Date: Tue, 22 Apr 2014 18:40:24 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351871 - head/graphics/libwmf Message-ID: <201404221840.s3MIeOEG071367@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Tue Apr 22 18:40:24 2014 New Revision: 351871 URL: http://svnweb.freebsd.org/changeset/ports/351871 QAT: https://qat.redports.org/buildarchive/r351871/ Log: - Fix package build as non-root - Use option helpers Note that the CONFLICT with the -nox11 variant is not registered anymore. PR: ports/188785 Submitted by: John Hein <john.hein@microsemi.com> Modified: head/graphics/libwmf/Makefile Modified: head/graphics/libwmf/Makefile ============================================================================== --- head/graphics/libwmf/Makefile Tue Apr 22 18:31:13 2014 (r351870) +++ head/graphics/libwmf/Makefile Tue Apr 22 18:40:24 2014 (r351871) @@ -29,20 +29,12 @@ PORTDOCS= * OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 +OPTIONS_SUB= yes +X11_USE= XORG=x11 +X11_CONFIGURE_OFF=--with-x=no .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 -PLIST_SUB+= X11="" -CONFLICTS+= libwmf-nox11-0.* -.else -PKGNAMESUFFIX= -nox11 -CONFIGURE_ARGS+= --with-x=no -PLIST_SUB+= X11="@comment " -CONFLICTS+= libwmf-0.* -.endif - post-patch: @${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \ ${WRKSRC}/Makefile.in @@ -57,7 +49,6 @@ post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \ ${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf - - @${CHOWN} -R ${SHAREOWN}:${SHAREGROUP} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404221840.s3MIeOEG071367>