Attachment 144098 Details for Bug 190716 – revised patch as per discussion

[patch] revised patch as per discussion

mod.patch (text/plain), 2.30 KB, created by Vick Khera on 2014-06-24 13:16:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vick Khera

Created: 2014-06-24 13:16:33 UTC

Size: 2.30 KB

patch

obsolete

>diff -Pru mod_authnz_crowd.old/Makefile mod_authnz_crowd/Makefile
>--- mod_authnz_crowd.old/Makefile	2014-05-30 15:54:01.347910000 -0400
>+++ mod_authnz_crowd/Makefile	2014-06-23 08:51:27.581427403 -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,6 +16,10 @@
> 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 +27,6 @@
> 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 +37,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-16 12:29:15.886030689 -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

Flags:

vivek: maintainer-approval+

Actions: View | Diff

Attachments on bug 190716: 143832 | 143833 | 144098