Attachment #139651 for bug #185935

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




# $FreeBSD: head/graphics/GraphicsMagick13/Makefile 337729 2013-12-27 13:13:47Z thierry $

PORTNAME=	GraphicsMagick
PORTVERSION=	1.3.19
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	SF \
		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/

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

LIB_DEPENDS=	libjbig.so:${PORTSDIR}/graphics/jbigkit		\
		libpng15.so:${PORTSDIR}/graphics/png		\
		libjbig.so:${PORTSDIR}/graphics/jbigkit		\
		libjasper.so:${PORTSDIR}/graphics/jasper	\
		libjpeg.so:${PORTSDIR}/graphics/jpeg		\
		liblcms2.so:${PORTSDIR}/graphics/lcms2		\
		libpng15.so:${PORTSDIR}/graphics/png		\
		libtiff.so:${PORTSDIR}/graphics/tiff		\
		libfreetype.so:${PORTSDIR}/print/freetype2

CONFLICTS=	GraphicsMagick-1.[12].* GraphicsMagick12-*

OPTIONS_DEFINE=	Q8BIT FPX OPENMP SSE TESTS X11 DOCS

Q8BIT_DESC=	Use 8-bit pixels (speed) instead of 16 (quality)
DPS_DESC=	Enable Display Ghostscript support
TESTS_DESC=	Run bundled self-tests after build

OPTIONS_DEFAULT=FPX DPS OPENMP X11 TESTS DOCS
OPTIONS_SINGLE=	X11
OPTIONS_SINGLE_X11=	DPS

PORTSCOUT=	limit:^1\.3\.

USES=		iconv
USE_AUTOTOOLS=	libtool libltdl
USE_BZIP2=	yes
USES=		iconv
USE_GNOME=	libxml2
USE_GHOSTSCRIPT=yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	PTHREAD_CFLAGS=" " PTHREAD_LIBS="-pthread"
CONFIGURE_ARGS=	--without-perl --enable-shared --enable-static \
		--with-quantum-depth="${QD}" \
		--with-windows-font-dir="${WINDOWS_FONT_DIR}"
CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
USE_LDCONFIG=	yes

PLIST_SUB=	Q="${QD}"

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE=		DOCS FPX OPENMP Q8BIT SSE TESTS WEBP X11
OPTIONS_SINGLE=		X11
OPTIONS_SINGLE_X11=	DPS
OPTIONS_DEFAULT=	DPS OPENMP TESTS WEBP X11

DPS_DESC=		Enable Display Ghostscript support
DPS_LIB_DEPENDS=	libdps.so:${PORTSDIR}/x11/dgs
DPS_USE=		XORG=xt
DPS_CONFIGURE_WITH=	dps
FPX_LIB_DEPENDS+=	libfpx.so.[2-9]:${PORTSDIR}/graphics/libfpx
FPX_CONFIGURE_WITH=	fpx
OPENMP_USES=		compiler:openmp
OPENMP_CONFIGURE_ON=	--with-threads --enable-openmp --disable-openmp-slow
OPENMP_CONFIGURE_OFF=	--without-threads --disable-openmp
Q8BIT_DESC=		Use 8-bit pixels (speed) instead of 16 (quality)
TESTS_DESC=		Run bundled self-tests after build
TESTS_BUILD_DEPENDS=	webfonts>0:${PORTSDIR}/x11-fonts/webfonts
TESTS_RUN_DEPENDS=	webfonts>0:${PORTSDIR}/x11-fonts/webfonts
WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
WEBP_CONFIGURE_WITH=	webp
X11_LIB_DEPENDS=	libwmflite.so:${PORTSDIR}/graphics/${LIBWMF_PORT}
X11_USE=		XORG=xext
X11_CONFIGURE_WITH=	x

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MQ8BIT}
QD=		8
.else
QD=		16
.endif

.if ${PORT_OPTIONS:MSSE}

.endif
.endif

.if ${PORT_OPTIONS:MX11}
LIBWMF_PORT=	libwmf
CONFIGURE_ARGS+=	--with-fpx
.else
LIBWMF_PORT=	libwmf-nox11
.endif

.include <bsd.port.pre.mk>
USE_XORG+=		xt
LIB_DEPENDS+=		libdps.so:${PORTSDIR}/x11/dgs
CONFIGURE_ARGS+=	--with-dps
.else
CONFIGURE_ARGS+=	--without-dps
.endif

.if ${OSVERSION} >= 1000024
.if ${PORT_OPTIONS:MFPX} && ${PORT_OPTIONS:MOPENMP}
IGNORE=		Cause C++ ABI conflict between clang/libc++ and gcc/libstdc++
.endif

