- Update MASTER_SITES

- Support PREFIX properly - Fix configure error under XFree86 4.x PR: 23621 Submitted by: Ports Furry No response from: maintainer
svn path=/head/; revision=36089
2024-10-20 20:09:11 +00:00 · 2000-12-19 08:34:53 +00:00 · 2000-12-19 08:34:53 +00:00 · 2f6fb4ef8c · 2021-03-31 03:12:20 +00:00
commit 2f6fb4ef8c
parent 79774bd82d
6 changed files with 68 additions and 70 deletions
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@ -8,29 +8,29 @@
 PORTNAME=	rosegarden
 PORTVERSION=	2.1.2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.all-day-breakfast.com/rosegarden/patches/
+MASTER_SITES=	http://www.cannam.demon.co.uk/rosegarden/distribution/
 DISTNAME=	${PORTNAME}-2.1pl2

 MAINTAINER=	shanee@augusta.de

-BUILD_DEPENDS=	${LOCALBASE}/lib/tclmidi/tclmidi31.so:$(PORTSDIR)/audio/tclmidi
-RUN_DEPENDS=	${LOCALBASE}/lib/tclmidi/tclmidi31.so:$(PORTSDIR)/audio/tclmidi
+BUILD_DEPENDS=	${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi
+RUN_DEPENDS=	${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi

-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
 USE_X_PREFIX=	yes
-CONFIGURE_ARGS=	--with-tclincl=${LOCALBASE}/include/tcl8.2/
-CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib"
+USE_AUTOCONF=	yes
+CONFIGURE_ENV=	MAKEDEPEND=${TRUE}
+CONFIGURE_ARGS=	--with-tclincl=${LOCALBASE}/include/tcl8.2
+
+post-patch:
+	@${CP} ${FILESDIR}/rosegarden ${WRKSRC}/rosegarden.sh
+.for file in Rosegarden rosegarden.sh
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
+.endfor

 do-install:
-	@${MKDIR} ${PREFIX}/lib/X11/app-defaults
 	@( \
 	 cd ${WRKSRC} ; ${SETENV} PREFIX="${PREFIX}" ./do-install \
 	)
-
-post-install:
-	${MV} ${PREFIX}/bin/rosegarden ${PREFIX}/bin/rosegarden-bin
-	${SED} s-%%PREFIX%%-${PREFIX}-g ${FILESDIR}/rosegarden >${WRKDIR}/rosegarden
-	${INSTALL_SCRIPT} ${WRKDIR}/rosegarden ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/rosegarden.sh ${PREFIX}/bin/rosegarden

 .include <bsd.port.mk>
--- a/audio/rosegarden/files/patch-aa
+++ b/audio/rosegarden/files/patch-aa
@ -1,21 +1,6 @@
--- configure.in.orig	Wed Oct 15 13:42:59 1997
-+++ configure.in	Sat Sep 18 16:15:13 1999
-@@ -4,6 +4,14 @@
- 
- AC_CONFIG_HEADER(config.h)
- 
-+AC_ARG_WITH(tcl,
-+    [--with-tclincl        Set tcl iclude Path],     
-+    [ with_tcl=$withval ],   
-+    [ with_tcl=/usr/local/include ],   
-+)
-+
-+CFLAGS="${CFLAGS} -I ${with_tcl}"
-+
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_LN_S
-@@ -67,11 +75,11 @@
+--- configure.in.orig	Tue Sep 21 20:25:38 1999
+++ configure.in	Thu Dec 14 02:14:00 2000
+@@ -67,11 +67,11 @@
 
 Petal=Petal
 
@ -29,7 +14,7 @@
      if test -n "$TCLSH"
      then
 	# Check Tcl version:
-@@ -88,7 +96,7 @@
+@@ -88,7 +88,7 @@
 	then
 		# Check for TclMIDI
 		AC_CHECKING(if TclMIDI is installed)
@ -38,14 +23,30 @@
 		if test -n "$TCL_MIDI_CHECK"
 		then
 			Petal=""
-@@ -153,8 +161,8 @@
+@@ -153,7 +153,7 @@
 	*freebsd*)
 	defines="-DNO_SYS_ERRLIST"
 	AC_CHECK_HEADER(machine/soundcard.h, sound_system="-DSYSTEM_OSS")
 -	extra_libs="-lmalloc"
-	# LDFLAGS="-L/usr/lib -L/usr/X11R6/lib"
 +	# extra_libs="-lmalloc"
-+	LDFLAGS="-L/usr/lib -L/usr/X11R6/lib"
+ 	# LDFLAGS="-L/usr/lib -L/usr/X11R6/lib"
 
 	PETAL_LD=ld
- 	PETAL_CFLAGS="-fPIC"
+@@ -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)
+ 
--- a/audio/rosegarden/files/patch-ab
+++ b/audio/rosegarden/files/patch-ab
@ -1,6 +1,6 @@
--- /tmp/rosegarden-2.1/petal/Makefile.in	Sat Oct 18 11:43:27 1997
-+++ ./petal/Makefile.in	Fri May 14 17:29:54 1999
-@@ -7,7 +7,7 @@
+--- 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"
@ -8,13 +8,12 @@
 +	echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh8.2
 
 petaleditor/pkgIndex.tcl : petaleditor/PetalEditor.tcl
- 	cd petaleditor; make
-@@ -19,7 +19,7 @@
+-	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
- 
- Petal.o : Petal.c
-	$(CC) $(CFLAGS) -c -o Petal.o Petal.c
-+	$(CC) $(CFLAGS) -I/usr/local/include -c -o Petal.o Petal.c
- 
- clean :
- 	rm -f Petal.o Petal.so
--- a/audio/rosegarden/files/patch-ad
+++ b/audio/rosegarden/files/patch-ad
@ -1,5 +1,6 @@
-Index: do-install
-@@ -1,27 +1,23 @@
+--- 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
@ -40,6 +41,14 @@ Index: do-install
 
 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
 
--- a/audio/rosegarden/files/patch-af
+++ b/audio/rosegarden/files/patch-af
@ -1,11 +0,0 @@
--- /tmp/rosegarden-2.1/petal/Petal.c	Sun Mar  2 20:03:31 1997
-+++ ./petal/Petal.c	Fri May 14 17:25:50 1999
-@@ -2,7 +2,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <string.h>
-#include <tcl.h>
-+#include <tcl8.2/tcl.h>
- 
- #define NB_MODES 7
- #define NB_TONALITIES 17 /* names, actually */
--- a/audio/rosegarden/files/patch-ai
+++ b/audio/rosegarden/files/patch-ai
@ -1,5 +1,5 @@
--- /tmp/rosegarden-2.1/Rosegarden	Wed Oct 22 22:16:41 1997
-+++ ./Rosegarden	Fri May 14 19:58:16 1999
+--- Rosegarden.orig	Thu Oct 23 05:14:54 1997
+++ Rosegarden	Wed Dec 13 02:41:20 2000
@@ -8,15 +8,15 @@
 
 !!! Paths, edit these
@ -9,16 +9,16 @@
 -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:		/usr/X11R6/lib/rosegarden/bin/editor
-+Rosegarden*sequencerName:	/usr/X11R6/lib/rosegarden/bin/sequencer
-+Rosegarden*helpFile:		/usr/X11R6/lib/rosegarden/help/rosehelp.info
-+Rosegarden*midiFmPatchFile:	/usr/X11R6/lib/rosegarden/synth-patches/std.sb
-+Rosegarden*midiFmDrumPFile:	/usr/X11R6/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:	/usr/X11R6/lib/rosegarden/rosepetal-filters
+Rosegarden*filtersDirectory:	%%PREFIX%%/lib/rosegarden/rosepetal-filters
 
 !!! this is the default directory used for file dialogs:
 
@ -27,7 +27,7 @@
 !!! this is for the sequencer's "Play through Slave":
 
 -Rosegarden*externalPlayer:	/usr/local/bin/xplaymidi
-+Rosegarden*externalPlayer:	/usr/X11R6/bin/xplaymidi
+Rosegarden*externalPlayer:	%%PREFIX%%/bin/xplaymidi
 
 !!! midi device location
 !!! for OSS this is normally /dev/sequencer, for ZILOG it's