Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Oct 2013 15:54:00 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330892 - head/multimedia/mpeg2codec
Message-ID:  <201310191554.r9JFs0P9027682@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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%%
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310191554.r9JFs0P9027682>