Tue Feb 7 21:17:49 2012 UTC ()
Fix the patch that adds NetBSD and Dragonfly by changing 'getPlatform' to
'getPlatform()'.

Now libcontrol.so should be built and install on NetBSD and Dragonfly.
(PR#45940 shows that its missing)


(sbd)
diff -r1.7 -r1.8 pkgsrc/audio/csound5/distinfo
diff -r1.4 -r1.5 pkgsrc/audio/csound5/patches/patch-ac
cvs diff -r1.7 -r1.8 pkgsrc/audio/csound5/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/csound5/distinfo 2011/09/07 12:42:02 1.7
+++ pkgsrc/audio/csound5/distinfo 2012/02/07 21:17:49 1.8
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.7 2011/09/07 12:42:02 obache Exp $ 1$NetBSD: distinfo,v 1.8 2012/02/07 21:17:49 sbd Exp $
2 2
3SHA1 (Csound5.01_src.tar.gz) = b387da9b6c24961397e89ddcedd1229cdfebffe7 3SHA1 (Csound5.01_src.tar.gz) = b387da9b6c24961397e89ddcedd1229cdfebffe7
4RMD160 (Csound5.01_src.tar.gz) = 24652f8f650464d886f6d537ae991654f475ad4a 4RMD160 (Csound5.01_src.tar.gz) = 24652f8f650464d886f6d537ae991654f475ad4a
5Size (Csound5.01_src.tar.gz) = 2031426 bytes 5Size (Csound5.01_src.tar.gz) = 2031426 bytes
6SHA1 (patch-ac) = a52a86dd8fed44ac3d72ef09e4de4224b2146c31 6SHA1 (patch-ac) = 686530ade67f637ccbd0286fa689af920773cd13
7SHA1 (patch-ad) = 343b5767584cf4ddfbc7664e3234577fe22ff03a 7SHA1 (patch-ad) = 343b5767584cf4ddfbc7664e3234577fe22ff03a
8SHA1 (patch-ae) = 705d56ce7a03cd10763542a9ec71b393474c0595 8SHA1 (patch-ae) = 705d56ce7a03cd10763542a9ec71b393474c0595
9SHA1 (patch-af) = 4444b8efe47a401e01718c21197c2b6e19ec548c 9SHA1 (patch-af) = 4444b8efe47a401e01718c21197c2b6e19ec548c
10SHA1 (patch-ag) = 2771fdce6a054d96e51dd70df1264fe2cfdcdf58 10SHA1 (patch-ag) = 2771fdce6a054d96e51dd70df1264fe2cfdcdf58
11SHA1 (patch-ah) = e9978da3a14140f072ca12ca25b4c9a67ea4ede4 11SHA1 (patch-ah) = e9978da3a14140f072ca12ca25b4c9a67ea4ede4
12SHA1 (patch-ai) = b7e079331053e555ce39df425e092715a6232d56 12SHA1 (patch-ai) = b7e079331053e555ce39df425e092715a6232d56
13SHA1 (patch-aj) = c22d25d55387c232187259690a43512457e18c54 13SHA1 (patch-aj) = c22d25d55387c232187259690a43512457e18c54
14SHA1 (patch-ak) = 1f3a7ec113a5185a81fe219d99061afb025bc13b 14SHA1 (patch-ak) = 1f3a7ec113a5185a81fe219d99061afb025bc13b
15SHA1 (patch-al) = 7da1e82a280b6803e2f0f75b8fb1eafbc3206636 15SHA1 (patch-al) = 7da1e82a280b6803e2f0f75b8fb1eafbc3206636
16SHA1 (patch-am) = 9770973e54770b9eebcf66c17f90f459e71a71c6 16SHA1 (patch-am) = 9770973e54770b9eebcf66c17f90f459e71a71c6
17SHA1 (patch-an) = 7dfbd38a4eca8c7767a53c2b93bb4967344c0f0e 17SHA1 (patch-an) = 7dfbd38a4eca8c7767a53c2b93bb4967344c0f0e
18SHA1 (patch-ao) = 64ee0a2a70dd317c992088212bc3f241f6296113 18SHA1 (patch-ao) = 64ee0a2a70dd317c992088212bc3f241f6296113
19SHA1 (patch-ap) = 9229c0166b37fb6991da5557c475d754715df711 19SHA1 (patch-ap) = 9229c0166b37fb6991da5557c475d754715df711
cvs diff -r1.4 -r1.5 pkgsrc/audio/csound5/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/csound5/patches/patch-ac 2009/12/30 13:19:58 1.4
+++ pkgsrc/audio/csound5/patches/patch-ac 2012/02/07 21:17:49 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.4 2009/12/30 13:19:58 joerg Exp $ 1$NetBSD: patch-ac,v 1.5 2012/02/07 21:17:49 sbd Exp $
2 2
3--- SConstruct.orig 2006-03-15 15:22:43.000000000 +0000 3--- SConstruct.orig 2006-03-15 15:22:43.000000000 +0000
4+++ SConstruct 4+++ SConstruct
5@@ -50,6 +50,10 @@ def today(): 5@@ -50,6 +50,10 @@ def today():
6 def getPlatform(): 6 def getPlatform():
7 if sys.platform[:5] == 'linux': 7 if sys.platform[:5] == 'linux':
8 return 'linux' 8 return 'linux'
9+ elif sys.platform[:6] == 'netbsd': 9+ elif sys.platform[:6] == 'netbsd':
10+ return 'netbsd' 10+ return 'netbsd'
11+ elif sys.platform[:9] == 'dragonfly': 11+ elif sys.platform[:9] == 'dragonfly':
12+ return 'dragonfly' 12+ return 'dragonfly'
13 elif sys.platform[:3] == 'win': 13 elif sys.platform[:3] == 'win':
14 return 'mingw' 14 return 'mingw'
@@ -88,27 +88,27 @@ $NetBSD: patch-ac,v 1.4 2009/12/30 13:19 @@ -88,27 +88,27 @@ $NetBSD: patch-ac,v 1.4 2009/12/30 13:19
88+ guiProgramEnvironment.Append(LINKFLAGS = ['-pthread']) 88+ guiProgramEnvironment.Append(LINKFLAGS = ['-pthread'])
89+ else: 89+ else:
90+ csoundProgramEnvironment.Append(LIBS = ['pthread', 'm']) 90+ csoundProgramEnvironment.Append(LIBS = ['pthread', 'm'])
91+ vstEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm']) 91+ vstEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
92+ guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm']) 92+ guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
93 if getPlatform() == 'darwin': 93 if getPlatform() == 'darwin':
94 csoundProgramEnvironment.Append(LINKFLAGS = Split(''' 94 csoundProgramEnvironment.Append(LINKFLAGS = Split('''
95 -framework Carbon -framework CoreAudio -framework CoreMidi 95 -framework Carbon -framework CoreAudio -framework CoreMidi
96@@ -989,7 +1021,7 @@ makePlugin(pluginEnvironment, 'stdopcod' 96@@ -989,7 +1021,7 @@ makePlugin(pluginEnvironment, 'stdopcod'
97 pluginLibraries.append('opcodes.dir') 97 pluginLibraries.append('opcodes.dir')
98 MacOSX_InstallPlugin('opcodes.dir') 98 MacOSX_InstallPlugin('opcodes.dir')
99  99
100-if getPlatform() == 'linux' or getPlatform() == 'darwin': 100-if getPlatform() == 'linux' or getPlatform() == 'darwin':
101+if getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform == 'netbsd' or getPlatform == 'dragonfly': 101+if getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
102 makePlugin(pluginEnvironment, 'control', ['Opcodes/control.c']) 102 makePlugin(pluginEnvironment, 'control', ['Opcodes/control.c'])
103 makePlugin(pluginEnvironment, 'ftest', ['Opcodes/ftest.c']) 103 makePlugin(pluginEnvironment, 'ftest', ['Opcodes/ftest.c'])
104 makePlugin(pluginEnvironment, 'mixer', ['Opcodes/mixer.cpp']) 104 makePlugin(pluginEnvironment, 'mixer', ['Opcodes/mixer.cpp'])
105@@ -1042,6 +1074,13 @@ else: 105@@ -1042,6 +1074,13 @@ else:
106 -framework Carbon -framework CoreAudio -framework CoreMidi 106 -framework Carbon -framework CoreAudio -framework CoreMidi
107 -framework ApplicationServices 107 -framework ApplicationServices
108 ''')) 108 '''))
109+ elif getPlatform() == 'netbsd': 109+ elif getPlatform() == 'netbsd':
110+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags') 110+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags')
111+ widgetsEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm']) 111+ widgetsEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
112+ elif getPlatform() == 'dragonfly': 112+ elif getPlatform() == 'dragonfly':
113+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags') 113+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags')
114+ widgetsEnvironment.Append(LIBS = ['stdc++', 'm']) 114+ widgetsEnvironment.Append(LIBS = ['stdc++', 'm'])