Attachment #157155 for bug #200304




# $FreeBSD: head/graphics/GraphicsMagick/Makefile 387433 2015-05-25 21:16:39Z amdmi3 $

PORTNAME=	GraphicsMagick
PORTVERSION=	1.3.21
PORTREVISION=	4
PORTEPOCH=	1
CATEGORIES=	graphics
MASTER_SITES=	SF \

WINDOWS_FONT_DIR=${LOCALBASE}/share/fonts/webfonts
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|"GNU strip"|"strip"|' ${WRKSRC}/configure

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

Lines 1-2 Link Here

(-)graphics/GraphicsMagick/distinfo (-2 / +2 lines)
1	SHA256 (GraphicsMagick-1.3.20.tar.bz2) = 7caf27691ec21682de1f0259c9243725db7cdeca699c40958c28aece99e4f1dc	1	SHA256 (GraphicsMagick-1.3.21.tar.bz2) = a0ce08f2710c158e39faa083463441f6eeeecce07dbd59510498ffa4e0b053d1
2	SIZE (GraphicsMagick-1.3.20.tar.bz2) = 7371945	2	SIZE (GraphicsMagick-1.3.21.tar.bz2) = 7527643

Lines 1-6 Link Here

(-)graphics/GraphicsMagick/files/patch-Makefile.in (-4 / +4 lines)
1	--- Makefile.in.orig 2008-05-18 17:22:51.000000000 -0400	1	--- Makefile.in.orig 2015-02-28 20:53:46 UTC
2	+++ Makefile.in 2008-06-06 18:41:23.620488084 -0400	2	+++ Makefile.in
3	@@ -1775,7 +1775,7 @@	3	@@ -2221,7 +2221,7 @@ MagickFilterModulesPath = @MagickFilterM
4	MagickLibConfigPath = @MagickLibConfigPath@	4	MagickLibConfigPath = @MagickLibConfigPath@
5	MagickLibPath = @MagickLibPath@	5	MagickLibPath = @MagickLibPath@
6	MagickShareConfigPath = @MagickShareConfigPath@	6	MagickShareConfigPath = @MagickShareConfigPath@
Lines 9-15 Link Here
9	MogrifyDelegate = @MogrifyDelegate@	9	MogrifyDelegate = @MogrifyDelegate@
10	NM = @NM@	10	NM = @NM@
11	NMEDIT = @NMEDIT@	11	NMEDIT = @NMEDIT@
12	@@ -4382,7 +4382,7 @@	12	@@ -4381,7 +4381,7 @@ PERLMAGICK_MAINTAINER_TARGETS = $(top_sr
13	@WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick	13	@WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick
14		14
15	# Pkgconfig directory	15	# Pkgconfig directory




--- configure.orig	2015-02-28 20:53:46 UTC
+++ configure
@@ -13277,7 +13277,6 @@ fi
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

       hardcode_direct=yes
       hardcode_shlibpath_var=no
       ;;
@@ -24497,60 +24496,6 @@ else
     X_CFLAGS="$X_CFLAGS -I$x_includes"
   fi
 

 
   # Check for system-dependent libraries X programs must link with.
   # Do this before checking for the system-independent R6 libraries
@@ -25245,15 +25190,16 @@ fi
     # 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.  */
 
@@ -27703,7 +27649,7 @@ fi
 #
 
 # Subdirectory under lib to place GraphicsMagick lib files

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




lib/GraphicsMagick/config/type.mgk
lib/libGraphicsMagick++.a
lib/libGraphicsMagick++.so
lib/libGraphicsMagick++.so.11
lib/libGraphicsMagick++.so.11.0.0
lib/libGraphicsMagick.a
lib/libGraphicsMagick.so
lib/libGraphicsMagick.so.3
lib/libGraphicsMagick.so.3.13.0
lib/libGraphicsMagickWand.a
lib/libGraphicsMagickWand.so
lib/libGraphicsMagickWand.so.2
lib/libGraphicsMagickWand.so.2.7.1
libdata/pkgconfig/GraphicsMagick++.pc
libdata/pkgconfig/GraphicsMagick.pc
libdata/pkgconfig/GraphicsMagickWand.pc

%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2011.html
%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2012.html
%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2013.html
%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2014.html
%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
%%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html

Return to bug 200304

Lines 2-9 Link Here

(-)graphics/GraphicsMagick/Makefile (-2 / +5 lines)
2	# $FreeBSD: head/graphics/GraphicsMagick/Makefile 387433 2015-05-25 21:16:39Z amdmi3 $	2	# $FreeBSD: head/graphics/GraphicsMagick/Makefile 387433 2015-05-25 21:16:39Z amdmi3 $
3		3
4	PORTNAME= GraphicsMagick	4	PORTNAME= GraphicsMagick
5	PORTVERSION= 1.3.20	5	PORTVERSION= 1.3.21
6	PORTREVISION= 4
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= graphics	7	CATEGORIES= graphics
9	MASTER_SITES= SF \	8	MASTER_SITES= SF \
Lines 98-103 Link Here
98	WINDOWS_FONT_DIR=${LOCALBASE}/share/fonts/webfonts	97	WINDOWS_FONT_DIR=${LOCALBASE}/share/fonts/webfonts
99	.endif	98	.endif
100		99
		100	post-patch:
		101	@${REINPLACE_CMD} -e \
		102	's\|"GNU strip"\|"strip"\|' ${WRKSRC}/configure
		103
101	.if ${PORT_OPTIONS:MTESTS}	104	.if ${PORT_OPTIONS:MTESTS}
102	post-build:: regression-test	105	post-build:: regression-test
103	.else	106	.else

Lines 1-6 Link Here

(-)graphics/GraphicsMagick/files/patch-configure (-7 / +7 lines)
1	--- configure.orig 2013-12-31 20:58:17.000000000 +0100	1	--- configure.orig 2015-02-28 20:53:46 UTC
2	+++ configure 2014-04-26 15:53:04.000000000 +0200	2	+++ configure
3	@@ -12919,7 +12919,6 @@	3	@@ -13277,7 +13277,6 @@ fi
4	# FreeBSD 3 and greater uses gcc -shared to do shared libraries.	4	# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
5	freebsd* \| dragonfly*)	5	freebsd* \| dragonfly*)
6	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'	6	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
Lines 8-14 Link Here
8	hardcode_direct=yes	8	hardcode_direct=yes
9	hardcode_shlibpath_var=no	9	hardcode_shlibpath_var=no
10	;;	10	;;
11	@@ -23889,60 +23888,6 @@	11	@@ -24497,60 +24496,6 @@ else
12	X_CFLAGS="$X_CFLAGS -I$x_includes"	12	X_CFLAGS="$X_CFLAGS -I$x_includes"
13	fi	13	fi
14		14
Lines 69-75 Link Here
69		69
70	# Check for system-dependent libraries X programs must link with.	70	# Check for system-dependent libraries X programs must link with.
71	# Do this before checking for the system-independent R6 libraries	71	# Do this before checking for the system-independent R6 libraries
72	@@ -24637,15 +24582,16 @@	72	@@ -25245,15 +25190,16 @@ fi
73	# Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build.	73	# Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build.
74	# Adobe DPS (as delivered on Solaris) doesn't require -lXt.	74	# Adobe DPS (as delivered on Solaris) doesn't require -lXt.
75	# GraphicsMagick itself doesn't use -lXt.	75	# GraphicsMagick itself doesn't use -lXt.
Lines 88-94 Link Here
88	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	88	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
89	/* end confdefs.h. */	89	/* end confdefs.h. */
90		90
91	@@ -27095,7 +27041,7 @@	91	@@ -27703,7 +27649,7 @@ fi
92	#	92	#
93		93
94	# Subdirectory under lib to place GraphicsMagick lib files	94	# Subdirectory under lib to place GraphicsMagick lib files
Lines 97-103 Link Here
97		97
98	cat >>confdefs.h <<_ACEOF	98	cat >>confdefs.h <<_ACEOF
99	#define MagickLibSubdir "$MagickLibSubdir"	99	#define MagickLibSubdir "$MagickLibSubdir"
100	@@ -27199,7 +27145,7 @@	100	@@ -27807,7 +27753,7 @@ _ACEOF
101		101
102	#	102	#
103	# Path to GraphicsMagick share files	103	# Path to GraphicsMagick share files

