From nobody@FreeBSD.org  Mon Jul  8 14:19:03 2002
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B1BB837B400
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  8 Jul 2002 14:19:03 -0700 (PDT)
Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5A6C743E31
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  8 Jul 2002 14:19:03 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g68LJ3OT010694
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 8 Jul 2002 14:19:03 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.4/8.12.4/Submit) id g68LJ3tf010691;
	Mon, 8 Jul 2002 14:19:03 -0700 (PDT)
Message-Id: <200207082119.g68LJ3tf010691@www.freebsd.org>
Date: Mon, 8 Jul 2002 14:19:03 -0700 (PDT)
From: KATO Tsuguru <tkato@prontomail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: graphics/ImageMagick
X-Send-Pr-Version: www-1.0

>Number:         40358
>Category:       ports
>Synopsis:       Update port: graphics/ImageMagick
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 08 14:20:04 PDT 2002
>Closed-Date:    Mon Jul 08 19:47:09 PDT 2002
>Last-Modified:  Mon Jul 08 19:47:09 PDT 2002
>Originator:     KATO Tsuguru
>Release:        4.6-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build in case WITH_IMAGEMAGICK_MODULES is defined
- Fix pkg-plist

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile	Mon Jul  8 20:17:24 2002
+++ graphics/ImageMagick/Makefile	Tue Jul  9 06:16:53 2002
@@ -120,21 +120,21 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|^tagnames=|#tagnames=|g ; \
-		s|LIBLTDL=.*$$|LIBLTDL="-lltdl"|g ; \
-		s|INCLTDL=.*$$|INCLTDL=|g ; \
-		s|lcms/lcms.h|lcms.h|g ; \
-		s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure
+# Do not use PTHREAD_LIBS here
+	@${REINPLACE_CMD} -e 's|-lpthread|-lc_r|g ; \
+		 s|^tagnames=|#tagnames=|g ; \
+		 s|LIBLTDL=.*$$|LIBLTDL="-lltdl"|g ; \
+		 s|INCLTDL=.*$$|INCLTDL=|g ; \
+		 s|lcms/lcms.h|lcms.h|g ; \
+		 s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|top_builddir)/ltdl/libltdlc.la|LIBLTDL)|g ; \
+		's|ltdl magick|magick|g ; \
+		 s|top_builddir)/ltdl/libltdlc.la|LIBLTDL)|g ; \
 		 s|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \
 		 s| install-data-html||g'
 	@${REINPLACE_CMD} -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
 	@${REINPLACE_CMD} -e 's|timestamp: %ld|timestamp: %d|g' \
 		${WRKSRC}/magick/xwindow.c
-	@${REINPLACE_CMD}-e 's|^tagnames.*\$$|#&|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/ImageMagick/pkg-plist graphics/ImageMagick/pkg-plist
--- /usr/ports/graphics/ImageMagick/pkg-plist	Mon Jul  8 20:17:25 2002
+++ graphics/ImageMagick/pkg-plist	Tue Jul  9 03:08:51 2002
@@ -288,7 +288,6 @@
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Image.fig
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Image.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Image.png
-@comment %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Image.svg
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/ImageDesign.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/ImageMagick.png
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Install.html

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: lioux 
State-Changed-When: Mon Jul 8 19:46:55 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=40358 
>Unformatted:
