From owner-freebsd-ports Mon Jul 8 14:20:48 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B03137B405 for ; Mon, 8 Jul 2002 14:20:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D31AB43E5E for ; Mon, 8 Jul 2002 14:20:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g68LK4JU002052 for ; Mon, 8 Jul 2002 14:20:04 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g68LK4mf002051; Mon, 8 Jul 2002 14:20:04 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1BB837B400 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/40358: Update port: graphics/ImageMagick Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40358 >Category: ports >Synopsis: Update port: graphics/ImageMagick >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 08 14:20:04 PDT 2002 >Closed-Date: >Last-Modified: >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|||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 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: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message