buildlink1 -> buildlink2

7 files changed, 105 insertions, 54 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"
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index d2bc8ecd8a7..d731d513463 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/19 09:04:26 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/24 00:24:37 jlam Exp $
 #
 
 DISTNAME=	ssh-3.2.0
@@ -12,13 +12,14 @@ COMMENT=	Secure Shell client and server for V.2 SSH protocol
 
 CONFLICTS=	openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]*
 
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
-PKG_SYSCONFSUBDIR=	ssh2
 
 BUILD_DEFS+=		USE_INET6
 
 CRYPTO=			YES
+PKG_SYSCONFSUBDIR=	ssh2
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,10 +37,12 @@ SSH_PID_DIR=		${SSH_PID_DIR.${OPSYS}}
 CONFIGURE_ARGS+=	--without-daemonpam --without-clientpam
 CONFIGURE_ARGS+=	--without-ssh-agent1-compat
 CONFIGURE_ARGS+=	--without-ssh1-compat
-CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp-wrappers}
 CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR}
+
 # Setting FOREIGN_ETCDIR to PKG_SYSCONFBASE may seem stupid
 # if PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set but it does no harm...
+#
 CONFIGURE_ARGS+=	--with-foreign-etcdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 
@@ -76,7 +79,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${EGDIR}
 .endfor
 
-.include "../../security/tcp_wrappers/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh2/distinfo b/security/ssh2/distinfo
index 88a4cf9a9b2..468255cbbb4 100644
--- a/security/ssh2/distinfo
+++ b/security/ssh2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/06 00:48:10 seb Exp $
+$NetBSD: distinfo,v 1.2 2002/09/24 00:24:37 jlam Exp $
 
 SHA1 (ssh-3.2.0.tar.gz) = 13cefe3d4a890004a37b680b00bc119542247c16
 Size (ssh-3.2.0.tar.gz) = 2256240 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = eeec9d05b2360fe971a397cf53795caf3fd47bfb
 SHA1 (patch-ab) = 5e4d66e3f8f3f13c9f3926d181e2a1a568c20b4b
 SHA1 (patch-ac) = b87e967252b1eaafc6e6b7ee95d8e09550957bff
 SHA1 (patch-ad) = b6944222c0b84d5f906ad019b5260fb19ee299d9
-SHA1 (patch-ae) = 0132993883abca365175116c2e9769bcfa35cc1f
-SHA1 (patch-af) = 0b42b41e4300bcae167dadadf13e310d3f893433
+SHA1 (patch-ae) = 79288d501031c56fd155f966c905de2e4f5ffc35
+SHA1 (patch-af) = cc26be58b0eaf99119919d3353ba6b603b1449b0
 SHA1 (patch-ag) = 5990115dc53a9278f171158df1dcdd4754080e90
 SHA1 (patch-ah) = 5a4314cf70463638d18599dcb3fddbbc19d52b2a
diff --git a/security/ssh2/patches/patch-ae b/security/ssh2/patches/patch-ae
index fc9725994b8..077d533707c 100644
--- a/security/ssh2/patches/patch-ae
+++ b/security/ssh2/patches/patch-ae
@@ -1,18 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
+$NetBSD: patch-ae,v 1.2 2002/09/24 00:24:38 jlam Exp $
 
---- configure.in.orig	Thu May 16 10:32:33 2002
+--- configure.in.orig	Thu May 16 03:32:33 2002
 +++ configure.in
-@@ -781,9 +781,6 @@ dnl
- #                    All rights reserved
- #
- 
--# So many systems seem to need this that it is better do it here automatically.
--LIBS="-L/usr/local/lib $LIBS"
--
- # Platform-specific stuff.
- case "$target" in
-   alpha*-dec-osf*)
-@@ -1779,6 +1776,8 @@ fi
+@@ -1779,6 +1779,8 @@ fi
  if test -z "$no_libbsd"; then
    AC_CHECK_LIB(bsd, openpty)
  fi
diff --git a/security/ssh2/patches/patch-af b/security/ssh2/patches/patch-af
index 3424ec2768a..d4890bc9081 100644
--- a/security/ssh2/patches/patch-af
+++ b/security/ssh2/patches/patch-af
@@ -1,23 +1,78 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
+$NetBSD: patch-af,v 1.2 2002/09/24 00:24:38 jlam Exp $
 
---- configure.orig	Thu May 16 10:32:38 2002
+--- configure.orig	Thu May 16 03:32:38 2002
 +++ configure
-@@ -3771,9 +3771,6 @@ export CC CFLAGS
- #                    All rights reserved
- #
+@@ -1590,49 +1590,27 @@ cat >> confdefs.h <<EOF
+ EOF
+ 
+ 
+-
+-        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
+-echo "configure:1596: checking for strerror in -lcposix" >&5
+-ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lcposix  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1604 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char strerror();
+-
+-int main() {
+-strerror()
+-; return 0; }
++echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
++echo "configure:1595: checking for POSIXized ISC" >&5
++if test -d /etc/conf/kconfig.d &&
++  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
++then
++  echo "$ac_t""yes" 1>&6
++  ISC=yes # If later tests want to check for ISC.
++  cat >> confdefs.h <<\EOF
++#define _POSIX_SOURCE 1
+ EOF
+-if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  LIBS="$LIBS -lcposix"
++  if test "$GCC" = yes; then
++    CC="$CC -posix"
++  else
++    CC="$CC -Xp"
++  fi
+ else
+   echo "$ac_t""no" 1>&6
++  ISC=
+ fi
  
--# So many systems seem to need this that it is better do it here automatically.
--LIBS="-L/usr/local/lib $LIBS"
+-  
 -
- # Platform-specific stuff.
- case "$target" in
-   alpha*-dec-osf*)
-@@ -8224,8 +8221,49 @@ else
+ 
+ #
+ # vx_suffix is used if targeting VxWorks embedded OS
+@@ -8224,8 +8202,49 @@ else
  fi
  
  fi
 +echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-+echo "configure:8226: checking for openpty in -lutil" >&5
++echo "configure:8207: checking for openpty in -lutil" >&5
 +ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
@@ -25,7 +80,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lutil  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 8234 "configure"
++#line 8215 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
@@ -36,7 +91,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
 +openpty()
 +; return 0; }
 +EOF
-+if { (eval echo configure:8245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=yes"
 +else
@@ -59,7 +114,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
 +
  echo $ac_n "checking for login in -lutil""... $ac_c" 1>&6
 -echo "configure:8229: checking for login in -lutil" >&5
-+echo "configure:8267: checking for login in -lutil" >&5
++echo "configure:8248: checking for login in -lutil" >&5
  ac_lib_var=`echo util'_'login | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6