svn commit: r419919 - head/audio/ocp

[Emanuel Haupt]

Author: ehaupt
Date: Tue Aug  9 13:46:14 2016
New Revision: 419919
URL: https://svnweb.freebsd.org/changeset/ports/419919

Log:
  Pacify stage-qa

Modified:
  head/audio/ocp/Makefile
  head/audio/ocp/pkg-plist

Modified: head/audio/ocp/Makefile
==============================================================================
--- head/audio/ocp/Makefile	Tue Aug  9 12:55:52 2016	(r419918)
+++ head/audio/ocp/Makefile	Tue Aug  9 13:46:14 2016	(r419919)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ocp
 PORTVERSION=	0.1.21
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/opencubicplayer/${DISTNAME} \
@@ -17,12 +17,13 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libid3tag.so:audio/libid3tag \
 		libmad.so:audio/libmad \
 		libvorbis.so:audio/libvorbis \
-		libsidplay.so:audio/libsidplay
+		libsidplay.so:audio/libsidplay \
+		libogg.so:audio/libogg
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 GNU_CONFIGURE=	yes
-USES=		ncurses gmake pkgconfig desktop-file-utils makeinfo tar:xz iconv
+USES=		ncurses gmake pkgconfig makeinfo tar:xz iconv
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
@@ -48,6 +49,15 @@ MIDI_DESC=	timidity support
 
 OPTIONS_DEFAULT=ADPLUG FLAC MIDI X11 SDL
 
+ADPLUG_LIB_DEPENDS=	libbinio.so:devel/libbinio \
+			libadplug.so:audio/libadplug
+
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
+
+# needed despite stage-qa's warning
+X11_USES=	desktop-file-utils
+SDL_USES=	desktop-file-utils
+
 .include <bsd.port.options.mk>
 
 .if exists(${TIMIDITY_CFG}) || ${PORT_OPTIONS:MMIDI}
@@ -55,7 +65,7 @@ RUN_DEPENDS+=	eawpats>0:audio/eawpats
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-USE_XORG=		xxf86dga xxf86vm xpm
+USE_XORG=		xxf86dga xxf86vm xpm xext x11
 CONFIGURE_ARGS+=	--with-x11=yes
 PLIST_SUB+=		XORG=""
 .else
@@ -64,7 +74,6 @@ PLIST_SUB+=		XORG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MADPLUG}
-LIB_DEPENDS+=		libadplug.so:audio/libadplug
 CONFIGURE_ARGS+=	--with-adplug
 PLIST_SUB+=		ADPLUG=""
 .else
@@ -88,7 +97,6 @@ PLIST_SUB+=		DESKTOP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=		libFLAC.so:audio/flac
 CONFIGURE_ARGS+=	--with-flac
 PLIST_SUB+=		FLAC=""
 .else

Modified: head/audio/ocp/pkg-plist
==============================================================================
--- head/audio/ocp/pkg-plist	Tue Aug  9 12:55:52 2016	(r419918)
+++ head/audio/ocp/pkg-plist	Tue Aug  9 13:46:14 2016	(r419919)
@@ -2,6 +2,7 @@ bin/ocp
 bin/ocp-curses
 %%XORG%%bin/ocp-x11
 %%SDL%%bin/ocp-sdl
+%%SDL%%lib/ocp/devpsdl.so
 bin/ultrafix.sh
 lib/ocp/autoload/10-compat.so
 lib/ocp/autoload/10-devi.so
@@ -30,7 +31,6 @@ lib/ocp/autoload/40-cphlpif.so
 lib/ocp/devpdisk.so
 lib/ocp/devpnone.so
 lib/ocp/devposs.so
-lib/ocp/devpsdl.so
 lib/ocp/devsnone.so
 lib/ocp/devsoss.so
 lib/ocp/devwmix.so