Attachment #144098 for bug #190716

Lines 3-9 Link Here

(-)mod_authnz_crowd/Makefile (-8 / +15 lines)
3		3
4	PORTNAME= mod_authnz_crowd	4	PORTNAME= mod_authnz_crowd
5	PORTVERSION= 2.2.2	5	PORTVERSION= 2.2.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= http://downloads.atlassian.com/software/crowd/downloads/cwdapache/	8	MASTER_SITES= http://downloads.atlassian.com/software/crowd/downloads/cwdapache/
9	DIST_SUBDIR= apache2	9	DIST_SUBDIR= apache2
Lines 16-21 Link Here
16	LIB_DEPENDS= libsvn_client-1.so:${PORTSDIR}/devel/subversion \	16	LIB_DEPENDS= libsvn_client-1.so:${PORTSDIR}/devel/subversion \
17	libcurl.so:${PORTSDIR}/ftp/curl	17	libcurl.so:${PORTSDIR}/ftp/curl
18		18
		19
		20	RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dav_svn.so:${PORTSDIR}/www/mod_dav_svn \
		21
		22
19	USE_AUTOTOOLS= autoconf:env automake:env libtool:env	23	USE_AUTOTOOLS= autoconf:env automake:env libtool:env
20	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
21	USE_GNOME= libxml2	25	USE_GNOME= libxml2
Lines 23-30 Link Here
23	USE_APACHE= 22	27	USE_APACHE= 22
24	MAKE_JOBS_SAFE= yes	28	MAKE_JOBS_SAFE= yes
25		29
26	MANUAL_PACKAGE_BUILD= requires subversion build with MOD_DAV_SVN.
27
28	SUB_FILES= pkg-message zzz_authnz_crowd.conf	30	SUB_FILES= pkg-message zzz_authnz_crowd.conf
29	SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} \	31	SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} \
30	APACHEMODDIR=${APACHEMODDIR}	32	APACHEMODDIR=${APACHEMODDIR}
Lines 35-46 Link Here
35		37
36	LDFLAGS+= -L${PREFIX}/lib	38	LDFLAGS+= -L${PREFIX}/lib
37		39
38	NO_STAGE= yes	40	post-patch:
		41	${REINPLACE_CMD} -e 's\|@APXS_STAGE@\|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}\|' \
		42	${WRKSRC}/src/Makefile.am
		43
		44	pre-install:
		45	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
		46	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes
		47
		48
39	post-install:	49	post-install:
40	${INSTALL_DATA} ${WRKDIR}/zzz_authnz_crowd.conf \	50	${INSTALL_DATA} ${WRKDIR}/zzz_authnz_crowd.conf \
41	${PREFIX}/${APACHEETCDIR}/Includes/	51	${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes/
42	@${ECHO_CMD}
43	@${CAT} ${PKGMESSAGE}
44	@${ECHO_CMD}
45		52
46	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Lines 24-29 Link Here

(-)mod_authnz_crowd/files/patch-src__Makefile.am (-3 / +3 lines)
24	- if [ -e /etc/apache2/mods-enabled/dav_svn.load ]; then mv /etc/apache2/mods-enabled/dav_svn.load /etc/apache2/mods-enabled/1dav_svn.load; fi	24	- if [ -e /etc/apache2/mods-enabled/dav_svn.load ]; then mv /etc/apache2/mods-enabled/dav_svn.load /etc/apache2/mods-enabled/1dav_svn.load; fi
25	- @APACHECTL@ configtest \|\| mv /tmp/httpd.conf.bak @HTTPD_CONF@	25	- @APACHECTL@ configtest \|\| mv /tmp/httpd.conf.bak @HTTPD_CONF@
26	- @APACHECTL@ graceful	26	- @APACHECTL@ graceful
27	+ @APXS@ -i mod_authnz_crowd.la	27	+ @APXS@ @APXS_STAGE@ -i mod_authnz_crowd.la
28	+ @APXS@ -e -n dav_svn modules/mod_dav_svn.so	28	+ @APXS@ @APXS_STAGE@ -e -n dav_svn modules/mod_dav_svn.so
29	+ @APXS@ -i svn/mod_authz_svn_crowd.la	29	+ @APXS@ @APXS_STAGE@ -i svn/mod_authz_svn_crowd.la

Return to bug 190716