svn commit: r329582 - head/security/gnupg
Antoine Brodin
antoine at FreeBSD.org
Sun Oct 6 15:04:10 UTC 2013
Author: antoine
Date: Sun Oct 6 15:04:10 2013
New Revision: 329582
URL: http://svnweb.freebsd.org/changeset/ports/329582
Log:
Fix staging:
- add man pages to the plist
- remove pkg-install and pkg-message from post-install
(the gpg symlink creation was violating stage)
- re-add INFO to Makefile
- use @mode instead of chmod to allow packaging setuid as user
While here, USE_GMAKE->USES=gmake, use OPTIONS_SUB instead of PLIST_SUB
and use %%PORTDOCS%% for help files as they do not exist with --disable-doc
Approved by: Jun Kuriyama (maintainer)
Modified:
head/security/gnupg/Makefile
head/security/gnupg/pkg-plist
Modified: head/security/gnupg/Makefile
==============================================================================
--- head/security/gnupg/Makefile Sun Oct 6 15:01:51 2013 (r329581)
+++ head/security/gnupg/Makefile Sun Oct 6 15:04:10 2013 (r329582)
@@ -23,9 +23,8 @@ LIB_DEPENDS= assuan:${PORTSDIR}/security
pth:${PORTSDIR}/devel/pth
USE_BZIP2= YES
-USE_GMAKE= YES
GNU_CONFIGURE= YES
-USES= iconv
+USES= gmake iconv
USE_LDCONFIG= YES
CONFIGURE_ARGS+= --enable-symcryptrun
@@ -40,11 +39,14 @@ STD_SOCKET_DESC= Use standard socket for
SUID_GPG_DESC= Install GPG with suid
OPTIONS_DEFAULT= CURL
NO_OPTIONS_SORT= YES
+OPTIONS_SUB= YES
.include <bsd.port.options.mk>
.if ! ${PORT_OPTIONS:MDOCS}
CONFIGURE_ARGS+= --disable-doc
+.else
+INFO= gnupg
.endif
.if ${PORT_OPTIONS:MPINENTRY}
@@ -54,27 +56,21 @@ RUN_DEPENDS+= pinentry>0:${PORTSDIR}/sec
.if ${PORT_OPTIONS:MGPGSM}
RUN_DEPENDS+= dirmngr:${PORTSDIR}/security/dirmngr
PORT_OPTIONS+= LDAP
-PLIST_SUB+= GPGSM=""
.else
CONFIGURE_ARGS+=--disable-gpgsm
-PLIST_SUB+= GPGSM="@comment "
.endif
.if ${PORT_OPTIONS:MLDAP}
USE_OPENLDAP= YES
CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-PLIST_SUB+= LDAP=""
.else
CONFIGURE_ARGS+=--disable-ldap
-PLIST_SUB+= LDAP="@comment "
.endif
.if ${PORT_OPTIONS:MKDNS}
LIB_DEPENDS+= adns:${PORTSDIR}/dns/adns
-PLIST_SUB+= ADNS=""
.else
CONFIGURE_SUB= -e '/GPGKEYS_KDNS=/s/".*"/""/'
-PLIST_SUB+= ADNS="@comment "
.endif
.if ${PORT_OPTIONS:MSTD_SOCKET}
@@ -84,18 +80,14 @@ CONFIGURE_ARGS+=--enable-standard-socket
.if ${PORT_OPTIONS:MNLS}
USES+= gettext
CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
.endif
.if ${PORT_OPTIONS:MSCDAEMON}
CONFIGURE_ARGS+=--enable-scdaemon
-PLIST_SUB+= SCDAEMON=""
.else
CONFIGURE_ARGS+=--disable-scdaemon
-PLIST_SUB+= SCDAEMON="@comment "
.endif
.if ${PORT_OPTIONS:MCURL}
@@ -114,11 +106,4 @@ post-patch:
@${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
${WRKSRC}/tools/symcryptrun.c
-post-install:
- PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if ${PORT_OPTIONS:MSUID_GPG}
- ${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/gpg2
-.endif
- @${CAT} ${PKGMESSAGE}
-
.include <bsd.port.mk>
Modified: head/security/gnupg/pkg-plist
==============================================================================
--- head/security/gnupg/pkg-plist Sun Oct 6 15:01:51 2013 (r329581)
+++ head/security/gnupg/pkg-plist Sun Oct 6 15:04:10 2013 (r329582)
@@ -1,6 +1,8 @@
bin/gpg-agent
bin/gpg-connect-agent
+%%SUID_GPG%%@mode 4555
bin/gpg2
+%%SUID_GPG%%@mode
bin/gpgconf
bin/gpgkey2ssh
bin/gpgparsemail
@@ -8,11 +10,10 @@ bin/gpgparsemail
bin/gpgsm-gencert.sh
bin/gpgv2
%%GPGSM%%bin/kbxutil
-%%SCDAEMON%%bin/scdaemon
bin/symcryptrun
bin/watchgnupg
libexec/gpg-check-pattern
-%%ADNS%%libexec/gpg2keys_kdns
+%%KDNS%%libexec/gpg2keys_kdns
%%SCDAEMON%%libexec/gnupg-pcsc-wrapper
libexec/gpg-preset-passphrase
libexec/gpg-protect-tool
@@ -20,6 +21,21 @@ libexec/gpg2keys_curl
libexec/gpg2keys_finger
libexec/gpg2keys_hkp
%%LDAP%%libexec/gpg2keys_ldap
+%%SCDAEMON%%libexec/scdaemon
+%%PORTDOCS%%man/man1/gpg-agent.1.gz
+%%PORTDOCS%%man/man1/gpg-connect-agent.1.gz
+%%PORTDOCS%%man/man1/gpg-preset-passphrase.1.gz
+%%PORTDOCS%%man/man1/gpg2.1.gz
+%%PORTDOCS%%man/man1/gpgconf.1.gz
+%%PORTDOCS%%man/man1/gpgparsemail.1.gz
+%%PORTDOCS%%man/man1/gpgsm-gencert.sh.1.gz
+%%PORTDOCS%%man/man1/gpgsm.1.gz
+%%PORTDOCS%%man/man1/gpgv2.1.gz
+%%PORTDOCS%%man/man1/scdaemon.1.gz
+%%PORTDOCS%%man/man1/symcryptrun.1.gz
+%%PORTDOCS%%man/man1/watchgnupg.1.gz
+%%PORTDOCS%%man/man8/addgnupghome.8.gz
+%%PORTDOCS%%man/man8/applygnupgdefaults.8.gz
sbin/addgnupghome
sbin/applygnupgdefaults
%%PORTDOCS%%%%DOCSDIR%%/DETAILS
@@ -34,37 +50,37 @@ sbin/applygnupgdefaults
%%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list
%%PORTDOCS%%%%DOCSDIR%%/examples/scd-event
%%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
-%%PORTDATA%%%%DATADIR%%/com-certs.pem
+%%PORTDOCS%%%%DATADIR%%/com-certs.pem
%%DATADIR%%/gpg-conf.skel
-%%PORTDATA%%%%DATADIR%%/help.be.txt
-%%PORTDATA%%%%DATADIR%%/help.ca.txt
-%%PORTDATA%%%%DATADIR%%/help.cs.txt
-%%PORTDATA%%%%DATADIR%%/help.da.txt
-%%PORTDATA%%%%DATADIR%%/help.de.txt
-%%PORTDATA%%%%DATADIR%%/help.el.txt
-%%PORTDATA%%%%DATADIR%%/help.eo.txt
-%%PORTDATA%%%%DATADIR%%/help.es.txt
-%%PORTDATA%%%%DATADIR%%/help.et.txt
-%%PORTDATA%%%%DATADIR%%/help.fi.txt
-%%PORTDATA%%%%DATADIR%%/help.fr.txt
-%%PORTDATA%%%%DATADIR%%/help.gl.txt
-%%PORTDATA%%%%DATADIR%%/help.hu.txt
-%%PORTDATA%%%%DATADIR%%/help.id.txt
-%%PORTDATA%%%%DATADIR%%/help.it.txt
-%%PORTDATA%%%%DATADIR%%/help.ja.txt
-%%PORTDATA%%%%DATADIR%%/help.nb.txt
-%%PORTDATA%%%%DATADIR%%/help.pl.txt
-%%PORTDATA%%%%DATADIR%%/help.pt.txt
-%%PORTDATA%%%%DATADIR%%/help.pt_BR.txt
-%%PORTDATA%%%%DATADIR%%/help.ro.txt
-%%PORTDATA%%%%DATADIR%%/help.ru.txt
-%%PORTDATA%%%%DATADIR%%/help.sk.txt
-%%PORTDATA%%%%DATADIR%%/help.sv.txt
-%%PORTDATA%%%%DATADIR%%/help.tr.txt
-%%PORTDATA%%%%DATADIR%%/help.txt
-%%PORTDATA%%%%DATADIR%%/help.zh_CN.txt
-%%PORTDATA%%%%DATADIR%%/help.zh_TW.txt
-%%PORTDATA%%%%DATADIR%%/qualified.txt
+%%PORTDOCS%%%%DATADIR%%/help.be.txt
+%%PORTDOCS%%%%DATADIR%%/help.ca.txt
+%%PORTDOCS%%%%DATADIR%%/help.cs.txt
+%%PORTDOCS%%%%DATADIR%%/help.da.txt
+%%PORTDOCS%%%%DATADIR%%/help.de.txt
+%%PORTDOCS%%%%DATADIR%%/help.el.txt
+%%PORTDOCS%%%%DATADIR%%/help.eo.txt
+%%PORTDOCS%%%%DATADIR%%/help.es.txt
+%%PORTDOCS%%%%DATADIR%%/help.et.txt
+%%PORTDOCS%%%%DATADIR%%/help.fi.txt
+%%PORTDOCS%%%%DATADIR%%/help.fr.txt
+%%PORTDOCS%%%%DATADIR%%/help.gl.txt
+%%PORTDOCS%%%%DATADIR%%/help.hu.txt
+%%PORTDOCS%%%%DATADIR%%/help.id.txt
+%%PORTDOCS%%%%DATADIR%%/help.it.txt
+%%PORTDOCS%%%%DATADIR%%/help.ja.txt
+%%PORTDOCS%%%%DATADIR%%/help.nb.txt
+%%PORTDOCS%%%%DATADIR%%/help.pl.txt
+%%PORTDOCS%%%%DATADIR%%/help.pt.txt
+%%PORTDOCS%%%%DATADIR%%/help.pt_BR.txt
+%%PORTDOCS%%%%DATADIR%%/help.ro.txt
+%%PORTDOCS%%%%DATADIR%%/help.ru.txt
+%%PORTDOCS%%%%DATADIR%%/help.sk.txt
+%%PORTDOCS%%%%DATADIR%%/help.sv.txt
+%%PORTDOCS%%%%DATADIR%%/help.tr.txt
+%%PORTDOCS%%%%DATADIR%%/help.txt
+%%PORTDOCS%%%%DATADIR%%/help.zh_CN.txt
+%%PORTDOCS%%%%DATADIR%%/help.zh_TW.txt
+%%PORTDOCS%%%%DATADIR%%/qualified.txt
%%NLS%%share/locale/be/LC_MESSAGES/gnupg2.mo
%%NLS%%share/locale/ca/LC_MESSAGES/gnupg2.mo
%%NLS%%share/locale/cs/LC_MESSAGES/gnupg2.mo
More information about the svn-ports-head
mailing list