From sunpoet@sunpoet.net  Wed Feb 22 07:24:03 2012
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D8E31065676;
	Wed, 22 Feb 2012 07:24:03 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
	by mx1.freebsd.org (Postfix) with ESMTP id C7B868FC1B;
	Wed, 22 Feb 2012 07:24:02 +0000 (UTC)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 3Tt9BW4wxsz4KM; Wed, 22 Feb 2012 15:22:27 +0800 (CST)
Message-Id: <3Tt9BW4wxsz4KM@sunpoet.net>
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: [PATCH] devel/subversion: fix build/package when WITH_MOD_DONTDOTHAT is set
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:    lev
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 22 07:30:14 UTC 2012
>Closed-Date:    Sun Apr 01 18:46:37 UTC 2012
>Last-Modified:  Sun Apr  1 18:50:16 UTC 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->lev 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Feb 22 07:30:55 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165390 
State-Changed-From-To: open->closed 
State-Changed-By: lev 
State-Changed-When: Sun Apr 1 18:45:47 UTC 2012 
State-Changed-Why:  
Committed, thanx! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=165390 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/165390: commit references a PR
Date: Sun,  1 Apr 2012 18:45:18 +0000 (UTC)

 lev         2012-04-01 18:45:05 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/subversion     Makefile Makefile.common distinfo 
                          pkg-plist 
     devel/subversion/files build-outputs.mk 
                            extra-patch-enhanced-keyword 
   Log:
    (1) Update to 1.7.4.
    (2) Remove all run-time dependencies for static build.
    (3) Check for incompatible options, like static and KDE Wallet.
    (4) Move FreeBSD extended API to private include file.
    (5) Fix build of mod_dontdothat.
   
   PR:             [2] ports/166187, [5] ports/165390, [4] ports/165311.
   Feature safe: yes
   
   Revision  Changes    Path
   1.143     +36 -14    ports/devel/subversion/Makefile
   1.60      +20 -9     ports/devel/subversion/Makefile.common
   1.85      +6 -6      ports/devel/subversion/distinfo
   1.7       +31 -11    ports/devel/subversion/files/build-outputs.mk
   1.2       +26 -30    ports/devel/subversion/files/extra-patch-enhanced-keyword
   1.46      +3 -1      ports/devel/subversion/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
