Date: Thu, 6 Feb 2014 19:14:10 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343140 - head/net/vde2 Message-ID: <201402061914.s16JEA0d083299@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Thu Feb 6 19:14:10 2014 New Revision: 343140 URL: http://svnweb.freebsd.org/changeset/ports/343140 QAT: https://qat.redports.org/buildarchive/r343140/ Log: - Stage support - Use OPTIONS helpers Modified: head/net/vde2/Makefile head/net/vde2/pkg-plist Modified: head/net/vde2/Makefile ============================================================================== --- head/net/vde2/Makefile Thu Feb 6 19:01:25 2014 (r343139) +++ head/net/vde2/Makefile Thu Feb 6 19:14:10 2014 (r343140) @@ -12,44 +12,22 @@ COMMENT= User-mode virtual ethernet infr LICENSE= BSD GPLv2 LGPL21 LICENSE_COMB= multi -OPTIONS_DEFINE= PYTHON -OPTIONS_DEFAULT= PYTHON - CONFLICTS= vde-[0-9]* -USES= pathfix -USE_GMAKE= yes +USES= gmake pathfix GNU_CONFIGURE= yes USE_LDCONFIG= yes +MAKE_ENV= V=1 MAKE_JOBS_UNSAFE=yes -MLINKS= unixcmd.1 vdecmd.1 \ - vdeq.1 vdeqemu.1 \ - vdeq.1 vdekvm.1 -MAN1= dpipe.1 slirpvde.1 unixcmd.1 unixterm.1 \ - vde_autolink.1 vde_cryptcab.1 vde_l3.1 vde_over_ns.1 \ - vde_pcapplug.1 vde_plug.1 vde_plug2tap.1 vde_switch.1 \ - vdeq.1 vdetaplib.1 vdeterm.1 wirefilter.1 -MAN8= vde_tunctl.8 - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPYTHON} -CONFIGURE_ARGS+=--disable-python -PLIST_SUB+= PYTHON="@comment " -.else -USE_PYTHON= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -PLIST_SUB+= PYTHON="" -.endif - -.include <bsd.port.pre.mk> - -.if defined(BATCH) || defined(PACKAGE_BUILDING) -MAKE_ENV+= V=1 -.endif +OPTIONS_DEFINE= PYTHON +OPTIONS_DEFAULT= PYTHON + +OPTIONS_SUB= yes +PYTHON_CONFIGURE_OFF= --disable-python +PYTHON_USE= PYTHON=yes +PYTHON_CPPFLAGS= -I${LOCALBASE}/include +PYTHON_LDFLAGS= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e '/-Wall/s|-O2||g' \ @@ -59,4 +37,9 @@ post-patch: @${REINPLACE_CMD} -e 's|^AM_CFLAGS|#AM_CFLAGS|g' \ ${WRKSRC}/src/slirpvde/Makefile.in -.include <bsd.port.post.mk> +post-install: + ${LN} -sf unixcmd.1 ${STAGEDIR}${PREFIX}/man/man1/vdecmd.1 + ${LN} -sf vdeq.1 ${STAGEDIR}${PREFIX}/man/man1/vdeqemu.1 + ${LN} -sf vdeq.1 ${STAGEDIR}${PREFIX}/man/man1/vdekvm.1 + +.include <bsd.port.mk> Modified: head/net/vde2/pkg-plist ============================================================================== --- head/net/vde2/pkg-plist Thu Feb 6 19:01:25 2014 (r343139) +++ head/net/vde2/pkg-plist Thu Feb 6 19:14:10 2014 (r343140) @@ -55,6 +55,26 @@ libdata/pkgconfig/vdehist.pc libdata/pkgconfig/vdemgmt.pc libdata/pkgconfig/vdeplug.pc libdata/pkgconfig/vdesnmp.pc +man/man1/dpipe.1.gz +man/man1/slirpvde.1.gz +man/man1/unixcmd.1.gz +man/man1/unixterm.1.gz +man/man1/vde_autolink.1.gz +man/man1/vde_cryptcab.1.gz +man/man1/vde_l3.1.gz +man/man1/vde_over_ns.1.gz +man/man1/vde_pcapplug.1.gz +man/man1/vde_plug.1.gz +man/man1/vde_plug2tap.1.gz +man/man1/vde_switch.1.gz +man/man1/vdecmd.1.gz +man/man1/vdekvm.1.gz +man/man1/vdeq.1.gz +man/man1/vdeqemu.1.gz +man/man1/vdetaplib.1.gz +man/man1/vdeterm.1.gz +man/man1/wirefilter.1.gz +man/man8/vde_tunctl.8.gz @dirrm lib/vde2/vde_l3 @dirrm lib/vde2 @dirrm etc/vde2/libvdemgmt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402061914.s16JEA0d083299>