svn commit: r340349 - head/sysutils/gather

[Mikolaj Golub]

Author: trociny
Date: Sun Jan 19 20:43:44 2014
New Revision: 340349
URL: http://svnweb.freebsd.org/changeset/ports/340349
QAT: https://qat.redports.org/buildarchive/r340349/

Log:
  Convert to stage.

Modified:
  head/sysutils/gather/Makefile
  head/sysutils/gather/pkg-plist

Modified: head/sysutils/gather/Makefile
==============================================================================
--- head/sysutils/gather/Makefile	Sun Jan 19 20:21:00 2014	(r340348)
+++ head/sysutils/gather/Makefile	Sun Jan 19 20:43:44 2014	(r340349)
@@ -22,40 +22,21 @@ MAKE_ENV+=	CONFDIR=${PREFIX}/etc/gather 
 
 SUB_FILES=	pkg-message
 
-MAN1=		gather.1
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	Changelog README
-.endif
-.if !defined(NOPORTEXAMPLES)
-PORTEXAMPLES=	*
-.endif
-
-NO_STAGE=	yes
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/gather ${PREFIX}/bin/
-	@${INSTALL_MAN} ${WRKSRC}/gather.1 ${PREFIX}/man/man1
-.if !exists(${PREFIX}/etc/gather)
-	@${MKDIR} ${PREFIX}/etc/gather
-.endif
-	@${INSTALL_DATA} ${WRKSRC}/gather.cfg ${PREFIX}/etc/gather/gather.cfg.sample
-.if !exists(${CONFDIR}/gather.cfg)
-	@${INSTALL_DATA} ${WRKSRC}/gather.cfg ${PREFIX}/etc/gather/gather.cfg
-.endif
-	@${INSTALL_DATA} ${WRKSRC}/examples/gather.map.freebsd ${PREFIX}/etc/gather/gather.map.sample
-.if !exists(${PREFIX}/etc/gather/gather.cfg)
-	@${INSTALL_DATA} ${WRKSRC}/examples/gather.map.freebsd ${PREFIX}/etc/gather/gather.map
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_SCRIPT} ${WRKSRC}/gather ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/gather.1 ${STAGEDIR}${PREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gather
+	${INSTALL_DATA} ${WRKSRC}/gather.cfg \
+	    ${STAGEDIR}${PREFIX}/etc/gather/gather.cfg.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/gather.map.freebsd \
+	    ${STAGEDIR}${PREFIX}/etc/gather/gather.map.sample
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Changelog ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/gather.map.freebsd \
+	    ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/gather.map.linux \
+	    ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/gather/pkg-plist
==============================================================================
--- head/sysutils/gather/pkg-plist	Sun Jan 19 20:21:00 2014	(r340348)
+++ head/sysutils/gather/pkg-plist	Sun Jan 19 20:43:44 2014	(r340349)
@@ -1,6 +1,15 @@
 bin/gather
+man/man1/gather.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gather.map.freebsd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gather.map.linux
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @unexec if cmp -s %D/etc/gather/gather.cfg.sample %D/etc/gather/gather.cfg; then rm -f %D/etc/gather/gather.cfg; else echo "If permanently deleting this package, %D/etc/gather/gather.cfg must be removed manually."; fi
 etc/gather/gather.cfg.sample
+ at exec if [ ! -f %D/etc/gather/gather.cfg ]; then cp -p %D/%F %B/gather.cfg; fi
 @unexec if cmp -s %D/etc/gather/gather.map.sample %D/etc/gather/gather.map; then rm -f %D/etc/gather/gather.map; else echo "If permanently deleting this package, %D/etc/gather/gather.map must be removed manually."; fi
 etc/gather/gather.map.sample
+ at exec if [ ! -f %D/etc/gather/gather.map ]; then cp -p %D/%F %B/gather.map; fi
 @dirrmtry etc/gather