Date: Wed, 10 Aug 2011 21:00:47 GMT From: "Daniel S. Haischt" <daniel.haischt@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/159660: PORT UPDATE: Apache Portable Runtime V2 Message-ID: <201108102100.p7AL0l8K086393@red.freebsd.org> Resent-Message-ID: <201108102110.p7ALAAMZ080380@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159660
>Category: ports
>Synopsis: PORT UPDATE: Apache Portable Runtime V2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 10 21:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Daniel S. Haischt
>Release: FreeBSD 8.2-STABLE
>Organization:
Daniel S. Haischt IT Consulting
>Environment:
FreeBSD xserve-fbsd82.abyssworld.de 8.2-STABLE FreeBSD 8.2-STABLE #0: Sun Jul 24 16:27:26 CEST 2011 root@fbsd82.abyssworld.de:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Please find attached an updated port for the Apache Portable Runtime V2. The port was depending on an APR snapshot file that did not exist any longer and thus the update. I am intending to use APR V2 for the creation of an Apache Tuscany Native port which depends on APR V2.
>How-To-Repeat:
Try to execute make package install clean using the original port. The process should stop immediately because the APR V2 snapshot tarball specified in the Makefile does not exist any longer.
>Fix:
The attached shell archive contains updated port descriptor files adn the patch files have been updated as well where appropriate.
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# apr2
# apr2/Makefile
# apr2/distinfo
# apr2/pkg-descr
# apr2/pkg-plist
# apr2/files
# apr2/files/patch-build__apr_hints.m4
# apr2/files/patch-build__iconv.m4
# apr2/files/patch-buildconf
#
echo c - apr2
mkdir -p apr2 > /dev/null 2>&1
echo x - apr2/Makefile
sed 's/^X//' >apr2/Makefile << '102d1af1058e5c0123f943a74cd7c771'
X# New ports collection makefile for: apr
X# Date created: 19 February 2002
X# Whom: Garrett Rooney <rooneg@electricjellyfish.net>
X#
X# $FreeBSD: ports/devel/apr2/Makefile,v 1.114 2010/12/04 07:31:00 ade Exp $
X
XPORTNAME= apr
XPORTVERSION= 2.0.${SNAPDATE}
XPORTREVISION= 1
XCATEGORIES= devel
XMASTER_SITES= http://svn.apache.org/snapshots/apr/
XDISTNAME= ${PORTNAME}_${SNAPDATE}
X
XMAINTAINER= apache@FreeBSD.org
XCOMMENT= Apache Portability Library
X
XLIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
X
XNO_LATEST_LINK= yes
X
XSNAPDATE= 20110809211349
X
XMAKE_JOBS_SAFE= yes
X
XOPTIONS= THREADS "Enable Threads in apr" on \
X IPV6 "Enable IPV6 Support in apr" on \
X BDB "Enable Berkley BDB support in apr-util" on \
X GDBM "Enable GNU dbm support in apr-util" on \
X MYSQL "Enable MySQL suport in apr-util" off \
X NDBM "Enable NDBM support in apr-util" off \
X PGSQL "Enable Postgresql suport in apr-util" off \
X SQLITE "Enable SQLite3 support in apr-util" off \
X DEVRANDOM "Use /dev/random or compatible in apr" on \
X DEVELOPER_ONLY "I want to test apr2 not the maintainer" off
X
XUSE_ICONV= yes
XUSE_AUTOTOOLS= automake autoconf libtool:env
XUSE_PERL5_BUILD= yes
XUSE_PYTHON_BUILD= -2.7
XUSE_LDCONFIG= yes
XGNU_CONFIGURE= yes
X
XCONFIGURE_ENV= CC="${CC}"
X
XCONFIGURE_ARGS= --with-installbuilddir=${DATADIR}/build-2 \
X --with-expat=${LOCALBASE} \
X --with-iconv=${LOCALBASE}
X
XWRKSRC= ${WRKDIR}/apr
X
XSHLIB_MAJOR= 0
XPLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
X
X.include <bsd.port.options.mk>
X
X.if !defined(WITH_DEVELOPER_ONLY)
XIGNORE= not for the general public. Maintainer only supports developers of apr
X.endif
X
X.if defined(WITHOUT_THREADS)
XCONFIGURE_ARGS+= --disable-threads
X.if defined(PKGNAMESUFFIX)
XPKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr
X.else
XPKGNAMESUFFIX= -nothr
X.endif
X.else
XCONFIGURE_ARGS+= --enable-threads
X.endif
X
X.if defined(WITHOUT_IPV6)
XCONFIGURE_ARGS+= --disable-ipv6
X.else
XCONFIGURE_ARGS+= --enable-ipv6
X.if defined(PKGNAMESUFFIX)
XPKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6
X.else
XPKGNAMESUFFIX= -ipv6
X.endif
X.endif
X
X.if defined(WITHOUT_DEVRANDOM)
XCONFIGURE_ARGS+= --without-devrandom
X.else
XCONFIGURE_ARGS+= --with-devrandom
X.if defined(PKGNAMESUFFIX)
XPKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom
X.else
XPKGNAMESUFFIX= -devrandom
X.endif
X.endif
X
X######### APR-Util Options
X.if defined(WITHOUT_GDBM)
XPLIST_SUB+= GDBM="@comment "
XCONFIGURE_ARGS+= --without-gdbm
X.else
XPLIST_SUB+= GDBM=""
XEXTRAS= yes
XLIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
XCONFIGURE_ARGS+= --with-gdbm=${LOCALBASE}
X.if defined(PKGNAMESUFFIX)
XPKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm
X.else
XPKGNAMESUFFIX= -gdbm
X.endif
X.endif
X
X.if defined(WITHOUT_BDB)
XPLIST_SUB+= BDB="@comment "
XCONFIGURE_ARGS+= --without-berkeley-db
X.else
XEXTRAS= yes
XPLIST_SUB+= BDB=""
XUSE_BDB= 42+
XCONFIGURE_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
X.if defined(PKGNAMESUFFIX)
XPKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
X.else
XPKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
X.endif
X.endif
X
X.if defined(WITH_NDBM)
XEXTRAS= yes
XPLIST_SUB+= NDBM=""
XCONFIGURE_ARGS+= --with-ndbm=/usr
X.if defined(PKGNAMESUFFIX)
XPKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm
X.else
XPKGNAMESUFFIX= -ndbm
X.endif
X.else
XPLIST_SUB+= NDBM="@comment "
XCONFIGURE_ARGS+= --without-ndbm
X.endif
X
X.if defined(WITH_MYSQL)
XEXTRAS= yes
XPLIST_SUB+= MYSQL=""
XUSE_MYSQL= YES
XCONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
XCONFIGURE_ENV+= LIBS="${LIBS}"
XCFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
XLDFLAGS+= -L${LOCALBASE}/lib/mysql
X.if defined(PKGNAMESUFFIX)
XPKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER}
X.else
XPKGNAMESUFFIX= -mysql
X.endif
X.else
XPLIST_SUB+= MYSQL="@comment "
XCONFIGURE_ARGS+= --without-mysql
X.endif
X
X.if defined(WITH_PGSQL)
XEXTRAS= yes
XPLIST_SUB+= PGSQL=""
XUSE_PGSQL= YES
XCONFIGURE_ARGS+= --with-pgsql=${LOCALBASE}
XCONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG=""
X.if defined(PKGNAMESUFFIX)
XPKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER}
X.else
XPKGNAMESUFFIX= -pgsql
X.endif
X.else
XPLIST_SUB+= PGSQL="@comment "
XCONFIGURE_ARGS+= --without-pgsql
X.endif
X
X.if defined(WITH_SQLITE)
XEXTRAS= yes
XPLIST_SUB+= SQLITE3=""
XUSE_SQLITE= YES
XCONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE}
X.if defined(PKGNAMESUFFIX)
XPKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3
X.else
XPKGNAMESUFFIX= -sqlite3
X.endif
X.else
XCONFIGURE_ARGS+= --without-sqlite3
XPLIST_SUB+= SQLITE3="@comment "
X.endif
X
X.if defined(EXTRAS)
XPLIST_SUB+= EXTRAS=""
X.else
XPLIST_SUB+= EXTRAS="@comment "
X.endif
X
Xpost-patch:
X ${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' ${WRKSRC}/build/apr_hints.m4
X ${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
X 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
X ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
X ${WRKSRC}/build/apr_threads.m4 \
X ${WRKSRC}/build/apr_hints.m4 \
X ${WRKSRC}/build/apu-conf.m4
X ${REINPLACE_CMD} -e '1 s/python/${PYTHON_VERSION}/' ${WRKSRC}/build/gen-build.py
X
Xrun-autotools:
X @(cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf)
X
Xtest: build
X @(cd ${WRKSRC}; make test)
X
X#regression-test: test
X
Xdebug_autoconf:
X @${ECHO} "LIBTOOL: ${LIBTOOL_VERSION}"
X @${ECHO} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}"
X @${ECHO} "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}"
X @${ECHO} "AUTOCONF_DIR: ${AUTOCONF_DIR}"
X @${ECHO} "BUILD_DEPENDS: ${BUILD_DEPENDS}"
X @${ECHO} "ACLOCAL_DIR: ${ACLOCAL_DIR}"
X @${ECHO} "LIBTOOLFILES: ${LIBTOOLFILES}"
X @${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"
X @${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"
X @${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"
X @${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${CONFIGURE_ARGS}"
X
X.include <bsd.port.mk>
102d1af1058e5c0123f943a74cd7c771
echo x - apr2/distinfo
sed 's/^X//' >apr2/distinfo << '9f56cf8cf4215c885794ba4a1f5aea49'
XSHA256 (apr_20110809211349.tar.gz) = f81d0029d654932584e74f120efb65133d73bb3d7f10c9a540f448dfa84d4c26
XSIZE (apr_20110809211349.tar.gz) = 977267
9f56cf8cf4215c885794ba4a1f5aea49
echo x - apr2/pkg-descr
sed 's/^X//' >apr2/pkg-descr << '8870fee7c9cde48b4d55e5e11edc97d3'
XThe Apache Portable Runtime is a library of C data structures and routines,
Xforming a system portability layer that covers as many operating systems as
Xpossible, including Unices, Win32, BeOS, and OS/2.
X
XThis port also includes the APR-Util package, which contains some useful
Xutilities built on top of APR.
X
XWWW: http://apr.apache.org/
8870fee7c9cde48b4d55e5e11edc97d3
echo x - apr2/pkg-plist
sed 's/^X//' >apr2/pkg-plist << '92a1d91dfc8cefee303aa64c03e50c4b'
Xbin/apr-2-config
X%%DATADIR%%/build-2/libtool
X%%DATADIR%%/build-2/mkdir.sh
X%%DATADIR%%/build-2/make_exports.awk
X%%DATADIR%%/build-2/make_var_export.awk
X%%DATADIR%%/build-2/apr_rules.mk
Xinclude/apr-2/apr.h
Xinclude/apr-2/apr_allocator.h
Xinclude/apr-2/apr_anylock.h
Xinclude/apr-2/apr_atomic.h
Xinclude/apr-2/apr_base64.h
Xinclude/apr-2/apr_buckets.h
Xinclude/apr-2/apr_crypto.h
Xinclude/apr-2/apr_date.h
Xinclude/apr-2/apr_dbd.h
Xinclude/apr-2/apr_dbm.h
Xinclude/apr-2/apr_dso.h
Xinclude/apr-2/apr_env.h
Xinclude/apr-2/apr_errno.h
Xinclude/apr-2/apu_errno.h
Xinclude/apr-2/apr_file_info.h
Xinclude/apr-2/apr_file_io.h
Xinclude/apr-2/apr_fnmatch.h
Xinclude/apr-2/apr_general.h
Xinclude/apr-2/apr_getopt.h
Xinclude/apr-2/apr_global_mutex.h
Xinclude/apr-2/apr_hash.h
Xinclude/apr-2/apr_hooks.h
Xinclude/apr-2/apr_inherit.h
Xinclude/apr-2/apr_lib.h
Xinclude/apr-2/apr_md4.h
Xinclude/apr-2/apr_md5.h
Xinclude/apr-2/apr_memcache.h
Xinclude/apr-2/apr_mmap.h
Xinclude/apr-2/apr_network_io.h
Xinclude/apr-2/apr_optional.h
Xinclude/apr-2/apr_optional_hooks.h
Xinclude/apr-2/apr_perms_set.h
Xinclude/apr-2/apr_poll.h
Xinclude/apr-2/apr_pools.h
Xinclude/apr-2/apr_portable.h
Xinclude/apr-2/apr_proc_mutex.h
Xinclude/apr-2/apr_queue.h
Xinclude/apr-2/apr_random.h
Xinclude/apr-2/apr_reslist.h
Xinclude/apr-2/apr_ring.h
Xinclude/apr-2/apr_rmm.h
Xinclude/apr-2/apr_sdbm.h
Xinclude/apr-2/apr_sha1.h
Xinclude/apr-2/apr_shm.h
Xinclude/apr-2/apr_signal.h
Xinclude/apr-2/apr_strings.h
Xinclude/apr-2/apr_strmatch.h
Xinclude/apr-2/apr_tables.h
Xinclude/apr-2/apr_thread_cond.h
Xinclude/apr-2/apr_thread_mutex.h
Xinclude/apr-2/apr_thread_pool.h
Xinclude/apr-2/apr_thread_proc.h
Xinclude/apr-2/apr_thread_rwlock.h
Xinclude/apr-2/apr_time.h
Xinclude/apr-2/apr_uri.h
Xinclude/apr-2/apr_user.h
Xinclude/apr-2/apr_uuid.h
Xinclude/apr-2/apr_version.h
Xinclude/apr-2/apr_want.h
Xinclude/apr-2/apr_xlate.h
Xinclude/apr-2/apr_xml.h
Xinclude/apr-2/apu.h
Xinclude/apr-2/apu_version.h
Xinclude/apr-2/apu_want.h
Xlibdata/pkgconfig/apr-2.pc
Xlib/apr.exp
Xlib/libapr-2.a
Xlib/libapr-2.la
Xlib/libapr-2.so
Xlib/libapr-2.so.%%SHLIB_MAJOR%%
X%%GDBM%%lib/apr-2/apr_dbm_gdbm-2.so
X%%GDBM%%lib/apr-2/apr_dbm_gdbm.so
X%%GDBM%%lib/apr-2/apr_dbm_gdbm.la
X%%GDBM%%lib/apr-2/apr_dbm_gdbm.a
X%%BDB%%lib/apr-2/apr_dbm_db-2.so
X%%BDB%%lib/apr-2/apr_dbm_db.so
X%%BDB%%lib/apr-2/apr_dbm_db.la
X%%BDB%%lib/apr-2/apr_dbm_db.a
X%%NDBM%%lib/apr-2/apr_dbm_ndbm-2.so
X%%NDBM%%lib/apr-2/apr_dbm_ndbm.so
X%%NDBM%%lib/apr-2/apr_dbm_ndbm.la
X%%NDBM%%lib/apr-2/apr_dbm_ndbm.a
X%%MYSQL%%lib/apr-2/apr_dbd_mysql-2.so
X%%MYSQL%%lib/apr-2/apr_dbd_mysql.so
X%%MYSQL%%lib/apr-2/apr_dbd_mysql.la
X%%MYSQL%%lib/apr-2/apr_dbd_mysql.a
X%%PGSQL%%lib/apr-2/apr_dbd_pgsql-2.so
X%%PGSQL%%lib/apr-2/apr_dbd_pgsql.so
X%%PGSQL%%lib/apr-2/apr_dbd_pgsql.la
X%%PGSQL%%lib/apr-2/apr_dbd_pgsql.a
X%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3-2.so
X%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.so
X%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.la
X%%SQLITE3%%lib/apr-2/apr_dbd_sqlite3.a
X%%EXTRAS%%@dirrm lib/apr-2
X@dirrm %%DATADIR%%/build-2
X@dirrm %%DATADIR%%
X@dirrm include/apr-2
92a1d91dfc8cefee303aa64c03e50c4b
echo c - apr2/files
mkdir -p apr2/files > /dev/null 2>&1
echo x - apr2/files/patch-build__apr_hints.m4
sed 's/^X//' >apr2/files/patch-build__apr_hints.m4 << '9e323a53356a930e7c9e551c678fc758'
X--- ./build/apr_hints.m4.orig 2010-02-06 16:14:03.000000000 -0500
X+++ ./build/apr_hints.m4 2010-05-26 23:19:19.263812317 -0400
X@@ -159,15 +159,11 @@
X ;;
X *-freebsd*)
X APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
X- if test -x /sbin/sysctl; then
X- os_version=`/sbin/sysctl -n kern.osreldate`
X- else
X- os_version=000000
X- fi
X+ osversion="${900010}"
X # 502102 is when libc_r switched to libpthread (aka libkse).
X if test $os_version -ge "502102"; then
X apr_cv_pthreads_cflags="none"
X- apr_cv_pthreads_lib="-lpthread"
X+ apr_cv_pthreads_lib="-pthread"
X else
X APR_ADDTO(CPPFLAGS, [-D_THREAD_SAFE -D_REENTRANT])
X APR_SETIFNULL(enable_threads, [no])
9e323a53356a930e7c9e551c678fc758
echo x - apr2/files/patch-build__iconv.m4
sed 's/^X//' >apr2/files/patch-build__iconv.m4 << '205b0bc55acd44015aa095432ae64445'
X--- ./build/iconv.m4.orig 2010-05-26 23:19:28.011405098 -0400
X+++ ./build/iconv.m4 2010-05-26 23:19:37.002271826 -0400
X@@ -44,7 +44,7 @@
X if test -f "$apu_iconv_dir/include/iconv.h"; then
X have_iconv="1"
X APR_ADDTO(CPPFLAGS,[-I$apu_iconv_dir/include])
X- APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib])
X+ APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib -liconv])
X fi
X fi
X ])
205b0bc55acd44015aa095432ae64445
echo x - apr2/files/patch-buildconf
sed 's/^X//' >apr2/files/patch-buildconf << 'e6b15705fd8b13c259d3c1fa1b7793b9'
X--- ./buildconf.orig 2011-08-10 22:03:47.000000000 +0200
X+++ ./buildconf 2011-08-10 22:08:22.000000000 +0200
X@@ -81,6 +81,7 @@
X fi
X # Do we need this anymore?
X echo "buildconf: Using libtool.m4 at ${ltfile}."
X+ chmod 644 build/libtool.m4
X rm -f build/libtool.m4
X cp -p $ltfile build/libtool.m4
X
X@@ -94,9 +95,12 @@
X # Not sure, would it interfere with httpd top_builddir when bundled?
X mv build/libtool.m4 build/libtool.m4.$$
X sed -e 's/\(LIBTOOL=.*\)top_build/\1apr_build/' < build/libtool.m4.$$ > build/libtool.m4
X+chmod 644 build/libtool.m4.$$
X rm -f build/libtool.m4.$$
X
X # Clean up any leftovers
X+chmod 644 aclocal.m4
X+chmod 644 libtool.m4
X rm -f aclocal.m4 libtool.m4
X
X #
e6b15705fd8b13c259d3c1fa1b7793b9
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108102100.p7AL0l8K086393>