mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-19 03:52:17 +00:00
Code Issues Releases Activity

update DjVuLibre to 3.5.25.3 and adjust dependent ports: the QT3 GUI that was

Browse Source 
formerly in graphics/djvulibre has been removed, and graphics/djvulibre-nox11
has been merged back into graphics/djvulibre
This commit is contained in:
Brendan Fabeny 2012-06-13 04:49:48 +00:00
parent 955fb96849
commit dfe91aa6ae
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=299167
28 changed files with 167 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MOVED
View File

@ -3474,3 +3474,4 @@ java/eclipseme||2012-06-12|Has expired: depends on java/sun-wtk
mail/lmtpd||2012-06-12|Has expired: BROKEN for more than 6 month
print/cups-magicolor||2012-06-12|Has expired: BROKEN for more than 6 month
security/pantera||2012-06-12|Has expired: BROKEN for more than 6 month
graphics/djvulibre-nox11|graphics/djvulibre|2012-06-13|Merged back into graphics/djvulibre

13
UPDATING
View File

@ -5,6 +5,19 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20120613:
AFFECTS: users of graphics/djvulibre and graphics/djvulibre-nox11
AUTHOR: bf@FreeBSD.org
DjVuLibre been updated to 3.5.25.3. The QT3 GUI that was in
graphics/djvulibre has been removed (users of this GUI should consider
switching to the new QT4 GUI in graphics/djview4), and
graphics/djvulibre-nox11 has been merged back into graphics/djvulibre.
To update DjVuLibre, you can use:
# pkg_delete djvulibre-\?.\*
# portmaster -o graphics/djvulibre djvulibre-nox11
20120612:
AFFECTS: users of databases/postgresql-libpqxx
AUTHOR: avilla@FreeBSD.org

4
converters/pdf2djvu/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= pdf2djvu
PORTVERSION= 0.5.11
PORTREVISION= 9
PORTREVISION= 10
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.18:${PORTSDIR}/graphics/poppler
LIB_DEPENDS+= djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}

2
graphics/ImageMagick/Makefile
View File

@ -173,7 +173,7 @@ PLIST_SUB+= OPENEXR="@comment "
. if ${_IMAGEMAGICK_THREADS} == "no"
IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
. endif
LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre-nox11
LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre
PLIST_SUB+= DJVU=""
.else
CONFIGURE_ARGS+= --without-djvu

1
graphics/Makefile
View File

@ -126,7 +126,6 @@
SUBDIR += divxcalc
SUBDIR += djview4
SUBDIR += djvulibre
SUBDIR += djvulibre-nox11
SUBDIR += dmtx-utils
SUBDIR += dri
SUBDIR += driconf

2
graphics/apvlv/Makefile
View File

@ -37,7 +37,7 @@ OPTIONS= DJVU "Enable DJVU support" off
CMAKE_ARGS+= -DAPVLV_WITH_DJVU=OFF
.else
CMAKE_ARGS+= -DAPVLV_WITH_DJVU=ON
LIB_DEPENDS+= djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre
.endif
.include <bsd.port.mk>

4
graphics/djview4/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= djview
PORTVERSION= 4.9
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/djvu/DjView/${PORTVERSION}
@ -16,7 +16,7 @@ COMMENT= Standalone Djvu viewer and plugin based on Qt4 toolkit
LICENSE= GPLv2
LIB_DEPENDS= djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
LIB_DEPENDS= djvulibre:${PORTSDIR}/graphics/djvulibre
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig

85
graphics/djvulibre-nox11/Makefile
View File

