Date: Sat, 15 Jun 2002 00:41:41 +0200 (CEST) From: Tilman Linneweh <tilman@arved.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39313: Maintainer Update: audio/cmt Message-ID: <200206142241.g5EMff35038379@sauna.arved.de>
next in thread | raw e-mail | index | archive | help
>Number: 39313 >Category: ports >Synopsis: Maintainer Update: audio/cmt >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jun 14 15:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Tilman Linneweh >Release: FreeBSD 4.6-RC i386 >Organization: BSD Usergroup Austria >Environment: System: FreeBSD sauna.arved.de 4.6-RC FreeBSD 4.6-RC #4: Wed Jun 5 00:48:18 CEST 2002 tilman@sauna.arved.de:/usr/obj/usr/src/sys/SAUNA i386 >Description: The patch in the CVS didn't apply. Introduced REINPLACE_CMD. >How-To-Repeat: >Fix: cvs diff: Diffing cmt Index: cmt/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/cmt/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- cmt/Makefile 30 May 2002 16:53:06 -0000 1.1 +++ cmt/Makefile 14 Jun 2002 22:37:13 -0000 @@ -6,6 +6,7 @@ PORTNAME= cmt PORTVERSION= 1.12 +PORTREVSION= 1 CATEGORIES= audio MASTER_SITES= http://www.ladspa.org/download/ DISTNAME= ${PORTNAME}_src @@ -20,21 +21,9 @@ MAKEFILE= makefile ALL_TARGET= targets -post-patch: - @${FIND} ${WRKSRC} -name '*.cpp' | ${XARGS} ${PERL} -pi -e \ - 's|<malloc.h>|<stdlib.h>|g' - -.for i in ${WRKSRC}/analogue.cpp \ - ${WRKSRC}/canyondelay.cpp \ - ${WRKSRC}/lofi.cpp \ - ${WRKSRC}/phasemod.cpp \ - ${WRKSRC}/syndrum.cpp \ - ${WRKSRC}/vcf303.cpp - ${MV} ${WRKDIR}/$i ${WRKDIR}/$i.sed - ${SED} -e "s:malloc.h:stdlib.h:g" \ - ${WRKDIR}/$i.sed >${WRKDIR}/$i - ${RM} ${WRKDIR}/$i.sed -.endfor +pre-patch: + @find ${WRKSRC} -name '*.cpp' | xargs \ + ${REINPLACE_CMD} -e "s|<malloc.h>|<stdlib.h>|g" do-install: @${INSTALL_DATA} ${WRKSRC}/../plugins/cmt.so ${LOCALBASE}/lib/ladspa/ cvs diff: Diffing cmt/files Index: cmt/files/patch-cmt.cpp =================================================================== RCS file: cmt/files/patch-cmt.cpp diff -N cmt/files/patch-cmt.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cmt/files/patch-cmt.cpp 5 Jun 2002 21:17:36 -0000 @@ -0,0 +1,15 @@ +--- cmt.cpp.orig Wed Jun 5 23:15:32 2002 ++++ cmt.cpp Wed Jun 5 23:16:33 2002 +@@ -115,9 +115,9 @@ + void CMT_Descriptor:: + addPort(LADSPA_PortDescriptor iPortDescriptor, + const char * pcPortName, +- LADSPA_PortRangeHintDescriptor iHintDescriptor = 0, +- LADSPA_Data fLowerBound = 0, +- LADSPA_Data fUpperBound = 0) { ++ LADSPA_PortRangeHintDescriptor iHintDescriptor, ++ LADSPA_Data fLowerBound, ++ LADSPA_Data fUpperBound) { + + unsigned long lOldPortCount = PortCount; + unsigned long lNewPortCount = PortCount + 1; Index: cmt/files/patch-makefile =================================================================== RCS file: /home/ncvs/ports/audio/cmt/files/patch-makefile,v retrieving revision 1.1 diff -u -r1.1 patch-makefile --- cmt/files/patch-makefile 30 May 2002 16:53:07 -0000 1.1 +++ cmt/files/patch-makefile 5 Jun 2002 21:12:38 -0000 @@ -1,22 +1,22 @@ ---- makefile.orig Tue Sep 18 00:15:28 2001 -+++ makefile Sun May 12 00:46:39 2002 -@@ -12,9 +12,7 @@ - # GENERAL +--- makefile.orig Wed Jun 5 23:11:40 2002 ++++ makefile Wed Jun 5 23:11:57 2002 +@@ -13,8 +13,8 @@ # - --INCLUDES = -I/usr/local/include/ --CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC --CXXFLAGS = $(CFLAGS) -+CXXFLAGS += -I/usr/local/include/ - PLUGIN_LIB = ../plugins/cmt.so - + + INCLUDES = -I/usr/local/include/ +-CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC +-CXXFLAGS = $(CFLAGS) ++CFLAGS += $(INCLUDES) -Wall -Werror ++CXXFLAGS += $(CFLAGS) + PLUGIN_LIB = ../plugins/cmt.so + ############################################################################### -@@ -61,7 +59,7 @@ - targets: $(PLUGIN_LIB) - - $(PLUGIN_LIB): $(PLUGIN_OBJECTS) -- $(CXX) -shared \ -+ $(CXX) ${CXXFLAGS} -shared \ - -o $(PLUGIN_LIB) \ - $(PLUGIN_OBJECTS) - +@@ -61,7 +61,7 @@ + targets: $(PLUGIN_LIB) + + $(PLUGIN_LIB): $(PLUGIN_OBJECTS) +- $(CXX) -shared \ ++ $(CXX) ${CXXFLAGS} -shared \ + -o $(PLUGIN_LIB) \ + $(PLUGIN_OBJECTS) + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206142241.g5EMff35038379>