Date: Sat, 13 Jul 2002 21:12:42 +0200 (CEST) From: Tilman Linneweh <tilman@arved.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tilman@arved.de Subject: ports/40533: [Maintainer-Update] audio/cmt Fix Patches. Message-ID: <200207131912.g6DJCgSV084020@sauna.arved.de>
next in thread | raw e-mail | index | archive | help
>Number: 40533 >Category: ports >Synopsis: [Maintainer-Update] audio/cmt Fix Patches. >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: Sat Jul 13 12:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Tilman Linneweh >Release: FreeBSD 4.6-STABLE i386 >Organization: BSD Usergroup Austria >Environment: System: FreeBSD sauna.arved.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jul 7 20:02:41 CEST 2002 tilman@sauna.arved.de:/usr/obj/usr/src/sys/SAUNA i386 >Description: patch- Files got mangled on the way from my Computer to the FreeBSD CVS This should fix them finally. Please test if they got mangled again. This diff is also available from http://arved.free-bsd.org/~tilman/cmt.diff >How-To-Repeat: >Fix: Index: files/patch-cmt.cpp =================================================================== RCS file: /home/ncvs/ports/audio/cmt/files/patch-cmt.cpp,v retrieving revision 1.1 diff -u -r1.1 patch-cmt.cpp --- files/patch-cmt.cpp 16 Jun 2002 18:17:24 -0000 1.1 +++ files/patch-cmt.cpp 13 Jul 2002 19:01:09 -0000 @@ -1,15 +1,15 @@ ---- cmt.cpp.orig Wed Jun 5 23:15:32 2002 -+++ cmt.cpp Wed Jun 5 23:16:33 2002 +--- cmt.cpp.orig Sat Jul 13 20:59:44 2002 ++++ cmt.cpp Sat Jul 13 21:00:21 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) { - + 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: files/patch-makefile =================================================================== RCS file: /home/ncvs/ports/audio/cmt/files/patch-makefile,v retrieving revision 1.2 diff -u -r1.2 patch-makefile --- files/patch-makefile 16 Jun 2002 18:17:24 -0000 1.2 +++ files/patch-makefile 13 Jul 2002 18:56:40 -0000 @@ -1,22 +1,24 @@ ---- makefile.orig Wed Jun 5 23:11:40 2002 -+++ makefile Wed Jun 5 23:11:57 2002 -@@ -13,8 +13,8 @@ +--- makefile.orig Sat Jul 13 20:54:06 2002 ++++ makefile Sat Jul 13 20:56:15 2002 +@@ -12,9 +12,9 @@ + # GENERAL # - - INCLUDES = -I/usr/local/include/ --CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC --CXXFLAGS = $(CFLAGS) -+CFLAGS += $(INCLUDES) -Wall -Werror -+CXXFLAGS += $(CFLAGS) - PLUGIN_LIB = ../plugins/cmt.so - + +-INCLUDES = -I/usr/local/include/ +-CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC +-CXXFLAGS = $(CFLAGS) ++INCLUDES = -I${LOCALBASE}/include/ ++CFLAGS += $(INCLUDES) -Wall -Werror -fPIC ++CXXFLAGS += $(CFLAGS) + PLUGIN_LIB = ../plugins/cmt.so + ############################################################################### @@ -61,7 +61,7 @@ - targets: $(PLUGIN_LIB) - - $(PLUGIN_LIB): $(PLUGIN_OBJECTS) -- $(CXX) -shared \ -+ $(CXX) ${CXXFLAGS} -shared \ - -o $(PLUGIN_LIB) \ - $(PLUGIN_OBJECTS) - + 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?200207131912.g6DJCgSV084020>