@ -1,85 +0,0 @@
# New ports collection makefile for: libdjvu++
# Date Created: 20 July 1999
# Whom: Mikhail Teterin <mi@aldan.algebra.com>
#
# $FreeBSD$
#
PORTNAME= djvulibre
PORTVERSION= 3.5.24
PORTREVISION= 0
CATEGORIES= graphics www
MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION}
PKGNAMESUFFIX= -nox11
MAINTAINER= bf@FreeBSD.org
COMMENT= DjVu base libraries and utilities
LICENSE= GPLv2
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
USE_ICONV= yes
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \
JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
TIFF_CFLAGS="-I${LOCALBASE}/include" \
TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
LOCALBASE="${LOCALBASE}"
CONFIGURE_ARGS= --enable-threads=pthread --enable-shared
USE_LDCONFIG= yes
OPTIONS= ANY2DJVU "Install any2djvu script (requires curl)" off
MANLANG= "" ja
MAN1= bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1 ddjvu.1 djvm.1 \
djvmcvt.1 djvu.1 djvudump.1 djvuextract.1 djvumake.1 djvups.1 \
djvused.1 djvuserve.1 djvutxt.1
MAN1_EN= djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1
PORTDOCS= djvu2spec.djvu lizard2002.djvu
CONFIGURE_ARGS+= --disable-djview --without-x
.include <bsd.port.pre.mk>
.if defined(WITH_ANY2DJVU)
MAN1_EN+= any2djvu.1
RUN_DEPENDS+= curl:${PORTSDIR}/ftp/curl
PLIST_SUB+= ANY2DJVU=""
.else
PLIST_SUB+= ANY2DJVU="@comment "
.endif
post-patch:
@${REINPLACE_CMD} -e \
's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/libdjvu/Makefile.in
@${REINPLACE_CMD} -e '/-O\*/d ; \
s|$$OPTS -O3|$$OPTS|g ; \
s|$$OPTS -O2|$$OPTS|g ; \
s|$$OPTS $$opt|$$OPTS|g' ${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|= @CPPFLAGS|= $${FLAGS} @CPPFLAGS|g ; \
s|@ $${FLAGS}|@|g ; \
s|} $${FLAGS}|}|g ; \
s|/netscape/|/djvulibre/|g ; \
s|eucjp|eucJP|g ; \
s|_PROGRAM} -m|} -m|g'
.if !defined(WITH_ANY2DJVU)
@${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in
.endif
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
.endif
.include <bsd.port.post.mk>

2
graphics/djvulibre-nox11/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (djvulibre-3.5.24.tar.gz) = c0734c81d22a0e458c3fb5efd4c3eab051bcb6ad8740f5a5784c1f5699482534
SIZE (djvulibre-3.5.24.tar.gz) = 2998853

41
graphics/djvulibre-nox11/files/patch-desktopfiles_Makefile.in
View File

@ -1,41 +0,0 @@
--- ./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}

10
graphics/djvulibre-nox11/files/patch-libdjvu__GSmartPointer.h
View File

@ -1,10 +0,0 @@
--- libdjvu/GSmartPointer.h.orig 2011-03-06 12:43:17.000000000 -0500
+++ libdjvu/GSmartPointer.h 2011-11-22 09:16:50.000000000 -0500
@@ -94,6 +94,7 @@
#pragma warning( disable : 4243 )
#endif
+#include <stddef.h>
#include "DjVuGlobal.h"
#include "atomic.h"

14
graphics/djvulibre-nox11/pkg-descr
View File

@ -1,14 +0,0 @@
DjVu is a web-centric format and software platform for distributing
documents and images. DjVu was originally developped at AT&T
Labs-Research. In March 2000, AT&T sold DjVu to LizardTech Inc. who
now distributes Windows/Mac plug-ins, and commercial encoders (mostly
on Windows)
The LizardTech released the reference implementation of DjVu under
the GNU GPL in October 2000. DjVuLibre (which means free DjVu), is
an enhanced version of that code maintained by the original inventors
of DjVu. It is compatible with version 3.5 of the LizardTech DjVu
software suite.
Author: Leon Bottou <leonb@users.sf.net>
WWW: http://djvu.sourceforge.net/

68
graphics/djvulibre-nox11/pkg-plist
View File

@ -1,68 +0,0 @@
%%ANY2DJVU%%bin/any2djvu
bin/bzz
bin/c44
bin/cjb2
bin/cpaldjvu
bin/csepdjvu
bin/ddjvu
bin/djvm
bin/djvmcvt
bin/djvudigital
bin/djvudump
bin/djvuextract
bin/djvumake
bin/djvups
bin/djvused
bin/djvuserve
bin/djvutoxml
bin/djvutxt
bin/djvuxmlparser
include/libdjvu/ddjvuapi.h
include/libdjvu/miniexp.h
lib/libdjvulibre.so
lib/libdjvulibre.so.24
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
share/djvu/osi/en/messages.xml
share/djvu/osi/en/unixgui-shared.xml
share/djvu/osi/en/unixgui-viewer.xml
share/djvu/osi/fr/libdjvu++.xml
share/djvu/osi/fr/messages.xml
share/djvu/osi/ja/libdjvu++.xml
share/djvu/osi/ja/messages.xml
share/djvu/osi/languages.xml
share/djvu/osi/zh/libdjvu++.xml
share/djvu/osi/zh/messages.xml
share/djvu/pubtext/DjVuMessages.dtd
share/djvu/pubtext/DjVuOCR.dtd
share/djvu/pubtext/DjVuXML-s.dtd
@dirrm share/djvu/pubtext
@dirrm share/djvu/osi/zh
@dirrm share/djvu/osi/ja
@dirrm share/djvu/osi/fr
@dirrm share/djvu/osi/en
@dirrm share/djvu/osi/desktop
@dirrm share/djvu/osi/de
@dirrm share/djvu/osi/cs
@dirrm share/djvu/osi
@dirrmtry share/djvu
@dirrmtry man/fr/man1
@dirrmtry man/fr
@dirrmtry man/de/man1
@dirrmtry man/de
@dirrm include/libdjvu

107
graphics/djvulibre/Makefile
View File

