From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 10 04:20:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 783D216A417 for ; Fri, 10 Nov 2006 04:20:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DD8143D5C for ; Fri, 10 Nov 2006 04:20:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAA4KM8U031278 for ; Fri, 10 Nov 2006 04:20:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAA4KMUc031277; Fri, 10 Nov 2006 04:20:22 GMT (envelope-from gnats) Resent-Date: Fri, 10 Nov 2006 04:20:22 GMT Resent-Message-Id: <200611100420.kAA4KMUc031277@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, "Denis Eremenko " Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD42B16A407 for ; Fri, 10 Nov 2006 04:19:20 +0000 (UTC) (envelope-from moonshade@pnhz.kz) Received: from relay.pnhz.kz (relay.pnhz.kz [212.154.198.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id E30CD43D46 for ; Fri, 10 Nov 2006 04:19:19 +0000 (GMT) (envelope-from moonshade@pnhz.kz) Received: from abyss.pnhz.kz (abyss.pnhz.kz [192.168.121.40]) by relay.pnhz.kz with ESMTP id kAA4JG96090288 for ; Fri, 10 Nov 2006 10:19:16 +0600 (ALMT) (envelope-from moonshade@pnhz.kz) Message-Id: <1163132355.4875@abyss.pnhz.kz> Date: Fri, 10 Nov 2006 10:19:15 +0600 From: "Denis Eremenko " To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/105358: security/hydra build fails in case of subversion with apr-1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 04:20:23 -0000 >Number: 105358 >Category: ports >Synopsis: security/hydra build fails in case of subversion with apr-1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Nov 10 04:20:21 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Denis Eremenko >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD 6.2-PRERELEASE #0: Wed Nov 8 13:32:56 ALMT 2006 root@abyss.pnhz.kz:/usr/obj/data/os/FreeBSD/src/6/src/sys/ABYSS-6 >Description: security/hydra's configure searches for libsvn_client and if found assumes apr-0, which can be wrong. >How-To-Repeat: 1. install apache >=21 2. install subversion 3. try to build security/hydra >Fix: --- hydra-Makefile begins here --- --- Makefile.orig Fri Nov 10 09:50:49 2006 +++ Makefile Fri Nov 10 10:04:29 2006 @@ -25,7 +25,14 @@ USE_OPENSSL= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src +.include + post-patch: +.if exists(${LOCALBASE}/bin/apr-1-config) + @${REINPLACE_CMD} -e 's|apr-0|apr-1|g; \ + s|aprutil-0|aprutil-1|g' \ + ${WRKSRC}/configure +.endif @${REINPLACE_CMD} -e 's|CC = gcc||; \ s|-O2|${CFLAGS}|; s|md4\..||g' \ ${WRKSRC}/Makefile.am @@ -33,4 +40,4 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/hydra ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin -.include +.include --- hydra-Makefile ends here --- >Release-Note: >Audit-Trail: >Unformatted: