Add x11 and sdl options (sdl does not work yet).

3 files changed, 41 insertions, 5 deletions

diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 004940187e2..86ce2163692 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2012/03/28 15:14:54 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/04/30 08:26:41 shattered Exp $
 
 DISTNAME=		ocp-0.1.21
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=opencubicplayer/}
 EXTRACT_SUFX=		.tar.bz2
@@ -27,14 +27,16 @@ MAKE_JOBS_SAFE=		no
 
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
-CONFIGURE_ARGS+=	--without-x11
-CONFIGURE_ARGS+=	--without-sdl
 
 CFLAGS.SunOS+=		-mimpure-text
 CFLAGS.SunOS+=		-DSOUND_PCM_WRITE_CHANNELS=SNDCTL_DSP_CHANNELS
 CFLAGS.SunOS+=		-DSOUND_PCM_WRITE_BITS=SNDCTL_DSP_SETFMT
 CFLAGS.SunOS+=		-DSOUND_PCM_WRITE_RATE=SNDCTL_DSP_SPEED
 
+PLIST_VARS+=		sdl x11 desktop
+
+.include "options.mk"
+
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
diff --git a/audio/ocp/PLIST b/audio/ocp/PLIST
index 87a7fa3345e..e4748ea6f46 100644
--- a/audio/ocp/PLIST
+++ b/audio/ocp/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2010/06/05 14:45:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/04/30 08:26:41 shattered Exp $
 bin/ocp
 bin/${PKGNAME}
 bin/ocp-curses
+${PLIST.sdl}bin/ocp-sdl
+${PLIST.x11}bin/ocp-x11
 info/ocp.info.gz
 lib/${PKGNAME}/autoload/10-compat.so
 lib/${PKGNAME}/autoload/10-devi.so
@@ -27,6 +29,7 @@ lib/${PKGNAME}/autoload/40-cphlpif.so
 lib/${PKGNAME}/devpdisk.so
 lib/${PKGNAME}/devpnone.so
 lib/${PKGNAME}/devposs.so
+${PLIST.sdl}lib/${PKGNAME}/devpsdl.so
 lib/${PKGNAME}/devsnone.so
 lib/${PKGNAME}/devsoss.so
 lib/${PKGNAME}/devwmix.so
@@ -52,6 +55,7 @@ lib/${PKGNAME}/playogg.so
 lib/${PKGNAME}/playwav.so
 lib/${PKGNAME}/playxm.so
 lib/${PKGNAME}/playym.so
+${PLIST.desktop}share/applications/cubic.org-opencubicplayer.desktop
 share/doc/${PKGNAME}/AUTHORS
 share/doc/${PKGNAME}/BUGS
 share/doc/${PKGNAME}/COPYING
@@ -73,4 +77,6 @@ share/doc/${PKGNAME}/html/support.html
 share/doc/${PKGNAME}/html/wap.html
 share/${PKGNAME}/data/ocp.hlp
 share/${PKGNAME}/etc/ocp.ini
+${PLIST.x11}share/icons/hicolor/16x16/apps/opencubicplayer.xpm
+${PLIST.x11}share/icons/hicolor/48x48/apps/opencubicplayer.xpm
 @pkgdir share/ocp/ultradir
diff --git a/audio/ocp/options.mk b/audio/ocp/options.mk
new file mode 100644
index 00000000000..0b0af7ff787
--- /dev/null
+++ b/audio/ocp/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2012/04/30 08:26:41 shattered Exp $
+
+PKG_OPTIONS_VAR=        PKG_OPTIONS.ocp
+PKG_SUPPORTED_OPTIONS=  x11
+
+.include "../../mk/bsd.options.mk"
+
+# broken (crashes at startup)
+.if !empty(PKG_OPTIONS:Msdl)
+CONFIGURE_ARGS+=        --with-sdl=yes
+PLIST.sdl=		yes
+PLIST.desktop=		yes
+.include "../../devel/SDL/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-sdl
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=        --with-x11=yes
+PLIST.x11=		yes
+PLIST.desktop=		yes
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-x11
+.endif