Date: Sat, 14 Dec 2013 00:58:19 +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: r336409 - head/multimedia/mjpegtools Message-ID: <201312140058.rBE0wJ9T010285@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Dec 14 00:58:19 2013 New Revision: 336409 URL: http://svnweb.freebsd.org/changeset/ports/336409 Log: Support stage Modified: head/multimedia/mjpegtools/Makefile head/multimedia/mjpegtools/pkg-plist Modified: head/multimedia/mjpegtools/Makefile ============================================================================== --- head/multimedia/mjpegtools/Makefile Sat Dec 14 00:54:57 2013 (r336408) +++ head/multimedia/mjpegtools/Makefile Sat Dec 14 00:58:19 2013 (r336409) @@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME:S/tools//}/$ MAINTAINER= multimedia@FreeBSD.org COMMENT= Set of tools to record/playback/edit videos in MPEG format -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg OPTIONS_DEFINE= GTK2 SDL PNG DV QUICKTIME SIMD DOCS OPTIONS_DEFAULT=GTK2 SDL PNG @@ -18,8 +18,7 @@ QUICKTIME_DESC= Enable libQuickTime sup CONFLICTS= mplex-[0-9]* -USES= pkgconfig -USE_GMAKE= yes +USES= gmake pkgconfig USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf LIBTOOLIZE_ARGS=--force ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal @@ -30,13 +29,6 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD CONFIGURE_ARGS= --without-x USE_LDCONFIG= yes -MAN1= jpeg2yuv.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 lavpipe.1 lavplay.1 \ - lavrec.1 lavtrans.1 mjpegtools.1 mp2enc.1 mpeg2enc.1 mplex.1 \ - pgmtoy4m.1 png2yuv.1 pnmtoy4m.1 ppmtoy4m.1 y4mcolorbars.1 \ - y4mdenoise.1 y4munsharp.1 y4mtopnm.1 y4mtoppm.1 yuv2lav.1 \ - yuvdenoise.1 yuvfps.1 yuvinactive.1 yuvkineco.1 \ - yuvmedianfilter.1 yuvplay.1 yuvscaler.1 yuvycsnoise.1 -MAN5= yuv4mpeg.5 INFO= mjpeg-howto DOC_FILES= AUTHORS BUGS CHANGES ChangeLog HINTS NEWS PLANS README \ @@ -46,7 +38,6 @@ DOC_FILES= AUTHORS BUGS CHANGES ChangeLo CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGTK2} @@ -72,7 +63,7 @@ CONFIGURE_ARGS+=--without-libsdl .endif # SDL .if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png CONFIGURE_ARGS+=--with-libpng PLIST_SUB+= PNG:="" .else @@ -81,7 +72,7 @@ PLIST_SUB+= PNG:="@comment " .endif # PNG .if ${PORT_OPTIONS:MDV} -LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv +LIB_DEPENDS+= libdv.so:${PORTSDIR}/multimedia/libdv CONFIGURE_ARGS+=--with-libdv .else CONFIGURE_ARGS+=--without-libdv @@ -89,7 +80,7 @@ CONFIGURE_ARGS+=--without-libdv .if ${PORT_OPTIONS:MQUICKTIME} PLIST_SUB+= QUICKTIME="" -LIB_DEPENDS+= quicktime:${PORTSDIR}/multimedia/libquicktime +LIB_DEPENDS+= libquicktime.so:${PORTSDIR}/multimedia/libquicktime CONFIGURE_ARGS+=--with-libquicktime .else PLIST_SUB+= QUICKTIME="@comment " @@ -119,11 +110,9 @@ post-patch: '/^pkgconfigdir/s|$$(libdir)|$$(prefix)/libdata|g' ${WRKSRC}/Makefile.am post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif # NOPORTDOCS .include <bsd.port.post.mk> Modified: head/multimedia/mjpegtools/pkg-plist ============================================================================== --- head/multimedia/mjpegtools/pkg-plist Sat Dec 14 00:54:57 2013 (r336408) +++ head/multimedia/mjpegtools/pkg-plist Sat Dec 14 00:58:19 2013 (r336409) @@ -136,6 +136,37 @@ lib/libmplex2.a lib/libmplex2.la lib/libmplex2.so libdata/pkgconfig/mjpegtools.pc +man/man1/jpeg2yuv.1.gz +man/man1/lav2mpeg.1.gz +man/man1/lav2wav.1.gz +man/man1/lav2yuv.1.gz +man/man1/lavpipe.1.gz +man/man1/lavplay.1.gz +man/man1/lavrec.1.gz +man/man1/lavtrans.1.gz +man/man1/mjpegtools.1.gz +man/man1/mp2enc.1.gz +man/man1/mpeg2enc.1.gz +man/man1/mplex.1.gz +man/man1/pgmtoy4m.1.gz +man/man1/png2yuv.1.gz +man/man1/pnmtoy4m.1.gz +man/man1/ppmtoy4m.1.gz +man/man1/y4mcolorbars.1.gz +man/man1/y4mdenoise.1.gz +man/man1/y4mtopnm.1.gz +man/man1/y4mtoppm.1.gz +man/man1/y4munsharp.1.gz +man/man1/yuv2lav.1.gz +man/man1/yuvdenoise.1.gz +man/man1/yuvfps.1.gz +man/man1/yuvinactive.1.gz +man/man1/yuvkineco.1.gz +man/man1/yuvmedianfilter.1.gz +man/man1/yuvplay.1.gz +man/man1/yuvscaler.1.gz +man/man1/yuvycsnoise.1.gz +man/man5/yuv4mpeg.5.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CHANGES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312140058.rBE0wJ9T010285>