diff -Pru mod_authnz_crowd.old/Makefile mod_authnz_crowd/Makefile
--- mod_authnz_crowd.old/Makefile	2014-04-16 14:28:47.000000000 -0400
+++ mod_authnz_crowd/Makefile	2014-06-06 11:22:25.550288436 -0400
@@ -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,7 +16,8 @@
 LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion \
 		libcurl.so:${PORTSDIR}/ftp/curl
 
-USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
+USE_AUTOTOOLS=	autoconf:env automake:env
+USES=		libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
 USE_GCC=	any
@@ -35,12 +36,17 @@
 
 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>
diff -Pru mod_authnz_crowd.old/files/patch-src__Makefile.am mod_authnz_crowd/files/patch-src__Makefile.am
--- mod_authnz_crowd.old/files/patch-src__Makefile.am	2014-01-14 15:31:13.000000000 -0500
+++ mod_authnz_crowd/files/patch-src__Makefile.am	2014-06-06 11:22:06.693288655 -0400
@@ -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