6 files changed, 92 insertions, 17 deletions

diff --git a/www/ump/Makefile b/www/ump/Makefile
index 40e915f0689e..670d2b248c78 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ump
 PORTVERSION=	1.10
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:timidity/} \
 		http://www.geocities.com/SiliconValley/Lab/2826/1-10/:ump \
@@ -16,6 +16,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:timidity/} \
 MASTER_SITE_SUBDIR=	timidity/:timidity \
 		sdk/plugin/unix/:plugin
 DISTFILES=	${BZ2DIST} ${ZDIST}
+EXTRACT_ONLY=	${BZ2DIST:C/:.*$//}
 
 PATCH_SITES=	http://www.onicos.com/staff/iz/timidity/dist/
 PATCHFILES=	ump-patch-1.gz ump-patch-2.gz ump-patch-3.gz ump-patch-4.gz
@@ -23,19 +24,20 @@ 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++
 
-CONFLICTS=	ump-0.8.[0-9]*
-
-RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++
+LIB_DEPENDS=	arc:${PORTSDIR}/archivers/libarc
+RUN_DEPENDS=	${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats
 
-BROKEN=		Does not build
+LATEST_LINK=	UNIXMidiPlugin
+CONFLICTS=	ump-0.8.[0-9]*
 
 BZ2DIST=	TiMidity++-${TIMIDITY_VERSION}.tar.bz2:timidity
 ZDIST=		unix-sdk-3.0b5.tar.Z:plugin ump_with_volume.tar.Z:ump timdiffs.tar.Z:ump
 
 TIMIDITY_VERSION=	2.13.2
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-ump
+CONFIGURE_ARGS=	--enable-ump --with-default-path=${LOCALBASE}/share/timidity
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
@@ -44,6 +46,10 @@ WANT_GNOME=	yes
 EXTRA_PATCHES=	${PORTSDIR}/audio/timidity++/files/*
 PKGDIR=		${.CURDIR}
 WRKSRC=		${WRKDIR}/TiMidity++-${TIMIDITY_VERSION}
+BUILD_WRKSRC=	${WRKSRC}/ump
+EXTRACT_AFTER_ARGS=	| ${TAR} -xpf - --exclude '*/libarc/*'	\
+	--exclude '*/utils/mblock.h' --exclude '*/utils/memb.h'
+ALL_TARGET=	ump
 
 # USE_MOTIF=	yes
 # CONFIGURE_ENV=	MOTIFLIB="${MOTIFLIB}"
@@ -62,19 +68,14 @@ CONFIGURE_ARGS+=	--enable-audio=oss
 CONFIGURE_ENV=	LDFLAGS=-export-dynamic
 .endif
 
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@(cd ${WRKDIR} && tar -jxf ${DISTDIR}/${DIST_SUBDIR}/${BZ2DIST:C/:.*$//})
+post-extract:
 	@${MKDIR} ${WRKSRC}/ump
-	@for file in ${ZDIST:C/:.*$//}; do \
-		if ! (cd ${WRKSRC}/ump && tar -Zxf ${DISTDIR}/${DIST_SUBDIR}/$${file}); \
+	@for f in ${ZDIST:C/:.*$//}; do \
+		if ! (cd ${WRKSRC}/ump && tar -Zxf ${DISTDIR}/${DIST_SUBDIR}/$${f}); \
 		then \
 			exit 1; \
 		fi \
 	done
-
-post-extract:
 	@${CP} ${WRKSRC}/ump/PluginSDK30b5/include/*.h ${WRKSRC}/ump/PluginSDK30b5/common/npunix.c ${WRKSRC}/ump
 
 post-configure:
@@ -84,9 +85,6 @@ post-configure:
 		${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile
 	@cd ${WRKSRC}; ${SETENV} CONFIG_HEADERS='' CONFIG_FILES=ump/Makefile ${SH} ./config.status
 
-do-build:
-	@cd ${WRKSRC}/ump; ${GMAKE} ump
-
 do-install:
 	${MKDIR} ${PREFIX}/lib/browser_plugins
 	${INSTALL_PROGRAM} ${WRKSRC}/ump/ump.so ${PREFIX}/lib/browser_plugins
diff --git a/www/ump/files/patch-interface-Makefile.in b/www/ump/files/patch-interface-Makefile.in
new file mode 100644
index 000000000000..7e26e7a8e1ce
--- /dev/null
+++ b/www/ump/files/patch-interface-Makefile.in
@@ -0,0 +1,11 @@
+--- interface/Makefile.in.orig	Wed May 24 20:40:04 2006
++++ interface/Makefile.in	Wed May 24 20:43:13 2006
+@@ -319,7 +319,7 @@
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)/timidity \
+-	-I$(top_srcdir)/libarc \
++	-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc \
+ 	-I$(top_srcdir)/utils
+ 
+ 
diff --git a/www/ump/files/patch-libunimod-Makefile.in b/www/ump/files/patch-libunimod-Makefile.in
new file mode 100644
index 000000000000..c138a50afdd7
--- /dev/null
+++ b/www/ump/files/patch-libunimod-Makefile.in
@@ -0,0 +1,11 @@
+--- libunimod/Makefile.in.orig	Wed May 24 20:47:34 2006
++++ libunimod/Makefile.in	Wed May 24 20:50:16 2006
+@@ -317,7 +317,7 @@
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/timidity \
+ 	-I$(top_srcdir)/utils \
+-	-I$(top_srcdir)/libarc \
++	-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc \
+ 	$(EXTRAINCS)
+ 
+ 
diff --git a/www/ump/files/patch-timidity-Makefile.in b/www/ump/files/patch-timidity-Makefile.in
new file mode 100644
index 000000000000..e646a372fc3c
--- /dev/null
+++ b/www/ump/files/patch-timidity-Makefile.in
@@ -0,0 +1,11 @@
+--- timidity/Makefile.in.orig	Wed May 24 20:45:31 2006
++++ timidity/Makefile.in	Wed May 24 20:46:31 2006
+@@ -315,7 +315,7 @@
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir) \
+-	-I$(top_srcdir)/libarc \
++	-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc \
+ 	-I$(top_srcdir)/libunimod \
+ 	-I$(top_srcdir)/interface \
+ 	-I$(top_srcdir)/utils \
diff --git a/www/ump/files/patch-ump-Makefile.in b/www/ump/files/patch-ump-Makefile.in
new file mode 100644
index 000000000000..7be313ed34ad
--- /dev/null
+++ b/www/ump/files/patch-ump-Makefile.in
@@ -0,0 +1,33 @@
+--- ump/Makefile.in.orig	Wed May 24 20:38:23 2006
++++ ump/Makefile.in	Wed May 24 20:39:09 2006
+@@ -183,7 +183,7 @@
+ DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\"
+ BITMAP_DIR = $(TCL_DIR)/bitmaps
+ 
+-INCLUDES =  	-I$(top_srcdir) 	-I$(top_srcdir)/libarc 	-I$(top_srcdir)/interface 	-I$(top_srcdir)/utils 	-I$(top_srcdir)/timidity 	-I$(top_srcdir)/libunimod 	$(EXTRAINCS)
++INCLUDES =  	-I$(top_srcdir) 	-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc  -I$(top_srcdir)/interface 	-I$(top_srcdir)/utils 	-I$(top_srcdir)/timidity 	-I$(top_srcdir)/libunimod 	$(EXTRAINCS)
+ 
+ 
+ noinst_LIBRARIES = libump.a
+@@ -204,7 +204,7 @@
+ UMPOBJS =  	npunix.o 	UnixShell.o 	plugin_c.o 	timiditymain.o
+ 
+ 
+-UMPLINKS = $(LIBS) -lXpm
++UMPLINKS = $(LIBS) -lXpm -larc -L$(LOCALBASE)/lib
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h ../interface.h
+ CONFIG_CLEAN_FILES = 
+@@ -437,11 +437,10 @@
+ ump: $(UMP)
+ 
+ $(UMP): $(UMPOBJS)
+-	for f in libarc utils interface; do (cd $(top_builddir)/$$f; $(MAKE)); done
++	for f in utils interface; do (cd $(top_builddir)/$$f; $(MAKE)); done
+ 	cd $(top_builddir)/timidity; $(MAKE) objs
+ 	$(SHLD) -o $(UMP) $(LDFLAGS) $(UMPOBJS) \
+ 	`echo $(top_builddir)/timidity/*.o | sed -e s@$(top_builddir)/timidity/timidity.o@@g` \
+-	$(top_builddir)/libarc/*.o \
+ 	$(top_builddir)/utils/*.o \
+ 	$(top_builddir)/interface/*.o \
+ 	$(top_builddir)/libunimod/*.o \
diff --git a/www/ump/files/patch-utils-Makefile.in b/www/ump/files/patch-utils-Makefile.in
new file mode 100644
index 000000000000..91b151b6b5fa
--- /dev/null
+++ b/www/ump/files/patch-utils-Makefile.in
@@ -0,0 +1,11 @@
+--- utils/Makefile.in.orig	Wed May 24 20:51:07 2006
++++ utils/Makefile.in	Wed May 24 20:57:43 2006
+@@ -314,7 +314,7 @@
+ BITMAP_DIR = $(TCL_DIR)/bitmaps
+ 
+ INCLUDES = \
+-	-I$(top_srcdir)/libarc \
++	-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc \
+ 	-I$(top_srcdir)/timidity
+ 
+