diff options
| author | wiz <wiz@pkgsrc.org> | 2001-06-13 20:15:06 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2001-06-13 20:15:06 +0000 |
| commit | eb73b18074b23447137203c558000b6792c83c2e (patch) | |
| tree | 092cf056ff5a31fe858b03b36b36242da414d15e /x11 | |
| parent | c24e330ee172c1ebcb28a9314c2be577fd0f9ec6 (diff) | |
| download | pkgsrc-eb73b18074b23447137203c558000b6792c83c2e.tar.gz | |
Fix installation if xpkgwedge is used. While here, remove patch-ab which is
only necessary on FreeBSD.
pkg/13193 by John P. Darrow.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/wmavgload/distinfo | 5 | ||||
| -rw-r--r-- | x11/wmavgload/patches/patch-aa | 12 | ||||
| -rw-r--r-- | x11/wmavgload/patches/patch-ab | 21 |
3 files changed, 9 insertions, 29 deletions
diff --git a/x11/wmavgload/distinfo b/x11/wmavgload/distinfo index a66ca493694..1214ec0867f 100644 --- a/x11/wmavgload/distinfo +++ b/x11/wmavgload/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:07:46 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/06/13 20:15:06 wiz Exp $ SHA1 (wmavgload-0.7.0.tar.gz) = 9225ced4e799a900a18374613396b500740f13a8 Size (wmavgload-0.7.0.tar.gz) = 11643 bytes -SHA1 (patch-aa) = 5977b525fb10f4b11636e538c332d45c25c974c4 -SHA1 (patch-ab) = a0488a4cfdf50f69485386b30c00a39433d0fde1 +SHA1 (patch-aa) = 9dce260a116de702c835047d588d2f9505c71b71 diff --git a/x11/wmavgload/patches/patch-aa b/x11/wmavgload/patches/patch-aa index f0f1924c940..b89e02756c4 100644 --- a/x11/wmavgload/patches/patch-aa +++ b/x11/wmavgload/patches/patch-aa @@ -1,9 +1,11 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/11/11 16:11:26 ad Exp $ +$NetBSD: patch-aa,v 1.2 2001/06/13 20:15:07 wiz Exp $ ---- Imakefile.orig Mon Sep 28 23:06:35 1998 -+++ Imakefile Thu Nov 11 16:07:02 1999 -@@ -2,7 +2,7 @@ - DESTDIR = /usr/X11R6 +--- Imakefile.orig Tue Sep 29 00:06:35 1998 ++++ Imakefile +@@ -1,8 +1,8 @@ + /* installation directory is the combination of $(DESTDIR) and $(BINDIR)*/ +-DESTDIR = /usr/X11R6 ++DESTDIR = ${PREFIX} BINDIR = /bin -XPMLIB = -L/usr/lib/X11 -L/opt/X11_Contrib/lib/sparc -lXpm -lm diff --git a/x11/wmavgload/patches/patch-ab b/x11/wmavgload/patches/patch-ab deleted file mode 100644 index 3d69ecfdf19..00000000000 --- a/x11/wmavgload/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/11/11 16:11:26 ad Exp $ - -*** get_load.c.orig Wed Nov 11 16:07:42 1998 ---- get_load.c Wed Nov 11 16:07:54 1998 -*************** -*** 104,110 **** - } - #endif - -! #if defined(__FreeBSD) || defined(__NetBSD__) || defined(__OpenBSD__) - void GetLoad(float *small, float *medium, float *large) - { - static double loadavg[3]; ---- 104,110 ---- - } - #endif - -! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - void GetLoad(float *small, float *medium, float *large) - { - static double loadavg[3]; |