Update security/pam-smbpass to version 2.2.5. This version matches the

pam_smbpass distributed with the samba-2.2.5 sources.

4 files changed, 15 insertions, 85 deletions

diff --git a/security/pam-smbpass/Makefile b/security/pam-smbpass/Makefile
index 20ed35233eb..2b9617b77d0 100644
--- a/security/pam-smbpass/Makefile
+++ b/security/pam-smbpass/Makefile
@@ -1,38 +1,18 @@
-# $NetBSD: Makefile,v 1.2 2002/06/25 15:39:31 taca Exp $
-
-DISTNAME=	samba-2.2.2
-#
-# The pam-smbpass version number is found in the README file within the
-# Samba sources.
-#
-PKGNAME=	pam-smbpass-0.7.5
-CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.samba.org/pub/samba/ \
-		ftp://ring.asahi-net.or.jp/pub/net/samba/ \
-		ftp://samba.anu.edu.au/pub/samba/ \
-		ftp://de.samba.org/pub/mirror/samba/ \
-		ftp://se.samba.org/pub/samba/ \
-		ftp://ftp.sunet.se/pub/unix/utilities/samba/
-
-MAINTAINER=	jlam@netbsd.org
-COMMENT=	PAM authentication against a Samba password database
-
-DEPENDS+=	{samba>=2.0,ja-samba>=2.0}:../../net/samba
-
-USE_BUILDLINK_ONLY=	yes
-WRKSRC=			${WRKDIR}/${DISTNAME}/source
-
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
-SAMBA_ETCDIR?=		${PKG_SYSCONFDIR}/samba
-SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR}
-CONFIGURE_ARGS+=	--with-privatedir=${SAMBA_PRIVATE}
-CONFIGURE_ARGS+=	--with-pam_smbpass
-CONFIGURE_ENV+=		ac_cv_lib_curses_tgetent=no
+# $NetBSD: Makefile,v 1.3 2002/07/30 23:24:05 jlam Exp $
+
+PKGNAME=		pam-smbpass-${SAMBA_DIST_VERS}
+CATEGORIES=		security
+
+USE_BUILDLINK_ONLY=	# defined
+
+.include "../../net/samba/Makefile.common"
+
+MAINTAINER=		jlam@netbsd.org
+COMMENT=		PAM authentication against a Samba password database
+
+DEPENDS+=		{samba>=2.0,ja-samba>=2.0}:../../net/samba
+
+CONFIGURE_ARGS+=	--with-pam
 
 ALL_TARGET=		pam_smbpass
 
diff --git a/security/pam-smbpass/distinfo b/security/pam-smbpass/distinfo
deleted file mode 100644
index c89a18873e8..00000000000
--- a/security/pam-smbpass/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/01/29 22:35:59 jlam Exp $
-
-SHA1 (samba-2.2.2.tar.gz) = b7aa9159e9944d150391b697189adf0a48e6f890
-Size (samba-2.2.2.tar.gz) = 6622889 bytes
-SHA1 (patch-aa) = 153f83db6a0d81dfdb48e92efe62f20c808652d3
-SHA1 (patch-ab) = c6c1bc735b6e4fc62ab13f973ce20ca5e627d247
diff --git a/security/pam-smbpass/patches/patch-aa b/security/pam-smbpass/patches/patch-aa
deleted file mode 100644
index 212dd985b55..00000000000
--- a/security/pam-smbpass/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/29 22:35:59 jlam Exp $
-
---- Makefile.in.orig	Sat Oct 13 17:09:06 2001
-+++ Makefile.in
-@@ -619,7 +619,7 @@
- 
- bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ)
- 	@echo Linking shared library $@
--	$(LD) @LDSHFLAGS@ -symbolic -o $@ $(PAM_SMBPASS_OBJ) -lpam $(LIBS) -lc
-+	$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(LIBS) -lc
- 
- nsswitch/libnss_wins.so: $(NSS_OBJ)
- 	@echo "Linking $@"
diff --git a/security/pam-smbpass/patches/patch-ab b/security/pam-smbpass/patches/patch-ab
deleted file mode 100644
index b8cf9b66990..00000000000
--- a/security/pam-smbpass/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/29 22:35:59 jlam Exp $
-
---- configure.orig	Sat Oct 13 17:09:16 2001
-+++ configure
-@@ -8288,6 +8288,10 @@
- EOF
- 
- 		;;
-+		*netbsd*)
-+			LDSHFLAGS="-shared -Wl,--export-dynamic"
-+			PICFLAG="-fPIC"
-+		;;
- 		*bsd*) LDSHFLAGS="-shared -Bshareable"
- 		;;
- 		*irix*) cat >> confdefs.h <<\EOF
-@@ -8392,6 +8396,7 @@
- 			;;
- esac
- 
-+if test x$PICFLAG = x; then
- # try to work out how to produce pic code with this compiler
- echo $ac_n "checking whether ${CC-cc} accepts -fpic""... $ac_c" 1>&6
- echo "configure:8398: checking whether ${CC-cc} accepts -fpic" >&5
-@@ -8411,6 +8416,7 @@
- echo "$ac_t""$ac_cv_prog_cc_fpic" 1>&6
- if test $ac_cv_prog_cc_fpic = yes; then
-     PICFLAG="-fpic";
-+fi
- fi
- if test x$PICFLAG = x; then
-   echo $ac_n "checking whether ${CC-cc} accepts -KPIC""... $ac_c" 1>&6