Date: Sun, 11 May 2014 18:37:52 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353723 - in head: net-mgmt/nagios-check_email_delivery net-mgmt/snmp4nagios security/openbsm-devel security/paperkey security/seccure security/seccure/files security/skipfish security/... Message-ID: <201405111837.s4BIbqK0020713@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Sun May 11 18:37:51 2014 New Revision: 353723 URL: http://svnweb.freebsd.org/changeset/ports/353723 QAT: https://qat.redports.org/buildarchive/r353723/ Log: - Add STAGE support - Bump PORTREVISION Modified: head/net-mgmt/nagios-check_email_delivery/Makefile head/net-mgmt/snmp4nagios/Makefile head/security/openbsm-devel/Makefile head/security/openbsm-devel/pkg-plist head/security/paperkey/Makefile head/security/seccure/Makefile head/security/seccure/files/patch-Makefile head/security/seccure/pkg-plist head/security/skipfish/Makefile head/security/skipfish/pkg-plist head/security/truecrypt/Makefile head/sysutils/msktutil/Makefile head/sysutils/userinfo/Makefile Modified: head/net-mgmt/nagios-check_email_delivery/Makefile ============================================================================== --- head/net-mgmt/nagios-check_email_delivery/Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/net-mgmt/nagios-check_email_delivery/Makefile Sun May 11 18:37:51 2014 (r353723) @@ -3,6 +3,7 @@ PORTNAME= check_email_delivery PORTVERSION= 0.7.1b +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://buhacoff.net/software/check_email_delivery/archive/ \ http://mirrors.rit.edu/zi/ @@ -28,25 +29,24 @@ DOC_FILES= check_email_delivery.html che PORTSCOUT= ignore:1 -NO_STAGE= yes .include <bsd.port.pre.mk> do-install: - @${MKDIR} ${PREFIX}/libexec/nagios - ${INSTALL_SCRIPT} ${WRKSRC}/check_email_delivery ${PREFIX}/libexec/nagios/ - ${INSTALL_SCRIPT} ${WRKSRC}/check_email_delivery_epn ${PREFIX}/libexec/nagios/ - ${INSTALL_SCRIPT} ${WRKSRC}/check_imap_quota ${PREFIX}/libexec/nagios/ - ${INSTALL_SCRIPT} ${WRKSRC}/check_imap_quota_epn ${PREFIX}/libexec/nagios/ - ${INSTALL_SCRIPT} ${WRKSRC}/check_imap_receive ${PREFIX}/libexec/nagios/ - ${INSTALL_SCRIPT} ${WRKSRC}/check_imap_receive_epn ${PREFIX}/libexec/nagios/ - ${INSTALL_SCRIPT} ${WRKSRC}/check_smtp_send ${PREFIX}/libexec/nagios/ - ${INSTALL_SCRIPT} ${WRKSRC}/check_smtp_send_epn ${PREFIX}/libexec/nagios/ - ${INSTALL_SCRIPT} ${WRKSRC}/imap_ssl_cert ${PREFIX}/libexec/nagios/ - ${INSTALL_SCRIPT} ${WRKSRC}/imap_ssl_cert_epn ${PREFIX}/libexec/nagios/ + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios + ${INSTALL_SCRIPT} ${WRKSRC}/check_email_delivery ${STAGEDIR}${PREFIX}/libexec/nagios/ + ${INSTALL_SCRIPT} ${WRKSRC}/check_email_delivery_epn ${STAGEDIR}${PREFIX}/libexec/nagios/ + ${INSTALL_SCRIPT} ${WRKSRC}/check_imap_quota ${STAGEDIR}${PREFIX}/libexec/nagios/ + ${INSTALL_SCRIPT} ${WRKSRC}/check_imap_quota_epn ${STAGEDIR}${PREFIX}/libexec/nagios/ + ${INSTALL_SCRIPT} ${WRKSRC}/check_imap_receive ${STAGEDIR}${PREFIX}/libexec/nagios/ + ${INSTALL_SCRIPT} ${WRKSRC}/check_imap_receive_epn ${STAGEDIR}${PREFIX}/libexec/nagios/ + ${INSTALL_SCRIPT} ${WRKSRC}/check_smtp_send ${STAGEDIR}${PREFIX}/libexec/nagios/ + ${INSTALL_SCRIPT} ${WRKSRC}/check_smtp_send_epn ${STAGEDIR}${PREFIX}/libexec/nagios/ + ${INSTALL_SCRIPT} ${WRKSRC}/imap_ssl_cert ${STAGEDIR}${PREFIX}/libexec/nagios/ + ${INSTALL_SCRIPT} ${WRKSRC}/imap_ssl_cert_epn ${STAGEDIR}${PREFIX}/libexec/nagios/ .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/docs/${file} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/net-mgmt/snmp4nagios/Makefile ============================================================================== --- head/net-mgmt/snmp4nagios/Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/net-mgmt/snmp4nagios/Makefile Sun May 11 18:37:51 2014 (r353723) @@ -3,7 +3,7 @@ PORTNAME= SNMP4Nagios PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION} @@ -21,7 +21,6 @@ NAGIOSDIR?= /var/spool/nagios OPTIONS_DEFINE= RRDTOOL RRDTOOL_DESC= Build with rrdtool support -NO_STAGE= yes .include <bsd.port.options.mk> CONFIGURE_ARGS= --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ Modified: head/security/openbsm-devel/Makefile ============================================================================== --- head/security/openbsm-devel/Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/security/openbsm-devel/Makefile Sun May 11 18:37:51 2014 (r353723) @@ -3,7 +3,7 @@ PORTNAME= openbsm DISTVERSION= 1.2-alpha3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.trustedbsd.org/downloads/ \ http://mirrors.rit.edu/zi/ @@ -29,17 +29,7 @@ USERS= auditdistd GROUPS= audit VARAUDIT= /var/audit -MAN1= auditreduce.1 praudit.1 -MAN2= audit.2 auditctl.2 auditon.2 getaudit.2 getauid.2 setaudit.2 \ - setauid.2 -MAN3= au_class.3 au_control.3 au_domain.3 au_errno.3 au_event.3 \ - au_fcntl_cmd.3 au_free_token.3 au_io.3 au_mask.3 au_open.3 \ - au_socket_type.3 au_token.3 au_user.3 libauditd.3 libbsm.3 -MAN5= audit.log.5 auditdistd.conf.5 audit_class.5 audit_control.5 \ - audit_event.5 audit_user.5 audit_warn.5 -MAN8= auditfilterd.8 audit.8 auditd.8 auditdistd.8 -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${OSVERSION} <= 800000 @@ -51,10 +41,9 @@ IGNORE= is not needed under FreeBSD 10. .endif post-install: - @${MKDIR} -m 0770 ${VARAUDIT}/dist - @${MKDIR} -m 0700 ${VARAUDIT}/remote - @${CHOWN} ${USERS}:${GROUPS} ${VARAUDIT}/dist - @${CHOWN} ${USERS}:wheel ${VARAUDIT}/remote - @${CAT} ${PKGMESSAGE} + @${MKDIR} -m 0770 ${STAGEDIR}${VARAUDIT}/dist + @${MKDIR} -m 0700 ${STAGEDIR}${VARAUDIT}/remote + @${CHOWN} ${USERS}:${GROUPS} ${STAGEDIR}${VARAUDIT}/dist + @${CHOWN} ${USERS}:wheel ${STAGEDIR}${VARAUDIT}/remote .include <bsd.port.post.mk> Modified: head/security/openbsm-devel/pkg-plist ============================================================================== --- head/security/openbsm-devel/pkg-plist Sun May 11 18:03:34 2014 (r353722) +++ head/security/openbsm-devel/pkg-plist Sun May 11 18:37:51 2014 (r353723) @@ -22,6 +22,41 @@ lib/libbsm.a lib/libbsm.la lib/libbsm.so lib/libbsm.so.0 +man/man1/auditreduce.1.gz +man/man1/praudit.1.gz +man/man2/audit.2.gz +man/man2/auditctl.2.gz +man/man2/auditon.2.gz +man/man2/getaudit.2.gz +man/man2/getauid.2.gz +man/man2/setaudit.2.gz +man/man2/setauid.2.gz +man/man3/au_class.3.gz +man/man3/au_control.3.gz +man/man3/au_domain.3.gz +man/man3/au_errno.3.gz +man/man3/au_event.3.gz +man/man3/au_fcntl_cmd.3.gz +man/man3/au_free_token.3.gz +man/man3/au_io.3.gz +man/man3/au_mask.3.gz +man/man3/au_open.3.gz +man/man3/au_socket_type.3.gz +man/man3/au_token.3.gz +man/man3/au_user.3.gz +man/man3/libauditd.3.gz +man/man3/libbsm.3.gz +man/man5/audit.log.5.gz +man/man5/audit_class.5.gz +man/man5/audit_control.5.gz +man/man5/audit_event.5.gz +man/man5/audit_user.5.gz +man/man5/audit_warn.5.gz +man/man5/auditdistd.conf.5.gz +man/man8/audit.8.gz +man/man8/auditd.8.gz +man/man8/auditdistd.8.gz +man/man8/auditfilterd.8.gz sbin/audit sbin/auditd sbin/auditdistd Modified: head/security/paperkey/Makefile ============================================================================== --- head/security/paperkey/Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/security/paperkey/Makefile Sun May 11 18:37:51 2014 (r353723) @@ -3,6 +3,7 @@ PORTNAME= paperkey PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.jabberwocky.com/software/paperkey/ \ http://mirrors.rit.edu/zi/ @@ -15,13 +16,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -PLIST_FILES= bin/paperkey -MAN1= paperkey.1 +PLIST_FILES= bin/paperkey man/man1/paperkey.1.gz PORTDOCS= NEWS README OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> # Setting ALL_TARGET to "all check" is racy and breaks parallel builds @@ -30,8 +29,8 @@ post-build: post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/security/seccure/Makefile ============================================================================== --- head/security/seccure/Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/security/seccure/Makefile Sun May 11 18:37:51 2014 (r353723) @@ -3,7 +3,7 @@ PORTNAME= seccure PORTVERSION= 0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://point-at-infinity.org/seccure/ \ ${MASTER_SITE_NETBSD} @@ -11,9 +11,8 @@ MASTER_SITES= http://point-at-infinity.o MAINTAINER= zi@FreeBSD.org COMMENT= Elliptic Curve Crypto Utility for Reliable Encryption -LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt -MAN1= seccure.1 +USE_GCC= any -NO_STAGE= yes .include <bsd.port.mk> Modified: head/security/seccure/files/patch-Makefile ============================================================================== --- head/security/seccure/files/patch-Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/security/seccure/files/patch-Makefile Sun May 11 18:37:51 2014 (r353723) @@ -21,15 +21,15 @@ - ln -f $(DESTDIR)/usr/bin/seccure-key $(DESTDIR)/usr/bin/seccure-veridec - ln -f $(DESTDIR)/usr/bin/seccure-key $(DESTDIR)/usr/bin/seccure-dh - install -m0644 seccure.1 $(DESTDIR)/usr/share/man/man1 -+ install -m0755 seccure-key $(PREFIX)/bin -+ ln -f $(PREFIX)/bin/seccure-key $(PREFIX)/bin/seccure-encrypt -+ ln -f $(PREFIX)/bin/seccure-key $(PREFIX)/bin/seccure-decrypt -+ ln -f $(PREFIX)/bin/seccure-key $(PREFIX)/bin/seccure-sign -+ ln -f $(PREFIX)/bin/seccure-key $(PREFIX)/bin/seccure-verify -+ ln -f $(PREFIX)/bin/seccure-key $(PREFIX)/bin/seccure-signcrypt -+ ln -f $(PREFIX)/bin/seccure-key $(PREFIX)/bin/seccure-veridec -+ ln -f $(PREFIX)/bin/seccure-key $(PREFIX)/bin/seccure-dh -+ install -m0644 seccure.1 $(PREFIX)/man/man1 ++ install -m0755 seccure-key $(DESTDIR)$(PREFIX)/bin ++ ln -f $(DESTDIR)$(PREFIX)/bin/seccure-key $(DESTDIR)$(PREFIX)/bin/seccure-encrypt ++ ln -f $(DESTDIR)$(PREFIX)/bin/seccure-key $(DESTDIR)$(PREFIX)/bin/seccure-decrypt ++ ln -f $(DESTDIR)$(PREFIX)/bin/seccure-key $(DESTDIR)$(PREFIX)/bin/seccure-sign ++ ln -f $(DESTDIR)$(PREFIX)/bin/seccure-key $(DESTDIR)$(PREFIX)/bin/seccure-verify ++ ln -f $(DESTDIR)$(PREFIX)/bin/seccure-key $(DESTDIR)$(PREFIX)/bin/seccure-signcrypt ++ ln -f $(DESTDIR)$(PREFIX)/bin/seccure-key $(DESTDIR)$(PREFIX)/bin/seccure-veridec ++ ln -f $(DESTDIR)$(PREFIX)/bin/seccure-key $(DESTDIR)$(PREFIX)/bin/seccure-dh ++ install -m0644 seccure.1 $(DESTDIR)$(PREFIX)/man/man1 clean: rm -f *.o *~ seccure-key seccure-encrypt seccure-decrypt seccure-sign \ Modified: head/security/seccure/pkg-plist ============================================================================== --- head/security/seccure/pkg-plist Sun May 11 18:03:34 2014 (r353722) +++ head/security/seccure/pkg-plist Sun May 11 18:37:51 2014 (r353723) @@ -6,3 +6,4 @@ bin/seccure-verify bin/seccure-signcrypt bin/seccure-veridec bin/seccure-dh +man/man1/seccure.1.gz Modified: head/security/skipfish/Makefile ============================================================================== --- head/security/skipfish/Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/security/skipfish/Makefile Sun May 11 18:37:51 2014 (r353723) @@ -1,8 +1,9 @@ -# Created by: rpsfa@rit.edu +# Created by: Ryan Steinmetz <rpsfa@rit.edu> # $FreeBSD$ PORTNAME= skipfish PORTVERSION= 2.10b +PORTREVISION= 1 CATEGORIES= security www MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} EXTRACT_SUFX= .tgz @@ -19,13 +20,10 @@ LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn USE_GMAKE= yes SUB_FILES= pkg-message -MAN1= skipfish.1 - .if !defined(NOPORTDOCS) PORTDOCS= README COPYING ChangeLog .endif -NO_STAGE= yes .include <bsd.port.pre.mk> post-patch: @@ -33,19 +31,16 @@ post-patch: -e 's:"assets":"${DATADIR}/assets":' ${WRKSRC}/src/config.h do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/skipfish ${PREFIX}/bin/skipfish - ${INSTALL_SCRIPT} ${WRKSRC}/tools/sfscandiff ${PREFIX}/bin/sfscandiff - ${INSTALL_MAN} ${WRKSRC}/doc/skipfish.1 ${PREFIX}/man/man1 - (cd ${WRKSRC}/assets/ && ${COPYTREE_SHARE} . ${DATADIR}/assets/) - (cd ${WRKSRC}/dictionaries/ && ${COPYTREE_SHARE} . ${DATADIR}/dictionaries/) + ${INSTALL_PROGRAM} ${WRKSRC}/skipfish ${STAGEDIR}${PREFIX}/bin/skipfish + ${INSTALL_SCRIPT} ${WRKSRC}/tools/sfscandiff ${STAGEDIR}${PREFIX}/bin/sfscandiff + ${INSTALL_MAN} ${WRKSRC}/doc/skipfish.1 ${STAGEDIR}${PREFIX}/man/man1 + (cd ${WRKSRC}/assets/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/assets/) + (cd ${WRKSRC}/dictionaries/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/dictionaries/) .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} . for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} . endfor .endif -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.post.mk> Modified: head/security/skipfish/pkg-plist ============================================================================== --- head/security/skipfish/pkg-plist Sun May 11 18:03:34 2014 (r353722) +++ head/security/skipfish/pkg-plist Sun May 11 18:37:51 2014 (r353723) @@ -28,6 +28,7 @@ bin/sfscandiff %%DATADIR%%/dictionaries/medium.wl %%DATADIR%%/dictionaries/extensions-only.wl %%DATADIR%%/dictionaries/minimal.wl +man/man1/skipfish.1.gz @dirrm %%DATADIR%%/dictionaries @dirrm %%DATADIR%%/assets @dirrm %%DATADIR%% Modified: head/security/truecrypt/Makefile ============================================================================== --- head/security/truecrypt/Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/security/truecrypt/Makefile Sun May 11 18:37:51 2014 (r353723) @@ -3,7 +3,7 @@ PORTNAME= truecrypt PORTVERSION= 7.1a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/wxwindows/${WX_VER}/:wxwidgets \ ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/:rsa \ @@ -28,7 +28,6 @@ USE_GMAKE= yes RESTRICTED= May not be redistributed. Must accept license to download. NO_CDROM= May not be redistributed. Must accept license to download. NO_PACKAGE= May not be redistributed. Must accept license to download. -NO_STAGE= yes TC_SRCFILE= TrueCrypt_${PORTVERSION}_Source.tar.gz WX_VER= 2.8.12 @@ -86,14 +85,11 @@ do-build: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${NOGUI} WXSTATIC=1 PKCS11_INC=${WRKDIR}/rsa) do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/Main/truecrypt ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/Main/truecrypt ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/License.txt ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/Release/Setup\ Files/TrueCrypt\ User\ Guide.pdf ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/License.txt ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/Release/Setup\ Files/TrueCrypt\ User\ Guide.pdf ${STAGEDIR}${DOCSDIR} .endif -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.mk> Modified: head/sysutils/msktutil/Makefile ============================================================================== --- head/sysutils/msktutil/Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/sysutils/msktutil/Makefile Sun May 11 18:37:51 2014 (r353723) @@ -3,6 +3,7 @@ PORTNAME= msktutil PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ http://mirrors.rit.edu/zi/ @@ -16,20 +17,14 @@ USE_OPENLDAP= yes GNU_CONFIGURE= yes WANT_OPENLDAP_SASL= yes -CONFIGURE_ARGS+=--with-sasldir=${PREFIX} +CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} -MAN1= msktutil.1 -PLIST_FILES= sbin/msktutil +PLIST_FILES= man/man1/msktutil.1.gz sbin/msktutil -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${OSVERSION} < 900035 LDFLAGS+= -lgssapi_krb5 .endif -.if ${OSVERSION} < 800000 -BROKEN= does not build on FreeBSD 7.x -.endif - .include <bsd.port.post.mk> Modified: head/sysutils/userinfo/Makefile ============================================================================== --- head/sysutils/userinfo/Makefile Sun May 11 18:03:34 2014 (r353722) +++ head/sysutils/userinfo/Makefile Sun May 11 18:37:51 2014 (r353723) @@ -3,6 +3,7 @@ PORTNAME= userinfo PORTVERSION= 2.4 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} @@ -19,5 +20,4 @@ GNU_CONFIGURE= yes MAN1= ui.1 MLINKS= ui.1 userinfo.1 -NO_STAGE= yes .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405111837.s4BIbqK0020713>