3 files changed, 46 insertions, 39 deletions

diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 799a7132a4a3..ccdc3f7cded0 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ocp
-PORTVERSION=	0.1.13
-PORTREVISION=	6
+PORTVERSION=	0.1.15
 CATEGORIES=	audio
 MASTER_SITES=	http://stian.lunafish.org/ocp/ \
 		CRITICAL
@@ -15,42 +14,41 @@ MASTER_SITES=	http://stian.lunafish.org/ocp/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The legendary Open Cubic Player
 
-LIB_DEPENDS=	id3tag.0:${PORTSDIR}/audio/libid3tag \
+LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
+		id3tag.0:${PORTSDIR}/audio/libid3tag \
 		mad.2:${PORTSDIR}/audio/libmad \
-		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		sidplay.1:${PORTSDIR}/audio/libsidplay
+		sidplay.1:${PORTSDIR}/audio/libsidplay \
+		vorbis.4:${PORTSDIR}/audio/libvorbis
 
 ONLY_FOR_ARCHS=	i386
 
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnometarget
+USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_GCC=	3.4+
-USE_LDCONFIG=	yes
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-L${LOCALBASE}/lib
-CXXFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
-
 CONFIGURE_ARGS=	--with-dir-suffix="" \
 		--libdir=${LOCALBASE}/lib
+USE_LDCONFIG=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-L${LOCALBASE}/lib
+CXXFLAGS+=	-L${LOCALBASE}/lib
 
 TIMIDITY_CFG=	${LOCALBASE}/share/timidity/timidity.cfg
 
 PFILES=		configure cpiface/cpianal.c cpiface/cpidots.c \
 		cpiface/cpiface.c cpiface/cpigraph.c cpiface/cpiinst.c \
-		cpiface/cpikube.c cpiface/cpilinks.c cpiface/cpimsg.c \
-		cpiface/cpiphase.c cpiface/cpiscope.c cpiface/cpitrack.c \
-		cpiface/mcpedit.c cpiface/volctrl.c filesel/cphlpfs.c \
-		filesel/pfilesel.c filesel/pfilesel.c.bak help/cphelper.c \
-		medialib/medialib.c playcda/cdapplay.c stuff/poutput-curses.c \
-		stuff/poutput-dga.c stuff/poutput-keyboard.c \
+		cpiface/cpikeyhelp.c cpiface/cpikube.c cpiface/cpilinks.c \
+		cpiface/cpimsg.c cpiface/cpiphase.c cpiface/cpiscope.c \
+		cpiface/cpitrack.c cpiface/mcpedit.c cpiface/volctrl.c \
+		filesel/cphlpfs.c filesel/pfilesel.c help/cphelper.c \
+		medialib/medialib.c playcda/cdapplay.c stuff/console.c \
+		stuff/poutput-curses.c stuff/poutput-keyboard.c \
 		stuff/poutput-vcsa.c stuff/poutput-x11.c
 
 .include <bsd.port.pre.mk>
@@ -104,17 +102,15 @@ pre-everything::
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e '/^if test/s|==|=|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \
+		${WRKSRC}/playgmi/gmitimidity.c
+
 .if defined(WITH_DEBUG)
 	@${REINPLACE_CMD} -e 's|/\*\ \(#define\ LD_DEBUG\ 1\)\ \*/|\1|' \
 		${WRKSRC}/config.h.in
 .endif