Lines 91-106 Link Here

(-)graphics/GraphicsMagick/pkg-plist (-4 / +5 lines)
91	lib/GraphicsMagick/config/type.mgk	91	lib/GraphicsMagick/config/type.mgk
92	lib/libGraphicsMagick++.a	92	lib/libGraphicsMagick++.a
93	lib/libGraphicsMagick++.so	93	lib/libGraphicsMagick++.so
94	lib/libGraphicsMagick++.so.3	94	lib/libGraphicsMagick++.so.11
95	lib/libGraphicsMagick++.so.3.7.0	95	lib/libGraphicsMagick++.so.11.0.0
96	lib/libGraphicsMagick.a	96	lib/libGraphicsMagick.a
97	lib/libGraphicsMagick.so	97	lib/libGraphicsMagick.so
98	lib/libGraphicsMagick.so.3	98	lib/libGraphicsMagick.so.3
99	lib/libGraphicsMagick.so.3.12.0	99	lib/libGraphicsMagick.so.3.13.0
100	lib/libGraphicsMagickWand.a	100	lib/libGraphicsMagickWand.a
101	lib/libGraphicsMagickWand.so	101	lib/libGraphicsMagickWand.so
102	lib/libGraphicsMagickWand.so.2	102	lib/libGraphicsMagickWand.so.2
103	lib/libGraphicsMagickWand.so.2.7.0	103	lib/libGraphicsMagickWand.so.2.7.1
104	libdata/pkgconfig/GraphicsMagick++.pc	104	libdata/pkgconfig/GraphicsMagick++.pc
105	libdata/pkgconfig/GraphicsMagick.pc	105	libdata/pkgconfig/GraphicsMagick.pc
106	libdata/pkgconfig/GraphicsMagickWand.pc	106	libdata/pkgconfig/GraphicsMagickWand.pc
Lines 142-147 Link Here
142	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2011.html	142	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2011.html
143	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2012.html	143	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2012.html
144	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2013.html	144	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2013.html
		145	%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2014.html
145	%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html	146	%%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
146	%%PORTDOCS%%%%DOCSDIR%%/www/Changes.html	147	%%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
147	%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html	148	%%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html