ports/122424: Port cleanup: audio/tclmidi
Ganael Laplanche
ganael.laplanche at martymac.com
Thu Apr 3 18:10:01 UTC 2008
>Number: 122424
>Category: ports
>Synopsis: Port cleanup: audio/tclmidi
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 03 18:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Ganael Laplanche
>Release: 7.0-STABLE
>Organization:
http://contribs.martymac.com
>Environment:
FreeBSD home.martymac.com 7.0-STABLE FreeBSD 7.0-STABLE #12: Wed Apr 2 20:57:23 CEST 2008 martymac at home.martymac.com:/usr/obj/usr/src/sys/MYKERNEL amd64
>Description:
This is a maintenance patch for audio/tclmidi :
- Add a new mirror on monash.edu.au
- Revert to ARCH instead of MACHINE_ARCH (5.4-RELEASE has been released :p)
- Rename files/patch-aa (etc) to standard files/patch-file-name
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -aurN tclmidi.orig/Makefile tclmidi/Makefile
--- tclmidi.orig/Makefile 2008-04-03 16:41:54.000000000 +0200
+++ tclmidi/Makefile 2008-04-03 16:49:33.000000000 +0200
@@ -8,7 +8,8 @@
PORTNAME= tclmidi
PORTVERSION= 3.1
CATEGORIES= audio
-MASTER_SITES= ftp://ftp.cs.ruu.nl/pub/MIDI/PROGRAMS/
+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
@@ -32,8 +33,8 @@
.include <bsd.port.pre.mk>
-.if ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64"
-IGNORE= "ignored due to cast from pointer to integer of different size"
+.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
+IGNORE= ignored due to cast from pointer to integer of different size
.endif
.if ${OSVERSION} >= 502000
diff -aurN tclmidi.orig/files/patch-Makefile.in tclmidi/files/patch-Makefile.in
--- tclmidi.orig/files/patch-Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ tclmidi/files/patch-Makefile.in 1999-11-28 19:32:00.000000000 +0100
@@ -0,0 +1,29 @@
+--- 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
diff -aurN tclmidi.orig/files/patch-aa tclmidi/files/patch-aa
--- tclmidi.orig/files/patch-aa 2008-04-03 16:41:54.000000000 +0200
+++ tclmidi/files/patch-aa 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
---- 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
diff -aurN tclmidi.orig/files/patch-ab tclmidi/files/patch-ab
--- tclmidi.orig/files/patch-ab 2008-04-03 16:41:54.000000000 +0200
+++ tclmidi/files/patch-ab 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
---- 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
-
diff -aurN tclmidi.orig/files/patch-ac tclmidi/files/patch-ac
--- tclmidi.orig/files/patch-ac 2008-04-03 16:41:54.000000000 +0200
+++ tclmidi/files/patch-ac 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
---- 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;
-
diff -aurN tclmidi.orig/files/patch-configure tclmidi/files/patch-configure
--- tclmidi.orig/files/patch-configure 1970-01-01 01:00:00.000000000 +0100
+++ tclmidi/files/patch-configure 2004-03-29 08:57:33.000000000 +0200
@@ -0,0 +1,26 @@
+--- 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
+
diff -aurN tclmidi.orig/files/patch-smf-SMFTrack.cxx tclmidi/files/patch-smf-SMFTrack.cxx
--- tclmidi.orig/files/patch-smf-SMFTrack.cxx 1970-01-01 01:00:00.000000000 +0100
+++ tclmidi/files/patch-smf-SMFTrack.cxx 2003-05-14 03:57:55.000000000 +0200
@@ -0,0 +1,21 @@
+--- 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;
+
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list