buildlink1 -> buildlink2

3 files changed, 21 insertions, 17 deletions

diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 5dcc5fede8c..28e306b38b4 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/08/25 19:23:15 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/24 00:17:51 jlam Exp $
 #
 
 DISTNAME=		krb4-1.1.1
@@ -19,14 +19,17 @@ CONFLICTS+=		zephyr-[0-9]*
 CONFLICTS+=		libdes-[0-9]*
 
 CRYPTO=			yes
-GNU_CONFIGURE=		yes
 
+USE_BUILDLINK2=		yes
+USE_X11=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--includedir=${PREFIX}/include/kerberosIV
 
-.include "../../mk/x11.buildlink.mk"
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+EXAMPLEDIR=		${PREFIX}/share/examples/kth-krb4
+
 # this hangs while compiling one of the files, at least with the
 # toolchain as of 1.5ZC (20020329)
 .if ${MACHINE_ARCH} == "sparc64"
@@ -34,10 +37,11 @@ BROKEN=			toolchain problems on sparc64 (1.5ZC, 20020329)
 .endif
 
 post-patch:
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
-		<${WRKSRC}/lib/kafs/kafs.h                                    \
-		>${WRKSRC}/lib/kafs/kafs.h.sed
-	@${MV} ${WRKSRC}/lib/kafs/kafs.h.sed ${WRKSRC}/lib/kafs/kafs.h
+	@for file in ${WRKSRC}/lib/kafs/kafs.h; do			\
+		${SED}	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'	\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
 
 # enable this once our autoconf has been upgraded to autoconf>=2.52:
 #pre-configure:
@@ -48,12 +52,12 @@ post-patch:
 #	${LOCALBASE}/bin/autoconf
 
 post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${WRKSRC}/etc/krb.realms ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${WRKSRC}/etc/inetd.conf.changes ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${FILESDIR}/services-1.4.2.diff ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${PREFIX}/share/examples/kth-krb4
+	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/krb.realms ${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/inetd.conf.changes ${EXAMPLEDIR}
+	${INSTALL_DATA} ${FILESDIR}/services-1.4.2.diff ${EXAMPLEDIR}
+	${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${EXAMPLEDIR}
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/kth-krb4/distinfo b/security/kth-krb4/distinfo
index fbc928a2be9..56dc89e6cd3 100644
--- a/security/kth-krb4/distinfo
+++ b/security/kth-krb4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/04/05 11:32:20 wennmach Exp $
+$NetBSD: distinfo,v 1.6 2002/09/24 00:17:51 jlam Exp $
 
 SHA1 (krb4-1.1.1.tar.gz) = db192908ec8510a22161c7607f83c8779dc7294a
 Size (krb4-1.1.1.tar.gz) = 1817919 bytes
-SHA1 (patch-ag) = e39c3159fe89cedbb34dd5dadcb95826cd8d4576
+SHA1 (patch-ag) = 41e3b00986b886d820e8d120709c057e58c209af
 SHA1 (patch-ah) = f60b4c67dc6fbd08a337f75585f9597e508c4c4c
 SHA1 (patch-ai) = 716ae2b9675d1d83e5e27edfa90c792d72b37ea5
diff --git a/security/kth-krb4/patches/patch-ag b/security/kth-krb4/patches/patch-ag
index c4dcaeef5b6..b04293c0a23 100644
--- a/security/kth-krb4/patches/patch-ag
+++ b/security/kth-krb4/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2000/06/08 13:56:01 wennmach Exp $
+$NetBSD: patch-ag,v 1.2 2002/09/24 00:17:51 jlam Exp $
 
 Do not use hardwired paths to arla's configuration directory.
 
@@ -9,7 +9,7 @@ Do not use hardwired paths to arla's configuration directory.
  #define _PATH_THESECELLS	_PATH_VICE "TheseCells"
  
 -#define _PATH_ARLA_VICE		"/usr/arla/etc/"
-+#define _PATH_ARLA_VICE		"@PREFIX@/etc/"
++#define _PATH_ARLA_VICE		"@PKG_SYSCONFDIR@/"
  #define _PATH_ARLA_THISCELL	_PATH_ARLA_VICE "ThisCell"
  #define _PATH_ARLA_CELLSERVDB 	_PATH_ARLA_VICE "CellServDB"
  #define _PATH_ARLA_THESECELLS	_PATH_ARLA_VICE "TheseCells"