svn commit: r360128 - in head/x11-wm/fvwm-crystal: . files

Vanilla I. Shu vanilla at FreeBSD.org
Wed Jul 2 03:21:05 UTC 2014 

Author: vanilla
Date: Wed Jul  2 03:21:04 2014
New Revision: 360128
URL: http://svnweb.freebsd.org/changeset/ports/360128
QAT: https://qat.redports.org/buildarchive/r360128/

Log:
  1: Stagify.
  2: use options helper.
  3: use INSTALL_TARGET to handle PORTDOCS
  
  Approved by:	portmgr@ (blanket approval)

Added:
  head/x11-wm/fvwm-crystal/files/patch-Makefile   (contents, props changed)
Deleted:
  head/x11-wm/fvwm-crystal/files/extra-patch-Makefile
  head/x11-wm/fvwm-crystal/files/extra-patch-Makefile_NODOC
Modified:
  head/x11-wm/fvwm-crystal/Makefile
  head/x11-wm/fvwm-crystal/pkg-plist

Modified: head/x11-wm/fvwm-crystal/Makefile
==============================================================================
--- head/x11-wm/fvwm-crystal/Makefile	Wed Jul  2 02:41:27 2014	(r360127)
+++ head/x11-wm/fvwm-crystal/Makefile	Wed Jul  2 03:21:04 2014	(r360128)
@@ -13,14 +13,12 @@ COMMENT=	Easy, eye-candy, light, and pow
 RUN_DEPENDS=	fvwm>=2.5:${PORTSDIR}/x11-wm/fvwm2 \
 		bash:${PORTSDIR}/shells/bash
 
