4 files changed, 25 insertions, 36 deletions

diff --git a/www/ump/Makefile b/www/ump/Makefile
index 859e3a4cabfd..171f5c20ad4e 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	ump
 PORTVERSION=	1.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
-MASTER_SITES=	http://www.timidity.jp/dist/	\
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
 		http://www.geocities.com/SiliconValley/Lab/2826/1-10/	\
 		http://pubweb.bnl.gov/people/hoff/midi/1.10/	\
 		${MASTER_SITE_NETSCAPE}
@@ -22,24 +22,22 @@ PATCHFILES=	ump-patch-1.gz ump-patch-2.gz ump-patch-3.gz ump-patch-4.gz
 MAINTAINER=	llwang@infor.org
 COMMENT=	Unix MIDI Plugin based on TiMidity++
 
-RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++	\
-		${X11BASE}/lib/mozilla/mozilla-bin:${PORTSDIR}/www/mozilla
+RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++
 
 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
+TIMIDITY_VERSION=	2.13.2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ump
 USE_GMAKE=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_XPM=	yes
 WANT_GNOME=	yes
 # CONFIGURE_ARGS+=	--enable-motif
-EXTRA_PATCHES=	${.CURDIR}/../../audio/timidity++/files/*
+EXTRA_PATCHES=	${PORTSDIR}/audio/timidity++/files/*
 PKGDIR=		${.CURDIR}
-DIST_SUBDIR=	timidity
 WRKSRC=		${WRKDIR}/TiMidity++-${TIMIDITY_VERSION}
 
 # USE_MOTIF=	yes
@@ -85,6 +83,7 @@ do-build:
 	@cd ${WRKSRC}/ump; ${GMAKE} ump
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ump/ump.so ${X11BASE}/lib/browser_plugins
+	${MKDIR} ${PREFIX}/lib/browser_plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/ump/ump.so ${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.post.mk>
diff --git a/www/ump/distinfo b/www/ump/distinfo
index a5e37fa203f2..4bb9ddcd76d7 100644
--- a/www/ump/distinfo
+++ b/www/ump/distinfo
@@ -1,16 +1,16 @@
-MD5 (timidity/TiMidity++-2.11.3.tar.bz2) = 72f6624d467b61c69b8ec9ce002c21a8
-SIZE (timidity/TiMidity++-2.11.3.tar.bz2) = 964222
-MD5 (timidity/unix-sdk-3.0b5.tar.Z) = 1e43785d5697c60937e8d6236e7d7d7e
-SIZE (timidity/unix-sdk-3.0b5.tar.Z) = 1644129
-MD5 (timidity/ump_with_volume.tar.Z) = 73c429e79e23b2d43906dddc594cc53b
-SIZE (timidity/ump_with_volume.tar.Z) = 21887
-MD5 (timidity/timdiffs.tar.Z) = efe668b0f7093d21294d6b03cec37b85
-SIZE (timidity/timdiffs.tar.Z) = 22377
-MD5 (timidity/ump-patch-1.gz) = f9b2cfd46d53627664dbd63c36d7b693
-SIZE (timidity/ump-patch-1.gz) = 8964
-MD5 (timidity/ump-patch-2.gz) = 84f32eee04748f3d74f34b6e34081a43
-SIZE (timidity/ump-patch-2.gz) = 294
-MD5 (timidity/ump-patch-3.gz) = 3f00420b7d3898164403752c8571c55a
-SIZE (timidity/ump-patch-3.gz) = 266
-MD5 (timidity/ump-patch-4.gz) = c95fec937fc585347ded3dd912616d13
-SIZE (timidity/ump-patch-4.gz) = 3079
+MD5 (TiMidity++-2.13.2.tar.bz2) = a82ceeb2245e22f4de2b41da21eaee32
+SIZE (TiMidity++-2.13.2.tar.bz2) = 1581230
+MD5 (unix-sdk-3.0b5.tar.Z) = 1e43785d5697c60937e8d6236e7d7d7e
+SIZE (unix-sdk-3.0b5.tar.Z) = 1644129
+MD5 (ump_with_volume.tar.Z) = 73c429e79e23b2d43906dddc594cc53b
+SIZE (ump_with_volume.tar.Z) = 21887
+MD5 (timdiffs.tar.Z) = efe668b0f7093d21294d6b03cec37b85
+SIZE (timdiffs.tar.Z) = 22377
+MD5 (ump-patch-1.gz) = f9b2cfd46d53627664dbd63c36d7b693
+SIZE (ump-patch-1.gz) = 8964
+MD5 (ump-patch-2.gz) = 84f32eee04748f3d74f34b6e34081a43
+SIZE (ump-patch-2.gz) = 294
+MD5 (ump-patch-3.gz) = 3f00420b7d3898164403752c8571c55a
+SIZE (ump-patch-3.gz) = 266
+MD5 (ump-patch-4.gz) = c95fec937fc585347ded3dd912616d13
+SIZE (ump-patch-4.gz) = 3079
diff --git a/www/ump/files/patch-timidity::Makefile.in b/www/ump/files/patch-timidity::Makefile.in
deleted file mode 100644
index cfe17564c63c..000000000000
--- a/www/ump/files/patch-timidity::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/pkg-plist b/www/ump/pkg-plist
index a2798e414b9a..6f9891af5f7b 100644
--- a/www/ump/pkg-plist
+++ b/www/ump/pkg-plist
@@ -1,2 +1,2 @@
-@cwd %%X11BASE%%
 lib/browser_plugins/ump.so
+@unexec rmdir %D/lib/browser_plugins 2>/dev/null || true