From owner-svn-ports-all@FreeBSD.ORG Wed Aug 13 11:35:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9469D8BB; Wed, 13 Aug 2014 11:35:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 80CA929FD; Wed, 13 Aug 2014 11:35:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7DBZwAa073068; Wed, 13 Aug 2014 11:35:58 GMT (envelope-from lev@FreeBSD.org) Received: (from lev@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7DBZwJX073067; Wed, 13 Aug 2014 11:35:58 GMT (envelope-from lev@FreeBSD.org) Message-Id: <201408131135.s7DBZwJX073067@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lev set sender to lev@FreeBSD.org using -f From: "Lev A. Serebryakov" Date: Wed, 13 Aug 2014 11:35:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364781 - head/devel/subversion X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Aug 2014 11:35:58 -0000 Author: lev Date: Wed Aug 13 11:35:57 2014 New Revision: 364781 URL: http://svnweb.freebsd.org/changeset/ports/364781 QAT: https://qat.redports.org/buildarchive/r364781/ Log: Properly build addons, with all (future) patches to build-outputs.mk Modified: head/devel/subversion/Makefile.common Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Wed Aug 13 11:03:04 2014 (r364780) +++ head/devel/subversion/Makefile.common Wed Aug 13 11:35:57 2014 (r364781) @@ -3,7 +3,7 @@ PORTNAME?= subversion PORTVERSION= 1.8.10 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion18 @@ -90,6 +90,11 @@ pre-everything:: .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 @@ -97,9 +102,6 @@ post-patch: .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_ADDONS) - @${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk -.endif .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h .endif