Index: head/devel/subversion/Makefile =================================================================== --- head/devel/subversion/Makefile (revision 249546) +++ head/devel/subversion/Makefile (revision 249547) @@ -1,277 +1,281 @@ # New ports collection makefile for: subversion # Date created: 10 September 2001 # Whom: rooneg@electricjellyfish.net # # $FreeBSD$ MAINTAINER= lev@freebsd.org COMMENT= Version control system CONFLICTS?= subversion-devel-[0-9]* subversion-freebsd-[0-9]* USE_RC_SUBR= svnserve MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnsync.1 svnversion.1 MAN5= svnserve.conf.5 MAN8= svnserve.8 TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \ APACHE2_APR "Use APR from Apache 2.X" off \ MOD_DONTDOTHAT "mod_dontdothat for Apache 2.X" off \ NEON "WebDAV/Delta-V repo access module (neon)" on \ SERF "WebDAV/Delta-V repo access module (serf)" off \ SASL "SASL2 authorization support" off \ BDB "db4 repository backend" on \ ASVN "Build and install Archive SVN (asvn)" off \ MAINTAINER_DEBUG "Build debug version" off \ SVNSERVE_WRAPPER "Enable svnserve wrapper" off \ STATIC "Build static version (no shared libs)" off \ BOOK "Install the Subversion Book" off .include "${.CURDIR}/../../devel/subversion/Makefile.common" SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs .if make(repository) WITH_REPOSITORY_CREATION= yes .endif .if defined(WITH_REPOSITORY_CREATION) MKREPOS_TARGET= _mkrepos .endif .if defined(WITH_SVNSERVE_WRAPPER) PLIST_SUB+= SVNSERVE_WRAPPER="" SUB_LIST+= SVNSERVE_BIN_EXT=".bin" EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch .else PLIST_SUB+= SVNSERVE_WRAPPER="@comment " SUB_LIST+= SVNSERVE_BIN_EXT="" .endif .if !defined(NOPORTDOCS) && defined(WITH_BOOK) BOOK_HTML= svn-book-html.tar.bz2 BOOK_PDF= svn-book.pdf DISTFILES+= ${BOOK_HTML}:book ${BOOK_PDF}:book PLIST_SUB+= BOOK="" .else PLIST_SUB+= BOOK="@comment " .endif .if defined(WITH_ASVN) RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install PLIST_SUB+= ASVN="" .else PLIST_SUB+= ASVN="@comment " .endif SCRIPTS= SCRIPTS_DATA= pre-everything:: @${ECHO_MSG} "" -.if defined(WITH_NEON) +.if defined(WITH_NEON) && defined(WITH_NEON28) + @${ECHO_CMD} "It doesn't make sense to depend on neon (neon29) and neon28 choose only one." + @${FALSE} +.endif +.if defined(WITH_NEON) || defined(WITH_NEON28) @${ECHO_MSG} "WebDAV/Delta-V repository access module enabled." .else @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled." .endif @${ECHO_MSG} "" .if defined(WITH_BDB) @${ECHO_MSG} "db4 repository backend enabled." .else @${ECHO_MSG} "db4 repository backend disabled." .endif @${ECHO_MSG} "" .if defined(WITH_MAINTAINER_DEBUG) @${ECHO_MSG} "Build debug version." @${ECHO_MSG} "" .endif .if defined(WITH_MOD_DAV_SVN) .if defined(WITH_STATIC) @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} .endif @${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled." @${ECHO_MSG} "This option implies the WITH_APACHE2_APR option." .else @${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X" .endif @${ECHO_MSG} "" .if defined(WITH_APACHE2_APR) @${ECHO_MSG} "Using APR from ${APACHE_PORT}. If you have the devel/apr" @${ECHO_MSG} "port/package installed, you may need to remove it." .else @${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr port." .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_DAV_SVN) @${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled." .else @${ECHO_MSG} "You can enable the mod_dontdothat module for Apache 2.X" .endif @${ECHO_MSG} "" .if defined(WITH_SVNSERVE_WRAPPER) @${ECHO_MSG} "svnserve wrapper enabled." @${ECHO_MSG} "" .endif .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 !defined(NOPORTDOCS) && defined(WITH_BOOK) @${ECHO_MSG} "Subversion Book will be installed." @${ECHO_MSG} "" .endif .if defined(WITH_ASVN) @${ECHO_MSG} "asvn will be installed" @${ECHO_MSG} "" .endif .if defined(WITH_STATIC) @${ECHO_MSG} "Static binaries will be built." .endif @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: @if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You selected to use`'"${APR_PORT}' for apr library." ; \ ${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .if !defined(WITHOUT_BDB) @if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif .if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT) post-build: cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \ ${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_subr-1 mod_dontdothat.c .endif .if defined(WITH_MOD_DAV_SVN) pre-install: ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav ${PREFIX}/${APACHEMODDIR}/mod_dav.so .endif post-install: ${MKREPOS_TARGET} .if defined(WITH_MOD_DAV_SVN) ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so .if defined(WITH_MOD_DONTDOTHAT) cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \ ${APXS} -i -n dontdothat mod_dontdothat.la ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so .endif .endif @${MKDIR} ${DATADIR} cd ${WRKSRC}/tools ; \ ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${DATADIR} -xf - @${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 defined(WITH_BOOK) ${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR} ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR} .endif .endif .if defined(WITH_ASVN) ${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin .endif .if defined(WITH_SVNSERVE_WRAPPER) @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve .endif repository: _mkrepos _SVNGRPFILES= dav db locks locks/db.lock locks/db-logs.lock SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,} _mkrepos: .USE .if !exists(${SVNREPOS}) .if defined(WITH_SVNSERVE_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 defined(WITH_SVNSERVE_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 post-deinstall: .if defined(WITH_MOD_DAV_SVN) @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL .endif svn-build-outputs-hack: cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk .include Property changes on: head/devel/subversion/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.128 \ No newline at end of property +1.129 \ No newline at end of property Index: head/devel/subversion/Makefile.common =================================================================== --- head/devel/subversion/Makefile.common (revision 249546) +++ head/devel/subversion/Makefile.common (revision 249547) @@ -1,164 +1,168 @@ # New ports collection makefile for: subversion # Date created: 10 September 2001 # Whom: rooneg@electricjellyfish.net # # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.6.6 -PORTREVISION?= 1 +PORTVERSION= 1.6.9 +#PORTREVISION?= 1 CATEGORIES+= devel MASTER_SITES= http://subversion.tigris.org/downloads/:main \ http://svnbook.red-bean.com/en/1.5/:book DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main DIST_SUBDIR= subversion EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAKE_JOBS_SAFE= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-ssl .if defined(SVN_BUILD_BINDINGS) # Bindings ports should use the same, as main port OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included OPTIONS= .endif .include CONFIGURE_ARGS+= --without-swig LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} # Default is "on" .if !defined(WITHOUT_NEON) -LIB_DEPENDS+= neon.28:${PORTSDIR}/www/neon28 -CONFIGURE_ARGS+= --with-neon=${LOCALBASE} -PLIST_SUB+= NEON="" +.if exists(${LOCALBASE}/bin/neon-config) +NEON_VER!= ${LOCALBASE}/bin/neon-config --version | \ + ${SED} -n -E 's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p' +.else +NEON_VER= 29 +.endif +LIB_DEPENDS+= neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER} .else CONFIGURE_ARGS+= --without-neon PLIST_SUB+= NEON="@comment " .endif .if defined(WITH_SASL) LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} PLIST_SUB+= SASL="" .else CONFIGURE_ARGS+= --without-sasl PLIST_SUB+= SASL="@comment " .endif # Default us "on" .if !defined(WITHOUT_BDB) USE_BDB= 42+ PLIST_SUB+= BDB="" .else CONFIGURE_ARGS+= --without-berkeley-db PLIST_SUB+= BDB="@comment " .endif .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DAV_SVN="" SVNGROUP?= www SVNUSER?= www .if defined(WITH_MOD_DONTDOTHAT) PLIST_SUB+= MOD_DONTDOTHAT="" .else PLIST_SUB+= MOD_DONTDOTHAT="@comment " .endif .else PLIST_SUB+= MOD_DAV_SVN="@comment " PLIST_SUB+= MOD_DONTDOTHAT="@comment " PKGDEINSTALL= NONEXISTENT SVNGROUP?= svn SVNUSER?= svn .endif .if defined(WITH_APACHE2_APR) USE_APACHE= 2.0+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${APACHE_VERSION} >= 21 APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config .else APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config .endif APR_PORT= ${APACHE_PORT} .else APR_PORT= devel/apr LIB_DEPENDS+= apr-1.3:${PORTSDIR}/${APR_PORT} APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config .endif CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \ --with-apr-util=${APR_APU_DIR}/${APU_CONFIG} .if defined(WITH_SERF) LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf CONFIGURE_ARGS+= --with-serf=${LOCALBASE} PLIST_SUB+= SERF="" .else PLIST_SUB+= SERF="@comment " .endif .if defined(SVN_BUILD_BINDINGS) .if defined(WITH_FREEBSD_SUBVERSION) LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd .else LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion .endif EXTRA_PATCHES+= ${PATCHDIR}/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in .endif .if !defined(WITHOUT_NLS) USE_GETTEXT= yes PLIST_SUB+= WITHOUT_GETTEXT="" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= WITHOUT_GETTEXT="@comment " .endif .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fpic -DPIC .endif .if defined(WITH_MAINTAINER_DEBUG) CONFIGURE_ARGS+=--enable-maintainer-mode \ --enable-debug CFLAGS+= -g .endif .if defined(WITH_STATIC) CONFIGURE_ARGS+=--enable-all-static PLIST_SUB+= DYNAMIC_ENABLED="@comment " .else PLIST_SUB+= DYNAMIC_ENABLED="" .endif post-extract: @${RM} -rf ${WRKSRC}/neon @${RM} -rf ${WRKSRC}/apr @${RM} -rf ${WRKSRC}/apr-util 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 @${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in .if defined(SVN_BUILD_BINDINGS) @${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} .endif Property changes on: head/devel/subversion/Makefile.common ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.26 \ No newline at end of property +1.27 \ No newline at end of property Index: head/devel/subversion/distinfo =================================================================== --- head/devel/subversion/distinfo (revision 249546) +++ head/devel/subversion/distinfo (revision 249547) @@ -1,12 +1,12 @@ -MD5 (subversion/subversion-1.6.6.tar.bz2) = e5109da756d74c7d98f683f004a539af -SHA256 (subversion/subversion-1.6.6.tar.bz2) = fe23c1a247dea631048bd62fd1cd6111924be2896ef2d166245ac9a1284c3c92 -SIZE (subversion/subversion-1.6.6.tar.bz2) = 5513036 +MD5 (subversion/subversion-1.6.9.tar.bz2) = 9c30a47b1d48664e7afef68bb4834c53 +SHA256 (subversion/subversion-1.6.9.tar.bz2) = 05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c +SIZE (subversion/subversion-1.6.9.tar.bz2) = 5478554 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb SIZE (subversion/svn-book-html.tar.bz2) = 406484 MD5 (subversion/svn-book.pdf) = a2d503ce36f6a72a8f136a127f3e14d3 SHA256 (subversion/svn-book.pdf) = 64e483cd27be6752eb8dfc1b00749f8dc46adfc4fb1ab1356dd8e2406d878225 SIZE (subversion/svn-book.pdf) = 1671317 MD5 (subversion/svn_hacks_1.4.diff) = 14090c8c4a3b4cbb2c9e32d0f6104fec SHA256 (subversion/svn_hacks_1.4.diff) = 94ce0682d86aece56eee955b1af0595866faaddb9863390be4cbc2d32d791882 SIZE (subversion/svn_hacks_1.4.diff) = 18107 Property changes on: head/devel/subversion/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.71 \ No newline at end of property +1.72 \ No newline at end of property Index: head/devel/subversion16/Makefile =================================================================== --- head/devel/subversion16/Makefile (revision 249546) +++ head/devel/subversion16/Makefile (revision 249547) @@ -1,277 +1,281 @@ # New ports collection makefile for: subversion # Date created: 10 September 2001 # Whom: rooneg@electricjellyfish.net # # $FreeBSD$ MAINTAINER= lev@freebsd.org COMMENT= Version control system CONFLICTS?= subversion-devel-[0-9]* subversion-freebsd-[0-9]* USE_RC_SUBR= svnserve MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnsync.1 svnversion.1 MAN5= svnserve.conf.5 MAN8= svnserve.8 TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \ APACHE2_APR "Use APR from Apache 2.X" off \ MOD_DONTDOTHAT "mod_dontdothat for Apache 2.X" off \ NEON "WebDAV/Delta-V repo access module (neon)" on \ SERF "WebDAV/Delta-V repo access module (serf)" off \ SASL "SASL2 authorization support" off \ BDB "db4 repository backend" on \ ASVN "Build and install Archive SVN (asvn)" off \ MAINTAINER_DEBUG "Build debug version" off \ SVNSERVE_WRAPPER "Enable svnserve wrapper" off \ STATIC "Build static version (no shared libs)" off \ BOOK "Install the Subversion Book" off .include "${.CURDIR}/../../devel/subversion/Makefile.common" SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs .if make(repository) WITH_REPOSITORY_CREATION= yes .endif .if defined(WITH_REPOSITORY_CREATION) MKREPOS_TARGET= _mkrepos .endif .if defined(WITH_SVNSERVE_WRAPPER) PLIST_SUB+= SVNSERVE_WRAPPER="" SUB_LIST+= SVNSERVE_BIN_EXT=".bin" EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch .else PLIST_SUB+= SVNSERVE_WRAPPER="@comment " SUB_LIST+= SVNSERVE_BIN_EXT="" .endif .if !defined(NOPORTDOCS) && defined(WITH_BOOK) BOOK_HTML= svn-book-html.tar.bz2 BOOK_PDF= svn-book.pdf DISTFILES+= ${BOOK_HTML}:book ${BOOK_PDF}:book PLIST_SUB+= BOOK="" .else PLIST_SUB+= BOOK="@comment " .endif .if defined(WITH_ASVN) RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install PLIST_SUB+= ASVN="" .else PLIST_SUB+= ASVN="@comment " .endif SCRIPTS= SCRIPTS_DATA= pre-everything:: @${ECHO_MSG} "" -.if defined(WITH_NEON) +.if defined(WITH_NEON) && defined(WITH_NEON28) + @${ECHO_CMD} "It doesn't make sense to depend on neon (neon29) and neon28 choose only one." + @${FALSE} +.endif +.if defined(WITH_NEON) || defined(WITH_NEON28) @${ECHO_MSG} "WebDAV/Delta-V repository access module enabled." .else @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled." .endif @${ECHO_MSG} "" .if defined(WITH_BDB) @${ECHO_MSG} "db4 repository backend enabled." .else @${ECHO_MSG} "db4 repository backend disabled." .endif @${ECHO_MSG} "" .if defined(WITH_MAINTAINER_DEBUG) @${ECHO_MSG} "Build debug version." @${ECHO_MSG} "" .endif .if defined(WITH_MOD_DAV_SVN) .if defined(WITH_STATIC) @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} .endif @${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled." @${ECHO_MSG} "This option implies the WITH_APACHE2_APR option." .else @${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X" .endif @${ECHO_MSG} "" .if defined(WITH_APACHE2_APR) @${ECHO_MSG} "Using APR from ${APACHE_PORT}. If you have the devel/apr" @${ECHO_MSG} "port/package installed, you may need to remove it." .else @${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr port." .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_DAV_SVN) @${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled." .else @${ECHO_MSG} "You can enable the mod_dontdothat module for Apache 2.X" .endif @${ECHO_MSG} "" .if defined(WITH_SVNSERVE_WRAPPER) @${ECHO_MSG} "svnserve wrapper enabled." @${ECHO_MSG} "" .endif .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 !defined(NOPORTDOCS) && defined(WITH_BOOK) @${ECHO_MSG} "Subversion Book will be installed." @${ECHO_MSG} "" .endif .if defined(WITH_ASVN) @${ECHO_MSG} "asvn will be installed" @${ECHO_MSG} "" .endif .if defined(WITH_STATIC) @${ECHO_MSG} "Static binaries will be built." .endif @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: @if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You selected to use`'"${APR_PORT}' for apr library." ; \ ${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .if !defined(WITHOUT_BDB) @if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif .if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT) post-build: cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \ ${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_subr-1 mod_dontdothat.c .endif .if defined(WITH_MOD_DAV_SVN) pre-install: ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav ${PREFIX}/${APACHEMODDIR}/mod_dav.so .endif post-install: ${MKREPOS_TARGET} .if defined(WITH_MOD_DAV_SVN) ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so .if defined(WITH_MOD_DONTDOTHAT) cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \ ${APXS} -i -n dontdothat mod_dontdothat.la ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so .endif .endif @${MKDIR} ${DATADIR} cd ${WRKSRC}/tools ; \ ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${DATADIR} -xf - @${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 defined(WITH_BOOK) ${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR} ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR} .endif .endif .if defined(WITH_ASVN) ${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin .endif .if defined(WITH_SVNSERVE_WRAPPER) @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve .endif repository: _mkrepos _SVNGRPFILES= dav db locks locks/db.lock locks/db-logs.lock SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,} _mkrepos: .USE .if !exists(${SVNREPOS}) .if defined(WITH_SVNSERVE_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 defined(WITH_SVNSERVE_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 post-deinstall: .if defined(WITH_MOD_DAV_SVN) @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL .endif svn-build-outputs-hack: cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk .include Property changes on: head/devel/subversion16/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.128 \ No newline at end of property +1.129 \ No newline at end of property Index: head/devel/subversion16/Makefile.common =================================================================== --- head/devel/subversion16/Makefile.common (revision 249546) +++ head/devel/subversion16/Makefile.common (revision 249547) @@ -1,164 +1,168 @@ # New ports collection makefile for: subversion # Date created: 10 September 2001 # Whom: rooneg@electricjellyfish.net # # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.6.6 -PORTREVISION?= 1 +PORTVERSION= 1.6.9 +#PORTREVISION?= 1 CATEGORIES+= devel MASTER_SITES= http://subversion.tigris.org/downloads/:main \ http://svnbook.red-bean.com/en/1.5/:book DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main DIST_SUBDIR= subversion EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAKE_JOBS_SAFE= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-ssl .if defined(SVN_BUILD_BINDINGS) # Bindings ports should use the same, as main port OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included OPTIONS= .endif .include CONFIGURE_ARGS+= --without-swig LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} # Default is "on" .if !defined(WITHOUT_NEON) -LIB_DEPENDS+= neon.28:${PORTSDIR}/www/neon28 -CONFIGURE_ARGS+= --with-neon=${LOCALBASE} -PLIST_SUB+= NEON="" +.if exists(${LOCALBASE}/bin/neon-config) +NEON_VER!= ${LOCALBASE}/bin/neon-config --version | \ + ${SED} -n -E 's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p' +.else +NEON_VER= 29 +.endif +LIB_DEPENDS+= neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER} .else CONFIGURE_ARGS+= --without-neon PLIST_SUB+= NEON="@comment " .endif .if defined(WITH_SASL) LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} PLIST_SUB+= SASL="" .else CONFIGURE_ARGS+= --without-sasl PLIST_SUB+= SASL="@comment " .endif # Default us "on" .if !defined(WITHOUT_BDB) USE_BDB= 42+ PLIST_SUB+= BDB="" .else CONFIGURE_ARGS+= --without-berkeley-db PLIST_SUB+= BDB="@comment " .endif .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DAV_SVN="" SVNGROUP?= www SVNUSER?= www .if defined(WITH_MOD_DONTDOTHAT) PLIST_SUB+= MOD_DONTDOTHAT="" .else PLIST_SUB+= MOD_DONTDOTHAT="@comment " .endif .else PLIST_SUB+= MOD_DAV_SVN="@comment " PLIST_SUB+= MOD_DONTDOTHAT="@comment " PKGDEINSTALL= NONEXISTENT SVNGROUP?= svn SVNUSER?= svn .endif .if defined(WITH_APACHE2_APR) USE_APACHE= 2.0+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${APACHE_VERSION} >= 21 APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config .else APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config .endif APR_PORT= ${APACHE_PORT} .else APR_PORT= devel/apr LIB_DEPENDS+= apr-1.3:${PORTSDIR}/${APR_PORT} APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config .endif CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \ --with-apr-util=${APR_APU_DIR}/${APU_CONFIG} .if defined(WITH_SERF) LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf CONFIGURE_ARGS+= --with-serf=${LOCALBASE} PLIST_SUB+= SERF="" .else PLIST_SUB+= SERF="@comment " .endif .if defined(SVN_BUILD_BINDINGS) .if defined(WITH_FREEBSD_SUBVERSION) LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd .else LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion .endif EXTRA_PATCHES+= ${PATCHDIR}/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in .endif .if !defined(WITHOUT_NLS) USE_GETTEXT= yes PLIST_SUB+= WITHOUT_GETTEXT="" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= WITHOUT_GETTEXT="@comment " .endif .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fpic -DPIC .endif .if defined(WITH_MAINTAINER_DEBUG) CONFIGURE_ARGS+=--enable-maintainer-mode \ --enable-debug CFLAGS+= -g .endif .if defined(WITH_STATIC) CONFIGURE_ARGS+=--enable-all-static PLIST_SUB+= DYNAMIC_ENABLED="@comment " .else PLIST_SUB+= DYNAMIC_ENABLED="" .endif post-extract: @${RM} -rf ${WRKSRC}/neon @${RM} -rf ${WRKSRC}/apr @${RM} -rf ${WRKSRC}/apr-util 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 @${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in .if defined(SVN_BUILD_BINDINGS) @${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} .endif Property changes on: head/devel/subversion16/Makefile.common ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.26 \ No newline at end of property +1.27 \ No newline at end of property Index: head/devel/subversion16/distinfo =================================================================== --- head/devel/subversion16/distinfo (revision 249546) +++ head/devel/subversion16/distinfo (revision 249547) @@ -1,12 +1,12 @@ -MD5 (subversion/subversion-1.6.6.tar.bz2) = e5109da756d74c7d98f683f004a539af -SHA256 (subversion/subversion-1.6.6.tar.bz2) = fe23c1a247dea631048bd62fd1cd6111924be2896ef2d166245ac9a1284c3c92 -SIZE (subversion/subversion-1.6.6.tar.bz2) = 5513036 +MD5 (subversion/subversion-1.6.9.tar.bz2) = 9c30a47b1d48664e7afef68bb4834c53 +SHA256 (subversion/subversion-1.6.9.tar.bz2) = 05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c +SIZE (subversion/subversion-1.6.9.tar.bz2) = 5478554 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb SIZE (subversion/svn-book-html.tar.bz2) = 406484 MD5 (subversion/svn-book.pdf) = a2d503ce36f6a72a8f136a127f3e14d3 SHA256 (subversion/svn-book.pdf) = 64e483cd27be6752eb8dfc1b00749f8dc46adfc4fb1ab1356dd8e2406d878225 SIZE (subversion/svn-book.pdf) = 1671317 MD5 (subversion/svn_hacks_1.4.diff) = 14090c8c4a3b4cbb2c9e32d0f6104fec SHA256 (subversion/svn_hacks_1.4.diff) = 94ce0682d86aece56eee955b1af0595866faaddb9863390be4cbc2d32d791882 SIZE (subversion/svn_hacks_1.4.diff) = 18107 Property changes on: head/devel/subversion16/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.71 \ No newline at end of property +1.72 \ No newline at end of property