@ -6,19 +6,17 @@
#
PORTNAME= djvulibre
PORTVERSION= 3.5.24
PORTREVISION= 1
PORTVERSION= 3.5.25.3
CATEGORIES= graphics www
MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION}
MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION:R}
MAINTAINER= bf@FreeBSD.org
COMMENT= DjVu viewers and browser plugin
COMMENT= DjVu base libraries and utilities
LICENSE= GPLv2
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \
tiff:${PORTSDIR}/graphics/tiff
USE_ICONV= yes
USE_GNOME= gnomehack
@ -28,66 +26,55 @@ CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \
TIFF_CFLAGS="-I${LOCALBASE}/include" \
TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
LOCALBASE="${LOCALBASE}" \
CXX="${CXX}"
CONFIGURE_ARGS= --enable-threads=pthread --enable-shared \
--enable-djview
PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --enable-threads=pthread --enable-shared
USE_LDCONFIG= yes
WRKSRC = ${WRKDIR}/${DISTNAME:R}
INSTALL_TARGET= install-gui install-i18n
OPTIONS_DEFINE = ANY2DJVU
ANY2DJVU_DESC= Install any2djvu script (requires curl)
USE_QT_VER= 3
CONFIGURE_ENV+= QTLIBS="-L${QT_PREFIX}/lib -lqt-mt"
MANLANG= "" ja
MAN1= djview3.1 nsdejavu.1
MLINKS= djview3.1 djview.1
DESKTOPDIR= ${PREFIX}/share/djvu/djview3/desktop
MAN1= bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1 ddjvu.1 djvm.1 \
djvmcvt.1 djvu.1 djvudump.1 djvuextract.1 djvumake.1 djvups.1 \
djvused.1 djvuserve.1 djvutxt.1
MAN1_EN= djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1
USE_WEBPLUGINS= gecko*
WEBPLUGINS_DIR= ${PREFIX}/lib/djvulibre/plugins
WEBPLUGINS_FILES= nsdejavu.so
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
.if ${PORT_OPTIONS:MANY2DJVU}
MAN1_EN+= any2djvu.1
RUN_DEPENDS+= curl:${PORTSDIR}/ftp/curl
PLIST_SUB+= ANY2DJVU=""
.else
PLIST_SUB+= ANY2DJVU="@comment "
.endif
post-patch:
@${REINPLACE_CMD} -E \
-e 's,(SUBDIRS_FIRST[[:space:]]+=[[:space:]]+).*,\1,' \
-e 's,(SUBDIRS_XML[[:space:]]+=[[:space:]]+).*,\1,' \
${WRKSRC}/Makefile.in
@${FIND} ${WRKSRC}/i18n/ -name "Makefile.in" | \
${XARGS} ${REINPLACE_CMD} -E -e \
's,(MANFILES[[:space:]]*=[[:space:]]*).*,\1$${MANFILES_GUI},'
@${REINPLACE_CMD} -E -e \
's,(LIBDJVU[[:space:]]+=[[:space:]]+).*,\1-ldjvulibre,' \
${WRKSRC}/gui/djview/Makefile.in \
${WRKSRC}/gui/bin2cpp/Makefile.in \
${WRKSRC}/tools/Makefile.in \
${WRKSRC}/xmltools/Makefile.in
@${REINPLACE_CMD} -e '/-O\*/d ; \
s|$$OPTS -O3|$$OPTS|g ; \
s|$$OPTS -O2|$$OPTS|g ; \
s|$$OPTS $$opt|$$OPTS|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's,/netscape/,/djvulibre/,' \
${WRKSRC}/gui/nsdejavu/nsdejavu.1.in
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|= @CPPFLAGS|= $${FLAGS} @CPPFLAGS|g ; \
s|@ $${FLAGS}|@|g ; \
s|} $${FLAGS}|}|g ; \
s|/netscape/|/djvulibre/|g ; \
s|eucjp|eucJP|g ; \
s|_PROGRAM} -m|} -m|g'
@${REINPLACE_CMD} -e \
's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/libdjvu/Makefile.in
@${REINPLACE_CMD} -e \
'/-[Og]\*)/d ; \
s|$$OPTS -O[[:digit:]]*|$$OPTS|g ; \
s|$$OPTS $$opt|$$OPTS|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's|$${FLAGS}|| ; \
s|@CPPFLAGS@|$${FLAGS} &|' \
${WRKSRC}/tools/jb2cmp/Makefile.in
@${REINPLACE_CMD} -e \
's|_PROGRAM} -m 0755|_SCRIPT}|' \
${WRKSRC}/tools/Makefile.in
.if empty(PORT_OPTIONS:MANY2DJVU)
@${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in
.endif
.if ${PORT_OPTIONS:MDOC}
PORTDOCS= djvu2spec.djvu djvu3spec.djvu djvuchanges.txt lizard2002.djvu lizard2007.djvu
post-install:
#
# Install desktop files.
#
${MKDIR} ${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/desktopfiles/djvulibre-djview3.desktop \
${WRKSRC}/desktopfiles/hi32-djview3.png \
${DESKTOPDIR}
${INSTALL_SCRIPT} ${WRKSRC}/desktopfiles/register-djview-menu \
${DESKTOPDIR}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

4
graphics/djvulibre/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (djvulibre-3.5.24.tar.gz) = c0734c81d22a0e458c3fb5efd4c3eab051bcb6ad8740f5a5784c1f5699482534
SIZE (djvulibre-3.5.24.tar.gz) = 2998853
SHA256 (djvulibre-3.5.25.3.tar.gz) = 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0
SIZE (djvulibre-3.5.25.3.tar.gz) = 2543949

0
graphics/djvulibre-nox11/files/patch-config_ltmain.sh → graphics/djvulibre/files/patch-config_ltmain.sh
View File

20
graphics/djvulibre/files/patch-configure
View File

@ -1,20 +0,0 @@
--- 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
-x_libraries=NONE
+x_libraries=${LOCALBASE}/lib
# Installation directory options.
# These are left unexpanded so users can "make install exec_prefix=/foo"
@@ -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"
;;

33
graphics/djvulibre/files/patch-desktopfiles_Makefile.in
View File

@ -1,27 +1,31 @@
--- ./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 @@
--- desktopfiles/Makefile.in.orig 2012-05-07 22:56:53.000000000 -0400
+++ desktopfiles/Makefile.in 2012-06-09 21:00:25.000000000 -0400
@@ -30,9 +30,10 @@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
CONVERT = @CONVERT@
-INKSCAPE = @INKSCAPE@
+INKSCAPE = false
RSVG = @RSVG@
XDG_MIME = @XDG_MIME@
@@ -64,10 +65,10 @@
|| cp ${srcdir}/prebuilt-$@ $@
XDG_ICON_RESOURCE = @XDG_ICON_RESOURCE@
@@ -58,10 +59,10 @@
|| ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $< $@ \
|| ${INKSCAPE} --without-gui --export-width=$${s} \
--export-height=$${s} --export-png=$@ $< \
- || cp ${srcdir}/prebuilt-$@ $@
+ || if test -f ${srcdir}/prebuilt-$@ ; then cp ${srcdir}/prebuilt-$@ $@ ; fi
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 @@
@@ -80,7 +81,7 @@
install-djvu-files: FORCE
${INSTALL} -d ${DESTDIR}${datadir_djvu}
@ -30,12 +34,3 @@
${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}

11
graphics/djvulibre/files/patch-gui_djview_Makefile.in
View File

@ -1,11 +0,0 @@
--- gui/djview/Makefile.in.orig 2009-07-08 18:38:28.000000000 +0400
+++ gui/djview/Makefile.in 2009-07-08 18:38:52.000000000 +0400
@@ -161,7 +161,7 @@
MISCFLAGS = ${JPEG_CFLAGS} ${THREAD_CFLAGS} ${QT_CFLAGS} ${X_CFLAGS}
FLAGS = ${DEFS} ${INCS} ${OPTS} ${MISCFLAGS}
-LIBS= @LDFLAGS@ ${QT_LIBS} ${X_LIBS} @LIBS@
+LIBS= @LDFLAGS@ ${QT_LIBS} ${X_LIBS} @LIBS@ ${THREAD_LIBS}
CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@

11
graphics/djvulibre/files/patch-libdjvu__miniexp.cpp Normal file
View File

@ -0,0 +1,11 @@
--- libdjvu/miniexp.cpp.orig 2012-05-07 22:56:53.000000000 -0400
+++ libdjvu/miniexp.cpp 2012-06-12 07:23:54.000000000 -0400
@@ -1008,7 +1008,7 @@
if (io == &miniexp_io && !CompatCounter::count)
return (*minilisp_getc)(); /* compatibility hack */
FILE *f = (io->data[0]) ? (FILE*)(io->data[0]) : stdin;
- return ::getc(f);
+ return getc(f);
}
static int

0
graphics/djvulibre-nox11/files/patch-tools_Makefile.in → graphics/djvulibre/files/patch-tools_Makefile.in
View File

0
graphics/djvulibre-nox11/files/patch-tools_any2djvu → graphics/djvulibre/files/patch-tools_any2djvu
View File

0
graphics/djvulibre-nox11/files/patch-xmltools_Makefile.in → graphics/djvulibre/files/patch-xmltools_Makefile.in
View File

8
graphics/djvulibre/pkg-descr
View File

@ -1,12 +1,12 @@
DjVu is a web-centric format and software platform for distributing
documents and images. DjVu was originally developped at AT&T
documents and images. DjVu was originally developed at AT&T
Labs-Research. In March 2000, AT&T sold DjVu to LizardTech Inc. who
now distributes Windows/Mac plug-ins, and commercial encoders (mostly
on Windows)
on Windows).
The LizardTech released the reference implementation of DjVu under
LizardTech released the reference implementation of DjVu under
the GNU GPL in October 2000. DjVuLibre (which means free DjVu), is
an enhanced version of that code maintained by the original inventors
an enhanced version of that code, maintained by the original inventors
of DjVu. It is compatible with version 3.5 of the LizardTech DjVu
software suite.

