Date: Mon, 8 Jun 2009 23:18:35 -0400 (EDT) From: "Philip M. Gollucci" <pgollucci@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lev@FreeBSD.org Subject: ports/135397: [PATCH] devel/subversion: devel/apr WITH_BDB related cleanups Message-ID: <200906090318.n593IZl2076134@frieza.p6m7g8.net> Resent-Message-ID: <200906090320.n593K4aB095593@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135397
>Category: ports
>Synopsis: [PATCH] devel/subversion: devel/apr WITH_BDB related cleanups
>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: Tue Jun 09 03:20:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 8.0-CURRENT amd64
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD frieza.p6m7g8.net 8.0-CURRENT FreeBSD 8.0-CURRENT #1: Thu Jun 4 00:22:57 EDT
>Description:
1) WITH_ASVN option clobbers RUN_DEPENDS, Its not bugged, but it is one.
Makefile
@@ -62,7 +62,7 @@
.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 "
2) We need to use the bsd.databases.mk subsystem (USE_BDB)
Makefile.common
@@ -54,6 +55,7 @@
# Default us "on"
.if !defined(WITHOUT_BDB)
+USE_DBD= 42+
PLIST_SUB+= BDB=""
.else
CONFIGURE_ARGS+= --without-berkeley-db
3) Apr handling and APR BDB support has been busted since
revision 1.77
date: 2009/01/18 19:43:53; author: pgollucci; state: Exp; lines: +108 -87
of devel/apr
Which is a pointyhat to me for not updating subversion then and its awesome the -exp didn't catch it either.
Here's a crack at it, and removes DEPENDS_ARGS which doesn't work anyway.
Makefile.common
@@ -92,21 +94,14 @@
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}
4)WANT_PERL does nothing these days, but thats a larger patch
to the tree. I relocated MAKE_JOBS_SAFE for consistency
@@ -14,11 +14,11 @@
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
A complete patch is attached.
Port maintainer (lev@freebsd.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- subversion-1.6.2_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/subversion/Makefile,v
retrieving revision 1.127
diff -u -u -r1.127 Makefile
--- Makefile 29 Apr 2009 12:11:16 -0000 1.127
+++ Makefile 9 Jun 2009 03:17:20 -0000
@@ -62,7 +62,7 @@
.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 "
@@ -173,7 +173,6 @@
fi
.endif
-
.if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT)
post-build:
cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
Index: Makefile.common
===================================================================
RCS file: /home/ncvs/ports/devel/subversion/Makefile.common,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile.common
--- Makefile.common 11 May 2009 14:38:33 -0000 1.20
+++ Makefile.common 9 Jun 2009 00:47:50 -0000
@@ -6,7 +6,7 @@
PORTNAME= subversion
PORTVERSION= 1.6.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
http://svnbook.red-bean.com/en/1.5/:book
@@ -14,11 +14,11 @@
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 +54,7 @@
# Default us "on"
.if !defined(WITHOUT_BDB)
+USE_DBD= 42+
PLIST_SUB+= BDB=""
.else
CONFIGURE_ARGS+= --without-berkeley-db
@@ -92,21 +93,14 @@
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}
--- subversion-1.6.2_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906090318.n593IZl2076134>