Index: head/devel/subversion/Makefile =================================================================== --- head/devel/subversion/Makefile (revision 401688) +++ head/devel/subversion/Makefile (revision 401689) @@ -1,228 +1,231 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ PORTREVISION= 1 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system CONFLICTS_INSTALL= subversion-1.[^9].[0-9]* \ subversion1[^9]-1.[^9].[0-9]* USE_RC_SUBR= svnserve PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ DOCS \ FREEBSD_TEMPLATE\ MAINTAINER_DEBUG\ NLS \ SASL \ SERF \ STATIC \ SVNSERVE_WRAPPER\ TEST \ TOOLS OPTIONS_DEFAULT=FREEBSD_TEMPLATE \ SERF TOOLS FREEBSD_TEMPLATE_DESC= FreeBSD Project log template MAINTAINER_DEBUG_DESC= Build debug version SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= Build static version (no shared libs) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools # Patches required for use with the FreeBSD Project repository only FREEBSD_TEMPLATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd-template SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper .include "Makefile.common" SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs SVNGROUP?= svn SVNUSER?= svn CONFIGURE_ARGS+= --without-gnome-keyring \ --without-kwallet \ --with-apxs=no .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} SUB_LIST+= SVNSERVE_BIN_EXT=".bin" PLIST_SUB+= NO_SVNSERVE_WRAPPER="@comment " .else SUB_LIST+= SVNSERVE_BIN_EXT="" PLIST_SUB+= NO_SVNSERVE_WRAPPER="" .endif .if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .endif .if ${PORT_OPTIONS:MSTATIC} . if ${PORT_OPTIONS:MNLS} USES+= gettext-tools . endif . if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes . endif OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= .endif .if ${PORT_OPTIONS:MBDB} CONFIGURE_ARGS+= --enable-bdb6 .else CONFIGURE_ARGS+= --without-berkeley-db .endif .if make(repository) WITH_REPOSITORY_CREATION= yes .endif .if defined(WITH_REPOSITORY_CREATION) MKREPOS_TARGET= _mkrepos .endif pre-everything:: @${ECHO_MSG} "" .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group." @${ECHO_MSG} "Make sure that all committers are its members." @${ECHO_MSG} "" @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with user '${SVNUSER}' and group '${SVNGROUP}'." @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @${ECHO_MSG} "" @${ECHO_MSG} "Make sure that:" @${ECHO_MSG} "* all your svn users are members of a common group" @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${ECHO_MSG} " subdirectories of your repository" @${ECHO_MSG} "* the above subdirectories are writable by this group" .endif @${ECHO_MSG} "" .if ${PORT_OPTIONS:MSTATIC} @${ECHO_MSG} "Static binaries will be built." .endif # STATIC @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: .if ${PORT_OPTIONS:MBDB} @BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \ if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5 or 6) support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif .if ${PORT_OPTIONS:MSTATIC} @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."; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif post-configure: # Enable GNOME Keyring / KWallet support in main code, as it is harmless @${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h # 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: build -@make check -C ${WRKSRC} .endif -post-build: -.if ${PORT_OPTIONS:MTOOLS} +post-build-TOOLS-on: @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} -.endif post-install: ${MKREPOS_TARGET} -.if ${PORT_OPTIONS:MTOOLS} - @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} -.endif + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} +post-install-STATIC-off: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + post-install-SVNSERVE_WRAPPER-on: @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample + +post-install-TOOLS-on: + @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* # =============================================================================== repository: _mkrepos _SVNGRPFILES= db locks locks/db.lock locks/db-logs.lock SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,} _mkrepos: .USE .if !exists(${SVNREPOS}) .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \ ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \ else \ if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \ then \ ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \ else \ ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi @if /usr/sbin/pw usershow "${SVNUSER}" >/dev/null 2>&1; then \ ${ECHO_MSG} "You already have a user \"${SVNUSER}\", so I will use it."; \ else \ if /usr/sbin/pw useradd ${SVNUSER} -h -; \ then \ ${ECHO_MSG} "Added user \"${SVNUSER}\"."; \ else \ ${ECHO_MSG} "Adding user \"${SVNUSER}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi .endif @${MKDIR} ${SVNREPOS} @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES} @${CHMOD} g+w ${SVNGRPFILES} @for i in ${SVNREPOS}/db/* ; do \ i=$${i##*/}; \ case $$i in \ DB_CONFIG|fs-type|uuid) ;; \ *) ${CHOWN} -R ${SVNUSER}:${SVNGROUP} ${SVNREPOS}/db/$$i; \ ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \ ;; \ esac; \ done .endif .endif svn-build-outputs-hack: (cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf) (cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include Index: head/devel/subversion/Makefile.common =================================================================== --- head/devel/subversion/Makefile.common (revision 401688) +++ head/devel/subversion/Makefile.common (revision 401689) @@ -1,112 +1,114 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ PORTNAME?= subversion PORTVERSION= 1.9.2 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion DIST_SUBDIR= subversion19 GNU_CONFIGURE= yes -USES+= cpe libtool pkgconfig shebangfix tar:bzip2 +USES+= cpe libtool pathfix pkgconfig shebangfix tar:bzip2 SHEBANG_FILES= tools/server-side/svnpubsub/rc.d/svnpubsub.solaris \ tools/server-side/svnpubsub/rc.d/svnwcsub.solaris -bash_OLD_CMD= /usr/bin/bash LICENSE= APACHE20 CPE_VENDOR= apache CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^9].[0-9]* LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libexpat.so:${PORTSDIR}/textproc/expat2 CONFIGURE_ARGS+= --without-swig \ --with-sqlite=${LOCALBASE} \ --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat .if defined(SVN_BUILD_ADDONS) CONFLICTS_BUILD+= ${PORTNAME}-1.[^9].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion OPTIONS_NAME= devel_subversion .endif # =============================================================== OPTIONS_SUB= yes BDB_CONFIGURE_OFF= --without-berkeley-db BDB_USE= BDB=42+ -MAINTAINER_DEBUG_CFLAGS= -g MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug 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 SERF_LIB_DEPENDS= libserf-1.so:${PORTSDIR}/www/serf STATIC_CONFIGURE_ON= --enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static" # =============================================================== .include + +.if ${PORT_OPTIONS:MMAINTAINER_DEBUG} +WITH_DEBUG= yes +.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 OPTIONS_FILE_UNSET?="" OPTIONS_FILE_SET?="" .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION) CFLAGS+= -DHAS_ORGANIZATION_NAME .endif .include pre-everything:: .if defined(SVN_BUILD_ADDONS) .if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} .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 @${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h .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 ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h .endif # shebangfix @${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \ | ${XARGS} ${REINPLACE_CMD} -e '1s|#\!/bin/b|#\!/usr/local/bin/b|' \ -e '1s|#\!/bin/env|#\!/usr/bin/env|' \ -e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|' # remove all .bak files to clean the stage @${FIND} ${WRKSRC} -name '*.bak' -delete Index: head/devel/subversion/pkg-plist =================================================================== --- head/devel/subversion/pkg-plist (revision 401688) +++ head/devel/subversion/pkg-plist (revision 401689) @@ -1,424 +1,424 @@ %%TOOLS%%bin/fsfs-access-map bin/svn %%TOOLS%%bin/svnbench %%TOOLS%%bin/svn-populate-node-origins-index bin/svnadmin %%TOOLS%%bin/svnauthz %%TOOLS%%bin/svnauthz-validate %%TOOLS%%bin/svndiff %%TOOLS%%bin/svndiff3 %%TOOLS%%bin/svndiff4 bin/svndumpfilter bin/svnfsfs bin/svnlook bin/svnmucc %%TOOLS%%bin/svnraisetreeconflict bin/svnrdump %%NO_SVNSERVE_WRAPPER%%bin/svnserve %%SVNSERVE_WRAPPER%%bin/svnserve.bin %%SVNSERVE_WRAPPER%%@sample bin/svnserve.sample bin/svnsync bin/svnversion %%TOOLS%%bin/x509-parser include/subversion-1/mod_authz_svn.h include/subversion-1/mod_dav_svn.h include/subversion-1/svn-revision.txt include/subversion-1/svn_auth.h include/subversion-1/svn_base64.h include/subversion-1/svn_cache_config.h include/subversion-1/svn_checksum.h include/subversion-1/svn_client.h include/subversion-1/svn_cmdline.h include/subversion-1/svn_compat.h include/subversion-1/svn_config.h include/subversion-1/svn_ctype.h include/subversion-1/svn_dav.h include/subversion-1/svn_delta.h include/subversion-1/svn_diff.h include/subversion-1/svn_dirent_uri.h include/subversion-1/svn_dso.h include/subversion-1/svn_error.h include/subversion-1/svn_error_codes.h include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_iter.h include/subversion-1/svn_md5.h include/subversion-1/svn_mergeinfo.h include/subversion-1/svn_nls.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h include/subversion-1/svn_props.h include/subversion-1/svn_quoprint.h include/subversion-1/svn_ra.h include/subversion-1/svn_ra_svn.h include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_user.h include/subversion-1/svn_utf.h include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_x509.h include/subversion-1/svn_xml.h lib/libsvn_client-1.a %%NO_STATIC%%lib/libsvn_client-1.so %%NO_STATIC%%lib/libsvn_client-1.so.0 %%NO_STATIC%%lib/libsvn_client-1.so.0.0.0 lib/libsvn_delta-1.a %%NO_STATIC%%lib/libsvn_delta-1.so %%NO_STATIC%%lib/libsvn_delta-1.so.0 %%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0 lib/libsvn_diff-1.a %%NO_STATIC%%lib/libsvn_diff-1.so %%NO_STATIC%%lib/libsvn_diff-1.so.0 %%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0 lib/libsvn_fs-1.a %%NO_STATIC%%lib/libsvn_fs-1.so %%NO_STATIC%%lib/libsvn_fs-1.so.0 %%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0 %%BDB%%lib/libsvn_fs_base-1.a %%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so %%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0 %%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 lib/libsvn_fs_fs-1.a %%NO_STATIC%%lib/libsvn_fs_fs-1.so %%NO_STATIC%%lib/libsvn_fs_fs-1.so.0 %%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0 lib/libsvn_fs_util-1.a %%NO_STATIC%%lib/libsvn_fs_util-1.so %%NO_STATIC%%lib/libsvn_fs_util-1.so.0 %%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0 lib/libsvn_fs_x-1.a %%NO_STATIC%%lib/libsvn_fs_x-1.so %%NO_STATIC%%lib/libsvn_fs_x-1.so.0 %%NO_STATIC%%lib/libsvn_fs_x-1.so.0.0.0 lib/libsvn_ra-1.a %%NO_STATIC%%lib/libsvn_ra-1.so %%NO_STATIC%%lib/libsvn_ra-1.so.0 %%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0 lib/libsvn_ra_local-1.a %%NO_STATIC%%lib/libsvn_ra_local-1.so %%NO_STATIC%%lib/libsvn_ra_local-1.so.0 %%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0 %%SERF%%lib/libsvn_ra_serf-1.a %%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so %%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0 %%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 lib/libsvn_ra_svn-1.a %%NO_STATIC%%lib/libsvn_ra_svn-1.so %%NO_STATIC%%lib/libsvn_ra_svn-1.so.0 %%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0 lib/libsvn_repos-1.a %%NO_STATIC%%lib/libsvn_repos-1.so %%NO_STATIC%%lib/libsvn_repos-1.so.0 %%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0 lib/libsvn_subr-1.a %%NO_STATIC%%lib/libsvn_subr-1.so %%NO_STATIC%%lib/libsvn_subr-1.so.0 %%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0 lib/libsvn_wc-1.a %%NO_STATIC%%lib/libsvn_wc-1.so %%NO_STATIC%%lib/libsvn_wc-1.so.0 %%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0 man/man1/svn.1.gz man/man1/svnadmin.1.gz man/man1/svndumpfilter.1.gz man/man1/svnlook.1.gz man/man1/svnmucc.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 %%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 -share/pkgconfig/libsvn_client.pc -share/pkgconfig/libsvn_delta.pc -share/pkgconfig/libsvn_diff.pc -share/pkgconfig/libsvn_fs.pc -share/pkgconfig/libsvn_fs_fs.pc -share/pkgconfig/libsvn_fs_util.pc -share/pkgconfig/libsvn_fs_x.pc -share/pkgconfig/libsvn_ra.pc -share/pkgconfig/libsvn_ra_local.pc -%%SERF%%share/pkgconfig/libsvn_ra_serf.pc -share/pkgconfig/libsvn_ra_svn.pc -share/pkgconfig/libsvn_repos.pc -share/pkgconfig/libsvn_subr.pc -share/pkgconfig/libsvn_wc.pc +libdata/pkgconfig/libsvn_client.pc +libdata/pkgconfig/libsvn_delta.pc +libdata/pkgconfig/libsvn_diff.pc +libdata/pkgconfig/libsvn_fs.pc +libdata/pkgconfig/libsvn_fs_fs.pc +libdata/pkgconfig/libsvn_fs_util.pc +libdata/pkgconfig/libsvn_fs_x.pc +libdata/pkgconfig/libsvn_ra.pc +libdata/pkgconfig/libsvn_ra_local.pc +%%SERF%%libdata/pkgconfig/libsvn_ra_serf.pc +libdata/pkgconfig/libsvn_ra_svn.pc +libdata/pkgconfig/libsvn_repos.pc +libdata/pkgconfig/libsvn_subr.pc +libdata/pkgconfig/libsvn_wc.pc %%DATADIR%%/backup/hot-backup.py %%DATADIR%%/bdb/erase-all-text-data.py %%DATADIR%%/bdb/skel.py %%DATADIR%%/bdb/svn-bdb-view.py %%DATADIR%%/bdb/svnfs.py %%DATADIR%%/bdb/whatis-rep.py %%DATADIR%%/buildbot/master/README %%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 %%DATADIR%%/buildbot/slaves/bb-openbsd/svnclean.sh %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnbuild.sh %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svncheck.sh %%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/svn-sparc-solaris/svnbuild.sh %%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svncheck.sh %%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svncleanup.sh %%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svnenv.sh %%DATADIR%%/buildbot/slaves/svn-x64-centos/list-svn-deps.sh %%DATADIR%%/buildbot/slaves/svn-x64-centos/svnbuild.sh %%DATADIR%%/buildbot/slaves/svn-x64-centos/svncheck-bindings.sh %%DATADIR%%/buildbot/slaves/svn-x64-centos/svncheck.sh %%DATADIR%%/buildbot/slaves/svn-x64-centos/svnclean.sh %%DATADIR%%/buildbot/slaves/svn-x64-centos/svnlog.sh %%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh %%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh %%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh %%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx/mkramdisk.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx/rmramdisk.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx/setenv.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnbuild.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx/svncheck.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnclean.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svnbuild.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svnclean.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svnlog.sh %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-build.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-template.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-test.cmd %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/config.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/do_all.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svnbuild.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svncheck.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svnclean.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svnlog.bat %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnbuild.bat %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svncheck.bat %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnclean.bat %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnlog.bat %%DATADIR%%/client-side/bash_completion %%DATADIR%%/client-side/bash_completion_test %%DATADIR%%/client-side/change-svn-wc-format.py %%DATADIR%%/client-side/detach.py %%DATADIR%%/client-side/mergeinfo-sanitizer.py %%DATADIR%%/client-side/server-version.py %%DATADIR%%/client-side/svn-graph.pl %%DATADIR%%/client-side/svn-ssl-fingerprints.sh %%DATADIR%%/client-side/svn-vendor.py %%DATADIR%%/client-side/svn-viewspec.py %%DATADIR%%/client-side/wcfind %%DATADIR%%/dev/analyze-svnlogs.py %%DATADIR%%/dev/aprerr.txt %%DATADIR%%/dev/benchmarks/RepoPerf/ClearMemory.cpp %%DATADIR%%/dev/benchmarks/RepoPerf/TimeWin.cpp %%DATADIR%%/dev/benchmarks/RepoPerf/copy_repo.py %%DATADIR%%/dev/benchmarks/RepoPerf/win_repo_bench.py %%DATADIR%%/dev/benchmarks/large_dirs/create_bigdir.sh %%DATADIR%%/dev/benchmarks/suite1/benchmark.py %%DATADIR%%/dev/benchmarks/suite1/cronjob %%DATADIR%%/dev/benchmarks/suite1/crontab.entry %%DATADIR%%/dev/benchmarks/suite1/generate_charts %%DATADIR%%/dev/benchmarks/suite1/run %%DATADIR%%/dev/benchmarks/suite1/run.bat %%DATADIR%%/dev/build-svn-deps-win.pl %%DATADIR%%/dev/check-license.py %%DATADIR%%/dev/contribulyze.py %%DATADIR%%/dev/datecheck.py %%DATADIR%%/dev/find-bad-style.py %%DATADIR%%/dev/find-unmoved-deprecated.sh %%DATADIR%%/dev/fsfs-access-map.c %%DATADIR%%/dev/gdb-py/README %%DATADIR%%/dev/gdb-py/svndbg/__init__.py %%DATADIR%%/dev/gdb-py/svndbg/printers.py %%DATADIR%%/dev/gen-javahl-errors.py %%DATADIR%%/dev/gen-py-errors.py %%DATADIR%%/dev/gen_junit_report.py %%DATADIR%%/dev/gnuify-changelog.pl %%DATADIR%%/dev/graph-dav-servers.py %%DATADIR%%/dev/histogram.py %%DATADIR%%/dev/iz/defect.dem %%DATADIR%%/dev/iz/ff2csv.command %%DATADIR%%/dev/iz/ff2csv.py %%DATADIR%%/dev/iz/find-fix.py %%DATADIR%%/dev/iz/run-queries.sh %%DATADIR%%/dev/lock-check.py %%DATADIR%%/dev/log_revnum_change_asf.py %%DATADIR%%/dev/merge-graph.py %%DATADIR%%/dev/mergegraph/__init__.py %%DATADIR%%/dev/mergegraph/mergegraph.py %%DATADIR%%/dev/mergegraph/save_as_sh.py %%DATADIR%%/dev/min-includes.sh %%DATADIR%%/dev/mklog.py %%DATADIR%%/dev/mlpatch.py %%DATADIR%%/dev/normalize-dump.py %%DATADIR%%/dev/po-merge.py %%DATADIR%%/dev/prebuild-cleanup.sh %%DATADIR%%/dev/random-commits.py %%DATADIR%%/dev/remove-trailing-whitespace.sh %%DATADIR%%/dev/sbox-ospath.py %%DATADIR%%/dev/scramble-tree.py %%DATADIR%%/dev/stress.pl %%DATADIR%%/dev/svn-dev.el %%DATADIR%%/dev/svn-dev.vim %%DATADIR%%/dev/svn-entries.el %%DATADIR%%/dev/svn-merge-revs.py %%DATADIR%%/dev/svnqlite3-dump %%DATADIR%%/dev/svnraisetreeconflict/svnraisetreeconflict.c %%DATADIR%%/dev/trails.py %%DATADIR%%/dev/unix-build/Makefile.svn %%DATADIR%%/dev/unix-build/README %%DATADIR%%/dev/verify-history.py %%DATADIR%%/dev/warn-ignored-err.sh %%DATADIR%%/dev/wc-format.py %%DATADIR%%/dev/wc-ng/bump-to-19.py %%DATADIR%%/dev/wc-ng/count-progress.py %%DATADIR%%/dev/wc-ng/gather-data.sh %%DATADIR%%/dev/wc-ng/graph-data.py %%DATADIR%%/dev/wc-ng/populate-pristine.py %%DATADIR%%/dev/wc-ng/svn-wc-db-tester.c %%DATADIR%%/dev/which-error.py %%DATADIR%%/dev/windows-build/Makefile %%DATADIR%%/dev/windows-build/README %%DATADIR%%/dev/windows-build/document-version.pl %%DATADIR%%/dev/x509-parser.c %%DATADIR%%/diff/diff.c %%DATADIR%%/diff/diff3.c %%DATADIR%%/diff/diff4.c %%DATADIR%%/dist/_gnupg.py %%DATADIR%%/dist/backport.pl %%DATADIR%%/dist/backport_accept.dump %%DATADIR%%/dist/backport_branches.dump %%DATADIR%%/dist/backport_indented_entry.dump %%DATADIR%%/dist/backport_multirevisions.dump %%DATADIR%%/dist/backport_tests.py %%DATADIR%%/dist/backport_two_approveds.dump %%DATADIR%%/dist/checksums.py %%DATADIR%%/dist/collect_sigs.py %%DATADIR%%/dist/dist.sh %%DATADIR%%/dist/download-release.sh %%DATADIR%%/dist/extract-for-examination.sh %%DATADIR%%/dist/nightly.sh %%DATADIR%%/dist/nominate.pl %%DATADIR%%/dist/rat-excludes %%DATADIR%%/dist/release.py %%DATADIR%%/dist/templates/download.ezt %%DATADIR%%/dist/templates/nightly-candidates.ezt %%DATADIR%%/dist/templates/rc-news.ezt %%DATADIR%%/dist/templates/rc-release-ann.ezt %%DATADIR%%/dist/templates/stable-news.ezt %%DATADIR%%/dist/templates/stable-release-ann.ezt %%DATADIR%%/dist/test.sh %%DATADIR%%/examples/ExampleAuthn.java %%DATADIR%%/examples/ExampleAuthnOld.java %%DATADIR%%/examples/ExampleAuthnVeryOld.java %%DATADIR%%/examples/SvnCLBrowse %%DATADIR%%/examples/blame.py %%DATADIR%%/examples/check-modified.py %%DATADIR%%/examples/dumpprops.py %%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/svnlog2html.rb %%DATADIR%%/examples/svnlook.py %%DATADIR%%/examples/svnlook.rb %%DATADIR%%/examples/svnput.c %%DATADIR%%/examples/svnserve-sgid.c %%DATADIR%%/examples/svnshell.py %%DATADIR%%/examples/svnshell.rb %%DATADIR%%/examples/testwrite.c %%DATADIR%%/examples/walk-config-auth.py %%DATADIR%%/hook-scripts/commit-access-control.cfg.example %%DATADIR%%/hook-scripts/commit-access-control.pl %%DATADIR%%/hook-scripts/commit-email.rb %%DATADIR%%/hook-scripts/control-chars.py %%DATADIR%%/hook-scripts/log-police.py %%DATADIR%%/hook-scripts/mailer/mailer.conf.example %%DATADIR%%/hook-scripts/mailer/mailer.py %%DATADIR%%/hook-scripts/mailer/tests/mailer-init.sh %%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.output %%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.sh %%DATADIR%%/hook-scripts/mailer/tests/mailer-tweak.py %%DATADIR%%/hook-scripts/mailer/tests/mailer.conf %%DATADIR%%/hook-scripts/persist-ephemeral-txnprops.py %%DATADIR%%/hook-scripts/svn2feed.py %%DATADIR%%/hook-scripts/svnperms.conf.example %%DATADIR%%/hook-scripts/svnperms.py %%DATADIR%%/hook-scripts/validate-extensions.py %%DATADIR%%/hook-scripts/validate-files.conf.example %%DATADIR%%/hook-scripts/validate-files.py %%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/svn-backup-dumps.py %%DATADIR%%/server-side/svn-populate-node-origins-index.c %%DATADIR%%/server-side/svn_server_log_parse.py %%DATADIR%%/server-side/svnauthz.c %%DATADIR%%/server-side/svnpredumpfilter.py %%DATADIR%%/server-side/svnpubsub/README.txt %%DATADIR%%/server-side/svnpubsub/commit-hook.py %%DATADIR%%/server-side/svnpubsub/daemonize.py %%DATADIR%%/server-side/svnpubsub/irkerbridge.py %%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub %%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.debian %%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.freebsd %%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.solaris %%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub %%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.debian %%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.freebsd %%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.solaris %%DATADIR%%/server-side/svnpubsub/revprop-change-hook.py %%DATADIR%%/server-side/svnpubsub/svnpubsub.tac %%DATADIR%%/server-side/svnpubsub/svnpubsub/__init__.py %%DATADIR%%/server-side/svnpubsub/svnpubsub/client.py %%DATADIR%%/server-side/svnpubsub/svnpubsub/server.py %%DATADIR%%/server-side/svnpubsub/svnpubsub/util.py %%DATADIR%%/server-side/svnpubsub/svntweet.py %%DATADIR%%/server-side/svnpubsub/svnwcsub.conf.example %%DATADIR%%/server-side/svnpubsub/svnwcsub.py %%DATADIR%%/server-side/svnpubsub/testserver.py %%DATADIR%%/server-side/svnpubsub/watcher.py %%DATADIR%%/server-side/test_svn_server_log_parse.py %%DATADIR%%/xslt/svnindex.css %%DATADIR%%/xslt/svnindex.xsl Index: head/security/subversion-gnome-keyring/Makefile =================================================================== --- head/security/subversion-gnome-keyring/Makefile (revision 401688) +++ head/security/subversion-gnome-keyring/Makefile (revision 401689) @@ -1,34 +1,37 @@ # Created by: Autrijus Tang # $FreeBSD$ PKGNAMESUFFIX= -gnome-keyring CATEGORIES= security gnome MAINTAINER= lev@FreeBSD.org COMMENT= Gnome KWyring integration for Version control system .if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16 BROKEN= does not build with subversion16 MASTERDIR= ${.CURDIR}/../../devel/subversion16 .elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17 BROKEN= does not build with subversion17 MASTERDIR= ${.CURDIR}/../../devel/subversion17 .elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18 MASTERDIR= ${.CURDIR}/../../devel/subversion18 .else MASTERDIR= ${.CURDIR}/../../devel/subversion .endif PKGDIR= ${.CURDIR} SVN_BUILD_ADDONS= yes .include "${MASTERDIR}/Makefile.common" LIB_DEPENDS+= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring CONFIGURE_ARGS+= --with-gnome-keyring ALL_TARGET= gnome-keyring-lib INSTALL_TARGET= install-gnome-keyring-lib +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + .include Index: head/security/subversion-gnome-keyring/pkg-plist =================================================================== --- head/security/subversion-gnome-keyring/pkg-plist (revision 401688) +++ head/security/subversion-gnome-keyring/pkg-plist (revision 401689) @@ -1,4 +1,5 @@ lib/libsvn_auth_gnome_keyring-1.a lib/libsvn_auth_gnome_keyring-1.so lib/libsvn_auth_gnome_keyring-1.so.0 lib/libsvn_auth_gnome_keyring-1.so.0.0.0 +libdata/pkgconfig/libsvn_auth_gnome_keyring.pc Index: head/security/subversion-kwallet/Makefile =================================================================== --- head/security/subversion-kwallet/Makefile (revision 401688) +++ head/security/subversion-kwallet/Makefile (revision 401689) @@ -1,35 +1,38 @@ # Created by: Autrijus Tang # $FreeBSD$ PKGNAMESUFFIX= -kwallet CATEGORIES= security kde MAINTAINER= lev@FreeBSD.org COMMENT= KDE KWallet integration for Version control system .if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16 BROKEN= does not build with subversion16 MASTERDIR= ${.CURDIR}/../../devel/subversion16 .elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17 BROKEN= does not build with subversion17 MASTERDIR= ${.CURDIR}/../../devel/subversion17 .elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18 PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../../devel/subversion18 .else MASTERDIR= ${.CURDIR}/../../devel/subversion .endif PKGDIR= ${.CURDIR} SVN_BUILD_ADDONS= yes USE_KDE4= kdelibs runtime .include "${MASTERDIR}/Makefile.common" CONFIGURE_ARGS+= --with-kwallet=${KDE4_PREFIX} ALL_TARGET= kwallet-lib INSTALL_TARGET= install-kwallet-lib +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + .include Index: head/security/subversion-kwallet/pkg-plist =================================================================== --- head/security/subversion-kwallet/pkg-plist (revision 401688) +++ head/security/subversion-kwallet/pkg-plist (revision 401689) @@ -1,4 +1,5 @@ lib/libsvn_auth_kwallet-1.a lib/libsvn_auth_kwallet-1.so lib/libsvn_auth_kwallet-1.so.0 lib/libsvn_auth_kwallet-1.so.0.0.0 +libdata/pkgconfig/libsvn_auth_kwallet.pc