From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 17 04:40:14 2003 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 7879516A4BF for ; Fri, 17 Oct 2003 04:40:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E40F43FAF for ; Fri, 17 Oct 2003 04:40:13 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9HBeCFY007435 for ; Fri, 17 Oct 2003 04:40:12 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9HBeCvQ007434; Fri, 17 Oct 2003 04:40:12 -0700 (PDT) (envelope-from gnats) Resent-Date: Fri, 17 Oct 2003 04:40:12 -0700 (PDT) Resent-Message-Id: <200310171140.h9HBeCvQ007434@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, "Samy Al Bahra" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F52716A4B3 for ; Fri, 17 Oct 2003 04:38:30 -0700 (PDT) Received: from essence.sdodson.com (67-50-89-87.br2.tbr.ga.frontiernet.net [67.50.89.87]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D34B43F93 for ; Fri, 17 Oct 2003 04:38:27 -0700 (PDT) (envelope-from samy@kerneled.com) Received: from beastie.freebsd.local (dial37-234.sbm.net.sa [212.46.37.234]) by essence.sdodson.com (8.12.10/8.12.10) with ESMTP id h9HBc6in002687 for ; Fri, 17 Oct 2003 11:38:14 GMT (envelope-from samy@kerneled.com) Message-Id: 1066390746@beastie.freebsd.local Date: Fri, 17 Oct 2003 14:39:25 +0300 From: "Samy Al Bahra" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: gtk-send-pr 0.1 Subject: ports/58161: Fix for the long-broken audio/denemo port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Oct 2003 11:40:14 -0000 >Number: 58161 >Category: ports >Synopsis: Fix for the long-broken audio/denemo port >Confidential: no >Severity: critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Oct 17 04:40:12 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Samy Al Bahra >Release: FreeBSD 5.1-CURRENT i386 >Organization: Kerneled >Environment: System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003 samy@beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386 >Description: denemo's setkey() function conflicts with the setkey() symbol from the cipher library (on 5.X systems at the least). >How-To-Repeat: Build denemo on a 5.X system. >Fix: The patch in this PR fixes this problem by renaming the setkey() function and removes some other redundancy in the port. --- denemo/Makefile.orig Fri Oct 17 14:08:35 2003 +++ denemo/Makefile Fri Oct 17 14:13:11 2003 @@ -19,6 +19,7 @@ xml.5:${PORTSDIR}/textproc/libxml USE_GETOPT_LONG=yes +USE_REINPLACE=yes GNU_CONFIGURE= yes PLIST= ${WRKDIR}/pkg-plist SHARED= denemo.conf denemo.keymaprc english.keymaprc french.keymaprc @@ -29,15 +30,12 @@ .include -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile" -.endif - pre-patch: -.for ii in analysis_highlighting.c main.c playback.c print.c - ${MV} ${WRKSRC}/${ii} ${WRKSRC}/${ii}.orig - ${SED} -e "s: ${WRKSRC}/${ii} +.for i in analysis_highlighting.c playback.c print.c + @${REINPLACE_CMD} -e "s|||g" ${WRKSRC}/${i} +.endfor +.for i in easylyparser.c easylyparser.y lyparserfuncs.c lyparserfuncs.h + @${REINPLACE_CMD} -e "s|setkey|setekey|g" ${WRKSRC}/${i} .endfor pre-install: >Release-Note: >Audit-Trail: >Unformatted: