From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 16 15:30:15 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 05BA316A4CE for ; Fri, 16 Jul 2004 15:30:15 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8FFB43D5C for ; Fri, 16 Jul 2004 15:30:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6GFUEhB032361 for ; Fri, 16 Jul 2004 15:30:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6GFUEjS032359; Fri, 16 Jul 2004 15:30:14 GMT (envelope-from gnats) Resent-Date: Fri, 16 Jul 2004 15:30:14 GMT Resent-Message-Id: <200407161530.i6GFUEjS032359@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, Andrej Zverev Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B74F16A4CE for ; Fri, 16 Jul 2004 15:23:08 +0000 (GMT) Received: from waterwall.inec.ru (waterwall.inec.ru [213.148.3.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF0AB43D58 for ; Fri, 16 Jul 2004 15:23:07 +0000 (GMT) (envelope-from az@waterwall.inec.ru) Received: from waterwall.inec.ru (root@localhost) by waterwall.inec.ru (8.12.9p2/8.12.9) with SMTP id i6GFX8XE089938 for ; Fri, 16 Jul 2004 19:33:08 +0400 (MSD) (envelope-from az@waterwall.inec.ru) Received: from waterwall.inec.ru (localhost.inec.ru [127.0.0.1]) by localhost (8.12.9p2/8.12.6) with ESMTP id i6GFX8mG089932; Fri, 16 Jul 2004 19:33:08 +0400 (MSD) Received: from localhost (localhost.inec.ru [127.0.0.1]) by localhost (Postfix) with SMTP id C952165579; Fri, 16 Jul 2004 19:33:08 +0400 (MSD) Received: from waterwall.inec.ru (localhost.inec.ru [127.0.0.1]) by waterwall.inec.ru (Postfix) with ESMTP id AAP1340F7F534155B8; Fri, 16 Jul 2004 19:33:08 +0400 (MSD) Received: (from az@localhost) by waterwall.inec.ru (8.12.9p2/8.12.6/Submit) id i6GFX8Er089929; Fri, 16 Jul 2004 19:33:08 +0400 (MSD) Message-Id: <200407161533.i6GFX8Er089929@waterwall.inec.ru> Date: Fri, 16 Jul 2004 19:33:08 +0400 (MSD) From: Andrej Zverev To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/69154: Fix ports/net/happystats link on FreeBSD >= 5.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Andrej Zverev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2004 15:30:15 -0000 >Number: 69154 >Category: ports >Synopsis: Fix ports/net/happystats link on FreeBSD >= 5.x >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 Jul 16 15:30:13 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Andrej Zverev >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD az.inec.ru 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Wed Jul 14 14:46:11 MSD 2004 root@az.inec.ru:/usr/obj/usr/src/sys/az i386 >Description: port market as broken on FreeBSD >= 5.x >How-To-Repeat: Just have FreeBSD 5.x and try make >Fix: Add extra check after patch to make sure we need gnugetopt or not --- /usr/ports/net/happystats/Makefile Sat Apr 3 18:02:43 2004 +++ Makefile Fri Jul 16 18:33:28 2004 @@ -22,6 +22,8 @@ rrd.0:${PORTSDIR}/net/rrdtool USE_GETOPT_LONG= yes +USE_REINPLACE= yes + MAN1= happystats.1 MANCOMPRESSED= yes @@ -29,12 +31,14 @@ .include -.if ${OSVERSION} >= 502108 -BROKEN= "Does not link on FreeBSD >= 5.x" -.endif - do-configure: @cd ${WRKSRC} && ${MAKE} dep + +post-configure: +.if ${OSVERSION} > 500041 + @${REINPLACE_CMD} -E -e 's|-lgnugetopt||g' \ + ${WRKSRC}/Makefile +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/happystats ${PREFIX}/bin >Release-Note: >Audit-Trail: >Unformatted: