From 0daacf6e6a6c2c4f1e77ed1d57e1c55459b4e0d9 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 25 Oct 2002 09:51:51 +0000
Subject: buildlink1 -> buildlink2.

---
 security/isakmpd/Makefile         | 9 +++++----
 security/isakmpd/distinfo         | 4 ++--
 security/isakmpd/patches/patch-ae | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'security/isakmpd')

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
-- 
cgit v1.2.3