ports/58161: Fix for the long-broken audio/denemo port

[Samy Al Bahra]

>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 at 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 <bsd.port.pre.mk>
 
-.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:<wait.h:<sys/wait.h:g" < ${WRKSRC}/${ii}.orig \
-		> ${WRKSRC}/${ii}
+.for i in analysis_highlighting.c playback.c print.c
+	@${REINPLACE_CMD} -e "s|<wait.h>|<sys/wait.h>|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: