- Change deprecated gvCleanup to gvFreeContext [1]

- Fix link with pthreads using LDFLAGS [2]
- Fix pkg_config files when use pthreads. [3]
- Bump PORTREVISION
- portlint(1)

PR:		91557 [1], 94287 [2], 94614 [3]
Submitted by:	Seva Gluschenko <gvs___rinet.ru> [1], lioux [3]
Notified by:	cokane [2]
Approved by:	maintainer timeout, 28 days

2 files changed, 29 insertions, 16 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 1e6f443192a2..db62422d3cfa 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ImageMagick
 PORTVERSION=	6.2.5.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/ImageMagick/ \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/}
@@ -52,8 +52,11 @@ PLIST_SUB+=		WITH_PERL='@comment '
      defined(PERL_THREADED) && ${PERL_THREADED} == "true")
 CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+LDFLAGS+=		${PTHREAD_LIBS}
+WITH_IMAGEMAGICK_THREADS=yes
 .else
 CONFIGURE_ARGS+=	--without-threads
+.undef WITH_IMAGEMAGICK_THREADS
 .endif
 
 # Faster, but poor quality
@@ -123,7 +126,7 @@ CONFIGURE_ARGS+=	--without-jp2
 # GraphViz dot graphs
 .if defined(WITH_IMAGEMAGICK_DOT)
 BUILD_DEPENDS+=		dot:${PORTSDIR}/graphics/graphviz
-RUN_DEPENDS+=		dot:${PORTSDIR}/graphics/graphviz  
+RUN_DEPENDS+=		dot:${PORTSDIR}/graphics/graphviz
 .else
 CONFIGURE_ARGS+=	--without-dot
 CONFIGURE_ARGS+=	--without-gvc
@@ -227,6 +230,16 @@ post-patch:
 	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
 	@${PERL} -pi -e 's|timestamp: %ld|timestamp: %d|g' \
 		${WRKSRC}/magick/xwindow.c
+.if defined(WITH_IMAGEMAGICK_THREADS)
+. for i in Magick++/lib/ImageMagick++.pc.in wand/Wand.pc.in magick/ImageMagick.pc.in
+	@${PERL} -pi -e 's|^(Libs.+)$$|\1 ${PTHREAD_LIBS}|; \
+		s|^(Cflags.+)$$|\1 ${PTHREAD_CFLAGS}|' \
+		${WRKSRC}/${i}
+. endfor
+.endif
+# deprecated gvCleanup
+	@${REINPLACE_CMD} -e "s|gvCleanup|gvFreeContext|g" \
+		${WRKSRC}/coders/dot.c
 
 post-install:
 .if defined(WITHOUT_IMAGEMAGICK_16BIT_PIXEL)
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 3dc34f21a0b2..744a3c65fa48 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -431,12 +431,12 @@ libdata/pkgconfig/Wand.pc
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix
-share/ImageMagick/config/coder.xml
-share/ImageMagick/config/log.xml
-share/ImageMagick/config/magic.xml
-share/ImageMagick-%%PORTVERSION%%/LICENSE
-share/ImageMagick-%%PORTVERSION%%/ChangeLog
-share/ImageMagick-%%PORTVERSION%%/NEWS
+%%DATADIR%%/config/coder.xml
+%%DATADIR%%/config/log.xml
+%%DATADIR%%/config/magic.xml
+%%DATADIR%%-%%PORTVERSION%%/LICENSE
+%%DATADIR%%-%%PORTVERSION%%/ChangeLog
+%%DATADIR%%-%%PORTVERSION%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/images/arc.png
 %%PORTDOCS%%%%DOCSDIR%%/images/background.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/button.gif
@@ -589,14 +589,14 @@ share/ImageMagick-%%PORTVERSION%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/www/search.html
 %%PORTDOCS%%%%DOCSDIR%%/www/sponsors.html
 %%PORTDOCS%%%%DOCSDIR%%/www/subversion.html
-%%PORTDOCS%%@dirrm share/doc/ImageMagick/www/api
-%%PORTDOCS%%@dirrm share/doc/ImageMagick/www/Magick++
-%%PORTDOCS%%@dirrm share/doc/ImageMagick/www
-%%PORTDOCS%%@dirrm share/doc/ImageMagick/images
-%%PORTDOCS%%@dirrm share/doc/ImageMagick
-@dirrm share/ImageMagick-%%PORTVERSION%%
-@dirrm share/ImageMagick/config
-@dirrm share/ImageMagick
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/api
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/Magick++
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/www
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%-%%PORTVERSION%%
+@dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick
 %%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
 %%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Image