- Modified port to use new fbsd-icons port, so the bsd-icons.tgz file

  from the files-dir could be nuked, as requested by Satoshi and others.
- Modified BUILD_DEPENDS to use ${LOCALBASE} variable instead of
  an absolute path.
- packaging tested on both ports fbsd-icons and fvwm95 ;-)

4 files changed, 8 insertions, 30 deletions

diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index e2c7a120ba25..6388b4c76e0c 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 <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/06/09 19:16:35 andreas Exp $
+# $Id: Makefile,v 1.11 1997/06/09 19:43:45 andreas Exp $
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
@@ -15,7 +15,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	andreas@klemm.gtn.com
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	/usr/local/lib/librplay.a:${PORTSDIR}/audio/rplay
+BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
+RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
@@ -26,7 +27,6 @@ MAN1=		fvwm95.1
 
 post-install:
 		@${INSTALL_MAN}	$(WRKSRC)/fvwm/fvwm95.man \
-				$(PREFIX)/man/man1/fvwm95.1
-		(cd ${PREFIX}/icons; tar xzf ${FILESDIR}/fbsd-icons.tar.gz)
+			$(PREFIX)/man/man1/fvwm95.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm95-i18n/pkg-plist b/x11-wm/fvwm95-i18n/pkg-plist
index e091cd11845e..8005d2f30ad6 100644
--- a/x11-wm/fvwm95-i18n/pkg-plist
+++ b/x11-wm/fvwm95-i18n/pkg-plist
@@ -9,7 +9,6 @@ icons/bckgnd1.xpm
 icons/bckgnd3.xpm
 icons/bomb.xpm
 icons/ccode.icon
-icons/chuck.xpm
 icons/clamp.xpm
 icons/colormap.xpm
 icons/datebook.xpm
@@ -27,9 +26,6 @@ icons/flow_chart.xpm
 icons/folder.xpm
 icons/folder2.xpm
 icons/folders.xpm
-icons/freebsd-menu.xpm
-icons/freebsd2-menu.xpm
-icons/freebsd3-menu.xpm
 icons/fvwm-menu.xpm
 icons/fvwm.bitmap
 icons/fvwm.xpm
@@ -52,7 +48,6 @@ icons/mail2.xpm
 icons/map.xpm
 icons/math4.xpm
 icons/mini-arch.xpm
-icons/mini-backup.xpm
 icons/mini-ball.xpm
 icons/mini-bball.xpm
 icons/mini-bomb.xpm
@@ -109,11 +104,7 @@ icons/mini-heart.xpm
 icons/mini-hex.xpm
 icons/mini-hextris.xpm
 icons/mini-icons.xpm
-icons/mini-info.xpm
-icons/mini-internet.xpm
-icons/mini-iris.xpm
 icons/mini-keyboard.xpm
-icons/mini-kfm.xpm
 icons/mini-lock.xpm
 icons/mini-lower.xpm
 icons/mini-mail.xpm
@@ -143,7 +134,6 @@ icons/mini-rball.xpm
 icons/mini-resize.xpm
 icons/mini-roach.xpm
 icons/mini-run.xpm
-icons/mini-run2.xpm
 icons/mini-sh.xpm
 icons/mini-sh1.xpm
 icons/mini-slon.xpm
@@ -158,7 +148,6 @@ icons/mini-turn.xpm
 icons/mini-twm.xpm
 icons/mini-window.xpm
 icons/mini-windows.xpm
-icons/mini-world.xpm
 icons/mini-x.xpm
 icons/mini-x2.xpm
 icons/mini-xfig.xpm
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index e2c7a120ba25..6388b4c76e0c 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 <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1997/06/09 19:16:35 andreas Exp $
+# $Id: Makefile,v 1.11 1997/06/09 19:43:45 andreas Exp $
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
@@ -15,7 +15,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	andreas@klemm.gtn.com
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	/usr/local/lib/librplay.a:${PORTSDIR}/audio/rplay
+BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
+RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
@@ -26,7 +27,6 @@ MAN1=		fvwm95.1
 
 post-install:
 		@${INSTALL_MAN}	$(WRKSRC)/fvwm/fvwm95.man \
-				$(PREFIX)/man/man1/fvwm95.1
-		(cd ${PREFIX}/icons; tar xzf ${FILESDIR}/fbsd-icons.tar.gz)
+			$(PREFIX)/man/man1/fvwm95.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm95/pkg-plist b/x11-wm/fvwm95/pkg-plist
index e091cd11845e..8005d2f30ad6 100644
--- a/x11-wm/fvwm95/pkg-plist
+++ b/x11-wm/fvwm95/pkg-plist
@@ -9,7 +9,6 @@ icons/bckgnd1.xpm
 icons/bckgnd3.xpm
 icons/bomb.xpm
 icons/ccode.icon
-icons/chuck.xpm
 icons/clamp.xpm
 icons/colormap.xpm
 icons/datebook.xpm
@@ -27,9 +26,6 @@ icons/flow_chart.xpm
 icons/folder.xpm
 icons/folder2.xpm
 icons/folders.xpm
-icons/freebsd-menu.xpm
-icons/freebsd2-menu.xpm
-icons/freebsd3-menu.xpm
 icons/fvwm-menu.xpm
 icons/fvwm.bitmap
 icons/fvwm.xpm
@@ -52,7 +48,6 @@ icons/mail2.xpm
 icons/map.xpm
 icons/math4.xpm
 icons/mini-arch.xpm
-icons/mini-backup.xpm
 icons/mini-ball.xpm
 icons/mini-bball.xpm
 icons/mini-bomb.xpm
@@ -109,11 +104,7 @@ icons/mini-heart.xpm
 icons/mini-hex.xpm
 icons/mini-hextris.xpm
 icons/mini-icons.xpm
-icons/mini-info.xpm
-icons/mini-internet.xpm
-icons/mini-iris.xpm
 icons/mini-keyboard.xpm
-icons/mini-kfm.xpm
 icons/mini-lock.xpm
 icons/mini-lower.xpm
 icons/mini-mail.xpm
@@ -143,7 +134,6 @@ icons/mini-rball.xpm
 icons/mini-resize.xpm
 icons/mini-roach.xpm
 icons/mini-run.xpm
-icons/mini-run2.xpm
 icons/mini-sh.xpm
 icons/mini-sh1.xpm
 icons/mini-slon.xpm
@@ -158,7 +148,6 @@ icons/mini-turn.xpm
 icons/mini-twm.xpm
 icons/mini-window.xpm
 icons/mini-windows.xpm
-icons/mini-world.xpm
 icons/mini-x.xpm
 icons/mini-x2.xpm
 icons/mini-xfig.xpm