From 9c6c57acc185bfe0ce6721b3cdcc35bc62c6987c Mon Sep 17 00:00:00 2001 From: andreas Date: Sat, 1 Feb 1997 16:46:15 +0000 Subject: Removed unneeded @cwd in PLIST after using USE_X11. But this change made it necessary to choose absolute path names, since a /usr/X11R6/lib/librplay.a doesn't exists. Even CONFIGURE_ARGS need absolute path names now, otherwise modules/FvwmAudio doesn't compile. But now packaging works, thanks Andrey. --- x11-wm/fvwm95-i18n/Makefile | 12 ++++++------ x11-wm/fvwm95-i18n/pkg-plist | 2 -- x11-wm/fvwm95/Makefile | 12 ++++++------ x11-wm/fvwm95/pkg-plist | 2 -- 4 files changed, 12 insertions(+), 16 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile index bf8eac9cf75c..611aca7bb919 100644 --- a/x11-wm/fvwm95-i18n/Makefile +++ b/x11-wm/fvwm95-i18n/Makefile @@ -3,7 +3,7 @@ # Date created: Sa 1 Feb 1997 14:46:05 MET # Whom: Andreas Klemm # -# $Id: Makefile,v 1.6 1996/11/18 11:43:08 asami Exp $ +# $Id: Makefile,v 1.7 1997/02/01 14:13:52 andreas Exp $ # DISTNAME= fvwm95-2.0.43a-Autoconf @@ -14,12 +14,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= andreas@klemm.gtn.com LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm -BUILD_DEPENDS= ${PREFIX}/lib/librplay.a:${PORTSDIR}/audio/rplay +BUILD_DEPENDS= /usr/local/lib/librplay.a:${PORTSDIR}/audio/rplay -HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=/usr/X11R6 \ - --includedir=${PREFIX}/include \ - --libdir=${PREFIX}/lib +USE_X11= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--includedir=/usr/local/include \ + --libdir=/usr/local/lib post-configure: @${ECHO} "See the sample.fvwm95rc file in the files directory" diff --git a/x11-wm/fvwm95-i18n/pkg-plist b/x11-wm/fvwm95-i18n/pkg-plist index 62d5db4b6209..2937e4f1f77f 100644 --- a/x11-wm/fvwm95-i18n/pkg-plist +++ b/x11-wm/fvwm95-i18n/pkg-plist @@ -1,6 +1,4 @@ -@cwd /usr/X11R6 bin/fvwm95 -@cwd /usr/X11R6 bin/xpmroot lib/libfvwm95.a lib/X11/fvwm95/FvwmAudio diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile index bf8eac9cf75c..611aca7bb919 100644 --- a/x11-wm/fvwm95/Makefile +++ b/x11-wm/fvwm95/Makefile @@ -3,7 +3,7 @@ # Date created: Sa 1 Feb 1997 14:46:05 MET # Whom: Andreas Klemm # -# $Id: Makefile,v 1.6 1996/11/18 11:43:08 asami Exp $ +# $Id: Makefile,v 1.7 1997/02/01 14:13:52 andreas Exp $ # DISTNAME= fvwm95-2.0.43a-Autoconf @@ -14,12 +14,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= andreas@klemm.gtn.com LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm -BUILD_DEPENDS= ${PREFIX}/lib/librplay.a:${PORTSDIR}/audio/rplay +BUILD_DEPENDS= /usr/local/lib/librplay.a:${PORTSDIR}/audio/rplay -HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=/usr/X11R6 \ - --includedir=${PREFIX}/include \ - --libdir=${PREFIX}/lib +USE_X11= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--includedir=/usr/local/include \ + --libdir=/usr/local/lib post-configure: @${ECHO} "See the sample.fvwm95rc file in the files directory" diff --git a/x11-wm/fvwm95/pkg-plist b/x11-wm/fvwm95/pkg-plist index 62d5db4b6209..2937e4f1f77f 100644 --- a/x11-wm/fvwm95/pkg-plist +++ b/x11-wm/fvwm95/pkg-plist @@ -1,6 +1,4 @@ -@cwd /usr/X11R6 bin/fvwm95 -@cwd /usr/X11R6 bin/xpmroot lib/libfvwm95.a lib/X11/fvwm95/FvwmAudio -- cgit