ports/147755: Update port: audio/rosegarden to 10.04.2
Stas Timokhin
devel at stasyan.com
Thu Jun 10 05:30:07 UTC 2010
>Number: 147755
>Category: ports
>Synopsis: Update port: audio/rosegarden to 10.04.2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 10 05:30:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Stas Timokhin
>Release: 8.0-release
>Organization:
None
>Environment:
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2009-11-23 01:49:29.000000000 +0600
+++ Makefile 2010-06-09 21:16:13.000000000 +0700
@@ -2,37 +2,34 @@
# Date created: 04 Aug 1996
# Whom: shanee at augusta.de
#
-# $FreeBSD: ports/audio/rosegarden/Makefile,v 1.30 2009/11/22 19:49:29 pav Exp $
+# $FreeBSD$
#
PORTNAME= rosegarden
-PORTVERSION= 2.1.2
-PORTREVISION= 3
+PORTVERSION= 10.04.2
CATEGORIES= audio
-MASTER_SITES= http://www.cannam.demon.co.uk/rosegarden/distribution/
-DISTNAME= ${PORTNAME}-2.1pl2
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/10.04/
MAINTAINER= ports at FreeBSD.org
COMMENT= The Rosegarden Editor and Sequencer suite
-BUILD_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi
-RUN_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi
-
-USE_XORG= xaw
-USE_AUTOTOOLS= autoconf:213
-CONFIGURE_ARGS= --with-tclincl=${LOCALBASE}/include/tcl8.2
-MAKE_JOBS_UNSAFE= yes
-
-post-patch:
- @${CP} ${FILESDIR}/rosegarden ${WRKSRC}/rosegarden.sh
-.for file in Rosegarden rosegarden.sh
- @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
-.endfor
-
-do-install:
- @( \
- cd ${WRKSRC} ; ${SETENV} PREFIX="${PREFIX}" ./do-install \
- )
- ${INSTALL_SCRIPT} ${WRKSRC}/rosegarden.sh ${PREFIX}/bin/rosegarden
+BUILD_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi \
+ dssi_osc_update:${PORTSDIR}/audio/dssi \
+ makedepend:${PORTSDIR}/devel/makedepend
+RUN_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi \
+ dssi_osc_update:${PORTSDIR}/audio/dssi
+LIB_DEPENDS+= lrdf.2:${PORTSDIR}/textproc/liblrdf \
+ fftw3.5:${PORTSDIR}/math/fftw3 \
+ fftw3f.5:${PORTSDIR}/math/fftw3-float \
+ asound.2:${PORTSDIR}/audio/alsa-lib
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_QT_VER= 4
+QT_COMPONENTS= gui xml network corelib sql qt3support rcc moc uic linguist
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV+= QTLIBDIR=${QT_LIBDIR} LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+GNU_CONFIGURE= yes
.include <bsd.port.mk>
--- distinfo.orig 2005-11-24 05:29:43.000000000 +0600
+++ distinfo 2010-06-09 12:10:30.000000000 +0700
@@ -1,3 +1,3 @@
-MD5 (rosegarden-2.1pl2.tar.gz) = 994a0d35a68817abc8fa7882d12b4929
-SHA256 (rosegarden-2.1pl2.tar.gz) = cc7cd2e2104043e2f3c228c0a77f6fb50c40a0bf937169cccfd446f5c13f7a31
-SIZE (rosegarden-2.1pl2.tar.gz) = 607980
+MD5 (rosegarden-10.04.2.tar.bz2) = e961a6f1deb2f57c2ed9dd7f1bc71a94
+SHA256 (rosegarden-10.04.2.tar.bz2) = 3bf680fa117553997f476c48b252b50f5ccbc745c9cdfd4d3fb168496b86332f
+SIZE (rosegarden-10.04.2.tar.bz2) = 5909808
--- pkg-plist.orig 1999-10-11 05:24:25.000000000 +0700
+++ pkg-plist 2010-06-09 13:33:16.000000000 +0700
@@ -1,24 +1,28 @@
bin/rosegarden
-bin/rosegarden-bin
-lib/rosegarden/bin/editor
-lib/rosegarden/bin/sequencer
-lib/rosegarden/example/glazunov.rose
-lib/rosegarden/synth-patches/std.sb
-lib/rosegarden/synth-patches/drums.sb
-lib/rosegarden/help/rosehelp.hnx
-lib/rosegarden/help/rosehelp.info
-lib/rosegarden/petal/Petal.so
-lib/rosegarden/petal/Petal.tcl
-lib/rosegarden/petal/PetalEditor.tcl
-lib/rosegarden/petal/PetalMidi.tcl
-lib/rosegarden/petal/pkgIndex.tcl
-lib/rosegarden/rosepetal-filters/harmonizer.tcl
-lib/rosegarden/rosepetal-filters/pattern.tcl
-lib/X11/app-defaults/Rosegarden
- at dirrm lib/rosegarden/example
- at dirrm lib/rosegarden/help
- at dirrm lib/rosegarden/bin
- at dirrm lib/rosegarden/petal
- at dirrm lib/rosegarden/rosepetal-filters
- at dirrm lib/rosegarden/synth-patches
- at dirrm lib/rosegarden
+share/applications/rosegarden.desktop
+share/icons/hicolor/16x16/mimetypes/audio-x-rosegarden-composition.png
+share/icons/hicolor/16x16/mimetypes/audio-x-rosegarden-device.png
+share/icons/hicolor/16x16/mimetypes/audio-x-rosegarden-project.png
+share/icons/hicolor/16x16/mimetypes/audio-x-rosegarden-template.png
+share/icons/hicolor/32x32/apps/rosegarden.png
+share/icons/hicolor/32x32/mimetypes/audio-x-rosegarden-composition.png
+share/icons/hicolor/32x32/mimetypes/audio-x-rosegarden-device.png
+share/icons/hicolor/32x32/mimetypes/audio-x-rosegarden-project.png
+share/icons/hicolor/32x32/mimetypes/audio-x-rosegarden-template.png
+share/icons/hicolor/64x64/mimetypes/audio-x-rosegarden-composition.png
+share/icons/hicolor/64x64/mimetypes/audio-x-rosegarden-device.png
+share/icons/hicolor/64x64/mimetypes/audio-x-rosegarden-project.png
+share/icons/hicolor/64x64/mimetypes/audio-x-rosegarden-template.png
+share/mime/packages/rosegarden.xml
+ at dirrmtry share/mime/packages
+ at dirrmtry share/mime
+ at dirrm share/icons/hicolor/64x64/mimetypes
+ at dirrm share/icons/hicolor/64x64
+ at dirrm share/icons/hicolor/32x32/mimetypes
+ at dirrm share/icons/hicolor/32x32/apps
+ at dirrm share/icons/hicolor/32x32
+ at dirrm share/icons/hicolor/16x16/mimetypes
+ at dirrm share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
+ at dirrmtry share/applications
--- files/patch-configure.orig 1970-01-01 07:00:00.000000000 +0700
+++ files/patch-configure 2010-06-09 12:39:18.000000000 +0700
@@ -0,0 +1,13 @@
+--- configure.orig 2010-06-09 12:33:23.000000000 +0700
++++ configure 2010-06-09 12:34:06.000000000 +0700
+@@ -4971,9 +4971,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+- LIBS="$LIBS -ldl"
+-else
+- as_fn_error "Failed to find required dl library" "$LINENO" 5
++ LIBS="$LIBS"
+ fi
+
+
--- files/rosegarden.orig 1999-10-11 05:24:23.000000000 +0700
+++ files/rosegarden 1970-01-01 07:00:00.000000000 +0700
@@ -1,2 +0,0 @@
-#! /bin/sh
-TCLLIBPATH="$TCLLIBPATH %%PREFIX%%/lib/rosegarden/petal" %%PREFIX%%/bin/rosegarden-bin
--- files/patch-aa.orig 2004-12-02 06:25:12.000000000 +0600
+++ files/patch-aa 1970-01-01 07:00:00.000000000 +0700
@@ -1,63 +0,0 @@
---- configure.in.orig Tue Sep 21 11:25:38 1999
-+++ configure.in Tue Nov 30 22:58:02 2004
-@@ -9,8 +9,8 @@
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
--dnl Checks for makedepend, uses /bin/true if not found
--AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
-+dnl Checks for makedepend, uses /usr/bin/true if not found
-+AC_PATH_PROG(MAKEDEPEND, makedepend, /usr/bin/true)
-
- AC_CANONICAL_SYSTEM
-
-@@ -67,11 +67,11 @@
-
- Petal=Petal
-
--AC_CHECK_HEADER(tcl.h, TCL_CHECK=1, TCL_CHECK=0)
-+TCL_CHECK=1
-
- if test $TCL_CHECK -eq 1
- then
-- AC_PATH_PROG(TCLSH, tclsh)
-+ AC_PATH_PROG(TCLSH, tclsh8.2)
- if test -n "$TCLSH"
- then
- # Check Tcl version:
-@@ -88,7 +88,7 @@
- then
- # Check for TclMIDI
- AC_CHECKING(if TclMIDI is installed)
-- TCL_MIDI_CHECK=`echo "package require tclmidi" | $TCLSH 2>&1`
-+ TCL_MIDI_CHECK=
- if test -n "$TCL_MIDI_CHECK"
- then
- Petal=""
-@@ -153,7 +153,7 @@
- *freebsd*)
- defines="-DNO_SYS_ERRLIST"
- AC_CHECK_HEADER(machine/soundcard.h, sound_system="-DSYSTEM_OSS")
-- extra_libs="-lmalloc"
-+ # extra_libs="-lmalloc"
- # LDFLAGS="-L/usr/lib -L/usr/X11R6/lib"
-
- PETAL_LD=ld
-@@ -181,6 +181,17 @@
-
- #x_includes="-I$x_includes"
- #x_libraries="-L$x_libraries"
-+
-+AC_MSG_CHECKING(Tcl include Path)
-+AC_ARG_WITH(tclincl,
-+ [ --with-tclincl Set tcl include Path],
-+ with_tclincl=$withval,
-+ with_tclincl=no)
-+AC_MSG_RESULT($with_tclincl)
-+
-+if test "$with_tclincl" != "no"; then
-+ PETAL_CFLAGS="${PETAL_CFLAGS} -I ${with_tclincl}"
-+fi
-
- AC_SUBST(rosegarden)
-
--- files/patch-ab.orig 2000-12-19 14:34:53.000000000 +0600
+++ files/patch-ab 1970-01-01 07:00:00.000000000 +0700
@@ -1,19 +0,0 @@
---- petal/Makefile.in.orig Wed Oct 8 07:40:55 1997
-+++ petal/Makefile.in Thu Dec 14 02:14:42 2000
-@@ -7,13 +7,13 @@
-
- pkgIndex.tcl : Petal.so Petal.tcl
- @echo "The error message for Petal.tcl is normal"
-- echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh
-+ echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh8.2
-
- petaleditor/pkgIndex.tcl : petaleditor/PetalEditor.tcl
-- cd petaleditor; make
-+ cd petaleditor; $(MAKE)
-
- petalmidi/pkgIndex.tcl : petalmidi/PetalMidi.tcl
-- cd petalmidi; make
-+ cd petalmidi; $(MAKE)
-
- Petal.so : Petal.o
- $(LD) $(LDFLAGS) Petal.o -o Petal.so
--- files/patch-ac.orig 1999-11-29 00:31:43.000000000 +0600
+++ files/patch-ac 1970-01-01 07:00:00.000000000 +0700
@@ -1,9 +0,0 @@
---- /tmp/rosegarden-2.1/petal/petaleditor/Makefile Sun Mar 2 20:03:35 1997
-+++ ./petal/petaleditor/Makefile Fri May 14 17:20:35 1999
-@@ -2,5 +2,5 @@
-
- pkgIndex.tcl : PetalEditor.tcl
- @echo "The error message for PetalEditor.tcl is normal"
-- echo "pkg_mkIndex . PetalEditor.tcl" | tclsh
-+ echo "pkg_mkIndex . PetalEditor.tcl" | tclsh8.2
-
--- files/patch-ad.orig 2000-12-19 14:34:53.000000000 +0600
+++ files/patch-ad 1970-01-01 07:00:00.000000000 +0700
@@ -1,77 +0,0 @@
---- do-install.orig Wed Oct 22 06:20:43 1997
-+++ do-install Wed Dec 13 03:31:28 2000
-@@ -1,34 +1,30 @@
- #!/bin/sh
-
--BINDIR=/usr/local/bin
--LIBDIR=/usr/local/lib
-+BINDIR=${PREFIX}/bin
-+LIBDIR=${PREFIX}/lib
-+APP=${PREFIX}/lib/X11/app-defaults
-
--install="sh ./install-sh"
--
--if [ ! -f ./bin/rosegarden ]; then
-- echo "You're supposed to build it first..."
-- exit 1
--fi
-+install=/usr/bin/install
-
- echo
- echo Rosegarden 2.1 basic install script
- echo
--echo 'Enter directory for the main rosegarden executable ['$BINDIR']'
--read newbin
--if [ t"$newbin" != t ]; then BINDIR="$newbin"; fi
--echo 'Enter directory to contain the rosegarden lib directory ['$LIBDIR']'
--read newlib
--if [ t"$newlib" != t ]; then LIBDIR="$newlib"; fi
--echo
--echo Thanks
--echo
-+# echo 'Enter directory for the main rosegarden executable ['$BINDIR']'
-+# read newbin
-+# if [ t"$newbin" != t ]; then BINDIR="$newbin"; fi
-+# echo 'Enter directory to contain the rosegarden lib directory ['$LIBDIR']'
-+# read newlib
-+# if [ t"$newlib" != t ]; then LIBDIR="$newlib"; fi
-+# echo
-+# echo Thanks
-+# echo
-
- ROSELIBDIR=$LIBDIR/rosegarden
-
- ( set -x
-
- $install -d $BINDIR
--$install -s -c ./bin/rosegarden $BINDIR
-+$install -s -c ./bin/rosegarden $BINDIR/rosegarden-bin
-
- $install -d $ROSELIBDIR/bin
- $install -s -c ./bin/sequencer $ROSELIBDIR/bin
-@@ -46,20 +42,20 @@
- $install -c -m 644 ./common/help/rosehelp.hnx $ROSELIBDIR/help
-
- $install -d $ROSELIBDIR/petal
--test -f ./petal/Petal.so && $install -m 644 ./petal/Petal.so $ROSELIBDIR/petal
-+test -f ./petal/Petal.so && $install -c -m 644 ./petal/Petal.so $ROSELIBDIR/petal
- $install -c ./petal/Petal.tcl $ROSELIBDIR/petal
- $install -c ./petal/petaleditor/PetalEditor.tcl $ROSELIBDIR/petal
- $install -c ./petal/petalmidi/PetalMidi.tcl $ROSELIBDIR/petal
-
--( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh )
-+( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh8.2 )
-
- $install -d $ROSELIBDIR/rosepetal-filters
- $install -c ./petal/harmonizer.tcl $ROSELIBDIR/rosepetal-filters
- $install -c ./petal/pattern.tcl $ROSELIBDIR/rosepetal-filters
-
--test -d $HOME/.. || exit 0 # not set
--test -f $HOME/Rosegarden && mv $HOME/Rosegarden $HOME/Rosegarden.SAVED
--$install -c -m 644 Rosegarden $HOME
-+
-+test -f $APP/Rosegarden && mv $APP/Rosegarden $APP/Rosegarden.SAVED
-+$install -c -m 644 Rosegarden $APP
-
- )
-
--- files/patch-ae.orig 1999-11-29 00:31:43.000000000 +0600
+++ files/patch-ae 1970-01-01 07:00:00.000000000 +0700
@@ -1,11 +0,0 @@
---- /tmp/rosegarden-2.1/petal/dump.tcl Mon Oct 20 19:23:58 1997
-+++ ./petal/dump.tcl Fri May 14 17:22:47 1999
-@@ -1,6 +1,6 @@
- #!/bin/sh
--# the next line restarts using tclsh \
--exec tclsh "$0" "$@"
-+# the next line restarts using tclsh8.0 \
-+exec tclsh8.2 "$0" "$@"
-
- package require "Petal"
- PetalInit
--- files/patch-ag.orig 1999-11-29 00:31:45.000000000 +0600
+++ files/patch-ag 1970-01-01 07:00:00.000000000 +0700
@@ -1,12 +0,0 @@
---- /tmp/rosegarden-2.1/petal/harmonizer.tcl Wed Oct 22 22:18:27 1997
-+++ ./petal/harmonizer.tcl Fri May 14 17:22:11 1999
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # FilterName: Harmonize
--# the next line restarts using tclsh \
--exec tclsh "$0" "$@"
-+# the next line restarts using tclsh8.2 \
-+exec tclsh8.2 "$0" "$@"
-
- # Trivial harmonizer
-
--- files/patch-ah.orig 1999-11-29 00:31:45.000000000 +0600
+++ files/patch-ah 1970-01-01 07:00:00.000000000 +0700
@@ -1,12 +0,0 @@
---- /tmp/rosegarden-2.1/petal/pattern.tcl Wed Oct 22 22:18:28 1997
-+++ ./petal/pattern.tcl Fri May 14 17:22:36 1999
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # FilterName: Instantiate Pattern
--# the next line restarts using tclsh \
--exec tclsh "$0" "$@"
-+# the next line restarts using tclsh8.2 \
-+exec tclsh8.2 "$0" "$@"
-
- # Pattern instantiator (very dumb)
- # Main staff is the pattern,
--- files/patch-ai.orig 2000-12-19 14:34:53.000000000 +0600
+++ files/patch-ai 1970-01-01 07:00:00.000000000 +0700
@@ -1,33 +0,0 @@
---- Rosegarden.orig Thu Oct 23 05:14:54 1997
-+++ Rosegarden Wed Dec 13 02:41:20 2000
-@@ -8,15 +8,15 @@
-
- !!! Paths, edit these
-
--Rosegarden*editorName: /usr/local/lib/rosegarden/bin/editor
--Rosegarden*sequencerName: /usr/local/lib/rosegarden/bin/sequencer
--Rosegarden*helpFile: /usr/local/lib/rosegarden/help/rosehelp.info
--Rosegarden*midiFmPatchFile: /usr/local/lib/rosegarden/synth-patches/std.sb
--Rosegarden*midiFmDrumPFile: /usr/local/lib/rosegarden/synth-patches/drums.sb
-+Rosegarden*editorName: %%PREFIX%%/lib/rosegarden/bin/editor
-+Rosegarden*sequencerName: %%PREFIX%%/lib/rosegarden/bin/sequencer
-+Rosegarden*helpFile: %%PREFIX%%/lib/rosegarden/help/rosehelp.info
-+Rosegarden*midiFmPatchFile: %%PREFIX%%/lib/rosegarden/synth-patches/std.sb
-+Rosegarden*midiFmDrumPFile: %%PREFIX%%/lib/rosegarden/synth-patches/drums.sb
-
- !!! directory for Petal filters. ~/.rosepetal-filters will also be searched
-
--Rosegarden*filtersDirectory: /usr/local/lib/rosegarden/rosepetal-filters
-+Rosegarden*filtersDirectory: %%PREFIX%%/lib/rosegarden/rosepetal-filters
-
- !!! this is the default directory used for file dialogs:
-
-@@ -24,7 +24,7 @@
-
- !!! this is for the sequencer's "Play through Slave":
-
--Rosegarden*externalPlayer: /usr/local/bin/xplaymidi
-+Rosegarden*externalPlayer: %%PREFIX%%/bin/xplaymidi
-
- !!! midi device location
- !!! for OSS this is normally /dev/sequencer, for ZILOG it's
--- files/patch-aj.orig 1999-11-29 00:31:46.000000000 +0600
+++ files/patch-aj 1970-01-01 07:00:00.000000000 +0700
@@ -1,9 +0,0 @@
---- /tmp/rosegarden-2.1/petal/petalmidi/Makefile Sun Mar 2 20:03:37 1997
-+++ ./petal/petalmidi/Makefile Fri May 14 17:24:26 1999
-@@ -2,5 +2,5 @@
-
- pkgIndex.tcl : PetalMidi.tcl
- @echo "The error message for PetalMidi.tcl is normal"
-- echo "pkg_mkIndex . PetalMidi.tcl" | tclsh
-+ echo "pkg_mkIndex . PetalMidi.tcl" | tclsh8.2
-
--- files/patch-ak.orig 1999-10-11 05:24:24.000000000 +0700
+++ files/patch-ak 1970-01-01 07:00:00.000000000 +0700
@@ -1,15 +0,0 @@
-Index: mapper/src/Mapper_OSS.c
-@@ -964,6 +964,13 @@
-
- BEGIN("Mapper_ReadEvent");
-
-+#ifdef __FreeBSD__
-+ /* on FreeBSD the read() will block when there is no data available... */
-+ out = 0;
-+ ioctl(seqfd, SNDCTL_SEQ_GETINCOUNT, &out);
-+ if (!out)
-+ RETURN_BOOL(False);
-+#endif
- if ( ( out = read(seqfd, &InBytes, sizeof(InBytes)) ) <= 0 )
- RETURN_BOOL(False);
-
--- files/patch-al.orig 1999-10-11 05:24:25.000000000 +0700
+++ files/patch-al 1970-01-01 07:00:00.000000000 +0700
@@ -1,10 +0,0 @@
-Index: include/Mapper_OSS.h
-@@ -4,7 +4,7 @@
- #undef MIDI_PITCH_BEND
- #endif
-
--#ifdef SYSTEM_FREEBSD || defined (__FreeBSD__)
-+#if defined(SYSTEM_FREEBSD) || defined (__FreeBSD__)
- #include <machine/soundcard.h>
- #elif SYSTEM_OSS
- #include <sys/soundcard.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list