Sync with ports.

Mostly fixes related to staging.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1333 058c260c-8361-11dd-a0ac-aa2bafec7d09

10 files changed, 11 insertions, 17 deletions

diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index 1741768..dba8dc6 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -16,5 +16,4 @@ USE_XORG=	xproto:both xtrans fontsproto:both fontenc
 
 CONFIGURE_ARGS=--without-xmlto --disable-devel-docs
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index be18e10..0fa5429 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -14,9 +14,6 @@ USE_XORG=	libfs xfont xtrans
 USE_RC_SUBR=	xfs
 CONFIGURE_ARGS=	--without-xmlto --without-fop
 
-MAN1=		xfs.1
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in
 .if defined(WITHOUT_XFS_CACHE)
@@ -27,9 +24,7 @@ post-build:
 	@cd ${WRKSRC}/config/ && ${GMAKE} config
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config.default
-	@if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \
-		${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config; \
-	fi
+	${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config.default
+	${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config; \
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist
index e2378ab..e175b97 100644
--- a/x11-fonts/xfs/pkg-plist
+++ b/x11-fonts/xfs/pkg-plist
@@ -1,4 +1,5 @@
 bin/xfs
+man/man1/xfs.1.gz
 @unexec if cmp -s %D/etc/X11/fs/config.default %D/etc/X11/fs/config; then rm -f %D/etc/X11/fs/config; fi
 etc/X11/fs/config.default
 @exec if [ ! -f %D/etc/X11/fs/config ] ; then cp -p %D/%F %B/config; fi
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index c3a6520..7517c77 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${FONTDIR}/100dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-1
 CONFLICTS=	XFree86-font100dpi-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index 496f98f..f863267 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${FONTDIR}/75dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75
 CONFLICTS=	XFree86-font75dpi-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index b78adb9..d2242bc 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -20,9 +20,9 @@ RUN_DEPENDS=	${FONTDIR}/cyrillic/crox1c.pcf.gz:${PORTSDIR}/x11-fonts/font-cronyx
 CONFLICTS=	XFree86-fontCyrillic-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index dffea8b..193725e 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -27,9 +27,9 @@ RUN_DEPENDS=	${FONTDIR}/misc/arabic24.pcf.gz:${PORTSDIR}/x11-fonts/font-arabic-m
 CONFLICTS=	XFree86-fontDefaultBitmaps-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index a70282f..fc5cbb1 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${FONTDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf \
 do-install:	# empty
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index a6c2739..f254b37 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	XFree86-fontScalable-*
 do-install:	# empty
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index f3ef39b..33a7041 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -23,9 +23,8 @@ RUN_DEPENDS=	xorg-fonts-100dpi>=0:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 do-install:
-		${MKDIR} ${PREFIX}/libdata/xorg
-		${TOUCH} ${PREFIX}/libdata/xorg/fonts
+		${MKDIR} ${STAGEDIR}${PREFIX}/libdata/xorg
+		${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/fonts
 
 .include <bsd.port.mk>