SF.net SVN: gar:[22600] csw/mgar/pkg/apr-util/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Nov 28 15:10:35 CET 2013
Revision: 22600
http://gar.svn.sourceforge.net/gar/?rev=22600&view=rev
Author: dmichelsen
Date: 2013-11-28 14:10:35 +0000 (Thu, 28 Nov 2013)
Log Message:
-----------
apr-util/trunk: Update to 1.5.3, remove lots of old stuff
Modified Paths:
--------------
csw/mgar/pkg/apr-util/trunk/Makefile
csw/mgar/pkg/apr-util/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch
csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.depend
csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec
csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.prototype
csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.depend
csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.gspec
csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.prototype
csw/mgar/pkg/apr-util/trunk/files/bdb44.diff
csw/mgar/pkg/apr-util/trunk/files/config.layout
csw/mgar/pkg/apr-util/trunk/files/dbd-mysql.diff
Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/Makefile 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,5 +1,5 @@
NAME = apr-util
-VERSION = 1.5.1
+VERSION = 1.5.3
GARTYPE = v2
DESCRIPTION = Apache Portable Runtime Utilities
@@ -13,25 +13,22 @@
DISTFILES = $(NAME)-$(VERSION).tar.gz
LICENSE = LICENSE
-#PATCHFILES = 0001-Make-sure-to-find-newly-built-libs-earlier.patch
-
PACKAGES += CSWlibaprutil1-0
CATALOGNAME_CSWlibaprutil1-0 = libaprutil1_0
SPKG_DESC_CSWlibaprutil1-0 += Apache Portable Runtime Utilities, libaprutil-1.so.0 and private libraries
PKGFILES_CSWlibaprutil1-0 += $(call pkgfiles_lib,libaprutil-1.so.0)
# PKGFILES_CSWlibaprutil1-0 += $(call baseisadirs,$(libdir),apr-util-1/.*)
RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWiconv
RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibuuid1
OBSOLETED_BY_CSWlibaprutil1-0 += CSWapr-util
-
PACKAGES += CSWlibaprutil1-dbd-freetds
SPKG_DESC_CSWlibaprutil1-dbd-freetds = Apache Portable Runtime database binding, apr-util-1/apr_dbd_freetds-1.so
PKGFILES_CSWlibaprutil1-dbd-freetds += $(call baseisadirs,$(libdir),apr-util-1/apr_dbd_freetds.*\.so)
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-freetds += CSWlibsybdb5
RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-freetds += CSWlibaprutil1-0
CHECKPKG_OVERRIDES_CSWlibaprutil1-dbd-freetds += surplus-dependency|CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-freetds += CSWfreetds
# FreeTDS has not been included in legacy CSWapr-util
PACKAGES += CSWlibaprutil1-dbd-odbc
@@ -40,7 +37,7 @@
# Depend on base library, there is no explicit binding in the dbd libraries, though
RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-odbc += CSWlibaprutil1-0
CHECKPKG_OVERRIDES_CSWlibaprutil1-dbd-odbc += surplus-dependency|CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-odbc += CSWunixodbc
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-odbc += CSWlibodbc2
OBSOLETED_BY_CSWlibaprutil1-dbd-odbc += CSWapr-util
PACKAGES += CSWlibaprutil1-dbd-sqlite3
@@ -59,12 +56,21 @@
RUNTIME_DEP_PKGS_CSWlibaprutil1-dbm-db += CSWbdb48
OBSOLETED_BY_CSWlibaprutil1-dbm-db += CSWapr-util
+PACKAGES += CSWlibaprutil1-dbd-pgsql
+SPKG_DESC_CSWlibaprutil1-dbd-pgsql = Apache Portable Runtime database binding, apr-util-1/apr_dbd_pgsql.so
+PKGFILES_CSWlibaprutil1-dbd-pgsql += $(call baseisadirs,$(libdir),apr-util-1/apr_dbd_pgsql.*\.so)
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-pgsql += CSWlibpq5
+RUNTIME_DEP_PKGS_CSWlibaprutil1-dbd-pgsql += CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWlibaprutil1-dbd-pgsql += surplus-dependency|CSWlibaprutil1-0
+# PostgreSQL has not been included in legacy CSWapr-util
+
PACKAGES += CSWlibaprutil1-ldap
SPKG_DESC_CSWlibaprutil1-ldap = Apache Portable Runtime database binding, apr-util-1/apr_ldap-1.so
PKGFILES_CSWlibaprutil1-ldap += $(call baseisadirs,$(libdir),apr-util-1/apr_ldap.*\.so)
RUNTIME_DEP_PKGS_CSWlibaprutil1-ldap += CSWlibaprutil1-0
CHECKPKG_OVERRIDES_CSWlibaprutil1-ldap += surplus-dependency|CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWlibaprutil1-ldap += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWlibaprutil1-ldap += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWlibaprutil1-ldap += CSWlibldap2-4-2
OBSOLETED_BY_CSWlibaprutil1-ldap += CSWapr-util
PACKAGES += CSWlibaprutil-dev
@@ -75,6 +81,10 @@
# We need this to get bdb48/lib into the runpath
EXTRA_LIB += $(prefix)/bdb48/lib
+# Having -I/opt/csw/include appear in CPPFLAGS leads to the installed headers of aprutil included first leading to
+# undefined symbols
+CPPFLAGS =
+
# EXTRA_INC += $(prefix)/instantclient_10_2/$(MM_LIBDIR)/sdk/include
# EXTRA_LIB += $(prefix)/instantclient_10_2
@@ -86,13 +96,25 @@
CONFIGURE_ARGS += --with-dbm=db48
CONFIGURE_ARGS += --with-berkeley-db=$(prefix)/bdb48/include:$(prefix)/bdb48/lib/$(MM_LIBDIR)
CONFIGURE_ARGS += --with-ldap
-CONFIGURE_ARGS += --with-freetds
CONFIGURE_ARGS += --without-sqlite2
-CONFIGURE_ARGS += --with-sqlite3
+CONFIGURE_ARGS += --with-sqlite3=$(prefix)
# Enabling Oracle takes some more with the current instantclient layout
#CONFIGURE_ARGS += --with-oracle=$(prefix)/instantclient_10_2/$(MM_LIBDIR)
#CONFIGURE_ARGS += --with-oracle-include=$(prefix)/instantclient_10_2/$(MM_LIBDIR)/sdk/include
-CONFIGURE_ARGS += --with-freetds
+CONFIGURE_ARGS += --with-freetds=$(prefix)
CONFIGURE_ARGS += --with-odbc
+CONFIGURE_ARGS += --with-pgsql
+# How do we deal with 64 bit?
+CONFIGURE_ARGS += --with-expat=$(prefix)
+
+TEST_ARGS += EXTRA_LDFLAGS="-L$(libdir) -liconv"
+
+# The whole testsuite requires running databases
+SKIPTEST ?= 1
+
include gar/category.mk
+
+post-configure:
+ perl -npe 's/^(CPPFLAGS.*)/# $$1/' -i $(WORKSRC)/build/rules.mk
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/apr-util/trunk/checksums
===================================================================
--- csw/mgar/pkg/apr-util/trunk/checksums 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/checksums 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1 +1 @@
-490c2e26e2dc95fd0983ad71112ddac6 apr-util-1.5.1.tar.gz
+71a11d037240b292f824ba1eb537b4e3 apr-util-1.5.3.tar.gz
Deleted: csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,25 +0,0 @@
-From 616e65579de39c6065233d09837bc84e747dd2b5 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 23 Aug 2010 11:24:04 +0200
-Subject: [PATCH] Make sure to find newly built libs earlier
-
----
- test/Makefile.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.in b/test/Makefile.in
-index 97ff49b..55d254a 100644
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -73,7 +73,7 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
- fi; \
- done; \
- else \
-- @apr_shlibpath_var@="`echo "../dbm/.libs:../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \
-+ @apr_shlibpath_var@="`echo "../.libs:../dbm/.libs:../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \
- ./$$prog; \
- status=$$?; \
- if test $$status != 0; then \
---
-1.7.1
-
Deleted: csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.depend
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.depend 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.depend 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1 +0,0 @@
-P CSWaprutil aprutil - Apache Portable Runtime Utility libraries
Deleted: csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.gspec 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,4 +0,0 @@
-%var bitname aprutil_devel
-%var pkgname CSWaprutil-devel
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENSE
Deleted: csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.prototype
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.prototype 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/CSWaprutil-devel.prototype 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,36 +0,0 @@
-d none /opt/csw/include 0755 root bin
-d none /opt/csw/include/apr-1 0755 root bin
-f none /opt/csw/include/apr-1/apr_anylock.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_base64.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_buckets.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_date.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_dbd.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_dbm.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_hooks.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_ldap.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_ldap_init.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_ldap_option.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_ldap_url.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_md4.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_md5.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_optional.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_optional_hooks.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_queue.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_reslist.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_rmm.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_sdbm.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_sha1.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_strmatch.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_uri.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_uuid.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_xlate.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_xml.h 0644 root bin
-f none /opt/csw/include/apr-1/apu.h 0644 root bin
-f none /opt/csw/include/apr-1/apu_version.h 0644 root bin
-f none /opt/csw/include/apr-1/apu_want.h 0644 root bin
-d none /opt/csw/lib 0755 root bin
-f none /opt/csw/lib/aprutil.exp 0644 root bin
-f none /opt/csw/lib/libaprutil.a 0644 root bin
-f none /opt/csw/lib/libaprutil.la 0755 root bin
-d none /opt/csw/lib/pkgconfig 0755 root bin
-f none /opt/csw/lib/pkgconfig/apr-util-1.pc 0644 root bin
Deleted: csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.depend
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.depend 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.depend 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,7 +0,0 @@
-P CSWapr apr - Apache Portable Runtime
-P CSWbdb43 berkeleydb43 - BerkeleyDB 4.3 libraries and utilities
-P CSWexpat expat - XML Parser Toolkit
-P CSWgdbm gdbm - GNU dbm
-P CSWiconv libiconv - GNU iconv library
-P CSWoldaprt openldap_rt - ldap runtime libraries
-P CSWsqlite3 sqlite3 - An embeddable SQL engine in a C library
Deleted: csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.gspec
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.gspec 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.gspec 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,4 +0,0 @@
-%var bitname aprutil
-%var pkgname CSWaprutil
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENSE
Deleted: csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.prototype
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.prototype 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/CSWaprutil.prototype 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,7 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/apu-1-config 0755 root bin
-s none /opt/csw/bin/apu-config=apu-1-config root bin
-d none /opt/csw/lib 0755 root bin
-f none /opt/csw/lib/libaprutil.so.0.2.2 0755 root bin
-s none /opt/csw/lib/libaprutil.so.0=libaprutil.so.0.2.2 root bin
-s none /opt/csw/lib/libaprutil.so=libaprutil.so.0.2.2 root bin
Deleted: csw/mgar/pkg/apr-util/trunk/files/bdb44.diff
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/bdb44.diff 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/bdb44.diff 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,103 +0,0 @@
-diff --speed-large-files --minimal -Nru apr-util-1.2.2.orig/build/dbm.m4 apr-util-1.2.2/build/dbm.m4
---- apr-util-1.2.2.orig/build/dbm.m4 2005-12-13 03:39:35.902099000 -0500
-+++ apr-util-1.2.2/build/dbm.m4 2005-12-13 03:39:16.908458000 -0500
-@@ -445,7 +445,25 @@
- apu_db_version=4
- fi
- ])
--
-+dnl
-+dnl APU_CHECK_DB44: is DB4.4 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB44], [
-+ places=$1
-+ if test -z "$places"; then
-+ places="std /usr/local/BerkeleyDB.4.4 /boot/home/config"
-+ fi
-+ APU_CHECK_BERKELEY_DB("4", "4", "-1",
-+ "$places",
-+ "db44/db.h db4/db.h db.h",
-+ "db-4.4 db4-4.4 db44 db4 db"
-+ )
-+ if test "$apu_have_db" = "1"; then
-+ apu_db_version=4
-+ fi
-+])
-
- AC_DEFUN([APU_CHECK_DB], [
- requested=$1
-@@ -506,6 +524,12 @@
- AC_MSG_ERROR(Berkeley db4 not found)
- fi
- ;;
-+ db44)
-+ APU_CHECK_DB44("$check_places")
-+ if test "$apu_db_version" != "4"; then
-+ AC_MSG_ERROR(Berkeley db4 not found)
-+ fi
-+ ;;
- default)
- APU_CHECK_DB_ALL("$check_places")
- ;;
-@@ -518,21 +542,24 @@
- AC_DEFUN([APU_CHECK_DB_ALL], [
- all_places=$1
-
-- APU_CHECK_DB43("$all_places")
-+ APU_CHECK_DB44("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB42("$all_places")
-+ APU_CHECK_DB43("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB41("$all_places")
-+ APU_CHECK_DB42("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB4("$all_places")
-+ APU_CHECK_DB41("$all_places")
- if test "$apu_db_version" != "4"; then
-- APU_CHECK_DB3("$all_places")
-- if test "$apu_db_version" != "3"; then
-- APU_CHECK_DB2("$all_places")
-- if test "$apu_db_version" != "2"; then
-- APU_CHECK_DB1("$all_places")
-- if test "$apu_db_version" != "1"; then
-- APU_CHECK_DB185("$all_places")
-+ APU_CHECK_DB4("$all_places")
-+ if test "$apu_db_version" != "4"; then
-+ APU_CHECK_DB3("$all_places")
-+ if test "$apu_db_version" != "3"; then
-+ APU_CHECK_DB2("$all_places")
-+ if test "$apu_db_version" != "2"; then
-+ APU_CHECK_DB1("$all_places")
-+ if test "$apu_db_version" != "1"; then
-+ APU_CHECK_DB185("$all_places")
-+ fi
- fi
- fi
- fi
-@@ -568,11 +595,11 @@
-
- AC_ARG_WITH(dbm, [
- --with-dbm=DBM choose the DBM type to use.
-- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43}
-+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44}
- ], [
- if test "$withval" = "yes"; then
- AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
-- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43])
-+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44])
- fi
- requested="$withval"
- ], [
-@@ -754,6 +781,9 @@
- apu_use_db=1
- apu_default_dbm=db4
- ;;
-+ db44)
-+ apu_use_db=1
-+ apu_default_dbm=db4
- default)
- dnl ### use more sophisticated DBMs for the default?
- apu_default_dbm="sdbm (default)"
Deleted: csw/mgar/pkg/apr-util/trunk/files/config.layout
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/config.layout 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/config.layout 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,249 +0,0 @@
-##
-## config.layout -- Pre-defined Installation Path Layouts
-##
-## Hints:
-## - layouts can be loaded with configure's --enable-layout=ID option
-## - when no --enable-layout option is given, the default layout is `apr'
-## - a trailing plus character (`+') on paths is replaced with a
-## `/<target>' suffix where <target> is currently hardcoded to 'apr'.
-## (This may become a configurable parameter at some point.)
-##
-
-# Classical APR-util path layout designed for parallel installs.
-<Layout apr-util>
- prefix: /usr/local/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/modules
- mandir: ${prefix}/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
- localstatedir: ${prefix}
- libsuffix: -${APRUTIL_MAJOR_VERSION}
-</Layout>
-
-# Classical single-installation APR path layout.
-<Layout classic>
- prefix: /usr/local/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/modules
- mandir: ${prefix}/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include
- localstatedir: ${prefix}
-</Layout>
-
-# GNU standards conforming path layout.
-# See FSF's GNU project `make-stds' document for details.
-<Layout GNU>
- prefix: /usr/local
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec
- mandir: ${prefix}/man
- sysconfdir: ${prefix}/etc+
- datadir: ${prefix}/share+
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include+
- localstatedir: ${prefix}/var+
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# Mac OS X Server (Rhapsody)
-<Layout Mac OS X Server>
- prefix: /Local/Library/WebServer
- exec_prefix: /usr
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: /System/Library/apr/Modules
- mandir: ${exec_prefix}/share/man
- sysconfdir: ${prefix}/Configuration
- datadir: ${prefix}
- installbuilddir: /System/Library/apr/Build
- includedir: /System/Library/Frameworks/apr.framework/Versions/2.0/Headers
- localstatedir: /var
- runtimedir: ${prefix}/Logs
-</Layout>
-
-# Darwin/Mac OS Layout
-<Layout Darwin>
- prefix: /usr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec+
- mandir: ${prefix}/share/man
- datadir: /Library/WebServer
- sysconfdir: /etc+
- installbuilddir: ${prefix}/share/httpd/build
- includedir: ${prefix}/include+
- localstatedir: /var
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# Red Hat Linux 7.x layout
-<Layout RedHat>
- prefix: /usr
- exec_prefix: ${prefix}
- bindir: ${prefix}/bin
- sbindir: ${prefix}/sbin
- libdir: ${prefix}/lib
- libexecdir: ${prefix}/lib/apr
- mandir: ${prefix}/man
- sysconfdir: /etc/httpd/conf
- datadir: /var/www
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr
- localstatedir: /var
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# According to the /opt filesystem conventions
-<Layout opt>
- prefix: /opt/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec
- mandir: ${prefix}/man
- sysconfdir: /etc${prefix}
- datadir: ${prefix}/share
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include
- localstatedir: /var${prefix}
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# BeOS layout...
-<Layout beos>
- prefix: /boot/home/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec
- mandir: ${prefix}/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include
- localstatedir: ${prefix}
- runtimedir: ${localstatedir}/logs
-</Layout>
-
-# SuSE 6.x layout
-<Layout SuSE>
- prefix: /usr
- exec_prefix: ${prefix}
- bindir: ${prefix}/bin
- sbindir: ${prefix}/sbin
- libdir: ${prefix}/lib
- libexecdir: ${prefix}/lib/apr
- mandir: ${prefix}/share/man
- sysconfdir: /etc/httpd
- datadir: /usr/local/httpd
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr
- localstatedir: /var/lib/httpd
- runtimedir: /var/run
-</Layout>
-
-# BSD/OS layout
-<Layout BSDI>
- prefix: /var/www
- exec_prefix: /usr/contrib
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec/apr
- mandir: ${exec_prefix}/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- includedir: ${exec_prefix}/include/apr
- localstatedir: /var
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# Solaris 8 Layout
-<Layout Solaris>
- prefix: /usr/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec
- mandir: ${exec_prefix}/man
- sysconfdir: /etc/apr
- datadir: /var/apr
- installbuilddir: ${datadir}/build
- includedir: ${exec_prefix}/include
- localstatedir: ${prefix}
- runtimedir: /var/run
-</Layout>
-
-# OpenBSD Layout
-<Layout OpenBSD>
- prefix: /var/www
- exec_prefix: /usr
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/lib/apr/modules
- mandir: ${exec_prefix}/share/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${prefix}/build
- includedir: ${exec_prefix}/lib/apr/include
- localstatedir: ${prefix}
- runtimedir: ${prefix}/logs
-</Layout>
-
-# Debian layout
-<Layout Debian>
- prefix:
- exec_prefix: ${prefix}/usr
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/lib/apr/modules
- mandir: ${exec_prefix}/share/man
- datadir: ${exec_prefix}/share/apr
- includedir: ${exec_prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
- localstatedir: ${prefix}/var/run
- runtimedir: ${prefix}/var/run
- infodir: ${exec_prefix}/share/info
- libsuffix -${APRUTIL_MAJOR_VERSION}
-</Layout>
-
-# csw layout
-<Layout csw>
- prefix: /opt/csw
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/lib/apr/modules
- mandir: ${exec_prefix}/share/man
- datadir: ${exec_prefix}/share/apr
- includedir: ${exec_prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
- localstatedir: ${prefix}/var/run
- runtimedir: ${prefix}/var/run
- infodir: ${exec_prefix}/share/info
- libsuffix -${APRUTIL_MAJOR_VERSION}
-</Layout>
-
Deleted: csw/mgar/pkg/apr-util/trunk/files/dbd-mysql.diff
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/dbd-mysql.diff 2013-11-28 13:12:50 UTC (rev 22599)
+++ csw/mgar/pkg/apr-util/trunk/files/dbd-mysql.diff 2013-11-28 14:10:35 UTC (rev 22600)
@@ -1,36 +0,0 @@
-diff --speed-large-files --minimal -Nru apr-util-1.2.2.orig/build/dbd.m4 apr-util-1.2.2/build/dbd.m4
---- apr-util-1.2.2.orig/build/dbd.m4 2005-12-13 20:23:11.123071000 -0500
-+++ apr-util-1.2.2/build/dbd.m4 2005-12-13 20:23:01.813244000 -0500
-@@ -87,14 +87,14 @@
- elif test "$withval" = "no"; then
- apu_have_mysql=0
- else
-- CPPFLAGS="-I$withval/include"
-- LIBS="-L$withval/lib "
-+ CPPFLAGS="-I$withval/include/mysql"
-+ LIBS="-L$withval/lib/mysql "
-
- AC_MSG_NOTICE(checking for mysql in $withval)
- AC_CHECK_HEADER(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
- if test "$apu_have_mysql" != "0"; then
-- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-+ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib/mysql])
-+ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
- fi
-
- if test "$apu_have_mysql" != "1"; then
-diff --speed-large-files --minimal -Nru apr-util-1.2.2.orig/build-outputs.mk apr-util-1.2.2/build-outputs.mk
---- apr-util-1.2.2.orig/build-outputs.mk 2005-12-13 20:23:09.205901000 -0500
-+++ apr-util-1.2.2/build-outputs.mk 2005-12-13 20:22:46.348436000 -0500
-@@ -45,8 +45,9 @@
- dbd/apr_dbd_sqlite2.lo: dbd/apr_dbd_sqlite2.c .make.dirs
- dbd/apr_dbd_sqlite3.lo: dbd/apr_dbd_sqlite3.c .make.dirs
- dbd/apr_dbd_pgsql.lo: dbd/apr_dbd_pgsql.c .make.dirs
-+dbd/apr_dbd_mysql.lo: dbd/apr_dbd_mysql.c .make.dirs
-
--OBJECTS_all = buckets/apr_buckets_pipe.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_alloc.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_socket.lo buckets/apr_buckets_heap.lo buckets/apr_buckets_simple.lo buckets/apr_buckets_file.lo buckets/apr_buckets.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_eos.lo buckets/apr_brigade.lo buckets/apr_buckets_refcount.lo crypto/apr_sha1.lo crypto/uuid.lo crypto/getuuid.lo crypto/apr_md5.lo crypto/apr_md4.lo dbm/apr_dbm.lo dbm/apr_dbm_berkeleydb.lo dbm/apr_dbm_gdbm.lo dbm/apr_dbm_ndbm.lo dbm/apr_dbm_sdbm.lo dbm/sdbm/sdbm_pair.lo dbm/sdbm/sdbm.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm_lock.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_url.lo ldap/apr_ldap_option.lo ldap/apr_ldap_init.lo misc/apr_reslist.lo misc/apu_version.lo misc/apr_date.lo misc/apr_rmm.lo misc/apr_queue.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo dbd/apr_dbd.lo dbd/apr_dbd_sqlite2.lo dbd/apr_dbd_sqlite3.lo dbd/apr_dbd_pgsq
l.lo
-+OBJECTS_all = buckets/apr_buckets_pipe.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_alloc.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_socket.lo buckets/apr_buckets_heap.lo buckets/apr_buckets_simple.lo buckets/apr_buckets_file.lo buckets/apr_buckets.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_eos.lo buckets/apr_brigade.lo buckets/apr_buckets_refcount.lo crypto/apr_sha1.lo crypto/uuid.lo crypto/getuuid.lo crypto/apr_md5.lo crypto/apr_md4.lo dbm/apr_dbm.lo dbm/apr_dbm_berkeleydb.lo dbm/apr_dbm_gdbm.lo dbm/apr_dbm_ndbm.lo dbm/apr_dbm_sdbm.lo dbm/sdbm/sdbm_pair.lo dbm/sdbm/sdbm.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm_lock.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_url.lo ldap/apr_ldap_option.lo ldap/apr_ldap_init.lo misc/apr_reslist.lo misc/apu_version.lo misc/apr_date.lo misc/apr_rmm.lo misc/apr_queue.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo dbd/apr_dbd.lo dbd/apr_dbd_sqlite2.lo dbd/apr_dbd_sqlite3.lo dbd/apr_dbd_pgsq
l.lo dbd/apr_dbd_mysql.lo
-
- OBJECTS_unix = $(OBJECTS_all)
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list