Update to 1.3.7

PR:		34592
Submitted by:	maintainer

5 files changed, 10 insertions, 53 deletions

diff --git a/security/pam_ldap/Makefile b/security/pam_ldap/Makefile
index f0956e3cfe54..154dbeb3b241 100644
--- a/security/pam_ldap/Makefile
+++ b/security/pam_ldap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pam_ldap
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.7
 CATEGORIES=	security net
 MASTER_SITES=	http://www.padl.com/download/ \
 		ftp://ftp.padl.com/pub/
@@ -22,10 +22,11 @@ LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap \
 		lber.1:${PORTSDIR}/net/openldap
 .endif
 
-USE_AUTOCONF=	yes
-USE_AUTOMAKE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ldap-lib=openldap \
-		--with-ldap-dir=${LOCALBASE}
+		--with-ldap-dir=${LOCALBASE} \
+		--with-ldap-conf-file=${PREFIX}/etc/ldap.conf
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 USE_GMAKE=	yes
 
diff --git a/security/pam_ldap/distinfo b/security/pam_ldap/distinfo
index f5ceedbd710b..94d50b6b48f9 100644
--- a/security/pam_ldap/distinfo
+++ b/security/pam_ldap/distinfo
@@ -1 +1 @@
-MD5 (pam_ldap-134.tar.gz) = 7d6583b37e02202c38ef95738880fadb
+MD5 (pam_ldap-137.tar.gz) = ee8cf85a4138425364705a1986cc4561
diff --git a/security/pam_ldap/files/patch-aa b/security/pam_ldap/files/patch-aa
index 4f2c107bd3b3..962fa84a51e0 100644
--- a/security/pam_ldap/files/patch-aa
+++ b/security/pam_ldap/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat May 26 16:07:21 2001
-+++ Makefile.in	Sat May 26 17:09:57 2001
-@@ -380,17 +380,15 @@
+--- Makefile.in.orig	Sun Feb  3 15:36:48 2002
++++ Makefile.in	Sun Feb  3 15:39:06 2002
+@@ -357,17 +357,13 @@
  
  install-exec-local: pam_ldap.so
  	@$(NORMAL_INSTALL)
@@ -9,9 +9,7 @@
 -@EXTENSION_SO_FALSE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so.1
 -@EXTENSION_SO_FALSE@	-rm -f $(DESTDIR)$(libdir)/security/pam_ldap.so
 -@EXTENSION_SO_FALSE@	-ln -s $(DESTDIR)$(libdir)/security/pam_ldap.so.1 $(DESTDIR)$(libdir)/security/pam_ldap.so
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
-+@EXTENSION_SO_TRUE@	$(INSTALL_PROGRAM) -o root -g wheel pam_ldap.so $(DESTDIR)$(libdir)/pam_ldap.so
-+@EXTENSION_SO_FALSE@	$(INSTALL_PROGRAM) -o root -g wheel pam_ldap.so $(DESTDIR)$(libdir)/pam_ldap.so
++	$(INSTALL_PROGRAM) -o root -g wheel pam_ldap.so $(DESTDIR)$(libdir)/pam_ldap.so
  
  install-data-local:
  	@$(NORMAL_INSTALL)
diff --git a/security/pam_ldap/files/patch-ab b/security/pam_ldap/files/patch-ab
deleted file mode 100644
index c5f4f7a8eabd..000000000000
--- a/security/pam_ldap/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- pam_ldap.c.orig	Mon Jun 11 11:44:49 2001
-+++ pam_ldap.c	Mon Jun 11 11:45:07 2001
-@@ -557,7 +557,7 @@
- 
-   /* configuration file location is configurable; default /etc/ldap.conf */
-   if (configFile == NULL)
--    configFile = "/etc/ldap.conf";
-+    configFile = LDAP_CONF_FILE;
- 
-   fp = fopen (configFile, "r");
- 
diff --git a/security/pam_ldap/files/patch-ac b/security/pam_ldap/files/patch-ac
deleted file mode 100644
index 88be9dacd1b0..000000000000
--- a/security/pam_ldap/files/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.am.orig	Mon Jan  8 18:00:14 2001
-+++ Makefile.am	Mon Jun 11 11:44:42 2001
-@@ -4,24 +4,18 @@
- 
- pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h
- pam_ldap_so_LDFLAGS = @pam_ldap_so_LDFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -DLDAP_CONF_FILE=\"$(sysconfdir)/ldap.conf\"
- 
- 
- install-exec-local: pam_ldap.so
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(libdir)/security
--if EXTENSION_SO
--	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so
--else
--	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so.1
--	-rm -f $(DESTDIR)$(libdir)/security/pam_ldap.so
--	-ln -s $(DESTDIR)$(libdir)/security/pam_ldap.so.1 $(DESTDIR)$(libdir)/security/pam_ldap.so
--endif
-+	$(INSTALL_PROGRAM) -o root -g wheel pam_ldap.so $(DESTDIR)$(libdir)/pam_ldap.so
- 
- install-data-local:
- 	@$(NORMAL_INSTALL)
--	@if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf; then \
-+	@if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf.dist; then \
- 		$(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
--		$(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \
-+		$(INSTALL_DATA) -o root -g wheel $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf.dist; \
- 	fi
- 
- uninstall-local: