summaryrefslogtreecommitdiff
path: root/www/ump
diff options
context:
space:
mode:
Diffstat (limited to 'www/ump')
-rw-r--r--www/ump/Makefile7
-rw-r--r--www/ump/distinfo2
-rw-r--r--www/ump/files/patch-timidity::Makefile.in10
-rw-r--r--www/ump/files/patch-ump::UnixShell.c24
4 files changed, 39 insertions, 4 deletions
diff --git a/www/ump/Makefile b/www/ump/Makefile
index c70a4513b746..5e05b7fb0c8d 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ump
PORTVERSION= 1.10
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.goice.co.jp/member/mo/timidity/dist/ \
http://www.geocities.com/SiliconValley/Lab/2826/1-10/ \
@@ -23,9 +24,11 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
RUN_DEPENDS= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ \
${X11BASE}/bin/mozilla:${PORTSDIR}/www/mozilla
-BZ2DIST= TiMidity++-2.10.4.tar.bz2
+BZ2DIST= TiMidity++-${TIMIDITY_VERSION}.tar.bz2
ZDIST= unix-sdk-3.0b5.tar.Z ump_with_volume.tar.Z timdiffs.tar.Z
+TIMIDITY_VERSION= 2.11.3
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-ump
USE_GMAKE= yes
@@ -35,7 +38,7 @@ WANT_ESOUND= yes
EXTRA_PATCHES= ${.CURDIR}/../../audio/timidity++/files/*
PKGDIR= ${.CURDIR}
DIST_SUBDIR= timidity
-WRKSRC= ${WRKDIR}/TiMidity++-2.10.4
+WRKSRC= ${WRKDIR}/TiMidity++-${TIMIDITY_VERSION}
# USE_MOTIF= yes
# CONFIGURE_ENV= MOTIFLIB="${MOTIFLIB}"
diff --git a/www/ump/distinfo b/www/ump/distinfo
index 0ddd9a5fbc0d..4b5a2002aab4 100644
--- a/www/ump/distinfo
+++ b/www/ump/distinfo
@@ -1,4 +1,4 @@
-MD5 (timidity/TiMidity++-2.10.4.tar.bz2) = 8e69753b7e71055e61aeb3c234048f1e
+MD5 (timidity/TiMidity++-2.11.3.tar.bz2) = 72f6624d467b61c69b8ec9ce002c21a8
MD5 (timidity/unix-sdk-3.0b5.tar.Z) = 1e43785d5697c60937e8d6236e7d7d7e
MD5 (timidity/ump_with_volume.tar.Z) = 73c429e79e23b2d43906dddc594cc53b
MD5 (timidity/timdiffs.tar.Z) = efe668b0f7093d21294d6b03cec37b85
diff --git a/www/ump/files/patch-timidity::Makefile.in b/www/ump/files/patch-timidity::Makefile.in
new file mode 100644
index 000000000000..cfe17564c63c
--- /dev/null
+++ b/www/ump/files/patch-timidity::Makefile.in
@@ -0,0 +1,10 @@
+--- timidity/Makefile.in.orig Fri Jan 18 07:43:16 2002
++++ timidity/Makefile.in Fri Feb 15 03:08:51 2002
+@@ -291,6 +291,7 @@
+ @ENABLE_W32GUI_TRUE@ $(top_builddir)/utils/libutils.a \
+ @ENABLE_W32GUI_TRUE@ $(top_builddir)/interface/w32g_res.res
+ @ENABLE_W32GUI_FALSE@timidity_DEPENDENCIES = \
++@ENABLE_W32GUI_FALSE@ $(SYSEXTRAS:.c=.o) \
+ @ENABLE_W32GUI_FALSE@ $(top_builddir)/interface/libinterface.a \
+ @ENABLE_W32GUI_FALSE@ $(top_builddir)/libarc/libarc.a \
+ @ENABLE_W32GUI_FALSE@ $(top_builddir)/libunimod/libunimod.a \
diff --git a/www/ump/files/patch-ump::UnixShell.c b/www/ump/files/patch-ump::UnixShell.c
index ad4ffba591ab..d14be21ca02d 100644
--- a/www/ump/files/patch-ump::UnixShell.c
+++ b/www/ump/files/patch-ump::UnixShell.c
@@ -1,4 +1,4 @@
---- ump/UnixShell.c.orig.1 Thu Nov 15 20:47:15 2001
+--- ump/UnixShell.c.orig Thu Nov 15 20:47:15 2001
+++ ump/UnixShell.c Thu Nov 15 20:50:37 2001
@@ -38,7 +38,7 @@
/*
@@ -9,6 +9,28 @@
#include <X11/Xlib.h> /* Xlib */
#include <X11/Intrinsic.h> /* Xt */
#include <X11/StringDefs.h> /* "callback" */
+--- ump/UnixShell.c.orig Fri Feb 15 02:42:28 2002
++++ ump/UnixShell.c Fri Feb 15 02:42:48 2002
+@@ -144,8 +144,8 @@
+ int argc = 0;
+
+ argv[argc++] = "timidity";
+-#ifdef AU_ALSA
+- argv[argc++] = "-Os";
++#ifdef AU_ESD
++ argv[argc++] = "-Oe";
+ #else
+ argv[argc++] = "-Od";
+ #endif
+@@ -151,7 +151,7 @@
+ #endif
+
+ if(timid_ump_rate <= 0)
+- argv[argc++] = eightKFlag ? "-s8000": "-s22050"; /* check if the user specified 8K rate */
++ argv[argc++] = eightKFlag ? "-s8000": "-s44100"; /* check if the user specified 8K rate */
+ else
+ {
+ sprintf(opt_rate, "-s%d", timid_ump_rate);
@@ -230,7 +230,7 @@
int loop; /* 0 means play only once, non-zero means loop forever */