Attachment #230211 for bug #260505

View | Details | Raw Unified | Return to bug 260505
Collapse All | Expand All




# Created by: Ron van Daal

PORTNAME=	GraphicsMagick
DISTVERSION=	1.3.37
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	graphics
MASTER_SITES=	SF
		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${PORTVERSION:R}/

MAINTAINER=	sunpoet@FreeBSD.org
COMMENT=	Fast image processing tools based on ImageMagick

LICENSE=	MIT

USES=		cpe libtool localbase pathfix tar:xz
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

INSTALL_TARGET=	install-strip
TEST_TARGET=	check

CONFIGURE_ENV=	PTHREAD_LIBS=-lpthread
CONFIGURE_ARGS=	--enable-shared --enable-static \
		--with-windows-font-dir=${WINDOWS_FONT_DIR} \
		--without-perl --without-trio
CONFIGURE_ENV=	PTHREAD_LIBS=-lpthread
GNU_CONFIGURE=	yes
INSTALL_TARGET=	install-strip
TEST_TARGET=	check
USE_LDCONFIG=	yes

# Use fonts installed by x11-fonts/webfonts by default
WINDOWS_FONT_DIR?=	${LOCALBASE}/share/fonts/webfonts

OPTIONS_DEFINE=	DOCS FPX FREETYPE JASPER JBIG JPEG LCMS2 OPENMP Q8BIT PNG TEST TIFF WEBP WMF X11 XML ZSTD
OPTIONS_DEFAULT=FREETYPE JASPER JBIG JPEG LCMS2 OPENMP PNG TIFF WEBP WMF X11 XML
Q8BIT_DESC=	Use 8-bit pixels (speed) instead of 16-bit (quality)
UMEM_DESC=	UMEM memory allocation library support
TEST_DESC=	Run bundled self-tests after build

BZIP2_CONFIGURE_WITH=	bzlib
FPX_CONFIGURE_WITH=	fpx
FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
FPX_CONFIGURE_WITH=	fpx
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
FREETYPE_CONFIGURE_WITH=ttf
JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
JASPER_CONFIGURE_WITH=	jp2
JBIG_LIB_DEPENDS=	libjbig.so:graphics/jbigkit
JBIG_CONFIGURE_WITH=	jbig
JPEG_USES=		jpeg
JPEG_CONFIGURE_WITH=	jpeg
LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
LCMS2_CONFIGURE_WITH=	lcms2
OPENMP_CONFIGURE_OFF=	--disable-openmp --without-threads
OPENMP_CONFIGURE_ON=	--disable-openmp-slow --enable-openmp --with-threads
PNG_CONFIGURE_WITH=	png
PNG_LIB_DEPENDS=	libpng.so:graphics/png
PNG_CONFIGURE_WITH=	png
Q8BIT_CONFIGURE_OFF=	--with-quantum-depth=16
Q8BIT_CONFIGURE_ON=	--with-quantum-depth=8
Q8BIT_PLIST_SUB=	Q=8
Q8BIT_PLIST_SUB_OFF=	Q=16
TEST_BUILD_DEPENDS=	webfonts>=0:x11-fonts/webfonts
TEST_RUN_DEPENDS=	webfonts>=0:x11-fonts/webfonts
TIFF_CONFIGURE_WITH=	tiff
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH=	tiff
WEBP_CONFIGURE_WITH=	webp
WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
WEBP_CONFIGURE_WITH=	webp
WMF_CONFIGURE_WITH=	wmf
X11_CONFIGURE_OFF=	ac_cv_lib_ICE_IceConnectionNumber=no
X11_CONFIGURE_WITH=	x
X11_USES=		xorg
X11_USE=		XORG=ice,sm,x11,xext
X11_CONFIGURE_OFF=	ac_cv_lib_ICE_IceConnectionNumber=no
X11_CONFIGURE_WITH=	x
XML_USES=		gnome
XML_USE=		GNOME=libxml2
XML_CONFIGURE_WITH=	xml
ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
ZSTD_CONFIGURE_WITH=	zstd

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MOPENMP}
.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le
USES+=		compiler:gcc-c++11-lib
.endif
.endif

.if ${PORT_OPTIONS:MSSE}
.if ${MACHINE_CPU:Msse}
CFLAGS+=	-msse
.endif
.if ${MACHINE_CPU:Msse2}
CFLAGS+=	-msse2
.endif
.if ${MACHINE_CPU:Msse3}
CFLAGS+=	-msse3
.endif
.endif

