diff options
| author | tron <tron@pkgsrc.org> | 1998-03-24 23:32:14 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1998-03-24 23:32:14 +0000 |
| commit | 8e16e53287cc3206fa360e1856a1d2410b4f1007 (patch) | |
| tree | 5492f6b450b3a6e0ed90eaf9399eb0305a203903 | |
| parent | 45b9aab2f3c5a86e42a3e01da79cf34f7e4791d5 (diff) | |
| download | pkgsrc-8e16e53287cc3206fa360e1856a1d2410b4f1007.tar.gz | |
Don't install "xpmroot", depend on the "xpmroot" package instead.
| -rw-r--r-- | x11/fvwm95/Makefile | 3 | ||||
| -rw-r--r-- | x11/fvwm95/patches/patch-af | 36 | ||||
| -rw-r--r-- | x11/fvwm95/pkg/PLIST | 3 |
3 files changed, 30 insertions, 12 deletions
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 |