diff options
| author | nork <nork@FreeBSD.org> | 2003-10-05 19:21:58 +0800 |
|---|---|---|
| committer | nork <nork@FreeBSD.org> | 2003-10-05 19:21:58 +0800 |
| commit | 89ec488aba17684e0dda65765ef9f5ebca691558 (patch) | |
| tree | 8a95be4e1452787ea64b57d804a345b5c42fd954 /graphics | |
| parent | f813d155cf54a6dcdaee9cef23e89ec4001e3b7e (diff) | |
| download | freebsd-ports-graphics-89ec488aba17684e0dda65765ef9f5ebca691558.tar.gz freebsd-ports-graphics-89ec488aba17684e0dda65765ef9f5ebca691558.tar.zst freebsd-ports-graphics-89ec488aba17684e0dda65765ef9f5ebca691558.zip | |
o Utilize CONFICTS
o Utilize USE_GNOME
o Install pkgconfig .pc file to correct place
o Support alternative PTHREAD_LIBS difinition
PR: ports/57592
Submitted by: Ports Fury
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick/Makefile | 14 | ||||
| -rw-r--r-- | graphics/ImageMagick/pkg-plist | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 40ef6f52b38..0e583f83395 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -7,7 +7,7 @@ PORTNAME= ImageMagick PORTVERSION= 5.5.7.11 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \ @@ -27,16 +27,16 @@ MASTER_SITE_SUBDIR= ${PORTNAME:L} ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org -COMMENT= Image processing tools (interactive optional--misc/display conflict) +COMMENT= Image processing tools WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USE_PERL5= yes USE_BZIP2= yes +USE_GNOME= gnomehack gnometarget pkgconfig USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= # none -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-shared INSTALLS_SHLIB= yes @@ -199,6 +199,7 @@ PKGNAMESUFFIX+= -nox11 CONFIGURE_ARGS+= --without-x --without-mpeg2 PLIST_SUB+= X11='@comment ' .else +CONFLICTS+= display CONFIGURE_ARGS+= --with-x USE_XLIB= yes MAN1+= animate.1 display.1 import.1 @@ -228,11 +229,12 @@ INSTALL_TARGET= install install-data-html .endif post-patch: -# Do not use PTHREAD_LIBS here - @${PERL} -pi -e 's|-lpthread|-lc_r|g ; \ +# do not use "-pthread" here + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS:S/-pthread/-lc_r/}|g ; \ + s|-pthread|${PTHREAD_LIBS:S/-pthread/-lc_r/}|g ; \ s|^tagnames=|#tagnames=|g ; \ s|lcms/lcms.h|lcms.h|g ; \ - s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure + s|lcms_lcms_h|lcms_h|g' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # version neither libraries nor directories @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \ 's|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \ diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist index b3fe38d4491..84850c2aeae 100644 --- a/graphics/ImageMagick/pkg-plist +++ b/graphics/ImageMagick/pkg-plist @@ -439,8 +439,8 @@ lib/libMagick.a lib/libMagick.la lib/libMagick.so lib/libMagick.so.6 -lib/pkgconfig/ImageMagick++.pc -lib/pkgconfig/ImageMagick.pc +libdata/pkgconfig/ImageMagick++.pc +libdata/pkgconfig/ImageMagick.pc %%WITH_PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm %%WITH_PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist %%WITH_PERL%%lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs |