cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(1) Update to 1.6.15

Browse Source 
(2) Add support for DBD 5.x

PR:		ports/152553 (1), ports/152172 (2)
Submitted by:	"Philip M. Gollucci" <pgollucci@p6m7g8.com> (1), Martin Matuska <mm@FreeBSD.org>
This commit is contained in:
Lev A. Serebryakov 2010-11-24 22:51:10 +00:00
parent fe17f60024
commit e6358c3d66
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=265112
8 changed files with 88 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devel/subversion/Makefile
View File

@ -22,7 +22,7 @@ OPTIONS= MOD_DAV_SVN "mod_dav_svn module 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 \
BDB "Berkeley DB (4 or 5) repository backend" on \
ASVN "Build and install Archive SVN (asvn)" off \
MAINTAINER_DEBUG "Build debug version" off \
SVNSERVE_WRAPPER "Enable svnserve wrapper" off \
@ -85,9 +85,9 @@ pre-everything::
.endif
@${ECHO_MSG} ""
.if defined(WITH_BDB)
@${ECHO_MSG} "db4 repository backend enabled."
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled."
.else
@${ECHO_MSG} "db4 repository backend disabled."
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend disabled."
.endif
@${ECHO_MSG} ""
.if defined(WITH_MAINTAINER_DEBUG)
@ -159,13 +159,14 @@ pre-everything::
pre-configure:
.if !defined(WITHOUT_BDB)
@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" ] ; then \
${ECHO_MSG} "" ; \
${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
${ECHO_MSG} 'You should build `'"${APR_PORT}' with Berkeley DB (4 or 5) support to use subversion with it." ; \
${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
${ECHO_MSG} "" ; \
${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} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
${ECHO_MSG} "To disable Berkeley DB support, define WITHOUT_BDB." ; \
${ECHO_MSG} "" ; \
${FALSE} ; \
fi

2
devel/subversion/Makefile.common
View File

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
PORTVERSION= 1.6.13
PORTVERSION= 1.6.15
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \

8
devel/subversion/distinfo
View File

@ -1,12 +1,8 @@
MD5 (subversion/subversion-1.6.13.tar.bz2) = 7ae1c827689f21cf975804005be30aeb
SHA256 (subversion/subversion-1.6.13.tar.bz2) = 3a30327bdb04109f369586196ee4a6993cdab2cfa85c3134549f02c229bf0d15
SIZE (subversion/subversion-1.6.13.tar.bz2) = 5513370
MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
SHA256 (subversion/subversion-1.6.15.tar.bz2) = b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45
SIZE (subversion/subversion-1.6.15.tar.bz2) = 5515056
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

37
devel/subversion/files/patch-configure
View File

@ -1,6 +1,35 @@
--- configure.orig 2009-07-09 17:23:21.000000000 +0400
+++ configure 2009-07-09 17:25:20.000000000 +0400
@@ -27683,7 +27683,10 @@
--- configure.orig 2010-11-23 17:33:28.000000000 +0300
+++ configure 2010-11-25 01:47:25.000000000 +0300
@@ -21458,8 +21458,8 @@
fi
if test "$withval" = "yes"; then
- if test "$apu_db_version" != "4"; then
- as_fn_error "APR-UTIL wasn't linked against Berkeley DB 4,
+ if test "$apu_db_version" != "4" -a "$apu_db_version" != "5"; then
+ as_fn_error "APR-UTIL wasn't linked against Berkeley DB 4 or 5,
while the fs component is required. Reinstall
APR-UTIL with the appropiate options." "$LINENO" 5
fi
@@ -21467,7 +21467,7 @@
status=required
elif test "$apu_found" != "reconfig"; then
- if test "$apu_db_version" != 4; then
+ if test "$apu_db_version" != 4 -a "$apu_db_version" != "5"; then
as_fn_error "APR-UTIL was installed independently, it won't be
possible to use the specified Berkeley DB: $withval" "$LINENO" 5
fi
@@ -21513,7 +21513,7 @@
whether apr-util is linked against Berkeley DB
$db_version" >&2;}
status=try-link
- elif test "$apu_db_version" != "4"; then
+ elif test "$apu_db_version" != "4" -a "$apu_db_version" != "5"; then
status=skip
else
status=try-link
@@ -23801,7 +23801,10 @@
if test "$RUBY" != "none"; then
@ -11,4 +40,4 @@
+ if "$RUBY" -r mkmf -e 'with_ldflags("'"$PTHREAD_LIBS"'") { exit(have_func("rb_hash_foreach") ? 0 : 1) }'; then
# Extract the first word of "rdoc", so it can be a program name with args.
set dummy rdoc; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

15
devel/subversion16/Makefile
View File

@ -22,7 +22,7 @@ OPTIONS= MOD_DAV_SVN "mod_dav_svn module 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 \
BDB "Berkeley DB (4 or 5) repository backend" on \
ASVN "Build and install Archive SVN (asvn)" off \
MAINTAINER_DEBUG "Build debug version" off \
SVNSERVE_WRAPPER "Enable svnserve wrapper" off \
@ -85,9 +85,9 @@ pre-everything::
.endif
@${ECHO_MSG} ""
.if defined(WITH_BDB)
@${ECHO_MSG} "db4 repository backend enabled."
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled."
.else
@${ECHO_MSG} "db4 repository backend disabled."
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend disabled."
.endif
@${ECHO_MSG} ""
.if defined(WITH_MAINTAINER_DEBUG)
@ -159,13 +159,14 @@ pre-everything::
pre-configure:
.if !defined(WITHOUT_BDB)
@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" ] ; then \
${ECHO_MSG} "" ; \
${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
${ECHO_MSG} 'You should build `'"${APR_PORT}' with Berkeley DB (4 or 5) support to use subversion with it." ; \
${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
${ECHO_MSG} "" ; \
${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} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
${ECHO_MSG} "To disable Berkeley DB support, define WITHOUT_BDB." ; \
${ECHO_MSG} "" ; \
${FALSE} ; \
fi

2
devel/subversion16/Makefile.common
View File

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
PORTVERSION= 1.6.13
PORTVERSION= 1.6.15
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \

8
devel/subversion16/distinfo
View File

@ -1,12 +1,8 @@
MD5 (subversion/subversion-1.6.13.tar.bz2) = 7ae1c827689f21cf975804005be30aeb
SHA256 (subversion/subversion-1.6.13.tar.bz2) = 3a30327bdb04109f369586196ee4a6993cdab2cfa85c3134549f02c229bf0d15
SIZE (subversion/subversion-1.6.13.tar.bz2) = 5513370
MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
SHA256 (subversion/subversion-1.6.15.tar.bz2) = b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45
SIZE (subversion/subversion-1.6.15.tar.bz2) = 5515056
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

37
devel/subversion16/files/patch-configure
View File

@ -1,6 +1,35 @@
--- configure.orig 2009-07-09 17:23:21.000000000 +0400
+++ configure 2009-07-09 17:25:20.000000000 +0400
@@ -27683,7 +27683,10 @@
--- configure.orig 2010-11-23 17:33:28.000000000 +0300
+++ configure 2010-11-25 01:47:25.000000000 +0300
@@ -21458,8 +21458,8 @@
fi
if test "$withval" = "yes"; then
- if test "$apu_db_version" != "4"; then
- as_fn_error "APR-UTIL wasn't linked against Berkeley DB 4,
+ if test "$apu_db_version" != "4" -a "$apu_db_version" != "5"; then
+ as_fn_error "APR-UTIL wasn't linked against Berkeley DB 4 or 5,
while the fs component is required. Reinstall
APR-UTIL with the appropiate options." "$LINENO" 5
fi
@@ -21467,7 +21467,7 @@
status=required
elif test "$apu_found" != "reconfig"; then
- if test "$apu_db_version" != 4; then
+ if test "$apu_db_version" != 4 -a "$apu_db_version" != "5"; then
as_fn_error "APR-UTIL was installed independently, it won't be
possible to use the specified Berkeley DB: $withval" "$LINENO" 5
fi
@@ -21513,7 +21513,7 @@
whether apr-util is linked against Berkeley DB
$db_version" >&2;}
status=try-link
- elif test "$apu_db_version" != "4"; then
+ elif test "$apu_db_version" != "4" -a "$apu_db_version" != "5"; then
status=skip
else
status=try-link
@@ -23801,7 +23801,10 @@
if test "$RUBY" != "none"; then
@ -11,4 +40,4 @@
+ if "$RUBY" -r mkmf -e 'with_ldflags("'"$PTHREAD_LIBS"'") { exit(have_func("rb_hash_foreach") ? 0 : 1) }'; then
# Extract the first word of "rdoc", so it can be a program name with args.
set dummy rdoc; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5