diff options
| author | antoine <antoine@FreeBSD.org> | 2014-04-24 04:42:47 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-04-24 04:42:47 +0800 |
| commit | 472c8ba8fa8b40c339fc567fa0622f22756df595 (patch) | |
| tree | f02bb7b4a714d86f4a532cefa738db018442f51f | |
| parent | c6568456fc4163a1d506acf97e8f572f6fff7d6f (diff) | |
| download | freebsd-ports-graphics-472c8ba8fa8b40c339fc567fa0622f22756df595.tar.gz freebsd-ports-graphics-472c8ba8fa8b40c339fc567fa0622f22756df595.tar.zst freebsd-ports-graphics-472c8ba8fa8b40c339fc567fa0622f22756df595.zip | |
Move the -nox11 PKGNAMESUFFIX to the -nox11 slave and simplify CONFLICTS
Suggested in: ports/188785 followup
| -rw-r--r-- | graphics/libwmf-nox11/Makefile | 3 | ||||
| -rw-r--r-- | graphics/libwmf/Makefile | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/graphics/libwmf-nox11/Makefile b/graphics/libwmf-nox11/Makefile index d0d983cf038..f19599300bc 100644 --- a/graphics/libwmf-nox11/Makefile +++ b/graphics/libwmf-nox11/Makefile @@ -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" diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index f80ac0830c9..9105d26dd03 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -17,6 +17,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ 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' \ |