From owner-svn-ports-head@FreeBSD.ORG  Sat Oct 19 15:54:01 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0B9B5F13;
 Sat, 19 Oct 2013 15:54:01 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D350A2149;
 Sat, 19 Oct 2013 15:54:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9JFs0o8027684;
 Sat, 19 Oct 2013 15:54:00 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9JFs0P9027682;
 Sat, 19 Oct 2013 15:54:00 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201310191554.r9JFs0P9027682@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 19 Oct 2013 15:54:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330892 - head/multimedia/mpeg2codec
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Oct 2013 15:54:01 -0000

Author: bapt
Date: Sat Oct 19 15:54:00 2013
New Revision: 330892
URL: http://svnweb.freebsd.org/changeset/ports/330892

Log:
  Enable stage
  Use options helpers
  Use pkg-plist

Added:
  head/multimedia/mpeg2codec/pkg-plist   (contents, props changed)
Modified:
  head/multimedia/mpeg2codec/Makefile

Modified: head/multimedia/mpeg2codec/Makefile
==============================================================================
--- head/multimedia/mpeg2codec/Makefile	Sat Oct 19 15:40:04 2013	(r330891)
+++ head/multimedia/mpeg2codec/Makefile	Sat Oct 19 15:54:00 2013	(r330892)
@@ -27,33 +27,19 @@ DATADIR=	${PREFIX}/share/mpeg2
 
 CFLAGS+=	-DVERIFY -DVERBOSE -DTRACE
 
-PORTDOCS=	mpeg2enc.doc
-PLIST_FILES=	bin/mpeg2decode bin/mpeg2encode \
-		%%DATADIR%%/MPEG-1.par %%DATADIR%%/NTSC.par \
-		%%DATADIR%%/PAL.par %%DATADIR%%/inter.mat \
-		%%DATADIR%%/intra.mat
-PLIST_DIRS=	%%DATADIR%%
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	xext
-MAKE_ARGS+=	USE_DISP="-DDISPLAY" \
+X11_USE=	XORG=xext
+X11_MAKE_ARGS=	USE_DISP="-DDISPLAY" \
 		USE_SHMEM="-DSH_MEM" \
 		LIBS="$$(pkg-config --libs xext) -lX11" \
 		INCLUDEDIR="$$(pkg-config --cflags xext)"
-.endif
 
 do-install:
 .for i in dec enc
-	${INSTALL_PROGRAM} ${WRKSRC}/src/mpeg2${i}/mpeg2${i}ode ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mpeg2${i}/mpeg2${i}ode ${STAGEDIR}${PREFIX}/bin
 .endfor
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/par/* ${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/mpeg2enc.doc ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/par/* ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/mpeg2enc.doc ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/multimedia/mpeg2codec/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mpeg2codec/pkg-plist	Sat Oct 19 15:54:00 2013	(r330892)
@@ -0,0 +1,11 @@
+bin/mpeg2decode
+bin/mpeg2encode
+%%PORTDOCS%%%%DOCSDIR%%/mpeg2enc.doc
+%%DATADIR%%/MPEG-1.par
+%%DATADIR%%/NTSC.par
+%%DATADIR%%/PAL.par
+%%DATADIR%%/inter.mat
+%%DATADIR%%/intra.mat
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+