Date: Tue, 22 Feb 2000 19:47:31 +0200 (EET) From: sobomax@altavista.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16913: [PATCH] Update of ImageMagick and Gimp ports Message-ID: <200002221747.TAA23436@vega.vega.com>
next in thread | raw e-mail | index | archive | help
>Number: 16913 >Category: ports >Synopsis: [PATCH] Update of ImageMagick and Gimp ports >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: Tue Feb 22 09:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Maxim Sobolev >Release: FreeBSD 3.4-STABLE i386 >Organization: Vega International Capital >Environment: >Description: Update of ImageMagick and Gimp ports >How-To-Repeat: >Fix: diff -ruN /usr/ports/graphics/ImageMagick/Makefile ImageMagick/Makefile --- /usr/ports/graphics/ImageMagick/Makefile Thu Nov 25 09:15:52 1999 +++ ImageMagick/Makefile Mon Feb 21 13:18:11 2000 @@ -1,12 +1,12 @@ # New ports collection makefile for: ImageMagick -# Version required: 4.2.9 +# Version required: 5.1.1 # Date created: 15 November 1994 # Whom: torstenb # # $FreeBSD: ports/graphics/ImageMagick/Makefile,v 1.76 1999/11/25 03:41:57 jseger Exp $ # -DISTNAME= ImageMagick-4.2.9 +DISTNAME= ImageMagick-5.1.1 CATEGORIES= graphics perl5 MASTER_SITES= ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \ ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/ \ @@ -25,16 +25,17 @@ BUILD_DEPENDS= fig2dev:${PORTSDIR}/print/transfig \ picttoppm:${PORTSDIR}/graphics/netpbm \ mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \ - gs:${PORTSDIR}/print/ghostscript5 + gs:${PORTSDIR}/print/ghostscript55 -MAN1= ImageMagick.1 animate.1 combine.1 convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 xtp.1 +MAN1= ImageMagick.1 animate.1 combine.1 convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 MAN3= Image::Magick.3 MAN4= miff.4 MAN5= quantize.5 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} HAS_CONFIGURE= YES -CONFIGURE_ARGS= --prefix=${PREFIX} --enable-lzw --enable-shared --with-perl=${PERL5} +CONFIGURE_ARGS= --prefix=${PREFIX} --enable-lzw --enable-shared --with-perl=${PERL5} \ + --enable-16bit-pixel USE_PERL5= YES CONFIGURE_ENV= LDFLAGS="$(LDFLAGS) -L${WRKSRC}/magick/.libs" post-install: diff -ruN /usr/ports/graphics/ImageMagick/files/md5 ImageMagick/files/md5 --- /usr/ports/graphics/ImageMagick/files/md5 Wed Oct 13 09:51:00 1999 +++ ImageMagick/files/md5 Mon Feb 21 11:52:52 2000 @@ -1 +1 @@ -MD5 (ImageMagick-4.2.9.tar.gz) = 178704017a82af18f5f2d08b985e9140 +MD5 (ImageMagick-5.1.1.tar.gz) = d05852644e34f9f0b25b374ef2da1004 diff -ruN /usr/ports/graphics/ImageMagick/pkg/PLIST ImageMagick/pkg/PLIST --- /usr/ports/graphics/ImageMagick/pkg/PLIST Wed Oct 13 09:51:00 1999 +++ ImageMagick/pkg/PLIST Mon Feb 21 13:22:09 2000 @@ -7,13 +7,13 @@ bin/import bin/mogrify bin/montage -bin/xtp include/magick/api.h include/magick/blob.h +include/magick/cache.h +include/magick/cache_io.h include/magick/classify.h include/magick/compress.h include/magick/config.h -include/magick/defines.h include/magick/delegates.h include/magick/error.h include/magick/gems.h @@ -22,12 +22,14 @@ include/magick/memory.h include/magick/monitor.h include/magick/quantize.h +include/magick/timer.h include/magick/utility.h include/magick/version.h +include/magick/xwindows.h lib/libMagick.a lib/libMagick.la lib/libMagick.so -lib/libMagick.so.4 +lib/libMagick.so.5 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs diff -ruN /usr/ports/graphics/gimp1/Makefile gimp1/Makefile --- /usr/ports/graphics/gimp1/Makefile Thu Jan 20 10:08:10 2000 +++ gimp1/Makefile Tue Feb 22 17:15:01 2000 @@ -1,12 +1,12 @@ # New ports collection makefile for: Gimp -# Version required: 1.1.15 +# Version required: 1.1.17 # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # # $FreeBSD: ports/graphics/gimp1/Makefile,v 1.62 2000/01/19 19:57:06 jim Exp $ # -DISTNAME= gimp-${VERSION} +DISTNAME= gimp-1.1.17 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \ ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v${VERSION}/ \ @@ -23,7 +23,7 @@ png.3:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -VERSION= 1.1.15 +VERSION= `${ECHO} ${DISTNAME} | ${SED} 's/gimp-//'` GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff -ruN /usr/ports/graphics/gimp1/files/md5 gimp1/files/md5 --- /usr/ports/graphics/gimp1/files/md5 Thu Jan 20 10:08:12 2000 +++ gimp1/files/md5 Tue Feb 22 17:15:39 2000 @@ -1 +1 @@ -MD5 (gimp-1.1.15.tar.bz2) = cdfc7538824d262da0cc6ae3a39d85c7 +MD5 (gimp-1.1.17.tar.bz2) = 5599cb98b3a17324f2ad2682348a7df9 diff -ruN /usr/ports/graphics/gimp1/patches/patch-aa gimp1/patches/patch-aa --- /usr/ports/graphics/gimp1/patches/patch-aa Mon Oct 25 10:01:55 1999 +++ gimp1/patches/patch-aa Tue Feb 22 17:32:37 2000 @@ -1,21 +1,21 @@ ---- app/main.c.orig Wed Oct 6 13:55:38 1999 -+++ app/main.c Tue Oct 12 13:23:44 1999 +--- app/main.c.orig Fri Feb 11 00:41:02 2000 ++++ app/main.c Tue Feb 22 17:31:39 2000 @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "config.h" - +#include <floatingpoint.h> - #include <locale.h> #include <stdio.h> #include <stdlib.h> -@@ -117,6 +117,9 @@ - + #include <signal.h> +@@ -129,6 +129,9 @@ /* Initialize variables */ + prog_name = argv[0]; + + /* Ignore floating point exceptions */ + fpsetmask(0); /* Initialize i18n support */ - + INIT_LOCALE ("gimp"); diff -ruN /usr/ports/graphics/gimp1/patches/patch-ai gimp1/patches/patch-ai --- /usr/ports/graphics/gimp1/patches/patch-ai Mon Oct 25 10:01:57 1999 +++ gimp1/patches/patch-ai Thu Jan 1 03:00:00 1970 @@ -1,140 +0,0 @@ ---- plug-ins/megawidget/Makefile.in.orig Wed Oct 6 15:04:53 1999 -+++ plug-ins/megawidget/Makefile.in Tue Oct 12 13:44:48 1999 -@@ -204,6 +204,8 @@ - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+HEADERS = $(gimpinclude_HEADERS) -+ - DIST_COMMON = Makefile.am Makefile.in - - -@@ -211,6 +213,7 @@ - - TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/megawidget.P - SOURCES = $(libmegawidget_a_SOURCES) - OBJECTS = $(libmegawidget_a_OBJECTS) - -@@ -218,9 +221,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .s - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/megawidget/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/megawidget/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -257,9 +260,6 @@ - rm -f $(DESTDIR)$(libdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- - .s.o: - $(COMPILE) -c $< - -@@ -276,9 +276,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -300,6 +297,21 @@ - $(AR) cru libmegawidget.a $(libmegawidget_a_OBJECTS) $(libmegawidget_a_LIBADD) - $(RANLIB) libmegawidget.a - -+install-gimpincludeHEADERS: $(gimpinclude_HEADERS) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(gimpincludedir) -+ @list='$(gimpinclude_HEADERS)'; for p in $$list; do \ -+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p; \ -+ done -+ -+uninstall-gimpincludeHEADERS: -+ @$(NORMAL_UNINSTALL) -+ list='$(gimpinclude_HEADERS)'; for p in $$list; do \ -+ rm -f $(DESTDIR)$(gimpincludedir)/$$p; \ -+ done -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) -@@ -334,6 +346,11 @@ - subdir = plug-ins/megawidget - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu plug-ins/megawidget/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -350,6 +367,37 @@ - ../../libgimp/parasite.h ../../libgimp/parasiteF.h \ - ../../libgimp/parasiteP.h ../../libgimp/gimpunit.h megawidget.h - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -417,10 +465,13 @@ - clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \ - install-libLIBRARIES mostlyclean-compile distclean-compile \ - clean-compile maintainer-clean-compile mostlyclean-libtool \ --distclean-libtool clean-libtool maintainer-clean-libtool tags \ -+distclean-libtool clean-libtool maintainer-clean-libtool \ -+uninstall-gimpincludeHEADERS install-gimpincludeHEADERS tags \ - mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ --distdir info-am info dvi-am dvi check check-am installcheck-am \ --installcheck install-exec-am install-exec install-data-am install-data \ -+distdir mostlyclean-depend distclean-depend clean-depend \ -+maintainer-clean-depend info-am info dvi-am dvi check check-am \ -+installcheck-am installcheck install-exec-am install-exec \ -+install-data-am install-data \ - install-am install uninstall-am uninstall all-redirect all-am all \ - installdirs mostlyclean-generic distclean-generic clean-generic \ - maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN /usr/ports/graphics/gimp1/pkg/PLIST gimp1/pkg/PLIST --- /usr/ports/graphics/gimp1/pkg/PLIST Mon Jan 24 11:00:37 2000 +++ gimp1/pkg/PLIST Tue Feb 22 18:59:46 2000 @@ -1,5 +1,6 @@ bin/gimp bin/gimptool +bin/gimp-config include/gck/gck.h include/gck/gckcolor.h include/gck/gckcommon.h @@ -35,6 +36,7 @@ include/libgimp/gimpunit.h include/libgimp/gimpunitmenu.h include/libgimp/gimpwidgets.h +include/libgimp/gimpquerybox.h include/libgimp/gserialize.h include/libgimp/parasite.h include/libgimp/parasiteF.h @@ -42,14 +44,13 @@ include/libgimp/parasiteio.h lib/libgck.a lib/libgck.so -lib/libgck.so.15 +lib/libgck.so.17 lib/libgimp.a lib/libgimp.so -lib/libgimp.so.15 +lib/libgimp.so.17 lib/libgimpui.a lib/libgimpui.so -lib/libgimpui.so.15 -lib/libmegawidget.a +lib/libgimpui.so.17 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B libexec/gimp/1.1/modules/libcdisplay_gamma.so @@ -131,6 +132,7 @@ libexec/gimp/1.1/plug-ins/guillotine libexec/gimp/1.1/plug-ins/gz libexec/gimp/1.1/plug-ins/header +libexec/gimp/1.1/plug-ins/helpbrowser libexec/gimp/1.1/plug-ins/hot libexec/gimp/1.1/plug-ins/hrz libexec/gimp/1.1/plug-ins/ifscompose @@ -257,6 +259,42 @@ share/gimp/brushes/thegimp.gbr share/gimp/brushes/vine.gih share/gimp/brushes/xcf.gbr +share/gimp/devel-docs/html/libgimp/book1.html +share/gimp/devel-docs/html/libgimp/gimpchainbutton.html +share/gimp/devel-docs/html/libgimp/gimpcolorbutton.html +share/gimp/devel-docs/html/libgimp/gimpdefinitions.html +share/gimp/devel-docs/html/libgimp/gimpfileselection.html +share/gimp/devel-docs/html/libgimp/gimpmodule.html +share/gimp/devel-docs/html/libgimp/gimppatheditor.html +share/gimp/devel-docs/html/libgimp/gimpsizeentry.html +share/gimp/devel-docs/html/libgimp/gimpunitmenu.html +share/gimp/devel-docs/html/libgimp/libgimp-color-display.html +share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html +share/gimp/devel-docs/html/libgimp/libgimp-gimp.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorspace.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpcompat.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpdialog.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpenums.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpenv.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpexport.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpfeatures.html +share/gimp/devel-docs/html/libgimp/libgimp-gimphelpui.html +share/gimp/devel-docs/html/libgimp/libgimp-gimplimits.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpmath.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html +share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html +share/gimp/devel-docs/html/libgimp/libgimp-gserialize.html +share/gimp/devel-docs/html/libgimp/libgimp-parasite.html +share/gimp/devel-docs/html/libgimp/libgimp-parasitef.html +share/gimp/devel-docs/html/libgimp/libgimp-parasiteio.html +share/gimp/devel-docs/html/libgimp/libgimp-parasitep.html +share/gimp/devel-docs/html/libgimp/libgimp.html +share/gimp/devel-docs/html/libgimp/libgimpui.html share/gimp/fractalexplorer/Asteroid_Field share/gimp/fractalexplorer/Bar_Code_Label share/gimp/fractalexplorer/Beauty_of_Nature @@ -851,7 +889,6 @@ share/gimp/help/images/eek.png share/gimp/help/images/wilber.png share/gimp/gtkrc -share/gimp/gtkrc.forest2 share/gimp/palettes/Bears share/gimp/palettes/Bgold share/gimp/palettes/Blues @@ -1060,6 +1097,7 @@ share/locale/cs/LC_MESSAGES/gimp.mo share/locale/da/LC_MESSAGES/gimp.mo share/locale/de/LC_MESSAGES/gimp.mo +share/locale/en_GB/LC_MESSAGES/gimp.mo share/locale/fi/LC_MESSAGES/gimp.mo share/locale/fr/LC_MESSAGES/gimp.mo share/locale/hu/LC_MESSAGES/gimp.mo @@ -1073,9 +1111,27 @@ share/locale/sk/LC_MESSAGES/gimp.mo share/locale/sv/LC_MESSAGES/gimp.mo share/locale/uk/LC_MESSAGES/gimp.mo +share/locale/cs/LC_MESSAGES/gimp-libgimp.mo +share/locale/da/LC_MESSAGES/gimp-libgimp.mo +share/locale/de/LC_MESSAGES/gimp-libgimp.mo +share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo +share/locale/fi/LC_MESSAGES/gimp-libgimp.mo +share/locale/fr/LC_MESSAGES/gimp-libgimp.mo +share/locale/hu/LC_MESSAGES/gimp-libgimp.mo +share/locale/it/LC_MESSAGES/gimp-libgimp.mo +share/locale/ja/LC_MESSAGES/gimp-libgimp.mo +share/locale/ko/LC_MESSAGES/gimp-libgimp.mo +share/locale/nl/LC_MESSAGES/gimp-libgimp.mo +share/locale/no/LC_MESSAGES/gimp-libgimp.mo +share/locale/pl/LC_MESSAGES/gimp-libgimp.mo +share/locale/ru/LC_MESSAGES/gimp-libgimp.mo +share/locale/sk/LC_MESSAGES/gimp-libgimp.mo +share/locale/sv/LC_MESSAGES/gimp-libgimp.mo +share/locale/uk/LC_MESSAGES/gimp-libgimp.mo share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo share/locale/da/LC_MESSAGES/gimp-std-plugins.mo share/locale/de/LC_MESSAGES/gimp-std-plugins.mo +share/locale/en_GB/LC_MESSAGES/gimp-std-plugins.mo share/locale/fi/LC_MESSAGES/gimp-std-plugins.mo share/locale/fr/LC_MESSAGES/gimp-std-plugins.mo share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo @@ -1089,6 +1145,9 @@ share/locale/sk/LC_MESSAGES/gimp-std-plugins.mo share/locale/sv/LC_MESSAGES/gimp-std-plugins.mo share/locale/uk/LC_MESSAGES/gimp-std-plugins.mo +@dirrm share/gimp/devel-docs/html/libgimp +@dirrm share/gimp/devel-docs/html +@dirrm share/gimp/devel-docs @dirrm share/gimp/gflare @dirrm share/gimp/gimpressionist/Brushes @dirrm share/gimp/gimpressionist/Paper >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200002221747.TAA23436>