Attachment #86055 for bug #122424

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




PORTNAME=	tclmidi
PORTVERSION=	3.1
CATEGORIES=	audio
MASTER_SITES=	ftp://ftp.cs.ruu.nl/pub/MIDI/PROGRAMS/ \
				http://ringtail.its.monash.edu.au/pub/midi/PROGRAMS/
# despite references on the homepage to ftp.xor.com, that server
# doesn't work - edwin 20021227



.include <bsd.port.pre.mk>

.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
IGNORE=		ignored due to cast from pointer to integer of different size
.endif

.if ${OSVERSION} >= 502000




--- Makefile.in.orig	Mon Nov  9 18:00:54 1998
+++ Makefile.in	Mon Nov  9 17:47:11 1998
@@ -11,7 +11,7 @@
 
 # The directory containing the Tcl library archive file appropriate
 # for this version of Tk:
-TCL_BIN_DIR = @TCL_BIN_DIR@
+TCL_BIN_DIR = ${LOCALBASE}/lib/tcl8.2
 
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
@@ -35,7 +35,7 @@
 VPATH = @srcdir@
 
 CFLAGS = @CFLAGS@ @DEFS@
-CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} \
+CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} -I${TCL_GENERIC_DIR} \
     -Idevice -Ievents -Irb -Ipatch -Ismf -Isong -I.
 
 TCLMFILES = tclmCmd.o tclmUtil.o tclmEvnt.o tclmPlay.o tclmPtch.o TclmIntp.o
@@ -101,7 +101,7 @@
 
 install: $(PROJ_LIB_NAME) $(SCRIPTS)
 	-mkdir -p $(prefix)$(libdir)/tclmidi
-	@INSTALL_DATA@ $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
+	@INSTALL_DATA@ -s $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
 	echo 'pkg_mkIndex $(prefix)$(libdir)/tclmidi \
 	    $(PROJECT)*${SHLIB_SUFFIX}' | @TCLSH_PATH@
 	cd man; $(MAKE) install




--- Makefile.in.orig	Mon Nov  9 18:00:54 1998
+++ Makefile.in	Mon Nov  9 17:47:11 1998
@@ -11,7 +11,7 @@
 
 # The directory containing the Tcl library archive file appropriate
 # for this version of Tk:
-TCL_BIN_DIR = @TCL_BIN_DIR@
+TCL_BIN_DIR = ${LOCALBASE}/lib/tcl8.2
 
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
@@ -35,7 +35,7 @@
 VPATH = @srcdir@
 
 CFLAGS = @CFLAGS@ @DEFS@
-CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} \
+CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} -I${TCL_GENERIC_DIR} \
     -Idevice -Ievents -Irb -Ipatch -Ismf -Isong -I.
 
 TCLMFILES = tclmCmd.o tclmUtil.o tclmEvnt.o tclmPlay.o tclmPtch.o TclmIntp.o
@@ -101,7 +101,7 @@
 
 install: $(PROJ_LIB_NAME) $(SCRIPTS)
 	-mkdir -p $(prefix)$(libdir)/tclmidi
-	@INSTALL_DATA@ $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
+	@INSTALL_DATA@ -s $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
 	echo 'pkg_mkIndex $(prefix)$(libdir)/tclmidi \
 	    $(PROJECT)*${SHLIB_SUFFIX}' | @TCLSH_PATH@
 	cd man; $(MAKE) install




--- configure.orig	Thu Oct 10 19:57:27 1996
+++ configure	Sun Mar 28 22:54:44 2004
@@ -1604,7 +1604,7 @@
 	        # Greg figured out how to use gcc instead of ld..
 		# -lgcc can be found in /usr/lib/gcc-lib/i486-linux/2.7.0/
 		# or something similar.
-	        SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc"
+	        SHLIB_LD_CXX="-lg++ -lstdc++ -lgcc"
 		DL_OBJS="tclLoadDld.o"
 		DL_LIBS="-ldld"
 		LD_FLAGS=""
@@ -1727,12 +1727,12 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-		SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc 2> /dev/null"
+		SHLIB_LD_CXX="-lstdc++ -lgcc 2> /dev/null"
 	
 else
   echo "$ac_t""no" 1>&6
 
-		SHLIB_LD_CXX="-Bstatic -lg++ -lgcc 2> /dev/null"
+		SHLIB_LD_CXX="-lg++ -lgcc 2> /dev/null"
 	
 fi
 




--- smf/SMFTrack.cxx.orig	Mon Aug  5 05:47:36 1996
+++ smf/SMFTrack.cxx	Wed May 14 03:51:51 2003
@@ -352,10 +352,17 @@
 	return (1);
 }
 
