Date: Wed, 15 Jan 2014 11:25:13 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: Dima Panov <fluffy@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r339755 - in head/net: freerdp freerdp/files remmina remmina-plugin-gnome remmina-plugin-i18n remmina-plugin-nx remmina-plugin-rdp remmina-plugin-telepathy remmina-plugin-vnc remmina-pl... Message-ID: <7E3F90C451355FBA1A00A827@atuin.in.mat.cc> In-Reply-To: <201401150544.s0F5ihZ8069160@svn.freebsd.org> References: <201401150544.s0F5ihZ8069160@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
+--On 15 janvier 2014 05:44:43 +0000 Dima Panov <fluffy@FreeBSD.org> wrote: | -PORTVERSION= 1.0.2 | +PORTVERSION= 1.1.0.b20130711 | +DISTVERSION= 1.1.0-beta+2013071101 You can't set both PORTVERSION and DISTVERSION. As you're using github as a source, the DISTVERSION doesn't matter as it's set by the ports framework, it'll be computed from the rest, you should remove it. You should convert all those options foo to the new framework, first by adding OPTIONS_SUB=yes to get all the PLIST_SUB generated automatically, and for the rest, a bit like : | .if ${PORT_OPTIONS:MDIRECTFB} | -LIB_DEPENDS+= directfb:${PORTSDIR}/devel/directfb | +LIB_DEPENDS+= libdirectfb.so:${PORTSDIR}/devel/directfb | CMAKE_ARGS+= -DWITH_DIRECTFB=ON | PLIST_SUB+= DIRECTFB="" | # currently DirectFB option fails with clang | @@ -53,7 +53,7 @@ PLIST_SUB+= DIRECTFB="@comment " | .endif DIRECTFB_LIB_DEPENDS= libdirectfb.so:${PORTSDIR}/devel/directfb DIRECTFB_CMAKE_ON= -DWITH_DIRECTFB=ON DIRECTFB_USE= gcc=yes | +.if ${PORT_OPTIONS:MGSTREAMER} | +CMAKE_ARGS+= -DWITH_GSTREAMER=ON | +USE_GSTREAMER= yes | +.else | +CMAKE_ARGS+= -DWITH_GSTREAMER=OFF | +.endif GSTREAMER_CMAKE_ON= -DWITH_GSTREAMER=ON GSTREAMER_CMAKE_OFF= -DWITH_GSTREAMER=OFF GSTREAMER_USE= gstreamer=yes And so on. -- Mathieu Arnold
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7E3F90C451355FBA1A00A827>