ports/80509: [maintainer] update audio/ocp 0.1.5 -> 0.1.6

[Emanuel Haupt]

>Number:         80509
>Category:       ports
>Synopsis:       [maintainer] update audio/ocp 0.1.5 -> 0.1.6
>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 May 01 17:30:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Emanuel Haupt
>Release:        FreeBSD 5.4-RC3 i386
>Organization:
>Environment:
System: FreeBSD beaver.critical.ch 5.4-RC3 FreeBSD 5.4-RC3 #0: Sun Apr 17 15:34:32 CEST 2005 root at beaver.critical.ch:/usr/obj/usr/src-release/src/sys/BEAVER i386


	
>Description:
this patch updates audio/ocp from version 0.1.5 to 0.1.6

- most FreeBSD related patches are merged to this release
- x11 support is now optional
- no more suid mode required for "g"-mode
- quick find functionality added
- speed improvements
- for maintainer debugging convenience WITH_DEBUG knob has
  been added


--- audio-ocp.patch start ---
diff -ru ocp-0.1.5/Makefile ocp/Makefile
--- ocp-0.1.5/Makefile	Mon Apr 25 02:01:17 2005
+++ ocp/Makefile	Sun May  1 19:01:35 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ocp
-PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTVERSION=	0.1.6
 CATEGORIES=	audio
 MASTER_SITES=	http://labs.nixia.no/
 
@@ -21,7 +20,6 @@
 
 ONLY_FOR_ARCHS=	i386
 
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -35,6 +33,8 @@
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
+CONFIGURE_ARGS=	--with-dir-suffix=""
+
 TIMIDITY_CFG=	${LOCALBASE}/share/timidity/timidity.cfg
 
 .include <bsd.port.pre.mk>
@@ -43,20 +43,35 @@
 RUN_DEPENDS=	${TIMIDITY_CFG}:${PORTSDIR}/audio/eawpats
 .endif
 
-.if !exists(${TIMIDITY_CFG}) && !defined(WITHOUT_MIDI)
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--without-x11
+.else
+USE_XLIB=	yes
+CONFIGURE_ARGS+=	--with-x11=yes
+.endif
+
 pre-everything::
+.if !exists(${TIMIDITY_CFG}) && !defined(WITHOUT_MIDI)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "In order to be able to play MIDI files, audio/eawpats will be installed."
 	@${ECHO_MSG} "Define WITHOUT_MIDI if you do not want to install it."
 	@${ECHO_MSG} ""
 .endif
+.if !defined(WITHOUT_X11)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "If you want to compile without X11 support, hit Ctrl-C right now and"
+	@${ECHO_MSG} "define WITHOUT_X11"
+	@${ECHO_MSG} ""
+.endif
 
 post-patch:
+.if defined(WITH_DEBUG)
+	@${REINPLACE_CMD} -e 's|/\*\ \(#define\ .*DEBUG\ 1\)\ \*/|\1|' \
+		${WRKSRC}/config.h.in
+.endif
 	@${REINPLACE_CMD} -e 's|@LIBDIR@|${PREFIX}/lib/ocp|' \
 		${WRKSRC}/Rules.make.in
 	@${REINPLACE_CMD} -e 's|stdint\.h|inttypes\.h|' ${WRKSRC}/types.h
-	@${REINPLACE_CMD} -e 's|ocp-" VERSION|ocp"|' \
-		${WRKSRC}/boot/kickload.c
 	@${REINPLACE_CMD} -e 's|\(-shared\)|-L${LOCALBASE}/lib -L${X11BASE}/lib \1|' \
 		${WRKSRC}/playmp2/Makefile \
 		${WRKSRC}/playogg/Makefile \
@@ -66,7 +81,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ocp ${PREFIX}/bin
-	${CHMOD} u+s ${PREFIX}/bin/ocp
 
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/cp.pak ${DATADIR}
diff -ru ocp-0.1.5/distinfo ocp/distinfo
--- ocp-0.1.5/distinfo	Sun Apr 24 16:11:31 2005
+++ ocp/distinfo	Sun May  1 19:01:42 2005
@@ -1,2 +1,2 @@
-MD5 (ocp-0.1.5.tar.gz) = 96ba21bdecb79f8290613479461f9f1d
-SIZE (ocp-0.1.5.tar.gz) = 612916
+MD5 (ocp-0.1.6.tar.gz) = 0f176bf9b3c3fa04cd95c9854d139fed
+SIZE (ocp-0.1.6.tar.gz) = 627176
Only in ocp-0.1.5: files
Only in ocp-0.1.5: make.out
diff -ru ocp-0.1.5/pkg-plist ocp/pkg-plist
--- ocp-0.1.5/pkg-plist	Sun Apr 24 16:11:31 2005
+++ ocp/pkg-plist	Sun May  1 13:09:17 2005
@@ -30,6 +30,7 @@
 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/mixclip.so
Only in ocp-0.1.5: work
--- audio-ocp.patch end ---

>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted: