Respect ${CONFDIR} and use the general INSTALL/DEINSTALL scripts.

7 files changed, 49 insertions, 158 deletions

diff --git a/security/sudo/DEINSTALL b/security/sudo/DEINSTALL
deleted file mode 100644
index dd651d7d925..00000000000
--- a/security/sudo/DEINSTALL
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:17:57 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CMP="@CMP@"
-RM="@RM@"
-
-SAMPLECONFDIR=${PKG_PREFIX}/share/examples/sudo
-CONFDIR=/etc
-CONFFILES="sudoers"
-
-case ${STAGE} in
-DEINSTALL)
-	# Remove configuration files if they don't differ from the default
-	# config file.
-	#
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}
-		if ${CMP} -s ${FILE} ${SAMPLEFILE}
-		then
-			${RM} -f ${FILE}
-		fi
-	done
-	;;
-
-POST-DEINSTALL)
-	modified_files=''
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		if [ -f ${FILE} ]
-		then
-			modified_files="${modified_files} ${FILE}"
-		fi
-	done
-	if [ -n "${modified_files}" ]
-	then
-		${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove the
-following files:
-
-EOF
-		for file in ${modified_files}
-		do
-			echo "	${file}"
-		done
-		${CAT} << EOF
-===========================================================================
-EOF
-	fi
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/security/sudo/INSTALL b/security/sudo/INSTALL
deleted file mode 100755
index 111d09d7d0d..00000000000
--- a/security/sudo/INSTALL
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/11/01 01:17:58 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CHOWN="@CHOWN@"
-CHMOD="@CHMOD@"
-CP="@CP@"
-
-SAMPLECONFDIR=${PKG_PREFIX}/share/examples/sudo
-CONFDIR=/etc
-CONFFILES="sudoers"
-
-case ${STAGE} in
-PRE-INSTALL)
-	;;
-
-POST-INSTALL)
-	echo "Installing configuration files:"
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}
-		if [ -f ${FILE} ]
-		then
-			echo "    ${FILE} already exists"
-		else
-			echo "    ${FILE}"
-			${CP} ${SAMPLEFILE} ${FILE}
-			${CHOWN} 0:0 ${FILE}
-			${CHMOD} 0440 ${FILE}
-		fi
-	done
-	${CAT} << EOF
-===========================================================================
-Some files you might need to customize include the following:
-
-EOF
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		echo "	${FILE}"
-	done
-	${CAT} << EOF
-===========================================================================
-EOF
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/security/sudo/MESSAGE b/security/sudo/MESSAGE
index 81725f42a0b..ecfaa1d38a3 100644
--- a/security/sudo/MESSAGE
+++ b/security/sudo/MESSAGE
@@ -1,10 +1,9 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 01:17:58 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2001/11/19 17:27:23 jlam Exp $
 
 If you are upgrading from a version of sudo prior to 1.6, then please read
 
 	${PREFIX}/share/doc/sudo/UPGRADE
 
 on how to modify your sudoers file appropriately.
-
 =============================================================================
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index df360e9c22e..ab035440e6f 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2001/08/02 17:27:41 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2001/11/19 17:27:23 jlam Exp $
 #
 
 DISTNAME=		sudo-1.6.3p7
@@ -18,6 +18,8 @@ GNU_CONFIGURE=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
+CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
+
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-skey
 .elif ${OPSYS} == "SunOS"
@@ -36,23 +38,9 @@ CONFIGURE_ARGS+=	--with-nbsdops --disable-path-info
 PLIST_SRC=		${PKGDIR}/PLIST.common
 PLIST_SRC+=		${PKGDIR}/PLIST.${LOWER_OPSYS}
 
