ports/57592: Update port: graphics/ImageMagick
KATO Tsuguru
tkato at prontomail.com
Sun Oct 5 05:20:24 UTC 2003
>Number: 57592
>Category: ports
>Synopsis: Update port: graphics/ImageMagick
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 04 22:20:19 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Utilize CONFICTS
- Utilize USE_GNOME
- Install pkgconfig .pc file to correct place
- Support alternative PTHREAD_LIBS difinition
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile Sun Oct 5 04:35:10 2003
+++ graphics/ImageMagick/Makefile Sun Oct 5 14:12:38 2003
@@ -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 @@
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports at 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 @@
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 @@
.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 -urN /usr/ports/graphics/ImageMagick/pkg-plist graphics/ImageMagick/pkg-plist
--- /usr/ports/graphics/ImageMagick/pkg-plist Sun Oct 5 04:35:11 2003
+++ graphics/ImageMagick/pkg-plist Sun Oct 5 13:38:56 2003
@@ -439,8 +439,8 @@
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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list