From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 4 13:30:18 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B650416A4CF for ; Sun, 4 Apr 2004 13:30:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BC5F43D4C for ; Sun, 4 Apr 2004 13:30:18 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i34KUIbv036584 for ; Sun, 4 Apr 2004 13:30:18 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i34KUISm036581; Sun, 4 Apr 2004 13:30:18 -0700 (PDT) (envelope-from gnats) Resent-Date: Sun, 4 Apr 2004 13:30:18 -0700 (PDT) Resent-Message-Id: <200404042030.i34KUISm036581@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Craig Rodrigues Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C21CD16A4CE for ; Sun, 4 Apr 2004 13:24:03 -0700 (PDT) Received: from sccrmhc12.comcast.net (sccrmhc12.comcast.net [204.127.202.56]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F45843D1F for ; Sun, 4 Apr 2004 13:24:03 -0700 (PDT) (envelope-from rodrigc@h00609772adf0.ne.client2.attbi.com) Received: from dibbler.crodrigues.org (h00609772adf0.ne.client2.attbi.com[66.31.45.197]) by comcast.net (sccrmhc12) with ESMTP id <20040404202402012002lakge>; Sun, 4 Apr 2004 20:24:02 +0000 Received: from dibbler.crodrigues.org (localhost.crodrigues.org [127.0.0.1]) i34KOLaF026931 for ; Sun, 4 Apr 2004 16:24:21 -0400 (EDT) (envelope-from rodrigc@h00609772adf0.ne.client2.attbi.com) Received: (from rodrigc@localhost) by dibbler.crodrigues.org (8.12.11/8.12.11/Submit) id i34KOKVg026930; Sun, 4 Apr 2004 16:24:20 -0400 (EDT) (envelope-from rodrigc) Message-Id: <200404042024.i34KOKVg026930@dibbler.crodrigues.org> Date: Sun, 4 Apr 2004 16:24:20 -0400 (EDT) From: Craig Rodrigues To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/65173: [PATCH] Unbreak devel/apr X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Craig Rodrigues List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Apr 2004 20:30:18 -0000 >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: