From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 10 18:10:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1061D16A41A for ; Fri, 10 Aug 2007 18:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E0CE213C46E for ; Fri, 10 Aug 2007 18:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l7AIA104026927 for ; Fri, 10 Aug 2007 18:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l7AIA1gE026926; Fri, 10 Aug 2007 18:10:01 GMT (envelope-from gnats) Resent-Date: Fri, 10 Aug 2007 18:10:01 GMT Resent-Message-Id: <200708101810.l7AIA1gE026926@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9325A16A417 for ; Fri, 10 Aug 2007 18:00:46 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa05.dion.ne.jp (msa05.dion.ne.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id 2903013C483 for ; Fri, 10 Aug 2007 18:00:46 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from localhost.localdomain (ZT068219.ppp.dion.ne.jp [59.128.68.219]) by msa105.dion.ne.jp (DION MAIL) with ESMTP id A6FB1538037 for ; Sat, 11 Aug 2007 03:00:38 +0900 (JST) Message-Id: <20070811030007.9aff6dbd.tkato432@yahoo.com> Date: Sat, 11 Aug 2007 03:00:07 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org X-Mailman-Approved-At: Fri, 10 Aug 2007 19:38:01 +0000 Cc: Subject: ports/115389: Update port: audio/cheesetracker to 0.9.15.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Aug 2007 18:10:02 -0000 >Number: 115389 >Category: ports >Synopsis: Update port: audio/cheesetracker to 0.9.15.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 10 18:10:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.2-RELEASE-p7 i386 >Organization: >Environment: >Description: - Update to version 0.9.15.1 Remove file: files/patch-cheesetracker-trackercore-saver.cpp files/patch-common-components-audio-resampler_manager.h files/patch-common-components-data-property_bridges.h files/patch-common-drivers-posix-sound_driver_jack.h pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/cheesetracker/Makefile audio/cheesetracker/Makefile --- /usr/ports/audio/cheesetracker/Makefile Sun May 20 04:58:18 2007 +++ audio/cheesetracker/Makefile Thu Aug 9 01:03:57 2007 @@ -7,25 +7,29 @@ # 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 .if ${ARCH} == "alpha" @@ -37,12 +41,14 @@ .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|%%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 -urN /usr/ports/audio/cheesetracker/distinfo audio/cheesetracker/distinfo --- /usr/ports/audio/cheesetracker/distinfo Thu Mar 29 22:20:59 2007 +++ audio/cheesetracker/distinfo Thu Aug 9 01:15:44 2007 @@ -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) = 30ebafe8055d6195dea2c3b316b7cd00 +SHA256 (cheesetracker-0.9.15.1.tar.bz2) = a79ea75120d79e080c252d99ab354135ebd56a86221ee0c2de272b31978d9a8a +SIZE (cheesetracker-0.9.15.1.tar.bz2) = 1271357 diff -urN /usr/ports/audio/cheesetracker/files/patch-SConstruct audio/cheesetracker/files/patch-SConstruct --- /usr/ports/audio/cheesetracker/files/patch-SConstruct Fri Apr 27 23:59:17 2007 +++ audio/cheesetracker/files/patch-SConstruct Tue Aug 7 21:46:44 2007 @@ -1,6 +1,6 @@ ---- 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 Tue Aug 7 21:46:43 2007 +@@ -55,8 +55,10 @@ env.make_so = None env.detect = detect.Detect() @@ -12,12 +12,40 @@ env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] env['ENV']['HOME'] = os.environ['HOME'] -@@ -87,7 +89,7 @@ - env.optimize_resampler_hack=0 +@@ -87,14 +89,14 @@ + env.Append(CXXFLAGS=['-DNEED_GMP']); + env.Append(LIBS=['-lgmp']); + 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 -urN /usr/ports/audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp --- /usr/ports/audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp Sat Apr 21 23:31:57 2007 +++ audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h --- /usr/ports/audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h Sat Apr 21 23:31:57 2007 +++ audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/audio/cheesetracker/files/patch-common-components-data-property_bridges.h audio/cheesetracker/files/patch-common-components-data-property_bridges.h --- /usr/ports/audio/cheesetracker/files/patch-common-components-data-property_bridges.h Sat Apr 21 23:31:57 2007 +++ audio/cheesetracker/files/patch-common-components-data-property_bridges.h Thu Jan 1 09:00:00 1970 @@ -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*)&rvalue);\ - if (rcast) {\ - set(rcast->get());\ diff -urN /usr/ports/audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h --- /usr/ports/audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h Sat Apr 21 23:31:57 2007 +++ audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp --- /usr/ports/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp Thu Mar 29 22:20:59 2007 +++ audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp Sun Aug 5 22:15:07 2007 @@ -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 -urN /usr/ports/audio/cheesetracker/files/patch-detect.py audio/cheesetracker/files/patch-detect.py --- /usr/ports/audio/cheesetracker/files/patch-detect.py Thu Mar 29 22:20:59 2007 +++ audio/cheesetracker/files/patch-detect.py Tue Aug 7 22:32:10 2007 @@ -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 Tue Aug 7 22:31:44 2007 +@@ -104,35 +104,11 @@ def check_libdl(libdata): @@ -38,9 +38,33 @@ - return 1; + return 0; - def check_alsa(libdata): + def check_need_gmp(libdata): + print "Checking if GMP is needed...", +@@ -208,19 +184,14 @@ + + def check_libaudiofile(libdata): + print "Checking for libaudiofile...", +- res = check_cpp_compile( +- "#include \n" + +- "int main() {\n" + +- " afNewFileSetup();\n" + +- " return 0;\n" + +- "}\n", "-laudiofile -lm"); +- if(res == 0): ++ errorval=os.system("pkg-config audiofile --modversion"); ++ if(errorval): + print " no. Access to lots of file formats is lost."; + libdata.have_libaudiofile=0; +- return 0; ++ return 1; + print "Yes."; + libdata.have_libaudiofile=1; +- return 1; ++ return 0; -@@ -148,6 +124,7 @@ + def check_mmap(libdata): + print "Checking for mmap...", +@@ -401,6 +372,7 @@ #list of dirs I can test.. qt_unix_library_dirs = [\ @@ -48,7 +72,7 @@ "",\ "/usr/lib",\ "/usr/X11R6/lib",\ -@@ -158,6 +135,7 @@ +@@ -411,6 +383,7 @@ ]; qt_unix_bin_dirs = [\ @@ -56,7 +80,7 @@ "",\ "/usr/bin",\ "/usr/X11R6/bin",\ -@@ -168,6 +146,7 @@ +@@ -421,6 +394,7 @@ ]; qt_unix_include_dirs = [\ @@ -64,7 +88,7 @@ "/usr/include",\ "/usr/include/qt3",\ "/usr/X11R6/include",\ -@@ -271,7 +250,10 @@ +@@ -524,7 +498,10 @@ print "Looking for QT 3.x 'moc' Binary:"; @@ -76,19 +100,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 -urN /usr/ports/audio/cheesetracker/pkg-descr audio/cheesetracker/pkg-descr --- /usr/ports/audio/cheesetracker/pkg-descr Mon Jul 28 14:56:13 2003 +++ audio/cheesetracker/pkg-descr Sun Aug 5 22:15:07 2007 @@ -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 -urN /usr/ports/audio/cheesetracker/pkg-plist audio/cheesetracker/pkg-plist --- /usr/ports/audio/cheesetracker/pkg-plist Thu Mar 29 22:20:59 2007 +++ audio/cheesetracker/pkg-plist Thu Jan 1 09:00:00 1970 @@ -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%% >Release-Note: >Audit-Trail: >Unformatted: