Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Feb 2014 09:45:02 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346174 - head/x11-wm/blackbox
Message-ID:  <201402260945.s1Q9j2HA031475@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Wed Feb 26 09:45:02 2014
New Revision: 346174
URL: http://svnweb.freebsd.org/changeset/ports/346174
QAT: https://qat.redports.org/buildarchive/r346174/

Log:
  - Stage support

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

Modified: head/x11-wm/blackbox/Makefile
==============================================================================
--- head/x11-wm/blackbox/Makefile	Wed Feb 26 09:44:51 2014	(r346173)
+++ head/x11-wm/blackbox/Makefile	Wed Feb 26 09:45:02 2014	(r346174)
@@ -17,13 +17,11 @@ USES=		pathfix pkgconfig iconv
 USE_XORG=	x11 xft
 LDFLAGS+=	${ICONV_LIB}
 
-MAN1=		bsetbg.1 bsetroot.1
 PORTDOCS=	README.bbtools README.bsetbg
 
 OPTIONS_DEFINE=		TOOLS_ONLY
 TOOLS_ONLY_DESC=	Do not install window manager, only tools
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOOLS_ONLY}
@@ -32,7 +30,6 @@ COMMENT+=	(tools only)
 MAKE_ARGS=	SUBDIRS="doc lib util" bin_PROGRAMS=bsetroot
 INSTALL_TARGET=	-C util install		# XXX dirty hack :(
 .else
-MAN1+=		blackbox.1
 PORTDOCS+=	AUTHORS COMPLIANCE ChangeLog README RELNOTES TODO
 .endif
 
@@ -44,11 +41,9 @@ post-install:
 .if ${PORT_OPTIONS:MTOOLS_ONLY}
 	@${REINPLACE_CMD} -E '/[^s]\/blackbox|bstyleconvert|lib|include/d' \
 		${TMPPLIST}
-	${INSTALL_MAN} ${MAN1:S#^#${WRKSRC}/doc/#} ${MANPREFIX}/man/man1
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S#^#${WRKSRC}/#} ${DOCSDIR}
+	${INSTALL_MAN} ${MAN1:S#^#${WRKSRC}/doc/#} ${STAGEDIR}${MANPREFIX}/man/man1
 .endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S#^#${WRKSRC}/#} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-wm/blackbox/pkg-plist
==============================================================================
--- head/x11-wm/blackbox/pkg-plist	Wed Feb 26 09:44:51 2014	(r346173)
+++ head/x11-wm/blackbox/pkg-plist	Wed Feb 26 09:45:02 2014	(r346174)
@@ -28,6 +28,9 @@ include/bt/XDG.hh
 %%DATADIR%%/styles/Purple
 %%DATADIR%%/styles/Red
 %%DATADIR%%/menu
+man/man1/blackbox.1.gz
+man/man1/bsetbg.1.gz
+man/man1/bsetroot.1.gz
 @dirrm include/bt
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402260945.s1Q9j2HA031475>