-	@${REINPLACE_CMD} -e 's|stdint\.h|inttypes\.h|' ${WRKSRC}/types.h
-	@${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \
-		${WRKSRC}/playgmi/gmitimidity.c
-# conflicts with fnmatch.h from security/heimdal
-	@${REINPLACE_CMD} -e 's|<\(fnmatch.h\)>|"/usr/include/\1"|' \
-		${WRKSRC}/filesel/adb.c \
-		${WRKSRC}/filesel/pfilesel.c
 
 .if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
 # use ncursesw from ports
@@ -138,7 +134,15 @@ do-install:
 .endif
 
 	${MKDIR} ${PREFIX}/lib/ocp
-	${INSTALL_DATA} ${WRKSRC}/*.so ${PREFIX}/lib/ocp
+.for d in . cpiface dev devp devs devw filesel help medialib playay playflac \
+	playgmd playgmi playit playmp2 playogg playsid playwav playxm stuff
+	${INSTALL_DATA} ${WRKSRC}/${d}/*.so ${PREFIX}/lib/ocp
+.endfor
+.if defined(WITH_ADPLUG)
+.for d in playopl
+	${INSTALL_DATA} ${WRKSRC}/${d}/*.so ${PREFIX}/lib/ocp
+.endfor
+.endif
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo
index 3a9883793b96..a658d431536b 100644
--- a/audio/ocp/distinfo
+++ b/audio/ocp/distinfo
@@ -1,3 +1,3 @@
-MD5 (ocp-0.1.13.tar.gz) = 52074c15a0ee43908276436d703fe5d8
-SHA256 (ocp-0.1.13.tar.gz) = d75f7af686533c1098da4a7540abfe45c72c1df8943c67b1b14b6034b32662b7
-SIZE (ocp-0.1.13.tar.gz) = 659769
+MD5 (ocp-0.1.15.tar.gz) = 8d26e8227efdef9d801efdce274a8db6
+SHA256 (ocp-0.1.15.tar.gz) = 7362135f479992ccd91aefa499c48b0db0973da6d1c06472f5bf1b2ccb4c50e1
+SIZE (ocp-0.1.15.tar.gz) = 687220
diff --git a/audio/ocp/pkg-plist b/audio/ocp/pkg-plist
index dad25e7354d6..a684dd62a396 100644
--- a/audio/ocp/pkg-plist
+++ b/audio/ocp/pkg-plist
@@ -4,6 +4,7 @@ etc/ocp.ini.default
 @exec [ -f %B/ocp.ini ] || cp %B/%f %B/ocp.ini
 lib/ocp/arctar.so
 lib/ocp/arczip.so
+lib/ocp/aytype.so
 lib/ocp/compat.so
 lib/ocp/cphelper.so
 lib/ocp/cphlpif.so
@@ -17,9 +18,11 @@ lib/ocp/devsoss.so
 lib/ocp/devwmix.so
 lib/ocp/devwmixf.so
 lib/ocp/devwnone.so
+lib/ocp/flacptype.so
 lib/ocp/framelock.so
 lib/ocp/fstypes.so
 lib/ocp/hardware.so
+lib/ocp/keyhelp.so
 lib/ocp/libocp.so
 lib/ocp/load669.so
 lib/ocp/loadams.so
@@ -30,29 +33,28 @@ 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/medialib.so
 lib/ocp/mixclip.so
 %%ADPLUG%%lib/ocp/opltype.so
 lib/ocp/pfilesel.so
+lib/ocp/playay.so
+lib/ocp/playflac.so
 lib/ocp/playgmd.so
 lib/ocp/playgmi.so
 lib/ocp/playit.so
 lib/ocp/playmp2.so
 lib/ocp/playogg.so
-lib/ocp/aytype.so
-lib/ocp/playay.so
 %%ADPLUG%%lib/ocp/playopl.so
 lib/ocp/playsid.so
-lib/ocp/sidtype.so
 lib/ocp/playwav.so
 lib/ocp/playxm.so
 lib/ocp/plrbase.so
 lib/ocp/poutput.so
 lib/ocp/sets.so
+lib/ocp/sidtype.so
 lib/ocp/smpbase.so
-%%DATADIR%%/ocp.pak
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
@@ -60,6 +62,7 @@ lib/ocp/smpbase.so
 %%PORTDOCS%%%%DOCSDIR%%/KEYBOARD_REMAPS
 %%PORTDOCS%%%%DOCSDIR%%/SUID
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-@dirrm lib/ocp
+%%DATADIR%%/ocp.pak
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/ocp