Fix install layout. Bump PKGREVISION.

4 files changed, 19 insertions, 16 deletions

diff --git a/www/ap-authnz-crowd/Makefile b/www/ap-authnz-crowd/Makefile
index d6c2f44eb31..a8f465548ad 100644
--- a/www/ap-authnz-crowd/Makefile
+++ b/www/ap-authnz-crowd/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/02/15 16:34:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.2 2016/02/17 16:32:44 jperkin Exp $
 #
 
 DISTNAME=	mod_authnz_crowd-2.2.2
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.atlassian.com/software/crowd/downloads/cwdapache/
 
@@ -27,9 +28,18 @@ CONFIGURE_ENV+=	BUILDLINK_PREFIX_subversion=${BUILDLINK_PREFIX.subversion-base}
 
 BUILDLINK_TRANSFORM+=	opt:-O2:-O1
 
+INSTALLATION_DIRS+=	lib/httpd
+
 pre-configure:
 	cd ${WRKSRC} && autoreconf -fiv
 
+do-install:
+	for mod in mod_authnz_crowd.la svn/mod_authz_svn_crowd.la; do \
+		${PREFIX}/share/httpd/build/instdso.sh \
+		    SH_LIBTOOL=${PREFIX}/share/httpd/build/libtool \
+		    ${WRKSRC}/src/$$mod ${DESTDIR}${PREFIX}/lib/httpd; \
+	done
+
 .include "../../devel/subversion-base/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/www/ap-authnz-crowd/PLIST b/www/ap-authnz-crowd/PLIST
index 75fd9f3ee2b..da4b97a37af 100644
--- a/www/ap-authnz-crowd/PLIST
+++ b/www/ap-authnz-crowd/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2016/02/15 16:34:32 jperkin Exp $
-lib/mod_authnz_crowd.la
-lib/mod_authz_svn_crowd.la
+@comment $NetBSD: PLIST,v 1.2 2016/02/17 16:32:44 jperkin Exp $
+lib/httpd/mod_authnz_crowd.so
+lib/httpd/mod_authnz_crowd.so.0.0.0
+lib/httpd/mod_authz_svn_crowd.so
+lib/httpd/mod_authz_svn_crowd.so.0.0.0
diff --git a/www/ap-authnz-crowd/distinfo b/www/ap-authnz-crowd/distinfo
index c9f7e54c560..37843a8664c 100644
--- a/www/ap-authnz-crowd/distinfo
+++ b/www/ap-authnz-crowd/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1 2016/02/15 16:34:32 jperkin Exp $
+$NetBSD: distinfo,v 1.2 2016/02/17 16:32:44 jperkin Exp $
 
 SHA1 (mod_authnz_crowd-2.2.2.tar.gz) = 72678d22e520dd4cb10b3ecc537897a1260bca20
 RMD160 (mod_authnz_crowd-2.2.2.tar.gz) = 22e5053b62a812b44c75af6c5fefbb0694d53ad8
 SHA512 (mod_authnz_crowd-2.2.2.tar.gz) = 9e8c8aaa1b30285f03d10e442feabd3fdc838b10d0358a6fb5bb7c7ba5629ac8073217ead0e5bc581532f3670484b85ff30b1bda08d54cd1928b7065ee90b05a
 Size (mod_authnz_crowd-2.2.2.tar.gz) = 30782 bytes
 SHA1 (patch-configure.ac) = e0b270bd58b9fa7d64160ca18791eedaf3d585b4
-SHA1 (patch-src_Makefile.am) = 001c70912cb56f2b8aa4f2153fda9c66684b08d3
+SHA1 (patch-src_Makefile.am) = cb349190a650156bd51089fc40fd4943ff1995d4
 SHA1 (patch-src_crowd__client.c) = d41cfc2de553c31459a1bd9d14847c222e75587b
 SHA1 (patch-src_mod__authnz__crowd.c) = 044aca7b1ebee0d113efec82814fc5f7dbcc34f3
 SHA1 (patch-src_svn_Makefile.am) = 204b979d8974a6a636baeb89510e3c60e459e40d
diff --git a/www/ap-authnz-crowd/patches/patch-src_Makefile.am b/www/ap-authnz-crowd/patches/patch-src_Makefile.am
index ca903f81bb4..1d7d971d4fe 100644
--- a/www/ap-authnz-crowd/patches/patch-src_Makefile.am
+++ b/www/ap-authnz-crowd/patches/patch-src_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile.am,v 1.1 2016/02/15 16:34:32 jperkin Exp $
+$NetBSD: patch-src_Makefile.am,v 1.2 2016/02/17 16:32:44 jperkin Exp $
 
 Fix automake failures.
 
@@ -13,12 +13,3 @@ Fix automake failures.
  TESTS = test.py
  TESTS_ENVIRONMENT = APACHE_BIN_DIR=@APACHE_BIN_DIR@
  
-@@ -17,7 +17,7 @@ httpd/conf/common.conf : httpd/conf/comm
- httpd/conf/httpd_svn.conf : httpd/conf/httpd_svn.conf.in
- 	APACHE_MODULES_DIR=@APACHE_MODULES_DIR@ CURDIR=$(CURDIR) envsubst < httpd/conf/httpd_svn.conf.in > httpd/conf/httpd_svn.conf
- 
--install:
-+notinstall:
- 	cp @HTTPD_CONF@ /tmp/httpd.conf.bak
- 	@APXS@ -i -a mod_authnz_crowd.la
- 	@APXS@ -e -a -n dav_svn modules/mod_dav_svn.so