Wed Feb 17 16:32:44 2016 UTC ()
Fix install layout.  Bump PKGREVISION.


(jperkin)
diff -r1.1 -r1.2 pkgsrc/www/ap-authnz-crowd/Makefile
diff -r1.1 -r1.2 pkgsrc/www/ap-authnz-crowd/PLIST
diff -r1.1 -r1.2 pkgsrc/www/ap-authnz-crowd/distinfo
diff -r1.1 -r1.2 pkgsrc/www/ap-authnz-crowd/patches/patch-src_Makefile.am
cvs diff -r1.1 -r1.2 pkgsrc/www/ap-authnz-crowd/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap-authnz-crowd/Makefile 2016/02/15 16:34:32 1.1
+++ pkgsrc/www/ap-authnz-crowd/Makefile 2016/02/17 16:32:44 1.2
@@ -1,37 +1,47 @@ @@ -1,37 +1,47 @@
1# $NetBSD: Makefile,v 1.1 2016/02/15 16:34:32 jperkin Exp $ 1# $NetBSD: Makefile,v 1.2 2016/02/17 16:32:44 jperkin Exp $
2# 2#
3 3
4DISTNAME= mod_authnz_crowd-2.2.2 4DISTNAME= mod_authnz_crowd-2.2.2
5PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/} 5PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/}
 6PKGREVISION= 1
6CATEGORIES= www 7CATEGORIES= www
7MASTER_SITES= http://downloads.atlassian.com/software/crowd/downloads/cwdapache/ 8MASTER_SITES= http://downloads.atlassian.com/software/crowd/downloads/cwdapache/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://confluence.atlassian.com/display/CROWD/Integrating+Crowd+with+Apache 11HOMEPAGE= https://confluence.atlassian.com/display/CROWD/Integrating+Crowd+with+Apache
11COMMENT= Apache module for Crowd authentication 12COMMENT= Apache module for Crowd authentication
12LICENSE= apache-2.0 13LICENSE= apache-2.0
13 14
14APACHE_MODULE= yes 15APACHE_MODULE= yes
15PKG_APACHE_ACCEPTED= apache22 apache24 16PKG_APACHE_ACCEPTED= apache22 apache24
16 17
17DEPENDS+= ${APACHE_PKG_PREFIX}-subversion>0:../../www/ap2-subversion 18DEPENDS+= ${APACHE_PKG_PREFIX}-subversion>0:../../www/ap2-subversion
18 19
19GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
20USE_LIBTOOL= yes 21USE_LIBTOOL= yes
21USE_TOOLS+= autoconf automake autoreconf 22USE_TOOLS+= autoconf automake autoreconf
22 23
23CONFIGURE_ENV+= ac_cv_path_HTTPD=${BUILDLINK_PREFIX.apache}/sbin/httpd 24CONFIGURE_ENV+= ac_cv_path_HTTPD=${BUILDLINK_PREFIX.apache}/sbin/httpd
24CONFIGURE_ENV+= APXS=${APXS:Q} 25CONFIGURE_ENV+= APXS=${APXS:Q}
25CONFIGURE_ENV+= BUILDLINK_PREFIX_apache=${BUILDLINK_PREFIX.apache} 26CONFIGURE_ENV+= BUILDLINK_PREFIX_apache=${BUILDLINK_PREFIX.apache}
26CONFIGURE_ENV+= BUILDLINK_PREFIX_subversion=${BUILDLINK_PREFIX.subversion-base} 27CONFIGURE_ENV+= BUILDLINK_PREFIX_subversion=${BUILDLINK_PREFIX.subversion-base}
27 28
28BUILDLINK_TRANSFORM+= opt:-O2:-O1 29BUILDLINK_TRANSFORM+= opt:-O2:-O1
29 30
 31INSTALLATION_DIRS+= lib/httpd
 32
30pre-configure: 33pre-configure:
31 cd ${WRKSRC} && autoreconf -fiv 34 cd ${WRKSRC} && autoreconf -fiv
32 35
 36do-install:
 37 for mod in mod_authnz_crowd.la svn/mod_authz_svn_crowd.la; do \
 38 ${PREFIX}/share/httpd/build/instdso.sh \
 39 SH_LIBTOOL=${PREFIX}/share/httpd/build/libtool \
 40 ${WRKSRC}/src/$$mod ${DESTDIR}${PREFIX}/lib/httpd; \
 41 done
 42