-USES=		gettext gmake
+USES=		gettext gmake shebangfix
+SHEBANG_FILES=	addons/* bin/* fvwm/scripts/speed_value
 USE_PYTHON=	yes
 MAKE_ENV=	prefix="${PREFIX}" addondir="${DOCSDIR}/addons"
 PORTDOCS=	*
 
-MAN1=		ApplicationDatabase.1 CrystalRoxHOWTO.1 FVWMCrystalFAQ.1 \
-		KeyboardBindings.1 MouseBindings.1 Tips.1
-
 OPTIONS_DEFINE=	ROX IMAGEMAGICK XSCREENSAVER TRAYER SUDO HSETROOT CMUS DOCS
 OPTIONS_DEFAULT=	ROX IMAGEMAGICK XSCREENSAVER TRAYER SUDO HSETROOT
 
@@ -31,56 +29,27 @@ TRAYER_DESC=		Tray (notification area) s
 SUDO_DESC=		Run text-based applications as superuser
 HSETROOT_DESC=		Allow to set desktop wallpaper
 CMUS_DESC=		Play music via audio/cmus player
+MROX_RUN_DEPENDS=	rox:${PORTSDIR}/x11-fm/rox-filer
+IMAGEMAGICK_RUN_DEPENDS=	display:${PORTSDIR}/graphics/ImageMagick
+XSCREENSAVER_RUN_DEPENDS=	xscreensaver:${PORTSDIR}/x11/xscreensaver
+TRAYER_RUN_DEPENDS=	trayer:${PORTSDIR}/x11/trayer
+SUDO_RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
+SETROOT_RUN_DEPENDS=	hsetroot:${PORTSDIR}/graphics/hsetroot
+CMUS_RUN_DEPENDS=	cmus:${PORTSDIR}/audio/cmus
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MROX}
-RUN_DEPENDS+=	rox:${PORTSDIR}/x11-fm/rox-filer
-.endif
-
-.if ${PORT_OPTIONS:MIMAGEMAGICK}
-RUN_DEPENDS+=	display:${PORTSDIR}/graphics/ImageMagick
-.endif
-
-.if ${PORT_OPTIONS:MXSCREENSAVER}
-RUN_DEPENDS+=	xscreensaver:${PORTSDIR}/x11/xscreensaver
-.endif
-
-.if ${PORT_OPTIONS:MTRAYER}
-RUN_DEPENDS+=	trayer:${PORTSDIR}/x11/trayer
-.endif
-
-.if ${PORT_OPTIONS:MSUDO}
-RUN_DEPENDS+=	sudo:${PORTSDIR}/security/sudo
-.endif
-
-.if ${PORT_OPTIONS:MHSETROOT}
-RUN_DEPENDS+=	hsetroot:${PORTSDIR}/graphics/hsetroot
-.endif
-
-.if ${PORT_OPTIONS:MCMUS}
-RUN_DEPENDS+=	cmus:${PORTSDIR}/audio/cmus
-.endif
-
 post-extract:
 	@cd ${WRKSRC} && ${FIND} . -depth -type d -name .svn \
 		-exec ${RM} -rf {} \;
 
 .if ${PORT_OPTIONS:MDOCS}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile
-.else
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile_NODOC
+INSTALL_TARGET=	install install-doc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|cp -r -d|cp -r|; s|cp -d|cp|' \
 		${WRKSRC}/${MAKEFILE}
-.for i in addons/* bin/* fvwm/scripts/speed_value
-	@${REINPLACE_CMD} -e 's|/bin/bash|${PREFIX}/bin/bash|g' ${WRKSRC}/${i}
-	@${FIND} ${WRKSRC} -name '*.bak' -delete
-.endfor
-
 scrivi:
 	${ECHO_CMD} ${LOCALBASE}
 	${ECHO_CMD} ${PREFIX}

Added: head/x11-wm/fvwm-crystal/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/fvwm-crystal/files/patch-Makefile	Wed Jul  2 03:21:04 2014	(r360128)
@@ -0,0 +1,61 @@
+--- Makefile.orig	2014-07-02 11:08:31.459626724 +0800
++++ Makefile	2014-07-02 11:11:50.634611079 +0800
+@@ -1,7 +1,7 @@
+ #!/usr/bin/make -f
+ .PHONY: all install uninstall dist correctpermissions install-doc uninstall-doc
+ 
+-prefix?=/usr/local
++prefix=$(PREFIX)
+ docdir?=$(prefix)/share/doc/fvwm-crystal/
+ addondir?=$(prefix)/share/fvwm-crystal/addons
+ 
+@@ -12,13 +12,13 @@ all:
+ 
+ install: uninstall correctpath
+ 	@echo Installing fvwm-crystal $(RELEASE) to $(prefix)
+-	mkdir -p $(prefix)/bin $(prefix)/share/fvwm-crystal/fvwm 
++	mkdir -p $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm 
+ 
+-	install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.generate-menu bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper $(prefix)/bin
+-	cp -d -r fvwm/* $(prefix)/share/fvwm-crystal/fvwm/
++	install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.generate-menu bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper $(DESTDIR)$(prefix)/bin
++	cp -r fvwm/* $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm/
+ 
+-	mkdir -p $(prefix)/share/man/man1
+-	cp -d -r man/* $(prefix)/share/man/man1
++	mkdir -p $(DESTDIR)$(prefix)/man/man1
++	cp -r man/* $(DESTDIR)$(prefix)/man/man1
+ 
+ uninstall:
+ 	@echo "Uninstalling previously installed fvwm-crystal"
+@@ -40,7 +40,7 @@ dist-minimal:
+ 	mkdir -p "fvwm-crystal-minimal-$(RELEASE)"
+ 	mkdir -p "fvwm-crystal-minimal-$(RELEASE)/fvwm"
+ 	# Copy basic files
+-	cp -r AUTHORS COPYING INSTALL Makefile NEWS README fvwm-crystal-minimal-$(RELEASE)/
++	cp -r AUTHORS INSTALL Makefile NEWS README fvwm-crystal-minimal-$(RELEASE)/
+ 	cp -r fvwm/config fvwm-crystal-minimal-$(RELEASE)/fvwm/
+ 	# Copy addons/
+ 	mkdir -p "fvwm-crystal-minimal-$(RELEASE)/addons"
+@@ -190,15 +190,15 @@ dist-minimal:
+ 
+ # It is needed to adjust some path inside fvwm-crystal.generate-menu since this file must know the install path
+ correctpath:
+-	sed -i 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
+-	sed -i 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
++	sed 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu > bin/fvwm-crystal.generate-menu.new
++	sed 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu.new > bin/fvwm-crystal.generate-menu
+ 
+ uninstall-doc:
+ 	-rm -rf $(docdir)
+ 	-rm -rf $(addondir)
+ 
+ install-doc:
+-	mkdir -p $(addondir) $(docdir)
+-	install -m 644 addons/* $(addondir)
+-	install -m 644 AUTHORS COPYING NEWS ChangeLog README INSTALL $(docdir)
+-	install -m 644 doc/* $(docdir)
++	mkdir -p $(DESTDIR)$(addondir) $(DESTDIR)$(docdir)
++	install -m 644 addons/* $(DESTDIR)$(addondir)
++	install -m 644 AUTHORS NEWS ChangeLog README INSTALL $(DESTDIR)$(docdir)
++	install -m 644 doc/* $(DESTDIR)$(docdir)

Modified: head/x11-wm/fvwm-crystal/pkg-plist
==============================================================================
--- head/x11-wm/fvwm-crystal/pkg-plist	Wed Jul  2 02:41:27 2014	(r360127)
+++ head/x11-wm/fvwm-crystal/pkg-plist	Wed Jul  2 03:21:04 2014	(r360128)
@@ -4,6 +4,12 @@ bin/fvwm-crystal.generate-menu
 bin/fvwm-crystal.infoline
 bin/fvwm-crystal.mplayer-wrapper
 bin/fvwm-crystal.wallpaper
+man/man1/ApplicationDatabase.1.gz
+man/man1/CrystalRoxHOWTO.1.gz
+man/man1/FVWMCrystalFAQ.1.gz
+man/man1/KeyboardBindings.1.gz
+man/man1/MouseBindings.1.gz
+man/man1/Tips.1.gz
 %%DATADIR%%/fvwm/Applications/20~Games/20~Action_Games/15~doom3~DOOM_III
 %%DATADIR%%/fvwm/Applications/20~Games/20~Action_Games/15~quake3~Quake_III_Arena
 %%DATADIR%%/fvwm/Applications/20~Games/20~Action_Games/15~quake4~Quake_IV

More information about the svn-ports-head mailing list