LDFLAGS+=		${PTHREAD_LIBS}
CONFIGURE_ARGS+=	--with-threads --enable-openmp --disable-openmp-slow
.else
CONFIGURE_ARGS+=	--without-threads --disable-openmp
.endif

.if !defined(WINDOWS_FONT_DIR)
# Use fonts installed by x11-fonts/webfonts by default
WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts
.endif

.if defined(WITH_WINDOWS_FONT_DIR)
CONFIGURE_ARGS+=	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
.endif

.if ${PORT_OPTIONS:MX11} == ""
CONFIGURE_ARGS+=--without-x
LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf-nox11
.else
USE_XORG+=		xext
LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf
.endif

.if ${PORT_OPTIONS:MQ8BIT}
CONFIGURE_ARGS+=	--with-quantum-depth=8
QD=			8
.else
CONFIGURE_ARGS+=	--with-quantum-depth=16
QD=			16
.endif
PLIST_SUB+=		Q=${QD}

.if ${PORT_OPTIONS:MTESTS}
post-build:: regression-test
.else
post-build::
	#

.endif

post-install:
.for i in coders filters
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q${QD}/${i}
.endfor

regression-test: do-build
	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		${MAKEFILE} ${MAKE_ARGS} check)

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)graphics/GraphicsMagick13/distinfo (-2 / +2 lines)
1	SHA256 (GraphicsMagick-1.3.18.tar.bz2) = 768b89a685d29b0e463ade21bc0649f2727800ebc5a8e13fa6fc17ccb9da769b	1	SHA256 (GraphicsMagick-1.3.19.tar.bz2) = b57cdeb1ab9492b667776bbbc265149eda5601d2c572d65f43b44273e892fff1
2	SIZE (GraphicsMagick-1.3.18.tar.bz2) = 7259418	2	SIZE (GraphicsMagick-1.3.19.tar.bz2) = 7252296




--- Makefile.in.orig	2008-11-17 17:54:43.000000000 -0500
+++ Makefile.in	2008-11-17 17:55:27.000000000 -0500
@@ -9600,7 +9600,7 @@
 info-am:
 
 install-data-am: install-codersLTLIBRARIES install-configlibDATA \
-	install-configshareDATA install-data-local install-docDATA \
+	install-configshareDATA install-data-local \
 	install-filtersLTLIBRARIES install-includeHEADERS \
 	install-ltdlincludeHEADERS install-magickincHEADERS \
 	install-magickppincHEADERS install-magickpptopincHEADERS \
@@ -10006,8 +10006,7 @@
 	$(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS)
 
 install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \
-	$(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \
-	$(HTML_INSTALL_DATA_TARGETS)
+	$(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS)
 
 uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
 	$(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \




--- configure.orig	2013-03-10 00:21:59.000000000 +0100
+++ configure	2013-12-27 11:48:19.000000000 +0100
@@ -24637,15 +24637,16 @@
     # Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build.
     # Adobe DPS (as delivered on Solaris) doesn't require -lXt.
     # GraphicsMagick itself doesn't use -lXt.

 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -27095,7 +27096,7 @@
 fi
 
 
-    ac_fn_c_check_header_compile "$LINENO" "freetype/freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
+    ac_fn_c_check_header_compile "$LINENO" "freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
 "
 if test "x$ac_cv_header_freetype_freetype_h" = xyes; then :
   have_freetype_h='yes'
@@ -26935,7 +26936,7 @@
 #
 
 # Subdirectory under lib to place GraphicsMagick lib files

 
 cat >>confdefs.h <<_ACEOF
 #define MagickLibSubdir "$MagickLibSubdir"
@@ -27199,7 +27200,7 @@
 
 #
 # Path to GraphicsMagick share files

Lines 89-94 Link Here

(-)graphics/GraphicsMagick13/pkg-plist (-1 / +3 lines)
89	lib/GraphicsMagick/config/type-solaris.mgk	89	lib/GraphicsMagick/config/type-solaris.mgk
90	lib/GraphicsMagick/config/type-windows.mgk	90	lib/GraphicsMagick/config/type-windows.mgk
91	lib/GraphicsMagick/config/type.mgk	91	lib/GraphicsMagick/config/type.mgk
		92	@exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%
		93	@exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%/coders
		94	@exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%/filters
92	lib/libGraphicsMagick++.a	95	lib/libGraphicsMagick++.a
93	lib/libGraphicsMagick++.la	96	lib/libGraphicsMagick++.la
94	lib/libGraphicsMagick++.so	97	lib/libGraphicsMagick++.so
Lines 289-295 Link Here
289	%%PORTDOCS%%@dirrm %%DOCSDIR%%	292	%%PORTDOCS%%@dirrm %%DOCSDIR%%
290	@dirrm %%DATADIR%%/config	293	@dirrm %%DATADIR%%/config
291	@dirrm %%DATADIR%%	294	@dirrm %%DATADIR%%
292	@dirrmtry libdata/pkgconfig
293	@dirrm lib/GraphicsMagick/modules-Q%%Q%%/filters	295	@dirrm lib/GraphicsMagick/modules-Q%%Q%%/filters
294	@dirrm lib/GraphicsMagick/modules-Q%%Q%%/coders	296	@dirrm lib/GraphicsMagick/modules-Q%%Q%%/coders
295	@dirrm lib/GraphicsMagick/modules-Q%%Q%%	297	@dirrm lib/GraphicsMagick/modules-Q%%Q%%

Return to bug 185935

Lines 2-9 Link Here

(-)graphics/GraphicsMagick13/Makefile (-75 / +55 lines)
2	# $FreeBSD: head/graphics/GraphicsMagick13/Makefile 337729 2013-12-27 13:13:47Z thierry $	2	# $FreeBSD: head/graphics/GraphicsMagick13/Makefile 337729 2013-12-27 13:13:47Z thierry $
3		3
4	PORTNAME= GraphicsMagick	4	PORTNAME= GraphicsMagick
5	PORTVERSION= 1.3.18	5	PORTVERSION= 1.3.19
6	PORTREVISION= 1
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= SF \	7	MASTER_SITES= SF \
9	ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/	8	ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
Lines 13-67 Link Here
13	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Fast image processing tools based on ImageMagick	13	COMMENT= Fast image processing tools based on ImageMagick
15		14
16	LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \	15	LIB_DEPENDS= libjbig.so:${PORTSDIR}/graphics/jbigkit \
17	libpng15.so:${PORTSDIR}/graphics/png \
18	libjbig.so:${PORTSDIR}/graphics/jbigkit \
19	libjasper.so:${PORTSDIR}/graphics/jasper \	16	libjasper.so:${PORTSDIR}/graphics/jasper \
20	libjpeg.so:${PORTSDIR}/graphics/jpeg \	17	libjpeg.so:${PORTSDIR}/graphics/jpeg \
21	liblcms.so:${PORTSDIR}/graphics/lcms \	18	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
		19	libpng15.so:${PORTSDIR}/graphics/png \
22	libtiff.so:${PORTSDIR}/graphics/tiff \	20	libtiff.so:${PORTSDIR}/graphics/tiff \
23	libxml2.so:${PORTSDIR}/textproc/libxml2	21	libfreetype.so:${PORTSDIR}/print/freetype2
24		22
25	CONFLICTS= GraphicsMagick-1.[12].* GraphicsMagick12-*	23	CONFLICTS= GraphicsMagick-1.[12].* GraphicsMagick12-*
26		24
27	OPTIONS_DEFINE= Q8BIT FPX OPENMP SSE TESTS X11 DOCS
28
29	Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16 (quality)
30	DPS_DESC= Enable Display Ghostscript support
31	TESTS_DESC= Run bundled self-tests after build
32
33	OPTIONS_DEFAULT=FPX DPS OPENMP X11 TESTS DOCS
34	OPTIONS_SINGLE= X11
35	OPTIONS_SINGLE_X11= DPS
36
37	PORTSCOUT= limit:^1\.3\.	25	PORTSCOUT= limit:^1\.3\.
38		26
39	USES= iconv
40	USE_AUTOTOOLS= libtool libltdl
41	USE_BZIP2= yes	27	USE_BZIP2= yes
		28	USES= iconv
		29	USE_GNOME= libxml2
42	USE_GHOSTSCRIPT=yes	30	USE_GHOSTSCRIPT=yes
43	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
44		32	CONFIGURE_ENV= PTHREAD_CFLAGS=" " PTHREAD_LIBS="-pthread"
45	CONFIGURE_ARGS= --without-perl --enable-shared --enable-static \	33	CONFIGURE_ARGS= --without-perl --enable-shared --enable-static \
46	--with-ltdl-include=${LOCALBASE}/include \	34	--with-quantum-depth="${QD}" \
47	--with-ltdl-lib=${LOCALBASE}/lib	35	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
48	CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
49	USE_LDCONFIG= yes	36	USE_LDCONFIG= yes
50		37
51	ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`	38	PLIST_SUB= Q="${QD}"
52		39
53	CPPFLAGS+= -I${LOCALBASE}/include	40	CPPFLAGS+= -I${LOCALBASE}/include
54	LDFLAGS+= -L${LOCALBASE}/lib	41	LDFLAGS+= -L${LOCALBASE}/lib
55		42
56	test check:	43	OPTIONS_DEFINE= DOCS FPX OPENMP Q8BIT SSE TESTS WEBP X11
57	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check	44	OPTIONS_SINGLE= X11
		45	OPTIONS_SINGLE_X11= DPS
		46	OPTIONS_DEFAULT= DPS OPENMP TESTS WEBP X11
		47
		48	DPS_DESC= Enable Display Ghostscript support
		49	DPS_LIB_DEPENDS= libdps.so:${PORTSDIR}/x11/dgs
		50	DPS_USE= XORG=xt
		51	DPS_CONFIGURE_WITH= dps
		52	FPX_LIB_DEPENDS+= libfpx.so.[2-9]:${PORTSDIR}/graphics/libfpx
		53	FPX_CONFIGURE_WITH= fpx
		54	OPENMP_USES= compiler:openmp
		55	OPENMP_CONFIGURE_ON= --with-threads --enable-openmp --disable-openmp-slow
		56	OPENMP_CONFIGURE_OFF= --without-threads --disable-openmp
		57	Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16 (quality)
		58	TESTS_DESC= Run bundled self-tests after build
		59	TESTS_BUILD_DEPENDS= webfonts>0:${PORTSDIR}/x11-fonts/webfonts
		60	TESTS_RUN_DEPENDS= webfonts>0:${PORTSDIR}/x11-fonts/webfonts
		61	WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp
		62	WEBP_CONFIGURE_WITH= webp
		63	X11_LIB_DEPENDS= libwmflite.so:${PORTSDIR}/graphics/${LIBWMF_PORT}
		64	X11_USE= XORG=xext
		65	X11_CONFIGURE_WITH= x
58		66
59	.include <bsd.port.options.mk>	67	.include <bsd.port.options.mk>
60		68
61	.if ${PORT_OPTIONS:MDOCS} == ""	69	.if ${PORT_OPTIONS:MQ8BIT}
62	# Get rid of the Makefile targets that install the documentation	70	QD= 8
63	# and HTML files into DOCSDIR	71	.else
64	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in	72	QD= 16
65	.endif	73	.endif
66		74
67	.if ${PORT_OPTIONS:MSSE}	75	.if ${PORT_OPTIONS:MSSE}
Lines 76-135 Link Here
76	.endif	84	.endif
77	.endif	85	.endif
78		86
79	.if ${PORT_OPTIONS:MFPX}	87	.if ${PORT_OPTIONS:MX11}
80	LIB_DEPENDS+= libfpx.so.[2-9]:${PORTSDIR}/graphics/libfpx	88	LIBWMF_PORT= libwmf
81	CONFIGURE_ARGS+= --with-fpx
82	.else	89	.else
83	CONFIGURE_ARGS+= --without-fpx	90	LIBWMF_PORT= libwmf-nox11
84	.endif	91	.endif
85		92
86	.if ${PORT_OPTIONS:MDPS}	93	.include <bsd.port.pre.mk>
87	USE_XORG+= xt
88	LIB_DEPENDS+= libdps.so:${PORTSDIR}/x11/dgs
89	CONFIGURE_ARGS+= --with-dps
90	.else
91	CONFIGURE_ARGS+= --without-dps
92	.endif
93		94
94	.if ${PORT_OPTIONS:MOPENMP}	95	.if ${OSVERSION} >= 1000024
95	.if ${OSVERSION} < 700042	96	.if ${PORT_OPTIONS:MFPX} && ${PORT_OPTIONS:MOPENMP}
96	IGNORE= does not support OpenMP on FreeBSD version ${OSVERSION}	97	IGNORE= Cause C++ ABI conflict between clang/libc++ and gcc/libstdc++
97	.endif	98	.endif
98
99	LDFLAGS+= ${PTHREAD_LIBS}
100	CONFIGURE_ARGS+= --with-threads --enable-openmp --disable-openmp-slow
101	.else
102	CONFIGURE_ARGS+= --without-threads --disable-openmp
103	.endif	99	.endif
104		100
105	.ifndef WINDOWS_FONT_DIR	101	.if !defined(WINDOWS_FONT_DIR)
106	# Use fonts installed by x11-fonts/webfonts by default	102	# Use fonts installed by x11-fonts/webfonts by default
107	WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts	103	WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts
108	.endif	104	.endif
109		105
110	.if defined(WITH_WINDOWS_FONT_DIR)
111	CONFIGURE_ARGS+= --with-windows-font-dir="${WINDOWS_FONT_DIR}"
112	.endif
113
114	.if ${PORT_OPTIONS:MX11} == ""
115	CONFIGURE_ARGS+=--without-x
116	LIB_DEPENDS+= libwmflite.so:${PORTSDIR}/graphics/libwmf-nox11
117	.else
118	USE_XORG+= xext
119	LIB_DEPENDS+= libwmflite.so:${PORTSDIR}/graphics/libwmf
120	.endif
121
122	.if ${PORT_OPTIONS:MQ8BIT}
123	CONFIGURE_ARGS+= --with-quantum-depth=8
124	QD= 8
125	.else
126	CONFIGURE_ARGS+= --with-quantum-depth=16
127	QD= 16
128	.endif
129	PLIST_SUB+= Q=${QD}
130
131	.if ${PORT_OPTIONS:MTESTS}	106	.if ${PORT_OPTIONS:MTESTS}
132	post-build:: test	107	post-build:: regression-test
133	.else	108	.else
134	post-build::	109	post-build::
135	#	110	#
Lines 139-145 Link Here
139	.endif	114	.endif
140		115
141	post-install:	116	post-install:
142	${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q${QD}/coders \	117	.for i in coders filters
143	${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q${QD}/filters	118	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q${QD}/${i}
		119	.endfor
		120
		121	regression-test: do-build
		122	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		123	${MAKEFILE} ${MAKE_ARGS} check)
144		124
145	.include <bsd.port.mk>	125	.include <bsd.port.post.mk>

Lines 1-21 Link Here

(-)graphics/GraphicsMagick13/files/extra-patch-Makefile.in (-21 lines)
1	--- Makefile.in.orig 2008-11-17 17:54:43.000000000 -0500
2	+++ Makefile.in 2008-11-17 17:55:27.000000000 -0500
3	@@ -9600,7 +9600,7 @@
4	info-am:
5
6	install-data-am: install-codersLTLIBRARIES install-configlibDATA \
7	- install-configshareDATA install-data-local install-docDATA \
8	+ install-configshareDATA install-data-local \
9	install-filtersLTLIBRARIES install-includeHEADERS \
10	install-ltdlincludeHEADERS install-magickincHEADERS \
11	install-magickppincHEADERS install-magickpptopincHEADERS \
12	@@ -10006,8 +10006,7 @@
13	$(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS)
14
15	install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \
16	- $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \
17	- $(HTML_INSTALL_DATA_TARGETS)
18	+ $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS)
19
20	uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
21	$(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \

Lines 1-6 Link Here

(-)graphics/GraphicsMagick13/files/patch-configure (-12 / +3 lines)
1	--- configure.orig 2013-03-10 00:21:59.000000000 +0100	1	--- configure.orig 2013-03-10 00:21:59.000000000 +0100
2	+++ configure 2013-12-27 11:48:19.000000000 +0100	2	+++ configure 2013-12-27 11:48:19.000000000 +0100
3	@@ -24580,15 +24580,16 @@	3	@@ -24637,15 +24637,16 @@
4	# Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build.	4	# Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build.
5	# Adobe DPS (as delivered on Solaris) doesn't require -lXt.	5	# Adobe DPS (as delivered on Solaris) doesn't require -lXt.
6	# GraphicsMagick itself doesn't use -lXt.	6	# GraphicsMagick itself doesn't use -lXt.
Lines 19-34 Link Here
19	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	19	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
20	/* end confdefs.h. */	20	/* end confdefs.h. */
21		21
22	@@ -26059,7 +26060,7 @@	22	@@ -27095,7 +27096,7 @@
23	fi
24
25
26	- ac_fn_c_check_header_compile "$LINENO" "freetype/freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
27	+ ac_fn_c_check_header_compile "$LINENO" "freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
28	"
29	if test "x$ac_cv_header_freetype_freetype_h" = xyes; then :
30	have_freetype_h='yes'
31	@@ -26935,7 +26936,7 @@
32	#	23	#
33		24
34	# Subdirectory under lib to place GraphicsMagick lib files	25	# Subdirectory under lib to place GraphicsMagick lib files
Lines 37-43 Link Here
37		28
38	cat >>confdefs.h <<_ACEOF	29	cat >>confdefs.h <<_ACEOF
39	#define MagickLibSubdir "$MagickLibSubdir"	30	#define MagickLibSubdir "$MagickLibSubdir"
40	@@ -27039,7 +27040,7 @@	31	@@ -27199,7 +27200,7 @@
41		32
42	#	33	#
43	# Path to GraphicsMagick share files	34	# Path to GraphicsMagick share files