diff options
| -rw-r--r-- | net/rdesktop10/Makefile | 8 | ||||
| -rw-r--r-- | security/isakmpd/Makefile | 9 | ||||
| -rw-r--r-- | security/isakmpd/distinfo | 4 | ||||
| -rw-r--r-- | security/isakmpd/patches/patch-ae | 8 | ||||
| -rw-r--r-- | security/nessus-libraries/Makefile | 11 |
5 files changed, 22 insertions, 18 deletions
diff --git a/net/rdesktop10/Makefile b/net/rdesktop10/Makefile index d4365ae4d96..4dfaf6d6205 100644 --- a/net/rdesktop10/Makefile +++ b/net/rdesktop10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/08/23 03:12:25 grant Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/25 10:12:37 wiz Exp $ # DISTNAME= rdesktop-1.0.0-pl19-8-0 @@ -11,7 +11,9 @@ MAINTAINER= grant@netbsd.org HOMEPAGE= http://www.rdesktop.org/ COMMENT= Open-source Remote Desktop Protocol client +USE_BUILDLINK2= yes USE_GMAKE= yes +USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${LOCALBASE} CONFIGURE_ARGS+= --with-openssl @@ -19,7 +21,5 @@ CONFIGURE_ARGS+= --with-openssl CFLAGS+= -Icrypto LDFLAGS+= -lcrypto -USE_X11= yes - -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile index 1bec2bbd4f1..9fcdb3f08f8 100644 --- a/security/isakmpd/Makefile +++ b/security/isakmpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/08/30 07:40:00 martti Exp $ +# $NetBSD: Makefile,v 1.22 2002/10/25 10:00:57 wiz Exp $ # DISTNAME= isakmpd-20020830 @@ -14,6 +14,7 @@ IGNORE+= "${PKGNAME} requires ipsec-ready NetBSD" .endif ALL_TARGET= depend all +USE_BUILDLINK2= YES WRKSRC= ${WRKDIR}/isakmpd @@ -21,9 +22,9 @@ MAKE_ENV+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man post-patch: @${ECHO_MSG} "Fixing references to buildlink directories" - @for i in `${FIND} ${WRKSRC} -name '*Makefile*'`; do \ + @for i in ${WRKSRC}/sysdep/netbsd/Makefile.sysdep; do \ ${MV} $${i} $${i}.orig; \ - ${SED} "s+@BUILDLINK_DIR@+${BUILDLINK_DIR}+g" \ + ${SED} "s+@BUILDLINK_PREFIX.openssl@+${BUILDLINK_PREFIX.openssl}+g" \ < $${i}.orig > $${i}; \ done @${ECHO_MSG} "Fixing manual page references" @@ -39,6 +40,6 @@ pre-install: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/isakmpd.sh ${PREFIX}/etc/rc.d/isakmpd -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo index a2726cec466..adfb6f2b712 100644 --- a/security/isakmpd/distinfo +++ b/security/isakmpd/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.9 2002/08/30 07:40:01 martti Exp $ +$NetBSD: distinfo,v 1.10 2002/10/25 10:00:58 wiz Exp $ SHA1 (isakmpd-20020830.tar.gz) = 831c047e46c1a47d260279fd94a874481a50359e Size (isakmpd-20020830.tar.gz) = 346452 bytes SHA1 (patch-aa) = 22903f2d4ba4f92f716920a121d861550bd8bc51 SHA1 (patch-ab) = f30c790f42d72866e95092848e102e4c3728365c SHA1 (patch-ad) = 8c477b99fd3d82ccb52b01374450295cc25244c0 -SHA1 (patch-ae) = 06b210382eb731561a09a676e8c57f2c3cdd9a25 +SHA1 (patch-ae) = 5b7488fb50f2b3970c05e7dcfcf9979a05cb5719 diff --git a/security/isakmpd/patches/patch-ae b/security/isakmpd/patches/patch-ae index 7108b58f476..391e331a2bc 100644 --- a/security/isakmpd/patches/patch-ae +++ b/security/isakmpd/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.2 2001/10/22 05:51:25 martti Exp $ +$NetBSD: patch-ae,v 1.3 2002/10/25 10:00:59 wiz Exp $ --- sysdep/netbsd/Makefile.sysdep.orig Mon Aug 13 14:33:35 2001 +++ sysdep/netbsd/Makefile.sysdep Sat Oct 20 15:46:49 2001 @@ -22,8 +22,8 @@ $NetBSD: patch-ae,v 1.2 2001/10/22 05:51:25 martti Exp $ # mandatory for gmp -CFLAGS+= -I/usr/pkg/include -LDADD+= -L/usr/pkg/lib -+CFLAGS+= -I@BUILDLINK_DIR@/include -I@BUILDLINK_DIR@/include/openssl -+LDADD+= -L@BUILDLINK_DIR@/lib ++CFLAGS+= -I@BUILDLINK_PREFIX.openssl@/include -I@BUILDLINK_PREFIX.openssl@/include/openssl ++LDADD+= -L@BUILDLINK_PREFIX.openssl@/lib IPSEC_SRCS= pf_key_v2.c IPSEC_CFLAGS= -DUSE_PF_KEY_V2 @@ -42,4 +42,4 @@ $NetBSD: patch-ae,v 1.2 2001/10/22 05:51:25 martti Exp $ -.elif exists(/usr/include/openssl/rsa.h) - ln -sf /usr/include/openssl ssl -.endif -+ ln -sf @BUILDLINK_DIR@/include/openssl ssl ++ ln -sf @BUILDLINK_PREFIX.openssl@/include/openssl ssl diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile index cd50ceb781f..f0949ff0bc9 100644 --- a/security/nessus-libraries/Makefile +++ b/security/nessus-libraries/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/10/13 09:11:53 frueauf Exp $ +# $NetBSD: Makefile,v 1.8 2002/10/25 09:51:51 wiz Exp $ # DISTNAME= nessus-libraries-${VERS} @@ -6,16 +6,19 @@ DISTNAME= nessus-libraries-${VERS} COMMENT= Libs required by the Nessus Network security scanner +USE_BUILDLINK2= yes USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -DEPENDS+= bison-*:../../devel/bison +DEPENDS+= bison-[0-9]*:../../devel/bison WRKSRC= ${WRKDIR}/nessus-libraries GNU_CONFIGURE= yes CONFIGURE_ENV+= CPP=${CPP} -CONFIGURE_ARGS+=--enable-zlib=/usr/lib \ +CONFIGURE_ARGS+=--enable-zlib=${BUILDLINK_PREFIX.zlib}/lib \ --localstatedir=/var -.include "../../security/openssl/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |