[Midnightbsd-cvs] mports [17757] trunk/devel/subversion/Makefile.common: fix path to outputs file

[laffer1 at midnightbsd.org]

Revision: 17757
          http://svnweb.midnightbsd.org/mports/?rev=17757
Author:   laffer1
Date:     2014-10-14 22:22:48 -0400 (Tue, 14 Oct 2014)
Log Message:
-----------
fix path to outputs file

Modified Paths:
--------------
    trunk/devel/subversion/Makefile.common

Modified: trunk/devel/subversion/Makefile.common
===================================================================
--- trunk/devel/subversion/Makefile.common	2014-10-15 02:15:47 UTC (rev 17756)
+++ trunk/devel/subversion/Makefile.common	2014-10-15 02:22:48 UTC (rev 17757)
@@ -2,7 +2,7 @@
 
 PORTNAME?=	subversion
 PORTVERSION=	1.8.10
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES+=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 DIST_SUBDIR=	subversion18
@@ -143,6 +143,11 @@
 .endif
 .endif
 
+pre-patch:
+.if defined(SVN_BUILD_ADDONS)
+	@${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk
+.endif
+
 post-patch:
 .if ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c
@@ -150,9 +155,6 @@
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
-.if defined(SVN_BUILD_BINDINGS)
-	@${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}
-.endif
-.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION)
+.if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
 	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
 .endif