diff options
11 files changed, 115 insertions, 105 deletions
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile index 1b7267c89841..6d60da8a7cd6 100644 --- a/audio/cheesetracker/Makefile +++ b/audio/cheesetracker/Makefile @@ -7,42 +7,53 @@ # PORTNAME= cheesetracker -PORTVERSION= 0.9.9 -PORTREVISION= 1 +PORTVERSION= 0.9.15.1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= cheesetronic +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An Impulse Tracker clone BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \ qmake:${PORTSDIR}/devel/qmake -LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \ - jack.0:${PORTSDIR}/audio/jack +LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack \ + audiofile.0:${PORTSDIR}/audio/libaudiofile \ + sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 +USE_BZIP2= yes USE_QT_VER= 3 MAKE_ENV+= QTDIR="${QT_PREFIX}" USE_SCONS= yes SCONS_ENV+= CXX="${CXX}" +PORTEXAMPLES= beek-dolphinisland.it ll-globule.it reduz-maschizo.it \ + xerxes-mfc.xm +PLIST_FILES= bin/cheesetracker_qt + .include <bsd.port.pre.mk> .if ${ARCH} == "alpha" BROKEN= Does not compile on alpha .endif +.if ${ARCH} != "i386" +LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4 +.endif + .if ${OSVERSION} < 600020 BROKEN= Requires MSG_NOSIGNAL .endif post-patch: - @${REINPLACE_CMD} -e 's,%%CFLAGS%%,${CFLAGS},' ${WRKSRC}/SConstruct - @${REINPLACE_CMD} -e 's,%%QT_PREFIX%%,${QT_PREFIX},' ${WRKSRC}/detect.py + @${REINPLACE_CMD} -e 's|%%CXXFLAGS%%|${CXXFLAGS}| ; \ + s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \ + s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \ + s|%%QT_PREFIX%%|${QT_PREFIX}|' ${WRKSRC}/detect.py do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker/program__QT/cheesetracker_qt ${PREFIX}/bin -.if !defined(NOPORTDOCS) +.if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.it ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.xm ${EXAMPLESDIR} diff --git a/audio/cheesetracker/distinfo b/audio/cheesetracker/distinfo index 5f24e2268c53..211e1f266fed 100644 --- a/audio/cheesetracker/distinfo +++ b/audio/cheesetracker/distinfo @@ -1,3 +1,3 @@ -MD5 (cheesetracker-0.9.9.tar.gz) = d2cb55cd35eaaaef48454a5aad41a08d -SHA256 (cheesetracker-0.9.9.tar.gz) = 97ddb3a7e6959400c1f042b8661a43540b3d5790db39c18bb9ce413a76d41d55 -SIZE (cheesetracker-0.9.9.tar.gz) = 842246 +MD5 (cheesetracker-0.9.15.1.tar.bz2) = f728e77ab536ec68071b2639d81e27e6 +SHA256 (cheesetracker-0.9.15.1.tar.bz2) = 0730ab746cc62cbb281bf0b82b531b3796a5c0cafe377d4f15c4172ab9833649 +SIZE (cheesetracker-0.9.15.1.tar.bz2) = 796008 diff --git a/audio/cheesetracker/files/patch-SConstruct b/audio/cheesetracker/files/patch-SConstruct index 3d12c2c7eafa..8b8951b37b30 100644 --- a/audio/cheesetracker/files/patch-SConstruct +++ b/audio/cheesetracker/files/patch-SConstruct @@ -1,6 +1,23 @@ ---- SConstruct.orig Fri Apr 23 07:51:57 2004 -+++ SConstruct Fri Apr 27 12:47:07 2007 -@@ -53,8 +53,10 @@ +--- SConstruct.orig Tue Aug 7 08:35:47 2007 ++++ SConstruct Mon Aug 20 14:43:47 2007 +@@ -1,12 +1,12 @@ + EnsureSConsVersion(0,14); + #EnsurePythonVersion(2,1); this is buggy in scons, so i commented this out + +-import os; +-import string; ++import os ++import string + import sys + +-import detect; +-import methods; ++import detect ++import methods + + moc_binary = "moc" + +@@ -55,8 +55,10 @@ env.make_so = None env.detect = detect.Detect() @@ -12,12 +29,43 @@ env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] env['ENV']['HOME'] = os.environ['HOME'] -@@ -87,7 +89,7 @@ - env.optimize_resampler_hack=0 +@@ -85,16 +87,16 @@ + + if (env.detect.need_gmp): + env.Append(CXXFLAGS=['-DNEED_GMP']); +- env.Append(LIBS=['-lgmp']); ++ env.Append(LIBS=['gmp']); + if (env.detect.have_libaudiofile): +- env.Append(LIBS=['-laudiofile']); ++ env.Append(LIBS=['audiofile']); + env.Append(CXXFLAGS=['-DHAVE_LIBAUDIOFILE']); + if (env.detect.need_limit_macros_define) : + env.Append(CXXFLAGS=['-D__STDC_LIMIT_MACROS']); + if (env.detect.have_gnu_basename) : + env.Append(CXXFLAGS=['-DHAVE_GNU_BASENAME']); +-if (env.detect.have_xpg_basename) : +- env.Append(CXXFLAGS=['-DHAVE_XPG_BASENAME']); ++#if (env.detect.have_xpg_basename) : ++# env.Append(CXXFLAGS=['-DHAVE_XPG_BASENAME']); + if (env.detect.have_stdint_h) : + env.Append(CXXFLAGS=['-DHAVE_STDINT_H']); + if (env.detect.have_msint) : +@@ -103,7 +105,7 @@ + env.Append(CXXFLAGS=['-DHAVE_MMAP']); + if (env.detect.have_madvise) : + env.Append(CXXFLAGS=['-DHAVE_MADVISE']); +-env.Append(CXXFLAGS=['-g','-Wall']); ++env.Append(CXXFLAGS="%%CXXFLAGS%% %%PTHREAD_CFLAGS%%"); + + if os.environ.has_key('USE_STACK_CHECK'): + env.Append(CXXFLAGS=['-fstack-check']); +@@ -159,7 +161,8 @@ + + + +-env.Append(LIBS=['z','m','pthread']); ++env.Append(LIBS=['z','m']); ++env.Append(LINKFLAGS=["%%PTHREAD_LIBS%%"]); + - if (env['optimize']): -- env.Append(CXXFLAGS=['-O3','-ffast-math']); -+ env.Append(CXXFLAGS="%%CFLAGS%%"); - env.optimize_resampler_hack=0 - profile=0; diff --git a/audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp b/audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp deleted file mode 100644 index 8e3fef004aeb..000000000000 --- a/audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- cheesetracker/trackercore/saver.cpp.orig Thu Apr 12 00:12:30 2007 -+++ cheesetracker/trackercore/saver.cpp Thu Apr 12 00:13:52 2007 -@@ -35,11 +35,8 @@ - - #include "saver.h" - --namespace Audio { -- - - Saver::Saver(){ - } - Saver::~Saver(){ - } --}; // end of namespace declaration diff --git a/audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h b/audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h deleted file mode 100644 index 11ca2a5faeb3..000000000000 --- a/audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h +++ /dev/null @@ -1,11 +0,0 @@ ---- common/components/audio/resampler_manager.h.orig Thu Apr 12 00:03:58 2007 -+++ common/components/audio/resampler_manager.h Thu Apr 12 00:04:14 2007 -@@ -34,7 +34,7 @@ - - public: - -- static Resampler_Manager * Resampler_Manager::get_resampler_manager(); -+ static Resampler_Manager * get_resampler_manager(); - int get_resampler_count(); - Resampler * get_resampler(int p_index); - diff --git a/audio/cheesetracker/files/patch-common-components-data-property_bridges.h b/audio/cheesetracker/files/patch-common-components-data-property_bridges.h deleted file mode 100644 index 71ecd9500b66..000000000000 --- a/audio/cheesetracker/files/patch-common-components-data-property_bridges.h +++ /dev/null @@ -1,11 +0,0 @@ ---- common/components/data/property_bridges.h.orig Wed Apr 11 23:57:19 2007 -+++ common/components/data/property_bridges.h Thu Apr 12 00:02:25 2007 -@@ -41,7 +41,7 @@ - */ - - #define BRIDGE_COPY_VALUE(T) \ -- virtual bool T::copy_value(const Property_Bridge& rvalue) {\ -+ virtual bool copy_value(const Property_Bridge& rvalue) {\ - T* rcast = dynamic_cast<T*>((T*)&rvalue);\ - if (rcast) {\ - set(rcast->get());\ diff --git a/audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h b/audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h deleted file mode 100644 index 8f5df7e06548..000000000000 --- a/audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h +++ /dev/null @@ -1,11 +0,0 @@ ---- common/drivers/posix/sound_driver_jack.h.orig Thu Apr 12 00:09:04 2007 -+++ common/drivers/posix/sound_driver_jack.h Thu Apr 12 00:09:21 2007 -@@ -72,7 +72,7 @@ - - int jack_callback_nframes; - -- Sound_Driver::Status Sound_Driver_JACK::process(); -+ Sound_Driver::Status process(); - - static int process_jack_callback(jack_nframes_t nframes,void *arg); - static int jack_set_mixfreq(jack_nframes_t nframes,void *arg); diff --git a/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp b/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp index 21207be23d07..e387aeca07e3 100644 --- a/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp +++ b/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp @@ -1,5 +1,5 @@ ---- common/drivers/posix/sound_driver_jack.cpp.orig Wed Mar 28 00:43:48 2007 -+++ common/drivers/posix/sound_driver_jack.cpp Wed Mar 28 00:44:18 2007 +--- common/drivers/posix/sound_driver_jack.cpp.orig Fri Aug 3 16:07:43 2007 ++++ common/drivers/posix/sound_driver_jack.cpp Sun Aug 5 22:11:52 2007 @@ -225,12 +225,12 @@ //printf("JACK: Connect Ports...\n"); @@ -8,10 +8,10 @@ + if (jack_connect (client, jack_port_name (output_port_l), "oss:playback_1")) { ERROR("cannot connect output ports\n"); //jack_client_close (client); - //return FUNCTION_FAILED; + //return FUNCTION_FAILURE; } - if (jack_connect (client, jack_port_name (output_port_r), "alsa_pcm:playback_2")) { + if (jack_connect (client, jack_port_name (output_port_r), "oss:playback_2")) { ERROR("cannot connect output ports\n"); //jack_client_close (client); - //return FUNCTION_FAILED; + //return FUNCTION_FAILURE; diff --git a/audio/cheesetracker/files/patch-detect.py b/audio/cheesetracker/files/patch-detect.py index 3c498ed45175..5663e472e51d 100644 --- a/audio/cheesetracker/files/patch-detect.py +++ b/audio/cheesetracker/files/patch-detect.py @@ -1,6 +1,6 @@ ---- detect.py.orig Fri Apr 23 05:21:08 2004 -+++ detect.py Wed Mar 28 22:49:07 2007 -@@ -49,35 +49,11 @@ +--- detect.py.orig Mon Aug 6 21:04:11 2007 ++++ detect.py Mon Aug 20 16:41:41 2007 +@@ -104,35 +104,11 @@ def check_libdl(libdata): @@ -38,9 +38,29 @@ - return 1; + return 0; - def check_alsa(libdata): - -@@ -148,6 +124,7 @@ + def check_need_gmp(libdata): + print "Checking if GMP is needed...", +@@ -152,7 +128,9 @@ + print "Checking if GMP is available...", + res = check_cpp_compile( + "#include <gmp.h>\n" + +- "int main() {return 0;}\n", "-lgmp"); ++ "int main() {\n" + ++ " return 0;\n" + ++ "}\n", "-I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib -lgmp"); + if(res == 0): + print "No." + print "\n\n**** CANNOT FIND GMP LIBRARY ****\n\n"; +@@ -213,7 +191,7 @@ + "int main() {\n" + + " afNewFileSetup();\n" + + " return 0;\n" + +- "}\n", "-laudiofile -lm"); ++ "}\n", "-I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib -laudiofile -lm"); + if(res == 0): + print " no. Access to lots of file formats is lost."; + libdata.have_libaudiofile=0; +@@ -401,6 +379,7 @@ #list of dirs I can test.. qt_unix_library_dirs = [\ @@ -48,7 +68,7 @@ "",\ "/usr/lib",\ "/usr/X11R6/lib",\ -@@ -158,6 +135,7 @@ +@@ -411,6 +390,7 @@ ]; qt_unix_bin_dirs = [\ @@ -56,7 +76,7 @@ "",\ "/usr/bin",\ "/usr/X11R6/bin",\ -@@ -168,6 +146,7 @@ +@@ -421,6 +401,7 @@ ]; qt_unix_include_dirs = [\ @@ -64,7 +84,7 @@ "/usr/include",\ "/usr/include/qt3",\ "/usr/X11R6/include",\ -@@ -271,7 +250,10 @@ +@@ -524,7 +505,10 @@ print "Looking for QT 3.x 'moc' Binary:"; @@ -76,19 +96,3 @@ for x in qt_unix_bin_dirs: if (not qt_lib_found): -@@ -299,7 +281,6 @@ - libdata.moc_bin=command; - break; - -- - if (not qt_found): - print("I Couldnt find QT in your system :(\n"); - print("If you think it is actually installed, you could try the following:\n"); -@@ -312,7 +293,6 @@ - else: - print("QT was found!\n"); - return 0; -- - - - def check_system(libdata): diff --git a/audio/cheesetracker/pkg-descr b/audio/cheesetracker/pkg-descr index be41c3111309..f38ac2418058 100644 --- a/audio/cheesetracker/pkg-descr +++ b/audio/cheesetracker/pkg-descr @@ -1,4 +1,4 @@ CheeseTracker is intended to be an Impulse Tracker clone. Yet, even when some features are missing, It should be perfectly usable. -WWW: http://reduz.com.ar/cheesetracker/ +WWW: http://cheesetracker.sourceforge.net/ diff --git a/audio/cheesetracker/pkg-plist b/audio/cheesetracker/pkg-plist deleted file mode 100644 index 11a1d495eedd..000000000000 --- a/audio/cheesetracker/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/cheesetracker_qt -%%PORTDOCS%%%%EXAMPLESDIR%%/beek-dolphinisland.it -%%PORTDOCS%%%%EXAMPLESDIR%%/ll-globule.it -%%PORTDOCS%%%%EXAMPLESDIR%%/reduz-maschizo.it -%%PORTDOCS%%%%EXAMPLESDIR%%/xerxes-mfc.xm -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% |