Date: Wed, 23 Oct 2013 12:35:04 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331381 - in head/security: cksfv idea op pkcrack proxytunnel pure-sfv ssh-copy-id tthsum tthsum/files Message-ID: <201310231235.r9NCZ4Yh067496@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Wed Oct 23 12:35:04 2013 New Revision: 331381 URL: http://svnweb.freebsd.org/changeset/ports/331381 Log: Support staging. Modified: head/security/cksfv/Makefile head/security/idea/Makefile head/security/idea/pkg-plist head/security/op/Makefile head/security/op/pkg-plist head/security/pkcrack/Makefile head/security/proxytunnel/Makefile head/security/pure-sfv/Makefile head/security/ssh-copy-id/Makefile head/security/tthsum/Makefile head/security/tthsum/files/patch-Makefile Modified: head/security/cksfv/Makefile ============================================================================== --- head/security/cksfv/Makefile Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/cksfv/Makefile Wed Oct 23 12:35:04 2013 (r331381) @@ -15,26 +15,24 @@ LICENSE= GPLv2 HAS_CONFIGURE= yes CONFIGURE_ARGS= --mandir=${PREFIX}/man --prefix=${PREFIX} -MAN1= cksfv.1 -PLIST_FILES= bin/cksfv +PLIST_FILES= bin/cksfv man/man1/cksfv.1.gz PORTDOCS= README ChangeLog OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's|^\(CC\)=|\1?=|' ${WRKSRC}/src/Makefile.in do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/security/idea/Makefile ============================================================================== --- head/security/idea/Makefile Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/idea/Makefile Wed Oct 23 12:35:04 2013 (r331381) @@ -15,12 +15,8 @@ COMMENT= Command-line IDEA encryption an WRKSRC= ${WRKDIR}/${PORTNAME} -MANL= idea.l -MANCOMPRESSED= no - OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-build: @@ -28,14 +24,15 @@ do-build: -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_MAN} ${WRKSRC}/manl/idea.l ${PREFIX}/man/manl - ${INSTALL_PROGRAM} -m 0555 ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/Examples ${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC}/manl/idea.l ${STAGEDIR}${PREFIX}/man/manl + ${INSTALL_PROGRAM} -m 0555 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/Examples ${STAGEDIR}${EXAMPLESDIR} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/byte_ord.ps ${WRKSRC}/idea_cmd.txt ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/byte_ord.ps ${WRKSRC}/idea_cmd.txt \ + ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/security/idea/pkg-plist ============================================================================== --- head/security/idea/pkg-plist Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/idea/pkg-plist Wed Oct 23 12:35:04 2013 (r331381) @@ -1,4 +1,5 @@ bin/idea +man/manl/idea.l.gz %%PORTDOCS%%%%DOCSDIR%%/idea_cmd.txt %%PORTDOCS%%%%DOCSDIR%%/byte_ord.ps %%EXAMPLESDIR%%/Examples Modified: head/security/op/Makefile ============================================================================== --- head/security/op/Makefile Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/op/Makefile Wed Oct 23 12:35:04 2013 (r331381) @@ -12,16 +12,14 @@ COMMENT= Controlled privilege escalation GNU_CONFIGURE= yes -MAN1= op.1 - -NO_STAGE= yes post-install: - ${MKDIR} ${PREFIX}/etc/op.d + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/op.d ${INSTALL_DATA} -m 0600 ${WRKSRC}/${PORTNAME}.conf \ - ${PREFIX}/etc/${PORTNAME}.conf.sample + ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample -.if !exists(${PREFIX}/etc/${PORTNAME}.conf) - ${INSTALL_DATA} -m 0600 ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc +.if !exists(${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf) + ${INSTALL_DATA} -m 0600 ${WRKSRC}/${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc .endif .include <bsd.port.mk> Modified: head/security/op/pkg-plist ============================================================================== --- head/security/op/pkg-plist Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/op/pkg-plist Wed Oct 23 12:35:04 2013 (r331381) @@ -1,3 +1,5 @@ +@comment $FreeBSD$ +man/man1/op.1.gz @unexec if cmp -s %D/etc/op.conf %D/etc/op.conf.sample; then rm -f %D/etc/op.conf; fi etc/op.conf.sample @exec [ -f %B/op.conf ] || cp %B/%f %B/op.conf Modified: head/security/pkcrack/Makefile ============================================================================== --- head/security/pkcrack/Makefile Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/pkcrack/Makefile Wed Oct 23 12:35:04 2013 (r331381) @@ -18,22 +18,21 @@ PORTDOCS= README pkzip.ps.gz OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: .for f in pkcrack zipdecrypt - ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor # these file names are too generic .for f in extract findkey makekey - ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin/pk${f} + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin/pk${f} .endfor .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/security/proxytunnel/Makefile ============================================================================== --- head/security/proxytunnel/Makefile Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/proxytunnel/Makefile Wed Oct 23 12:35:04 2013 (r331381) @@ -14,12 +14,10 @@ USES= pkgconfig gmake ALL_TARGET= ${PORTNAME} -MAN1= proxytunnel.1 -PLIST_FILES= bin/proxytunnel +PLIST_FILES= bin/proxytunnel man/man1/proxytunnel.1.gz -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> Modified: head/security/pure-sfv/Makefile ============================================================================== --- head/security/pure-sfv/Makefile Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/pure-sfv/Makefile Wed Oct 23 12:35:04 2013 (r331381) @@ -21,7 +21,6 @@ PORTDOCS= ReadMe.txt OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -29,11 +28,11 @@ post-patch: ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/security/ssh-copy-id/Makefile ============================================================================== --- head/security/ssh-copy-id/Makefile Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/ssh-copy-id/Makefile Wed Oct 23 12:35:04 2013 (r331381) @@ -12,10 +12,8 @@ COMMENT= Small script which copies your NO_BUILD= yes -MAN1= ssh-copy-id.1 -PLIST_FILES= bin/ssh-copy-id +PLIST_FILES= bin/ssh-copy-id man/man1/ssh-copy-id.1.gz -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${OSVERSION} >= 1000024 @@ -28,7 +26,7 @@ pre-patch: .endfor do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/${MAN1} ${MANPREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.post.mk> Modified: head/security/tthsum/Makefile ============================================================================== --- head/security/tthsum/Makefile Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/tthsum/Makefile Wed Oct 23 12:35:04 2013 (r331381) @@ -15,15 +15,13 @@ LICENSE= GPLv3 CONFLICTS= microdc2-[0-9]* USES= gmake -MANCOMPRESSED= yes -MAN1= tthsum.1 -PLIST_FILES= bin/tthsum +PLIST_FILES= bin/tthsum man/man1/tthsum.1.gz +MAKE_ENV+= STAGEDIR=${STAGEDIR} WRKSRC= ${WRKDIR}/${PORTNAME} regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} test runtest -NO_STAGE= yes .include <bsd.port.mk> Modified: head/security/tthsum/files/patch-Makefile ============================================================================== --- head/security/tthsum/files/patch-Makefile Wed Oct 23 12:31:45 2013 (r331380) +++ head/security/tthsum/files/patch-Makefile Wed Oct 23 12:35:04 2013 (r331381) @@ -29,9 +29,9 @@ - install $(BINS)/tthsum $(BIN) - install -m644 $(SHARES)/tthsum.1.gz $(MAN)/man1 +install: tthsum manual -+ install -d $(BIN) $(MANPREFIX)/man/man1 -+ install $(BINS)/tthsum $(PREFIX)/bin -+ install -m644 $(SHARES)/tthsum.1.gz $(MANPREFIX)/man/man1 ++ install -d $(BIN) $(STAGEDIR)$(MANPREFIX)/man/man1 ++ install $(BINS)/tthsum $(STAGEDIR)$(PREFIX)/bin ++ install -m644 $(SHARES)/tthsum.1.gz $(STAGEDIR)$(MANPREFIX)/man/man1 uninstall: $(RM) $(BIN)/tthsum
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310231235.r9NCZ4Yh067496>