Date: Sun, 4 Apr 2004 16:24:20 -0400 (EDT) From: Craig Rodrigues <rodrigc@crodrigues.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/65173: [PATCH] Unbreak devel/apr Message-ID: <200404042024.i34KOKVg026930@dibbler.crodrigues.org> Resent-Message-ID: <200404042030.i34KUISm036581@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65173
>Category: ports
>Synopsis: [PATCH] Unbreak devel/apr
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 04 13:30:17 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Craig Rodrigues
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dibbler.crodrigues.org 5.2-CURRENT FreeBSD 5.2-CURRENT #39: Sat Mar 13 14:49:20 EST 2004 rodrigc@dibbler.crodrigues.org:/usr/obj/usr/src/sys/MYKERNEL1 i386
>Description:
Unbreaks ade@'s commits to devel/apr
>How-To-Repeat:
>Fix:
(1) cvs rm /usr/ports/devel/apr/files/patch-buildconf
(2) Apply the following patch to Makefile
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/apr/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile 30 Mar 2004 19:20:16 -0000 1.38
+++ Makefile 4 Apr 2004 20:19:28 -0000
@@ -29,11 +29,12 @@
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOCONF_VER= 257
+USE_AUTOCONF_VER= 259
USE_PERL5= yes
USE_GMAKE= yes
USE_LIBTOOL_VER= 15
LIBTOOLFILES= # none
+USE_AUTOMAKE_VER= 15
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
@@ -117,14 +118,15 @@
${LN} -s apr-util-APU_0_9_BRANCH apr-util-${PORTVERSION}
pre-configure:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
+ ${DO_NADA}
+
+run-autotools:
+ cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${ACLOCAL_DIR}/libtool${USE_LIBTOOL_VER}.m4 ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
- ${SH} ./buildconf \
+ ${SETENV} ${SCRIPTS_EV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${ACLOCAL_DIR}/libtool${USE_LIBTOOL_VER}.m4 ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
-
-run-autotools:
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
cd ${WRKDIR}/apr-util-${PORTVERSION}; \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404042024.i34KOKVg026930>