From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 25 02:40:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FFB616A421 for ; Thu, 25 May 2006 02:40:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 996D443D49 for ; Thu, 25 May 2006 02:40:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4P2eEcI006050 for ; Thu, 25 May 2006 02:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4P2eEt5006048; Thu, 25 May 2006 02:40:14 GMT (envelope-from gnats) Resent-Date: Thu, 25 May 2006 02:40:14 GMT Resent-Message-Id: <200605250240.k4P2eEt5006048@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Li-Lun Wang (Leland Wang) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 681CE16A420 for ; Thu, 25 May 2006 02:34:06 +0000 (UTC) (envelope-from llwang@infor.ck.tp.edu.tw) Received: from infor.ck.tp.edu.tw (infor.ck.tp.edu.tw [203.64.26.200]) by mx1.FreeBSD.org (Postfix) with ESMTP id D57C243D46 for ; Thu, 25 May 2006 02:34:05 +0000 (GMT) (envelope-from llwang@infor.ck.tp.edu.tw) Received: by infor.ck.tp.edu.tw (Postfix, from userid 1001) id 8CB93170A1; Thu, 25 May 2006 10:34:04 +0800 (CST) Message-Id: <20060525023404.8CB93170A1@infor.ck.tp.edu.tw> Date: Thu, 25 May 2006 10:34:04 +0800 (CST) From: Li-Lun Wang (Leland Wang) To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/97869: [maintainer] Fix and unbreak www/ump X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Li-Lun Wang \(Leland Wang\)" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 May 2006 02:40:15 -0000 >Number: 97869 >Category: ports >Synopsis: [maintainer] Fix and unbreak www/ump >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: Thu May 25 02:40:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Li-Lun Wang (Leland Wang) >Release: FreeBSD 6.0-RELEASE-p4 i386 >Organization: >Environment: System: FreeBSD Athena.infor.org 6.0-RELEASE-p4 FreeBSD 6.0-RELEASE-p4 #3: Thu Jan 26 23:44:20 CST 2006 root@Athena.infor.org:/usr/obj/usr/src/sys/Athena i386 >Description: - Use libarc instead of the one contained in the distribution - Remove BROKEN - Correct dependency - Add LATEST_LINK to resolve confliction with math/ump - Bump PORTREVISION Added files: www/ump/files patch-interface::Makefile.in patch-libunimod::Makefile.in patch-timidity::Makefile.in patch-ump::Makefile.in patch-utils::Makefile.in Modified files: www/ump Makefile >How-To-Repeat: >Fix: diff -urN ump.orig/Makefile ump/Makefile --- ump.orig/Makefile Wed May 24 19:43:15 2006 +++ ump/Makefile Wed May 24 21:22:49 2006 @@ -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_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 @@ 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,12 @@ EXTRA_PATCHES= ${PORTSDIR}/audio/timidity++/files/* PKGDIR= ${.CURDIR} WRKSRC= ${WRKDIR}/TiMidity++-${TIMIDITY_VERSION} +BUILD_WRKSRC= ${WRKSRC}/ump +CPPFLAGS+= -I${LOCALBASE}/include/libarc +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +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 +70,14 @@ 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: @@ -83,9 +86,6 @@ -e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \ ${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 diff -urN ump.orig/files/patch-interface::Makefile.in ump/files/patch-interface::Makefile.in --- ump.orig/files/patch-interface::Makefile.in Wed Dec 31 18:00:00 1969 +++ ump/files/patch-interface::Makefile.in Wed May 24 20:44:45 2006 @@ -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/libarc \ + -I$(top_srcdir)/utils + + diff -urN ump.orig/files/patch-libunimod::Makefile.in ump/files/patch-libunimod::Makefile.in --- ump.orig/files/patch-libunimod::Makefile.in Wed Dec 31 18:00:00 1969 +++ ump/files/patch-libunimod::Makefile.in Wed May 24 20:50:37 2006 @@ -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/libarc \ + $(EXTRAINCS) + + diff -urN ump.orig/files/patch-timidity::Makefile.in ump/files/patch-timidity::Makefile.in --- ump.orig/files/patch-timidity::Makefile.in Wed Dec 31 18:00:00 1969 +++ ump/files/patch-timidity::Makefile.in Wed May 24 20:47:05 2006 @@ -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/libarc \ + -I$(top_srcdir)/libunimod \ + -I$(top_srcdir)/interface \ + -I$(top_srcdir)/utils \ diff -urN ump.orig/files/patch-ump::Makefile.in ump/files/patch-ump::Makefile.in --- ump.orig/files/patch-ump::Makefile.in Wed Dec 31 18:00:00 1969 +++ ump/files/patch-ump::Makefile.in Wed May 24 20:39:12 2006 @@ -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/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 + 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 -urN ump.orig/files/patch-utils::Makefile.in ump/files/patch-utils::Makefile.in --- ump.orig/files/patch-utils::Makefile.in Wed Dec 31 18:00:00 1969 +++ ump/files/patch-utils::Makefile.in Wed May 24 20:58:13 2006 @@ -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/libarc \ + -I$(top_srcdir)/timidity + + >Release-Note: >Audit-Trail: >Unformatted: