- Support APACHE_PORT

- rename module so apxs can install it nicely.
PR:		38861

3 files changed, 54 insertions, 7 deletions

diff --git a/www/auth_ldap/Makefile b/www/auth_ldap/Makefile
index eaacf3aafcc0..6ebb58493bae 100644
--- a/www/auth_ldap/Makefile
+++ b/www/auth_ldap/Makefile
@@ -7,16 +7,16 @@
 
 PORTNAME=	auth_ldap
 PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.rudedog.org/auth_ldap/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module to authenticate against an LDAP directory
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
+BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 LIB_DEPENDS=	lber.2:${PORTSDIR}/net/openldap20
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
+RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="-llber"
@@ -28,10 +28,14 @@ CONFIGURE_ARGS= --with-sdk-headers=${LOCALBASE}/include \
 USE_GMAKE=	yes
 
 APXS?=		${LOCALBASE}/sbin/apxs
+APACHE_PORT?=	${PORTSDIR}/www/apache13
 
 MAKE_ARGS+=	APXS=${APXS}
 
+post-patch:
+	${CP} -p ${WRKSRC}/auth_ldap.c ${WRKSRC}/mod_auth_ldap.c
+
 do-install:
-	${APXS} -i -A -n ldap ${WRKSRC}/auth_ldap.so
+	${APXS} -i -a -n auth_ldap ${WRKSRC}/mod_auth_ldap.so
 
 .include <bsd.port.mk>
diff --git a/www/auth_ldap/files/patch-Makefile.in b/www/auth_ldap/files/patch-Makefile.in
new file mode 100644
index 000000000000..0ff2a996a0a1
--- /dev/null
+++ b/www/auth_ldap/files/patch-Makefile.in
@@ -0,0 +1,43 @@
+--- Makefile.in.orig	Wed Jul  4 16:37:55 2001
++++ Makefile.in	Wed Jun  4 21:17:22 2003
+@@ -14,11 +14,11 @@
+ AIX_LDFLAGS_SHLIB=@AIX_LDFLAGS_SHLIB@
+ MYCC=@MYCC@
+ 
+-all: auth_ldap.so
++all: mod_auth_ldap.so
+ 
+ html: FAQ.html Changes.html auth_ldap.html
+ 
+-OBJS=auth_ldap.o auth_ldap_config.o auth_ldap_cache.o auth_ldap_cache_mgr.o
++OBJS=mod_auth_ldap.o auth_ldap_config.o auth_ldap_cache.o auth_ldap_cache_mgr.o
+ 
+ CFLAGS=`$(APXS) -q CFLAGS` $(FRONTPAGE) $(SSL) $(SHARED_CACHE) $(OPENLDAP)
+ CFLAGS_SHLIB=`$(APXS) -q CFLAGS_SHLIB` 
+@@ -27,7 +27,7 @@
+ LD_SHLIB=`$(APXS) -q LD_SHLIB`
+ LDFLAGS_SHLIB=$(EXTRA_LDFLAGS) `$(APXS) -q LDFLAGS_SHLIB` $(AIX_LDFLAGS_SHLIB)
+ 
+-auth_ldap.so: $(OBJS) $(AIX_EXP)
++mod_auth_ldap.so: $(OBJS) $(AIX_EXP)
+ 	@echo $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(OBJS) $(LIBS)
+ 	@$(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(OBJS) $(LIBS) 
+ 
+@@ -46,7 +46,7 @@
+ 	cd .. && tar cvzf $$tar $$dirname/ --exclude-from=/tmp/excl.$$$$; \
+ 	rm -f /tmp/excl.$$$$
+ 
+-install: auth_ldap.so
++install: mod_auth_ldap.so
+ 	$(APXS) -i $(ACTIVATE) auth_ldap.so
+ 
+ clean:
+@@ -58,7 +58,7 @@
+ $(AIX_EXP):
+ 	@echo auth_ldap_module > $@
+ 
+-auth_ldap.o: auth_ldap.h auth_ldap_cache_mgr.h
++mod_auth_ldap.o: auth_ldap.h auth_ldap_cache_mgr.h
+ auth_ldap_config.o: auth_ldap.h auth_ldap_cache_mgr.h
+ auth_ldap_cache.o: auth_ldap.h auth_ldap_cache_mgr.h
+ auth_ldap_cache_mgr.o: auth_ldap.h auth_ldap_cache_mgr.h
diff --git a/www/auth_ldap/pkg-plist b/www/auth_ldap/pkg-plist
index 3d6d61273ccd..661fc6eebc15 100644
--- a/www/auth_ldap/pkg-plist
+++ b/www/auth_ldap/pkg-plist
@@ -1,3 +1,3 @@
-libexec/apache/auth_ldap.so
-@exec %D/sbin/apxs -e -A -n ldap %D/%F
-@unexec %D/sbin/apxs -e -A -n ldap %D/%F
+libexec/apache/mod_auth_ldap.so
+@exec %D/sbin/apxs -e -a -n auth_ldap %D/%F
+@unexec %D/sbin/apxs -e -A -n auth_ldap %D/%F