diff options
| author | tron <tron@pkgsrc.org> | 2001-10-14 13:47:17 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-10-14 13:47:17 +0000 |
| commit | cc29c215ec00c62ac30066391f0da3e03a50d81d (patch) | |
| tree | 6c14abf720eca2758e8c76330c6a200360dac231 /wm/fvwm1/patches | |
| parent | 2ab07e3e270dc0ab94ad2bf79b19fe6b2e8ad8e2 (diff) | |
| download | pkgsrc-cc29c215ec00c62ac30066391f0da3e03a50d81d.tar.gz | |
Fix build failure on systems where "xpkgwedge" is installed.
Diffstat (limited to 'wm/fvwm1/patches')
| -rw-r--r-- | wm/fvwm1/patches/patch-aa | 10 | ||||
| -rw-r--r-- | wm/fvwm1/patches/patch-ab | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/wm/fvwm1/patches/patch-aa b/wm/fvwm1/patches/patch-aa index 9c1967868e2..1cd2f6badc7 100644 --- a/wm/fvwm1/patches/patch-aa +++ b/wm/fvwm1/patches/patch-aa @@ -1,15 +1,15 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2001/10/14 13:47:18 tron Exp $ --- configure.h~ Mon Nov 28 13:08:47 1994 +++ configure.h Mon Mar 16 21:44:31 1998 @@ -1,7 +1,7 @@ -#define FVWMDIR "/usr/lib/X11/fvwm" -+#define FVWMDIR "/usr/X11R6/lib/X11/fvwm" ++#define FVWMDIR "${PREFIX}/lib/X11/fvwm" /* #define FVWMDIR "/local/homes/dsp/nation/modules"*/ -#define FVWM_ICONDIR "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps" -#define FVWMRC "/usr/lib/X11/fvwm/system.fvwmrc" -+#define FVWM_ICONDIR "/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/X11/pixmaps" -+#define FVWMRC "/usr/X11R6/lib/X11/fvwm/system.fvwmrc" ++#define FVWM_ICONDIR "${PREFIX}/include/X11/bitmaps:${PREFIX}/include/X11/pixmaps" ++#define FVWMRC "${PREFIX}/lib/X11/fvwm/system.fvwmrc" /* Imake command needed to put modules in desired target location */ /* Use the second version if it causes grief */ @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ #define XPM /* linker flags needed to locate and link in the Xpm library, if you use it */ -#define XPMLIBRARY -L/usr/lib/X11 -lXpm -+#define XPMLIBRARY -L/usr/X11R6/lib -lXpm ++#define XPMLIBRARY -L${X11BASE}/lib -L${PREFIX}/lib -lXpm /*************************************************************************** *#define M4 diff --git a/wm/fvwm1/patches/patch-ab b/wm/fvwm1/patches/patch-ab index a59a26bee41..ae31930f3af 100644 --- a/wm/fvwm1/patches/patch-ab +++ b/wm/fvwm1/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2001/10/14 13:47:18 tron Exp $ --- Imakefile.orig Fri Dec 2 20:04:20 1994 -+++ Imakefile Wed Mar 25 00:36:03 1998 ++++ Imakefile Sun Oct 14 15:37:57 2001 @@ -28,7 +28,7 @@ modules/FvwmWinList @@ -11,3 +11,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ #endif SUBDIRS = $(ALLSUBDIRS) $(XPMSUBDIRS) $(SHAPESUBDIRS) +@@ -43,3 +43,4 @@ + + + ++depend: |