[arch-commits] Commit in apr/trunk (4 files)

Fri Jun 20 00:42:28 UTC 2008

Date: Thursday, June 19, 2008 @ 20:42:28
  Author: pierre
Revision: 3120

upgpkg: apr 1.3.0-1

Modified:
  apr/trunk/PKGBUILD
Deleted:
  apr/trunk/fix-apr.pc.patch
  apr/trunk/fix_apr-config.patch
  apr/trunk/ship_find_apr.m4.patch

------------------------+
 PKGBUILD               |   34 ++++++++++++----------------------
 fix-apr.pc.patch       |   19 -------------------
 fix_apr-config.patch   |   32 --------------------------------
 ship_find_apr.m4.patch |   26 --------------------------
 4 files changed, 12 insertions(+), 99 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2008-06-20 00:42:03 UTC (rev 3119)
+++ PKGBUILD	2008-06-20 00:42:28 UTC (rev 3120)
@@ -1,7 +1,8 @@
 # $Id$
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
 pkgname=apr
-pkgver=1.2.12
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
@@ -9,26 +10,15 @@
 depends=('e2fsprogs')
 options=('!libtool')
 license=('APACHE')
-source=("http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2" \
-	'fix-apr.pc.patch' \
-	'fix_apr-config.patch' \
-	'ship_find_apr.m4.patch')
-md5sums=('c5da94517e3918f0f2b2e0a05f56aa21'
-         'cc4e960c14a55aba304a247c4cfd63d9'
-         'b57edc9ef228f1a90d1aa85d73e53695'
-         'd85eb89f076e19a137afc4dd957874ab')
-                           
+source=("http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2")
+md5sums=('27d8fc8b13f8ea1a40e6796e7453bd84')
+
 build() {
-  cd ${startdir}/src/apr-${pkgver}
-  patch -Np1 -i ${startdir}/src/fix-apr.pc.patch || return 1
-  patch -Np1 -i ${startdir}/src/fix_apr-config.patch || return 1
-  patch -Np1 -i ${startdir}/src/ship_find_apr.m4.patch || return 1
-  ./buildconf
-  export ac_cv_search_shm_open=no
+	cd ${srcdir}/apr-${pkgver}
 
-  ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
-  	--with-installbuilddir=/usr/share/apr-1/build \
-	--enable-nonportable-atomics
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
+	./configure --prefix=/usr --includedir=/usr/include/apr-1 \
+		--with-installbuilddir=/usr/share/apr-1/build \
+		--enable-nonportable-atomics
+	make || return 1
+	make DESTDIR=${pkgdir} install
+}
\ No newline at end of file

Deleted: fix-apr.pc.patch
===================================================================
--- fix-apr.pc.patch	2008-06-20 00:42:03 UTC (rev 3119)
+++ fix-apr.pc.patch	2008-06-20 00:42:28 UTC (rev 3120)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 014_fix-apr.pc.dpatch by  <tfheen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad apr1.0-1.2.2~/apr.pc.in apr1.0-1.2.2/apr.pc.in
---- apr1.0-1.2.2~/apr.pc.in	2006-01-27 17:28:12.000000000 +0100
-+++ apr1.0-1.2.2/apr.pc.in	2006-01-27 17:31:18.000000000 +0100
-@@ -7,5 +7,6 @@
- Name: APR
- Description: The Apache Portable Runtime library
- Version: @APR_DOTTED_VERSION@
--Libs: -L${libdir} -l at APR_LIBNAME@ @EXTRA_LIBS@
--Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir}
-+Libs: -L${libdir} -l at APR_LIBNAME@
-+Libs.private: @EXTRA_LIBS@
-+Cflags: @EXTRA_CPPFLAGS@ -I${includedir}

Deleted: fix_apr-config.patch
===================================================================
--- fix_apr-config.patch	2008-06-20 00:42:03 UTC (rev 3119)
+++ fix_apr-config.patch	2008-06-20 00:42:28 UTC (rev 3120)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 011_fix_apr-config.dpatch by  <tfheen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: apr-config.in
---- a/apr-config.in
-+++ b/apr-config.in
-@@ -38,7 +38,7 @@
- LIBS="@EXTRA_LIBS@"
- EXTRA_INCLUDES="@EXTRA_INCLUDES@"
- SHLIBPATH_VAR="@shlibpath_var@"
--APR_SOURCE_DIR="@apr_srcdir@"
-+APR_SOURCE_DIR="$(cd @installbuilddir@/.. ; pwd)"
- APR_BUILD_DIR="@apr_builddir@"
- APR_SO_EXT="@so_ext@"
- APR_LIB_TARGET="@export_lib_target@"
-@@ -222,11 +222,7 @@
-     exit 0
-     ;;
-     --apr-libtool)
--    if test "$location" = "installed"; then
--        echo "${installbuilddir}/libtool"
--    else
--        echo "$APR_BUILD_DIR/libtool"
--    fi
-+        echo "$installbuilddir/libtool"
-     exit 0
-     ;;
-     --help)

Deleted: ship_find_apr.m4.patch
===================================================================
--- ship_find_apr.m4.patch	2008-06-20 00:42:03 UTC (rev 3119)
+++ ship_find_apr.m4.patch	2008-06-20 00:42:28 UTC (rev 3120)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 013_ship_find_apr.m4.dpatch by Tollef Fog Heen <tfheen at err.no>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Install a set of random build files too
-
- at DPATCH@
-diff -urNad apr1.0-1.2.2~/Makefile.in apr1.0-1.2.2/Makefile.in
---- apr1.0-1.2.2~/Makefile.in	2005-02-04 12:55:44.000000000 +0100
-+++ apr1.0-1.2.2/Makefile.in	2006-01-26 20:19:44.000000000 +0100
-@@ -85,6 +85,15 @@
- 	done
- 	$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
- 	$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
-+
-+	if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
-+	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
-+	fi
-+	for file in find_apr.m4 apr_common.m4 install.sh gen-build.py get-version.sh ; do \
-+		$(LIBTOOL) --mode=install cp $(top_srcdir)/build/$$file \
-+	    $(DESTDIR)$(installbuilddir)/$$file	; \
-+	done
-+
- 	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
-             for i in $(INSTALL_SUBDIRS); do \
- 	        ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \



