From 6bc6b01650890b3a32af5cb338c5fbe1c2aa7a91 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 14 Oct 2001 13:47:17 +0000 Subject: Fix build failure on systems where "xpkgwedge" is installed. --- wm/fvwm1/Makefile | 21 ++++++++++++++------- wm/fvwm1/distinfo | 6 +++--- wm/fvwm1/patches/patch-aa | 10 +++++----- wm/fvwm1/patches/patch-ab | 9 +++++++-- wm/fvwm1/pkg/PLIST | 4 +++- 5 files changed, 32 insertions(+), 18 deletions(-) (limited to 'wm') diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile index 1562671efc7..520ae890ae8 100644 --- a/wm/fvwm1/Makefile +++ b/wm/fvwm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/03/11 16:19:46 tron Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/14 13:47:17 tron Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -17,9 +17,7 @@ CONFLICTS= fvwm-1.* NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_IMAKE= yes -# drop -a because we have no `depends' target -XMKMF= ${SH} -c "${X11BASE}/bin/xmkmf && ${MAKE} Makefiles" +USE_IMAKE= YES post-extract: cd ${WRKSRC}/modules; \ @@ -33,13 +31,22 @@ post-extract: ${SED} -e 's@#ifdef AlphaArchitecture@#if defined(AlphaArchitecture) \&\& !defined(NetBSDArchitecture)@' \ <${WRKSRC}/modules/GoodStuff/Imakefile.orig >${WRKSRC}/modules/GoodStuff/Imakefile +post-patch: + cd ${WRKSRC}; \ + ${MV} configure.h configure.h.old; \ + ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \ + -e 's#$${X11BASE}#${X11BASE}#g' configure.h.old >configure.h + post-install: @${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm/pixmaps @${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm/bitmaps ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xpm \ - ${PREFIX}/lib/X11/fvwm/pixmaps + ${PREFIX}/lib/X11/fvwm/pixmaps ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xbm \ - ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \ - ${PREFIX}/lib/X11/fvwm/bitmaps + ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \ + ${PREFIX}/lib/X11/fvwm/bitmaps + ${INSTALL_MAN} ${WRKSRC}/modules/GoodStuff/GoodStuff.man \ + ${PREFIX}/man/man1/GoodStuff.1 + ${INSTALL_MAN} ${WRKSRC}/fvwm/fvwm.man ${PREFIX}/man/man1/fvwm.1 .include "../../mk/bsd.pkg.mk" diff --git a/wm/fvwm1/distinfo b/wm/fvwm1/distinfo index 33b6e6effb5..97e5f6e2468 100644 --- a/wm/fvwm1/distinfo +++ b/wm/fvwm1/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/17 16:03:45 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/10/14 13:47:17 tron Exp $ SHA1 (fvwm-1.24r.tar.gz) = 89de9d7f0d9f63e9adffec7ac1f8be89ecbac9f4 Size (fvwm-1.24r.tar.gz) = 325480 bytes -SHA1 (patch-aa) = 62cb52e589edaedf7e15fc0c1b24ab587f8d1420 -SHA1 (patch-ab) = c5ee87e4d0f9887c0b8c0518847912925f463b10 +SHA1 (patch-aa) = 839762e930c6f97356daf842e30a51189e76dc0c +SHA1 (patch-ab) = 755326fa2b7f25bb3990dc96982f8a2bfbf78da3 SHA1 (patch-ac) = dd88301ae8b7f8abd0bb0c3fcfa40e69b44218ea SHA1 (patch-ad) = 258b376854f994a79eea8f42f38dcf6968a4f5fc 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: diff --git a/wm/fvwm1/pkg/PLIST b/wm/fvwm1/pkg/PLIST index 071cdfcac7e..df7f7c817b5 100644 --- a/wm/fvwm1/pkg/PLIST +++ b/wm/fvwm1/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/10/14 13:47:19 tron Exp $ bin/fvwm lib/X11/fvwm/FvwmPager lib/X11/fvwm/system.fvwmrc @@ -66,6 +66,8 @@ lib/X11/fvwm/pixmaps/xterm-sun.xpm lib/X11/fvwm/pixmaps/xterm.xpm man/cat1/GoodStuff.0 man/cat1/fvwm.0 +man/man1/GoodStuff.1 +man/man1/fvwm.1 @dirrm lib/X11/fvwm/pixmaps @dirrm lib/X11/fvwm/bitmaps @dirrm lib/X11/fvwm -- cgit v1.2.3