-DOCDIR=			${PREFIX}/share/doc/sudo
-EGDIR=			${PREFIX}/share/examples/sudo
-
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
-
-FILES_SUBST=		CAT=${CAT:Q}
-FILES_SUBST+=		CHMOD=${CHMOD:Q}
-FILES_SUBST+=		CHOWN=${CHOWN:Q}
-FILES_SUBST+=		CMP=${CMP:Q}
-FILES_SUBST+=		CP=${CP:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
-
-pre-install:
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES_PERMS=	${EGDIR}/sudoers ${CONFDIR}/sudoers 0 0 0440
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
@@ -62,4 +50,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample.sudoers ${EGDIR}/sudoers.sample
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index a1f66c5feb1..db8f93703d7 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 00:49:54 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/11/19 17:27:23 jlam 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
+SHA1 (patch-af) = 2bddc487a703c326664792506935cbcfad8440a0
+SHA1 (patch-ag) = 3dd193c969d57368a3511dffa6b4d48675ff7889
diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af
index 3c9da6c4415..e0ebaf15925 100644
--- a/security/sudo/patches/patch-af
+++ b/security/sudo/patches/patch-af
@@ -1,8 +1,16 @@
-$NetBSD: patch-af,v 1.8 2000/08/10 02:25:31 thorpej Exp $
+$NetBSD: patch-af,v 1.9 2001/11/19 17:27:24 jlam Exp $
 
---- configure.in.orig	Fri Mar 24 12:14:04 2000
-+++ configure.in	Wed Aug  9 17:13:17 2000
-@@ -167,6 +167,19 @@
+--- configure.in.orig	Fri Mar 24 15:14:04 2000
++++ configure.in
+@@ -59,7 +59,6 @@
+ test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
+ test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
+ test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
+-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
+ 
+ dnl
+ dnl Deprecated --with options (these all warn or generate an error)
+@@ -167,6 +166,19 @@
  		;;
  esac])
  
@@ -22,7 +30,7 @@ $NetBSD: patch-af,v 1.8 2000/08/10 02:25:31 thorpej Exp $
  AC_ARG_WITH(passwd, [  --without-passwd        don't use passwd/shadow file for authentication],
  [case $with_passwd in
      yes)	;;
-@@ -1466,7 +1479,9 @@
+@@ -1466,7 +1478,9 @@
  dnl
  if test "$with_kerb5" = "yes"; then
      AC_DEFINE(HAVE_KERB5)
@@ -33,7 +41,7 @@ $NetBSD: patch-af,v 1.8 2000/08/10 02:25:31 thorpej Exp $
  	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
      elif test -f "/usr/local/kerberos/include/krb5.h"; then
  	CPPFLAGS="$CPPFLAGS -I/usr/local/kerberos/include"
-@@ -1476,7 +1491,9 @@
+@@ -1476,7 +1490,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
  
@@ -44,7 +52,7 @@ $NetBSD: patch-af,v 1.8 2000/08/10 02:25:31 thorpej Exp $
  	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"
-@@ -1486,7 +1503,7 @@
+@@ -1486,7 +1502,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
  
diff --git a/security/sudo/patches/patch-ag b/security/sudo/patches/patch-ag
index 916a16cf248..db65fb85e4e 100644
--- a/security/sudo/patches/patch-ag
+++ b/security/sudo/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2001/06/26 00:49:55 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2001/11/19 17:27:24 jlam Exp $
 
---- configure.orig	Fri Mar 24 21:14:00 2000
+--- configure.orig	Fri Mar 24 15:14:00 2000
 +++ configure
 @@ -28,6 +28,8 @@
  ac_help="$ac_help
@@ -11,7 +11,24 @@ $NetBSD: patch-ag,v 1.1 2001/06/26 00:49:55 wiz Exp $
    --without-passwd        don't use passwd/shadow file for authentication"
  ac_help="$ac_help
    --with-skey             enable S/Key support "
-@@ -819,6 +821,23 @@
+@@ -292,7 +294,7 @@
+   --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+   --datadir=DIR           read-only architecture-independent data in DIR
+                           [PREFIX/share]
+-  --sysconfdir=DIR        read-only single-machine data in DIR [/etc]
++  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                           [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+@@ -679,7 +681,6 @@
+ test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
+ test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
+ test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
+-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
+ 
+ 
+ # Check whether --with-otp-only or --without-otp-only was given.
+@@ -819,6 +820,23 @@
  fi
  
  
@@ -35,7 +52,7 @@ $NetBSD: patch-ag,v 1.1 2001/06/26 00:49:55 wiz Exp $
  # Check whether --with-passwd or --without-passwd was given.
  if test "${with_passwd+set}" = set; then
    withval="$with_passwd"
-@@ -7712,7 +7731,9 @@
+@@ -7712,7 +7730,9 @@
  #define HAVE_KERB5 1
  EOF
  
@@ -46,7 +63,7 @@ $NetBSD: patch-ag,v 1.1 2001/06/26 00:49:55 wiz Exp $
  	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 @@
+@@ -7722,7 +7742,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
  
@@ -57,7 +74,7 @@ $NetBSD: patch-ag,v 1.1 2001/06/26 00:49:55 wiz Exp $
  	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 @@
+@@ -7732,7 +7754,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