From d1459f8ca6e0d6f9d9ed11abea5998e5a7ffa632 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 4 Aug 2014 19:34:31 +0000 Subject: [PATCH] - Switch graphics/GraphicsMagick to USES=libtool, drop .la files - Bump dependent ports as .so version has changed - Fix distinfo for graphics/cmg - Fix shebang for graphics/vips Approved by: portmgr blanket --- comms/xastir/Makefile | 2 +- graphics/GraphicsMagick/Makefile | 4 ++-- graphics/GraphicsMagick/pkg-plist | 12 ++++++------ graphics/cimg/Makefile | 4 ++-- graphics/cimg/distinfo | 4 ++-- graphics/darktable/Makefile | 2 +- graphics/gimp-gmic-plugin/Makefile | 2 +- graphics/pecl-gmagick/Makefile | 2 +- graphics/vips/Makefile | 3 ++- math/octave/Makefile | 4 ++-- science/gnudatalanguage/Makefile | 4 ++-- textproc/htmltolatex/Makefile | 2 +- 12 files changed, 23 insertions(+), 22 deletions(-) diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index f0246173d277..3d190815ca28 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -3,7 +3,7 @@ PORTNAME= xastir PORTVERSION= 2.0.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION} diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index a8f989dad30e..24919a9a38f0 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -3,7 +3,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.19 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF \ @@ -25,7 +25,7 @@ CONFLICTS= GraphicsMagick-1.[12].* GraphicsMagick12-* PORTSCOUT= limit:^1\.3\. -USES= iconv tar:bzip2 +USES= iconv libtool tar:bzip2 USE_GNOME= libxml2 USE_GHOSTSCRIPT=yes GNU_CONFIGURE= yes diff --git a/graphics/GraphicsMagick/pkg-plist b/graphics/GraphicsMagick/pkg-plist index b7eccb451055..148dede8892f 100644 --- a/graphics/GraphicsMagick/pkg-plist +++ b/graphics/GraphicsMagick/pkg-plist @@ -93,17 +93,17 @@ lib/GraphicsMagick/config/type.mgk @exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%/coders @exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%/filters lib/libGraphicsMagick++.a -lib/libGraphicsMagick++.la lib/libGraphicsMagick++.so -lib/libGraphicsMagick++.so.9 +lib/libGraphicsMagick++.so.3 +lib/libGraphicsMagick++.so.3.6.3 lib/libGraphicsMagick.a -lib/libGraphicsMagick.la lib/libGraphicsMagick.so -lib/libGraphicsMagick.so.14 +lib/libGraphicsMagick.so.3 +lib/libGraphicsMagick.so.3.11.1 lib/libGraphicsMagickWand.a -lib/libGraphicsMagickWand.la lib/libGraphicsMagickWand.so -lib/libGraphicsMagickWand.so.8 +lib/libGraphicsMagickWand.so.2 +lib/libGraphicsMagickWand.so.2.6.1 libdata/pkgconfig/GraphicsMagick++.pc libdata/pkgconfig/GraphicsMagick.pc libdata/pkgconfig/GraphicsMagickWand.pc diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 79777c1fe076..0894c9045021 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -3,7 +3,7 @@ PORTNAME= cimg PORTVERSION= 1.5.9 -PORTREVISION= 1 +PORTREVISION= 3 PORTEPOCH= 3 CATEGORIES= graphics devel MASTER_SITES= SF/${PORTNAME} \ @@ -51,7 +51,7 @@ LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ libopencv_core.so:${PORTSDIR}/graphics/opencv-core\ - libGraphicsMagick.so.14:${PORTSDIR}/graphics/GraphicsMagick + libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick ALL_TARGET= Mlinux . else ALL_TARGET= dlinux diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo index e940e2026456..0767790b2248 100644 --- a/graphics/cimg/distinfo +++ b/graphics/cimg/distinfo @@ -1,2 +1,2 @@ -SHA256 (cimg-1.5.9_1/CImg-1.5.9.zip) = ecb863210e96cf5691aa62e0625e1d6749e917875225bfa73974b1378801c2f6 -SIZE (cimg-1.5.9_1/CImg-1.5.9.zip) = 11584769 +SHA256 (cimg-1.5.9_3/CImg-1.5.9.zip) = ecb863210e96cf5691aa62e0625e1d6749e917875225bfa73974b1378801c2f6 +SIZE (cimg-1.5.9_3/CImg-1.5.9.zip) = 11584769 diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 0c394fefb7e8..7234e715a885 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -3,7 +3,7 @@ PORTNAME= darktable PORTVERSION= 1.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile index 8fb3a823ae5d..d640ab926754 100644 --- a/graphics/gimp-gmic-plugin/Makefile +++ b/graphics/gimp-gmic-plugin/Makefile @@ -2,7 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.5.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/older_versions/ \ SF/${PORTNAME}/ diff --git a/graphics/pecl-gmagick/Makefile b/graphics/pecl-gmagick/Makefile index 21774f066459..7994fbec43bb 100644 --- a/graphics/pecl-gmagick/Makefile +++ b/graphics/pecl-gmagick/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmagick PORTVERSION= 1.1.7RC2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index ab00546775c4..20516f70bb2e 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -3,6 +3,7 @@ PORTNAME= vips PORTVERSION= 7.40.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/ @@ -32,7 +33,7 @@ OPTIONS_DEFAULT+= PYTHON .endif USES= gettext gmake libtool pathfix perl5 pkgconfig shebangfix USE_PERL5= build -SHEBANG_FILES= tools/vips-${PORTVERSION:R} +SHEBANG_FILES= tools/vips-${PORTVERSION:R} tools/vipsprofile USE_GNOME= glib20 pango libxml2 libgsf USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/math/octave/Makefile b/math/octave/Makefile index 6ce465918b9c..957a228fa8cb 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave PORTVERSION= 3.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= octave @@ -20,7 +20,7 @@ BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ gsed:${PORTSDIR}/textproc/gsed \ ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo -LIB_DEPENDS= libGraphicsMagick.so.14:${PORTSDIR}/graphics/GraphicsMagick \ +LIB_DEPENDS= libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick \ libarpack.so:${PORTSDIR}/math/arpack \ libcurl.so:${PORTSDIR}/ftp/curl \ libfftw3.so:${PORTSDIR}/math/fftw3 \ diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index bdaf1b20a0ca..708480b8d7f6 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnudatalanguage DISTVERSION= 0.9.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${DISTVERSION} .if defined(BUILD_PYTHON_MODULE) @@ -65,7 +65,7 @@ PLIST_SUB+= MASTER="" .endif .if !defined(WITHOUT_GRAPHICSMAGICK) -LIB_DEPENDS+= libGraphicsMagick.so.14:${PORTSDIR}/graphics/GraphicsMagick +LIB_DEPENDS+= libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick CMAKE_ARGS+= -DGRAPHICSMAGICK:BOOL=YES .else CMAKE_ARGS+= -DGRAPHICSMAGICK:BOOL=NO diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile index 4588a10df471..fb8067a914d1 100644 --- a/textproc/htmltolatex/Makefile +++ b/textproc/htmltolatex/Makefile @@ -3,7 +3,7 @@ PORTNAME= htmltolatex PORTVERSION= 1 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= textproc MASTER_SITES= http://people.FreeBSD.org/~foxfair/distfiles/ DISTNAME= ${PORTNAME}