33.include "../../devel/subversion-base/buildlink3.mk" 43.include "../../devel/subversion-base/buildlink3.mk"
34.include "../../textproc/libxml2/buildlink3.mk" 44.include "../../textproc/libxml2/buildlink3.mk"
35.include "../../www/curl/buildlink3.mk" 45.include "../../www/curl/buildlink3.mk"
36.include "../../mk/apache.mk" 46.include "../../mk/apache.mk"
37.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/www/ap-authnz-crowd/PLIST (expand / switch to unified diff)

--- pkgsrc/www/ap-authnz-crowd/PLIST 2016/02/15 16:34:32 1.1
+++ pkgsrc/www/ap-authnz-crowd/PLIST 2016/02/17 16:32:44 1.2
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
1@comment $NetBSD: PLIST,v 1.1 2016/02/15 16:34:32 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.2 2016/02/17 16:32:44 jperkin Exp $
2lib/mod_authnz_crowd.la 2lib/httpd/mod_authnz_crowd.so
3lib/mod_authz_svn_crowd.la 3lib/httpd/mod_authnz_crowd.so.0.0.0
 4lib/httpd/mod_authz_svn_crowd.so
 5lib/httpd/mod_authz_svn_crowd.so.0.0.0
cvs diff -r1.1 -r1.2 pkgsrc/www/ap-authnz-crowd/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ap-authnz-crowd/distinfo 2016/02/15 16:34:32 1.1
+++ pkgsrc/www/ap-authnz-crowd/distinfo 2016/02/17 16:32:44 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.1 2016/02/15 16:34:32 jperkin Exp $ 1$NetBSD: distinfo,v 1.2 2016/02/17 16:32:44 jperkin Exp $
2 2
3SHA1 (mod_authnz_crowd-2.2.2.tar.gz) = 72678d22e520dd4cb10b3ecc537897a1260bca20 3SHA1 (mod_authnz_crowd-2.2.2.tar.gz) = 72678d22e520dd4cb10b3ecc537897a1260bca20
4RMD160 (mod_authnz_crowd-2.2.2.tar.gz) = 22e5053b62a812b44c75af6c5fefbb0694d53ad8 4RMD160 (mod_authnz_crowd-2.2.2.tar.gz) = 22e5053b62a812b44c75af6c5fefbb0694d53ad8
5SHA512 (mod_authnz_crowd-2.2.2.tar.gz) = 9e8c8aaa1b30285f03d10e442feabd3fdc838b10d0358a6fb5bb7c7ba5629ac8073217ead0e5bc581532f3670484b85ff30b1bda08d54cd1928b7065ee90b05a 5SHA512 (mod_authnz_crowd-2.2.2.tar.gz) = 9e8c8aaa1b30285f03d10e442feabd3fdc838b10d0358a6fb5bb7c7ba5629ac8073217ead0e5bc581532f3670484b85ff30b1bda08d54cd1928b7065ee90b05a
6Size (mod_authnz_crowd-2.2.2.tar.gz) = 30782 bytes 6Size (mod_authnz_crowd-2.2.2.tar.gz) = 30782 bytes
7SHA1 (patch-configure.ac) = e0b270bd58b9fa7d64160ca18791eedaf3d585b4 7SHA1 (patch-configure.ac) = e0b270bd58b9fa7d64160ca18791eedaf3d585b4
8SHA1 (patch-src_Makefile.am) = 001c70912cb56f2b8aa4f2153fda9c66684b08d3 8SHA1 (patch-src_Makefile.am) = cb349190a650156bd51089fc40fd4943ff1995d4
9SHA1 (patch-src_crowd__client.c) = d41cfc2de553c31459a1bd9d14847c222e75587b 9SHA1 (patch-src_crowd__client.c) = d41cfc2de553c31459a1bd9d14847c222e75587b
10SHA1 (patch-src_mod__authnz__crowd.c) = 044aca7b1ebee0d113efec82814fc5f7dbcc34f3 10SHA1 (patch-src_mod__authnz__crowd.c) = 044aca7b1ebee0d113efec82814fc5f7dbcc34f3
11SHA1 (patch-src_svn_Makefile.am) = 204b979d8974a6a636baeb89510e3c60e459e40d 11SHA1 (patch-src_svn_Makefile.am) = 204b979d8974a6a636baeb89510e3c60e459e40d
12SHA1 (patch-src_svn_mod__authz__svn__crowd.c) = a639496e96e196a9094168f8aef70de427ee25f8 12SHA1 (patch-src_svn_mod__authz__svn__crowd.c) = a639496e96e196a9094168f8aef70de427ee25f8
cvs diff -r1.1 -r1.2 pkgsrc/www/ap-authnz-crowd/patches/patch-src_Makefile.am (expand / switch to unified diff)