87
graphics/djvulibre/pkg-plist
View File

@ -1,23 +1,66 @@
bin/djview
bin/djview3
lib/djvulibre/plugins/nsdejavu.so
share/djvu/djview3/cs/djview.qm
share/djvu/djview3/cs/qt.qm
share/djvu/djview3/de/djview.qm
share/djvu/djview3/de/qt.qm
share/djvu/djview3/desktop/djvulibre-djview3.desktop
share/djvu/djview3/desktop/hi32-djview3.png
share/djvu/djview3/desktop/register-djview-menu
share/djvu/djview3/fr/djview.qm
share/djvu/djview3/fr/qt.qm
share/djvu/djview3/ja/djview.qm
share/djvu/djview3/ja/qt.qm
@dirrm share/djvu/djview3/ja
@dirrm share/djvu/djview3/fr
@dirrm share/djvu/djview3/desktop
@dirrm share/djvu/djview3/de
@dirrm share/djvu/djview3/cs
@dirrm share/djvu/djview3
%%ANY2DJVU%%bin/any2djvu
bin/bzz
bin/c44
bin/cjb2
bin/cpaldjvu
bin/csepdjvu
bin/ddjvu
bin/djvm
bin/djvmcvt
bin/djvudigital
bin/djvudump
bin/djvuextract
bin/djvumake
bin/djvups
bin/djvused
bin/djvuserve
bin/djvutoxml
bin/djvutxt
bin/djvuxmlparser
include/libdjvu/ddjvuapi.h
include/libdjvu/miniexp.h
lib/libdjvulibre.so
lib/libdjvulibre.so.25
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
share/djvu/osi/en/messages.xml
share/djvu/osi/fr/libdjvu++.xml
share/djvu/osi/fr/messages.xml
share/djvu/osi/ja/libdjvu++.xml
share/djvu/osi/ja/messages.xml
share/djvu/osi/languages.xml
share/djvu/osi/zh/libdjvu++.xml
share/djvu/osi/zh/messages.xml
share/djvu/pubtext/DjVuMessages.dtd
share/djvu/pubtext/DjVuOCR.dtd
share/djvu/pubtext/DjVuXML-s.dtd
@dirrm share/djvu/pubtext
@dirrm share/djvu/osi/zh
@dirrm share/djvu/osi/ja
@dirrm share/djvu/osi/fr
@dirrm share/djvu/osi/en
@dirrm share/djvu/osi/desktop
@dirrm share/djvu/osi/de
@dirrm share/djvu/osi/cs
@dirrm share/djvu/osi
@dirrmtry share/djvu
@dirrm lib/djvulibre/plugins
@dirrm lib/djvulibre
@dirrmtry man/fr/man1
@dirrmtry man/fr
@dirrmtry man/de/man1
@dirrmtry man/de
@dirrm include/libdjvu

2
graphics/evince/Makefile
View File

@ -99,7 +99,7 @@ PLIST_SUB+= IMPRESS="@comment "
.endif
.if defined(WITH_DJVU)
LIB_DEPENDS+= djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre
CONFIGURE_ARGS+= --enable-djvu
GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas
PLIST_SUB+= DJVU=""

2
graphics/gscan2pdf/Makefile
View File

@ -31,7 +31,7 @@ BUILD_DEPENDS= ${SITE_PERL}/Test/Perl/Critic.pm:${PORTSDIR}/textproc/p5-Test-Per
${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
cjb2:${PORTSDIR}/graphics/djvulibre-nox11 \
cjb2:${PORTSDIR}/graphics/djvulibre \
gocr:${PORTSDIR}/graphics/gocr \
p5-Sane>=0:${PORTSDIR}/graphics/p5-Sane \
scanimage:${PORTSDIR}/graphics/sane-backends \

4
graphics/okular/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= okular
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 universal document viewer
LIB_DEPENDS= djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11 \
LIB_DEPENDS= djvulibre:${PORTSDIR}/graphics/djvulibre \
jpeg.11:${PORTSDIR}/graphics/jpeg \
qca.2:${PORTSDIR}/devel/qca \
tiff.4:${PORTSDIR}/graphics/tiff \