ports/82956: [maintainer-update] patch: audio/ocp - disable libsidplay support for 4.x

[Emanuel Haupt]

>Number:         82956
>Category:       ports
>Synopsis:       [maintainer-update] patch: audio/ocp - disable libsidplay support for 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 03 21:50:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Emanuel Haupt
>Release:        FreeBSD 5.4-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD beaver.critical.ch 5.4-RELEASE-p3 FreeBSD 5.4-RELEASE-p3 #0: Thu Jun 30 20:20:39 CEST 2005 root at beaver.critical.ch:/usr/obj/usr/src-release/src/sys/BEAVER i386


	
>Description:
This patch disables libsidplay (audio/libsidplay) support for 4.x, since libsidplay
needs to be compiled with gcc 3.4 and older. under 4.x audio/libsidplay is compiled
with 2.95.4. I requested the maintainer to build audio/libsidplay with gcc 3.4 (pr 82952).

>How-To-Repeat:
	
>Fix:

	



--- audio-ocp.patch begins here ---
diff -ruN ocp.orig/Makefile ocp/Makefile
--- ocp.orig/Makefile	Sun Jul  3 23:11:18 2005
+++ ocp/Makefile	Sun Jul  3 23:24:57 2005
@@ -7,14 +7,14 @@
 
 PORTNAME=	ocp
 PORTVERSION=	0.1.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://labs.nixia.no/
 
 MAINTAINER=	ehaupt at critical.ch
 COMMENT=	The legendary Open Cubic Player
 
-LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay \
-		id3tag.2:${PORTSDIR}/audio/libid3tag \
+LIB_DEPENDS=	id3tag.2:${PORTSDIR}/audio/libid3tag \
 		mad.2:${PORTSDIR}/audio/libmad \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
@@ -42,6 +42,13 @@
 TIMIDITY_CFG=	${LOCALBASE}/share/timidity/timidity.cfg
 
 .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
diff -ruN ocp.orig/pkg-plist ocp/pkg-plist
--- ocp.orig/pkg-plist	Sun Jul  3 23:14:49 2005
+++ ocp/pkg-plist	Sun Jul  3 23:15:30 2005
@@ -42,8 +42,8 @@
 lib/ocp/playmp2.so
 lib/ocp/playogg.so
 %%ADPLUG%%lib/ocp/playopl.so
-lib/ocp/playsid.so
-lib/ocp/sidtype.so
+%%LIBSIDPLAY%%lib/ocp/playsid.so
+%%LIBSIDPLAY%%lib/ocp/sidtype.so
 lib/ocp/playwav.so
 lib/ocp/playxm.so
 lib/ocp/plrbase.so
--- audio-ocp.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: