From b4340bf78e847ef8579e957b7854229cce8cc8bf Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Sat, 17 Nov 2018 21:07:15 +0000 Subject: [PATCH] Move audio/csound6 -> audio/csound Having the version in its name doesn't make sense because this is a stable package. --- MOVED | 1 + audio/Makefile | 2 +- audio/{csound6 => csound}/Makefile | 9 ++------- audio/csound/distinfo | 3 +++ audio/{csound6 => csound}/files/custom.py.in | 0 audio/{csound6 => csound}/files/patch-CMakeLists.txt | 0 audio/{csound6 => csound}/files/patch-H_remote.h | 0 audio/{csound6 => csound}/files/patch-InOut_rtalsa.c | 0 .../files/patch-Opcodes_stk_CMakeLists.txt | 0 audio/{csound6 => csound}/files/patch-Top_csound.c | 0 .../files/patch-cmake_Modules_FindFAUST.cmake | 0 audio/{csound6 => csound}/files/pkg-message.in | 0 audio/{csound6 => csound}/pkg-descr | 0 audio/{csound6 => csound}/pkg-plist | 0 audio/csound6/distinfo | 3 --- 15 files changed, 7 insertions(+), 11 deletions(-) rename audio/{csound6 => csound}/Makefile (98%) create mode 100644 audio/csound/distinfo rename audio/{csound6 => csound}/files/custom.py.in (100%) rename audio/{csound6 => csound}/files/patch-CMakeLists.txt (100%) rename audio/{csound6 => csound}/files/patch-H_remote.h (100%) rename audio/{csound6 => csound}/files/patch-InOut_rtalsa.c (100%) rename audio/{csound6 => csound}/files/patch-Opcodes_stk_CMakeLists.txt (100%) rename audio/{csound6 => csound}/files/patch-Top_csound.c (100%) rename audio/{csound6 => csound}/files/patch-cmake_Modules_FindFAUST.cmake (100%) rename audio/{csound6 => csound}/files/pkg-message.in (100%) rename audio/{csound6 => csound}/pkg-descr (100%) rename audio/{csound6 => csound}/pkg-plist (100%) delete mode 100644 audio/csound6/distinfo diff --git a/MOVED b/MOVED index 9f8bc1bc971b..ad7849125af1 100644 --- a/MOVED +++ b/MOVED @@ -10632,3 +10632,4 @@ net-mgmt/vidalia||2018-11-16|Has expired: outdated and unmaintained german/selfhtml||2018-11-16|Has expired: Project migrated to a Wiki sysutils/fastest_cvsup||2018-11-16|Has expired: Obsolete, FreeBSD and OpenBSD switched from cvsup to svn and cvsync, NetBSD only have 2 servers left devel/rubygem-sidekiq-bulk-rails5|devel/rubygem-sidekiq-bulk|2018-11-17|Remove -rails5 suffix +audio/csound6|audio/csound|2018-11-17|Move to audio/csound because this is a stable project, no need to have a versioned package name diff --git a/audio/Makefile b/audio/Makefile index 8f2b6fa89045..5728d6adebb4 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -93,7 +93,7 @@ SUBDIR += cpp-xmms2 SUBDIR += creox SUBDIR += crip - SUBDIR += csound6 + SUBDIR += csound SUBDIR += ctronome SUBDIR += cue2toc SUBDIR += cueplayer diff --git a/audio/csound6/Makefile b/audio/csound/Makefile similarity index 98% rename from audio/csound6/Makefile rename to audio/csound/Makefile index bcd68a0ffde2..9d7f3b9fd853 100644 --- a/audio/csound6/Makefile +++ b/audio/csound/Makefile @@ -4,8 +4,6 @@ PORTNAME= csound DISTVERSION= 6.12.2 CATEGORIES= audio lang -PKGNAMESUFFIX= 6 -DIST_SUBDIR= csound MAINTAINER= yuri@FreeBSD.org COMMENT= Sound synthesizer @@ -20,23 +18,20 @@ LIB_DEPENDS= libsamplerate.so:audio/libsamplerate \ libsndfile.so:audio/libsndfile USES= alias bison cmake:outsource compiler:c++11-lib eigen:3 localbase ncurses python:2.7 -# math/gmm++ requires c++11 USE_GITHUB= yes +USE_LDCONFIG= yes + CMAKE_ARGS= -DBUILD_CSOUNDVST:BOOL=OFF \ -DBUILD_PD_CLASS:BOOL=OFF \ -DPYTHON_MODULE_INSTALL_DIR:PATH="${PYTHONPREFIX_SITELIBDIR}" \ -DOPSYS:STRING="${OPSYS}" CMAKE_OFF= USE_ALSA BUILD_JAVA_INTERFACE BUILD_TESTS -USE_LDCONFIG= yes SSP_UNSAFE= yes BINARY_ALIAS= swig=swig3.0 LDFLAGS+= -lexecinfo SUB_FILES= pkg-message -CONFLICTS= csound-5.* -CONFLICTS_INSTALL= outguess-* - OPTIONS_DEFINE= CURL FLTK HDF5 NLS OPENMP PORTAUDIO PULSEAUDIO OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= BUCHLA CHUA DSSI EXCITER FAUST FLUIDSYNTH IMAGE JACK LUA LINALG OSC P5GLOVE PADSYNTH PLATEREV PVSGENDY SCANSYN SELECT SERIAL STACK STK WIIMOTE # Opcodes/CMakeLists.txt, Opcodes/stk/CMakeLists.txt diff --git a/audio/csound/distinfo b/audio/csound/distinfo new file mode 100644 index 000000000000..9c3eb56ef563 --- /dev/null +++ b/audio/csound/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1542488559 +SHA256 (csound-csound-6.12.2_GH0.tar.gz) = 39f4872b896eb1cbbf596fcacc0f2122fd3e5ebbb5cec14a81b4207d6b8630ff +SIZE (csound-csound-6.12.2_GH0.tar.gz) = 26297850 diff --git a/audio/csound6/files/custom.py.in b/audio/csound/files/custom.py.in similarity index 100% rename from audio/csound6/files/custom.py.in rename to audio/csound/files/custom.py.in diff --git a/audio/csound6/files/patch-CMakeLists.txt b/audio/csound/files/patch-CMakeLists.txt similarity index 100% rename from audio/csound6/files/patch-CMakeLists.txt rename to audio/csound/files/patch-CMakeLists.txt diff --git a/audio/csound6/files/patch-H_remote.h b/audio/csound/files/patch-H_remote.h similarity index 100% rename from audio/csound6/files/patch-H_remote.h rename to audio/csound/files/patch-H_remote.h diff --git a/audio/csound6/files/patch-InOut_rtalsa.c b/audio/csound/files/patch-InOut_rtalsa.c similarity index 100% rename from audio/csound6/files/patch-InOut_rtalsa.c rename to audio/csound/files/patch-InOut_rtalsa.c diff --git a/audio/csound6/files/patch-Opcodes_stk_CMakeLists.txt b/audio/csound/files/patch-Opcodes_stk_CMakeLists.txt similarity index 100% rename from audio/csound6/files/patch-Opcodes_stk_CMakeLists.txt rename to audio/csound/files/patch-Opcodes_stk_CMakeLists.txt diff --git a/audio/csound6/files/patch-Top_csound.c b/audio/csound/files/patch-Top_csound.c similarity index 100% rename from audio/csound6/files/patch-Top_csound.c rename to audio/csound/files/patch-Top_csound.c diff --git a/audio/csound6/files/patch-cmake_Modules_FindFAUST.cmake b/audio/csound/files/patch-cmake_Modules_FindFAUST.cmake similarity index 100% rename from audio/csound6/files/patch-cmake_Modules_FindFAUST.cmake rename to audio/csound/files/patch-cmake_Modules_FindFAUST.cmake diff --git a/audio/csound6/files/pkg-message.in b/audio/csound/files/pkg-message.in similarity index 100% rename from audio/csound6/files/pkg-message.in rename to audio/csound/files/pkg-message.in diff --git a/audio/csound6/pkg-descr b/audio/csound/pkg-descr similarity index 100% rename from audio/csound6/pkg-descr rename to audio/csound/pkg-descr diff --git a/audio/csound6/pkg-plist b/audio/csound/pkg-plist similarity index 100% rename from audio/csound6/pkg-plist rename to audio/csound/pkg-plist diff --git a/audio/csound6/distinfo b/audio/csound6/distinfo deleted file mode 100644 index 02186cfda641..000000000000 --- a/audio/csound6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1542473401 -SHA256 (csound/csound-csound-6.12.2_GH0.tar.gz) = 39f4872b896eb1cbbf596fcacc0f2122fd3e5ebbb5cec14a81b4207d6b8630ff -SIZE (csound/csound-csound-6.12.2_GH0.tar.gz) = 26297850