two minor updates. seems to be fine on amd64.
Index: apr/Makefile
===================================================================
RCS file: /cvs/ports/devel/apr/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- apr/Makefile 16 Sep 2007 02:52:56 -0000 1.16
+++ apr/Makefile 18 Sep 2007 13:14:29 -0000
@@ -2,9 +2,10 @@
COMMENT= Apache Portable Runtime
-DISTNAME= apr-1.2.9
-FULLPKGNAME= apr${MT}-1.2.9p0
-SHARED_LIBS += apr-1${MT} 2.9 # .2.9
+V= 1.2.11
+DISTNAME= apr-$V
+FULLPKGNAME= apr${MT}-$V
+SHARED_LIBS += apr-1${MT} 2.11 # .2.11
CATEGORIES= devel
Index: apr/distinfo
===================================================================
RCS file: /cvs/ports/devel/apr/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- apr/distinfo 5 Jul 2007 16:01:28 -0000 1.6
+++ apr/distinfo 18 Sep 2007 13:14:29 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (apr-1.2.11.tar.gz) = r8+VQdwxVRq+tsU7tCwllg==
+RMD160 (apr-1.2.11.tar.gz) = ixwYMc2Cgd4X9B+E/8XP2bbDVVM=
+SHA1 (apr-1.2.11.tar.gz) = veLItuR3dSvKxPOHrA3pZxzRXRo=
+SHA256 (apr-1.2.11.tar.gz) = /HoU6N7QAsJSz188zObNVjbwGoWYYYjjc/k0OhdMQv8=
+SIZE (apr-1.2.11.tar.gz) = 1114033
Index: apr/patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/apr/patches/patch-configure,v
retrieving revision 1.6
diff -u -r1.6 patch-configure
--- apr/patches/patch-configure 5 Jul 2007 16:01:28 -0000 1.6
+++ apr/patches/patch-configure 18 Sep 2007 13:14:29 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.6 2007/07/05 16:01:28 steven Exp $
---- configure.orig Tue Jun 5 00:05:31 2007
-+++ configure Tue Jun 26 08:30:40 2007
+--- configure.orig Tue Sep 4 03:42:02 2007
++++ configure Sat Sep 15 21:15:35 2007
@@ -4326,6 +4326,11 @@ if test "x$apr_preload_done" != "xyes" ; then
;;
*-openbsd*)
@@ -31,7 +31,7 @@
LIBS="$apr_ptc_libs $lib"
if test "$cross_compiling" = yes; then
-@@ -39542,7 +39547,7 @@ for ac_spec in func:semget func:semctl define:SEM_UNDO
+@@ -39676,7 +39681,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"
-@@ -43577,7 +43582,7 @@ esac
+@@ -43711,7 +43716,7 @@ esac
Index: apr/patches/patch-user_unix_groupinfo_c
===================================================================
RCS file: apr/patches/patch-user_unix_groupinfo_c
diff -N apr/patches/patch-user_unix_groupinfo_c
--- apr/patches/patch-user_unix_groupinfo_c 1 Apr 2007 20:03:07 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-user_unix_groupinfo_c,v 1.2 2007/04/01 20:03:07 kurt Exp $
---- user/unix/groupinfo.c.orig Wed Aug 24 05:42:42 2005
-+++ user/unix/groupinfo.c Wed Mar 28 09:57:24 2007
-@@ -35,7 +35,7 @@ APR_DECLARE(apr_status_t) apr_gid_name_get(char **grou
-
- #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) &&
defined(HAVE_GETGRGID_R)
- struct group grp;
-- char grbuf[512];
-+ char grbuf[3072];
- apr_status_t rv;
-
- /* See comment in getpwnam_safe on error handling. */
-@@ -63,7 +63,7 @@ APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *group
-
- #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) &&
defined(HAVE_GETGRNAM_R)
- struct group grp;
-- char grbuf[512];
-+ char grbuf[3072];
- apr_status_t rv;
-
- /* See comment in getpwnam_safe on error handling. */
Index: apr-util/Makefile
===================================================================
RCS file: /cvs/ports/devel/apr-util/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- apr-util/Makefile 11 Sep 2007 20:20:51 -0000 1.18
+++ apr-util/Makefile 18 Sep 2007 13:14:29 -0000
@@ -2,9 +2,10 @@
COMMENT= companion library to APR
-DISTNAME= apr-util-1.2.8
-FULLPKGNAME= apr-util${MT}-1.2.8p0${FLAVOR_EXT:S/-mt//}
-SHARED_LIBS += aprutil-1${MT} 2.9 # .2.9
+V= 1.2.10
+DISTNAME= apr-util-$V
+FULLPKGNAME= apr-util${MT}-$V${FLAVOR_EXT:S/-mt//}
+SHARED_LIBS += aprutil-1${MT} 2.11 # .2.11
CATEGORIES= devel
@@ -28,7 +29,8 @@
MODULES= converters/libiconv
USE_LIBTOOL= Yes
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=gnu autoconf
+AUTOCONF_VERSION=2.59
CONFIGURE_ARGS= --with-apr=${LOCALBASE} \
--with-dbm=db4 \
--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib/db4 \
@@ -48,13 +50,13 @@
MT?=
.if ${FLAVOR:L:Mmt}
MT=-mt
-LIB_DEPENDS+= apr-1-mt.=2:apr-mt-1.2.9:devel/apr,mt
+LIB_DEPENDS+= apr-1-mt.=2:apr-mt-1.2.11: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.9:devel/apr
+LIB_DEPENDS+= apr-1.=2:apr-1.2.11:devel/apr
.endif
SUBST_VARS+= MT
Index: apr-util/distinfo
===================================================================
RCS file: /cvs/ports/devel/apr-util/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- apr-util/distinfo 5 Jul 2007 16:02:03 -0000 1.5
+++ apr-util/distinfo 18 Sep 2007 13:14:29 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (apr-util-1.2.10.tar.gz) = dVj7os5ureg88opxZKmB+g==
+RMD160 (apr-util-1.2.10.tar.gz) = bVd7BKTXXvy0DhMv3fFfrt57KcE=
+SHA1 (apr-util-1.2.10.tar.gz) = nhNqVJIxOg6zxQFUol2iyZ3Kuxs=
+SHA256 (apr-util-1.2.10.tar.gz) = h2H+xIf/mOe52WWGQSXQRoo9St8skaRINPr/PGk+b0c=
+SIZE (apr-util-1.2.10.tar.gz) = 654083
Index: apr-util/patches/patch-build_apu-conf_m4
===================================================================
RCS file: apr-util/patches/patch-build_apu-conf_m4
diff -N apr-util/patches/patch-build_apu-conf_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ apr-util/patches/patch-build_apu-conf_m4 18 Sep 2007 13:14:29 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- build/apu-conf.m4.orig Tue Sep 18 14:47:31 2007
++++ build/apu-conf.m4 Tue Sep 18 14:47:57 2007
+@@ -144,6 +144,7 @@ AC_ARG_WITH([expat],
+ APR_ADDTO(LDFLAGS, [-L$withval/lib])
+ APR_ADDTO(CPPFLAGS, [-I$withval/include])
+ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
++ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
+ fi
+ # ...and refuse to fall back on the builtin expat.
+ apu_try_builtin_expat=0
Index: apr-util/patches/patch-test_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/apr-util/patches/patch-test_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-test_Makefile_in
--- apr-util/patches/patch-test_Makefile_in 24 Mar 2007 13:45:13 -0000
1.2
+++ apr-util/patches/patch-test_Makefile_in 18 Sep 2007 13:14:29 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-test_Makefile_in,v 1.2 2007/03/24 13:45:13 todd Exp $
---- test/Makefile.in.orig Tue Jun 14 06:03:51 2005
-+++ test/Makefile.in Fri Feb 9 17:21:57 2007
+--- test/Makefile.in.orig Sat Sep 1 11:45:39 2007
++++ test/Makefile.in Tue Sep 18 15:12:55 2007
@@ -8,7 +8,7 @@ TARGETS = $(PROGRAMS)
[EMAIL PROTECTED]@
@@ -10,16 +10,16 @@
CLEAN_TARGETS = manyfile.bin testfile.txt data/sqlite*.db
-@@ -21,7 +21,11 @@ all: $(PROGRAMS)
-
- check: $(PROGRAMS)
- for prog in $(PROGRAMS); do \
-- ./$$prog ;\
-+ if test $$prog = "testdbm"; then \
-+ ./$$prog auto db; \
-+ else \
-+ ./$$prog ;\
-+ fi; \
- if test $$? = 255; then \
- echo "$$prog failed"; \
- break; \
+@@ -30,7 +30,11 @@ check: $(PROGRAMS)
+ fi; \
+ done; \
+ else \
+- ./$$prog; \
++ if test $$prog = "testdbm"; then \
++ ./$$prog auto db; \
++ else \
++ ./$$prog ;\
++ fi; \
+ if test $$? = 255; then \
+ echo "$$prog failed"; \
+ break; \
