Date: Thu, 3 Oct 2013 18:18:02 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329219 - head/multimedia/vdr-plugin-xineliboutput Message-ID: <201310031818.r93II2DV036472@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Thu Oct 3 18:18:01 2013 New Revision: 329219 URL: http://svnweb.freebsd.org/changeset/ports/329219 Log: - Invoke configure seperately as gmake apparently no longer picks up the generated config.mak properly otherwise, breaking the build again with clang. - Fix passing of conditional configure args in the process. - Bump PORTREVISION. Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile ============================================================================== --- head/multimedia/vdr-plugin-xineliboutput/Makefile Thu Oct 3 18:10:03 2013 (r329218) +++ head/multimedia/vdr-plugin-xineliboutput/Makefile Thu Oct 3 18:18:01 2013 (r329219) @@ -3,7 +3,7 @@ PORTNAME= vdr-plugin-xineliboutput PORTVERSION= 1.0.90s20120511 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= SF:release \ LOCAL:snapshot @@ -30,27 +30,27 @@ WRKSRC= ${WRKDIR}/vdr-${PLUGIN} OPTIONS_DEFINE= LIBBLURAY LIBEXTRACTOR +HAS_CONFIGURE= yes NO_STAGE= yes + .include "${.CURDIR}/../vdr/Makefile.plugins" .include <bsd.port.pre.mk> +CONFIGURE_ARGS+= --cc="${CC}" --cxx="${CXX}" --add-cflags=-I$(VDRDIR) + .if ${PORT_OPTIONS:MLIBEXTRACTOR} LIB_DEPENDS+= extractor:${PORTSDIR}/textproc/libextractor -CONFIGURE_OPTS+= --enable-libextractor .else -CONFIGURE_OPTS+= --disable-libextractor +CONFIGURE_ARGS+= --disable-libextractor .endif .if ${PORT_OPTIONS:MLIBBLURAY} -CONFIGURE_OPTS+= --enable-libbluray LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray .else -CONFIGURE_OPTS+= --disable-libbluray +CONFIGURE_ARGS+= --disable-libbluray .endif -MAKE_ARGS+= CONFIGURE_OPTS="${CONFIGURE_OPTS}" - post-patch: post-patch-plugin # clang doesn't know -MG ${TOUCH} -t 200001010000 ${WRKSRC}/nosignal_720x576.c \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310031818.r93II2DV036472>