From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 7 18:10:07 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0317B1065671 for ; Wed, 7 May 2008 18:10:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DB8A38FC1C for ; Wed, 7 May 2008 18:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m47IA6l4031144 for ; Wed, 7 May 2008 18:10:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m47IA6G2031143; Wed, 7 May 2008 18:10:06 GMT (envelope-from gnats) Resent-Date: Wed, 7 May 2008 18:10:06 GMT Resent-Message-Id: <200805071810.m47IA6G2031143@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C7B71065673 for ; Wed, 7 May 2008 18:00:47 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166]) by mx1.freebsd.org (Postfix) with ESMTP id E54578FC26 for ; Wed, 7 May 2008 18:00:46 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from localhost.localdomain (U047151.ppp.dion.ne.jp [218.222.47.151]) by msa103lp.auone-net.jp (au one net msa) with ESMTP id 4705747C031 for ; Thu, 8 May 2008 03:00:40 +0900 (JST) Message-Id: <20080508030010.375638a1.tkato432@yahoo.com> Date: Thu, 8 May 2008 03:00:10 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/123497: Update port: audio/ocp to 0.1.15 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2008 18:10:07 -0000 >Number: 123497 >Category: ports >Synopsis: Update port: audio/ocp to 0.1.15 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 07 18:10:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.3-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 0.1.15 >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/ocp/Makefile audio/ocp/Makefile --- /usr/ports/audio/ocp/Makefile 2008-05-03 20:58:24.000000000 +0900 +++ audio/ocp/Makefile 2008-05-07 16:34:51.000000000 +0900 @@ -6,8 +6,7 @@ # PORTNAME= ocp -PORTVERSION= 0.1.13 -PORTREVISION= 6 +PORTVERSION= 0.1.15 CATEGORIES= audio MASTER_SITES= http://stian.lunafish.org/ocp/ \ CRITICAL @@ -15,42 +14,41 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The legendary Open Cubic Player -LIB_DEPENDS= id3tag.0:${PORTSDIR}/audio/libid3tag \ +LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \ + id3tag.0:${PORTSDIR}/audio/libid3tag \ mad.2:${PORTSDIR}/audio/libmad \ - vorbis.4:${PORTSDIR}/audio/libvorbis \ - sidplay.1:${PORTSDIR}/audio/libsidplay + sidplay.1:${PORTSDIR}/audio/libsidplay \ + vorbis.4:${PORTSDIR}/audio/libvorbis ONLY_FOR_ARCHS= i386 -GNU_CONFIGURE= yes +USE_GNOME= gnometarget +USE_ICONV= yes USE_GMAKE= yes -USE_GCC= 3.4+ -USE_LDCONFIG= yes - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -L${LOCALBASE}/lib -CXXFLAGS+= -L${LOCALBASE}/lib - -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" - CONFIGURE_ARGS= --with-dir-suffix="" \ --libdir=${LOCALBASE}/lib +USE_LDCONFIG= yes + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -L${LOCALBASE}/lib +CXXFLAGS+= -L${LOCALBASE}/lib TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg PFILES= configure cpiface/cpianal.c cpiface/cpidots.c \ cpiface/cpiface.c cpiface/cpigraph.c cpiface/cpiinst.c \ - cpiface/cpikube.c cpiface/cpilinks.c cpiface/cpimsg.c \ - cpiface/cpiphase.c cpiface/cpiscope.c cpiface/cpitrack.c \ - cpiface/mcpedit.c cpiface/volctrl.c filesel/cphlpfs.c \ - filesel/pfilesel.c filesel/pfilesel.c.bak help/cphelper.c \ - medialib/medialib.c playcda/cdapplay.c stuff/poutput-curses.c \ - stuff/poutput-dga.c stuff/poutput-keyboard.c \ + cpiface/cpikeyhelp.c cpiface/cpikube.c cpiface/cpilinks.c \ + cpiface/cpimsg.c cpiface/cpiphase.c cpiface/cpiscope.c \ + cpiface/cpitrack.c cpiface/mcpedit.c cpiface/volctrl.c \ + filesel/cphlpfs.c filesel/pfilesel.c help/cphelper.c \ + medialib/medialib.c playcda/cdapplay.c stuff/console.c \ + stuff/poutput-curses.c stuff/poutput-keyboard.c \ stuff/poutput-vcsa.c stuff/poutput-x11.c .include @@ -104,17 +102,15 @@ .endif post-patch: + @${REINPLACE_CMD} -e '/^if test/s|==|=|g' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \ + ${WRKSRC}/playgmi/gmitimidity.c + .if defined(WITH_DEBUG) @${REINPLACE_CMD} -e 's|/\*\ \(#define\ LD_DEBUG\ 1\)\ \*/|\1|' \ ${WRKSRC}/config.h.in .endif - @${REINPLACE_CMD} -e 's|stdint\.h|inttypes\.h|' ${WRKSRC}/types.h - @${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \ - ${WRKSRC}/playgmi/gmitimidity.c -# conflicts with fnmatch.h from security/heimdal - @${REINPLACE_CMD} -e 's|<\(fnmatch.h\)>|"/usr/include/\1"|' \ - ${WRKSRC}/filesel/adb.c \ - ${WRKSRC}/filesel/pfilesel.c .if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033) # use ncursesw from ports @@ -138,7 +134,15 @@ .endif ${MKDIR} ${PREFIX}/lib/ocp - ${INSTALL_DATA} ${WRKSRC}/*.so ${PREFIX}/lib/ocp +.for d in . cpiface dev devp devs devw filesel help medialib playay playflac \ + playgmd playgmi playit playmp2 playogg playsid playwav playxm stuff + ${INSTALL_DATA} ${WRKSRC}/${d}/*.so ${PREFIX}/lib/ocp +.endfor +.if defined(WITH_ADPLUG) +.for d in playopl + ${INSTALL_DATA} ${WRKSRC}/${d}/*.so ${PREFIX}/lib/ocp +.endfor +.endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff -urN /usr/ports/audio/ocp/distinfo audio/ocp/distinfo --- /usr/ports/audio/ocp/distinfo 2007-02-14 06:56:13.000000000 +0900 +++ audio/ocp/distinfo 2008-05-07 01:25:39.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (ocp-0.1.13.tar.gz) = 52074c15a0ee43908276436d703fe5d8 -SHA256 (ocp-0.1.13.tar.gz) = d75f7af686533c1098da4a7540abfe45c72c1df8943c67b1b14b6034b32662b7 -SIZE (ocp-0.1.13.tar.gz) = 659769 +MD5 (ocp-0.1.15.tar.gz) = 8d26e8227efdef9d801efdce274a8db6 +SHA256 (ocp-0.1.15.tar.gz) = 7362135f479992ccd91aefa499c48b0db0973da6d1c06472f5bf1b2ccb4c50e1 +SIZE (ocp-0.1.15.tar.gz) = 687220 diff -urN /usr/ports/audio/ocp/pkg-plist audio/ocp/pkg-plist --- /usr/ports/audio/ocp/pkg-plist 2007-04-17 16:27:43.000000000 +0900 +++ audio/ocp/pkg-plist 2008-05-07 02:21:15.000000000 +0900 @@ -4,6 +4,7 @@ @exec [ -f %B/ocp.ini ] || cp %B/%f %B/ocp.ini lib/ocp/arctar.so lib/ocp/arczip.so +lib/ocp/aytype.so lib/ocp/compat.so lib/ocp/cphelper.so lib/ocp/cphlpif.so @@ -17,9 +18,11 @@ lib/ocp/devwmix.so lib/ocp/devwmixf.so lib/ocp/devwnone.so +lib/ocp/flacptype.so lib/ocp/framelock.so lib/ocp/fstypes.so lib/ocp/hardware.so +lib/ocp/keyhelp.so lib/ocp/libocp.so lib/ocp/load669.so lib/ocp/loadams.so @@ -30,29 +33,28 @@ lib/ocp/loadptm.so lib/ocp/loads3m.so lib/ocp/loadult.so -lib/ocp/medialib.so lib/ocp/mchasm.so lib/ocp/mcpbase.so +lib/ocp/medialib.so lib/ocp/mixclip.so %%ADPLUG%%lib/ocp/opltype.so lib/ocp/pfilesel.so +lib/ocp/playay.so +lib/ocp/playflac.so lib/ocp/playgmd.so lib/ocp/playgmi.so lib/ocp/playit.so lib/ocp/playmp2.so lib/ocp/playogg.so -lib/ocp/aytype.so -lib/ocp/playay.so %%ADPLUG%%lib/ocp/playopl.so lib/ocp/playsid.so -lib/ocp/sidtype.so lib/ocp/playwav.so lib/ocp/playxm.so lib/ocp/plrbase.so lib/ocp/poutput.so lib/ocp/sets.so +lib/ocp/sidtype.so lib/ocp/smpbase.so -%%DATADIR%%/ocp.pak %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CREDITS @@ -60,6 +62,7 @@ %%PORTDOCS%%%%DOCSDIR%%/KEYBOARD_REMAPS %%PORTDOCS%%%%DOCSDIR%%/SUID %%PORTDOCS%%%%DOCSDIR%%/TODO -@dirrm lib/ocp +%%DATADIR%%/ocp.pak @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm lib/ocp >Release-Note: >Audit-Trail: >Unformatted: