aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLev A. Serebryakov <lev@FreeBSD.org>2010-07-07 14:42:53 +0000
committerLev A. Serebryakov <lev@FreeBSD.org>2010-07-07 14:42:53 +0000
commit1bf7642bdd7f11f0f13fe960b3b5a7bb0a483468 (patch)
treed6594e697496793ec1c01fd892477c10847819a0
parent32b6d40b36a40e91084e9830193d52d69eb3b6f8 (diff)
downloadports-1bf7642bdd7f11f0f13fe960b3b5a7bb0a483468.tar.gz
ports-1bf7642bdd7f11f0f13fe960b3b5a7bb0a483468.zip
(1) Update to latest 1.6.12
(2) Make NEON_VER configurable Feature safe: yes PR: [2] ports/147300
Notes
Notes: svn path=/head/; revision=257494
-rw-r--r--devel/subversion/Makefile.common14
-rw-r--r--devel/subversion/distinfo6
-rw-r--r--devel/subversion16/Makefile.common14
-rw-r--r--devel/subversion16/distinfo6
4 files changed, 22 insertions, 18 deletions
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index b7aec91eb5e9..4c20203b9143 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -5,8 +5,8 @@
# $FreeBSD$
PORTNAME= subversion
-PORTVERSION= 1.6.11
-PORTREVISION?= 3
+PORTVERSION= 1.6.12
+PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
http://svnbook.red-bean.com/en/1.5/:book
@@ -43,17 +43,19 @@ CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE}
# Default is "on"
.if !defined(WITHOUT_NEON)
+.if !defined(NEON_VER)
.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
+NEON_VER= 29
+.endif
.endif
LIB_DEPENDS+= neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
-PLIST_SUB+= NEON=""
+PLIST_SUB+= NEON=""
.else
-CONFIGURE_ARGS+= --without-neon
-PLIST_SUB+= NEON="@comment "
+CONFIGURE_ARGS+=--without-neon
+PLIST_SUB+= NEON="@comment "
.endif
.if defined(WITH_SASL)
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 087085154fd8..fd55a6305271 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.11.tar.bz2) = 75419159b50661092c4137449940b5cc
-SHA256 (subversion/subversion-1.6.11.tar.bz2) = 64bd000ae30470d343c0725758bdd8288143393308eedc511c7826bb6731e59c
-SIZE (subversion/subversion-1.6.11.tar.bz2) = 5486069
+MD5 (subversion/subversion-1.6.12.tar.bz2) = a4b1d0d7f3a4587c59da9c1acf9dedd0
+SHA256 (subversion/subversion-1.6.12.tar.bz2) = 8ebf17fb173ff9c482a72deaaf756c3ca595c99da15fc8f1f8f4310609284c8f
+SIZE (subversion/subversion-1.6.12.tar.bz2) = 5476628
MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
SIZE (subversion/svn-book-html.tar.bz2) = 406484
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index b7aec91eb5e9..4c20203b9143 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -5,8 +5,8 @@
# $FreeBSD$
PORTNAME= subversion
-PORTVERSION= 1.6.11
-PORTREVISION?= 3
+PORTVERSION= 1.6.12
+PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
http://svnbook.red-bean.com/en/1.5/:book
@@ -43,17 +43,19 @@ CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE}
# Default is "on"
.if !defined(WITHOUT_NEON)
+.if !defined(NEON_VER)
.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
+NEON_VER= 29
+.endif
.endif
LIB_DEPENDS+= neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
-PLIST_SUB+= NEON=""
+PLIST_SUB+= NEON=""
.else
-CONFIGURE_ARGS+= --without-neon
-PLIST_SUB+= NEON="@comment "
+CONFIGURE_ARGS+=--without-neon
+PLIST_SUB+= NEON="@comment "
.endif
.if defined(WITH_SASL)
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 087085154fd8..fd55a6305271 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.11.tar.bz2) = 75419159b50661092c4137449940b5cc
-SHA256 (subversion/subversion-1.6.11.tar.bz2) = 64bd000ae30470d343c0725758bdd8288143393308eedc511c7826bb6731e59c
-SIZE (subversion/subversion-1.6.11.tar.bz2) = 5486069
+MD5 (subversion/subversion-1.6.12.tar.bz2) = a4b1d0d7f3a4587c59da9c1acf9dedd0
+SHA256 (subversion/subversion-1.6.12.tar.bz2) = 8ebf17fb173ff9c482a72deaaf756c3ca595c99da15fc8f1f8f4310609284c8f
+SIZE (subversion/subversion-1.6.12.tar.bz2) = 5476628
MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
SIZE (subversion/svn-book-html.tar.bz2) = 406484