please test/ok.
Index: apr/Makefile
===================================================================
RCS file: /cvs/ports/devel/apr/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- apr/Makefile 26 Apr 2007 16:05:01 -0000 1.11
+++ apr/Makefile 26 Jun 2007 07:14:00 -0000
@@ -2,10 +2,9 @@
COMMENT= "Apache Portable Runtime"
-DISTNAME= apr-1.2.7
-PKGNAME= ${DISTNAME}p2
-FULLPKGNAME= apr${MT}-1.2.7p2
-SHARED_LIBS += apr-1${MT} 2.7 # .2.7
+DISTNAME= apr-1.2.9
+FULLPKGNAME= apr${MT}-1.2.9
+SHARED_LIBS += apr-1${MT} 2.9 # .2.9
CATEGORIES= devel
Index: apr/distinfo
===================================================================
RCS file: /cvs/ports/devel/apr/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- apr/distinfo 5 Apr 2007 15:37:51 -0000 1.5
+++ apr/distinfo 26 Jun 2007 07:14:00 -0000
@@ -1,5 +1,5 @@
-MD5 (apr-1.2.7.tar.gz) = rqkmy+WI+EStnjFxV9YBdQ==
-RMD160 (apr-1.2.7.tar.gz) = nf61YrN2wyJhuKJjiHoFUVxK++I=
-SHA1 (apr-1.2.7.tar.gz) = Q3rUBm9xoZcCn/hqjLVfO2gXofM=
-SHA256 (apr-1.2.7.tar.gz) = S94m2BaCFvAOD2UuNOIOUn2rOO3KanwNha6lQr8Pxfo=
-SIZE (apr-1.2.7.tar.gz) = 1102370
+MD5 (apr-1.2.9.tar.gz) = b0sGOsAaVLoIGMMSgPBpWQ==
+RMD160 (apr-1.2.9.tar.gz) = AtXoHEvMOJp8KN0ZuWt5L61ym6g=
+SHA1 (apr-1.2.9.tar.gz) = KJZX2lem5zksZl3JtEraSRcktTc=
+SHA256 (apr-1.2.9.tar.gz) = pBYItezXa11VW4U8mQfVXRzyDp0WhpI+zLwUN++WfRM=
+SIZE (apr-1.2.9.tar.gz) = 1109990
Index: apr/patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/apr/patches/patch-configure,v
retrieving revision 1.5
diff -u -r1.5 patch-configure
--- apr/patches/patch-configure 1 Apr 2007 20:03:07 -0000 1.5
+++ apr/patches/patch-configure 26 Jun 2007 07:14:00 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2007/04/01 20:03:07 kurt Exp $
---- configure.orig Sun Apr 9 16:32:36 2006
-+++ configure Wed Mar 28 09:57:24 2007
-@@ -4317,6 +4317,11 @@ if test "x$apr_preload_done" != "xyes" ; then
+--- configure.orig Tue Jun 5 00:05:31 2007
++++ configure Tue Jun 26 08:30:40 2007
+@@ -4326,6 +4326,11 @@ if test "x$apr_preload_done" != "xyes" ; then
;;
*-openbsd*)
@@ -13,7 +13,7 @@
if test "x$CPPFLAGS" = "x"; then
test "x$silent" != "xyes" && echo " setting CPPFLAGS to
\"-D_POSIX_THREADS\""
CPPFLAGS="-D_POSIX_THREADS"
-@@ -26147,7 +26152,7 @@ if test "${apr_cv_pthreads_lib+set}" = set; then
+@@ -26156,7 +26161,7 @@ if test "${apr_cv_pthreads_lib+set}" = set; then
else
apr_ptc_libs=$LIBS
@@ -22,7 +22,7 @@
LIBS="$apr_ptc_libs $lib"
if test "$cross_compiling" = yes; then
-@@ -26705,7 +26710,7 @@ if test "${apr_cv_pthreads_lib+set}" = set; then
+@@ -26714,7 +26719,7 @@ if test "${apr_cv_pthreads_lib+set}" = set; then
else
apr_ptc_libs=$LIBS
@@ -31,7 +31,7 @@
LIBS="$apr_ptc_libs $lib"
if test "$cross_compiling" = yes; then
-@@ -39523,7 +39528,7 @@ for ac_spec in func:semget func:semctl define:SEM_UNDO
+@@ -39542,7 +39547,7 @@ for ac_spec in func:semget func:semctl define:SEM_UNDO
done
if test ".$ac_rc" = .yes; then
:
@@ -40,7 +40,7 @@
else
:
hassysvser="0"
-@@ -43558,7 +43563,7 @@ esac
+@@ -43577,7 +43582,7 @@ esac
Index: apr/patches/patch-test_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/apr/patches/patch-test_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-test_Makefile_in
--- apr/patches/patch-test_Makefile_in 24 Mar 2007 13:46:47 -0000 1.1
+++ apr/patches/patch-test_Makefile_in 26 Jun 2007 07:14:00 -0000
@@ -1,24 +1,7 @@
$OpenBSD: patch-test_Makefile_in,v 1.1 2007/03/24 13:46:47 todd Exp $
---- test/Makefile.in.orig Tue Mar 21 14:29:41 2006
-+++ test/Makefile.in Fri Feb 9 15:54:33 2007
-@@ -12,12 +12,13 @@ VPATH = @srcdir@
-
- STDTEST_PORTABLE = \
- [EMAIL PROTECTED]@ \
-- [EMAIL PROTECTED]@ \
-- [EMAIL PROTECTED]@ \
- [EMAIL PROTECTED]@ \
- [EMAIL PROTECTED]@
-
--OTHER_PROGRAMS = [EMAIL PROTECTED]@
-+OTHER_PROGRAMS = \
-+ [EMAIL PROTECTED]@ \
-+ [EMAIL PROTECTED]@ \
-+ [EMAIL PROTECTED]@
-
- PROGRAMS = $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS)
-
-@@ -26,7 +27,7 @@ TARGETS = $(PROGRAMS)
+--- test/Makefile.in.orig Sat Jun 2 00:02:13 2007
++++ test/Makefile.in Tue Jun 26 08:30:40 2007
+@@ -27,7 +27,7 @@ TARGETS = $(PROGRAMS)
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
Index: apr-util/Makefile
===================================================================
RCS file: /cvs/ports/devel/apr-util/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- apr-util/Makefile 28 Apr 2007 14:02:26 -0000 1.14
+++ apr-util/Makefile 26 Jun 2007 07:14:00 -0000
@@ -2,10 +2,9 @@
COMMENT= "companion library to APR"
-DISTNAME= apr-util-1.2.7
-PKGNAME= ${DISTNAME}p2
-FULLPKGNAME= apr-util${MT}-1.2.7p2
-SHARED_LIBS += aprutil-1${MT} 2.7 # .2.7
+DISTNAME= apr-util-1.2.8
+FULLPKGNAME= apr-util${MT}-1.2.8
+SHARED_LIBS += aprutil-1${MT} 2.9 # .2.8
CATEGORIES= devel
@@ -41,13 +40,13 @@
MT?=
.if ${FLAVOR:L:Mmt}
MT=-mt
-LIB_DEPENDS+= apr-1-mt.=2:apr-mt-1.2.7:devel/apr,mt
+LIB_DEPENDS+= apr-1-mt.=2:apr-mt-1.2.9:devel/apr,mt
post-install:
sed 's/{APRUTIL_LIBNAME}/{APRUTIL_LIBNAME}-mt/g'
${WRKSRC}/apu-config.out > ${PREFIX}/bin/apu-1-mt-config
.else
-LIB_DEPENDS+= apr-1.=2:apr-1.2.7:devel/apr
+LIB_DEPENDS+= apr-1.=2:apr-1.2.9:devel/apr
.endif
SUBST_VARS+= MT
Index: apr-util/distinfo
===================================================================
RCS file: /cvs/ports/devel/apr-util/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- apr-util/distinfo 5 Apr 2007 15:37:51 -0000 1.4
+++ apr-util/distinfo 26 Jun 2007 07:14:00 -0000
@@ -1,5 +1,5 @@
-MD5 (apr-util-1.2.7.tar.gz) = w3AmaKZAvhaVlWEVhX7CLg==
-RMD160 (apr-util-1.2.7.tar.gz) = M5mDy79O5mE58U27NDfVluV5Cy8=
-SHA1 (apr-util-1.2.7.tar.gz) = /bp7Rv5XMt/atakABSRAgKRJ+YU=
-SHA256 (apr-util-1.2.7.tar.gz) = jNhOsgMakVcuG+KXX0Fxcwqb5yxM2IcYxMQKx9xP19M=
-SIZE (apr-util-1.2.7.tar.gz) = 641600
+MD5 (apr-util-1.2.8.tar.gz) = ouLlTWXp6ulh9xcTNc8lUA==
+RMD160 (apr-util-1.2.8.tar.gz) = ALEO8Kqybz6l03TiQAwdulZqkCA=
+SHA1 (apr-util-1.2.8.tar.gz) = SSYNmLhjdWl0vYPNKLw5M41POoI=
+SHA256 (apr-util-1.2.8.tar.gz) = ZSfLCz3WGaz8pmhBLoTlKGDf2GIFQkbKkDgi1eqCTeY=
+SIZE (apr-util-1.2.8.tar.gz) = 646379
Index: apr-util/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/apr-util/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- apr-util/patches/patch-Makefile_in 25 Mar 2007 09:59:35 -0000 1.2
+++ apr-util/patches/patch-Makefile_in 26 Jun 2007 07:14:00 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.2 2007/03/25 09:59:35 steven Exp $
---- Makefile.in.orig Tue May 24 08:09:35 2005
-+++ Makefile.in Fri Feb 9 17:18:33 2007
+--- Makefile.in.orig Tue May 24 14:09:35 2005
++++ Makefile.in Tue Jun 26 08:51:15 2007
@@ -7,6 +7,8 @@ CPP = @CPP@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -10,7 +10,7 @@
srcdir = @srcdir@
VPATH = @srcdir@
-@@ -14,11 +16,12 @@ INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_
+@@ -14,11 +16,12 @@ INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APR
APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
APRUTIL_LIBS = @APRUTIL_LIBS@
