diff options
| author | lioux <lioux@FreeBSD.org> | 2002-07-09 10:46:31 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2002-07-09 10:46:31 +0800 |
| commit | 8563064ebca759c8e3b7d756a926f006334387c7 (patch) | |
| tree | 114278e3bf380fdb2dee2211b1c8a7e55a711271 | |
| parent | 99a67b2ded42b1dd2a9cbaa35a87191a90c35c1f (diff) | |
| download | freebsd-ports-gnome-8563064ebca759c8e3b7d756a926f006334387c7.tar.gz freebsd-ports-gnome-8563064ebca759c8e3b7d756a926f006334387c7.tar.zst freebsd-ports-gnome-8563064ebca759c8e3b7d756a926f006334387c7.zip | |
o Fix build in case WITH_IMAGEMAGICK_MODULES is defined
o Trim pkg-plist
PR: 40358
Submitted by: KATO Tsuguru <tkato@prontomail.com>
| -rw-r--r-- | graphics/ImageMagick/Makefile | 6 | ||||
| -rw-r--r-- | graphics/ImageMagick/pkg-plist | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 24e7822268df..bf7b139107eb 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -120,7 +120,8 @@ INSTALL_TARGET= install install-data-html .endif post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \ +# 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 ; \ @@ -128,13 +129,12 @@ post-patch: 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|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 --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist index e2ed3e0437a0..4aaed7c2ee16 100644 --- a/graphics/ImageMagick/pkg-plist +++ b/graphics/ImageMagick/pkg-plist @@ -288,7 +288,6 @@ share/ImageMagick/magic.mgk %%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 |