Date: Wed, 23 Apr 2014 20:42:47 +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: r351972 - in head/graphics: libwmf libwmf-nox11 Message-ID: <201404232042.s3NKglWU032167@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed Apr 23 20:42:47 2014 New Revision: 351972 URL: http://svnweb.freebsd.org/changeset/ports/351972 QAT: https://qat.redports.org/buildarchive/r351972/ Log: Move the -nox11 PKGNAMESUFFIX to the -nox11 slave and simplify CONFLICTS Suggested in: ports/188785 followup Modified: head/graphics/libwmf-nox11/Makefile head/graphics/libwmf/Makefile Modified: head/graphics/libwmf-nox11/Makefile ============================================================================== --- head/graphics/libwmf-nox11/Makefile Wed Apr 23 20:31:48 2014 (r351971) +++ head/graphics/libwmf-nox11/Makefile Wed Apr 23 20:42:47 2014 (r351972) @@ -1,10 +1,13 @@ # Created by: mm@FreeBSD.org # $FreeBSD$ +PKGNAMESUFFIX= -nox11 PORTSCOUT= ignore:1 +CONFLICTS= libwmf-[0-9]* MASTERDIR= ${.CURDIR}/../libwmf OPTIONS_EXCLUDE= X11 OPTIONS_FILE_UNSET= X11 + .include "${MASTERDIR}/Makefile" Modified: head/graphics/libwmf/Makefile ============================================================================== --- head/graphics/libwmf/Makefile Wed Apr 23 20:31:48 2014 (r351971) +++ head/graphics/libwmf/Makefile Wed Apr 23 20:42:47 2014 (r351972) @@ -17,6 +17,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 +CONFLICTS?= libwmf-nox11-[0-9]* + USE_AUTOTOOLS= libtool USE_GNOME= libxml2 GNU_CONFIGURE= yes @@ -33,14 +35,8 @@ OPTIONS_SUB= yes X11_USE= XORG=x11 X11_CONFIGURE_OFF=--with-x=no -.include <bsd.port.options.mk> -.if ! ${PORT_OPTIONS:MX11} -PKGNAMESUFFIX= -nox11 -CONFLICTS+= libwmf-[0-9]* -.else -CONFLICTS+= libwmf-nox11-[0-9]* -.endif +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404232042.s3NKglWU032167>