View | Details | Raw Unified | Return to bug 115389
Collapse All | Expand All

(-)audio/cheesetracker/Makefile (-9 / +15 lines)
Lines 7-31 Link Here
7
#
7
#
8
8
9
PORTNAME=	cheesetracker
9
PORTNAME=	cheesetracker
10
PORTVERSION=	0.9.9
10
PORTVERSION=	0.9.15.1
11
PORTREVISION=	1
12
CATEGORIES=	audio
11
CATEGORIES=	audio
13
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	SF
14
MASTER_SITE_SUBDIR=	cheesetronic
15
13
16
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	An Impulse Tracker clone
15
COMMENT=	An Impulse Tracker clone
18
16
19
BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
17
BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
20
		qmake:${PORTSDIR}/devel/qmake
18
		qmake:${PORTSDIR}/devel/qmake
21
LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
19
LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
22
		jack.0:${PORTSDIR}/audio/jack
20
		audiofile.0:${PORTSDIR}/audio/libaudiofile \
21
		sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
23
22
23
USE_BZIP2=	yes
24
USE_QT_VER=	3
24
USE_QT_VER=	3
25
MAKE_ENV+=	QTDIR="${QT_PREFIX}"
25
MAKE_ENV+=	QTDIR="${QT_PREFIX}"
26
USE_SCONS=	yes
26
USE_SCONS=	yes
27
SCONS_ENV+=	CXX="${CXX}"
27
SCONS_ENV+=	CXX="${CXX}"
28
28
29
PORTEXAMPLES=	beek-dolphinisland.it ll-globule.it reduz-maschizo.it \
30
		xerxes-mfc.xm
31
PLIST_FILES=	bin/cheesetracker_qt
32
29
.include <bsd.port.pre.mk>
33
.include <bsd.port.pre.mk>
30
34
31
.if ${ARCH} == "alpha"
35
.if ${ARCH} == "alpha"
Lines 37-48 Link Here
37
.endif
41
.endif
38
42
39
post-patch:
43
post-patch:
40
	@${REINPLACE_CMD} -e 's,%%CFLAGS%%,${CFLAGS},' ${WRKSRC}/SConstruct
44
	@${REINPLACE_CMD} -e 's|%%CXXFLAGS%%|${CXXFLAGS}| ; \
41
	@${REINPLACE_CMD} -e 's,%%QT_PREFIX%%,${QT_PREFIX},' ${WRKSRC}/detect.py
45
		 s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \
46
		 s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/SConstruct
47
	@${REINPLACE_CMD} -e 's|%%QT_PREFIX%%|${QT_PREFIX}|' ${WRKSRC}/detect.py
