ports/123657: standardize on apr-1 LIB_DEPENDS instead of apr-1.2 in preparation for apr 1.3.0

[Philip M. Gollucci]

>Number:         123657
>Category:       ports
>Synopsis:       standardize on apr-1 LIB_DEPENDS instead of apr-1.2 in preparation for apr 1.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 14 05:30:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
Riderway Inc.
>Environment:
System: FreeBSD piccollo.p6m7g8.net 8.0-CURRENT FreeBSD 8.0-CURRENT #1: Sun Mar 2 09:48:59 EST 2008 root at krillin.p6m7g8.net:/usr/obj/usr/src/sys/PICCOLLO i386
>Description:
o apr/apr-util is FORWARD compatible in the 1.x series
  (http://apr.apache.org/versioning.html)
o affects 4 ports

>How-To-Repeat:
>Fix:

--- apr.diff begins here ---
Index: devel/subcommander/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/subcommander/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- devel/subcommander/Makefile	5 May 2008 08:33:56 -0000	1.5
+++ devel/subcommander/Makefile	14 May 2008 05:13:02 -0000
@@ -15,7 +15,7 @@
 COMMENT=	Qt based multiplatform subversion client, diff & merge tool
 
 LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon26 \
-		apr-1.2:${PORTSDIR}/devel/apr-svn \
+		apr-1:${PORTSDIR}/devel/apr-svn \
 		boost_thread.4:${PORTSDIR}/devel/boost \
 		svn_client-1.0:${PORTSDIR}/devel/subversion
 
Index: devel/subversion/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/subversion/Makefile,v
retrieving revision 1.119
diff -u -r1.119 Makefile
--- devel/subversion/Makefile	5 May 2008 08:33:56 -0000	1.119
+++ devel/subversion/Makefile	14 May 2008 05:14:14 -0000
@@ -187,11 +187,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
Index: sysutils/ftwin/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/ftwin/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sysutils/ftwin/Makefile	3 Jan 2008 04:25:44 -0000	1.2
+++ sysutils/ftwin/Makefile	14 May 2008 05:14:28 -0000
@@ -14,7 +14,7 @@
 COMMENT=	A useful tool to find duplicate files
 
 LIB_DEPENDS=	puzzle.1:${PORTSDIR}/graphics/libpuzzle \
-		apr-1.2:${PORTSDIR}/devel/apr \
+		apr-1:${PORTSDIR}/devel/apr \
 		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
Index: www/tomcat-native/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/tomcat-native/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- www/tomcat-native/Makefile	28 Feb 2008 14:26:10 -0000	1.1
+++ www/tomcat-native/Makefile	14 May 2008 05:14:49 -0000
@@ -15,7 +15,7 @@
 MAINTAINER=	ale at FreeBSD.org
 COMMENT=	Tomcat native library
 
-LIB_DEPENDS=	apr-1.2:${PORTSDIR}/devel/apr
+LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/jni/native
 
--- apr.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: