From 4b1da8458feedc43663f86cb932a0498cfa6eb69 Mon Sep 17 00:00:00 2001 From: obache Date: Wed, 7 Sep 2011 12:42:02 +0000 Subject: * LICENSE=gnu-lgpl-v2.1. * use install.py instead os SCons for staged installation support. * drop to build python binding. Bump PKGREVISION. --- audio/csound5/Makefile | 18 +++--- audio/csound5/PLIST | 28 +++++---- audio/csound5/distinfo | 3 +- audio/csound5/patches/patch-install.py | 107 +++++++++++++++++++++++++++++++++ 4 files changed, 135 insertions(+), 21 deletions(-) create mode 100644 audio/csound5/patches/patch-install.py (limited to 'audio/csound5') diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile index 7c9bcae0ab8..21c086345a1 100644 --- a/audio/csound5/Makefile +++ b/audio/csound5/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2011/04/22 13:42:51 obache Exp $ +# $NetBSD: Makefile,v 1.18 2011/09/07 12:42:02 obache Exp $ # DISTNAME= Csound${CSOUND_VERSION}_src PKGNAME= csound5-${CSOUND_VERSION} -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/} WRKSRC= ${WRKDIR}/Csound${CSOUND_VERSION} @@ -11,6 +11,9 @@ WRKSRC= ${WRKDIR}/Csound${CSOUND_VERSION} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/csound/ COMMENT= Software synthesizer and sequencer +LICENSE= gnu-lgpl-v2.1 # or later + +PKG_DESTDIR_SUPPORT= user-destdir CSOUND_VERSION= 5.01 USE_LANGUAGES= c c++ @@ -23,25 +26,24 @@ SCONS_ARGS= -C ${WRKSRC} prefix=${PREFIX} SCONS_ARGS+= buildDSSI=0 buildLoris=0 buildRelease=1 SCONS_ARGS+= useALSA=0 useJack=0 useOSC=0 usePortMIDI=0 SCONS_ARGS+= usePortAudio=0 -SCONS_ENV_FILE= ${WRKDIR}/ugly-pkgsrc-scons-hack.txt +SCONS_ARGS+= buildInterfaces=0 INSTALLATION_DIRS= bin do-build: - ${ECHO} ${MAKE_ENV:Q} >${SCONS_ENV_FILE} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS} do-install: - cd ${WRKSRC} && SCONS_ENV="`${CAT} ${SCONS_ENV_FILE}`" && \ - eval "${SETENV} $${SCONS_ENV} ${SCONS} ${SCONS_ARGS} install" + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${PYTHONBIN} \ + install.py --prefix=${PREFIX} --instdir=${DESTDIR} cd ${DESTDIR}${PREFIX} && ${LN} -s ../lib/csound5/csound bin/csound5 .include "../../audio/fluidsynth/buildlink3.mk" .include "../../audio/libsndfile/buildlink3.mk" -.include "../../devel/swig/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../lang/python24/buildlink3.mk" +PYTHON_FOR_BUILD_ONLY= yes +.include "../../lang/python/application.mk" .include "../../x11/fltk/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/csound5/PLIST b/audio/csound5/PLIST index 949b30c6135..1ab7a9dbee4 100644 --- a/audio/csound5/PLIST +++ b/audio/csound5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:04 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2011/09/07 12:42:02 obache Exp $ bin/csound5 include/csound5/CppSound.hpp include/csound5/CsoundFile.hpp @@ -29,19 +29,12 @@ lib/csound5/extractor lib/csound5/het_export lib/csound5/het_import lib/csound5/hetro +lib/csound5/libcsound.a lib/csound5/lpanal lib/csound5/lpc_export lib/csound5/lpc_import lib/csound5/makecsd lib/csound5/mixer -lib/csound5/pvanal -lib/csound5/pvlook -lib/csound5/scale -lib/csound5/scot -lib/csound5/scsort -lib/csound5/sndinfo -lib/csound5/srconv -lib/csound5/csnd.py lib/csound5/plugins/libbabo.so lib/csound5/plugins/libbarmodel.so lib/csound5/plugins/libfluidOpcodes.so @@ -54,7 +47,6 @@ lib/csound5/plugins/libmodal4.so lib/csound5/plugins/libphisem.so lib/csound5/plugins/libphysmod.so lib/csound5/plugins/libpitch.so -@comment -- portaudio module -- lib/csound5/plugins/librtpa.so lib/csound5/plugins/libscansyn.so lib/csound5/plugins/libsfont.so lib/csound5/plugins/libstdopcod.so @@ -62,5 +54,17 @@ lib/csound5/plugins/libstdutil.so lib/csound5/plugins/libvbap.so lib/csound5/plugins/libwidgets.so lib/csound5/plugins/opcodes.dir -lib/csound5/lib_csnd.so -lib/csound5/libcsound.a +lib/csound5/pvanal +lib/csound5/pvlook +lib/csound5/scale +lib/csound5/scot +lib/csound5/scsort +lib/csound5/sndinfo +lib/csound5/srconv +share/csound/xmg/American.xmg +share/csound/xmg/English.xmg +share/csound/xmg/csound.xmg +share/doc/csound/COPYING +share/doc/csound/ChangeLog +share/doc/csound/INSTALL +share/doc/csound/readme-csound5.txt diff --git a/audio/csound5/distinfo b/audio/csound5/distinfo index 110f842a73f..6c7b6988c77 100644 --- a/audio/csound5/distinfo +++ b/audio/csound5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2009/12/30 13:19:58 joerg Exp $ +$NetBSD: distinfo,v 1.7 2011/09/07 12:42:02 obache Exp $ SHA1 (Csound5.01_src.tar.gz) = b387da9b6c24961397e89ddcedd1229cdfebffe7 RMD160 (Csound5.01_src.tar.gz) = 24652f8f650464d886f6d537ae991654f475ad4a @@ -17,3 +17,4 @@ SHA1 (patch-am) = 9770973e54770b9eebcf66c17f90f459e71a71c6 SHA1 (patch-an) = 7dfbd38a4eca8c7767a53c2b93bb4967344c0f0e SHA1 (patch-ao) = 64ee0a2a70dd317c992088212bc3f241f6296113 SHA1 (patch-ap) = 9229c0166b37fb6991da5557c475d754715df711 +SHA1 (patch-install.py) = 8150b01843b5875558cbbf0bd621d8cf7b021905 diff --git a/audio/csound5/patches/patch-install.py b/audio/csound5/patches/patch-install.py new file mode 100644 index 00000000000..c596abdfc71 --- /dev/null +++ b/audio/csound5/patches/patch-install.py @@ -0,0 +1,107 @@ +$NetBSD: patch-install.py,v 1.1 2011/09/07 12:42:02 obache Exp $ + +* adjust installation layout to same as SCons. +* kill uninstaller and md5sum for it. +* kill ldconfig + +--- install.py.orig 2006-03-15 15:20:59.000000000 +0000 ++++ install.py +@@ -3,7 +3,6 @@ + import sys + import os + import re +-import md5 + import time + + # get Python version +@@ -25,7 +24,7 @@ exeFiles1 = ['csound', 'CsoundVST', 'cst + 'pvlook', 'scale', 'sndinfo', 'srconv', + 'scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot'] + +-exeFiles2 = ['brkpt', 'linseg', 'tabdes'] ++exeFiles2 = [] + + docFiles = ['COPYING', 'ChangeLog', 'INSTALL', 'readme-csound5.txt'] + +@@ -88,15 +87,15 @@ def concatPath(lst): + return s + + # frontends +-binDir = concatPath([prefix, '/bin']) ++binDir = concatPath([prefix, '/lib/csound5']) + # Csound API header files +-includeDir = concatPath([prefix, '/include/csound']) ++includeDir = concatPath([prefix, '/include/csound5']) + # Csound API libraries +-libDir = concatPath([prefix, '/lib']) ++libDir = concatPath([prefix, '/lib/csound5']) + # single precision plugin libraries +-pluginDir32 = concatPath([libDir, '/csound/plugins']) ++pluginDir32 = concatPath([libDir, '/plugins']) + # double precision plugin libraries +-pluginDir64 = concatPath([libDir, '/csound/plugins64']) ++pluginDir64 = concatPath([libDir, '/plugins64']) + # XMG files + xmgDir = concatPath([prefix, '/share/csound/xmg']) + # documentation +@@ -317,7 +316,7 @@ installErrors = installErrors or err + print ' === Installing Tcl/Tk modules and scripts ===' + if findFiles('.', 'tclcsound\\.so').__len__() > 0: + err = installXFile('--strip-unneeded', 'tclcsound.so', tclDir) +-err = installFile('nsliders.tk', tclDir) ++ err = installFile('nsliders.tk', tclDir) + installErrors = installErrors or err + + # copy STK raw wave files +@@ -375,42 +374,6 @@ if vimDir != '': + '%s/%s' % (vimDir, 'syntax')) + installErrors = installErrors or err + +-# create uninstall script +- +-print ' === Installing uninstall script ===' +-fileList += [concatPath([prefix, md5Name])] +-fileList += [concatPath([binDir, 'uninstall-csound5'])] +-try: +- f = open(concatPath([instDir, binDir, 'uninstall-csound5']), 'w') +- print >> f, '#!/bin/sh' +- print >> f, '' +- for i in fileList: +- print >> f, 'rm -f "%s"' % i +- print >> f, '' +- print >> f, '/sbin/ldconfig > /dev/null 2> /dev/null' +- print >> f, '' +- f.close() +- os.chmod(concatPath([instDir, binDir, 'uninstall-csound5']), 0755) +- addMD5(concatPath([instDir, binDir, 'uninstall-csound5']), +- concatPath([binDir, 'uninstall-csound5'])) +- print ' %s' % concatPath([binDir, 'uninstall-csound5']) +-except: +- print ' *** Error creating uninstall script' +- installErrors = 1 +- +-# save MD5 checksums +- +-print ' === Installing MD5 checksums ===' +-try: +- f = open(concatPath([instDir, prefix, md5Name]), 'w') +- print >> f, md5List, +- f.close() +- os.chmod(concatPath([instDir, prefix, md5Name]), 0644) +- print ' %s' % concatPath([prefix, md5Name]) +-except: +- print ' *** Error installing MD5 checksums' +- installErrors = 1 +- + # ----------------------------------------------------------------------------- + + print '' +@@ -437,8 +400,5 @@ else: + print ' RAWWAVE_PATH=%s' % rawWaveDir + print 'Csound can be uninstalled by running %s/uninstall-csound5' % binDir + +-if os.getuid() == 0: +- runCmd(['/sbin/ldconfig']) +- + print '' + -- cgit v1.2.3