Remove dependency on autoconf/automake and finish buildlink2 conversion.

7 files changed, 306 insertions, 25 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 45df43bdfc1..a4765db0597 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/08/25 18:39:50 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2002/09/07 07:37:37 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.27
 SVR4_PKGNAME=		csasl
@@ -11,8 +11,6 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://asg.web.cmu.edu/sasl/
 COMMENT=		Simple Authentication and Security Layer
 
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
-
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
@@ -85,12 +83,6 @@ post-extract:
 	cd ${WRKSRC}; ${RM} -f include/md5.h
 	${CP} ${FILESDIR}/sasl-config.in ${WRKSRC}/plugins
 
-pre-configure:
-	cd ${WRKSRC};							\
-	${LOCALBASE}/bin/autoheader;					\
-	${LOCALBASE}/bin/automake --gnu;				\
-	${LOCALBASE}/bin/autoconf
-
 pre-install:
 	@for script in ${RCD_SCRIPTS}; do				\
 		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index d2bedb53cd0..f0593a3503f 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2002/08/25 18:39:51 jlam Exp $
+$NetBSD: distinfo,v 1.8 2002/09/07 07:37:38 jlam Exp $
 
 SHA1 (cyrus-sasl-1.5.27.tar.gz) = eedaec8355219b61e64236e3a5d9845d3af5a13d
 Size (cyrus-sasl-1.5.27.tar.gz) = 528252 bytes
-SHA1 (patch-aa) = 0cd3f7a221a601008ed42f8edbf6f2724479be02
+SHA1 (patch-aa) = cedf8b0a45b69d292a4306192eab4ec6245b6e46
 SHA1 (patch-ab) = 82359390958c020348e7e7ebc39315da552d34c7
 SHA1 (patch-ac) = b5f99dd4789c19e36c29bbc3fbf47c556e32876e
 SHA1 (patch-ad) = faa888873c16c3c322e110a6f90380748b138942
@@ -13,3 +13,7 @@ SHA1 (patch-ah) = 84bb1809f9d1914746ca02de3ffc55149c28dd75
 SHA1 (patch-ai) = 55ade1200d2c5b8f20b4c1775d6c3b7d3b8ef278
 SHA1 (patch-aj) = 386ebb6e33c93bed497b438b397e903200eb4549
 SHA1 (patch-ak) = c65c4b2f9082e8beedcedca140410f31f9599b76
+SHA1 (patch-al) = c54b721c7cc69c1050600633d982e8a05d91e283
+SHA1 (patch-am) = 95f01aad91729992d4189da87970e7d7d9cd4ceb
+SHA1 (patch-an) = 933c350c55361d71c0c3273efaf0b7804edf2eea
+SHA1 (patch-ao) = 63048c5d49a3e5dcc1065149864e567ef3cabb0e
diff --git a/security/cyrus-sasl/patches/patch-aa b/security/cyrus-sasl/patches/patch-aa
index afd3619a606..a10e948d2cd 100644
--- a/security/cyrus-sasl/patches/patch-aa
+++ b/security/cyrus-sasl/patches/patch-aa
@@ -1,24 +1,21 @@
-$NetBSD: patch-aa,v 1.4 2001/12/10 12:43:21 martti Exp $
+$NetBSD: patch-aa,v 1.5 2002/09/07 07:37:39 jlam Exp $
 
---- configure.in.orig	Fri Jul 21 04:35:01 2000
-+++ configure.in	Mon Dec 10 13:26:32 2001
-@@ -65,9 +65,12 @@
+--- configure.in.orig	Fri Mar 23 17:47:27 2001
++++ configure.in
+@@ -69,6 +69,12 @@ dnl let's just link against local.  othe
+ CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
+ CMU_ADD_LIBPATH("/usr/local/lib")
  
- dnl check for -R, etc. switch
- CMU_GUESS_RUNPATH_SWITCH
--dnl let's just link against local.  otherwise we never find anything useful.
--CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
--CMU_ADD_LIBPATH("/usr/local/lib")
-+
 +AC_PATH_PROG(SED, sed, no)
 +if test "$SED" = "no"; then
 +  AC_ERROR([sed is required to build sasl-config])
 +fi
 +AC_SUBST(SED)