--- pkgsrc/www/ap-authnz-crowd/patches/patch-src_Makefile.am 2016/02/15 16:34:32 1.1
+++ pkgsrc/www/ap-authnz-crowd/patches/patch-src_Makefile.am 2016/02/17 16:32:44 1.2
@@ -1,24 +1,15 @@ @@ -1,24 +1,15 @@
1$NetBSD: patch-src_Makefile.am,v 1.1 2016/02/15 16:34:32 jperkin Exp $ 1$NetBSD: patch-src_Makefile.am,v 1.2 2016/02/17 16:32:44 jperkin Exp $
2 2
3Fix automake failures. 3Fix automake failures.
4 4
5--- src/Makefile.am.orig 2013-09-25 06:41:53.000000000 +0000 5--- src/Makefile.am.orig 2013-09-25 06:41:53.000000000 +0000
6+++ src/Makefile.am 6+++ src/Makefile.am
7@@ -5,7 +5,7 @@ mod_authnz_crowd_la_SOURCES = mod_authnz 7@@ -5,7 +5,7 @@ mod_authnz_crowd_la_SOURCES = mod_authnz
8 mod_authnz_crowd_la_LDFLAGS = -module -lcurl `xml2-config --libs` 8 mod_authnz_crowd_la_LDFLAGS = -module -lcurl `xml2-config --libs`
9 AM_CFLAGS = `apr-1-config --cflags` 9 AM_CFLAGS = `apr-1-config --cflags`
10 AM_CPPFLAGS = -I@APACHE_INCLUDE_DIR@ `apr-1-config --cppflags --includes` `xml2-config --cflags` 10 AM_CPPFLAGS = -I@APACHE_INCLUDE_DIR@ `apr-1-config --cppflags --includes` `xml2-config --cflags`
11-CFLAGS=-g -Wmissing-prototypes -O1 # -O2 causes mysterious crashes 11-CFLAGS=-g -Wmissing-prototypes -O1 # -O2 causes mysterious crashes
12+AM_CFLAGS += -g -Wmissing-prototypes -O1 # -O2 causes mysterious crashes 12+AM_CFLAGS += -g -Wmissing-prototypes -O1 # -O2 causes mysterious crashes
13 TESTS = test.py 13 TESTS = test.py
14 TESTS_ENVIRONMENT = APACHE_BIN_DIR=@APACHE_BIN_DIR@ 14 TESTS_ENVIRONMENT = APACHE_BIN_DIR=@APACHE_BIN_DIR@
15  15
16@@ -17,7 +17,7 @@ httpd/conf/common.conf : httpd/conf/comm 
17 httpd/conf/httpd_svn.conf : httpd/conf/httpd_svn.conf.in 
18 APACHE_MODULES_DIR=@APACHE_MODULES_DIR@ CURDIR=$(CURDIR) envsubst < httpd/conf/httpd_svn.conf.in > httpd/conf/httpd_svn.conf 
19  
20-install: 
21+notinstall: 
22 cp @HTTPD_CONF@ /tmp/httpd.conf.bak 
23 @APXS@ -i -a mod_authnz_crowd.la 
24 @APXS@ -e -a -n dav_svn modules/mod_dav_svn.so