From 02d636fea3b32889d24bf3eefa9f11fe32c25e80 Mon Sep 17 00:00:00 2001 From: Stanislav Sedov Date: Sun, 21 Nov 2010 08:59:10 +0000 Subject: [PATCH] - Update graphics/djvulibre to 3.5.23. - Bump portrevisions of all dependent ports. PR: ports/152353, ports/152353 (based on) Submitted by: Takefu --- converters/pdf2djvu/Makefile | 4 ++-- graphics/ImageMagick/Makefile | 1 + graphics/djview4/Makefile | 4 ++-- graphics/djvulibre-nox11/Makefile | 11 ++++++----- graphics/djvulibre-nox11/distinfo | 5 ++--- .../djvulibre-nox11/files/patch-config_ltmain.sh | 14 +++++++------- graphics/djvulibre-nox11/pkg-plist | 2 +- graphics/djvulibre/Makefile | 12 ++++++------ graphics/djvulibre/distinfo | 5 ++--- graphics/evince/Makefile | 4 +++- graphics/kdegraphics4/Makefile | 4 ++-- 11 files changed, 34 insertions(+), 32 deletions(-) diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index bd2318f50294..540f2ddd9f77 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdf2djvu PORTVERSION= 0.5.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX} @@ -17,7 +17,7 @@ COMMENT= Pdf2djvu creates DjVu files from PDF files BUILD_DEPENDS= ${LOCALBASE}/include/pstreams/pstream.h:${PORTSDIR}/devel/pstreams LIB_DEPENDS= poppler.6:${PORTSDIR}/graphics/poppler -LIB_DEPENDS+= djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11 +LIB_DEPENDS+= djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11 GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS=${PTHREAD_LIBS} \ diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 49dfe96f6842..9cd6428d9e9d 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -7,6 +7,7 @@ PORTNAME= ImageMagick DISTVERSION= 6.6.4-10 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \ ftp://ftp.nluug.nl/pub/ImageMagick/ \ diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index cc3ac5b6153e..b33b669b84a4 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -7,7 +7,7 @@ PORTNAME= djview PORTVERSION= 4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/djvu/DjView/${PORTVERSION} DISTNAME= ${PORTNAME}4-${PORTVERSION} @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}4-${PORTVERSION} MAINTAINER= stas@FreeBSD.org COMMENT= Standalone Djvu viewer and plugin based on Qt4 toolkit -LIB_DEPENDS= djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11 +LIB_DEPENDS= djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11 GNU_CONFIGURE= yes USE_GNOME= pkgconfig gnometarget diff --git a/graphics/djvulibre-nox11/Makefile b/graphics/djvulibre-nox11/Makefile index 94e1e7ca3f38..df6f4e4038f0 100644 --- a/graphics/djvulibre-nox11/Makefile +++ b/graphics/djvulibre-nox11/Makefile @@ -6,17 +6,18 @@ # PORTNAME= djvulibre -PORTVERSION= 3.5.22 -PORTREVISION= 2 +PORTVERSION= 3.5.23 +PORTREVISION= 0 CATEGORIES= graphics www -MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ \ - SF/djvu/DjVuLibre/${PORTVERSION} +MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION} PKGNAMESUFFIX= -nox11 MAINTAINER= stas@FreeBSD.org COMMENT= DjVu base libraries and utilities -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ +LICENSE= GPLv2 + +LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff USE_ICONV= yes diff --git a/graphics/djvulibre-nox11/distinfo b/graphics/djvulibre-nox11/distinfo index 003f8f6a27e7..bcab4b8b230b 100644 --- a/graphics/djvulibre-nox11/distinfo +++ b/graphics/djvulibre-nox11/distinfo @@ -1,3 +1,2 @@ -MD5 (djvulibre-3.5.22.tar.gz) = d1513784ce0e4f37d71595dc34c95ec7 -SHA256 (djvulibre-3.5.22.tar.gz) = 3d9242f98db8f5fc8ca239ccaa91e70c20451fe3b3fa8de6f133e0888f89f0be -SIZE (djvulibre-3.5.22.tar.gz) = 3027985 +SHA256 (djvulibre-3.5.23.tar.gz) = 608c07e629626cfe713168c942a07d2db3b0b19df4aae1f598473f4a2daf213d +SIZE (djvulibre-3.5.23.tar.gz) = 3028428 diff --git a/graphics/djvulibre-nox11/files/patch-config_ltmain.sh b/graphics/djvulibre-nox11/files/patch-config_ltmain.sh index c26cfde5d078..db247645038a 100644 --- a/graphics/djvulibre-nox11/files/patch-config_ltmain.sh +++ b/graphics/djvulibre-nox11/files/patch-config_ltmain.sh @@ -1,14 +1,14 @@ ---- config/ltmain.sh.orig 2008-08-26 16:13:33.000000000 +0400 -+++ config/ltmain.sh 2008-08-26 16:14:40.000000000 +0400 -@@ -6002,14 +6002,6 @@ - IFS="$save_ifs" +--- config/ltmain.sh.orig 2010-11-19 01:46:29.000000000 -0800 ++++ config/ltmain.sh 2010-11-19 01:46:38.000000000 -0800 +@@ -2076,14 +2076,6 @@ + func_execute_cmds "$postinstall_cmds" 'exit $?' fi - # Install the pseudo-library for information purposes. -- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- func_basename "$file" +- name="$func_basename_result" - instname="$dir/$name"i -- $show "$install_prog $instname $destdir/$name" -- $run eval "$install_prog $instname $destdir/$name" || exit $? +- func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/graphics/djvulibre-nox11/pkg-plist b/graphics/djvulibre-nox11/pkg-plist index ad0704ee33b1..4c10015c2624 100644 --- a/graphics/djvulibre-nox11/pkg-plist +++ b/graphics/djvulibre-nox11/pkg-plist @@ -20,7 +20,7 @@ bin/djvuxmlparser include/libdjvu/ddjvuapi.h include/libdjvu/miniexp.h lib/libdjvulibre.so -lib/libdjvulibre.so.22 +lib/libdjvulibre.so.23 libdata/pkgconfig/ddjvuapi.pc share/djvu/osi/cs/messages.xml share/djvu/osi/de/libdjvu++.xml diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 9fc5df08fd17..c35855023a54 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -6,18 +6,18 @@ # PORTNAME= djvulibre -PORTVERSION= 3.5.22 -PORTREVISION= 3 +PORTVERSION= 3.5.23 CATEGORIES= graphics www -MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ \ - SF/djvu/DjVuLibre/${PORTVERSION} +MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION} MAINTAINER= stas@FreeBSD.org COMMENT= DjVu viewers and browser plugin -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ +LICENSE= GPLv2 + +LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11 + djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11 USE_ICONV= yes USE_GNOME= gnomehack gnometarget diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo index 003f8f6a27e7..bcab4b8b230b 100644 --- a/graphics/djvulibre/distinfo +++ b/graphics/djvulibre/distinfo @@ -1,3 +1,2 @@ -MD5 (djvulibre-3.5.22.tar.gz) = d1513784ce0e4f37d71595dc34c95ec7 -SHA256 (djvulibre-3.5.22.tar.gz) = 3d9242f98db8f5fc8ca239ccaa91e70c20451fe3b3fa8de6f133e0888f89f0be -SIZE (djvulibre-3.5.22.tar.gz) = 3027985 +SHA256 (djvulibre-3.5.23.tar.gz) = 608c07e629626cfe713168c942a07d2db3b0b19df4aae1f598473f4a2daf213d +SIZE (djvulibre-3.5.23.tar.gz) = 3028428 diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index cd85c2f72e26..fa9f2c828dee 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -7,7 +7,9 @@ # PORTNAME= evince +PORTVERSION= 2.30.3 PORTVERSION= 2.32.0 +PORTREVISION= 1 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -97,7 +99,7 @@ PLIST_SUB+= IMPRESS="@comment " .endif .if defined(WITH_DJVU) -LIB_DEPENDS+= djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11 +LIB_DEPENDS+= djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11 CONFIGURE_ARGS+= --enable-djvu GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas PLIST_SUB+= DJVU="" diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index bf9ab0307129..4fe5aea3be6f 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -6,7 +6,7 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -28,7 +28,7 @@ LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ chm.0:${PORTSDIR}/misc/chmlib \ sane.1:${PORTSDIR}/graphics/sane-backends \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \ - djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11 \ + djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11 \ qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ spectre.1:${PORTSDIR}/print/libspectre \ qca.2:${PORTSDIR}/devel/qca \