Fix two problem coexistence problems:

- Don't install "xpmroot", depend on the "xpmroot" package instead.
- Don't clobber fvm-2's manual pages.

3 files changed, 24 insertions, 22 deletions

diff --git a/x11/fvwm1/Makefile b/x11/fvwm1/Makefile
index 9720f0efdec..08c0d6bce54 100644
--- a/x11/fvwm1/Makefile
+++ b/x11/fvwm1/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 March 1997
 # Whom:			cjs@netbsd.org
 #
-# $NetBSD: Makefile,v 1.3 1998/03/18 18:46:40 cjs Exp $
+# $NetBSD: Makefile,v 1.4 1998/03/25 18:32:00 tron Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -14,14 +14,20 @@ MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
 MAINTAINER=	cjs@netbsd.org
 
 LIB_DEPENDS=	Xpm.4.:${PORTSDIR}/graphics/xpm
+RUN_DEPENDS=	xpmroot:${PORTSDIR}/x11/xpmroot
 
 USE_IMAKE=	yes
 XMKMF=		xmkmf && make Makefiles	# drop -a because we have no `depends' target
 
-CAT1= 		FvwmAudio.0 FvwmAuto.0 FvwmBacker.0 FvwmBanner.0 \
-		FvwmIconBox.0 FvwmIdent.0 FvwmPager.0 \
-		FvwmSave.0 FvwmSaveDesk.0 FvwmScroll.0 \
-		FvwmWinList.0 fvwm.0 xpmroot.0
+CAT1=		GoodStuff.0 fvwm.0
+
+post-extract:
+	cd ${WRKSRC}/modules; \
+	for FILE in Fvwm*/Imakefile; do \
+	    ${MV} $${FILE} $${FILE}.orig; \
+	    ${SED} s/ComplexProgramTarget/ComplexProgramTargetNoMan/ \
+		<$${FILE}.orig >$${FILE}; \
+	done
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm/pixmaps
diff --git a/x11/fvwm1/patches/patch-ab b/x11/fvwm1/patches/patch-ab
new file mode 100644
index 00000000000..3e6e51c5d07
--- /dev/null
+++ b/x11/fvwm1/patches/patch-ab
@@ -0,0 +1,11 @@
+--- Imakefile.orig	Fri Dec  2 20:04:20 1994
++++ Imakefile	Wed Mar 25 00:36:03 1998
+@@ -28,7 +28,7 @@
+           modules/FvwmWinList
+ 
+ #ifdef XPM
+-XPMSUBDIRS = xpmroot modules/FvwmBanner 
++XPMSUBDIRS = modules/FvwmBanner 
+ #endif
+ 
+ SUBDIRS = $(ALLSUBDIRS) $(XPMSUBDIRS) $(SHAPESUBDIRS)
diff --git a/x11/fvwm1/pkg/PLIST b/x11/fvwm1/pkg/PLIST
index cf2b0621082..82c08d5cdc8 100644
--- a/x11/fvwm1/pkg/PLIST
+++ b/x11/fvwm1/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 1998/03/17 07:07:58 cjs Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/03/25 18:32:01 tron Exp $
 bin/fvwm
-bin/xpmroot
 lib/X11/fvwm/FvwmPager
 lib/X11/fvwm/system.fvwmrc
 lib/X11/fvwm/GoodStuff
@@ -65,22 +64,8 @@ lib/X11/fvwm/pixmaps/xterm-sgi.xpm
 lib/X11/fvwm/pixmaps/xterm-sol.xpm
 lib/X11/fvwm/pixmaps/xterm-sun.xpm
 lib/X11/fvwm/pixmaps/xterm.xpm
-man/cat1/xpmroot.0
-man/cat1/FvwmAudio.0
-man/cat1/FvwmAuto.0
-man/cat1/FvwmBacker.0
-man/cat1/FvwmBanner.0
-man/cat1/FvwmIconBox.0
-man/cat1/FvwmIdent.0
-man/cat1/FvwmPager.0
-man/cat1/FvwmSave.0
-man/cat1/FvwmSaveDesk.0
-man/cat1/FvwmScroll.0
-man/cat1/FvwmWinList.0
-man/cat1/fvwm.0
 man/cat1/GoodStuff.0
-man/cat1/FvwmDebug.0
-man/cat1/FvwmClean.0
+man/cat1/fvwm.0
 @dirrm lib/X11/fvwm/pixmaps
 @dirrm lib/X11/fvwm/bitmaps
 @dirrm lib/X11/fvwm