pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Make apr1 the default in preparation of removing Apach...
details: https://anonhg.NetBSD.org/pkgsrc/rev/23bdfba02417
branches: trunk
changeset: 635752:23bdfba02417
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Jun 10 14:40:50 2014 +0000
description:
Make apr1 the default in preparation of removing Apache 2.0.
diffstat:
devel/subversion-base/Makefile | 18 ++++--------------
devel/subversion-base/buildlink3.mk | 12 +++---------
devel/subversion-base/options.mk | 8 ++------
devel/subversion16-base/Makefile | 18 ++++--------------
devel/subversion16-base/buildlink3.mk | 13 +++----------
devel/subversion16-base/options.mk | 8 ++------
mk/defaults/options.description | 1 -
www/ap2-subversion/Makefile | 7 ++-----
8 files changed, 20 insertions(+), 65 deletions(-)
diffs (227 lines):
diff -r f39484c2c901 -r 23bdfba02417 devel/subversion-base/Makefile
--- a/devel/subversion-base/Makefile Tue Jun 10 14:21:37 2014 +0000
+++ b/devel/subversion-base/Makefile Tue Jun 10 14:40:50 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2014/05/18 11:43:51 adam Exp $
+# $NetBSD: Makefile,v 1.95 2014/06/10 14:40:50 joerg Exp $
PKGNAME= subversion-base-${SVNVER}
COMMENT= Version control system, base programs and libraries
@@ -15,29 +15,18 @@
CONFIGURE_ARGS+= --without-apxs
-.if !empty(PKG_OPTIONS:Mapr1)
APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util
-.else
-APU_OPTIONS= PKG_BUILD_OPTIONS.apr
-.endif
BUILD_DEFS+= ${APU_OPTIONS}
CFLAGS.SunOS+= -D__EXTENSIONS__
-.if !empty(PKG_OPTIONS:Mapr1)
-. include "../../devel/apr/buildlink3.mk"
-. include "../../devel/apr-util/buildlink3.mk"
-.else
-BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5
-. include "../../devel/apr0/buildlink3.mk"
-.endif
-
BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.15.1
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
PLIST_VARS+= db4
-.if !empty(PKG_OPTIONS:Mapr1) && !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
+.include "../../devel/apr-util/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
PLIST.db4= yes
CONFIGURE_ARGS+= --with-berkeley-db
.else
@@ -90,5 +79,6 @@
cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc
${MV} -f ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
+.include "../../devel/apr/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f39484c2c901 -r 23bdfba02417 devel/subversion-base/buildlink3.mk
--- a/devel/subversion-base/buildlink3.mk Tue Jun 10 14:21:37 2014 +0000
+++ b/devel/subversion-base/buildlink3.mk Tue Jun 10 14:40:50 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2014/04/09 07:26:58 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2014/06/10 14:40:50 joerg Exp $
.include "../../mk/bsd.fast.prefs.mk"
.include "../../devel/subversion/Makefile.version"
@@ -21,20 +21,14 @@
.include "../../security/cyrus-sasl/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.subversion-base:Mapr1)
-. include "../../devel/apr/buildlink3.mk"
-. include "../../devel/apr-util/buildlink3.mk"
-.else
-. include "../../devel/apr0/buildlink3.mk"
-.endif
-
-# If serf and -apr1 are selected, the build will probably fail.
.if !empty(PKG_BUILD_OPTIONS.subversion-base:Mserf)
. include "../../www/serf/buildlink3.mk"
.endif
BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.15.1
.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/apr/buildlink3.mk"
+.include "../../devel/apr-util/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.endif # SUBVERSION_BASE_BUILDLINK3_MK
diff -r f39484c2c901 -r 23bdfba02417 devel/subversion-base/options.mk
--- a/devel/subversion-base/options.mk Tue Jun 10 14:21:37 2014 +0000
+++ b/devel/subversion-base/options.mk Tue Jun 10 14:40:50 2014 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: options.mk,v 1.12 2013/07/04 19:31:15 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2014/06/10 14:40:50 joerg Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.subversion
-PKG_SUPPORTED_OPTIONS= apr1 serf sasl
-.include "../../mk/bsd.prefs.mk"
-.if !defined(PKG_APACHE_DEFAULT) || empty(PKG_APACHE_DEFAULT:Mapache2)
-PKG_SUGGESTED_OPTIONS= apr1
-.endif
+PKG_SUPPORTED_OPTIONS= serf sasl
PKG_SUGGESTED_OPTIONS+= serf
# Note that this file is included as part of several packages.
diff -r f39484c2c901 -r 23bdfba02417 devel/subversion16-base/Makefile
--- a/devel/subversion16-base/Makefile Tue Jun 10 14:21:37 2014 +0000
+++ b/devel/subversion16-base/Makefile Tue Jun 10 14:40:50 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/04/09 07:26:58 obache Exp $
+# $NetBSD: Makefile,v 1.9 2014/06/10 14:40:50 joerg Exp $
PKGNAME= subversion16-base-${SVNVER}
PKGREVISION= 5
@@ -17,27 +17,16 @@
CONFIGURE_ARGS+= --disable-neon-version-check
CONFIGURE_ARGS+= --without-apxs
-.if !empty(PKG_OPTIONS:Mapr1)
APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util
-.else
-APU_OPTIONS= PKG_BUILD_OPTIONS.apr
-.endif
BUILD_DEFS+= ${APU_OPTIONS}
-.if !empty(PKG_OPTIONS:Mapr1)
-. include "../../devel/apr/buildlink3.mk"
-. include "../../devel/apr-util/buildlink3.mk"
-.else
-BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5
-. include "../../devel/apr0/buildlink3.mk"
-.endif
-
BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.4
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
PLIST_VARS+= db4
-.if !empty(PKG_OPTIONS:Mapr1) && !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
+.include "../../devel/apr-util/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
PLIST.db4= yes
#CONFIGURE_ARGS+= --with-berkeley-db=:${BUILDLINK_PREFIX.db4:Q}/include:${BUILDLINK_PREFIX.db4:Q}/lib:${BUILDLINK_LDADD.db4:S/^-l//:Q}
CONFIGURE_ARGS+= --with-berkeley-db
@@ -103,5 +92,6 @@
cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client16,libsvn_delta16,libsvn_diff16,libsvn_fs16,libsvn_ra16,libsvn_repos16,libsvn_subr16,libsvn_wc16
${MV} -f ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
+.include "../../devel/apr/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f39484c2c901 -r 23bdfba02417 devel/subversion16-base/buildlink3.mk
--- a/devel/subversion16-base/buildlink3.mk Tue Jun 10 14:21:37 2014 +0000
+++ b/devel/subversion16-base/buildlink3.mk Tue Jun 10 14:40:50 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2014/04/09 07:26:58 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2014/06/10 14:40:50 joerg Exp $
.include "../../mk/bsd.fast.prefs.mk"
.include "../../devel/subversion/Makefile.version"
@@ -21,15 +21,6 @@
.include "../../security/cyrus-sasl/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.subversion16-base:Mapr1)
-. include "../../devel/apr/buildlink3.mk"
-. include "../../devel/apr-util/buildlink3.mk"
-.else
-. include "../../devel/apr0/buildlink3.mk"
-.endif
-
-# If serf and -apr1 are selected, the build will probably fail.
-# Do that rather than force neon for apr0
.if !empty(PKG_BUILD_OPTIONS.subversion16-base:Mserf)
. include "../../www/serf0/buildlink3.mk"
.else
@@ -38,6 +29,8 @@
BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.4
.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/apr/buildlink3.mk"
+.include "../../devel/apr-util/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.endif # SUBVERSION16_BASE_BUILDLINK3_MK
diff -r f39484c2c901 -r 23bdfba02417 devel/subversion16-base/options.mk
--- a/devel/subversion16-base/options.mk Tue Jun 10 14:21:37 2014 +0000
+++ b/devel/subversion16-base/options.mk Tue Jun 10 14:40:50 2014 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2013/02/22 15:33:49 taca Exp $
+# $NetBSD: options.mk,v 1.3 2014/06/10 14:40:50 joerg Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.subversion16
-PKG_SUPPORTED_OPTIONS= apr1 serf sasl
-.include "../../mk/bsd.prefs.mk"
-.if !defined(PKG_APACHE_DEFAULT) || empty(PKG_APACHE_DEFAULT:Mapache2)
-PKG_SUGGESTED_OPTIONS= apr1
-.endif
+PKG_SUPPORTED_OPTIONS= serf sasl
# Note that this file is included as part of several packages.
# Therefore this file defines options and includes some but not all of
diff -r f39484c2c901 -r 23bdfba02417 mk/defaults/options.description
--- a/mk/defaults/options.description Tue Jun 10 14:21:37 2014 +0000
+++ b/mk/defaults/options.description Tue Jun 10 14:40:50 2014 +0000
@@ -30,7 +30,6 @@
apache-mpm-prefork Use pre-forked workers in Apache web server.
apache-mpm-worker Use multiple processes of multi-threaded workers in Apache web server.
apache-shared-modules Build all modules as shared for apache22.
-apr1 Use Apache Portable Runtime 1.x rather than 0.x.
ares Use the ares library for asynchronous name resolution.
aria2-metalink Enable Metalink support.
arts Use the aRts audio daemon.
diff -r f39484c2c901 -r 23bdfba02417 www/ap2-subversion/Makefile
--- a/www/ap2-subversion/Makefile Tue Jun 10 14:21:37 2014 +0000
+++ b/www/ap2-subversion/Makefile Tue Jun 10 14:40:50 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2014/05/18 11:43:51 adam Exp $
+# $NetBSD: Makefile,v 1.69 2014/06/10 14:40:50 joerg Exp $
PKGNAME= ${APACHE_PKG_PREFIX}-subversion-${SVNVER}
COMMENT= WebDAV server (Apache module) for Subversion
@@ -20,11 +20,8 @@
${RM} ${WRKSRC}/build-outputs.mk
${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk
-PKG_APACHE_ACCEPTED= apache2 apache22 apache24
+PKG_APACHE_ACCEPTED= apache22 apache24
.include "../../devel/subversion-base/buildlink3.mk"
.include "../../mk/apache.mk"
-.if ${PKG_APACHE} == "apache2" && !empty(PKG_BUILD_OPTIONS.subversion-base:Mapr1)
-PKG_FAIL_REASON= "subversion-base package must be built without apr1 option."
-.endif
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index