Date: Wed, 22 Feb 2012 15:22:27 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lev@FreeBSD.org Subject: ports/165390: [PATCH] devel/subversion: fix build/package when WITH_MOD_DONTDOTHAT is set Message-ID: <3Tt9BW4wxsz4KM@sunpoet.net> Resent-Message-ID: <201202220730.q1M7UEI7021882@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 165390
>Category: ports
>Synopsis: [PATCH] devel/subversion: fix build/package when WITH_MOD_DONTDOTHAT is set
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 22 07:30:14 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 9.0-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Sun Jan 29 23:36:49 CST 2012
>Description:
- Fix build/package when WITH_MOD_DONTDOTHAT is set
Port maintainer (lev@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- subversion-1.7.3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/subversion/Makefile,v
retrieving revision 1.140
diff -u -u -r1.140 Makefile
--- Makefile 14 Feb 2012 16:06:21 -0000 1.140
+++ Makefile 21 Feb 2012 16:38:45 -0000
@@ -190,7 +190,7 @@
post-build:
.if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT)
- cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
+ cd ${WRKSRC}/tools/server-side/mod_dontdothat && \
${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_subr-1 mod_dontdothat.c
.endif
# subversion 1.7+ -- it is not optional
@@ -213,7 +213,7 @@
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREFIX}/${APACHEMODDIR}/mod_dav_svn.so
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so
.if defined(WITH_MOD_DONTDOTHAT)
- cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
+ cd ${WRKSRC}/tools/server-side/mod_dontdothat && \
${APXS} -i -n dontdothat mod_dontdothat.la
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
.endif
@@ -236,7 +236,7 @@
.endif
.endif
.if defined(WITH_ASVN)
- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/client-side/asvn ${PREFIX}/bin
.endif
.if defined(WITH_SVNSERVE_WRAPPER)
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/subversion/pkg-plist,v
retrieving revision 1.45
diff -u -u -r1.45 pkg-plist
--- pkg-plist 14 Feb 2012 16:06:21 -0000 1.45
+++ pkg-plist 21 Feb 2012 16:38:45 -0000
@@ -353,6 +353,8 @@
%%DATADIR%%/po/po-update.sh
%%DATADIR%%/server-side/mod_dontdothat/README
%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c
+%%MOD_DONTDOTHAT%%%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.la
+%%MOD_DONTDOTHAT%%%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.slo
%%DATADIR%%/server-side/fsfs-reshard.py
%%DATADIR%%/server-side/svn-backup-dumps.py
%%DATADIR%%/server-side/svn-populate-node-origins-index
--- subversion-1.7.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3Tt9BW4wxsz4KM>