From c4b3148335c0bd1c437e4f5724d196ce23457e59 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Tue, 24 Mar 1998 23:32:14 +0000
Subject: Don't install "xpmroot", depend on the "xpmroot" package instead.

---
 x11/fvwm95/Makefile         |  3 ++-
 x11/fvwm95/patches/patch-af | 36 +++++++++++++++++++++++++++---------
 x11/fvwm95/pkg/PLIST        |  3 +--
 3 files changed, 30 insertions(+), 12 deletions(-)

(limited to 'x11/fvwm95')

diff --git a/x11/fvwm95/Makefile b/x11/fvwm95/Makefile
index 63f3c5abc12..e0120427f4a 100644
--- a/x11/fvwm95/Makefile
+++ b/x11/fvwm95/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $NetBSD: Makefile,v 1.5 1998/03/10 16:30:02 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/03/24 23:32:14 tron Exp $
 # FreeBSD: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp
 #
 
@@ -17,6 +17,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 
 LIB_DEPENDS=	Xpm.4.:${PORTSDIR}/graphics/xpm
 BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
+RUN_DEPENDS=	xpmroot:${PORTSDIR}/x11/xpmroot
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/fvwm95/patches/patch-af b/x11/fvwm95/patches/patch-af
index 2d5712d2da9..f827ac2478e 100644
--- a/x11/fvwm95/patches/patch-af
+++ b/x11/fvwm95/patches/patch-af
@@ -1,11 +1,29 @@
---- xpmroot/Makefile.in.orig	Tue Sep 10 20:36:19 1996
-+++ xpmroot/Makefile.in	Wed Mar 11 00:08:21 1998
-@@ -24,7 +24,7 @@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
- RM=@RM@
+--- configure.orig	Tue Dec 10 17:55:16 1996
++++ configure	Wed Mar 25 00:22:14 1998
+@@ -2247,7 +2247,6 @@
+           libs/Makefile \
+           mini-icons/Makefile \
+           utils/Makefile \
+-          xpmroot/Makefile \
+           sample.fvwmrc/Makefile \
+           modules/Makefile \
+           modules/FvwmAudio/Makefile \
+@@ -2329,7 +2328,6 @@
+           libs/Makefile \
+           mini-icons/Makefile \
+           utils/Makefile \
+-          xpmroot/Makefile \
+           sample.fvwmrc/Makefile \
+           modules/Makefile \
+           modules/FvwmAudio/Makefile \
+--- Makefile.in.orig	Tue Jun 25 18:26:47 1996
++++ Makefile.in	Wed Mar 25 00:21:32 1998
+@@ -10,7 +10,7 @@
  
--PROG=xpmroot
-+PROG=xpmroot95
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-subdirs=libs fvwm modules utils sample.fvwmrc xpmroot icons mini-icons
++subdirs=libs fvwm modules utils sample.fvwmrc icons mini-icons
+ 
+ CFLAGS = -O
  
- SRCS = xpmroot.c
- OBJS = xpmroot.o
diff --git a/x11/fvwm95/pkg/PLIST b/x11/fvwm95/pkg/PLIST
index 2c77b403daf..dba6543160c 100644
--- a/x11/fvwm95/pkg/PLIST
+++ b/x11/fvwm95/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 1998/03/10 23:24:52 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/03/24 23:32:15 tron Exp $
 bin/fvwm95
-bin/xpmroot95
 icons/Mosaic.xpm
 icons/Xfm.xpm
 icons/arrdown2.xpm
-- 
cgit v1.2.3