ports/80087: update and unbreak port: www/ump (by maintainer)

[Li-Lun Wang (Leland Wang)]

>Number:         80087
>Category:       ports
>Synopsis:       update and unbreak port: www/ump (by maintainer)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 19 06:20:37 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Li-Lun Wang (Leland Wang)
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD Athena.infor.org 4.9-RELEASE-p1 FreeBSD 4.9-RELEASE-p1 #1: Wed Dec 3 02:14:02 CST 2003 root at Athena.infor.org:/home/adm/obj/usr/src/sys/Athena i386


	
>Description:

Update port www/ump so that it works with the newest timidity++.

>How-To-Repeat:
	
>Fix:

diff -urN ump.orig/Makefile ump/Makefile
--- ump.orig/Makefile	Sun Mar 13 15:09:37 2005
+++ ump/Makefile	Tue Apr 19 01:15:28 2005
@@ -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,13 +22,12 @@
 MAINTAINER=	llwang at 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
@@ -37,9 +36,8 @@
 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
diff -urN ump.orig/distinfo ump/distinfo
--- ump.orig/distinfo	Mon Apr  5 04:17:43 2004
+++ ump/distinfo	Mon Apr 18 23:49:55 2005
@@ -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 -urN ump.orig/files/patch-timidity::Makefile.in ump/files/patch-timidity::Makefile.in
--- ump.orig/files/patch-timidity::Makefile.in	Fri Feb 15 00:21:57 2002
+++ ump/files/patch-timidity::Makefile.in	Wed Dec 31 18:00:00 1969
@@ -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 at timidity_DEPENDENCIES = \
-+ at 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 \


>Release-Note:
>Audit-Trail:
>Unformatted: