svn commit: r330897 - head/multimedia/ogmtools

[Baptiste Daroussin]

Author: bapt
Date: Sat Oct 19 16:03:48 2013
New Revision: 330897
URL: http://svnweb.freebsd.org/changeset/ports/330897

Log:
  Enable stage
  Use options helpers

Modified:
  head/multimedia/ogmtools/Makefile
  head/multimedia/ogmtools/pkg-plist

Modified: head/multimedia/ogmtools/Makefile
==============================================================================
--- head/multimedia/ogmtools/Makefile	Sat Oct 19 16:03:07 2013	(r330896)
+++ head/multimedia/ogmtools/Makefile	Sat Oct 19 16:03:48 2013	(r330897)
@@ -10,20 +10,24 @@ MASTER_SITES=	http://www.bunkus.org/vide
 MAINTAINER=	multimedia at FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create OGG media streams
 
-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogg-prefix=${LOCALBASE} \
   		--with-vorbis-prefix=${LOCALBASE}
 
-MAN1=		ogmcat.1 ogmdemux.1 ogminfo.1 ogmmerge.1 ogmsplit.1
-
 OPTIONS_DEFINE=	DVDREAD
 OPTIONS_DEFAULT=	DVDREAD
 DVDREAD_DESC=	DVD title chapter extraction via libdvdread
 
-NO_STAGE=	yes
+DVDREAD_LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+DVDREAD_CONFIGURE_ON=	--with-dvdread \
+			--with-dvdread-includes=${LOCALBASE} \
+			--with-dvdread-libs=${LOCALBASE}
+DVDREAD_CONFIGURE_OFF=	--without-dvdread
+OPTIONS_SUB=	yes
+
 post-patch:
 # disable GNU auto* tools
 	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
@@ -46,20 +50,4 @@ post-configure:
 		's!malloc.h!stdlib.h!; \
 		s|stdint.h|inttypes.h|'
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDVDREAD}
-LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
-
-CONFIGURE_ARGS+=	--with-dvdread \
-			--with-dvdread-includes=${LOCALBASE} \
-			--with-dvdread-libs=${LOCALBASE}
-PLIST_SUB+=	DVDREAD=""
-
-MAN1+=	dvdxchap.1
-.else
-CONFIGURE_ARGS+=	--without-dvdread
-PLIST_SUB+=	DVDREAD="@comment "
-.endif
-
 .include <bsd.port.mk>

Modified: head/multimedia/ogmtools/pkg-plist
==============================================================================
--- head/multimedia/ogmtools/pkg-plist	Sat Oct 19 16:03:07 2013	(r330896)
+++ head/multimedia/ogmtools/pkg-plist	Sat Oct 19 16:03:48 2013	(r330897)
@@ -4,3 +4,9 @@ bin/ogmdemux
 bin/ogminfo
 bin/ogmmerge
 bin/ogmsplit
+man/man1/ogmcat.1.gz
+man/man1/ogmdemux.1.gz
+man/man1/ogminfo.1.gz
+man/man1/ogmmerge.1.gz
+man/man1/ogmsplit.1.gz
+%%DVDREAD%%man/man1/dvdxchap.1.gz