diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/gnupg/options.mk | 3 | ||||
| -rw-r--r-- | security/gnupg2/Makefile | 4 | ||||
| -rw-r--r-- | security/gnutls/Makefile | 4 | ||||
| -rw-r--r-- | security/gsasl/Makefile | 4 | ||||
| -rw-r--r-- | security/heimdal/Makefile | 8 | ||||
| -rw-r--r-- | security/honeyd/Makefile | 4 | ||||
| -rw-r--r-- | security/kth-krb4/Makefile | 8 | ||||
| -rw-r--r-- | security/opensc/Makefile | 4 | ||||
| -rw-r--r-- | security/pwsafe/options.mk | 6 |
9 files changed, 20 insertions, 25 deletions
diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk index 39cb1bb7526..49bb4211172 100644 --- a/security/gnupg/options.mk +++ b/security/gnupg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2013/01/07 12:26:56 wiz Exp $ +# $NetBSD: options.mk,v 1.17 2013/07/15 02:02:27 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg PKG_SUPPORTED_OPTIONS= curl ldap readline @@ -42,7 +42,6 @@ CFLAGS+= -m68060 .endif .if !empty(PKG_OPTIONS:Mreadline) -USE_GNU_READLINE= yes .include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} .else diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index d4d31d0654d..eeb18e63ea7 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2013/05/29 22:53:36 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2013/07/15 02:02:27 ryoon Exp $ DISTNAME= gnupg-2.0.20 PKGNAME= ${DISTNAME:S/gnupg/gnupg2/} @@ -41,7 +41,7 @@ BUILDLINK_API_DEPENDS.libksba+= libksba>=1.0.2 .include "../../databases/openldap-client/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pth/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/libassuan2/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 7bff2e2a43d..55cbf7626c9 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.128 2013/07/09 11:11:11 wiz Exp $ +# $NetBSD: Makefile,v 1.129 2013/07/15 02:02:28 ryoon Exp $ DISTNAME= gnutls-3.2.1 CATEGORIES= security devel @@ -46,7 +46,7 @@ post-install: .include "../../archivers/lzo/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libcfg+/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile index e46027f7c94..bd89a6399a2 100644 --- a/security/gsasl/Makefile +++ b/security/gsasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/02/06 23:23:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.38 2013/07/15 02:02:28 ryoon Exp $ DISTNAME= gsasl-1.8.0 PKGREVISION= 2 @@ -28,7 +28,7 @@ TEST_TARGET= check .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" .include "../../devel/libntlm/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 685bf134c96..9486c2f154c 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2013/05/09 07:39:19 adam Exp $ +# $NetBSD: Makefile,v 1.99 2013/07/15 02:02:28 ryoon Exp $ DISTNAME= heimdal-1.5.2 PKGREVISION= 8 @@ -51,8 +51,8 @@ CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no # Heimdal's configure script expects to find the readline.h header as # <readline.h>. -CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline} +CPPFLAGS+= -I${BUILDLINK_PREFIX.editlinereadline}/include/readline PLIST_VARS+= afskauth hcrypto .if ${OPSYS} == "IRIX" @@ -91,7 +91,7 @@ pre-build: ${TOUCH} ${WRKSRC}/po/localefiles .include "../../databases/sqlite3/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" .include "../../mk/curses.buildlink3.mk" diff --git a/security/honeyd/Makefile b/security/honeyd/Makefile index 140819e2b3b..4e640d77ba2 100644 --- a/security/honeyd/Makefile +++ b/security/honeyd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2013/06/06 12:55:01 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2013/07/15 02:02:28 ryoon Exp $ # DISTNAME= honeyd-1.5b @@ -35,7 +35,7 @@ BUILDLINK_API_DEPENDS.libevent+= libevent>=1.0 .include "../../devel/libevent/buildlink3.mk" .include "../../devel/libdnsres/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../net/libdnet/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index 6ac056ec3e0..fe70bb9f4e4 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2013/02/06 23:23:39 jperkin Exp $ +# $NetBSD: Makefile,v 1.60 2013/07/15 02:02:28 ryoon Exp $ # DISTNAME= krb4-1.2.2 @@ -59,12 +59,12 @@ PLIST.glob= yes .if ${OPSYS} == "NetBSD" CONFIGURE_ARGS+= --with-readline=yes \ - --with-readline-lib=${BUILDLINK_PREFIX.readline}/lib \ - --with-readline-include=${BUILDLINK_PREFIX.readline}/include/readline \ + --with-readline-lib=${BUILDLINK_PREFIX.editlinereadline}/lib \ + --with-readline-include=${BUILDLINK_PREFIX.editlinereadline}/include/readline \ ac_cv_funclib_bswap16=yes \ ac_cv_funclib_bswap32=yes -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .endif PLIST_VARS+= glob wantdes diff --git a/security/opensc/Makefile b/security/opensc/Makefile index 65bd9fe8a29..bd640f58e80 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/02/06 23:23:40 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:28 ryoon Exp $ OPENSC_PKG_VERSION= 0.12.2 DISTNAME= opensc-${OPENSC_PKG_VERSION} @@ -44,7 +44,7 @@ post-install: .include "../../textproc/docbook-xsl/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 .include "../../security/openssl/buildlink3.mk" diff --git a/security/pwsafe/options.mk b/security/pwsafe/options.mk index 6dd300112b8..210c76212ee 100644 --- a/security/pwsafe/options.mk +++ b/security/pwsafe/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/01/30 20:53:24 joerg Exp $ +# $NetBSD: options.mk,v 1.3 2013/07/15 02:02:28 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pwsafe PKG_SUPPORTED_OPTIONS= readline x11 @@ -7,10 +7,6 @@ PKG_SUPPORTED_OPTIONS= readline x11 .if !empty(PKG_OPTIONS:Mreadline) CONFIGURE_ARGS+= --with-readline -. if ${OPSYS} == "NetBSD" -# The NetBSD readline implementation isn't GNU compatible -USE_GNU_READLINE= yes -. endif . include "../../devel/readline/buildlink3.mk" . include "../../devel/ncurses/buildlink3.mk" .else |