.if ${PORT_OPTIONS:MWMF}
.if ${PORT_OPTIONS:MX11}
LIB_DEPENDS+=	libwmflite.so:graphics/libwmf

Lines 1-3 Link Here

(-)b/graphics/GraphicsMagick/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1609598843	1	TIMESTAMP = 1639387126
2	SHA256 (GraphicsMagick-1.3.36.tar.bz2) = 2017829803cb0810bbc8284eee703dfeb1ac0a46f5a39940d30b4a2f5eeae435	2	SHA256 (GraphicsMagick-1.3.37.tar.xz) = 90dc22f1a7bd240e4c9065a940962bf13da43c99bcc36cb111cc3c1a0d7477d4
3	SIZE (GraphicsMagick-1.3.36.tar.bz2) = 8464166	3	SIZE (GraphicsMagick-1.3.37.tar.xz) = 5623688

Added Link Here

(-)b/graphics/GraphicsMagick/files/patch-utilities_tests_convert.tap (+11 lines)
1	--- utilities/tests/convert.tap.orig 2021-12-17 20:43:52 UTC
2	+++ utilities/tests/convert.tap
3	@@ -8,7 +8,7 @@
4	commands=${top_srcdir}/utilities/tests/convert-cmds.txt
5
6	# Count how many commands there are
7	-count=`wc -l ${commands} \| sed -e 's/ .*//'`
8	+count=`sed -n '$=' ${commands}`
9
10	# Number of tests we plan to execute
11	test_plan_fn ${count}




lib/libGraphicsMagick++.a
lib/libGraphicsMagick++.so
lib/libGraphicsMagick++.so.12
lib/libGraphicsMagick++.so.12.5.1
lib/libGraphicsMagick.a
lib/libGraphicsMagick.so
lib/libGraphicsMagick.so.3
lib/libGraphicsMagick.so.3.23.0
lib/libGraphicsMagickWand.a
lib/libGraphicsMagickWand.so
lib/libGraphicsMagickWand.so.2
lib/libGraphicsMagickWand.so.2.9.6
libdata/pkgconfig/GraphicsMagick++.pc
libdata/pkgconfig/GraphicsMagick.pc
libdata/pkgconfig/GraphicsMagickWand.pc

%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2017
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2018
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2019
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2020
%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2001.html

%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2017.html
%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2018.html
%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2019.html
%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2020.html
%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
%%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html

Return to bug 260505

Lines 1-99 Link Here

(-)b/graphics/GraphicsMagick/Makefile (-43 / +26 lines)
1	# Created by: Ron van Daal	1	# Created by: Ron van Daal
2		2
3	PORTNAME= GraphicsMagick	3	PORTNAME= GraphicsMagick
4	PORTVERSION= 1.3.36	4	DISTVERSION= 1.3.37
5	PORTREVISION= 1
6	PORTEPOCH= 1	5	PORTEPOCH= 1
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= SF \	7	MASTER_SITES= SF
9	ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${PORTVERSION:R}/
10		8
11	MAINTAINER= sunpoet@FreeBSD.org	9	MAINTAINER= sunpoet@FreeBSD.org
12	COMMENT= Fast image processing tools based on ImageMagick	10	COMMENT= Fast image processing tools based on ImageMagick
13		11
14	LICENSE= MIT	12	LICENSE= MIT
15		13
16	USES= cpe libtool localbase pathfix tar:bzip2	14	USES= cpe libtool localbase pathfix tar:xz
		15	GNU_CONFIGURE= yes
		16	USE_LDCONFIG= yes
		17
		18	INSTALL_TARGET= install-strip
		19	TEST_TARGET= check
17		20
		21	CONFIGURE_ENV= PTHREAD_LIBS=-lpthread