- 
++
  AM_DISABLE_STATIC
  
-@@ -352,8 +355,11 @@
+ CMU_PROG_LIBTOOL
+@@ -364,8 +370,11 @@ if test "$with_des" != no; then
      CPPFLAGS="$CPPFLAGS -I${with_des}/include"
      LDFLAGS="$LDFLAGS -L${with_des}/lib"
    fi
@@ -32,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2001/12/10 12:43:21 martti Exp $
  
    if test "$with_des" = no; then
      dnl if openssl is around, we might be able to use that for des
-@@ -464,7 +470,7 @@
+@@ -476,7 +485,7 @@ AC_ARG_ENABLE(gssapi, [  --enable-gssapi
  
  if test "$gssapi" != no; then
    if test -d ${gssapi}; then
@@ -41,7 +38,7 @@ $NetBSD: patch-aa,v 1.4 2001/12/10 12:43:21 martti Exp $
       LDFLAGS="$LDFLAGS -L$gssapi/lib"
    fi
    AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H),
-@@ -694,6 +700,9 @@
+@@ -661,6 +670,9 @@ AC_SUBST(SNPRINTFOBJS)
  
  LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
  AC_SUBST(LTLIBOBJS)
diff --git a/security/cyrus-sasl/patches/patch-al b/security/cyrus-sasl/patches/patch-al
new file mode 100644
index 00000000000..665d92539a9
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-al
@@ -0,0 +1,148 @@
+$NetBSD: patch-al,v 1.1 2002/09/07 07:37:40 jlam Exp $
+
+--- configure.orig	Fri Mar 23 17:48:12 2001
++++ configure
+@@ -1364,6 +1364,47 @@ CPPFLAGS="-I/usr/local/include ${CPPFLAG
+   fi
+ 
+ 
++# Extract the first word of "sed", so it can be a program name with args.
++set dummy sed; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1371: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$SED" in
++  /*)
++  ac_cv_path_SED="$SED" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_SED="$SED" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_SED="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_SED" && ac_cv_path_SED="no"
++  ;;
++esac
++fi
++SED="$ac_cv_path_SED"
++if test -n "$SED"; then
++  echo "$ac_t""$SED" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++if test "$SED" = "no"; then
++  { echo "configure: error: sed is required to build sasl-config" 1>&2; exit 1; }
++fi
++
++
+ # Check whether --enable-static or --disable-static was given.
+ if test "${enable_static+set}" = set; then
+   enableval="$enable_static"
+@@ -3599,8 +3640,41 @@ LIBS="$ac_save_LIBS"
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
++  ac_safe=`echo "des.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for des.h""... $ac_c" 1>&6
++echo "configure:3646: checking for des.h" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 3651 "configure"
++#include "confdefs.h"
++#include <des.h>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:3656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
+   LIB_DES="-ldes";
+-				       with_des=yes
++				with_des=yes
++else
++  echo "$ac_t""no" 1>&6
++with_des=no
++fi
++
+ else
+   echo "$ac_t""no" 1>&6
+ with_des=no
+@@ -3997,7 +4071,7 @@ fi
+ 
+ if test "$gssapi" != no; then
+   if test -d ${gssapi}; then
+-     CPPFLAGS="$CPPFLAGS -I$gssapi/include"
++     CPPFLAGS="$CPPFLAGS -I$gssapi/include -I$gssapi/include/krb5"
+      LDFLAGS="$LDFLAGS -L$gssapi/lib"
+   fi
+   ac_safe=`echo "gssapi.h" | sed 'y%./+-%__p_%'`
+@@ -5000,6 +5074,35 @@ fi
+ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
+ 
+ 
++
++ac_safe=`echo "/dev/urandom" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for /dev/urandom""... $ac_c" 1>&6
++echo "configure:5081: checking for /dev/urandom" >&5
++if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
++else
++  if test -r /dev/urandom; then
++    eval "ac_cv_file_$ac_safe=yes"
++  else
++    eval "ac_cv_file_$ac_safe=no"
++  fi
++fi
++fi
++if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  cat >> confdefs.h <<EOF
++#define SASL_DEV_RANDOM "/dev/urandom"
++EOF
++
++else
++  echo "$ac_t""no" 1>&6
++
++fi
++
++
+ for ac_hdr in getopt.h unistd.h crypt.h pwd.h shadow.h paths.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+@@ -5474,6 +5577,7 @@ s%@MAKEINFO@%$MAKEINFO%g
+ s%@SET_MAKE@%$SET_MAKE%g
+ s%@CC@%$CC%g
+ s%@CPP@%$CPP%g
++s%@SED@%$SED%g
+ s%@build@%$build%g
+ s%@build_alias@%$build_alias%g
+ s%@build_cpu@%$build_cpu%g
diff --git a/security/cyrus-sasl/patches/patch-am b/security/cyrus-sasl/patches/patch-am
new file mode 100644
index 00000000000..5f60aee273e
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2002/09/07 07:37:41 jlam Exp $
+
+--- include/Makefile.in.orig	Thu Sep  5 06:28:04 2002
++++ include/Makefile.in
+@@ -144,7 +144,7 @@ SRP_LIBS = @SRP_LIBS@
+ VERSION = @VERSION@
+ plugindir = @plugindir@
+ 
+-include_HEADERS = hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h
++include_HEADERS = hmac-md5.h sasl.h saslplug.h saslutil.h
+ 
+ noinst_PROGRAMS = makemd5
+ 
diff --git a/security/cyrus-sasl/patches/patch-an b/security/cyrus-sasl/patches/patch-an
new file mode 100644
index 00000000000..369ed32d101
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-an
@@ -0,0 +1,114 @@
+$NetBSD: patch-an,v 1.1 2002/09/07 07:37:42 jlam Exp $
+
+--- plugins/Makefile.in.orig	Fri Sep  6 10:59:39 2002
++++ plugins/Makefile.in
+@@ -143,6 +143,7 @@ SASL_KRB_LIB = @SASL_KRB_LIB@
+ SASL_MECHS = @SASL_MECHS@
+ SASL_UTIL_HEADERS_EXTRA = @SASL_UTIL_HEADERS_EXTRA@
+ SASL_UTIL_LIBS_EXTRA = @SASL_UTIL_LIBS_EXTRA@
++SED = @SED@
+ SNPRINTFOBJS = @SNPRINTFOBJS@
+ SRP_LIBS = @SRP_LIBS@
+ VERSION = @VERSION@
+@@ -168,6 +169,10 @@ sasldir = $(prefix)/lib/sasl
+ sasl_LTLIBRARIES = @SASL_MECHS@
+ EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la libscrammd5.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la
+ 
++bin_SCRIPTS = sasl-config
++sasl_config_CFLAGS = $(CPPFLAGS)
++sasl_config_LIBS = $(libplain_la_LIBADD) $(libkerberos4_la_LIBADD) $(libgssapiv2_la_LIBADD) $(libdigestmd5_la_LIBADD) $(liblogin_la_LIBADD) $(libsrp_la_LIBADD)
++
+ libplain_la_SOURCES = plain.c
+ libplain_la_LDFLAGS = -version-info $(plain_version)
+ libplain_la_LIBADD = $(PLAIN_LIBS)
+@@ -227,6 +232,8 @@ liblogin_la_DEPENDENCIES = 
+ liblogin_la_OBJECTS =  login.lo
+ libsrp_la_DEPENDENCIES = 
+ libsrp_la_OBJECTS =  srp.lo
++SCRIPTS =  $(bin_SCRIPTS)
++
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -343,6 +350,25 @@ liblogin.la: $(liblogin_la_OBJECTS) $(li
+ libsrp.la: $(libsrp_la_OBJECTS) $(libsrp_la_DEPENDENCIES)
+ 	$(LINK)  $(libsrp_la_LDFLAGS) $(libsrp_la_OBJECTS) $(libsrp_la_LIBADD) $(LIBS)
+ 
++install-binSCRIPTS: $(bin_SCRIPTS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	@list='$(bin_SCRIPTS)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	  else if test -f $(srcdir)/$$p; then \
++	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
++	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	  else :; fi; fi; \
++	done
++
++uninstall-binSCRIPTS:
++	@$(NORMAL_UNINSTALL)
++	list='$(bin_SCRIPTS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	done
++
+ tags: TAGS
+ 
+ ID: $(HEADERS) $(SOURCES) $(LISP)
+@@ -395,7 +421,7 @@ check-am: all-am
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
+-install-exec-am:
++install-exec-am: install-binSCRIPTS
+ install-exec: install-exec-am
+ 
+ install-data-am: install-saslLTLIBRARIES
+@@ -404,14 +430,14 @@ install-data: install-data-am
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-am
+-uninstall-am: uninstall-saslLTLIBRARIES
++uninstall-am: uninstall-saslLTLIBRARIES uninstall-binSCRIPTS
+ uninstall: uninstall-am
+-all-am: Makefile $(LTLIBRARIES)
++all-am: Makefile $(LTLIBRARIES) $(SCRIPTS)
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+-	$(mkinstalldirs)  $(DESTDIR)$(sasldir)
++	$(mkinstalldirs)  $(DESTDIR)$(sasldir) $(DESTDIR)$(bindir)
+ 
+ 
+ mostlyclean-generic:
+@@ -455,9 +481,11 @@ clean-saslLTLIBRARIES maintainer-clean-s
+ uninstall-saslLTLIBRARIES install-saslLTLIBRARIES mostlyclean-compile \
+ distclean-compile clean-compile maintainer-clean-compile \
+ mostlyclean-libtool distclean-libtool clean-libtool \
+-maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
++maintainer-clean-libtool uninstall-binSCRIPTS install-binSCRIPTS tags \
++mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
++distdir mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
+ install-data-am install-data install-am install uninstall-am uninstall \
+ all-redirect all-am all installdirs mostlyclean-generic \
+ distclean-generic clean-generic maintainer-clean-generic clean \
+@@ -467,6 +495,13 @@ mostlyclean distclean maintainer-clean
+ # libx509_la_SOURCES = x509.c
+ # libx509_la_LDFLAGS = -version-info $(x509_version)
+ # libx509_la_LIBADD = $(X509_LIBS)
++
++sasl-config: sasl-config.in
++	$(SED)	-e "s,%%sasl_config_LIBS%%,$(sasl_config_LIBS),g" \
++		-e "s,%%sasl_config_CFLAGS%%,$(sasl_config_CFLAGS),g" \
++		-e "s,%%prefix%%,$(prefix),g" \
++		-e "s,%%VERSION%%,$(VERSION),g" \
++		< sasl-config.in > sasl-config
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/security/cyrus-sasl/patches/patch-ao b/security/cyrus-sasl/patches/patch-ao
new file mode 100644
index 00000000000..cc00862f9cb
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2002/09/07 07:37:43 jlam Exp $
+
+--- saslauthd/Makefile.in.orig	Thu Sep  5 06:28:18 2002
++++ saslauthd/Makefile.in
+@@ -104,7 +104,7 @@ sbin_PROGRAMS = saslauthd
+ man_MANS = saslauthd.8
+ 
+ saslauthd_SOURCES = saslauthd.c mechanisms.c globals.h mechanisms.h auth_dce.c auth_dce.h auth_getpwent.c auth_getpwent.h auth_krb4.c auth_krb4.h auth_pam.c auth_pam.h auth_rimap.c auth_rimap.h auth_shadow.c auth_shadow.h auth_sia.c auth_sia.h
+-saslauthd_LDADD = @SASL_KRB_LIB@
++saslauthd_LDADD = @PLAIN_LIBS@
+ 
+ INCLUDES = -I$(top_srcdir)/include
+ EXTRA_DIST = saslauthd.8