Date: Fri, 4 Jul 2008 19:11:34 -0700 (PDT) From: Yen-Ming Lee <leeym@leeym.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/125301: update subversion for apr-1 Message-ID: <200807050211.m652BYWh010469@cn1.leeym.com> Resent-Message-ID: <200807050220.m652K4ii043172@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125301
>Category: ports
>Synopsis: update subversion for apr-1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 05 02:20:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 7.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD cn1.leeym.com 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008 root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
The major version of apr becomes 3, so its library is apr-1.3 now.
We can update subversion ports to require apr-1.3, or simply use apr-1 instead.
>How-To-Repeat:
>Fix:
--- subversion.diff begins here ---
Index: subversion/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/subversion/Makefile,v
retrieving revision 1.122
diff -u -d -b -w -r1.122 Makefile
--- subversion/Makefile 30 Jun 2008 10:00:04 -0000 1.122
+++ subversion/Makefile 5 Jul 2008 02:08:35 -0000
@@ -108,11 +108,11 @@
APR_CONFIG= apr-1-config
APU_CONFIG= apu-1-config
.if defined(WITH_BDB)
-LIB_DEPENDS+= apr-1.2:${PORTSDIR}/devel/apr-svn
+LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr-svn
APR_PORT= devel/apr-svn
OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes
.else
-LIB_DEPENDS+= apr-1.2:${PORTSDIR}/devel/apr
+LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr
APR_PORT= devel/apr
.endif
.endif
Index: subversion/Makefile.common
===================================================================
RCS file: /home/pcvs/ports/devel/subversion/Makefile.common,v
retrieving revision 1.3
diff -u -d -b -w -r1.3 Makefile.common
--- subversion/Makefile.common 2 Jul 2008 05:21:38 -0000 1.3
+++ subversion/Makefile.common 5 Jul 2008 02:08:35 -0000
@@ -6,7 +6,7 @@
PORTNAME= subversion
PORTVERSION= 1.5.0
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
http://svnbook.red-bean.com/en/1.4/:book
Index: subversion-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/subversion-devel/Makefile,v
retrieving revision 1.128
diff -u -d -b -w -r1.128 Makefile
--- subversion-devel/Makefile 30 Jun 2008 10:00:05 -0000 1.128
+++ subversion-devel/Makefile 5 Jul 2008 02:08:35 -0000
@@ -6,7 +6,7 @@
PORTNAME= subversion
DISTVERSION= 1.5.0
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/downloads/
PKGNAMESUFFIX?= -devel
@@ -188,11 +188,11 @@
APR_CONFIG= apr-1-config
APU_CONFIG= apu-1-config
.if !defined(WITHOUT_BDB)
-LIB_DEPENDS+= apr-1.2:${PORTSDIR}/devel/apr-svn
+LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr-svn
APR_PORT= devel/apr-svn
OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes
.else
-LIB_DEPENDS+= apr-1.2:${PORTSDIR}/devel/apr
+LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr
APR_PORT= devel/apr
.endif
.endif
--- subversion.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807050211.m652BYWh010469>