svn commit: r335264 - head/x11-wm/fvwm

[Dirk Meyer]

Author: dinoex
Date: Sat Nov 30 06:53:59 2013
New Revision: 335264
URL: http://svnweb.freebsd.org/changeset/ports/335264

Log:
  - use STAGEDIR

Modified:
  head/x11-wm/fvwm/Makefile
  head/x11-wm/fvwm/pkg-plist

Modified: head/x11-wm/fvwm/Makefile
==============================================================================
--- head/x11-wm/fvwm/Makefile	Sat Nov 30 05:26:53 2013	(r335263)
+++ head/x11-wm/fvwm/Makefile	Sat Nov 30 06:53:59 2013	(r335264)
@@ -6,31 +6,25 @@ PORTVERSION=	1.24r
 PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-1/
-PKGNAMESUFFIX=	1
+PKGNAMESUFFIX=	1${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	The fvwm window manager
 
 NO_LATEST_LINK=	yes
-NO_STAGE=	yes
 
 USES=		imake
 USE_XORG=	xbitmaps xpm xext x11 xmu
 
-MAN1=		FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmClean.1 \
-		FvwmDebug.1 FvwmIconBox.1 FvwmIdent.1 FvwmPager.1 FvwmSave.1 \
-		FvwmSaveDesk.1 FvwmScroll.1 FvwmWinList.1 GoodStuff.1 fvwm.1 \
-		xpmroot.1
-
 pre-configure:
-	@${REINPLACE_CMD} -e '/DependSubdirs/y,/*#,   ,' ${WRKSRC}/Imakefile
+	${REINPLACE_CMD} -e '/DependSubdirs/y,/*#,   ,' ${WRKSRC}/Imakefile
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/configure.h \
 		${WRKSRC}/sample.fvwmrc/system.fvwmrc
 
 post-install:
-	@${MKDIR} ${PREFIX}/include/X11/pixmaps
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-	${WRKSRC}/fvwm_icons/*.xpm ${PREFIX}/include/X11/pixmaps
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/X11/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xpm \
+		${STAGEDIR}${PREFIX}/include/X11/pixmaps
 
 .include <bsd.port.mk>

Modified: head/x11-wm/fvwm/pkg-plist
==============================================================================
--- head/x11-wm/fvwm/pkg-plist	Sat Nov 30 05:26:53 2013	(r335263)
+++ head/x11-wm/fvwm/pkg-plist	Sat Nov 30 06:53:59 2013	(r335264)
@@ -58,5 +58,21 @@ include/X11/pixmaps/xterm-sgi.xpm
 include/X11/pixmaps/xterm-sol.xpm
 include/X11/pixmaps/xterm-sun.xpm
 include/X11/pixmaps/xterm.xpm
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmClean.1.gz
+man/man1/FvwmDebug.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/GoodStuff.1.gz
+man/man1/fvwm.1.gz
+man/man1/xpmroot.1.gz
 @dirrm lib/X11/fvwm
 @dirrmtry include/X11/pixmaps