svn commit: r307029 - head/devel/subversion/files

[Olli Hauer]

On 2012-11-05 21:01, Lev A. Serebryakov wrote:
> Author: lev
> Date: Mon Nov  5 20:01:08 2012
> New Revision: 307029
> URL: http://svnweb.freebsd.org/changeset/ports/307029
> 
> Log:
>    Really remove patch, includet to upstreeam
>   
>   Feature safe: yes
> 
> Deleted:
>   head/devel/subversion/files/patch-build-outputs.mk
> 
> 

would be nice if you adapt the following diff from PR 173283

Index: Makefile.common
===================================================================
--- Makefile.common     (revision 307030)
+++ Makefile.common     (working copy)
@@ -123,6 +120,7 @@
 CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
 PLIST_SUB+=    SERF=""
 .else
+CONFIGURE_ARGS+=--without-serf
 PLIST_SUB+=    SERF="@comment "
 .endif

Else subversion builds against neon and serf if both are on the system
(openoffice build against serf and subversion against neon)

--
Regards,
olli