From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 16 02:30:07 2007 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8D18A16A404 for ; Mon, 16 Apr 2007 02:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 683F413C459 for ; Mon, 16 Apr 2007 02:30:07 +0000 (UTC) (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 l3G2U7XO092993 for ; Mon, 16 Apr 2007 02:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l3G2U7uF092992; Mon, 16 Apr 2007 02:30:07 GMT (envelope-from gnats) Resent-Date: Mon, 16 Apr 2007 02:30:07 GMT Resent-Message-Id: <200704160230.l3G2U7uF092992@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, Edwin Groothuis Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B5DFC16A400 for ; Mon, 16 Apr 2007 02:20:45 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from mail4out.barnet.com.au (mail4.barnet.com.au [202.83.178.125]) by mx1.freebsd.org (Postfix) with ESMTP id 7831413C483 for ; Mon, 16 Apr 2007 02:20:45 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: by mail4out.barnet.com.au (Postfix, from userid 1001) id BCED437CFEF; Mon, 16 Apr 2007 12:20:44 +1000 (EST) Received: from mail4auth.barnet.com.au (mail4.barnet.com.au [202.83.178.125]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail4.barnet.com.au (Postfix) with ESMTP id 8E54F4226DC for ; Mon, 16 Apr 2007 12:20:44 +1000 (EST) Received: from k7.mavetju (k7.mavetju.org [10.251.1.18]) by mail4auth.barnet.com.au (Postfix) with ESMTP id 40A1D37CFE9 for ; Mon, 16 Apr 2007 12:20:44 +1000 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id 1B08AD6; Mon, 16 Apr 2007 12:20:44 +1000 (EST) Message-Id: <20070416022044.1B08AD6@k7.mavetju> Date: Mon, 16 Apr 2007 12:20:44 +1000 (EST) From: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/111681: [patch] audio/ocp - cleanup non-supported FreeBSD versions X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2007 02:30:07 -0000 >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 -.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: