Date: Sun, 19 Apr 2015 08:04:34 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384269 - branches/2015Q2/multimedia/gstreamer Message-ID: <201504190804.t3J84Ysr012589@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Apr 19 08:04:33 2015 New Revision: 384269 URL: https://svnweb.freebsd.org/changeset/ports/384269 Log: MFH: r384267 - Fix BUILD_DEPENDS and LIB_DEPENDS with NLS (default OPTION) - Simplify OPTIONS handling - Pet portlint - Bump PORTREVISION PR: 196729 Submitted by: z7dr6ut7gs@snkmail.com Reviewed by: riggs Approved by: portmgr (erwin) Modified: branches/2015Q2/multimedia/gstreamer/Makefile branches/2015Q2/multimedia/gstreamer/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/gstreamer/Makefile ============================================================================== --- branches/2015Q2/multimedia/gstreamer/Makefile Sun Apr 19 07:55:55 2015 (r384268) +++ branches/2015Q2/multimedia/gstreamer/Makefile Sun Apr 19 08:04:33 2015 (r384269) @@ -4,7 +4,7 @@ PORTNAME= gstreamer PORTVERSION= 0.10.36 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ @@ -31,17 +31,16 @@ INSTALL_TARGET= install-strip GST_VERSION= 0.10 OPTIONS_DEFINE= LIBCHECK NLS +OPTIONS_SUB= yes LIBCHECK_DESC= Unit tests support -.include <bsd.port.pre.mk> +LIBCHECK_LIB_DEPENDS= libcheck.so:${PORTSDIR}/devel/libcheck +LIBCHECK_CONFIGURE_OFF= --disable-check -.if ${PORT_OPTIONS:MLIBCHECK} -LIB_DEPENDS+= libcheck.so:${PORTSDIR}/devel/libcheck -PLIST_SUB+= CHECK="" -.else -CONFIGURE_ARGS+=--disable-check -PLIST_SUB+= CHECK="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls + +.include <bsd.port.pre.mk> # workaround a crash in clang 3.3 crash llvm bug # 15840 .if ((${OSVERSION} >= 901504 && ${OSVERSION} < 902502) || \ @@ -54,14 +53,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${ CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" .endif -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure Modified: branches/2015Q2/multimedia/gstreamer/pkg-plist ============================================================================== --- branches/2015Q2/multimedia/gstreamer/pkg-plist Sun Apr 19 07:55:55 2015 (r384268) +++ branches/2015Q2/multimedia/gstreamer/pkg-plist Sun Apr 19 08:04:33 2015 (r384269) @@ -23,10 +23,10 @@ include/gstreamer-%%VERSION%%/gst/base/g include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstconsistencychecker.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/internal-check.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gstconsistencychecker.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/internal-check.h include/gstreamer-%%VERSION%%/gst/controller/gstcontroller.h include/gstreamer-%%VERSION%%/gst/controller/gstcontrolsource.h include/gstreamer-%%VERSION%%/gst/controller/gstinterpolationcontrolsource.h @@ -97,7 +97,7 @@ include/gstreamer-%%VERSION%%/gst/net/gs include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h lib/girepository-1.0/Gst-%%VERSION%%.typelib lib/girepository-1.0/GstBase-%%VERSION%%.typelib -%%CHECK%%lib/girepository-1.0/GstCheck-%%VERSION%%.typelib +%%LIBCHECK%%lib/girepository-1.0/GstCheck-%%VERSION%%.typelib lib/girepository-1.0/GstController-%%VERSION%%.typelib lib/girepository-1.0/GstNet-%%VERSION%%.typelib lib/gstreamer-%%VERSION%%/libgstcoreelements.la @@ -109,11 +109,11 @@ lib/libgstbase-%%VERSION%%.la lib/libgstbase-%%VERSION%%.so lib/libgstbase-%%VERSION%%.so.0 lib/libgstbase-%%VERSION%%.so.0.30.0 -%%CHECK%%lib/libgstcheck-%%VERSION%%.a -%%CHECK%%lib/libgstcheck-%%VERSION%%.la -%%CHECK%%lib/libgstcheck-%%VERSION%%.so -%%CHECK%%lib/libgstcheck-%%VERSION%%.so.0 -%%CHECK%%lib/libgstcheck-%%VERSION%%.so.0.30.0 +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.a +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.la +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.so +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.so.0 +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.so.0.30.0 lib/libgstcontroller-%%VERSION%%.a lib/libgstcontroller-%%VERSION%%.la lib/libgstcontroller-%%VERSION%%.so @@ -136,7 +136,7 @@ lib/libgstreamer-%%VERSION%%.so.0 lib/libgstreamer-%%VERSION%%.so.0.30.0 libdata/pkgconfig/gstreamer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc -%%CHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc +%%LIBCHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc libdata/pkgconfig/gstreamer-dataprotocol-%%VERSION%%.pc libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc @@ -150,7 +150,7 @@ man/man1/gst-xmllaunch-0.10.1.gz share/aclocal/gst-element-check-%%VERSION%%.m4 share/gir-1.0/Gst-%%VERSION%%.gir share/gir-1.0/GstBase-%%VERSION%%.gir -%%CHECK%%share/gir-1.0/GstCheck-%%VERSION%%.gir +%%LIBCHECK%%share/gir-1.0/GstCheck-%%VERSION%%.gir share/gir-1.0/GstController-%%VERSION%%.gir share/gir-1.0/GstNet-%%VERSION%%.gir %%NLS%%share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504190804.t3J84Ysr012589>