diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile index bc8b5e846f55..dcb20dae3bc6 100644 --- a/devel/p5-subversion/Makefile +++ b/devel/p5-subversion/Makefile @@ -1,43 +1,43 @@ PKGNAMEPREFIX= p5- -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Perl bindings for Version control system WWW= https://subversion.apache.org/ USES= perl5 USE_PERL5= build run -PORTREVISION_LATEST= 1 -PORTREVISION_LTS= 1 +PORTREVISION_LATEST= 2 +PORTREVISION_LTS= 2 SVN_BUILD_BINDINGS= yes MAKE_JOBS_UNSAFE= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= perl5 CONFIGURE_ARGS+= --with-swig-perl=${PERL} \ --without-swig-python \ --without-swig-ruby \ --without-gnome-keyring \ --without-kwallet \ --with-apxs=no ALL_TARGET= swig-pl-lib swig-pl INSTALL_TARGET= install-swig-pl pre-install: ${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Client/_Client.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Core/_Core.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Delta/_Delta.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Fs/_Fs.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Ra/_Ra.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Repos/_Repos.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Wc/_Wc.so .include diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 6c99882bd8ca..40fabe32d855 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -1,34 +1,34 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Python bindings for version control system WWW= https://subversion.apache.org/ BUILD_DEPENDS= ${LOCALBASE}/include/py3c.h:devel/py3c USES= python USE_PYTHON= flavors py3kplist # There is bug in python bindings Makefile MAKE_JOBS_UNSAFE=yes -PORTREVISION_LATEST= 3 -PORTREVISION_LTS= 1 +PORTREVISION_LATEST= 4 +PORTREVISION_LTS= 2 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= python CONFIGURE_ARGS+= --with-swig-python=${PYTHON_CMD} \ --without-swig-perl \ --without-swig-ruby \ --without-gnome-keyring \ --without-kwallet \ --with-apxs=no ALL_TARGET= swig-py check-swig-py INSTALL_TARGET= install-swig-py .include diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index 3ff8953a6728..1087f9b43b9e 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -1,34 +1,34 @@ PKGNAMEPREFIX= ruby- -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Ruby bindings for version control system WWW= https://subversion.apache.org/ USES+= compiler:c11 ruby -PORTREVISION_LATEST= 1 -PORTREVISION_LTS= 1 +PORTREVISION_LATEST= 2 +PORTREVISION_LTS= 2 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= ruby CONFIGURE_ARGS+= --with-swig-ruby=${RUBY} \ --without-swig-perl \ --without-swig-python \ --without-gnome-keyring \ --without-kwallet \ --with-apxs=no ALL_TARGET= swig-rb-lib swig-rb INSTALL_TARGET= install-swig-rb CFLAGS+= -fdeclspec .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types .endif .include diff --git a/devel/subversion-book/Makefile b/devel/subversion-book/Makefile index 4a57cead639f..5f6968697272 100644 --- a/devel/subversion-book/Makefile +++ b/devel/subversion-book/Makefile @@ -1,50 +1,51 @@ PORTNAME= subversion-book DISTVERSION= 4515 +PORTREVISION= 1 CATEGORIES= devel misc MASTER_SITES= LOCAL/lev DISTFILES= # empty DIST_SUBDIR= subversion18 EXTRACT_ONLY= # empty -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Subversion Documentation HTML/PDF WWW= https://svnbook.red-bean.com/ # Creative Commons Legal Code # http://svnbook.red-bean.com/en/1.7/svn.copyright.html LICENSE= CDDL USES= tar:bzip2 NO_BUILD= yes OPTIONS_SUB= yes OPTIONS_DEFINE= DOCS HTML_SINGLE PDF OPTIONS_DEFAULT= HTML_SINGLE HTML_SINGLE_DESC= Single HTML page edition PDF_DESC= PDF edition HTML_SINGLE_IMPLIES= DOCS PDF_IMPLIES= DOCS HTML_SINGLE_DISTFILES= svn-book-html-r${DISTVERSION}.tar.bz2 PDF_DISTFILES= svn-book-r${DISTVERSION}.pdf .include .if !${PORT_OPTIONS:MDOCS} IGNORE= it does not make sense to install dedicated documentation if DOCS are globally disabled .endif do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} do-install-HTML_SINGLE-on: ${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${HTML_SINGLE_DISTFILES} \ -C ${STAGEDIR}${DOCSDIR} (cd ${STAGEDIR}${DOCSDIR}/svn-book-html && ${LN} -s svn-book.html index.html) do-install-PDF-on: ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PDF_DISTFILES} \ ${STAGEDIR}${DOCSDIR}/svn-book.pdf .include diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile index dae08ab026cf..8e0387c3c657 100644 --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -1,236 +1,236 @@ -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= -lts -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Version control system, long-term-support version WWW= https://subversion.apache.org/ CONFLICTS_INSTALL= subversion USE_RC_SUBR= svnserve PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ DOCS \ GPG_AGENT \ NLS \ SASL \ SERF \ STATIC \ SVNSERVE_WRAPPER\ TEST \ TOOLS OPTIONS_DEFAULT=GPG_AGENT SERF TOOLS GPG_AGENT_DESC= Enable GPG agent password store SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= No shared libs (disables SVN integration) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper USES+= shebangfix python:env python_OLD_CMD+= "/bin/env python" SHEBANG_REGEX= ./tools/.* .include "Makefile.common" SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs SVNGROUP?= svn SVNUSER?= svn GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+= --without-swig-perl \ --without-swig-python \ --without-swig-ruby \ --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 " SVNSERVE_EXT= .bin .else SUB_LIST+= SVNSERVE_BIN_EXT="" PLIST_SUB+= NO_SVNSERVE_WRAPPER="" SVNSERVE_EXT= .endif .if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .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 make(repository) WITH_REPOSITORY_CREATION= yes .endif .if defined(WITH_REPOSITORY_CREATION) MKREPOS_TARGET= _mkrepos .endif BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \ svnrdump svnserve${SVNSERVE_EXT} svnsync svnversion TOOLS_TO_STRIP= fsfs-access-map svn-mergeinfo-normalizer \ svn-populate-node-origins-index svnauthz \ svnauthz-validate svnconflict svndiff svndiff3 \ svndiff4 svnmover svnraisetreeconflict x509-parser 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" -a "$${BDB_VERSION}" != "18" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5, 6 or 18) 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} LIBS_SQLITE3!= pkgconf --libs --static sqlite3 LIBS+= ${LIBS_SQLITE3} # for work with ICU LIBS+= -lc++ -lm .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-TOOLS-on: @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} post-install: ${MKREPOS_TARGET} for F in ${BINS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${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} for F in ${TOOLS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done # =============================================================================== 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} && python 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 diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 4e2427ac0eee..2dc0d42dc05f 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,235 +1,235 @@ -PORTREVISION= 6 +PORTREVISION= 7 -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Version control system WWW= https://subversion.apache.org/ CONFLICTS_INSTALL= subversion-lts USE_RC_SUBR= svnserve PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ DOCS \ GPG_AGENT \ NLS \ SASL \ SERF \ STATIC \ SVNSERVE_WRAPPER\ TEST \ TOOLS OPTIONS_DEFAULT=GPG_AGENT SERF TOOLS GPG_AGENT_DESC= Enable GPG agent password store SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= No shared libs (disables SVN integration) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper USES+= shebangfix python:env python_OLD_CMD+= "/bin/env python" SHEBANG_REGEX= ./tools/.* .include "Makefile.common" SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs SVNGROUP?= svn SVNUSER?= svn GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS+= --without-swig-perl \ --without-swig-python \ --without-swig-ruby \ --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 " SVNSERVE_EXT= .bin .else SUB_LIST+= SVNSERVE_BIN_EXT="" PLIST_SUB+= NO_SVNSERVE_WRAPPER="" SVNSERVE_EXT= .endif .if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .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 make(repository) WITH_REPOSITORY_CREATION= yes .endif .if defined(WITH_REPOSITORY_CREATION) MKREPOS_TARGET= _mkrepos .endif BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \ svnrdump svnserve${SVNSERVE_EXT} svnsync svnversion TOOLS_TO_STRIP= fsfs-access-map svn-mergeinfo-normalizer \ svn-populate-node-origins-index svnauthz \ svnauthz-validate svnconflict svndiff svndiff3 \ svndiff4 svnmover svnraisetreeconflict x509-parser 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" -a "$${BDB_VERSION}" != "18" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5, 6 or 18) 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} LIBS_SQLITE3!= pkgconf --libs --static sqlite3 LIBS+= ${LIBS_SQLITE3} # for work with ICU LIBS+= -lc++ -lm .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-TOOLS-on: @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} post-install: ${MKREPOS_TARGET} for F in ${BINS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${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} for F in ${TOOLS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done # =============================================================================== 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} && python 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 diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile index 03550ba4df7d..2c1c132f4093 100644 --- a/java/java-subversion/Makefile +++ b/java/java-subversion/Makefile @@ -1,47 +1,47 @@ PKGNAMEPREFIX= java- CATEGORIES= java -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Java bindings for Version control system WWW= https://subversion.apache.org/ USES= compiler USE_JAVA= yes JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes -PORTREVISION_LATEST= 1 -PORTREVISION_LTS= 1 +PORTREVISION_LATEST= 2 +PORTREVISION_LTS= 2 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CONFIGURE_ARGS+= --enable-javahl \ --without-swig-perl \ --without-siwg-python \ --without-swig-ruby \ --with-jdk=${JAVA_HOME} \ --with-jikes=no \ --without-gnome-keyring \ --without-kwallet \ --with-apxs=no MAKE_JOBS_UNSAFE= yes ALL_TARGET= javahl INSTALL_TARGET= install-javahl post-configure: .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} "s#^LT_CXX_LIBADD = .*#LT_CXX_LIBADD =#" ${WRKSRC}/Makefile .else @${DO_NADA} .endif pre-build: @${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes .include diff --git a/security/subversion-gnome-keyring/Makefile b/security/subversion-gnome-keyring/Makefile index 758a139c8686..8314a9a4f506 100644 --- a/security/subversion-gnome-keyring/Makefile +++ b/security/subversion-gnome-keyring/Makefile @@ -1,23 +1,23 @@ PKGNAMESUFFIX= -gnome-keyring CATEGORIES= security gnome -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Gnome Keyring integration for Version control system WWW= https://subversion.apache.org/ -PORTREVISION_LATEST= 1 -PORTREVISION_LTS= 1 +PORTREVISION_LATEST= 2 +PORTREVISION_LTS= 2 .include "${.CURDIR}/../../devel/subversion/Makefile.addons" LIB_DEPENDS+= libsecret-1.so:security/libsecret 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 diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile index 1b1793760c4b..aa19c9fb223a 100644 --- a/www/mod_dav_svn/Makefile +++ b/www/mod_dav_svn/Makefile @@ -1,33 +1,33 @@ PORTNAME= mod_dav_svn DISTNAME= subversion-${PORTVERSION} CATEGORIES= www -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Apache module for subversion serving WWW= https://subversion.apache.org/ USES= apache -PORTREVISION_LATEST= 1 -PORTREVISION_LTS= 1 +PORTREVISION_LATEST= 2 +PORTREVISION_LTS= 2 .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CONFIGURE_ARGS+= --with-apxs=${APXS} \ --with-apache-libexecdir \ --without-gnome-keyring \ --without-kwallet SUB_FILES+= 220_subversion.conf.sample PLIST_SUB+= SED=${SED} ALL_TARGET= apache-mod INSTALL_TARGET= install-mods-shared post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${INSTALL_DATA} ${WRKDIR}/220_subversion.conf.sample \ ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d .include diff --git a/www/serf/Makefile b/www/serf/Makefile index d7fba597ccf1..32adcfd2295a 100644 --- a/www/serf/Makefile +++ b/www/serf/Makefile @@ -1,63 +1,64 @@ PORTNAME= serf PORTVERSION= 1.3.10 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= APACHE/serf -MAINTAINER= lev@FreeBSD.org +MAINTAINER= michaelo@apache.org COMMENT= Serf HTTP client library WWW= https://serf.apache.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS+= libapr-1.so:devel/apr1 USES= scons ssl tar:bzip2 cpe CPE_VENDOR= serf_project USE_LDCONFIG= yes INSTALL_TARGET= install --install-sandbox=${STAGEDIR} TEST_TARGET= check # some tests fail OPTIONS_DEFINE= DOCS OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_BASE_DESC= Heimdal Kerberos (base) GSSAPI_HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) GSSAPI_MIT_DESC= MIT Kerberos (security/krb5) GSSAPI_HEIMDAL_LIB_DEPENDS= libkrb5.so.26:security/heimdal GSSAPI_MIT_LIB_DEPENDS= libkrb5.so.3:security/krb5 SCONS_ARGS= APR=${LOCALBASE}/bin/apr-1-config SCONS_ARGS+= APU=${LOCALBASE}/bin/apu-1-config SCONS_ARGS+= OPENSSL=${OPENSSLBASE} SCONS_ARGS+= PREFIX=${PREFIX} SCONS_ARGS+= CC=${CC} SCONS_ARGS+= CFLAGS="${CFLAGS}" .include .if ${PORT_OPTIONS:MGSSAPI_BASE} SCONS_ARGS+= GSSAPI="/usr" .endif .if ${PORT_OPTIONS:MGSSAPI_MIT} || ${PORT_OPTIONS:MGSSAPI_HEIMDAL} SCONS_ARGS+= GSSAPI="${LOCALBASE}" .endif post-patch: @${REINPLACE_CMD} -E \ -e '/^Requires.private/s/(libssl|libcrypto)//g' \ -e '/^Libs.private/s|$$| -L${OPENSSLLIB} -lssl -lcrypto|' \ ${WRKSRC}/build/serf.pc.in post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${STAGEDIR}${DOCSDIR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libserf-1.so .include MAKE_ARGS= ${SCONS_ARGS} .include