1 files changed, 25 insertions, 48 deletions

diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 4cffe763e7a2..d617e85242a3 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	ocp
-PORTVERSION=	0.1.13
-PORTREVISION=	7
+PORTVERSION=	0.1.17
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://stian.lunafish.org/ocp/ \
-		CRITICAL
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	The legendary Open Cubic Player
@@ -26,7 +24,7 @@ ONLY_FOR_ARCHS=	i386
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-
+INSTALLS_ICONS=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -54,6 +52,11 @@ PFILES=		configure cpiface/cpianal.c cpiface/cpidots.c \
 		stuff/poutput-dga.c stuff/poutput-keyboard.c \
 		stuff/poutput-vcsa.c stuff/poutput-x11.c
 
+OPTIONS=	ADPLUG "Build with adplug support" on \
+		FLAC   "Build with FLAC support" on \
+		MIDI   "Build with timidity support" on \
+		X11    "Build with X11 support" on
+
 .include <bsd.port.pre.mk>
 
 .if exists(${TIMIDITY_CFG}) || !defined(WITHOUT_MIDI)
@@ -62,46 +65,41 @@ RUN_DEPENDS+=	${TIMIDITY_CFG}:${PORTSDIR}/audio/eawpats
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--without-x11
+PLIST_SUB+=		XORG="@comment "
 .else
-USE_XORG=	xxf86dga xxf86vm
+USE_XORG=	xxf86dga xxf86vm xpm
 CONFIGURE_ARGS+=	--with-x11=yes
+PLIST_SUB+=		XORG=""
 .endif
+
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--with-debug
 .endif
+
 .if defined(WITH_ADPLUG)
 LIB_DEPENDS+=		adplug-2.1:${PORTSDIR}/audio/libadplug
-CONFIGURE_ARGS+=	--without-x11 --with-adplug
+CONFIGURE_ARGS+=	--with-adplug
 PLIST_SUB+=		ADPLUG=""
 .else
 PLIST_SUB+=		ADPLUG="@comment "
 CONFIGURE_ARGS+=	--without-adplug
 .endif
 
-.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
-LIB_DEPENDS+=	ncursesw.5:${PORTSDIR}/devel/ncurses
+.if defined(WITH_FLAC)
+LIB_DEPENDS+=		FLAC.10:${PORTSDIR}/audio/flac
+CONFIGURE_ARGS+=	--with-flac
+PLIST_SUB+=		FLAC=""
+.else
+PLIST_SUB+=		FLAC="@comment "
+CONFIGURE_ARGS+=	--without-flac
 .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) && !defined(WITH_ADPLUG)
-	@${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} ""
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	DOCS="\#"
 .endif
 
-# Hangs on exit
-.if defined(WITH_ADPLUG) && !defined(WITHOUT_X11)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Disabling X11 support. X11 and libadplug usage cannot yet peacefully"
-	@${ECHO_MSG} "coexist."
-	@${ECHO_MSG} ""
+.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
+LIB_DEPENDS+=	ncursesw.5:${PORTSDIR}/devel/ncurses
 .endif
 
 post-patch:
@@ -127,25 +125,4 @@ post-patch:
 .endfor
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ocp ${PREFIX}/bin
-
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/ocp.pak ${DATADIR}
-
-	${INSTALL_DATA} ${WRKSRC}/ocp.ini ${PREFIX}/etc/ocp.ini.default
-.if !exists(${PREFIX}/etc/ocp.ini)
-	${INSTALL_DATA} ${WRKSRC}/ocp.ini ${PREFIX}/etc
-.endif
-
-	${MKDIR} ${PREFIX}/lib/ocp
-	${INSTALL_DATA} ${WRKSRC}/*.so ${PREFIX}/lib/ocp
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in AUTHORS BUGS CREDITS Changelog KEYBOARD_REMAPS SUID TODO
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
-
 .include <bsd.port.post.mk>