18	CONFIGURE_ARGS= --enable-shared --enable-static \	22	CONFIGURE_ARGS= --enable-shared --enable-static \
19	--with-windows-font-dir=${WINDOWS_FONT_DIR} \	23	--with-windows-font-dir=${WINDOWS_FONT_DIR} \
20	--without-perl --without-trio	24	--without-perl --without-trio
21	CONFIGURE_ENV= PTHREAD_LIBS=-lpthread
22	GNU_CONFIGURE= yes
23	INSTALL_TARGET= install-strip
24	TEST_TARGET= check
25	USE_LDCONFIG= yes
26		25
27	# Use fonts installed by x11-fonts/webfonts by default	26	# Use fonts installed by x11-fonts/webfonts by default
28	WINDOWS_FONT_DIR?= ${LOCALBASE}/share/fonts/webfonts	27	WINDOWS_FONT_DIR?= ${LOCALBASE}/share/fonts/webfonts
29		28
30	OPTIONS_DEFINE= BZIP2 DOCS FPX FREETYPE JASPER JBIG JPEG LCMS2 LZMA OPENMP Q8BIT PNG SSE TEST TIFF UMEM WEBP WMF X11 XML ZLIB ZSTD	29	OPTIONS_DEFINE= DOCS FPX FREETYPE JASPER JBIG JPEG LCMS2 OPENMP Q8BIT PNG TEST TIFF WEBP WMF X11 XML ZSTD
31	OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB	30	OPTIONS_DEFAULT=FREETYPE JASPER JBIG JPEG LCMS2 OPENMP PNG TIFF WEBP WMF X11 XML
32	Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16-bit (quality)	31	Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16-bit (quality)
33	UMEM_DESC= UMEM memory allocation library support	32	UMEM_DESC= UMEM memory allocation library support
34	TEST_DESC= Run bundled self-tests after build	33	TEST_DESC= Run bundled self-tests after build
35		34
36	BZIP2_CONFIGURE_WITH= bzlib
37	FPX_CONFIGURE_WITH= fpx
38	FPX_LIB_DEPENDS= libfpx.so:graphics/libfpx	35	FPX_LIB_DEPENDS= libfpx.so:graphics/libfpx
39	FREETYPE_CONFIGURE_WITH=ttf	36	FPX_CONFIGURE_WITH= fpx
40	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2	37	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
41	JASPER_CONFIGURE_WITH= jp2	38	FREETYPE_CONFIGURE_WITH=ttf
42	JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper	39	JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper
43	JBIG_CONFIGURE_WITH= jbig	40	JASPER_CONFIGURE_WITH= jp2
44	JBIG_LIB_DEPENDS= libjbig.so:graphics/jbigkit	41	JBIG_LIB_DEPENDS= libjbig.so:graphics/jbigkit
45	JPEG_CONFIGURE_WITH= jpeg	42	JBIG_CONFIGURE_WITH= jbig
46	JPEG_USES= jpeg	43	JPEG_USES= jpeg
47	LCMS2_CONFIGURE_WITH= lcms2	44	JPEG_CONFIGURE_WITH= jpeg
48	LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2	45	LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2
49	LZMA_CONFIGURE_WITH= lzma	46	LCMS2_CONFIGURE_WITH= lcms2
50	OPENMP_CONFIGURE_OFF= --disable-openmp --without-threads	47	OPENMP_CONFIGURE_OFF= --disable-openmp --without-threads
51	OPENMP_CONFIGURE_ON= --disable-openmp-slow --enable-openmp --with-threads	48	OPENMP_CONFIGURE_ON= --disable-openmp-slow --enable-openmp --with-threads
52	PNG_CONFIGURE_WITH= png
53	PNG_LIB_DEPENDS= libpng.so:graphics/png	49	PNG_LIB_DEPENDS= libpng.so:graphics/png
		50	PNG_CONFIGURE_WITH= png
54	Q8BIT_CONFIGURE_OFF= --with-quantum-depth=16	51	Q8BIT_CONFIGURE_OFF= --with-quantum-depth=16
55	Q8BIT_CONFIGURE_ON= --with-quantum-depth=8	52	Q8BIT_CONFIGURE_ON= --with-quantum-depth=8
56	Q8BIT_PLIST_SUB= Q=8	53	Q8BIT_PLIST_SUB= Q=8
57	Q8BIT_PLIST_SUB_OFF= Q=16	54	Q8BIT_PLIST_SUB_OFF= Q=16
58	TEST_BUILD_DEPENDS= webfonts>=0:x11-fonts/webfonts	55	TEST_BUILD_DEPENDS= webfonts>=0:x11-fonts/webfonts
59	TEST_RUN_DEPENDS= webfonts>=0:x11-fonts/webfonts	56	TEST_RUN_DEPENDS= webfonts>=0:x11-fonts/webfonts
60	TIFF_CONFIGURE_WITH= tiff
61	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff	57	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
62	UMEM_CONFIGURE_WITH= umem	58	TIFF_CONFIGURE_WITH= tiff
63	WEBP_CONFIGURE_WITH= webp
64	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp	59	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
		60	WEBP_CONFIGURE_WITH= webp
