diff options
| author | wiz <wiz> | 2001-06-13 20:15:06 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2001-06-13 20:15:06 +0000 |
| commit | 1bea85b3133a7b9adab01d05002ebb26330a9d5c (patch) | |
| tree | 092cf056ff5a31fe858b03b36b36242da414d15e /x11/wmavgload/patches | |
| parent | 3a634184f959e77540fcc65c1519eaba71d783ab (diff) | |
| download | pkgsrc-1bea85b3133a7b9adab01d05002ebb26330a9d5c.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/wmavgload/patches')
| -rw-r--r-- | x11/wmavgload/patches/patch-aa | 12 | ||||
| -rw-r--r-- | x11/wmavgload/patches/patch-ab | 21 |
2 files changed, 7 insertions, 26 deletions
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]; |