From 45b9aab2f3c5a86e42a3e01da79cf34f7e4791d5 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Tue, 24 Mar 1998 23:18:40 +0000
Subject: Don't install "xpmroot", depend on the "xpmroot" package instead.

---
 x11/fvwm2/Makefile         |  5 +++--
 x11/fvwm2/patches/patch-ab | 11 +++++++++++
 x11/fvwm2/pkg/PLIST        |  4 +---
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 x11/fvwm2/patches/patch-ab

(limited to 'x11/fvwm2')

diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index a65932c05e9..eb658876be9 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $NetBSD: Makefile,v 1.5 1998/01/30 13:57:42 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/03/24 23:18:40 tron Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -19,13 +19,14 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
 MAINTAINER=	matusita@jp.freebsd.org
 
 LIB_DEPENDS=	Xpm.4.:${PORTSDIR}/graphics/xpm
+RUN_DEPENDS=	xpmroot:${PORTSDIR}/x11/xpmroot
 
 USE_IMAKE=	yes
 CAT1= 		FvwmAudio.0 FvwmAuto.0 FvwmBacker.0 FvwmBanner.0 \
 		FvwmButtons.0 FvwmCascade.0 FvwmCpp.0 FvwmForm.0 \
 		FvwmIconBox.0 FvwmIconMan.0 FvwmIdent.0 FvwmM4.0 FvwmPager.0 \
 		FvwmSave.0 FvwmSaveDesk.0 FvwmScroll.0 FvwmTalk.0 FvwmTile.0 \
-		FvwmWinList.0 fvwm2.0 xpmroot.0
+		FvwmWinList.0 fvwm2.0
 
 # filenames.
 PATCH_FIXIT=	kits/patch/fix-2.0.46
diff --git a/x11/fvwm2/patches/patch-ab b/x11/fvwm2/patches/patch-ab
new file mode 100644
index 00000000000..fc5afc5b095
--- /dev/null
+++ b/x11/fvwm2/patches/patch-ab
@@ -0,0 +1,11 @@
+--- Imakefile.orig	Thu Jun 12 22:06:45 1997
++++ Imakefile	Tue Mar 24 23:49:41 1998
+@@ -37,7 +37,7 @@
+ 	  sample.fvwmrc
+ 
+ #if HasXpm
+-XPMSUBDIRS = xpmroot modules/FvwmBanner 
++XPMSUBDIRS = modules/FvwmBanner 
+ #endif
+ 
+ SUBDIRS = $(BUILDSUBDIRS) $(XPMSUBDIRS) $(SAMPLESUBDIRS)
diff --git a/x11/fvwm2/pkg/PLIST b/x11/fvwm2/pkg/PLIST
index 754c4096625..858cc95ac8d 100644
--- a/x11/fvwm2/pkg/PLIST
+++ b/x11/fvwm2/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/10 01:03:18 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/03/24 23:18:41 tron Exp $
 bin/fvwm2
-bin/xpmroot
 lib/X11/fvwm2/FvwmAudio
 lib/X11/fvwm2/FvwmAuto
 lib/X11/fvwm2/FvwmBacker
@@ -153,7 +152,6 @@ lib/X11/fvwm2/pixmaps/xterm.xpm
 lib/X11/fvwm2/pixmaps/xv.xpm
 lib/X11/fvwm2/pixmaps/xv2.xpm
 man/cat1/fvwm2.0.gz
-man/cat1/xpmroot.0.gz
 man/cat1/FvwmAudio.0.gz
 man/cat1/FvwmAuto.0.gz
 man/cat1/FvwmBacker.0.gz
-- 
cgit v1.2.3