- New upstream release (dated 2011-05-02)

- Add LICENSE
- Add dependency on ogmtools due to dvdxchap
- USE_* -> USES
- Stagify
- OPTIONS for DOCS and EXAMPLES

Approved by:	mentors (implicit)

3 files changed, 27 insertions, 19 deletions

diff --git a/multimedia/iso2mkv/Makefile b/multimedia/iso2mkv/Makefile
index 0a34df0691a9..7b6ebab2d675 100644
--- a/multimedia/iso2mkv/Makefile
+++ b/multimedia/iso2mkv/Makefile
@@ -2,47 +2,50 @@
 # $FreeBSD$
 
 PORTNAME=	iso2mkv
-DISTVERSION=	2007-04-25
-PORTREVISION=	2
+DISTVERSION=	2011-05-02
 CATEGORIES=	multimedia
 MASTER_SITES=	http://5ko.free.fr/dl/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Script to convert DVD image, device, or VIDEO_TS to mkv
 
+LICENSE=	MIT
+
 RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		normalize:${PORTSDIR}/audio/normalize \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		mencoder:${PORTSDIR}/multimedia/mencoder \
 		mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix \
+		dvdxchap:${PORTSDIR}/multimedia/ogmtools \
 		bash:${PORTSDIR}/shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
+
 NO_BUILD=	yes
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
+
+OPTIONS_DEFINE=		DOCS EXAMPLES
 
-PLIST_FILES=	bin/iso2mkv
-PORTDOCS=	README.utf8.txt
-PORTEXAMPLES=	iso2mkv.conf
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^#!/bin/bash|#!${LOCALBASE}/bin/bash| ; \
 		 s|normalize-audio|normalize| ; \
 		 s|stat -c %s|stat -f %z|' ${WRKSRC}/iso2mkv
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/iso2mkv ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}/
-.endif
-	@${CAT} ${WRKSRC}/README.utf8.txt
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${EXAMPLESDIR}/
-	@${ECHO} "${EXAMPLESDIR}/${PORTEXAMPLES} should be copied to   ~/.mplayer/iso2mkv.conf"
+	${INSTALL_SCRIPT} ${WRKSRC}/iso2mkv ${STAGEDIR}${PREFIX}/bin
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_MAN} ${WRKSRC}/README.utf8.txt ${STAGEDIR}${DOCSDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/iso2mkv.conf ${STAGEDIR}${EXAMPLESDIR}
+	@${ECHO} "Users should copy ${EXAMPLESDIR}/iso2mkv.conf to ~/.mplayer/iso2mkv.conf"
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/iso2mkv/distinfo b/multimedia/iso2mkv/distinfo
index dd0b5a54c3fa..245369198051 100644
--- a/multimedia/iso2mkv/distinfo
+++ b/multimedia/iso2mkv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (iso2mkv-2007-04-25.tar.bz2) = 13ae693b56d4802e2706d8fe93836e8942e29da51d84e09ab2c89ff8c6028d2c
-SIZE (iso2mkv-2007-04-25.tar.bz2) = 8348
+SHA256 (iso2mkv.tar.bz2) = bb418d3151d15ff9381fd64f19d12d60383628185352808010e5c48179e3a208
+SIZE (iso2mkv.tar.bz2) = 8334
diff --git a/multimedia/iso2mkv/pkg-plist b/multimedia/iso2mkv/pkg-plist
new file mode 100644
index 000000000000..aa105156c0b6
--- /dev/null
+++ b/multimedia/iso2mkv/pkg-plist
@@ -0,0 +1,5 @@
+bin/iso2mkv
+%%PORTDOCS%%%%DOCSDIR%%/README.utf8.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso2mkv.conf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%