Bump PKGREVISION:

- No need for /usr/lib/sasl2 anymore: INSTALL script removed, DEINSTALL
  script tuned.
- Removed auto* tools dependencies by providing patch files for generated
  configure and Makefile.in.
- Use ${PKGDIR} instead of ${.CURDIR} for PLIST_SRC files.
- `--with-rc4' does not need an argument.
- Use BUILDLINK_PREFIX.whatever instead of BUILDLINK_DIR.
- Fix GSSAPI build for non-current NetBSD, this includes patch-ag removal.
- Fix PLIST handling by providing PLIST.post (lib/sasl2 removal at deinstall
  time) and fixing PLIST.common (include/sasl removal at deinstall time).
- Bump BUILDLINK_DEPENDS.cyrus-sasl in buildlink2.mk.
- Work around problem introduced by LTCONFIG_OVERRIDE and direct usage
  of ac_cv_can_build_shared in configure.in as suggested by Nick Hudson.
  Remove patch-ab (sasl-config is gone btw, it was not needed anyway).
  This should fix plugins shared libs problem as reported -among other-
  in PR pkg/19001 by Stephen Degler <sdegler at degler dot net>.

5 files changed, 147 insertions, 71 deletions

diff --git a/security/cyrus-sasl2/patches/patch-aa b/security/cyrus-sasl2/patches/patch-aa
index 087fd4d1117..a3ca7b8e0a1 100644
--- a/security/cyrus-sasl2/patches/patch-aa
+++ b/security/cyrus-sasl2/patches/patch-aa
@@ -1,28 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+$NetBSD: patch-aa,v 1.2 2002/11/14 22:21:14 seb Exp $
 
---- configure.in.orig	Fri Oct 11 21:56:29 2002
-+++ configure.in	Sun Oct 27 14:06:01 2002
-@@ -86,13 +86,13 @@
-   dnl xxx we should add -W at some point (but that might scare people)
-   CFLAGS="-Wall ${CFLAGS}"
-   GCC_VERSION=`gcc -v 2>&1 | sed -n -e '/version/s/.*version \([[0-9]]\)\..*/\1/p'`
--  if test "$GCC_VERSION" != "3"; then
--    CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
--  fi
--else
--  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
- fi 
--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
+--- configure.in.orig	Fri Oct 11 22:56:29 2002
++++ configure.in
+@@ -114,6 +114,13 @@ target=$save_target
  
-@@ -832,6 +832,9 @@
+ dnl ltconfig might not have found support for shared libs
+ dnl just do static libs if so.
++
++_build_libtool_libs=`${CONFIG_SHELL-/bin/sh} $srcdir/libtool --config | grep '^build_libtool_libs='`
++case "x$_build_libtool_libs" in
++       x*=yes) ac_cv_can_build_shared=yes;;
++       x*) ac_cv_can_build_shared=no;;
++esac
++
+ if test "$ac_cv_can_build_shared" = no; then
+ 	enable_shared=no
+ 	enable_static=yes
+@@ -832,6 +839,9 @@ AC_SUBST(LTGETNAMEINFOOBJS)
  LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
  AC_SUBST(LIBOBJS)
  AC_SUBST(LTLIBOBJS)
diff --git a/security/cyrus-sasl2/patches/patch-ab b/security/cyrus-sasl2/patches/patch-ab
deleted file mode 100644
index b5c04f5a45d..00000000000
--- a/security/cyrus-sasl2/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
-
---- plugins/Makefile.am.orig	Sun Oct 27 14:07:27 2002
-+++ plugins/Makefile.am	Sun Oct 27 14:09:58 2002
-@@ -79,6 +79,10 @@
- 	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
- 	libntlm.la libsasldb.la libmysql.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) $(libopt_la_LIBADD) $(libsasldb_la_LIBADD) $(libmysql_ls_LIBADD)
-+
- libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
- libplain_la_LDFLAGS = -version-info $(plain_version)
- libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
-@@ -133,7 +137,7 @@
- libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
- libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
- libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
--libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
-+libsasldb_la_LIBADD = $(SASL_DB_LIB) $(COMPAT_OBJS)
- 
- # Auxprop Plugins
- libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources)
-@@ -160,4 +164,9 @@
- 	cd ../lib; $(MAKE) $(COMPAT_OBJS)
- 	for file in $(COMPAT_OBJS); do ln -s ../lib/$$file .; done
- 
--
-+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
diff --git a/security/cyrus-sasl2/patches/patch-ag b/security/cyrus-sasl2/patches/patch-ag
deleted file mode 100644
index dee341c4c84..00000000000
--- a/security/cyrus-sasl2/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2002/11/13 10:39:13 chris Exp $
-
---- saslauthd/Makefile.am.orig	Tue Sep 10 15:08:59 2002
-+++ saslauthd/Makefile.am	Wed Nov 13 10:08:59 2002
-@@ -22,7 +22,7 @@
- EXTRA_DIST	= saslauthd.8 saslauthd.mdoc config include \
- 		  getnameinfo.c getaddrinfo.c saslauthd-unix.c \
- 		  saslauthd-doors.c LDAP_SASLAUTHD
--INCLUDES	= -I$(top_srcdir)/include
-+INCLUDES	= -I$(top_srcdir)/include -I/usr/include/krb5
- DEFS            = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
- 
- 
diff --git a/security/cyrus-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai
new file mode 100644
index 00000000000..372b355add9
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ai
@@ -0,0 +1,57 @@
+$NetBSD: patch-ai,v 1.1 2002/11/14 22:21:15 seb Exp $
+
+--- configure.orig	Wed Nov 13 12:57:20 2002
++++ configure
+@@ -1949,6 +1949,13 @@ fi
+ 
+ target=$save_target
+ 
++
++_build_libtool_libs=`${CONFIG_SHELL-/bin/sh} $srcdir/libtool --config | grep '^build_libtool_libs='`
++case "x$_build_libtool_libs" in
++       x*=yes) ac_cv_can_build_shared=yes;;
++       x*) ac_cv_can_build_shared=no;;
++esac
++
+ if test "$ac_cv_can_build_shared" = no; then
+ 	enable_shared=no
+ 	enable_static=yes
+@@ -6676,8 +6683,37 @@ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/
+ 
+ 
+ 
++
++ac_safe=`echo "/dev/urandom" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for /dev/urandom""... $ac_c" 1>&6
++echo "configure:6690: 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
++
++
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:6681: checking for working const" >&5
++echo "configure:6717: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
diff --git a/security/cyrus-sasl2/patches/patch-aj b/security/cyrus-sasl2/patches/patch-aj
new file mode 100644
index 00000000000..2c5a1c6e6f1
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-aj
@@ -0,0 +1,73 @@
+$NetBSD: patch-aj,v 1.1 2002/11/14 22:21:15 seb Exp $
+
+--- lib/Makefile.in.orig	Wed Nov 13 12:56:52 2002
++++ lib/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -122,6 +122,7 @@ JAVADOC = @JAVADOC@
+ JAVAH = @JAVAH@
+ JAVAROOT = @JAVAROOT@
+ JAVA_INCLUDES = @JAVA_INCLUDES@
++LIBOBJS = @LIBOBJS@
+ LIBTOOL = @LIBTOOL@
+ LIB_CRYPT = @LIB_CRYPT@
+ LIB_DES = @LIB_DES@
+@@ -133,6 +134,7 @@ LIB_SOCKET = @LIB_SOCKET@
+ LN_S = @LN_S@
+ LTGETADDRINFOOBJS = @LTGETADDRINFOOBJS@
+ LTGETNAMEINFOOBJS = @LTGETNAMEINFOOBJS@
++LTLIBOBJS = @LTLIBOBJS@
+ LTSNPRINTFOBJS = @LTSNPRINTFOBJS@
+ MAKEINFO = @MAKEINFO@
+ NM = @NM@
+@@ -177,10 +179,7 @@ noinst_LIBRARIES = @SASL_STATIC_LIBS@
+ libsasl2_a_SOURCES = 
+ 
+ common_headers = saslint.h
+-common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c
+-
+-LTLIBOBJS = @LTLIBOBJS@ plugin_common.lo
+-LIBOBJS = @LIBOBJS@ plugin_common.o
++common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c plugin_common.c
+ 
+ lib_LTLIBRARIES = libsasl2.la
+ 
+@@ -207,7 +206,7 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
+ 
+ libsasl2_la_OBJECTS =  auxprop.lo canonusr.lo checkpw.lo client.lo \
+ common.lo config.lo external.lo md5.lo saslutil.lo server.lo \
+-seterror.lo dlopen.lo
++seterror.lo dlopen.lo plugin_common.lo
+ 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)
+@@ -219,7 +218,7 @@ getsubopt.c snprintf.c
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ SOURCES = $(libsasl2_a_SOURCES) $(libsasl2_la_SOURCES)
+ OBJECTS = $(libsasl2_a_OBJECTS) $(libsasl2_la_OBJECTS)
+@@ -436,11 +435,8 @@ distclean-generic clean-generic maintain
+ mostlyclean distclean maintainer-clean
+ 
+ 
+-plugin_common.lo: plugin_common.o
+-	ln -s $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
+-
+-plugin_common.o:
+-	ln -s $(top_builddir)/plugins/plugin_common.o plugin_common.o
++plugin_common.c:
++	ln -s $(top_builddir)/plugins/plugin_common.c plugin_common.c
+ @MACOSX_TRUE@install-exec-hook:
+ @MACOSX_TRUE@	$(mkinstalldirs) $(framedir)/Versions/A
+ @MACOSX_TRUE@	ln -fs $(libdir)/libsasl2.dylib $(framedir)/Versions/A/SASL2