diff options
| author | rene <rene@FreeBSD.org> | 2013-04-30 00:43:05 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2013-04-30 00:43:05 +0800 |
| commit | 4474a0cc08c5d35a6a333ccf61e822717d7440fa (patch) | |
| tree | a101ccfbdb487a4c9c92a67d6d88ac8775e3362a /security | |
| parent | 6d3249226ec6077a65ecc9129a6a4a11b61b2d09 (diff) | |
| download | freebsd-ports-gnome-4474a0cc08c5d35a6a333ccf61e822717d7440fa.tar.gz freebsd-ports-gnome-4474a0cc08c5d35a6a333ccf61e822717d7440fa.tar.zst freebsd-ports-gnome-4474a0cc08c5d35a6a333ccf61e822717d7440fa.zip | |
In preparation of removing devel/libusb (expires 2013-04-30), remove it
from these ports.
Other changes:
- convert Makefile header
- convert to optionsNG
- remove indefinite article from comment
- drop support for FreeBSD < 8.0
- pet portlint (leave library ABI versions in LIB_DEPENDS)
- net-mgmt/spectools: change option name from GTK to GTK2 to use default
description from bsd.options.desc.mk
Approved by: portmgr (bapt)
Diffstat (limited to 'security')
| -rw-r--r-- | security/bsp_upektfmess/Makefile | 3 | ||||
| -rw-r--r-- | security/gnupg/Makefile | 22 | ||||
| -rw-r--r-- | security/ykpers/Makefile | 8 |
3 files changed, 12 insertions, 21 deletions
diff --git a/security/bsp_upektfmess/Makefile b/security/bsp_upektfmess/Makefile index f168d6ea34e5..5a84dd9544e8 100644 --- a/security/bsp_upektfmess/Makefile +++ b/security/bsp_upektfmess/Makefile @@ -12,8 +12,7 @@ DISTNAME= TFMESS_BSP_FreeBSD_1.1 MAINTAINER= ports@FreeBSD.org COMMENT= UPEK TouchChip TFM/ESS Fingerprint BSP -LIB_DEPENDS= bioapi100.0:${PORTSDIR}/security/bioapi \ - usb-0.1.8:${PORTSDIR}/devel/libusb +LIB_DEPENDS= bioapi100.0:${PORTSDIR}/security/bioapi RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext PLIST_FILES= lib/libtfmessbsp.so diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 14144f613bb9..b156fdc713b1 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -29,15 +29,6 @@ GNU_CONFIGURE= YES USES= iconv USE_LDCONFIG= YES CONFIGURE_ARGS+= --enable-symcryptrun -.if defined(NOPORTDOCS) -CONFIGURE_ARGS+= --disable-doc -.else -MAN1= gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \ - gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \ - gpgparsemail.1 symcryptrun.1 gpgsm-gencert.sh.1 -MAN8= addgnupghome.8 applygnupgdefaults.8 -INFO= gnupg -.endif OPTIONS_DEFINE= PINENTRY LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS PINENTRY_DESC= Use pinentry @@ -52,6 +43,16 @@ NO_OPTIONS_SORT= YES .include <bsd.port.options.mk> +.if ! ${PORT_OPTIONS:MDOCS} +CONFIGURE_ARGS+= --disable-doc +.else +MAN1= gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \ + gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \ + gpgparsemail.1 symcryptrun.1 gpgsm-gencert.sh.1 +MAN8= addgnupghome.8 applygnupgdefaults.8 +INFO= gnupg +.endif + .if ${PORT_OPTIONS:MPINENTRY} RUN_DEPENDS+= pinentry>0:${PORTSDIR}/security/pinentry .endif @@ -97,9 +98,6 @@ PLIST_SUB+= NLS="@comment " .if ${PORT_OPTIONS:MSCDAEMON} CONFIGURE_ARGS+=--enable-scdaemon -. if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb -. endif PLIST_SUB+= SCDAEMON="" .else CONFIGURE_ARGS+=--disable-scdaemon diff --git a/security/ykpers/Makefile b/security/ykpers/Makefile index 3592bac2ac11..a65dea5a4fd8 100644 --- a/security/ykpers/Makefile +++ b/security/ykpers/Makefile @@ -39,13 +39,7 @@ PROJECTHOST= yubikey-personalization MAKE_JOBS_UNSAFE=yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 800069 LDFLAGS+= -L/usr/lib -.else -LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb -.endif post-patch: @${REINPLACE_CMD} -e 's|^pkgconfigdir = .*|pkgconfigdir = /usr/local/libdata/pkgconfig|g' \ @@ -54,4 +48,4 @@ post-patch: regression-test: build @(cd ${WRKSRC}; ${MAKE} check) -.include <bsd.port.post.mk> +.include <bsd.port.mk> |