+#include <sys/param.h>
 ostream &
 operator<<(ostream &os, const SMFTrack &t)
 {
-	long i, prev_flags;
+#if __FreeBSD_version < 500000
+	long
+#else
+        std::_Ios_Fmtflags
+#endif
+             prev_flags;
+	long i;
 	int prev_width;
 	unsigned char *ptr;
 




--- configure.orig	Thu Oct 10 19:57:27 1996
+++ configure	Sun Mar 28 22:54:44 2004
@@ -1604,7 +1604,7 @@
 	        # Greg figured out how to use gcc instead of ld..
 		# -lgcc can be found in /usr/lib/gcc-lib/i486-linux/2.7.0/
 		# or something similar.
-	        SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc"
+	        SHLIB_LD_CXX="-lg++ -lstdc++ -lgcc"
 		DL_OBJS="tclLoadDld.o"
 		DL_LIBS="-ldld"
 		LD_FLAGS=""
@@ -1727,12 +1727,12 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-		SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc 2> /dev/null"
+		SHLIB_LD_CXX="-lstdc++ -lgcc 2> /dev/null"
 	
 else
   echo "$ac_t""no" 1>&6
 
-		SHLIB_LD_CXX="-Bstatic -lg++ -lgcc 2> /dev/null"
+		SHLIB_LD_CXX="-lg++ -lgcc 2> /dev/null"
 	
 fi
 




--- smf/SMFTrack.cxx.orig	Mon Aug  5 05:47:36 1996
+++ smf/SMFTrack.cxx	Wed May 14 03:51:51 2003
@@ -352,10 +352,17 @@
 	return (1);
 }
 
+#include <sys/param.h>
 ostream &
 operator<<(ostream &os, const SMFTrack &t)
 {
-	long i, prev_flags;
+#if __FreeBSD_version < 500000
+	long
+#else
+        std::_Ios_Fmtflags
+#endif
+             prev_flags;
+	long i;
 	int prev_width;
 	unsigned char *ptr;


Return to bug 122424

Lines 8-14 Link Here

(-)tclmidi/Makefile (-3 / +4 lines)
8	PORTNAME= tclmidi	8	PORTNAME= tclmidi
9	PORTVERSION= 3.1	9	PORTVERSION= 3.1
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ftp://ftp.cs.ruu.nl/pub/MIDI/PROGRAMS/	11	MASTER_SITES= ftp://ftp.cs.ruu.nl/pub/MIDI/PROGRAMS/ \
		12	http://ringtail.its.monash.edu.au/pub/midi/PROGRAMS/
12	# despite references on the homepage to ftp.xor.com, that server	13	# despite references on the homepage to ftp.xor.com, that server
13	# doesn't work - edwin 20021227	14	# doesn't work - edwin 20021227
14		15
Lines 32-39 Link Here
32		33
33	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
34		35
35	.if ${MACHINE_ARCH} == "ia64" \|\| ${MACHINE_ARCH} == "sparc64"	36	.if ${ARCH} == "ia64" \|\| ${ARCH} == "sparc64"
36	IGNORE= "ignored due to cast from pointer to integer of different size"	37	IGNORE= ignored due to cast from pointer to integer of different size
37	.endif	38	.endif
38		39
39	.if ${OSVERSION} >= 502000	40	.if ${OSVERSION} >= 502000

Line 0 Link Here

(-)tclmidi/files/patch-Makefile.in (+29 lines)
	1	--- Makefile.in.orig Mon Nov 9 18:00:54 1998
	2	+++ Makefile.in Mon Nov 9 17:47:11 1998
	3	@@ -11,7 +11,7 @@
	4
	5	# The directory containing the Tcl library archive file appropriate
	6	# for this version of Tk:
	7	-TCL_BIN_DIR = @TCL_BIN_DIR@
	8	+TCL_BIN_DIR = ${LOCALBASE}/lib/tcl8.2
	9
	10	#----------------------------------------------------------------
	11	# The information below is modified by the configure script when
	12	@@ -35,7 +35,7 @@
	13	VPATH = @srcdir@
	14
	15	CFLAGS = @CFLAGS@ @DEFS@
	16	-CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} \
	17	+CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} -I${TCL_GENERIC_DIR} \
	18	-Idevice -Ievents -Irb -Ipatch -Ismf -Isong -I.
	19
	20	TCLMFILES = tclmCmd.o tclmUtil.o tclmEvnt.o tclmPlay.o tclmPtch.o TclmIntp.o
	21	@@ -101,7 +101,7 @@
	22
	23	install: $(PROJ_LIB_NAME) $(SCRIPTS)
	24	-mkdir -p $(prefix)$(libdir)/tclmidi
	25	- @INSTALL_DATA@ $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
	26	+ @INSTALL_DATA@ -s $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
	27	echo 'pkg_mkIndex $(prefix)$(libdir)/tclmidi \
	28	$(PROJECT)*${SHLIB_SUFFIX}' \| @TCLSH_PATH@
	29	cd man; $(MAKE) install

Lines 1-29 Link Here

