Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Nov 2021 12:35:09 GMT
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 10672193d0da - main - graphics/autotrace: fix package build by disabling one of conflicting options
Message-ID:  <202111171235.1AHCZ9i3033574@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=10672193d0daad0be9520df775f4c4d8d7e49ba6

commit 10672193d0daad0be9520df775f4c4d8d7e49ba6
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2021-11-17 10:44:06 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2021-11-17 12:34:17 +0000

    graphics/autotrace: fix package build by disabling one of conflicting options
    
    autotrace (optionally) pulls both imagemagick6 and pstoedit, while
    the latter also pulls imagemagick7. Since imagemagick6 conflicts
    with imagemagick7 and autotrace does not support imagemagick7, one
    of the options need to be disabled by default to avoid the conflict.
    Disabling PSTOEDIT in assumption that raster image support would be
    more useful than postscript support.
    
    Approved by:    portmgr blanket
---
 graphics/autotrace/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 3017e51ea673..b2d03ed1272f 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -23,7 +23,7 @@ LDFLAGS+=	$$(libpng-config --L_opts)
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	IMAGEMAGICK MING PSTOEDIT
-OPTIONS_DEFAULT=IMAGEMAGICK PSTOEDIT
+OPTIONS_DEFAULT=IMAGEMAGICK
 MING_DESC=	Enable swf interface
 PSTOEDIT_DESC=	Convert postscript to other formats
 
@@ -46,4 +46,5 @@ post-patch:
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libautotrace.so
+
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111171235.1AHCZ9i3033574>