diff options
| author | wiz <wiz> | 2002-05-12 21:21:31 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-05-12 21:21:31 +0000 |
| commit | 6b0d1bfd3d1bb1e347753acf245285ba2153981c (patch) | |
| tree | 2200e519754f34e89a26e610d9e2f15ddd8bbb05 /x11/aterm | |
| parent | 922f03a620961698a38fd5fdc3e181ec763d6a4e (diff) | |
| download | pkgsrc-6b0d1bfd3d1bb1e347753acf245285ba2153981c.tar.gz | |
Fix compilation on -current. Patches from Rui-Xiang Guo in response
to pkg/16637.
Diffstat (limited to 'x11/aterm')
| -rw-r--r-- | x11/aterm/distinfo | 4 | ||||
| -rw-r--r-- | x11/aterm/patches/patch-ac | 28 | ||||
| -rw-r--r-- | x11/aterm/patches/patch-ad | 20 |
3 files changed, 51 insertions, 1 deletions
diff --git a/x11/aterm/distinfo b/x11/aterm/distinfo index f557a6bb601..57540dcebb0 100644 --- a/x11/aterm/distinfo +++ b/x11/aterm/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/12/11 16:02:08 wiz Exp $ +$NetBSD: distinfo,v 1.4 2002/05/12 21:21:31 wiz Exp $ SHA1 (aterm-0.4.2.tar.gz) = 8ce3f1fcdc12805068ff5acde6f130a22e1f5b9b Size (aterm-0.4.2.tar.gz) = 312730 bytes SHA1 (patch-aa) = 59cf8fe42bf4291b2a98c0d95170a02308197645 SHA1 (patch-ab) = 9b4e6785912de338db958e9ad48c4cafcb344270 +SHA1 (patch-ac) = 28c79343079680251a013ec3fe364b01f5a5ccac +SHA1 (patch-ad) = 0c87ee69672e98189afa2cfdcdd9691a1571f354 diff --git a/x11/aterm/patches/patch-ac b/x11/aterm/patches/patch-ac new file mode 100644 index 00000000000..37433df93ac --- /dev/null +++ b/x11/aterm/patches/patch-ac @@ -0,0 +1,28 @@ +$NetBSD: patch-ac,v 1.1 2002/05/12 21:21:32 wiz Exp $ + +--- src/utmp.c.orig Sat May 4 08:40:45 2002 ++++ src/utmp.c +@@ -186,7 +186,11 @@ + } + } + ++#ifdef HAVE_UTMPX_H ++ utmpxname(UTMP_FILENAME); ++#else + utmpname(UTMP_FILENAME); ++#endif + + setutent(); /* XXX: should be unnecessaray */ + +@@ -265,7 +269,11 @@ + if (!ut_id[0]) + return; /* entry not made */ + ++#ifdef HAVE_UTMPX_H ++ utmpxname(UTMP_FILENAME); ++#else + utmpname(UTMP_FILENAME); ++#endif + MEMSET(&utmp, 0, sizeof(UTMP)); + STRNCPY(utmp.ut_id, ut_id, sizeof(utmp.ut_id)); + utmp.ut_type = USER_PROCESS; diff --git a/x11/aterm/patches/patch-ad b/x11/aterm/patches/patch-ad new file mode 100644 index 00000000000..67addf493fa --- /dev/null +++ b/x11/aterm/patches/patch-ad @@ -0,0 +1,20 @@ +$NetBSD: patch-ad,v 1.1 2002/05/12 21:21:32 wiz Exp $ + +--- src/rxvt.h.orig Sat May 4 08:47:56 2002 ++++ src/rxvt.h +@@ -549,11 +549,13 @@ + #ifdef WTMP_SUPPORT + # ifdef HAVE_UTMPX_H /* means we're on Solaris (or Irix?) */ + # undef WTMP_FILENAME +-# if defined(WTMPX_FILE) || defined(_WTMPX_FILE) ++# if defined(WTMPX_FILE) || defined(_WTMPX_FILE) || defined(_PATH_WTMPX) + # if defined(WTMPX_FILE) + # define WTMP_FILENAME WTMPX_FILE +-# else ++# elif defined(_WTMPX_FILE) + # define WTMP_FILENAME _WTMPX_FILE ++# else ++# define WTMP_FILENAME _PATH_WTMPX + # endif + # define update_wtmp updwtmpx + # else |