diff options
Diffstat (limited to 'devel/apr')
-rw-r--r-- | devel/apr/DESCR | 3 | ||||
-rw-r--r-- | devel/apr/Makefile | 36 | ||||
-rw-r--r-- | devel/apr/PLIST | 80 | ||||
-rw-r--r-- | devel/apr/buildlink2.mk | 28 | ||||
-rw-r--r-- | devel/apr/distinfo | 9 | ||||
-rw-r--r-- | devel/apr/patches/patch-ae | 22 | ||||
-rw-r--r-- | devel/apr/patches/patch-an | 13 | ||||
-rw-r--r-- | devel/apr/patches/patch-ao | 13 | ||||
-rw-r--r-- | devel/apr/patches/patch-ap | 22 | ||||
-rw-r--r-- | devel/apr/patches/patch-aq | 22 |
10 files changed, 248 insertions, 0 deletions
diff --git a/devel/apr/DESCR b/devel/apr/DESCR new file mode 100644 index 00000000000..4961cf68f32 --- /dev/null +++ b/devel/apr/DESCR @@ -0,0 +1,3 @@ +The Apache Portable Run-time mission is to provide a library of +routines that allows programmers to write a program once and be +able to compile it anywhere. diff --git a/devel/apr/Makefile b/devel/apr/Makefile new file mode 100644 index 00000000000..ee30f63c169 --- /dev/null +++ b/devel/apr/Makefile @@ -0,0 +1,36 @@ +# $NetBSD: Makefile,v 1.1.1.1 2003/05/25 08:55:18 epg Exp $ + +PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION} +CATEGORIES= devel + +HOMEPAGE= http://apr.apache.org/ +COMMENT= Apache Portable Runtime + +CONFLICTS= apache2<2.0.45 + +USE_BUILDLINK2= YES +USE_LIBTOOL= YES +LIBTOOL_OVERRIDE= ${WRKSRC}/apr/libtool + +WRKSRC= ${WRKDIR}/${DISTNAME}/srclib +BUILD_DIRS= ${WRKSRC}/apr ${WRKSRC}/apr-util + +do-configure: + @cd ${WRKSRC}/apr && ${SETENV} ${CONFIGURE_ENV} ./configure \ + --prefix=${PREFIX} \ + --with-devrandom=/dev/urandom \ + --with-installbuilddir=${PREFIX}/libexec/apr + @cd ${WRKSRC}/apr-util && ${SETENV} ${CONFIGURE_ENV} ./configure \ + --prefix=${PREFIX} \ + --with-apr=${WRKSRC}/apr \ + --with-dbm=sdbm \ + --with-expat=${BUILDLINK_PREFIX.expat} + +post-install: + ${RM} ${PREFIX}/libexec/apr/libtool + ${INSTALL_SCRIPT} ${LIBTOOL} ${PREFIX}/libexec/apr/libtool + +.include "../../www/apache2/Makefile.common" + +.include "../../textproc/expat/buildlink2.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/apr/PLIST b/devel/apr/PLIST new file mode 100644 index 00000000000..659d958e21a --- /dev/null +++ b/devel/apr/PLIST @@ -0,0 +1,80 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ +bin/apr-config +bin/apu-config +include/apr-0/apr.h +include/apr-0/apr_allocator.h +include/apr-0/apr_anylock.h +include/apr-0/apr_atomic.h +include/apr-0/apr_base64.h +include/apr-0/apr_buckets.h +include/apr-0/apr_compat.h +include/apr-0/apr_date.h +include/apr-0/apr_dbm.h +include/apr-0/apr_dso.h +include/apr-0/apr_env.h +include/apr-0/apr_errno.h +include/apr-0/apr_file_info.h +include/apr-0/apr_file_io.h +include/apr-0/apr_fnmatch.h +include/apr-0/apr_general.h +include/apr-0/apr_getopt.h +include/apr-0/apr_global_mutex.h +include/apr-0/apr_hash.h +include/apr-0/apr_hooks.h +include/apr-0/apr_inherit.h +include/apr-0/apr_ldap.h +include/apr-0/apr_ldap_url.h +include/apr-0/apr_lib.h +include/apr-0/apr_md4.h +include/apr-0/apr_md5.h +include/apr-0/apr_mmap.h +include/apr-0/apr_network_io.h +include/apr-0/apr_optional.h +include/apr-0/apr_optional_hooks.h +include/apr-0/apr_poll.h +include/apr-0/apr_pools.h +include/apr-0/apr_portable.h +include/apr-0/apr_proc_mutex.h +include/apr-0/apr_queue.h +include/apr-0/apr_reslist.h +include/apr-0/apr_ring.h +include/apr-0/apr_rmm.h +include/apr-0/apr_sdbm.h +include/apr-0/apr_sha1.h +include/apr-0/apr_shm.h +include/apr-0/apr_signal.h +include/apr-0/apr_strings.h +include/apr-0/apr_strmatch.h +include/apr-0/apr_support.h +include/apr-0/apr_tables.h +include/apr-0/apr_thread_cond.h +include/apr-0/apr_thread_mutex.h +include/apr-0/apr_thread_proc.h +include/apr-0/apr_thread_rwlock.h +include/apr-0/apr_time.h +include/apr-0/apr_uri.h +include/apr-0/apr_user.h +include/apr-0/apr_uuid.h +include/apr-0/apr_version.h +include/apr-0/apr_want.h +include/apr-0/apr_xlate.h +include/apr-0/apr_xml.h +include/apr-0/apu.h +include/apr-0/apu_compat.h +include/apr-0/apu_version.h +lib/apr.exp +lib/aprutil.exp +lib/libapr-0.a +lib/libapr-0.la +lib/libapr-0.so +lib/libapr-0.so.9 +lib/libapr-0.so.9.3 +lib/libaprutil-0.a +lib/libaprutil-0.la +lib/libaprutil-0.so +lib/libaprutil-0.so.9 +lib/libaprutil-0.so.9.3 +libexec/apr/apr_rules.mk +libexec/apr/libtool +@dirrm libexec/apr +@dirrm include/apr-0 diff --git a/devel/apr/buildlink2.mk b/devel/apr/buildlink2.mk new file mode 100644 index 00000000000..dae97e0280c --- /dev/null +++ b/devel/apr/buildlink2.mk @@ -0,0 +1,28 @@ +# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ +# + +.if !defined(APR_BUILDLINK2_MK) +APR_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= apr +BUILDLINK_DEPENDS.apr?= apr>=0.9.1.2.0.45 +BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr + +EVAL_PREFIX+= BUILDLINK_PREFIX.apr=apr +BUILDLINK_PREFIX.apr_DEFAULT= ${LOCALBASE} + +BUILDLINK_FILES.apr+= bin/apr-config +BUILDLINK_FILES.apr+= bin/apu-config +BUILDLINK_FILES.apr+= include/apr-0/* +BUILDLINK_FILES.apr+= lib/apr.exp +BUILDLINK_FILES.apr+= lib/aprutil.exp +BUILDLINK_FILES.apr+= lib/libapr-0.* +BUILDLINK_FILES.apr+= lib/libaprutil-0.* + +.include "../../textproc/expat/buildlink2.mk" + +BUILDLINK_TARGETS+= apr-buildlink + +apr-buildlink: _BUILDLINK_USE + +.endif # APR_BUILDLINK2_MK diff --git a/devel/apr/distinfo b/devel/apr/distinfo new file mode 100644 index 00000000000..877e4e852d6 --- /dev/null +++ b/devel/apr/distinfo @@ -0,0 +1,9 @@ +$NetBSD: distinfo,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ + +SHA1 (httpd-2.0.45.tar.gz) = f722399b0e1986e699bc807518e396b7f0286cca +Size (httpd-2.0.45.tar.gz) = 5549120 bytes +SHA1 (patch-ae) = ef9e3f62e772752cfbbe5125fcb6bb9b64bec176 +SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056 +SHA1 (patch-ao) = 25d44b0028772535da908895444d2bfe56f44120 +SHA1 (patch-ap) = 41c36538dcd6d84f3e26ee02e9f1953e715d2c80 +SHA1 (patch-aq) = 94e2650291d6b5d832cb446bf41e31629f2be723 diff --git a/devel/apr/patches/patch-ae b/devel/apr/patches/patch-ae new file mode 100644 index 00000000000..2fb6d34ba04 --- /dev/null +++ b/devel/apr/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ + +Index: threadproc/unix/proc.c +=================================================================== +RCS file: /home/cvspublic/apr/threadproc/unix/proc.c,v +retrieving revision 1.62 +diff -a -u -r1.62 proc.c +--- threadproc/unix/proc.c 6 Jan 2003 23:44:38 -0000 1.62 ++++ apr/threadproc/unix/proc.c +@@ -474,7 +474,11 @@ + waitpid_options |= WNOHANG; + } + +- if ((pstatus = waitpid(proc->pid, &exit_int, waitpid_options)) > 0) { ++ do { ++ pstatus = waitpid(proc->pid, &exit_int, waitpid_options); ++ } while (pstatus < 0 && errno == EINTR); ++ ++ if (pstatus > 0) { + proc->pid = pstatus; + + if (WIFEXITED(exit_int)) { diff --git a/devel/apr/patches/patch-an b/devel/apr/patches/patch-an new file mode 100644 index 00000000000..4c165831d98 --- /dev/null +++ b/devel/apr/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ + +--- apr/configure.in.orig 2003-01-06 21:04:08.000000000 +0200 ++++ apr/configure.in 2003-01-28 16:11:24.000000000 +0200 +@@ -1635,7 +1635,7 @@ + if test "$apr_devrandom" = "yes"; then + # /dev/random on OpenBSD doesn't provide random data, so + # prefer /dev/arandom, which does; see random(4). +- for f in /dev/arandom /dev/random /dev/urandom; do ++ for f in /dev/arandom /dev/urandom /dev/random; do + if test -r $f; then + apr_devrandom=$f + rand=1 diff --git a/devel/apr/patches/patch-ao b/devel/apr/patches/patch-ao new file mode 100644 index 00000000000..51e0a691042 --- /dev/null +++ b/devel/apr/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ + +--- apr/configure.orig 2003-01-18 17:20:31.000000000 +0200 ++++ apr/configure 2003-01-28 16:13:11.000000000 +0200 +@@ -24713,7 +24713,7 @@ + if test "$apr_devrandom" = "yes"; then + # /dev/random on OpenBSD doesn't provide random data, so + # prefer /dev/arandom, which does; see random(4). +- for f in /dev/arandom /dev/random /dev/urandom; do ++ for f in /dev/arandom /dev/urandom /dev/random; do + if test -r $f; then + apr_devrandom=$f + rand=1 diff --git a/devel/apr/patches/patch-ap b/devel/apr/patches/patch-ap new file mode 100644 index 00000000000..5fefe643de8 --- /dev/null +++ b/devel/apr/patches/patch-ap @@ -0,0 +1,22 @@ +$NetBSD: patch-ap,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ + +--- apr-util/config.layout.orig Thu Apr 3 17:15:08 2003 ++++ apr-util/config.layout Thu Apr 3 17:14:15 2003 +@@ -229,3 +229,17 @@ + infodir: ${exec_prefix}/share/info + libsuffix -${APRUTIL_MAJOR_VERSION} + </Layout> ++ ++# NetBSD (pkgsrc) layout ++<Layout NetBSD> ++ prefix: /usr/pkg ++ exec_prefix: ${prefix} ++ bindir: ${exec_prefix}/bin ++ sbindir: ${exec_prefix}/sbin ++ libexecdir: ${exec_prefix}/lib/httpd ++ mandir: ${prefix}/man ++ datadir: ${prefix}/share/httpd ++ includedir: ${prefix}/include/apr ++ localstatedir: /var ++ runtimedir: ${localstatedir}/run ++</Layout> diff --git a/devel/apr/patches/patch-aq b/devel/apr/patches/patch-aq new file mode 100644 index 00000000000..857bebb666e --- /dev/null +++ b/devel/apr/patches/patch-aq @@ -0,0 +1,22 @@ +$NetBSD: patch-aq,v 1.1.1.1 2003/05/25 08:55:19 epg Exp $ + +--- apr/config.layout.orig Thu Apr 3 17:14:54 2003 ++++ apr/config.layout Thu Apr 3 17:14:01 2003 +@@ -229,3 +229,17 @@ + infodir: ${exec_prefix}/share/info + libsuffix: -${APR_MAJOR_VERSION} + </Layout> ++ ++# NetBSD (pkgsrc) layout ++<Layout NetBSD> ++ prefix: /usr/pkg ++ exec_prefix: ${prefix} ++ bindir: ${exec_prefix}/bin ++ sbindir: ${exec_prefix}/sbin ++ libexecdir: ${exec_prefix}/lib/httpd ++ mandir: ${prefix}/man ++ datadir: ${prefix}/share/httpd ++ includedir: ${prefix}/include/apr ++ localstatedir: /var ++ runtimedir: ${localstatedir}/run ++</Layout> |