ports/122555: [PATCH] devel/apr: update to 1.2.12

Philip M. Gollucci pgollucci at p6m7g8.com
Tue Apr 8 06:10:12 UTC 2008


>Number:         122555
>Category:       ports
>Synopsis:       [PATCH] devel/apr: update to 1.2.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 08 06:10:11 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
>Description:
- Update to 1.2.12

Removed file(s):
- files/patch-apr_hints.m4

Port maintainer (rodrigc at crodrigues.org) is cc'd.

The last PR for this port timed-out, If it times out again,
I volunteer for maintainership.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- apr-1.2.12.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/apr/Makefile,v
retrieving revision 1.69
diff -u -u -r1.69 Makefile
--- Makefile	31 Mar 2008 13:55:58 -0000	1.69
+++ Makefile	8 Apr 2008 01:06:28 -0000
@@ -15,8 +15,7 @@
 # APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
 
 PORTNAME=	apr
-PORTVERSION=	1.2.8
-PORTREVISION=	3
+PORTVERSION=	1.2.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -131,8 +130,6 @@
 	@${ECHO_MSG} ""
 
 post-patch:
-	${REINPLACE_CMD} -e 's/OSVERSION/'${OSVERSION}'/g' \
-		${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4
 	${FIND} ${WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/apr/distinfo,v
retrieving revision 1.16
diff -u -u -r1.16 distinfo
--- distinfo	16 Jun 2007 19:56:47 -0000	1.16
+++ distinfo	7 Apr 2008 18:12:40 -0000
@@ -1,6 +1,6 @@
-MD5 (apr-1.2.8.tar.gz) = 814f19528d9cfc79aef188dd752e04d8
-SHA256 (apr-1.2.8.tar.gz) = 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7
-SIZE (apr-1.2.8.tar.gz) = 1107189
-MD5 (apr-util-1.2.8.tar.gz) = a2e2e54d65e9eae961f7171335cf2550
-SHA256 (apr-util-1.2.8.tar.gz) = 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6
-SIZE (apr-util-1.2.8.tar.gz) = 646379
+MD5 (apr-1.2.12.tar.gz) = 020ea947446dca2d1210c099c7a4c837
+SHA256 (apr-1.2.12.tar.gz) = 23759142c483be869a0aec0529c5b8c94745b4dfd1c2c23f38417f4e02adcead
+SIZE (apr-1.2.12.tar.gz) = 1127522
+MD5 (apr-util-1.2.12.tar.gz) = e292942e22edd21b68609086352212e4
+SHA256 (apr-util-1.2.12.tar.gz) = 7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
+SIZE (apr-util-1.2.12.tar.gz) = 668292
Index: files/patch-apr-util_build_dbm.m4
===================================================================
RCS file: /home/ncvs/ports/devel/apr/files/patch-apr-util_build_dbm.m4,v
retrieving revision 1.3
diff -u -u -r1.3 patch-apr-util_build_dbm.m4
--- files/patch-apr-util_build_dbm.m4	16 Jun 2007 19:56:47 -0000	1.3
+++ files/patch-apr-util_build_dbm.m4	8 Apr 2008 01:02:22 -0000
@@ -1,6 +1,6 @@
---- apr-util-1.2.8/build/dbm.m4-orig	Wed Dec  7 09:02:23 2005
-+++ apr-util-1.2.8/build/dbm.m4	Wed Dec 23 09:07:34 2005
-@@ -588,6 +588,8 @@
+--- ./apr-util-1.2.12/build/dbm.m4.orig	2007-11-01 10:07:19.000000000 -0400
++++ ./apr-util-1.2.12/build/dbm.m4	2008-04-07 21:01:46.000000000 -0400
+@@ -672,6 +672,8 @@
      elif test "$withval" = "no"; then
        apu_have_gdbm=0
      else
@@ -9,13 +9,13 @@
        CPPFLAGS="-I$withval/include"
        LIBS="-L$withval/lib "
  
-@@ -597,6 +599,9 @@
+@@ -681,6 +683,9 @@
          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
        fi
-+
++      
 +      CPPFLAGS="$saved_cppflags"
 +      LIBS="$saved_libs"
      fi
-   ], [
-     apu_have_gdbm=0
+   ])
+ 
Index: files/patch-apr-util_configure
===================================================================
RCS file: /home/ncvs/ports/devel/apr/files/patch-apr-util_configure,v
retrieving revision 1.3
diff -u -u -r1.3 patch-apr-util_configure
--- files/patch-apr-util_configure	16 Jun 2007 19:56:47 -0000	1.3
+++ files/patch-apr-util_configure	8 Apr 2008 01:02:22 -0000
@@ -1,6 +1,6 @@
---- apr-util-1.2.8/configure.orig	Mon Sep 26 18:28:49 2005
-+++ apr-util-1.2.8/configure	Fri Dec 23 15:06:09 2005
-@@ -13806,6 +13806,8 @@
+--- ./apr-util-1.2.12/configure.orig	2008-04-07 21:01:59.000000000 -0400
++++ ./apr-util-1.2.12/configure	2008-04-07 20:57:18.000000000 -0400
+@@ -14323,6 +14323,8 @@
      elif test "$withval" = "no"; then
        apu_have_gdbm=0
      else
@@ -9,7 +9,7 @@
        CPPFLAGS="-I$withval/include"
        LIBS="-L$withval/lib "
  
-@@ -14064,6 +14066,9 @@
+@@ -14566,6 +14568,9 @@
    fi
  
        fi
@@ -18,4 +18,4 @@
 +      LIBS="$saved_libs"
      fi
  
- else
+ fi
Index: files/patch-apr_hints.m4
===================================================================
RCS file: files/patch-apr_hints.m4
diff -N files/patch-apr_hints.m4
--- files/patch-apr_hints.m4	16 Jun 2007 19:56:47 -0000	1.11
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
---- apr-1.2.8/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.2.8/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
-@@ -137,11 +137,7 @@
- 	;;
-     *-freebsd*)
-         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
--        if test -x /sbin/sysctl; then
--            os_version=`/sbin/sysctl -n kern.osreldate`
--        else
--            os_version=000000
--        fi
-+        os_version="OSVERSION"
-         # 502102 is when libc_r switched to libpthread (aka libkse).
-         if test $os_version -ge "502102"; then
-           apr_cv_pthreads_cflags="none"
--- apr-1.2.12.patch ends here ---

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



More information about the freebsd-ports-bugs mailing list