(-)tclmidi/files/patch-aa (-29 lines)
1	--- Makefile.in.orig Mon Nov 9 18:00:54 1998
2	+++ Makefile.in Mon Nov 9 17:47:11 1998
3	@@ -11,7 +11,7 @@
4
5	# The directory containing the Tcl library archive file appropriate
6	# for this version of Tk:
7	-TCL_BIN_DIR = @TCL_BIN_DIR@
8	+TCL_BIN_DIR = ${LOCALBASE}/lib/tcl8.2
9
10	#----------------------------------------------------------------
11	# The information below is modified by the configure script when
12	@@ -35,7 +35,7 @@
13	VPATH = @srcdir@
14
15	CFLAGS = @CFLAGS@ @DEFS@
16	-CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} \
17	+CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} -I${TCL_GENERIC_DIR} \
18	-Idevice -Ievents -Irb -Ipatch -Ismf -Isong -I.
19
20	TCLMFILES = tclmCmd.o tclmUtil.o tclmEvnt.o tclmPlay.o tclmPtch.o TclmIntp.o
21	@@ -101,7 +101,7 @@
22
23	install: $(PROJ_LIB_NAME) $(SCRIPTS)
24	-mkdir -p $(prefix)$(libdir)/tclmidi
25	- @INSTALL_DATA@ $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
26	+ @INSTALL_DATA@ -s $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi
27	echo 'pkg_mkIndex $(prefix)$(libdir)/tclmidi \
28	$(PROJECT)*${SHLIB_SUFFIX}' \| @TCLSH_PATH@
29	cd man; $(MAKE) install

Lines 1-26 Link Here

(-)tclmidi/files/patch-ab (-26 lines)
1	--- configure.orig Thu Oct 10 19:57:27 1996
2	+++ configure Sun Mar 28 22:54:44 2004
3	@@ -1604,7 +1604,7 @@
4	# Greg figured out how to use gcc instead of ld..
5	# -lgcc can be found in /usr/lib/gcc-lib/i486-linux/2.7.0/
6	# or something similar.
7	- SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc"
8	+ SHLIB_LD_CXX="-lg++ -lstdc++ -lgcc"
9	DL_OBJS="tclLoadDld.o"
10	DL_LIBS="-ldld"
11	LD_FLAGS=""
12	@@ -1727,12 +1727,12 @@
13	if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
14	echo "$ac_t""yes" 1>&6
15
16	- SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc 2> /dev/null"
17	+ SHLIB_LD_CXX="-lstdc++ -lgcc 2> /dev/null"
18
19	else
20	echo "$ac_t""no" 1>&6
21
22	- SHLIB_LD_CXX="-Bstatic -lg++ -lgcc 2> /dev/null"
23	+ SHLIB_LD_CXX="-lg++ -lgcc 2> /dev/null"
24
25	fi
26

Lines 1-21 Link Here

(-)tclmidi/files/patch-ac (-21 lines)
1	--- smf/SMFTrack.cxx.orig Mon Aug 5 05:47:36 1996
2	+++ smf/SMFTrack.cxx Wed May 14 03:51:51 2003
3	@@ -352,10 +352,17 @@
4	return (1);
5	}
6
7	+#include <sys/param.h>
8	ostream &
9	operator<<(ostream &os, const SMFTrack &t)
10	{
11	- long i, prev_flags;
12	+#if __FreeBSD_version < 500000
13	+ long
14	+#else
15	+ std::_Ios_Fmtflags
16	+#endif
17	+ prev_flags;
18	+ long i;
19	int prev_width;
20	unsigned char *ptr;
21

Line 0 Link Here

(-)tclmidi/files/patch-configure (+26 lines)
	1	--- configure.orig Thu Oct 10 19:57:27 1996
	2	+++ configure Sun Mar 28 22:54:44 2004
	3	@@ -1604,7 +1604,7 @@
	4	# Greg figured out how to use gcc instead of ld..
	5	# -lgcc can be found in /usr/lib/gcc-lib/i486-linux/2.7.0/
	6	# or something similar.
	7	- SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc"
	8	+ SHLIB_LD_CXX="-lg++ -lstdc++ -lgcc"
	9	DL_OBJS="tclLoadDld.o"
	10	DL_LIBS="-ldld"
	11	LD_FLAGS=""
	12	@@ -1727,12 +1727,12 @@
	13	if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
	14	echo "$ac_t""yes" 1>&6
	15
	16	- SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc 2> /dev/null"
	17	+ SHLIB_LD_CXX="-lstdc++ -lgcc 2> /dev/null"
	18
	19	else
	20	echo "$ac_t""no" 1>&6
	21
	22	- SHLIB_LD_CXX="-Bstatic -lg++ -lgcc 2> /dev/null"
	23	+ SHLIB_LD_CXX="-lg++ -lgcc 2> /dev/null"
	24
	25	fi
	26

Line 0 Link Here

(-)tclmidi/files/patch-smf-SMFTrack.cxx (+21 lines)
	1	--- smf/SMFTrack.cxx.orig Mon Aug 5 05:47:36 1996
	2	+++ smf/SMFTrack.cxx Wed May 14 03:51:51 2003
	3	@@ -352,10 +352,17 @@
	4	return (1);
	5	}
	6
	7	+#include <sys/param.h>
	8	ostream &
	9	operator<<(ostream &os, const SMFTrack &t)
	10	{
	11	- long i, prev_flags;
	12	+#if __FreeBSD_version < 500000
	13	+ long
	14	+#else
	15	+ std::_Ios_Fmtflags
	16	+#endif
	17	+ prev_flags;
	18	+ long i;
	19	int prev_width;
	20	unsigned char *ptr;
	21