aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorstas <stas@FreeBSD.org>2009-07-03 22:15:55 +0800
committerstas <stas@FreeBSD.org>2009-07-03 22:15:55 +0800
commit56b29afbc460aa950ff39c6f178637e0ada93a82 (patch)
tree8c51c8e03d98cbcbc292f04bc5eff7ff79cf02d8 /graphics
parent7bbe6f7fb6481b0aabc2073dae43187376136da4 (diff)
downloadfreebsd-ports-gnome-56b29afbc460aa950ff39c6f178637e0ada93a82.tar.gz
freebsd-ports-gnome-56b29afbc460aa950ff39c6f178637e0ada93a82.tar.zst
freebsd-ports-gnome-56b29afbc460aa950ff39c6f178637e0ada93a82.zip
- Update to 3.5.22.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/djvulibre-nox11/Makefile4
-rw-r--r--graphics/djvulibre-nox11/distinfo6
-rw-r--r--graphics/djvulibre-nox11/files/patch-configure10
-rw-r--r--graphics/djvulibre-nox11/files/patch-desktopfiles_Makefile.in35
-rw-r--r--graphics/djvulibre-nox11/files/patch-tools_Makefile.in47
-rw-r--r--graphics/djvulibre-nox11/files/patch-xmltools_Makefile.in11
-rw-r--r--graphics/djvulibre-nox11/pkg-plist8
-rw-r--r--graphics/djvulibre/Makefile6
-rw-r--r--graphics/djvulibre/distinfo6
-rw-r--r--graphics/djvulibre/files/patch-configure24
-rw-r--r--graphics/djvulibre/files/patch-desktopfiles_Makefile.in41
11 files changed, 153 insertions, 45 deletions
diff --git a/graphics/djvulibre-nox11/Makefile b/graphics/djvulibre-nox11/Makefile
index 339b2d9f9879..2215fca2b731 100644
--- a/graphics/djvulibre-nox11/Makefile
+++ b/graphics/djvulibre-nox11/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= djvulibre
-PORTVERSION= 3.5.21
-PORTREVISION= 1
+PORTVERSION= 3.5.22
+PORTREVISION= 0
CATEGORIES= graphics www
MASTER_SITES= SF/djvu
PKGNAMESUFFIX= -nox11
diff --git a/graphics/djvulibre-nox11/distinfo b/graphics/djvulibre-nox11/distinfo
index d128ef1130b2..003f8f6a27e7 100644
--- a/graphics/djvulibre-nox11/distinfo
+++ b/graphics/djvulibre-nox11/distinfo
@@ -1,3 +1,3 @@
-MD5 (djvulibre-3.5.21.tar.gz) = 4c6f3eb03ffbd067b6d2fe2344b0d9ad
-SHA256 (djvulibre-3.5.21.tar.gz) = 39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
-SIZE (djvulibre-3.5.21.tar.gz) = 2993718
+MD5 (djvulibre-3.5.22.tar.gz) = d1513784ce0e4f37d71595dc34c95ec7
+SHA256 (djvulibre-3.5.22.tar.gz) = 3d9242f98db8f5fc8ca239ccaa91e70c20451fe3b3fa8de6f133e0888f89f0be
+SIZE (djvulibre-3.5.22.tar.gz) = 3027985
diff --git a/graphics/djvulibre-nox11/files/patch-configure b/graphics/djvulibre-nox11/files/patch-configure
deleted file mode 100644
index 7d033577a88c..000000000000
--- a/graphics/djvulibre-nox11/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/files/patch-desktopfiles_Makefile.in b/graphics/djvulibre-nox11/files/patch-desktopfiles_Makefile.in
index c1b329e32cd8..fd218965e260 100644
--- a/graphics/djvulibre-nox11/files/patch-desktopfiles_Makefile.in
+++ b/graphics/djvulibre-nox11/files/patch-desktopfiles_Makefile.in
@@ -1,28 +1,41 @@
---- desktopfiles/Makefile.in.orig 2007-09-10 20:23:30.000000000 +0400
-+++ desktopfiles/Makefile.in 2007-09-10 20:55:26.000000000 +0400
-@@ -29,6 +29,7 @@
+--- ./desktopfiles/Makefile.in.orig 2009-07-03 16:20:19.000000000 +0400
++++ ./desktopfiles/Makefile.in 2009-07-03 16:20:48.000000000 +0400
+@@ -30,6 +30,7 @@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
+ CONVERT = @CONVERT@
XDG_MIME = @XDG_MIME@
- XDG_ICON_RESOURCE = @XDG_ICON_RESOURCE@
-@@ -71,7 +72,7 @@
+@@ -64,10 +65,10 @@
+ || cp ${srcdir}/prebuilt-$@ $@
+
+ hi-djvu.svgz: djvu.svg
+- cat $< | gzip >$@
++ cat ${.ALLSRC} | gzip >$@
+
+ hi-djview3.svgz: djview.svg
+- cat $< | gzip >$@
++ cat ${.ALLSRC} | gzip >$@
+
+ register-djvu-mime: register-djvu-mime.in
+ sed < ${srcdir}/register-djvu-mime.in > register-djvu-mime \
+@@ -96,7 +97,7 @@
install-djvu-files: FORCE
${INSTALL} -d ${DESTDIR}${datadir_djvu}
- ${INSTALL_PROGRAM} register-djvu-mime ${DESTDIR}${datadir_djvu}
+ ${INSTALL_SCRIPT} register-djvu-mime ${DESTDIR}${datadir_djvu}
- ${INSTALL_DATA} ${srcdir}/*djvu.png ${DESTDIR}${datadir_djvu}
+ ${INSTALL_DATA} *djvu.png ${DESTDIR}${datadir_djvu}
+ ${INSTALL_DATA} *djvu.svgz ${DESTDIR}${datadir_djvu}
${INSTALL_DATA} ${srcdir}/*mime.xml ${DESTDIR}${datadir_djvu}
- -@echo "Run ${datadir_djvu}/register-djvu-mime install"
-@@ -79,7 +80,7 @@
+@@ -105,7 +106,7 @@
install-djview-files: FORCE
${INSTALL} -d ${DESTDIR}${datadir_djview}
- ${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
+ ${INSTALL_SCRIPT} register-djview-menu ${DESTDIR}${datadir_djview}
- ${INSTALL_DATA} ${srcdir}/*djview3.png ${DESTDIR}${datadir_djview}
- ${INSTALL_DATA} ${srcdir}/*djview3.desktop ${DESTDIR}${datadir_djview}
- -@echo "Run ${datadir_djview}/register-djview-menu install"
+ ${INSTALL_DATA} *djview3.png ${DESTDIR}${datadir_djview}
+ ${INSTALL_DATA} *djview3.svgz ${DESTDIR}${datadir_djview}
+ ${INSTALL_PROGRAM} ${srcdir}/*djview3.desktop ${DESTDIR}${datadir_djview}
diff --git a/graphics/djvulibre-nox11/files/patch-tools_Makefile.in b/graphics/djvulibre-nox11/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..1bd254767109
--- /dev/null
+++ b/graphics/djvulibre-nox11/files/patch-tools_Makefile.in
@@ -0,0 +1,47 @@
+--- ./tools/Makefile.in.orig 2009-07-03 16:01:51.000000000 +0400
++++ ./tools/Makefile.in 2009-07-03 16:07:05.000000000 +0400
+@@ -53,7 +53,7 @@
+
+ INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
+ FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
+-LIBS= @LDFLAGS@ @LIBS@
++LIBS= @LDFLAGS@ @LIBS@ @THREAD_LIBS@
+ MORELIBS= @LDFLAGS@ ${TIFF_LIBS} @LIBS@
+ CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+ CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+@@ -65,7 +65,7 @@
+ djvups djvuextract djvumake \
+ djvused djvutxt djvuserve
+
+-SCRIPTS = djvudigital any2djvu
++SCRIPTS = djvudigital
+
+ MAN1PAGES = djvu
+
+@@ -83,7 +83,7 @@
+ install-scripts: FORCE
+ ${INSTALL} -d ${DESTDIR}${bindir}
+ for n in ${SCRIPTS} ; do \
+- ${INSTALL_PROGRAM} -m 0755 ${srcdir}/$$n ${DESTDIR}${bindir} \
++ ${INSTALL} -m 0755 ${srcdir}/$$n ${DESTDIR}${bindir} \
+ || exit ; done
+
+ install-man: FORCE
+@@ -127,7 +127,7 @@
+
+ cjb2: cjb2.o ${JB2OBJS}
+ ${LIBTOOL} --mode=link \
+- ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS}
++ ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS} ${THREAD_LIBS}
+
+ cpaldjvu: cpaldjvu.o ${JB2OBJS}
+ ${LIBTOOL} --mode=link \
+@@ -139,7 +139,7 @@
+
+ ddjvu: ddjvu.o tiff2pdf.o
+ ${LIBTOOL} --mode=link \
+- ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS}
++ ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS} ${THREAD_LIBS}
+
+ djvm: djvm.o
+ ${LIBTOOL} --mode=link \
diff --git a/graphics/djvulibre-nox11/files/patch-xmltools_Makefile.in b/graphics/djvulibre-nox11/files/patch-xmltools_Makefile.in
new file mode 100644
index 000000000000..1b01a25406c8
--- /dev/null
+++ b/graphics/djvulibre-nox11/files/patch-xmltools_Makefile.in
@@ -0,0 +1,11 @@
+--- ./xmltools/Makefile.in.orig 2009-07-03 16:10:50.000000000 +0400
++++ ./xmltools/Makefile.in 2009-07-03 16:11:10.000000000 +0400
+@@ -51,7 +51,7 @@
+
+ INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
+ FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+-LIBS= @LDFLAGS@ @LIBS@
++LIBS= @LDFLAGS@ @LIBS@ ${THREAD_LIBS}
+ CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+ CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+
diff --git a/graphics/djvulibre-nox11/pkg-plist b/graphics/djvulibre-nox11/pkg-plist
index c11498800336..ad0704ee33b1 100644
--- a/graphics/djvulibre-nox11/pkg-plist
+++ b/graphics/djvulibre-nox11/pkg-plist
@@ -20,15 +20,21 @@ bin/djvuxmlparser
include/libdjvu/ddjvuapi.h
include/libdjvu/miniexp.h
lib/libdjvulibre.so
-lib/libdjvulibre.so.21
+lib/libdjvulibre.so.22
libdata/pkgconfig/ddjvuapi.pc
share/djvu/osi/cs/messages.xml
share/djvu/osi/de/libdjvu++.xml
share/djvu/osi/de/messages.xml
share/djvu/osi/desktop/djvulibre-mime.xml
+share/djvu/osi/desktop/hi-djvu.svgz
share/djvu/osi/desktop/hi22-djvu.png
share/djvu/osi/desktop/hi32-djvu.png
share/djvu/osi/desktop/hi48-djvu.png
+share/djvu/osi/desktop/hi64-djvu.png
+share/djvu/osi/desktop/prebuilt-hi22-djvu.png
+share/djvu/osi/desktop/prebuilt-hi32-djvu.png
+share/djvu/osi/desktop/prebuilt-hi48-djvu.png
+share/djvu/osi/desktop/prebuilt-hi64-djvu.png
share/djvu/osi/desktop/register-djvu-mime
share/djvu/osi/en/djvutools-reference.xml
share/djvu/osi/en/libdjvu++.xml
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index def7456bba41..6295d5afaadc 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= djvulibre
-PORTVERSION= 3.5.21
-PORTREVISION= 1
+PORTVERSION= 3.5.22
+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.21:${PORTSDIR}/graphics/djvulibre-nox11
+ djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11
USE_ICONV= yes
USE_GNOME= gnomehack gnometarget
diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo
index d128ef1130b2..003f8f6a27e7 100644
--- a/graphics/djvulibre/distinfo
+++ b/graphics/djvulibre/distinfo
@@ -1,3 +1,3 @@
-MD5 (djvulibre-3.5.21.tar.gz) = 4c6f3eb03ffbd067b6d2fe2344b0d9ad
-SHA256 (djvulibre-3.5.21.tar.gz) = 39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
-SIZE (djvulibre-3.5.21.tar.gz) = 2993718
+MD5 (djvulibre-3.5.22.tar.gz) = d1513784ce0e4f37d71595dc34c95ec7
+SHA256 (djvulibre-3.5.22.tar.gz) = 3d9242f98db8f5fc8ca239ccaa91e70c20451fe3b3fa8de6f133e0888f89f0be
+SIZE (djvulibre-3.5.22.tar.gz) = 3027985
diff --git a/graphics/djvulibre/files/patch-configure b/graphics/djvulibre/files/patch-configure
index ecfe48a92d0c..bf21e13ba438 100644
--- a/graphics/djvulibre/files/patch-configure
+++ b/graphics/djvulibre/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon Oct 31 19:34:47 2005
-+++ configure Tue Apr 18 13:55:47 2006
-@@ -486,7 +486,7 @@
+--- configure.orig 2009-07-03 15:21:12.000000000 +0400
++++ configure 2009-07-03 15:22:16.000000000 +0400
+@@ -945,7 +945,7 @@
srcdir=
verbose=
x_includes=NONE
@@ -9,12 +9,12 @@
# Installation directory options.
# These are left unexpanded so users can "make install exec_prefix=/foo"
-@@ -26327,7 +26327,7 @@
- then
- NSDEJAVU_CFLAGS=${X_CFLAGS}
- case "$host" in
-- *-cygwin* | *-mingw*)
-+ *-cygwin* | *-mingw* | *-freebsd*)
- NSDEJAVU_LIBS="`echo ${X_LIBS} | sed -e 's/-lXext/-lXt -lXext/'`"
- NSDEJAVU_LIBS="-no-undefined $NSDEJAVU_LIBS"
- ;;
+@@ -28076,7 +28076,7 @@
+
+ NSDEJAVU_CFLAGS=${X_CFLAGS}
+ case "$host" in
+- *-cygwin* | *-mingw*)
++ *-cygwin* | *-mingw* | *-freebsd*)
+ NSDEJAVU_LIBS="`echo ${X_LIBS} | sed -e 's/-lXext/-lXt -lXext/'`"
+ NSDEJAVU_LIBS="-no-undefined $NSDEJAVU_LIBS"
+ ;;
diff --git a/graphics/djvulibre/files/patch-desktopfiles_Makefile.in b/graphics/djvulibre/files/patch-desktopfiles_Makefile.in
new file mode 100644
index 000000000000..fd218965e260
--- /dev/null
+++ b/graphics/djvulibre/files/patch-desktopfiles_Makefile.in
@@ -0,0 +1,41 @@
+--- ./desktopfiles/Makefile.in.orig 2009-07-03 16:20:19.000000000 +0400
++++ ./desktopfiles/Makefile.in 2009-07-03 16:20:48.000000000 +0400
+@@ -30,6 +30,7 @@
+
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ CONVERT = @CONVERT@
+ XDG_MIME = @XDG_MIME@
+@@ -64,10 +65,10 @@
+ || cp ${srcdir}/prebuilt-$@ $@
+
+ hi-djvu.svgz: djvu.svg
+- cat $< | gzip >$@
++ cat ${.ALLSRC} | gzip >$@
+
+ hi-djview3.svgz: djview.svg
+- cat $< | gzip >$@
++ cat ${.ALLSRC} | gzip >$@
+
+ register-djvu-mime: register-djvu-mime.in
+ sed < ${srcdir}/register-djvu-mime.in > register-djvu-mime \
+@@ -96,7 +97,7 @@
+
+ install-djvu-files: FORCE
+ ${INSTALL} -d ${DESTDIR}${datadir_djvu}
+- ${INSTALL_PROGRAM} register-djvu-mime ${DESTDIR}${datadir_djvu}
++ ${INSTALL_SCRIPT} register-djvu-mime ${DESTDIR}${datadir_djvu}
+ ${INSTALL_DATA} *djvu.png ${DESTDIR}${datadir_djvu}
+ ${INSTALL_DATA} *djvu.svgz ${DESTDIR}${datadir_djvu}
+ ${INSTALL_DATA} ${srcdir}/*mime.xml ${DESTDIR}${datadir_djvu}
+@@ -105,7 +106,7 @@
+
+ install-djview-files: FORCE
+ ${INSTALL} -d ${DESTDIR}${datadir_djview}
+- ${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
++ ${INSTALL_SCRIPT} register-djview-menu ${DESTDIR}${datadir_djview}
+ ${INSTALL_DATA} *djview3.png ${DESTDIR}${datadir_djview}
+ ${INSTALL_DATA} *djview3.svgz ${DESTDIR}${datadir_djview}
+ ${INSTALL_PROGRAM} ${srcdir}/*djview3.desktop ${DESTDIR}${datadir_djview}
generated by cgit (git 2.34.1) at 2024-12-30 03:50:18 +0800