42
48
43
do-install:
49
do-install:
44
	${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker/program__QT/cheesetracker_qt ${PREFIX}/bin
50
	${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker/program__QT/cheesetracker_qt ${PREFIX}/bin
45
.if !defined(NOPORTDOCS)
51
.if !defined(NOPORTEXAMPLES)
46
	@${MKDIR} ${EXAMPLESDIR}
52
	@${MKDIR} ${EXAMPLESDIR}
47
	${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.it ${EXAMPLESDIR}
53
	${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.it ${EXAMPLESDIR}
48
	${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.xm ${EXAMPLESDIR}
54
	${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.xm ${EXAMPLESDIR}
(-)audio/cheesetracker/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (cheesetracker-0.9.9.tar.gz) = d2cb55cd35eaaaef48454a5aad41a08d
1
MD5 (cheesetracker-0.9.15.1.tar.bz2) = 30ebafe8055d6195dea2c3b316b7cd00
2
SHA256 (cheesetracker-0.9.9.tar.gz) = 97ddb3a7e6959400c1f042b8661a43540b3d5790db39c18bb9ce413a76d41d55
2
SHA256 (cheesetracker-0.9.15.1.tar.bz2) = a79ea75120d79e080c252d99ab354135ebd56a86221ee0c2de272b31978d9a8a
3
SIZE (cheesetracker-0.9.9.tar.gz) = 842246
3
SIZE (cheesetracker-0.9.15.1.tar.bz2) = 1271357
(-)audio/cheesetracker/files/patch-SConstruct (-10 / +38 lines)
Lines 1-6 Link Here
1
--- SConstruct.orig	Fri Apr 23 07:51:57 2004
1
--- SConstruct.orig	Tue Aug  7 08:35:47 2007
2
+++ SConstruct	Fri Apr 27 12:47:07 2007
2
+++ SConstruct	Tue Aug  7 21:46:43 2007
3
@@ -53,8 +53,10 @@
3
@@ -55,8 +55,10 @@
4
 env.make_so = None
4
 env.make_so = None
5
 env.detect = detect.Detect()
5
 env.detect = detect.Detect()
6
 
6
 
Lines 12-23 Link Here
12
 	env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
12
 	env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
13
 	env['ENV']['HOME'] = os.environ['HOME']
13
 	env['ENV']['HOME'] = os.environ['HOME']
14
 
14
 
15
@@ -87,7 +89,7 @@
15
@@ -87,14 +89,14 @@
16
 env.optimize_resampler_hack=0
16
 	env.Append(CXXFLAGS=['-DNEED_GMP']);
17
 	env.Append(LIBS=['-lgmp']);
18
 if (env.detect.have_libaudiofile):
19
-	env.Append(LIBS=['-laudiofile']);
20
+	env.Append(LIBS=['audiofile']);
21
 	env.Append(CXXFLAGS=['-DHAVE_LIBAUDIOFILE']);
22
 if (env.detect.need_limit_macros_define) :
23
 	env.Append(CXXFLAGS=['-D__STDC_LIMIT_MACROS']);
24
 if (env.detect.have_gnu_basename) :
25
 	env.Append(CXXFLAGS=['-DHAVE_GNU_BASENAME']);
26
-if (env.detect.have_xpg_basename) :
27
-	env.Append(CXXFLAGS=['-DHAVE_XPG_BASENAME']);
28
+#if (env.detect.have_xpg_basename) :
29
+#	env.Append(CXXFLAGS=['-DHAVE_XPG_BASENAME']);
30
 if (env.detect.have_stdint_h) :
31
 	env.Append(CXXFLAGS=['-DHAVE_STDINT_H']);
32
 if (env.detect.have_msint) :
33
@@ -103,7 +105,7 @@
34
 	env.Append(CXXFLAGS=['-DHAVE_MMAP']);
35
 if (env.detect.have_madvise) :
36
 	env.Append(CXXFLAGS=['-DHAVE_MADVISE']);
37
-env.Append(CXXFLAGS=['-g','-Wall']);
38
+env.Append(CXXFLAGS="%%CXXFLAGS%% %%PTHREAD_CFLAGS%%");
39
 
40
 if os.environ.has_key('USE_STACK_CHECK'):
41
 	env.Append(CXXFLAGS=['-fstack-check']);
42
@@ -159,7 +161,8 @@
43
 
44
 
45
 
46
-env.Append(LIBS=['z','m','pthread']);
47
+env.Append(LIBS=['z','m']);
48
+env.Append(LINKFLAGS=["%%PTHREAD_LIBS%%"]);
49
 
17
 
50
 
18
 if (env['optimize']):
19
-	env.Append(CXXFLAGS=['-O3','-ffast-math']);
20
+	env.Append(CXXFLAGS="%%CFLAGS%%");
21
 	env.optimize_resampler_hack=0
22
 
51
 
23
 profile=0;
(-)audio/cheesetracker/files/patch-cheesetracker-trackercore-saver.cpp (-14 lines)
Lines 1-14 Link Here
1
--- cheesetracker/trackercore/saver.cpp.orig	Thu Apr 12 00:12:30 2007
2
+++ cheesetracker/trackercore/saver.cpp	Thu Apr 12 00:13:52 2007
3
@@ -35,11 +35,8 @@
4
 
5
 #include "saver.h"
6
 
7
-namespace Audio {
8
-
9
 
10
 Saver::Saver(){
11
 }
12
 Saver::~Saver(){
13
 }
14
-}; // end of namespace declaration
(-)audio/cheesetracker/files/patch-common-components-audio-resampler_manager.h (-11 lines)
Lines 1-11 Link Here
1
--- common/components/audio/resampler_manager.h.orig	Thu Apr 12 00:03:58 2007
2
+++ common/components/audio/resampler_manager.h	Thu Apr 12 00:04:14 2007
3
@@ -34,7 +34,7 @@
4
 
5
 public:
6
 
7
-	static Resampler_Manager * Resampler_Manager::get_resampler_manager();
8
+	static Resampler_Manager * get_resampler_manager();
9
 	int get_resampler_count();
10
 	Resampler * get_resampler(int p_index);
11
 
(-)audio/cheesetracker/files/patch-common-components-data-property_bridges.h (-11 lines)
Lines 1-11 Link Here
1
--- common/components/data/property_bridges.h.orig	Wed Apr 11 23:57:19 2007
2
+++ common/components/data/property_bridges.h	Thu Apr 12 00:02:25 2007
3
@@ -41,7 +41,7 @@
4
   */
5
 
6
   #define BRIDGE_COPY_VALUE(T) \
7
-	virtual bool T::copy_value(const Property_Bridge& rvalue) {\
8
+	virtual bool copy_value(const Property_Bridge& rvalue) {\
9
 		T* rcast = dynamic_cast<T*>((T*)&rvalue);\
10
 		if (rcast) {\
11
 			set(rcast->get());\
(-)audio/cheesetracker/files/patch-common-drivers-posix-sound_driver_jack.h (-11 lines)
Lines 1-11 Link Here
1
--- common/drivers/posix/sound_driver_jack.h.orig	Thu Apr 12 00:09:04 2007
2
+++ common/drivers/posix/sound_driver_jack.h	Thu Apr 12 00:09:21 2007
3
@@ -72,7 +72,7 @@
4
 
5
 	int jack_callback_nframes;
6
 
7
-	Sound_Driver::Status Sound_Driver_JACK::process();
8
+	Sound_Driver::Status process();
9
 
10
         static int process_jack_callback(jack_nframes_t nframes,void *arg);
11
         static int jack_set_mixfreq(jack_nframes_t nframes,void *arg);
(-)audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp (-4 / +4 lines)
Lines 1-5 Link Here
1
--- common/drivers/posix/sound_driver_jack.cpp.orig	Wed Mar 28 00:43:48 2007
1
--- common/drivers/posix/sound_driver_jack.cpp.orig	Fri Aug  3 16:07:43 2007
2
+++ common/drivers/posix/sound_driver_jack.cpp	Wed Mar 28 00:44:18 2007
2
+++ common/drivers/posix/sound_driver_jack.cpp	Sun Aug  5 22:11:52 2007
3
@@ -225,12 +225,12 @@
3
@@ -225,12 +225,12 @@
4
 
4
 
5
 	//printf("JACK: Connect Ports...\n");
5
 	//printf("JACK: Connect Ports...\n");
Lines 8-17 Link Here
8
+	if (jack_connect (client, jack_port_name (output_port_l), "oss:playback_1")) {
8
+	if (jack_connect (client, jack_port_name (output_port_l), "oss:playback_1")) {
9
 		ERROR("cannot connect output ports\n");
9
 		ERROR("cannot connect output ports\n");
10
 		//jack_client_close (client);
10
 		//jack_client_close (client);
11
 		//return FUNCTION_FAILED;
11
 		//return FUNCTION_FAILURE;
12
 	}
12
 	}
13
-	if (jack_connect (client, jack_port_name (output_port_r), "alsa_pcm:playback_2")) {
13
-	if (jack_connect (client, jack_port_name (output_port_r), "alsa_pcm:playback_2")) {
14
+	if (jack_connect (client, jack_port_name (output_port_r), "oss:playback_2")) {
14
+	if (jack_connect (client, jack_port_name (output_port_r), "oss:playback_2")) {
15
 		ERROR("cannot connect output ports\n");
15
 		ERROR("cannot connect output ports\n");
16
 		//jack_client_close (client);
16
 		//jack_client_close (client);
17
 		//return FUNCTION_FAILED;
17
 		//return FUNCTION_FAILURE;
(-)audio/cheesetracker/files/patch-detect.py (-24 / +32 lines)
Lines 1-6 Link Here
1
--- detect.py.orig	Fri Apr 23 05:21:08 2004
1
--- detect.py.orig	Mon Aug  6 21:04:11 2007
2
+++ detect.py	Wed Mar 28 22:49:07 2007
2
+++ detect.py	Tue Aug  7 22:31:44 2007
3
@@ -49,35 +49,11 @@
3
@@ -104,35 +104,11 @@
4
 
4
 
5
 def check_libdl(libdata):
5
 def check_libdl(libdata):
6
 
6
 
Lines 38-46 Link Here
38
-	return 1;
38
-	return 1;
39
+	return 0;
39
+	return 0;
40
 
40
 
41
 def check_alsa(libdata):
41
 def check_need_gmp(libdata):
42
 	print "Checking if GMP is needed...",
43
@@ -208,19 +184,14 @@
44
 
45
 def check_libaudiofile(libdata):
46
 	print "Checking for libaudiofile...",
47
-	res = check_cpp_compile(
48
-		"#include <audiofile.h>\n" +
49
-		"int main() {\n" +
50
-		"	afNewFileSetup();\n" +
51
-		"	return 0;\n" +
52
-		"}\n", "-laudiofile -lm");
53
-	if(res == 0):
54
+	errorval=os.system("pkg-config audiofile --modversion");
55
+	if(errorval):
56
 		print " no. Access to lots of file formats is lost.";
57
 		libdata.have_libaudiofile=0;
58
-		return 0;
59
+		return 1;
60
 	print "Yes.";
61
 	libdata.have_libaudiofile=1;
62
-	return 1;
63
+	return 0;
42
 
64
 
43
@@ -148,6 +124,7 @@
65
 def check_mmap(libdata):
66
 	print "Checking for mmap...",
67
@@ -401,6 +372,7 @@
44
 
68
 
45
 	#list of dirs I can test..
69
 	#list of dirs I can test..
46
 	qt_unix_library_dirs = [\
70
 	qt_unix_library_dirs = [\
Lines 48-54 Link Here
48
 		"",\
72
 		"",\
49
 		"/usr/lib",\
73
 		"/usr/lib",\
50
 		"/usr/X11R6/lib",\
74
 		"/usr/X11R6/lib",\
51
@@ -158,6 +135,7 @@
75
@@ -411,6 +383,7 @@
52
 	];
76
 	];
53
 
77
 
54
 	qt_unix_bin_dirs = [\
78
 	qt_unix_bin_dirs = [\
Lines 56-62 Link Here
56
                 "",\
80
                 "",\
57
 		"/usr/bin",\
81
 		"/usr/bin",\
58
 		"/usr/X11R6/bin",\
82
 		"/usr/X11R6/bin",\
59
@@ -168,6 +146,7 @@
83
@@ -421,6 +394,7 @@
60
 	];
84
 	];
61
 
85
 
62
 	qt_unix_include_dirs = [\
86
 	qt_unix_include_dirs = [\
Lines 64-70 Link Here
64
 		"/usr/include",\
88
 		"/usr/include",\
65
 		"/usr/include/qt3",\
89
 		"/usr/include/qt3",\
66
 		"/usr/X11R6/include",\
90
 		"/usr/X11R6/include",\
67
@@ -271,7 +250,10 @@
91
@@ -524,7 +498,10 @@
68
 
92
 
69
 	print "Looking for QT 3.x 'moc' Binary:";
93
 	print "Looking for QT 3.x 'moc' Binary:";
70
 
94
 
Lines 76-94 Link Here
76
 
100
 
77
         for x in qt_unix_bin_dirs:
101
         for x in qt_unix_bin_dirs:
78
 		if (not qt_lib_found):
102
 		if (not qt_lib_found):
79
@@ -299,7 +281,6 @@
80
        		libdata.moc_bin=command;
81
 		break;
82
 
83
-
84
         if (not qt_found):
85
 		print("I Couldnt find QT in your system :(\n");
86
 		print("If you think it is actually installed, you could try the following:\n");
87
@@ -312,7 +293,6 @@
88
 	else:
89
 		print("QT was found!\n");
90
 		return 0;
91
-
92
 
93
 
94
 def check_system(libdata):
(-)audio/cheesetracker/pkg-descr (-1 / +1 lines)
Lines 1-4 Link Here
1
CheeseTracker is intended to be an Impulse Tracker clone. Yet, even when
1
CheeseTracker is intended to be an Impulse Tracker clone. Yet, even when
2
some features are missing, It should be perfectly usable.
2
some features are missing, It should be perfectly usable.
3
3
4
WWW: http://reduz.com.ar/cheesetracker/
4
WWW: http://cheesetracker.sourceforge.net/
(-)audio/cheesetracker/pkg-plist (-6 lines)
Lines 1-6 Link Here
1
bin/cheesetracker_qt
2
%%PORTDOCS%%%%EXAMPLESDIR%%/beek-dolphinisland.it
3
%%PORTDOCS%%%%EXAMPLESDIR%%/ll-globule.it
4
%%PORTDOCS%%%%EXAMPLESDIR%%/reduz-maschizo.it
5
%%PORTDOCS%%%%EXAMPLESDIR%%/xerxes-mfc.xm
6
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%

Return to bug 115389