Date: Mon, 16 Apr 2007 12:20:44 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/111681: [patch] audio/ocp - cleanup non-supported FreeBSD versions Message-ID: <20070416022044.1B08AD6@k7.mavetju> Resent-Message-ID: <200704160230.l3G2U7uF092992@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111681
>Category: ports
>Synopsis: [patch] audio/ocp - cleanup non-supported FreeBSD versions
>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: Mon Apr 16 02:30:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:42:56 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386
>Description:
>How-To-Repeat:
>Fix:
There is a chance that the bsd.port.pre.mk / bsd.port.post.mk can
be replaced by a single bsd.port.mk, as I couldn't find use for it
anymore. But I leave this for the maintainer.
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/ocp/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile 13 Feb 2007 21:56:13 -0000 1.18
+++ Makefile 16 Apr 2007 02:19:44 -0000
@@ -18,7 +18,8 @@
LIB_DEPENDS= id3tag.0:${PORTSDIR}/audio/libid3tag \
mad.2:${PORTSDIR}/audio/libmad \
- vorbis.3:${PORTSDIR}/audio/libvorbis
+ vorbis.3:${PORTSDIR}/audio/libvorbis \
+ sidplay.1:${PORTSDIR}/audio/libsidplay
ONLY_FOR_ARCHS= i386
@@ -45,13 +46,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 500000
-LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
-PLIST_SUB+= LIBSIDPLAY=""
-.else
-PLIST_SUB+= LIBSIDPLAY="@comment "
-.endif
-
.if exists(${TIMIDITY_CFG}) || !defined(WITHOUT_MIDI)
RUN_DEPENDS+= ${TIMIDITY_CFG}:${PORTSDIR}/audio/eawpats
.endif
@@ -65,7 +59,7 @@
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --with-debug
.endif
-.if defined(WITH_ADPLUG) && ${OSVERSION} > 500000
+.if defined(WITH_ADPLUG)
LIB_DEPENDS+= adplug-2.0.1.0:${PORTSDIR}/audio/libadplug
CONFIGURE_ARGS+= --without-x11 --with-adplug
PLIST_SUB+= ADPLUG=""
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/audio/ocp/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 13 Feb 2007 21:56:13 -0000 1.6
+++ pkg-plist 16 Apr 2007 02:19:44 -0000
@@ -44,8 +44,8 @@
lib/ocp/aytype.so
lib/ocp/playay.so
%%ADPLUG%%lib/ocp/playopl.so
-%%LIBSIDPLAY%%lib/ocp/playsid.so
-%%LIBSIDPLAY%%lib/ocp/sidtype.so
+lib/ocp/playsid.so
+lib/ocp/sidtype.so
lib/ocp/playwav.so
lib/ocp/playxm.so
lib/ocp/plrbase.so
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070416022044.1B08AD6>