aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--converters/pdf2djvu/Makefile9
-rw-r--r--graphics/djview4/Makefile6
-rw-r--r--graphics/djview4/distinfo6
-rw-r--r--graphics/djvulibre-nox11/Makefile4
-rw-r--r--graphics/djvulibre-nox11/distinfo6
-rw-r--r--graphics/djvulibre-nox11/files/patch-config_ltmain.sh17
-rw-r--r--graphics/djvulibre-nox11/files/patch-configure10
-rw-r--r--graphics/djvulibre-nox11/pkg-plist3
-rw-r--r--graphics/djvulibre/Makefile6
-rw-r--r--graphics/djvulibre/distinfo6
-rw-r--r--graphics/gscan2pdf/Makefile4
-rw-r--r--graphics/kdegraphics4/Makefile2
12 files changed, 50 insertions, 29 deletions
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index f98f5b45199a..6a643719ef7d 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pdf2djvu
PORTVERSION= 0.4.12
+PORTREVISION= 1
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
@@ -20,13 +21,7 @@ LIB_DEPENDS= poppler.3:${PORTSDIR}/graphics/poppler
USE_GMAKE= yes
PLIST_FILES= bin/pdf2djvu
-.if exists(${LOCALBASE}/bin/djview)
-DJVU_DIR?= # empty
-.else
-DJVU_DIR?= -nox11
-.endif
-
-LIB_DEPENDS+= djvulibre.20:${PORTSDIR}/graphics/djvulibre${DJVU_DIR}
+LIB_DEPENDS+= djvulibre.21:${PORTSDIR}/graphics/djvulibre-nox11
MAN1= pdf2djvu.1
MANCOMPRESSED= no
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index a8ab126ebb90..1a741fa9d980 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= djview
-PORTVERSION= 4.3
-PORTREVISION= 2
+PORTVERSION= 4.4
+PORTREVISION= 0
CATEGORIES= graphics
MASTER_SITES= SF/djvu
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.20:${PORTSDIR}/graphics/djvulibre-nox11
+LIB_DEPENDS= djvulibre.21:${PORTSDIR}/graphics/djvulibre-nox11
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig gnometarget
diff --git a/graphics/djview4/distinfo b/graphics/djview4/distinfo
index a6e0abdc9b50..95e6733c1083 100644
--- a/graphics/djview4/distinfo
+++ b/graphics/djview4/distinfo
@@ -1,3 +1,3 @@
-MD5 (djview4-4.3.tar.gz) = 7469c1ac540bbe037a69aab7b4ddec4b
-SHA256 (djview4-4.3.tar.gz) = a783c3700f32d31b0a2a8662d5e2abcd1b4ab3cc129543daaa8af9211135e911
-SIZE (djview4-4.3.tar.gz) = 780019
+MD5 (djview4-4.4.tar.gz) = 466225c5546aed90008d612cdb490a4e
+SHA256 (djview4-4.4.tar.gz) = 4f3fe7b4897310d2ea559872f4dd20f1d0b017480857b04dd413bcab4b0fe8bc
+SIZE (djview4-4.4.tar.gz) = 837828
diff --git a/graphics/djvulibre-nox11/Makefile b/graphics/djvulibre-nox11/Makefile
index fa5a13bf1cad..c5d8ce47edf6 100644
--- a/graphics/djvulibre-nox11/Makefile
+++ b/graphics/djvulibre-nox11/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= djvulibre
-PORTVERSION= 3.5.20
-PORTREVISION= 2
+PORTVERSION= 3.5.21
+PORTREVISION= 0
CATEGORIES= graphics www
MASTER_SITES= SF/djvu
PKGNAMESUFFIX= -nox11
diff --git a/graphics/djvulibre-nox11/distinfo b/graphics/djvulibre-nox11/distinfo
index 4635bb276def..d128ef1130b2 100644
--- a/graphics/djvulibre-nox11/distinfo
+++ b/graphics/djvulibre-nox11/distinfo
@@ -1,3 +1,3 @@
-MD5 (djvulibre-3.5.20.tar.gz) = c94091de014b3aaf037d3d0f398d36c2
-SHA256 (djvulibre-3.5.20.tar.gz) = d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
-SIZE (djvulibre-3.5.20.tar.gz) = 2416958
+MD5 (djvulibre-3.5.21.tar.gz) = 4c6f3eb03ffbd067b6d2fe2344b0d9ad
+SHA256 (djvulibre-3.5.21.tar.gz) = 39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
+SIZE (djvulibre-3.5.21.tar.gz) = 2993718
diff --git a/graphics/djvulibre-nox11/files/patch-config_ltmain.sh b/graphics/djvulibre-nox11/files/patch-config_ltmain.sh
new file mode 100644
index 000000000000..c26cfde5d078
--- /dev/null
+++ b/graphics/djvulibre-nox11/files/patch-config_ltmain.sh
@@ -0,0 +1,17 @@
+--- 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"
+ fi
+
+- # Install the pseudo-library for information purposes.
+- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+- instname="$dir/$name"i
+- $show "$install_prog $instname $destdir/$name"
+- $run eval "$install_prog $instname $destdir/$name" || exit $?
+-
+- # Maybe install the static library, too.
+- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ ;;
+
+ *.lo)
diff --git a/graphics/djvulibre-nox11/files/patch-configure b/graphics/djvulibre-nox11/files/patch-configure
new file mode 100644
index 000000000000..7d033577a88c
--- /dev/null
+++ b/graphics/djvulibre-nox11/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig 2008-08-26 14:48:20.000000000 +0400
++++ configure 2008-08-26 14:48:36.000000000 +0400
+@@ -21689,6 +21689,7 @@
+ __sync_lock_test_and_set(&l,1);
+ __sync_lock_release(&l);
+ __sync_add_and_fetch(&l,1);
++ __sync_bool_compare_and_swap(&l,&l,1);
+ return 0;
+ ;
+ return 0;
diff --git a/graphics/djvulibre-nox11/pkg-plist b/graphics/djvulibre-nox11/pkg-plist
index 52356570865b..c11498800336 100644
--- a/graphics/djvulibre-nox11/pkg-plist
+++ b/graphics/djvulibre-nox11/pkg-plist
@@ -19,9 +19,8 @@ bin/djvutxt
bin/djvuxmlparser
include/libdjvu/ddjvuapi.h
include/libdjvu/miniexp.h
-lib/libdjvulibre.la
lib/libdjvulibre.so
-lib/libdjvulibre.so.20
+lib/libdjvulibre.so.21
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 e538a791b334..9443d97b9c9b 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= djvulibre
-PORTVERSION= 3.5.20
-PORTREVISION= 2
+PORTVERSION= 3.5.21
+PORTREVISION= 0
CATEGORIES= graphics www
MASTER_SITES= SF/djvu
@@ -16,7 +16,7 @@ COMMENT= DjVu viewers and browser plugin
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
- djvulibre.20:${PORTSDIR}/graphics/djvulibre-nox11
+ djvulibre.21:${PORTSDIR}/graphics/djvulibre-nox11
USE_ICONV= yes
USE_GNOME= gnomehack gnometarget
diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo
index 4635bb276def..d128ef1130b2 100644
--- a/graphics/djvulibre/distinfo
+++ b/graphics/djvulibre/distinfo
@@ -1,3 +1,3 @@
-MD5 (djvulibre-3.5.20.tar.gz) = c94091de014b3aaf037d3d0f398d36c2
-SHA256 (djvulibre-3.5.20.tar.gz) = d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
-SIZE (djvulibre-3.5.20.tar.gz) = 2416958
+MD5 (djvulibre-3.5.21.tar.gz) = 4c6f3eb03ffbd067b6d2fe2344b0d9ad
+SHA256 (djvulibre-3.5.21.tar.gz) = 39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
+SIZE (djvulibre-3.5.21.tar.gz) = 2993718
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index cb1390d58431..624ae955459a 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gscan2pdf
PORTVERSION= 0.9.23
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SFE
@@ -18,7 +18,7 @@ RUN_DEPENDS= p5-PDF-API2>=0.57:${PORTSDIR}/textproc/p5-PDF-API2 \
p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
scanimage:${PORTSDIR}/graphics/sane-backends \
scanadf:${PORTSDIR}/graphics/sane-frontends \
- cjb2:${PORTSDIR}/graphics/djvulibre \
+ cjb2:${PORTSDIR}/graphics/djvulibre-nox11 \
unpaper:${PORTSDIR}/graphics/unpaper \
p5-Gtk2>=1.112:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
p5-Gtk2-Ex-PodViewer>=0.17:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-PodViewer \
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 626dfa460dab..a12040d5189e 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= stable/${PORTVERSION}/src