Update to 0.1.6

PR:		ports/80509
Submitted by:	maintainer

7 files changed, 24 insertions, 53 deletions

diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 469eead53148..39aeb7dea940 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -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 @@ LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay \
 
 ONLY_FOR_ARCHS=	i386
 
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -35,6 +33,8 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		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 @@ TIMIDITY_CFG=	${LOCALBASE}/share/timidity/timidity.cfg
 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 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ocp ${PREFIX}/bin
-	${CHMOD} u+s ${PREFIX}/bin/ocp
 
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/cp.pak ${DATADIR}
diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo
index 95602781de43..d925e6899617 100644
--- a/audio/ocp/distinfo
+++ b/audio/ocp/distinfo
@@ -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
diff --git a/audio/ocp/files/patch-dev_mix.c b/audio/ocp/files/patch-dev_mix.c
deleted file mode 100644
index 7f1be1c1ced8..000000000000
--- a/audio/ocp/files/patch-dev_mix.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- dev/mix.c.orig	Sat Apr 23 23:13:56 2005
-+++ dev/mix.c	Sat Apr 23 23:14:04 2005
-@@ -13,6 +13,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/mman.h>
- #include <unistd.h>
- #include "mcp.h"
diff --git a/audio/ocp/files/patch-filesel_arctar.c b/audio/ocp/files/patch-filesel_arctar.c
deleted file mode 100644
index 18ec635eb356..000000000000
--- a/audio/ocp/files/patch-filesel_arctar.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- filesel/arctar.c.orig	Sun Apr 24 02:06:12 2005
-+++ filesel/arctar.c	Sun Apr 24 02:07:06 2005
-@@ -13,9 +13,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#ifndef __linux
--#include <sys/resource.h>
--#endif
- #include <sys/signal.h>
- #include <sys/stat.h>
- #include <sys/time.h>
diff --git a/audio/ocp/files/patch-lrmi-0.8_vbetest.c b/audio/ocp/files/patch-lrmi-0.8_vbetest.c
deleted file mode 100644
index 0b2892c83212..000000000000
--- a/audio/ocp/files/patch-lrmi-0.8_vbetest.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- lrmi-0.8/vbetest.c.orig	Fri Mar 25 18:13:15 2005
-+++ lrmi-0.8/vbetest.c	Sat Apr 23 19:51:05 2005
-@@ -18,7 +18,8 @@
- #include <dev/wscons/wsconsio.h>
- #include <machine/sysarch.h>
- #elif defined(__FreeBSD__)
--#include <machine/console.h>
-+#include <sys/consio.h>
-+#include <sys/kbio.h>
- #include <machine/sysarch.h>
- #endif
- 
diff --git a/audio/ocp/files/patch-playgmd_gmdlokt.c b/audio/ocp/files/patch-playgmd_gmdlokt.c
deleted file mode 100644
index 672d523ada22..000000000000
--- a/audio/ocp/files/patch-playgmd_gmdlokt.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- playgmd/gmdlokt.c.orig	Sun Apr 24 02:08:10 2005
-+++ playgmd/gmdlokt.c	Sun Apr 24 02:08:24 2005
-@@ -9,6 +9,7 @@
-  */
- 
- #include "config.h"
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/audio/ocp/pkg-plist b/audio/ocp/pkg-plist
index c6b369693666..494fc66d6704 100644
--- a/audio/ocp/pkg-plist
+++ b/audio/ocp/pkg-plist
@@ -30,6 +30,7 @@ lib/ocp/loadokt.so
 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