From owner-svn-ports-all@FreeBSD.ORG Sun Oct 27 18:41:34 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 776C5B5F; Sun, 27 Oct 2013 18:41:34 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6290A2605; Sun, 27 Oct 2013 18:41:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RIfY6i085027; Sun, 27 Oct 2013 18:41:34 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9RIfXCc085023; Sun, 27 Oct 2013 18:41:33 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201310271841.r9RIfXCc085023@svn.freebsd.org> From: Olli Hauer Date: Sun, 27 Oct 2013 18:41:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331798 - in head/devel/subversion17: . files 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.14 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: Sun, 27 Oct 2013 18:41:34 -0000 Author: ohauer Date: Sun Oct 27 18:41:33 2013 New Revision: 331798 URL: http://svnweb.freebsd.org/changeset/ports/331798 Log: - add STAGEDIR support Added: head/devel/subversion17/files/patch-Makefile.in (contents, props changed) Deleted: head/devel/subversion17/files/pkg-deinstall.in Modified: head/devel/subversion17/Makefile head/devel/subversion17/Makefile.common head/devel/subversion17/pkg-plist Modified: head/devel/subversion17/Makefile ============================================================================== --- head/devel/subversion17/Makefile Sun Oct 27 18:39:24 2013 (r331797) +++ head/devel/subversion17/Makefile Sun Oct 27 18:41:33 2013 (r331798) @@ -4,29 +4,39 @@ MAINTAINER= ohauer@FreeBSD.org COMMENT= Version control system -CONFLICTS_INSTALL= subversion-1.[6|8].[0-9]* +CONFLICTS_INSTALL= subversion-1.[^7].[0-9]* \ + subversion1[^7]-1.[^7].[0-9]* USE_RC_SUBR= svnserve -MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnrdump.1 \ - svnsync.1 svnversion.1 -MAN5= svnserve.conf.5 -MAN8= svnserve.8 - TXT_DOCS= BUGS CHANGES COMMITTERS INSTALL README -OPTIONS_DEFINE= P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE \ - MOD_DAV_SVN MOD_DONTDOTHAT SVNAUTHZ_VALIDATE \ - NEON SERF \ - SASL BDB \ - MAINTAINER_DEBUG \ - SVNSERVE_WRAPPER SVNMUCC \ - STATIC \ - GNOME_KEYRING KDE_KWALLET \ - BOOK TEST - -OPTIONS_DEFAULT=P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE NEON +OPTIONS_DEFINE= \ + BDB \ + BOOK \ + DOCS \ + ENHANCED_KEYWORD\ + FREEBSD_TEMPLATE\ + GNOME_KEYRING \ + KDE_KWALLET \ + MAINTAINER_DEBUG\ + MOD_DAV_SVN \ + NLS \ + NEON \ + P4_STYLE_MARKERS\ + SASL \ + SERF \ + STATIC \ + SVNSERVE_WRAPPER\ + TEST \ + TOOLS + +OPTIONS_DEFAULT=P4_STYLE_MARKERS \ + ENHANCED_KEYWORD \ + FREEBSD_TEMPLATE \ + NEON +BDB_DESC= Berkeley DB (deprected in 1.8.x) BOOK_DESC= Install the Subversion Book ENHANCED_KEYWORD_DESC= Enhanced svn:keyword support FREEBSD_TEMPLATE_DESC= FreeBSD Project log template @@ -34,17 +44,20 @@ GNOME_KEYRING_DESC= Build with GNOME Key KDE_KWALLET_DESC= Build with KDE KWallet auth support MAINTAINER_DEBUG_DESC= Build debug version MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X -MOD_DONTDOTHAT_DESC= mod_dontdothat for Apache 2.X -NEON_DESC= WebDAV/Delta-V repo access module (neon) +NEON_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module P4_STYLE_MARKERS_DESC= Perforce-style conflict markers -SERF_DESC= WebDAV/Delta-V repo access module (serf) +SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= Build static version (no shared libs) -SVNAUTHZ_VALIDATE_DESC= install svnauthz-validate -SVNMUCC_DESC= Install Multiple URL Command Client SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite +TOOLS_DESC= Install several tools (svnauthz-validate and mod_dontdothat are among them) + +# Patches required for use with the FreeBSD Project repository only +P4_STYLE_MARKERS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-3way-conflict-markers +FREEBSD_TEMPLATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd-template +SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper +ENHANCED_KEYWORD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-enhanced-keyword -NO_STAGE= yes .include "Makefile.common" EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -52,84 +65,62 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs -SUB_FILES= pkg-install \ - pkg-deinstall +SUB_FILES= pkg-install BOOK_VERSION= 4515 -.if make(repository) -WITH_REPOSITORY_CREATION= yes -.endif - -.if defined(WITH_REPOSITORY_CREATION) -MKREPOS_TARGET= _mkrepos -.endif - -# Patches required for use with the FreeBSD Project repository only -.if ${PORT_OPTIONS:MP4_STYLE_MARKERS} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers -.endif -.if ${PORT_OPTIONS:MENHANCED_KEYWORD} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-enhanced-keyword -.endif -.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template +.if !${PORT_OPTIONS:MMAINTAINER_DEBUG} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in .endif -.if empty(PORT_OPTIONS:MMAINTAINER_DEBUG) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK} +BOOK_HTML= svn-book-html-r${BOOK_VERSION}.tar.bz2 +BOOK_PDF= svn-book-r${BOOK_VERSION}.pdf +DISTFILES+= ${BOOK_HTML}:book ${BOOK_PDF}:book .endif .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} -PLIST_SUB+= SVNSERVE_WRAPPER="" SUB_LIST+= SVNSERVE_BIN_EXT=".bin" -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-svnserve-wrapper .else -PLIST_SUB+= SVNSERVE_WRAPPER="@comment " SUB_LIST+= SVNSERVE_BIN_EXT="" .endif -.if ${PORT_OPTIONS:MSVNMUCC} -PLIST_SUB+= SVNMUCC="" -.else -PLIST_SUB+= SVNMUCC="@comment " -.endif - -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK} -BOOK_HTML= svn-book-html-r${BOOK_VERSION}.tar.bz2 -BOOK_PDF= svn-book-r${BOOK_VERSION}.pdf -DISTFILES+= ${BOOK_HTML}:book ${BOOK_PDF}:book -PLIST_SUB+= BOOK="" +.if ${PORT_OPTIONS:MMOD_DAV_SVN} +SUB_LIST+= MOD_DAV_SVN_INSTALL="YES" +PLIST_SUB+= SED=${SED} +SVNGROUP?= www +SVNUSER?= www .else -PLIST_SUB+= BOOK="@comment " +SUB_LIST+= MOD_DAV_SVN_INSTALL="NO" +SVNGROUP?= svn +SVNUSER?= svn .endif -# testsuite will fail until PR156076 is committed .if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .endif -#.if ${PORT_OPTIONS:MASVN} -#RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils -#PLIST_SUB+= ASVN="" -#.else -PLIST_SUB+= ASVN="@comment " -#.endif - -SCRIPTS= - -SCRIPTS_DATA= - .if ${PORT_OPTIONS:MSTATIC} -.if ${PORT_OPTIONS:MNLS} -USES+= gettext:build -.endif -.if ${PORT_OPTIONS:MBDB} +. if ${PORT_OPTIONS:MNLS} +USES+= gettext:build +. endif +. if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes -.endif +. endif OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= +PLIST_SUB+= DYNAMIC_ENABLED="@comment " +.else +PLIST_SUB+= DYNAMIC_ENABLED="" +.endif + +.if make(repository) +WITH_REPOSITORY_CREATION= yes +.endif + +.if defined(WITH_REPOSITORY_CREATION) +MKREPOS_TARGET= _mkrepos .endif pre-everything:: @@ -151,38 +142,29 @@ pre-everything:: @${ECHO_MSG} " subdirectories of your repository" @${ECHO_MSG} "* the above subdirectories are writable by this group" .endif + @${ECHO_MSG} "" -.if !defined(NOPORTDOCS) && ${PORT_OPTIONS:MBOOK} - @${ECHO_MSG} "Subversion Book will be installed." - @${ECHO_MSG} "" -.endif .if ${PORT_OPTIONS:MSTATIC} -.if ${PORT_OPTIONS:MMOD_DAV_SVN} +. if ${PORT_OPTIONS:MMOD_DAV_SVN} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} -.endif -.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE} - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO_MSG} "!!! svnauthz_validate and static build are not compatible !!!" - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${FALSE} -.endif -.if ${PORT_OPTIONS:MGNOME_KEYRING} +. endif +. if ${PORT_OPTIONS:MGNOME_KEYRING} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! Gnome Keyring and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} -.endif -.if ${PORT_OPTIONS:MKDE_WALLET} +. endif +. if ${PORT_OPTIONS:MKDE_WALLET} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! KDE Wallet and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} -.endif +. endif @${ECHO_MSG} "Static binaries will be built." -.endif +.endif # STATIC @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: @@ -190,8 +172,8 @@ pre-configure: @BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \ if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" ] ; then \ ${ECHO_MSG} "" ; \ - ${ECHO_MSG} 'You should build `'"${APR_PORT}' with Berkeley DB (4 or 5) support to use subversion with it." ; \ - ${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ + ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4 or 5) support to use subversion with it." ; \ + ${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "" ; \ @@ -199,7 +181,7 @@ pre-configure: fi .endif .if ${PORT_OPTIONS:MSTATIC} - @if grep -q icui18n ${LOCALBASE}/lib/libsqlite3.la ; then \ + @if ${GREP} -q icui18n ${LOCALBASE}/lib/libsqlite3.la ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "You can not build static subversion if your SQLite3 is built with ICU enabled."; \ ${ECHO_MSG} "Please, reinstall 'devel/sqlite3' port with disabled ICU support."; \ @@ -208,61 +190,43 @@ pre-configure: fi .endif +post-configure: +# ugly hack: save tools directory so we don't have to cleanup before installing + @${CP} -R ${WRKSRC}/tools ${WRKSRC}/tools.examples + @${CHMOD} -R a-st,o+rX ${WRKSRC}/tools.examples + # takes a long time, and will fail but gives maintainer a good oversight .if ${PORT_OPTIONS:MTEST} -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 test: build -@make check -C ${WRKSRC} .endif -pre-install: -.if ${PORT_OPTIONS:MMOD_DAV_SVN} -# activate dav_module now in pkg-install to prevent double activation. -# workaround for apxs bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=47397 - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL +post-build: +.if ${PORT_OPTIONS:MTOOLS} + @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} .endif post-install: ${MKREPOS_TARGET} -.if ${PORT_OPTIONS:MMOD_DAV_SVN} - ${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 ${PORT_OPTIONS:MMOD_DONTDOTHAT} - ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so -. endif -.endif -.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE} - ${LIBTOOL} --mode=install ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/tools/server-side/svnauthz-validate ${PREFIX}/bin -.endif - @${MKDIR} ${DATADIR} - cd ${WRKSRC}/tools ; \ - ${TAR} --exclude '*.in' --exclude '.libs' --exclude '*.o' --exclude '*.lo' --exclude '*.la' --exclude='*.slo' -cf - * | ${TAR} -C ${DATADIR} -xf - -# ugly hack to remove libtool scripts ... - @${GREP} -R ${WRKSRC} ${DATADIR} | ${CUT} -d\: -f 1 | ${XARGS} ${RM} -f - @${CHMOD} -R a-st,o+rX ${DATADIR} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - for f in ${TXT_DOCS}; do \ - ${INSTALL_MAN} ${WRKSRC}/$$f ${DOCSDIR}; \ - done -. if ${PORT_OPTIONS:MBOOK} - ${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR} - ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR}/svn-book.pdf -. endif +.if ${PORT_OPTIONS:MTOOLS} + @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} .endif -.if ${PORT_OPTIONS:MASVN} - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR} + @(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) + +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${TXT_DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} +. if ${PORT_OPTIONS:MBOOK} + ${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${STAGEDIR}${DOCSDIR}/svn-book.pdf +. endif .endif + .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} - @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve -.endif -.if ${PORT_OPTIONS:MSVNMUCC} -. if ${PORT_OPTIONS:MSTATIC} - @${INSTALL} ${WRKSRC}/tools/client-side/svnmucc/svnmucc ${PREFIX}/bin -. else - @${INSTALL} ${WRKSRC}/tools/client-side/svnmucc/.libs/svnmucc ${PREFIX}/bin -. endif + @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve .endif +# =============================================================================== repository: _mkrepos _SVNGRPFILES= db locks locks/db.lock locks/db-logs.lock Modified: head/devel/subversion17/Makefile.common ============================================================================== --- head/devel/subversion17/Makefile.common Sun Oct 27 18:39:24 2013 (r331797) +++ head/devel/subversion17/Makefile.common Sun Oct 27 18:41:33 2013 (r331798) @@ -11,6 +11,8 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:ma DIST_SUBDIR= subversion17 MASTER_SITE_SUBDIR= subversion/:main \ lev/:book +# setting PKGSUFFIX not possible wo. having a Mk/Uses file and fixing a bunch of ports +#PKGNAMESUFFIX= 17 USE_BZIP2= yes USE_AUTOTOOLS= libtool @@ -18,149 +20,88 @@ USE_KDE4= # Used below if KWallet suppor LICENSE= AL2 -CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|8].[0-9]* -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}17${PKGNAMESUFFIX} +CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^7].[0-9]* -LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ +LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libexpat.so:${PORTSDIR}/textproc/expat2 -CONFIGURE_ARGS+= --with-ssl \ - --without-swig \ +CONFIGURE_ARGS+= --without-swig \ + --with-ssl \ --with-sqlite=${LOCALBASE} \ - --with-expat=/usr/local/include:/usr/local/lib:expat + --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat .if defined(SVN_BUILD_BINDINGS) -CONFLICTS_BUILD+= ${PORTNAME}-1.[6|8].[0-9]* +CONFLICTS_BUILD+= ${PORTNAME}-1.[^7].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion17 OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included .endif +# =============================================================== +OPTIONS_SUB= yes + +BDB_CONFIGURE_OFF= --without-berkeley-db +BDB_USE= BDB=42+ + +GNOME_KEYRING_CONFIGURE_OFF= --without-gnome-keyring +GNOME_KEYRING_CONFIGURE_ON= --with-gnome-keyring +GNOME_KEYRING_LIB_DEPENDS= libgcr.so:${PORTSDIR}/security/gnome-keyring + +KDE_KWALLET_CONFIGURE_OFF= --without-kwallet +KDE_KWALLET_CONFIGURE_ON= --with-kwallet=${KDE4_PREFIX} +KDE_KWALLET_USE= KDE4=kdelibs runtime + +MAINTAINER_DEBUG_CFLAGS= -g +MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug + +MOD_DAV_SVN_CONFIGURE_OFF= --with-apxs=no +MOD_DAV_SVN_CONFIGURE_ON= --with-apxs=${APXS} +MOD_DAV_SVN_USE= APACHE=22+ + +NEON_CONFIGURE_OFF= --without-neon +NEON_CONFIGURE_ON= --with-neon=${LOCALBASE} +NEON_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 + +NLS_CONFIGURE_OFF= --disable-nls +NLS_USES= gettext + +SASL_CONFIGURE_OFF= --without-sasl +SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} +SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 + +SERF_CONFIGURE_OFF= --without-serf +SERF_CONFIGURE_ON= --with-serf=${LOCALBASE} +SERF_LIB_DEPENDS= libserf-1.so:${PORTSDIR}/www/serf + +STATIC_CONFIGURE_ON= --enable-all-static + +# =============================================================== .include -# Default is "on" -.if ${PORT_OPTIONS:MNEON} -LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29 -PLIST_SUB+= NEON="" -.else -CONFIGURE_ARGS+=--without-neon -PLIST_SUB+= NEON="@comment " -.endif - -.if ${PORT_OPTIONS:MSASL} -LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 -CONFIGURE_ARGS+=--with-sasl=${LOCALBASE} -PLIST_SUB+= SASL="" -.else -CONFIGURE_ARGS+=--without-sasl -PLIST_SUB+= SASL="@comment " -.endif - -# Default is "on" -.if ${PORT_OPTIONS:MBDB} -USE_BDB= 42+ -PLIST_SUB+= BDB="" -.else -CONFIGURE_ARGS+=--without-berkeley-db -PLIST_SUB+= BDB="@comment " -.endif - -.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && empty(PORT_OPTIONS:MMOD_DAV_SVN) -IGNORE= to build mod_dontdothat option mod_dav_svn is required -.endif - -.if ${PORT_OPTIONS:MMOD_DAV_SVN} -USE_APACHE= 22+ -CONFIGURE_ARGS+=--with-apxs=${APXS} -PLIST_SUB+= MOD_DAV_SVN="" -SUB_LIST+= MOD_DAV_SVN_INSTALL="YES" -SVNGROUP?= www -SVNUSER?= www -. if ${PORT_OPTIONS:MMOD_DONTDOTHAT} -PLIST_SUB+= MOD_DONTDOTHAT="" -. else -PLIST_SUB+= MOD_DONTDOTHAT="@comment " -. endif -.else -CONFIGURE_ARGS+=--with-apxs=no -PLIST_SUB+= MOD_DAV_SVN="@comment " -PLIST_SUB+= MOD_DONTDOTHAT="@comment " -SUB_LIST+= MOD_DAV_SVN_INSTALL="NO" -SVNGROUP?= svn -SVNUSER?= svn -.endif - -LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 -APR_CONFIG= ${LOCALBASE}/bin/apr-1-config -APU_CONFIG= ${LOCALBASE}/bin/apu-1-config - -CONFIGURE_ARGS+= --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG} - -.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE} -APR_INCLUDE_DIR!= ${APR_CONFIG} --includedir -PLIST_SUB+= SVNAUTHZ_VALIDATE="" -.else -PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment " -.endif - -.if ${PORT_OPTIONS:MSERF} -LIB_DEPENDS+= libserf-1.so:${PORTSDIR}/www/serf -CONFIGURE_ARGS+=--with-serf=${LOCALBASE} -PLIST_SUB+= SERF="" -.else -CONFIGURE_ARGS+=--without-serf -PLIST_SUB+= SERF="@comment " +.if ${PORT_OPTIONS:MBOOK} && !${PORT_OPTIONS:MDOCS} +IGNORE= SVN book requires OPTION DOCS set to ON .endif -.if defined(SVN_BUILD_BINDINGS) -LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion17 +.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && !${PORT_OPTIONS:MMOD_DAV_SVN} +IGNORE= to build mod_dontdothat OPTION mod_dav_svn is required .endif -# KWallet requires NLS to be enabled. -.if ${PORT_OPTIONS:MNLS} || ${PORT_OPTIONS:MKDE_KWALLET} -USES+= gettext -PLIST_SUB+= WITHOUT_GETTEXT="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= WITHOUT_GETTEXT="@comment " +.if ${PORT_OPTIONS:MKDE_KWALLET} && !${PORT_OPTIONS:MNLS} +IGNORE= KWallet requires OPTION NLS set to ON .endif +APR_CONFIG= ${LOCALBASE}/bin/apr-1-config +APU_CONFIG= ${LOCALBASE}/bin/apu-1-config + +CONFIGURE_ARGS+=--with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG} + .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fpic -DPIC .endif -.if ${PORT_OPTIONS:MMAINTAINER_DEBUG} -CONFIGURE_ARGS+=--enable-maintainer-mode --enable-debug -CFLAGS+= -g -.endif - .if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) -CFLAGS+= -DHAS_ORGANIZATION_NAME -.endif - -.if ${PORT_OPTIONS:MSTATIC} -CONFIGURE_ARGS+=--enable-all-static -PLIST_SUB+= DYNAMIC_ENABLED="@comment " -.else -PLIST_SUB+= DYNAMIC_ENABLED="" -.endif - -.if ${PORT_OPTIONS:MGNOME_KEYRING} -LIB_DEPENDS+= libgcr.so:${PORTSDIR}/security/gnome-keyring -CONFIGURE_ARGS+=--with-gnome-keyring -PLIST_SUB+= GNOME_KEYRING="" -.else -CONFIGURE_ARGS+=--without-gnome-keyring -PLIST_SUB+= GNOME_KEYRING="@comment " -.endif - -.if ${PORT_OPTIONS:MKDE_KWALLET} -USE_KDE4= kdelibs runtime -CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX} -PLIST_SUB+= KDE_KWALLET="" -.else -CONFIGURE_ARGS+=--without-kwallet -PLIST_SUB+= KDE_KWALLET="@comment " +CFLAGS+= -DHAS_ORGANIZATION_NAME .endif .include Added: head/devel/subversion17/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/subversion17/files/patch-Makefile.in Sun Oct 27 18:41:33 2013 (r331798) @@ -0,0 +1,15 @@ +======================================================================== +This patch is required to build SVN Apache modules with staging support +======================================================================== +--- ./Makefile.in.orig 2013-10-21 19:51:16.000000000 +0200 ++++ ./Makefile.in 2013-10-21 19:51:31.000000000 +0200 +@@ -209,7 +209,8 @@ + LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) + + # special link rule for mod_dav_svn +-LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) ++LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -inst-prefix-dir ${DESTDIR} ++ + + # Special LDFLAGS for some libraries + libsvn_auth_gnome_keyring_LDFLAGS = @libsvn_auth_gnome_keyring_LDFLAGS@ Modified: head/devel/subversion17/pkg-plist ============================================================================== --- head/devel/subversion17/pkg-plist Sun Oct 27 18:39:24 2013 (r331797) +++ head/devel/subversion17/pkg-plist Sun Oct 27 18:41:33 2013 (r331798) @@ -1,15 +1,20 @@ @comment $FreeBSD$ bin/svn +%%TOOLS%%bin/svn-tools/diff +%%TOOLS%%bin/svn-tools/diff3 +%%TOOLS%%bin/svn-tools/diff4 +%%TOOLS%%bin/svn-tools/svn-populate-node-origins-index +%%TOOLS%%bin/svn-tools/svn-rep-sharing-stats +%%TOOLS%%bin/svn-tools/svnauthz-validate +%%TOOLS%%bin/svn-tools/svnmucc +%%TOOLS%%bin/svn-tools/svnraisetreeconflict bin/svnadmin bin/svndumpfilter bin/svnlook bin/svnrdump bin/svnserve -bin/svnsync -%%ASVN%%bin/asvn -%%SVNAUTHZ_VALIDATE%%bin/svnauthz-validate %%SVNSERVE_WRAPPER%%bin/svnserve.bin -%%SVNMUCC%%bin/svnmucc +bin/svnsync bin/svnversion include/subversion-1/mod_authz_svn.h include/subversion-1/mod_dav_svn.h @@ -55,7 +60,6 @@ include/subversion-1/svn_utf.h include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h -@dirrm include/subversion-1 %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la %%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so @@ -96,14 +100,14 @@ lib/libsvn_ra-1.a lib/libsvn_ra-1.la %%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so %%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0 -%%NEON%%lib/libsvn_ra_neon-1.a -%%NEON%%lib/libsvn_ra_neon-1.la -%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so -%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0 lib/libsvn_ra_local-1.a lib/libsvn_ra_local-1.la %%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so %%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0 +%%NEON%%lib/libsvn_ra_neon-1.a +%%NEON%%lib/libsvn_ra_neon-1.la +%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so +%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0 lib/libsvn_ra_svn-1.a lib/libsvn_ra_svn-1.la %%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so @@ -124,6 +128,25 @@ lib/libsvn_wc-1.a lib/libsvn_wc-1.la %%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so %%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0 +@comment enable modules in this order: dav_svn, authz_svn, dontdothat +%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf +%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n dav_svn %D/%F +%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+authz_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf +%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n authz_svn %D/%F +%%MOD_DAV_SVN%%%%TOOLS%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf +%%MOD_DAV_SVN%%%%TOOLS%%%%APACHEMODDIR%%/mod_dontdothat.so +%%MOD_DAV_SVN%%%%TOOLS%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F +man/man1/svn.1.gz +man/man1/svnadmin.1.gz +man/man1/svndumpfilter.1.gz +man/man1/svnlook.1.gz +man/man1/svnrdump.1.gz +man/man1/svnsync.1.gz +man/man1/svnversion.1.gz +man/man5/svnserve.conf.5.gz +man/man8/svnserve.8.gz %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COMMITTERS @@ -150,18 +173,18 @@ lib/libsvn_wc-1.la %%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/styles.css %%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/svn-book.html %%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book.pdf -%%WITHOUT_GETTEXT%%share/locale/de/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/es/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/fr/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/it/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/ja/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/ko/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/nb/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/pl/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/pt_BR/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/sv/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/zh_CN/LC_MESSAGES/subversion.mo -%%WITHOUT_GETTEXT%%share/locale/zh_TW/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/de/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/es/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/fr/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/it/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/ja/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/ko/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/nb/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/pl/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/sv/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/subversion.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/subversion.mo %%DATADIR%%/backup/hot-backup.py %%DATADIR%%/bdb/erase-all-text-data.py %%DATADIR%%/bdb/skel.py @@ -169,12 +192,13 @@ lib/libsvn_wc-1.la %%DATADIR%%/bdb/svnfs.py %%DATADIR%%/bdb/whatis-rep.py %%DATADIR%%/buildbot/master/Feeder.py +%%DATADIR%%/buildbot/master/SVNMailNotifier.py %%DATADIR%%/buildbot/master/master.cfg %%DATADIR%%/buildbot/master/private-sample.py %%DATADIR%%/buildbot/master/public_html/buildbot.css %%DATADIR%%/buildbot/master/public_html/index.html %%DATADIR%%/buildbot/master/public_html/robots.txt -%%DATADIR%%/buildbot/master/SVNMailNotifier.py +%%DATADIR%%/buildbot/slaves/README %%DATADIR%%/buildbot/slaves/bb-openbsd/svnbuild.sh %%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck-bindings.sh %%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck.sh @@ -190,7 +214,6 @@ lib/libsvn_wc-1.la %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnclean.sh %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnlog.sh %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c -%%DATADIR%%/buildbot/slaves/README %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh @@ -230,8 +253,8 @@ lib/libsvn_wc-1.la %%DATADIR%%/client-side/svn-graph.pl %%DATADIR%%/client-side/svn-ssl-fingerprints.sh %%DATADIR%%/client-side/svn-viewspec.py -%%DATADIR%%/client-side/svnmucc/svnmucc.c %%DATADIR%%/client-side/svnmucc/svnmucc-test.py +%%DATADIR%%/client-side/svnmucc/svnmucc.c %%DATADIR%%/client-side/wcfind %%DATADIR%%/dev/analyze-svnlogs.py %%DATADIR%%/dev/benchmarks/large_dirs/create_bigdir.sh @@ -285,9 +308,9 @@ lib/libsvn_wc-1.la %%DATADIR%%/dev/wc-ng/graph-data.py %%DATADIR%%/dev/wc-ng/populate-pristine.py %%DATADIR%%/dev/which-error.py -%%DATADIR%%/dev/windows-build/document-version.pl %%DATADIR%%/dev/windows-build/Makefile %%DATADIR%%/dev/windows-build/README +%%DATADIR%%/dev/windows-build/document-version.pl %%DATADIR%%/diff/diff.c %%DATADIR%%/diff/diff3.c %%DATADIR%%/diff/diff4.c @@ -308,19 +331,19 @@ lib/libsvn_wc-1.la %%DATADIR%%/dist/templates/stable-candidates.ezt %%DATADIR%%/dist/templates/stable-release-ann.ezt %%DATADIR%%/dist/test.sh +%%DATADIR%%/examples/SvnCLBrowse %%DATADIR%%/examples/blame.py %%DATADIR%%/examples/check-modified.py %%DATADIR%%/examples/dumpprops.py -%%DATADIR%%/examples/info.rb %%DATADIR%%/examples/get-location-segments.py %%DATADIR%%/examples/getfile.py %%DATADIR%%/examples/getlocks_test.c %%DATADIR%%/examples/geturl.py %%DATADIR%%/examples/headrev.c +%%DATADIR%%/examples/info.rb %%DATADIR%%/examples/minimal_client.c %%DATADIR%%/examples/putfile.py %%DATADIR%%/examples/revplist.py -%%DATADIR%%/examples/SvnCLBrowse %%DATADIR%%/examples/svnlog2html.rb %%DATADIR%%/examples/svnlook.py %%DATADIR%%/examples/svnlook.rb @@ -347,9 +370,9 @@ lib/libsvn_wc-1.la %%DATADIR%%/hook-scripts/verify-po.py %%DATADIR%%/po/l10n-report.py %%DATADIR%%/po/po-update.sh +%%DATADIR%%/server-side/fsfs-reshard.py %%DATADIR%%/server-side/mod_dontdothat/README %%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c -%%DATADIR%%/server-side/fsfs-reshard.py %%DATADIR%%/server-side/svn-backup-dumps.py %%DATADIR%%/server-side/svn-populate-node-origins-index.c %%DATADIR%%/server-side/svn-rep-sharing-stats.c @@ -358,50 +381,46 @@ lib/libsvn_wc-1.la %%DATADIR%%/server-side/test_svn_server_log_parse.py %%DATADIR%%/xslt/svnindex.css %%DATADIR%%/xslt/svnindex.xsl -%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so -%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n authz_svn libexec/%%APACHEDIR%%/mod_authz_svn.so -%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so -%%MOD_DONTDOTHAT%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dontdothat libexec/%%APACHEDIR%%/mod_dontdothat.so -%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images -%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/backup -@dirrm %%DATADIR%%/bdb -@dirrm %%DATADIR%%/buildbot/master/public_html -@dirrm %%DATADIR%%/buildbot/master -@dirrm %%DATADIR%%/buildbot/slaves/bb-openbsd -@dirrm %%DATADIR%%/buildbot/slaves/centos -@dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1 -@dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared -@dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf -@dirrm %%DATADIR%%/buildbot/slaves/ubuntu-x64 -@dirrm %%DATADIR%%/buildbot/slaves/win32-SharpSvn -@dirrm %%DATADIR%%/buildbot/slaves/win32-xp-VS2005 -@dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32 -@dirrm %%DATADIR%%/buildbot/slaves -@dirrm %%DATADIR%%/buildbot -@dirrm %%DATADIR%%/client-side/svnmucc -@dirrm %%DATADIR%%/client-side -@dirrm %%DATADIR%%/dev/benchmarks/large_dirs -@dirrm %%DATADIR%%/dev/benchmarks/suite1 -@dirrm %%DATADIR%%/dev/benchmarks -@dirrm %%DATADIR%%/dev/iz -@dirrm %%DATADIR%%/dev/svnraisetreeconflict -@dirrm %%DATADIR%%/dev/unix-build -@dirrm %%DATADIR%%/dev/wc-ng -@dirrm %%DATADIR%%/dev/windows-build -@dirrm %%DATADIR%%/dev -@dirrm %%DATADIR%%/diff -@dirrm %%DATADIR%%/dist/templates -@dirrm %%DATADIR%%/dist -@dirrm %%DATADIR%%/examples +@dirrm %%DATADIR%%/xslt +@dirrm %%DATADIR%%/server-side/mod_dontdothat +@dirrm %%DATADIR%%/server-side +@dirrm %%DATADIR%%/po @dirrm %%DATADIR%%/hook-scripts/mailer/tests @dirrm %%DATADIR%%/hook-scripts/mailer @dirrm %%DATADIR%%/hook-scripts -@dirrm %%DATADIR%%/po -@dirrm %%DATADIR%%/server-side/mod_dontdothat -@dirrm %%DATADIR%%/server-side -@dirrm %%DATADIR%%/xslt +@dirrm %%DATADIR%%/examples +@dirrm %%DATADIR%%/dist/templates +@dirrm %%DATADIR%%/dist +@dirrm %%DATADIR%%/diff +@dirrm %%DATADIR%%/dev/windows-build +@dirrm %%DATADIR%%/dev/wc-ng +@dirrm %%DATADIR%%/dev/unix-build +@dirrm %%DATADIR%%/dev/svnraisetreeconflict +@dirrm %%DATADIR%%/dev/iz +@dirrm %%DATADIR%%/dev/benchmarks/suite1 +@dirrm %%DATADIR%%/dev/benchmarks/large_dirs +@dirrm %%DATADIR%%/dev/benchmarks +@dirrm %%DATADIR%%/dev +@dirrm %%DATADIR%%/client-side/svnmucc +@dirrm %%DATADIR%%/client-side +@dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32 +@dirrm %%DATADIR%%/buildbot/slaves/win32-xp-VS2005 +@dirrm %%DATADIR%%/buildbot/slaves/win32-SharpSvn +@dirrm %%DATADIR%%/buildbot/slaves/ubuntu-x64 +@dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf +@dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared +@dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1 +@dirrm %%DATADIR%%/buildbot/slaves/centos +@dirrm %%DATADIR%%/buildbot/slaves/bb-openbsd +@dirrm %%DATADIR%%/buildbot/slaves +@dirrm %%DATADIR%%/buildbot/master/public_html +@dirrm %%DATADIR%%/buildbot/master +@dirrm %%DATADIR%%/buildbot +@dirrm %%DATADIR%%/bdb +@dirrm %%DATADIR%%/backup @dirrm %%DATADIR%% +%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images +%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm include/subversion-1 +%%TOOLS%%@dirrm bin/svn-tools