81f42249df
Upstream changes: Version 1.6.12 (21 Jun 2010, from /branches/1.6.x) http://svn.apache.org/repos/asf/subversion/tags/1.6.12 User-visible changes: * further improvements for issue #3242 * allow deletion of uris which need character escaping (issue #3636) * fix errors with 'svn mkdir --parents' (issue #3649) * update address to which crash reports are sent (r901304) * check for server certificate revocation on Windows (r898048) * disable custom file mutexes on Windows (r879902, -16) * fix handling of peg revision'd copy targets (issue #3651) * more improvements to 'svn merge --reintegrate' (r935631) * allow copying of broken symlinks (issue #3303) * improve rep-sharing performance on high-concurrency repos (issue #3506) * fixed: added subtrees with mergeinfo break reintegrate (issue #3654) * fixed: assertion triggered by tree-conflicted externals (issue #3469) Developer-visible changes: * give windows devs more flexibility with sqlite versions (r944635) * allow the pack tests to work with low file descriptor limits (r937610) * improve exception handling on Windows Vista and 7 (r878447, -910, -916) Version 1.6.11 (19 Apr 2010, from /branches/1.6.x) http://svn.apache.org/repos/asf/subversion/tags/1.6.11 User-visible changes: * fix for repositories mounted via NFS (issue #3501) * enable TCP keep-alives in svnserve (r880552) * tighten restrictions on revprops for 'svnadmin verify' (r904594) * make ra_serf give better out-of-date information (issue #3561) * improve error message upon connection failure with svn+ssh:// (r922516) * allow 'svn log' on an uncommitted copy/move destination (r901752) * make 'svnadmin hotcopy' copy the fsfs config file (r905303) * mergeinfo improvements with non-inheritable mergeinfo (issue #3573) * make mergeinfo queries not require access to the repo root (issue #3242) * update URLs to refer the the new apache.org repository (r904301, -94) * update relative externals during a switch (issue #3390) * fix 'merge --reintegrate' with self-referential mergeinfo (r892050, -85) * improve wc-ng working copy detection (r929382) * improve handling of mergeinfo when using serf (r880461) * fixed: 'svnlook plist --revprop' with '-t TXN_NAME' (r917640, -8211) * fixed: file external from URL cannot overwrite existing item (issue #3552) * fixed: potential memory error in 'svn status' (r923674, -9) * fixed: merge records mergeinfo from natural history gaps (issue #3432) * fixed: theoretical possibility of DB corruption (r926151, -67) Developer-visible changes: * disable checks for wc-ng working copies when running the test suite * on Windows, don't ignore move operation error codes (r896915) * more precise reporting of errors occuring with sqlite init (r927323, -8) * ensure rangelist APIs are commutative (r923389, -91) Version 1.6.10 (Not released, see changes for 1.6.11.)
102 lines
3.8 KiB
Makefile
102 lines
3.8 KiB
Makefile
# $NetBSD: Makefile,v 1.70 2010/09/19 16:10:46 sno Exp $
|
|
|
|
PKGNAME= subversion-base-${SVNVER}
|
|
#PKGREVISION= 1
|
|
COMMENT= Version control system, base programs and libraries
|
|
|
|
PKG_INSTALLATION_TYPES= overwrite pkgviews
|
|
PKG_DESTDIR_SUPPORT= user-destdir
|
|
|
|
# on at least solaris, configure fails to figure out
|
|
# that you need -lintl
|
|
BROKEN_GETTEXT_DETECTION= yes
|
|
|
|
.include "../../devel/subversion/Makefile.common"
|
|
|
|
USE_TOOLS+= msgfmt
|
|
|
|
CONFIGURE_ARGS+= --disable-neon-version-check
|
|
CONFIGURE_ARGS+= --without-apxs
|
|
|
|
.if !empty(PKG_OPTIONS:Mapr1)
|
|
APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util
|
|
.else
|
|
APU_OPTIONS= PKG_BUILD_OPTIONS.apr
|
|
.endif
|
|
BUILD_DEFS+= ${APU_OPTIONS}
|
|
|
|
.if !empty(PKG_OPTIONS:Mapr1)
|
|
. include "../../devel/apr/buildlink3.mk"
|
|
. include "../../devel/apr-util/buildlink3.mk"
|
|
.else
|
|
BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5
|
|
. include "../../devel/apr0/buildlink3.mk"
|
|
.endif
|
|
|
|
BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.4
|
|
.include "../../databases/sqlite3/buildlink3.mk"
|
|
.include "../../devel/zlib/buildlink3.mk"
|
|
|
|
PLIST_VARS+= db4
|
|
.if !empty(PKG_OPTIONS:Mapr1) && !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
|
|
PLIST.db4= yes
|
|
#CONFIGURE_ARGS+= --with-berkeley-db=:${BUILDLINK_PREFIX.db4:Q}/include:${BUILDLINK_PREFIX.db4:Q}/lib:${BUILDLINK_LDADD.db4:S/^-l//:Q}
|
|
CONFIGURE_ARGS+= --with-berkeley-db
|
|
.else
|
|
CONFIGURE_ARGS+= --without-berkeley-db
|
|
.endif
|
|
|
|
PLIST_SUBST+= DAV_RA=${DAV_RA:Q}
|
|
|
|
SUBST_CLASSES+= paths
|
|
SUBST_STAGE.paths= pre-configure
|
|
SUBST_FILES.paths= contrib/cgi/tweak-log.cgi
|
|
SUBST_SED.paths= -e "s|/usr/local/bin/|${PREFIX}/bin|g"
|
|
SUBST_MESSAGE.paths= Fixing hardcoded /usr/local/bin paths.
|
|
|
|
post-install:
|
|
${INSTALL_DATA_DIR} ${DESTDIR}${SVNDOC}
|
|
cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README ${DESTDIR}${SVNDOC}
|
|
cd ${WRKSRC}/doc/user && ${INSTALL_DATA} *.html *.txt ${DESTDIR}${SVNDOC}
|
|
${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/backup
|
|
${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/cgi
|
|
${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts
|
|
${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
|
|
${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
|
|
${INSTALL_DATA} ${WRKSRC}/tools/backup/hot-backup.py \
|
|
${DESTDIR}${SVNEXAMPLES}/backup
|
|
${INSTALL_DATA} ${WRKSRC}/contrib/cgi/tweak-log.cgi \
|
|
${DESTDIR}${SVNEXAMPLES}/cgi
|
|
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit* \
|
|
${DESTDIR}${SVNEXAMPLES}/hook-scripts
|
|
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \
|
|
${DESTDIR}${SVNEXAMPLES}/hook-scripts
|
|
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/log-police.py \
|
|
${WRKSRC}/tools/hook-scripts/verify-po.py \
|
|
${DESTDIR}${SVNEXAMPLES}/hook-scripts
|
|
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer* \
|
|
${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
|
|
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/mailer* \
|
|
${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
|
|
|
|
.PHONY: svn-build-outputs-hack
|
|
# Subversion's build system is set up to build everything from source
|
|
# at once. In pkgsrc, we install the base part of subversion, and
|
|
# then build other pieces against installed libraries. Here, we run
|
|
# svn's equivalent of automake to say that the libraries installed as
|
|
# part of subversion-base are installed, and save that generated file.
|
|
# Other packages then copy this file into place when building to avoid
|
|
# having to build these libraries again.
|
|
#
|
|
# The normal update procedure is
|
|
# test build and package subversion-base
|
|
# run make svn-build-outputs-hack
|
|
# test build and package other subversion packages
|
|
# commit the update to ../subversion/files/build-outputs.mk along with the version change
|
|
#
|
|
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} -f ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
|
|
|
|
.include "../../devel/gettext-lib/buildlink3.mk"
|
|
.include "../../mk/bsd.pkg.mk"
|