3 files changed, 27 insertions, 35 deletions

diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index d509c592f760..bead64384dcc 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -16,7 +16,7 @@ COMMENT=	RFC 2307 NSS module
 
 USE_OPENLDAP=	yes
 
-NSS_LDAP_VERSION=239
+NSS_LDAP_VERSION=244
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -26,8 +26,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib"
 
-CONFIGURE_ARGS+= \
-		--with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \
+CONFIGURE_ARGS=	--with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \
 		--with-ldap-secret-file=${PREFIX}/etc/nss_ldap.secret \
 		--enable-rfc2307bis \
 		--enable-schema-mapping \
diff --git a/net/nss_ldap/distinfo b/net/nss_ldap/distinfo
index 068a8a388171..58cb02531bad 100644
--- a/net/nss_ldap/distinfo
+++ b/net/nss_ldap/distinfo
@@ -1,2 +1,3 @@
-MD5 (nss_ldap-239.tar.gz) = e30e3a3035e75933cd1a0acdeded1394
-SIZE (nss_ldap-239.tar.gz) = 222276
+MD5 (nss_ldap-244.tar.gz) = 25c237675cdd0f78e0773aff2c877a51
+SHA256 (nss_ldap-244.tar.gz) = c7730f8b46ca78dca7afd13cc8e60d9dbfb3c71d6fcbbf6ad9806d03465b42c6
+SIZE (nss_ldap-244.tar.gz) = 229667
diff --git a/net/nss_ldap/files/patch-Makefile.in b/net/nss_ldap/files/patch-Makefile.in
index 662144f00bfb..35a450e9f73b 100644
--- a/net/nss_ldap/files/patch-Makefile.in
+++ b/net/nss_ldap/files/patch-Makefile.in
@@ -1,68 +1,60 @@
---- Makefile.in.orig	Thu Jun 30 15:32:54 2005
-+++ Makefile.in	Thu Jun 30 16:00:29 2005
-@@ -82,7 +82,12 @@
+--- Makefile.in.orig	Mon Dec  5 08:52:20 2005
++++ Makefile.in	Mon Dec  5 08:56:32 2005
+@@ -82,7 +82,7 @@
  
  man_MANS = nss_ldap.5
  
--nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c 	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c 	ldap-bp.c util.c ltf.c snprintf.c resolve.c 	dnsconfig.c irs-nss.c pagectrl.c
-+nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c \
-+	\
-+	ldap-schema.c \
-+	util.c ltf.c snprintf.c resolve.c \
-+ 	dnsconfig.c irs-nss.c pagectrl.c \
-+	bsdnss.c
+-nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c 	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c 	ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c 	dnsconfig.c irs-nss.c pagectrl.c
++nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-schema.c util.c ltf.c snprintf.c resolve.c 	dnsconfig.c irs-nss.c pagectrl.c bsdnss.c
  
  
  nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@
-@@ -90,7 +95,10 @@
+@@ -90,7 +90,7 @@
  NSS_LDAP_PATH_CONF = @NSS_LDAP_PATH_CONF@
  NSS_LDAP_PATH_ROOTPASSWD = @NSS_LDAP_PATH_ROOTPASSWD@
  
 -NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-netgrp.c ldap-schema.c 	util.c ltf.c snprintf.c resolve.c dnsconfig.c 	irs-nss.c pagectrl.c aix_authmeth.c
-+NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-schema.c \
-+ 	util.c ltf.c snprintf.c resolve.c dnsconfig.c \
-+ 	irs-nss.c pagectrl.c aix_authmeth.c \
-+	bsdnss.c
++NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-schema.c 	util.c ltf.c snprintf.c resolve.c dnsconfig.c 	irs-nss.c pagectrl.c aix_authmeth.c bsdnss.c
  
  
  NSS_LDAP_LDFLAGS = @NSS_LDAP_LDFLAGS@
-@@ -118,15 +126,17 @@
+@@ -118,16 +118,16 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
 -nss_ldap_so_OBJECTS =  ldap-nss.o ldap-pwd.o ldap-grp.o ldap-netgrp.o \
 -ldap-rpc.o ldap-hosts.o ldap-network.o ldap-proto.o ldap-spwd.o \
 -ldap-alias.o ldap-service.o ldap-schema.o ldap-ethers.o ldap-bp.o \
--util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o pagectrl.o
+-ldap-automount.o util.o ltf.o snprintf.o resolve.o dnsconfig.o \
+-irs-nss.o pagectrl.o
 +nss_ldap_so_OBJECTS =  ldap-nss.o ldap-pwd.o ldap-grp.o \
 +	\
 +	ldap-schema.o \
-+	util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o pagectrl.o \
-+	bsdnss.o
++	util.o ltf.o snprintf.o resolve.o dnsconfig.o \
++	irs-nss.o pagectrl.o bsdnss.o
  nss_ldap_so_LDADD = $(LDADD)
  nss_ldap_so_DEPENDENCIES = 
 -NSS_LDAP_OBJECTS =  ldap-nss.o ldap-grp.o ldap-pwd.o ldap-netgrp.o \
--ldap-schema.o util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o \
--pagectrl.o aix_authmeth.o
 +NSS_LDAP_OBJECTS =  ldap-nss.o ldap-grp.o ldap-pwd.o \
-+	ldap-schema.o util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o \
-+	pagectrl.o aix_authmeth.o \
-+	bsdnss.o
+ ldap-schema.o util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o \
+-pagectrl.o aix_authmeth.o
++pagectrl.o aix_authmeth.o bsdnss.o
  NSS_LDAP_LDADD = $(LDADD)
  NSS_LDAP_DEPENDENCIES = 
  CFLAGS = @CFLAGS@
-@@ -147,31 +157,18 @@
+@@ -148,32 +148,18 @@
  TAR = tar
  GZIP_ENV = --best
  DEP_FILES =  .deps/aix_authmeth.P .deps/dnsconfig.P .deps/irs-nss.P \
--.deps/ldap-alias.P .deps/ldap-bp.P .deps/ldap-ethers.P .deps/ldap-grp.P \
--.deps/ldap-hosts.P .deps/ldap-netgrp.P .deps/ldap-network.P \
--.deps/ldap-nss.P .deps/ldap-proto.P .deps/ldap-pwd.P .deps/ldap-rpc.P \
+-.deps/ldap-alias.P .deps/ldap-automount.P .deps/ldap-bp.P \
+-.deps/ldap-ethers.P .deps/ldap-grp.P .deps/ldap-hosts.P \
+-.deps/ldap-netgrp.P .deps/ldap-network.P .deps/ldap-nss.P \
+-.deps/ldap-proto.P .deps/ldap-pwd.P .deps/ldap-rpc.P \
 -.deps/ldap-schema.P .deps/ldap-service.P .deps/ldap-spwd.P .deps/ltf.P \
 -.deps/pagectrl.P .deps/resolve.P .deps/snprintf.P .deps/util.P
 +.deps/ldap-grp.P \
-+\
-+.deps/ldap-nss.P .deps/ldap-pwd.P \
++.deps/ldap-nss.P \
++.deps/ldap-pwd.P \
 +.deps/ldap-schema.P .deps/ltf.P \
 +.deps/pagectrl.P .deps/resolve.P .deps/snprintf.P .deps/util.P \
 +.deps/bsdnss.P