1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00

(1) Update to 1.6.3

(2) Cleanup DBD usage

PR:	(2) ports/135397
This commit is contained in:
Lev A. Serebryakov 2009-06-26 11:37:13 +00:00
parent 73aa4fd5f4
commit 9004d89c85
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=236656
6 changed files with 22 additions and 36 deletions

View File

@ -62,7 +62,7 @@ PLIST_SUB+= BOOK="@comment "
.endif
.if defined(WITH_ASVN)
RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
PLIST_SUB+= ASVN=""
.else
PLIST_SUB+= ASVN="@comment "

View File

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
PORTVERSION= 1.6.2
PORTVERSION= 1.6.3
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
@ -13,12 +13,11 @@ MASTER_SITES= http://subversion.tigris.org/downloads/:main \
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:15
CONFIGURE_ARGS= --with-ssl
MAKE_JOBS_SAFE= yes
WANT_PERL= yes
.if defined(SVN_BUILD_BINDINGS)
# Bindings ports should use the same, as main port
@ -54,6 +53,7 @@ PLIST_SUB+= SASL="@comment "
# Default us "on"
.if !defined(WITHOUT_BDB)
USE_BDB= 42+
PLIST_SUB+= BDB=""
.else
CONFIGURE_ARGS+= --without-berkeley-db
@ -92,21 +92,14 @@ APR_CONFIG= apr-config
APU_CONFIG= apu-config
.endif
APR_PORT= ${APACHE_PORT}
.if !defined(WITHOUT_BDB)
DEPENDS_ARGS+= WITH_BERKELEYDB=db4
OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42)
.endif
.else
LIB_DEPENDS+= apr-1.3:${PORTSDIR}/devel/apr
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
APR_PORT= devel/apr
.if !defined(WITHOUT_BDB)
OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes
DEPENDS_ARGS+= WITH_BDB=yes
.endif
.endif
CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}

View File

@ -1,6 +1,6 @@
MD5 (subversion/subversion-1.6.2.tar.bz2) = ebb1cecd313533ca0876f9bfc86bd5d9
SHA256 (subversion/subversion-1.6.2.tar.bz2) = 9788a5a19d032b7711b54f462f40b72ee0c6180069335db6994d96b7b23c4075
SIZE (subversion/subversion-1.6.2.tar.bz2) = 5470969
MD5 (subversion/subversion-1.6.3.tar.bz2) = 8bf7637ac99368db0890e3f085fa690d
SHA256 (subversion/subversion-1.6.3.tar.bz2) = 1dfd4550ae87687c5031665d3b1624082130b4dc235b1084eb0c6279f8e2ee6c
SIZE (subversion/subversion-1.6.3.tar.bz2) = 5483625
MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
SIZE (subversion/svn-book-html.tar.bz2) = 406484

View File

@ -62,7 +62,7 @@ PLIST_SUB+= BOOK="@comment "
.endif
.if defined(WITH_ASVN)
RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
PLIST_SUB+= ASVN=""
.else
PLIST_SUB+= ASVN="@comment "

View File

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
PORTVERSION= 1.6.2
PORTVERSION= 1.6.3
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
@ -13,12 +13,11 @@ MASTER_SITES= http://subversion.tigris.org/downloads/:main \
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:15
CONFIGURE_ARGS= --with-ssl
MAKE_JOBS_SAFE= yes
WANT_PERL= yes
.if defined(SVN_BUILD_BINDINGS)
# Bindings ports should use the same, as main port
@ -54,6 +53,7 @@ PLIST_SUB+= SASL="@comment "
# Default us "on"
.if !defined(WITHOUT_BDB)
USE_BDB= 42+
PLIST_SUB+= BDB=""
.else
CONFIGURE_ARGS+= --without-berkeley-db
@ -92,21 +92,14 @@ APR_CONFIG= apr-config
APU_CONFIG= apu-config
.endif
APR_PORT= ${APACHE_PORT}
.if !defined(WITHOUT_BDB)
DEPENDS_ARGS+= WITH_BERKELEYDB=db4
OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42)
.endif
.else
LIB_DEPENDS+= apr-1.3:${PORTSDIR}/devel/apr
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
APR_PORT= devel/apr
.if !defined(WITHOUT_BDB)
OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes
DEPENDS_ARGS+= WITH_BDB=yes
.endif
.endif
CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}

View File

@ -1,6 +1,6 @@
MD5 (subversion/subversion-1.6.2.tar.bz2) = ebb1cecd313533ca0876f9bfc86bd5d9
SHA256 (subversion/subversion-1.6.2.tar.bz2) = 9788a5a19d032b7711b54f462f40b72ee0c6180069335db6994d96b7b23c4075
SIZE (subversion/subversion-1.6.2.tar.bz2) = 5470969
MD5 (subversion/subversion-1.6.3.tar.bz2) = 8bf7637ac99368db0890e3f085fa690d
SHA256 (subversion/subversion-1.6.3.tar.bz2) = 1dfd4550ae87687c5031665d3b1624082130b4dc235b1084eb0c6279f8e2ee6c
SIZE (subversion/subversion-1.6.3.tar.bz2) = 5483625
MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
SIZE (subversion/svn-book-html.tar.bz2) = 406484