x11-themes/fvwm-themes: support stagedir

PR:		191716 (based on)
Submitted by:	Dan Lukes <dan@obluda.cz>

3 files changed, 22 insertions, 12 deletions

diff --git a/x11-themes/fvwm-themes/Makefile b/x11-themes/fvwm-themes/Makefile
index 624730d98598..a4e9a1cdf2a6 100644
--- a/x11-themes/fvwm-themes/Makefile
+++ b/x11-themes/fvwm-themes/Makefile
@@ -16,17 +16,12 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		fvwm2:${PORTSDIR}/x11-wm/fvwm2
 RUN_DEPENDS=	fvwm2:${PORTSDIR}/x11-wm/fvwm2
 
-USE_BZIP2=	yes
 USE_XORG=	xpm
 USES=		perl5 gmake tar:bzip2
 GNU_CONFIGURE=	yes
 
-MAN1=		fvwm-themes-config.1 fvwm-themes-menuapp.1 fvwm-themes-com.1 \
-		fvwm-themes-images.1 fvwm-themes-start.1 fvwm-themes-root.1
-
-NO_STAGE=	yes
 post-install:
 	@cd ${WRKDIR}/${PORTNAME}-extra-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/fvwm/themes
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${PREFIX}/share/fvwm/themes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/fvwm-themes/files/patch-Makefile.in b/x11-themes/fvwm-themes/files/patch-Makefile.in
new file mode 100644
index 000000000000..089c4f8d3dbc
--- /dev/null
+++ b/x11-themes/fvwm-themes/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	2014-07-08 02:30:39.000000000 +0000
++++ Makefile.in	2014-07-08 02:33:45.000000000 +0000
+@@ -463,10 +463,10 @@
+ 	mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)
+ 
+ 	PATH="$(DESTDIR)$(bindir):$(FVWM_BINDIR):$$PATH"; \
+-	$(DESTDIR)$(bindir)/fvwm-themes-config --site --reset
++	# $(DESTDIR)$(bindir)/fvwm-themes-config --site --reset
+ 
+ 	if test "$(BUILD_MENUS)" = "yes"; then \
+-		$(DESTDIR)$(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \
++		#$(DESTDIR)$(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \
+ 	fi
+ 
+ 	if test "$(GNOME_ICONS)" = "yes"; then \
diff --git a/x11-themes/fvwm-themes/pkg-plist b/x11-themes/fvwm-themes/pkg-plist
index 393fe68d2a32..fb9bb8112c08 100644
--- a/x11-themes/fvwm-themes/pkg-plist
+++ b/x11-themes/fvwm-themes/pkg-plist
@@ -6,6 +6,12 @@ bin/fvwm-themes-root
 bin/fvwm-themes-script
 bin/fvwm-themes-start
 bin/fvwm-themes-xrdb
+man/man1/fvwm-themes-config.1.gz
+man/man1/fvwm-themes-menuapp.1.gz
+man/man1/fvwm-themes-com.1.gz
+man/man1/fvwm-themes-images.1.gz
+man/man1/fvwm-themes-start.1.gz
+man/man1/fvwm-themes-root.1.gz
 share/fvwm/FvwmApplet-APMMon
 share/fvwm/FvwmApplet-Day
 share/fvwm/FvwmApplet-DayClock
@@ -282,9 +288,6 @@ share/fvwm/sounds/iconify.au
 share/fvwm/sounds/new_desk.au
 share/fvwm/sounds/new_page.au
 share/fvwm/sounds/windowshade.au
-share/fvwm/themes-rc
-share/fvwm/themes-rc-2
-share/fvwm/themes-rc-3
 share/fvwm/themes/afterstep/README
 share/fvwm/themes/afterstep/background
 share/fvwm/themes/afterstep/buttons
@@ -614,7 +617,6 @@ share/fvwm/themes/celticbow/images/button/spin_in.xpm
 share/fvwm/themes/celticbow/images/decor/knots.png
 share/fvwm/themes/celticbow/theme-name.cfg
 share/fvwm/themes/celticbow/windowlook
-share/fvwm/themes/current/theme.cfg
 share/fvwm/themes/default/README
 share/fvwm/themes/default/background
 share/fvwm/themes/default/background.cfg
@@ -1543,7 +1545,6 @@ share/fvwm/themes/unsafe/menustyle.cfg
 @dirrm share/fvwm/themes/default/images/background
 @dirrm share/fvwm/themes/default/images
 @dirrm share/fvwm/themes/default
-@dirrm share/fvwm/themes/current
 @dirrm share/fvwm/themes/celticbow/images/decor
 @dirrm share/fvwm/themes/celticbow/images/button
 @dirrm share/fvwm/themes/celticbow/images/background
@@ -1615,4 +1616,3 @@ share/fvwm/themes/unsafe/menustyle.cfg
 @dirrm share/fvwm/images/32x32
 @dirrm share/fvwm/images/16x16-kde
 @dirrm share/fvwm/images
-@dirrmtry share/fvwm