svn commit: r359297 - in head/www/mod_authnz_crowd: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Wed Jun 25 19:55:04 2014
New Revision: 359297
URL: http://svnweb.freebsd.org/changeset/ports/359297
QAT: https://qat.redports.org/buildarchive/r359297/

Log:
  - Support staging.
  - Depend on www/mod_dav_svn so the port can be built as a package.
  
  PR:		190716
  Submitted by:	Vick Khera <vivek at khera.org> (maintainer)

Modified:
  head/www/mod_authnz_crowd/Makefile
  head/www/mod_authnz_crowd/files/patch-src__Makefile.am

Modified: head/www/mod_authnz_crowd/Makefile
==============================================================================
--- head/www/mod_authnz_crowd/Makefile	Wed Jun 25 19:54:13 2014	(r359296)
+++ head/www/mod_authnz_crowd/Makefile	Wed Jun 25 19:55:04 2014	(r359297)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_authnz_crowd
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.atlassian.com/software/crowd/downloads/cwdapache/
 DIST_SUBDIR=	apache2
@@ -16,6 +16,8 @@ LICENSE=	APACHE20
 LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion \
 		libcurl.so:${PORTSDIR}/ftp/curl
 
+RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_dav_svn.so:${PORTSDIR}/www/mod_dav_svn
+
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
@@ -23,8 +25,6 @@ USE_GCC=	any
 USE_APACHE=	22
 MAKE_JOBS_SAFE= yes
 
-MANUAL_PACKAGE_BUILD=	requires subversion build with MOD_DAV_SVN.
-
 SUB_FILES=	pkg-message zzz_authnz_crowd.conf
 SUB_LIST+=	APACHEETCDIR=${APACHEETCDIR} \
 		APACHEMODDIR=${APACHEMODDIR}
@@ -35,12 +35,17 @@ PLIST_FILES=	${APACHEMODDIR}/mod_authnz_
 
 LDFLAGS+=	-L${PREFIX}/lib
 
-NO_STAGE=	yes
+post-patch:
+	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \
+		${WRKSRC}/src/Makefile.am
+
+pre-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes
+
+
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/zzz_authnz_crowd.conf \
-		${PREFIX}/${APACHEETCDIR}/Includes/
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
+		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes/
 
 .include <bsd.port.mk>

Modified: head/www/mod_authnz_crowd/files/patch-src__Makefile.am
==============================================================================
--- head/www/mod_authnz_crowd/files/patch-src__Makefile.am	Wed Jun 25 19:54:13 2014	(r359296)
+++ head/www/mod_authnz_crowd/files/patch-src__Makefile.am	Wed Jun 25 19:55:04 2014	(r359297)
@@ -24,6 +24,6 @@
 -	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
 -	@APACHECTL@ configtest || mv /tmp/httpd.conf.bak @HTTPD_CONF@
 -	@APACHECTL@ graceful
-+	@APXS@ -i mod_authnz_crowd.la
-+	@APXS@ -e -n dav_svn modules/mod_dav_svn.so
-+	@APXS@ -i svn/mod_authz_svn_crowd.la
++	@APXS@ @APXS_STAGE@ -i mod_authnz_crowd.la
++	@APXS@ @APXS_STAGE@ -e -n dav_svn modules/mod_dav_svn.so
++	@APXS@ @APXS_STAGE@ -i svn/mod_authz_svn_crowd.la