Remove build time dependency on autoconf by adding a patch for configure.

Fixes pkg/13004.

3 files changed, 72 insertions, 9 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index fb54c8277f3..539a3782195 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2001/04/08 00:02:45 itojun Exp $
-# FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp
+# $NetBSD: Makefile,v 1.36 2001/06/26 00:49:54 wiz Exp $
 #
 
 DISTNAME=		sudo-1.6.3p7
@@ -14,12 +13,10 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.courtesan.com/sudo/
 COMMENT=		Allow others to run commands as root
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+GNU_CONFIGURE=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-GNU_CONFIGURE=		# defined
-
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-skey
 .elif ${OPSYS} == "SunOS"
@@ -41,9 +38,6 @@ PLIST_SRC+=		${PKGDIR}/PLIST.${LOWER_OPSYS}
 DOCDIR=			${PREFIX}/share/doc/sudo
 EGDIR=			${PREFIX}/share/examples/sudo
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
-
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/UPGRADE ${DOCDIR}
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index eeefd985909..a1f66c5feb1 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:41 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/26 00:49:54 wiz Exp $
 
 SHA1 (sudo-1.6.3p7.tar.gz) = 270b139cf1e5df6c29c21914d96700031e5fb41c
 Size (sudo-1.6.3p7.tar.gz) = 285417 bytes
 SHA1 (patch-aa) = 3298ebd31c6348848c02b98e493a6772369ca840
 SHA1 (patch-ab) = 9ee5fd292495a97ba8acfdddfd60c54955070eac
 SHA1 (patch-af) = 50ee0d2f15672d3d7d5d09a7b8d41068e62699e4
+SHA1 (patch-ag) = 712287a6f4b77eef1707b718592712b5a52fbf6a
diff --git a/security/sudo/patches/patch-ag b/security/sudo/patches/patch-ag
new file mode 100644
index 00000000000..916a16cf248
--- /dev/null
+++ b/security/sudo/patches/patch-ag
@@ -0,0 +1,68 @@
+$NetBSD: patch-ag,v 1.1 2001/06/26 00:49:55 wiz Exp $
+
+--- configure.orig	Fri Mar 24 21:14:00 2000
++++ configure
+@@ -28,6 +28,8 @@
+ ac_help="$ac_help
+   --with-csops            add CSOps standard options"
+ ac_help="$ac_help
++  --with-nbsdops          add NetBSD standard options"
++ac_help="$ac_help
+   --without-passwd        don't use passwd/shadow file for authentication"
+ ac_help="$ac_help
+   --with-skey             enable S/Key support "
+@@ -819,6 +821,23 @@
+ fi
+ 
+ 
++# Check whether --with-nbsdops or --without-nbsdops was given.
++if test "${with_nbsdops+set}" = set; then
++  withval="$with_nbsdops"
++  case $with_nbsdops in
++    yes)	echo 'Adding NetBSD standard options'
++		CHECKSIA=false
++		with_ignore_dot=yes
++		with_env_editor=yes
++		with_tty_tickets=yes
++		;;
++    no)		;;
++    *)		echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
++		;;
++esac
++fi
++
++
+ # Check whether --with-passwd or --without-passwd was given.
+ if test "${with_passwd+set}" = set; then
+   withval="$with_passwd"
+@@ -7712,7 +7731,9 @@
+ #define HAVE_KERB5 1
+ EOF
+ 
+-    if test -f "/usr/local/include/krb5.h"; then
++    if test -f "/usr/include/krb5/krb5.h"; then
++	CPPFLAGS="$CPPFLAGS -I/usr/include/krb5";
++    elif test -f "/usr/local/include/krb5.h"; then
+ 	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+     elif test -f "/usr/local/kerberos/include/krb5.h"; then
+ 	CPPFLAGS="$CPPFLAGS -I/usr/local/kerberos/include"
+@@ -7722,7 +7743,9 @@
+ 	echo 'Unable to locate kerberos 5 include files, you will have to edit the Makefile and add -I/path/to/krb/includes to CPPFLAGS'
+     fi
+ 
+-    if test -f "/usr/local/lib/libkrb5.a"; then
++    if test -f "/usr/lib/libkrb5.a"; then
++	SUDO_LDFLAGS="${SUDO_LDFLAGS}";
++    elif test -f "/usr/local/lib/libkrb5.a"; then
+ 	SUDO_LDFLAGS="${SUDO_LDFLAGS} -L/usr/local/lib"
+     elif test -f "/usr/local/kerberos/lib/libkrb5.a"; then
+ 	SUDO_LDFLAGS="${SUDO_LDFLAGS} -L/usr/local/kerberos/lib"
+@@ -7732,7 +7755,7 @@
+ 	echo 'Unable to locate kerberos 5 libraries, you will have to edit the Makefile and add -L/path/to/krb/libs to SUDO_LDFLAGS'
+     fi
+ 
+-    SUDO_LIBS="${SUDO_LIBS} -lkrb5 -lk5crypto -lcom_err"
++    SUDO_LIBS="${SUDO_LIBS} -lkrb5 -lasn1 -lcrypto -lroken -lcom_err"
+     AUTH_OBJS="${AUTH_OBJS} kerb5.o"
+ fi
+