65	WMF_CONFIGURE_WITH= wmf	61	WMF_CONFIGURE_WITH= wmf
66	X11_CONFIGURE_OFF= ac_cv_lib_ICE_IceConnectionNumber=no
67	X11_CONFIGURE_WITH= x
68	X11_USES= xorg	62	X11_USES= xorg
69	X11_USE= XORG=ice,sm,x11,xext	63	X11_USE= XORG=ice,sm,x11,xext
70	XML_CONFIGURE_WITH= xml	64	X11_CONFIGURE_OFF= ac_cv_lib_ICE_IceConnectionNumber=no
71	XML_USE= GNOME=libxml2	65	X11_CONFIGURE_WITH= x
72	XML_USES= gnome	66	XML_USES= gnome
73	ZLIB_CONFIGURE_WITH= zlib	67	XML_USE= GNOME=libxml2
74	ZSTD_CONFIGURE_WITH= zstd	68	XML_CONFIGURE_WITH= xml
75	ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd	69	ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
		70	ZSTD_CONFIGURE_WITH= zstd
76		71
77	.include <bsd.port.options.mk>	72	.include <bsd.port.options.mk>
78		73
79	.if ${PORT_OPTIONS:MOPENMP}	74	.if ${PORT_OPTIONS:MOPENMP}
80	.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le	75	.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le
81	USES+= compiler:gcc-c++11-lib	76	USES+= compiler:gcc-c++11-lib
82	.endif	77	.endif
83	.endif	78	.endif
84		79
85	.if ${PORT_OPTIONS:MSSE}
86	.if ${MACHINE_CPU:Msse}
87	CFLAGS+= -msse
88	.endif
89	.if ${MACHINE_CPU:Msse2}
90	CFLAGS+= -msse2
91	.endif
92	.if ${MACHINE_CPU:Msse3}
93	CFLAGS+= -msse3
94	.endif
95	.endif
96
97	.if ${PORT_OPTIONS:MWMF}	80	.if ${PORT_OPTIONS:MWMF}
98	.if ${PORT_OPTIONS:MX11}	81	.if ${PORT_OPTIONS:MX11}
99	LIB_DEPENDS+= libwmflite.so:graphics/libwmf	82	LIB_DEPENDS+= libwmflite.so:graphics/libwmf

Lines 95-109 lib/GraphicsMagick/config/type.mgk Link Here

(-)b/graphics/GraphicsMagick/pkg-plist (-3 / +5 lines)
95	lib/libGraphicsMagick++.a	95	lib/libGraphicsMagick++.a
96	lib/libGraphicsMagick++.so	96	lib/libGraphicsMagick++.so
97	lib/libGraphicsMagick++.so.12	97	lib/libGraphicsMagick++.so.12
98	lib/libGraphicsMagick++.so.12.5.0	98	lib/libGraphicsMagick++.so.12.5.1
99	lib/libGraphicsMagick.a	99	lib/libGraphicsMagick.a
100	lib/libGraphicsMagick.so	100	lib/libGraphicsMagick.so
101	lib/libGraphicsMagick.so.3	101	lib/libGraphicsMagick.so.3
102	lib/libGraphicsMagick.so.3.22.0	102	lib/libGraphicsMagick.so.3.23.0
103	lib/libGraphicsMagickWand.a	103	lib/libGraphicsMagickWand.a
104	lib/libGraphicsMagickWand.so	104	lib/libGraphicsMagickWand.so
105	lib/libGraphicsMagickWand.so.2	105	lib/libGraphicsMagickWand.so.2
106	lib/libGraphicsMagickWand.so.2.9.5	106	lib/libGraphicsMagickWand.so.2.9.6
107	libdata/pkgconfig/GraphicsMagick++.pc	107	libdata/pkgconfig/GraphicsMagick++.pc
108	libdata/pkgconfig/GraphicsMagick.pc	108	libdata/pkgconfig/GraphicsMagick.pc
109	libdata/pkgconfig/GraphicsMagickWand.pc	109	libdata/pkgconfig/GraphicsMagickWand.pc
Lines 136-141 man/man5/quantize.5.gz Link Here
136	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2017	136	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2017
137	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2018	137	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2018
138	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2019	138	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2019
		139	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2020
139	%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt	140	%%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
140	%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt	141	%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
141	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2001.html	142	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2001.html
Lines 157-162 man/man5/quantize.5.gz Link Here
157	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2017.html	158	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2017.html
158	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2018.html	159	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2018.html
159	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2019.html	160	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2019.html
		161	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2020.html
160	%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html	162	%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
161	%%PORTDOCS%%%%DOCSDIR%%/www/Changes.html	163	%%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
162	%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html	164	%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html