Hi, Ports!

This update packages djvulibre and djview4 to the latest release.
Tested on i386, amd64.

Comments ? OK ?

--
Alexandr Shadchin

Index: djview4/Makefile
===================================================================
RCS file: /cvs/ports/graphics/djview4/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- djview4/Makefile    10 Aug 2009 06:31:44 -0000      1.4
+++ djview4/Makefile    29 Aug 2010 10:22:26 -0000
@@ -2,13 +2,12 @@
 
 COMMENT=       portable DjVu viewer and browser plugin
 
-DISTNAME=      djview4-4.4
-PKGNAME=       ${DISTNAME}p1
+DISTNAME=      djview4-4.6
 CATEGORIES=    graphics print
 
 HOMEPAGE=      http://djvu.sourceforge.net/djview4.html
 
-# GPL v2
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -16,20 +15,19 @@ PERMIT_DISTFILES_FTP=       Yes
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=djvu/}
 
-WANTLIB=       ICE SM X11 Xext Xi Xinerama Xrender \
-               c m z stdc++ fontconfig freetype pthread \
-               glib-2.0 gthread-2.0 iconv intl png jpeg tiff \
-               expat gobject-2.0 pthread-stubs xcb
+WANTLIB += QtGui QtNetwork X11 Xext c djvulibre m pthread stdc++ tiff
 
 MODULES=       x11/qt4
 
-LIB_DEPENDS=   djvulibre::graphics/djvulibre \
-               QtGui,QtNetwork::x11/qt4
+LIB_DEPENDS=   ::graphics/djvulibre
 
+RUN_DEPENDS=   ::devel/desktop-file-utils \
+               ::x11/hicolor-icon-theme
+
+USE_GMAKE=     Yes
 USE_LIBTOOL=   Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=        --with-tiff=${LOCALBASE} \
-               --with-qt=${MODQT_LIBDIR}
+CONFIGURE_ARGS=        --with-tiff=${LOCALBASE}
 CONFIGURE_ENV+= QTDIR="${MODQT4_QTDIR}" \
                CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 
Index: djview4/distinfo
===================================================================
RCS file: /cvs/ports/graphics/djview4/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- djview4/distinfo    30 Oct 2008 14:54:20 -0000      1.2
+++ djview4/distinfo    29 Aug 2010 10:22:26 -0000
@@ -1,5 +1,5 @@
-MD5 (djview4-4.4.tar.gz) = RmIlxVRq7ZAAjWEs20kKTg==
-RMD160 (djview4-4.4.tar.gz) = z1+3jaLV1XIjNWEgw35eyBk3ues=
-SHA1 (djview4-4.4.tar.gz) = tx61O1Ad+rrjgQKvIh8vGIQYHWs=
-SHA256 (djview4-4.4.tar.gz) = Tz/ntIlzENLqVZhy9N0g8dCwF0gIV7BN1BO8q0sP6Lw=
-SIZE (djview4-4.4.tar.gz) = 837828
+MD5 (djview4-4.6.tar.gz) = ZCEFlwRnzwhkwAcxQNH6EQ==
+RMD160 (djview4-4.6.tar.gz) = qRFkZrodwkQe04WSiy9U1x+rUls=
+SHA1 (djview4-4.6.tar.gz) = ctmP3pxkBu5xSDARjQZ2e1YZQf0=
+SHA256 (djview4-4.6.tar.gz) = A2IFzaHxNDAb2/LbaRE6hvAUzkeTPpoV2lRof+co2Vs=
+SIZE (djview4-4.6.tar.gz) = 893657
Index: djview4/patches/patch-desktopfiles_Makefile_in
===================================================================
RCS file: djview4/patches/patch-desktopfiles_Makefile_in
diff -N djview4/patches/patch-desktopfiles_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ djview4/patches/patch-desktopfiles_Makefile_in      29 Aug 2010 10:22:26 
-0000
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- desktopfiles/Makefile.in.orig      Sat Mar 20 21:38:33 2010
++++ desktopfiles/Makefile.in   Sun Aug 29 21:11:01 2010
+@@ -39,6 +39,8 @@ XDG_DESKTOP_MENU = @XDG_DESKTOP_MENU@
+ RM = @RM@
+ 
+ datadir_djview = ${datadir}/djvu/djview4/desktop
++datadir_applications = ${datadir}/applications
++datadir_icons = ${datadir}/icons/hicolor
+ 
+ 
+ # -------- all
+@@ -70,13 +72,14 @@ register-djview-menu: register-djview-menu.in
+ install: install-djview-files 
+ 
+ install-djview-files: FORCE
+-      ${INSTALL} -d ${DESTDIR}${datadir_djview}
+-      ${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
+-      ${INSTALL_DATA} *djview4.png ${DESTDIR}${datadir_djview}
+-      ${INSTALL_DATA} *djview4.svgz ${DESTDIR}${datadir_djview}
+-      ${INSTALL_PROGRAM} ${srcdir}/*djview4.desktop 
${DESTDIR}${datadir_djview}
+-      -...@echo "Run ${datadir_djview}/register-djview-menu install"
+-      -...@echo " to register the djview3 menu entries."
++      ${INSTALL} -d ${DESTDIR}${datadir_applications}
++      ${INSTALL_DATA} djvulibre-djview4.desktop 
${DESTDIR}${datadir_applications}/djvulibre-djview4.desktop
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/32x32/apps
++      ${INSTALL_DATA} hi32-djview4.png 
${DESTDIR}${datadir_icons}/32x32/apps/djvulibre-djview4.png
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/64x64/apps
++      ${INSTALL_DATA} hi64-djview4.png 
${DESTDIR}${datadir_icons}/64x64/apps/djvulibre-djview4.png
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/scalable/apps
++      ${INSTALL_DATA} djview.svg 
${DESTDIR}${datadir_icons}/scalable/apps/djvulibre-djview4.svg
+ 
+ # -------- misc
+ 
Index: djview4/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/djview4/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- djview4/pkg/PLIST   30 Oct 2008 14:54:20 -0000      1.2
+++ djview4/pkg/PLIST   29 Aug 2010 10:22:26 -0000
@@ -7,14 +7,18 @@ lib/netscape/plugins/
 @man man/man1/djview.1
 @man man/man1/djview4.1
 @man man/man1/nsdejavu.1
+share/applications/djvulibre-djview4.desktop
 share/djvu/
 share/djvu/djview4/
-share/djvu/djview4/desktop/
-share/djvu/djview4/desktop/djvulibre-djview4.desktop
-share/djvu/djview4/desktop/hi32-djview4.png
-share/djvu/djview4/desktop/register-djview-menu
 share/djvu/djview4/djview_cs.qm
 share/djvu/djview4/djview_de.qm
 share/djvu/djview4/djview_fr.qm
 share/djvu/djview4/djview_ru.qm
 share/djvu/djview4/djview_uk.qm
+share/icons/hicolor/32x32/apps/djvulibre-djview4.png
+share/icons/hicolor/64x64/apps/djvulibre-djview4.png
+share/icons/hicolor/scalable/apps/djvulibre-djview4.svg
+...@exec %D/bin/update-desktop-database
+...@unexec-delete %D/bin/update-desktop-database
+...@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> 
/dev/null || true
+...@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 
2> /dev/null || true
Index: djvulibre/Makefile
===================================================================
RCS file: /cvs/ports/graphics/djvulibre/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- djvulibre/Makefile  6 Jul 2010 22:25:53 -0000       1.9
+++ djvulibre/Makefile  29 Aug 2010 10:22:47 -0000
@@ -2,16 +2,15 @@
 
 COMMENT=       view, decode and encode DjVu files
 
-DISTNAME=      djvulibre-3.5.21
-PKGNAME=       ${DISTNAME}p0
-SHARED_LIBS=   djvulibre 21.0
+DISTNAME=      djvulibre-3.5.23
+SHARED_LIBS=   djvulibre 23.0
 CATEGORIES=    graphics print
 
 HOMEPAGE=      http://djvu.sourceforge.net/
 
 MAINTAINER=    Steven Mestdagh <ste...@openbsd.org>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -22,28 +21,29 @@ MASTER_SITES=       ${MASTER_SITE_SOURCEFORGE:
 FLAVORS=       no_x11
 FLAVOR?=
 
-WANTLIB=       c m pthread stdc++ z
+WANTLIB=       c m jpeg pthread stdc++ tiff z
 
-MODULES=       converters/libiconv
+LIB_DEPENDS=   ::graphics/jpeg \
+               ::graphics/tiff
 
-LIB_DEPENDS=   jpeg::graphics/jpeg \
-               tiff::graphics/tiff 
+RUN_DEPENDS=   ::x11/hicolor-icon-theme
 
+USE_GMAKE=     Yes
 USE_LIBTOOL=   Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=        --with-jpeg=${LOCALBASE} \
                --with-tiff=${LOCALBASE} \
                --with-extra-libraries=${LOCALBASE}/lib \
                --disable-i18n
-CONFIGURE_ENV= TIFF_LIBS="-L${LOCALBASE}/lib -ltiff -lz -ljpeg"
 
 .if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+=--without-x
 .else
-MODULES+=      x11/qt3
+MODULES=       x11/qt3
+RUN_DEPENDS+=  ::devel/desktop-file-utils
 USE_X11=       Yes
 WANTLIB+=      ICE SM X11 Xext Xau Xdmcp pthread-stubs xcb
-CONFIGURE_ARGS+=--with-qt=${MODQT_LIBDIR}
+CONFIGURE_ARGS+=--enable-djview
 CONFIGURE_ENV+= QT_CFLAGS="-I${MODQT_INCDIR}" \
                QT_LIBS="-L${MODQT_LIBDIR} -lqt-mt"
 .endif
Index: djvulibre/distinfo
===================================================================
RCS file: /cvs/ports/graphics/djvulibre/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- djvulibre/distinfo  30 Oct 2008 14:53:40 -0000      1.4
+++ djvulibre/distinfo  29 Aug 2010 10:22:47 -0000
@@ -1,5 +1,5 @@
-MD5 (djvulibre-3.5.21.tar.gz) = TG8+sD/70Ge20v4jRLDZrQ==
-RMD160 (djvulibre-3.5.21.tar.gz) = IWO3hNcFzHtVuz2cnrhe3sRPKKc=
-SHA1 (djvulibre-3.5.21.tar.gz) = pu9csURbqjM4g3VMcDq9dcxbNPY=
-SHA256 (djvulibre-3.5.21.tar.gz) = OfgMGBC+IsXqf2pEu7RJw+KZAoldz/naaoRAiRpnuLQ=
-SIZE (djvulibre-3.5.21.tar.gz) = 2993718
+MD5 (djvulibre-3.5.23.tar.gz) = AFO5kIuePVfQ2Js9BlFo6Q==
+RMD160 (djvulibre-3.5.23.tar.gz) = Ztbccc2qjCQSGX9SViyZvva5JKY=
+SHA1 (djvulibre-3.5.23.tar.gz) = sZ9rRhUVpS6xBIrsgeBN/YNtaB8=
+SHA256 (djvulibre-3.5.23.tar.gz) = YIwH5ilibP5xMWjJQqB9LbOwsZ30quH1mEc/Si2vIT0=
+SIZE (djvulibre-3.5.23.tar.gz) = 3028428
Index: djvulibre/patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/djvulibre/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- djvulibre/patches/patch-configure   6 Feb 2007 07:17:42 -0000       1.2
+++ djvulibre/patches/patch-configure   29 Aug 2010 10:22:47 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.2 2007/02/06 07:17:42 steven Exp $
---- configure.orig     Sun Jan 14 19:23:27 2007
-+++ configure  Sun Jan 28 00:17:40 2007
-@@ -20424,14 +20424,11 @@ fi;
+--- configure.orig     Sun Aug 15 08:20:58 2010
++++ configure  Wed Aug 25 05:30:23 2010
+@@ -14886,14 +14886,11 @@ fi
     CFLAGS=
     for opt in $saved_CXXFLAGS ; do
       case $opt in
@@ -16,38 +16,52 @@ $OpenBSD: patch-configure,v 1.2 2007/02/
         *) CFLAGS="$CFLAGS $opt" ;;
       esac
     done
-@@ -20463,7 +20460,7 @@ echo $ECHO_N "checking if $CXX accepts $
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+@@ -14925,7 +14922,7 @@ $as_echo_n "checking if $CXX accepts $opt... " >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
      rm conftest.*
 -    OPTS="$OPTS -O3"
 +    OPTS="$OPTS"
   else
-     echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-@@ -20477,7 +20474,7 @@ echo $ECHO_N "checking if $CXX accepts $
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14939,7 +14936,7 @@ $as_echo_n "checking if $CXX accepts $opt... " >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
      rm conftest.*
 -    OPTS="$OPTS -O2"
 +    OPTS="$OPTS"
   else
-     echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-@@ -20523,7 +20520,6 @@ echo "${ECHO_T}yes" >&6
-     echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14985,7 +14982,6 @@ $as_echo "yes" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
      rm conftest.*
 -     opt="-mcpu=${host_cpu}"
  
   opt="$opt"
-  echo "$as_me:$LINENO: checking if $CXX accepts $opt" >&5
-@@ -26852,7 +26848,7 @@ if test x$ac_enable_djview != xno
- then
-  NSDEJAVU_CFLAGS=${X_CFLAGS}
-  case "$host" in
-- *-cygwin* | *-mingw*)
-+ *-cygwin* | *-mingw* | *-openbsd* )
-    NSDEJAVU_LIBS="`echo ${X_LIBS} | sed -e 's/-lXext/-lXt -lXext/'`"
-    NSDEJAVU_LIBS="-no-undefined $NSDEJAVU_LIBS"
-    ;;
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+@@ -18454,8 +18450,10 @@ $as_echo "setting QT_LIBS=$QT_LIBS" >&6; }
+ 
+     # Search X11 and Xt headers
+     if test "$no_x" != "yes" ; then
+-        savedCFLAGS="$CFLAGS"
+-        CFLAGS="$CFLAGS ${X_CFLAGS}"
++        savedCXXFLAGS="$CXXFLAGS"
++        CXXFLAGS="$CXXFLAGS ${X_CFLAGS}"
++        savedCPPFLAGS="$CPPFLAGS"
++        CPPFLAGS="$CPPFLAGS ${X_CFLAGS}"
+         for ac_header in X11/extensions/Xext.h
+ do :
+   ac_fn_cxx_check_header_compile "$LINENO" "X11/extensions/Xext.h" 
"ac_cv_header_X11_extensions_Xext_h" "include <X11/Xlib.h>
+@@ -18485,7 +18483,8 @@ else
+ fi
+ 
+ 
+-        CFLAGS="$savedCFLAGS"
++        CXXFLAGS="$savedCXXFLAGS"
++        CPPFLAGS="$savedCPPFLAGS"
+         if test "$no_xt" == "yes" ; then
+             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Xt include 
files not found" >&5
+ $as_echo "$as_me: WARNING: Xt include files not found" >&2;}
Index: djvulibre/patches/patch-desktopfiles_Makefile_in
===================================================================
RCS file: djvulibre/patches/patch-desktopfiles_Makefile_in
diff -N djvulibre/patches/patch-desktopfiles_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ djvulibre/patches/patch-desktopfiles_Makefile_in    29 Aug 2010 10:22:47 
-0000
@@ -0,0 +1,53 @@
+$OpenBSD$
+--- desktopfiles/Makefile.in.orig      Sat Mar 20 01:39:50 2010
++++ desktopfiles/Makefile.in   Sun Aug 29 21:21:02 2010
+@@ -40,6 +40,8 @@ RM = @RM@
+ 
+ datadir_djvu = ${datadir}/djvu/osi/desktop
+ datadir_djview = ${datadir}/djvu/djview3/desktop
++datadir_applications = ${datadir}/applications
++datadir_icons = ${datadir}/icons/hicolor
+ 
+ 
+ # -------- all
+@@ -98,22 +100,26 @@ install: install-djvu-files
+ @gui_...@install: install-djview-files
+ 
+ install-djvu-files: FORCE
+-      ${INSTALL} -d ${DESTDIR}${datadir_djvu}
+-      ${INSTALL_PROGRAM} 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}
+-      -...@echo "Run ${datadir_djvu}/register-djvu-mime install"
+-      -...@echo " to register the djvu mime types and icons."
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/22x22/mimetypes
++      ${INSTALL_DATA} hi22-djvu.png 
${DESTDIR}${datadir_icons}/22x22/mimetypes/image-vnd.djvu.png
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/32x32/mimetypes
++      ${INSTALL_DATA} hi32-djvu.png 
${DESTDIR}${datadir_icons}/32x32/mimetypes/image-vnd.djvu.png
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/48x48/mimetypes
++      ${INSTALL_DATA} hi48-djvu.png 
${DESTDIR}${datadir_icons}/48x48/mimetypes/image-vnd.djvu.png
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/64x64/mimetypes
++      ${INSTALL_DATA} hi64-djvu.png 
${DESTDIR}${datadir_icons}/64x64/mimetypes/image-vnd.djvu.png
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/scalable/mimetypes
++      ${INSTALL_DATA} djvu.svg 
${DESTDIR}${datadir_icons}/scalable/mimetypes/image-vnd.djvu.svg
+ 
+ install-djview-files: FORCE
+-      ${INSTALL} -d ${DESTDIR}${datadir_djview}
+-      ${INSTALL_PROGRAM} 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}
+-      -...@echo "Run ${datadir_djview}/register-djview-menu install"
+-      -...@echo " to register the djview3 menu entries."
++      ${INSTALL} -d ${DESTDIR}${datadir_applications}
++      ${INSTALL_DATA} djvulibre-djview3.desktop 
${DESTDIR}${datadir_applications}/djvulibre-djview3.desktop
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/32x32/apps
++      ${INSTALL_DATA} hi32-djview3.png 
${DESTDIR}${datadir_icons}/32x32/apps/djvulibre-djview3.png
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/64x64/apps
++      ${INSTALL_DATA} hi64-djview3.png 
${DESTDIR}${datadir_icons}/64x64/apps/djvulibre-djview3.png
++      ${INSTALL} -d ${DESTDIR}${datadir_icons}/scalable/apps
++      ${INSTALL_DATA} djview.svg 
${DESTDIR}${datadir_icons}/scalable/apps/djvulibre-djview3.svg
+ 
+ 
+ # -------- misc
Index: djvulibre/patches/patch-libdjvu_DjVuDocEditor_cpp
===================================================================
RCS file: djvulibre/patches/patch-libdjvu_DjVuDocEditor_cpp
diff -N djvulibre/patches/patch-libdjvu_DjVuDocEditor_cpp
--- djvulibre/patches/patch-libdjvu_DjVuDocEditor_cpp   16 Jul 2006 16:48:07 
-0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-libdjvu_DjVuDocEditor_cpp,v 1.1.1.1 2006/07/16 16:48:07 steven 
Exp $
---- libdjvu/DjVuDocEditor.cpp.orig     Wed May 25 22:24:52 2005
-+++ libdjvu/DjVuDocEditor.cpp  Sun Jul 16 15:48:41 2006
-@@ -192,8 +192,21 @@ DjVuDocEditor::init(const GURL &url)
-    {
-          // Suxx. I need to convert it NOW.
-          // We will unlink this file in the destructor
--      tmp_doc_url=GURL::Filename::Native(tmpnam(0));
--      const GP<ByteStream> gstr(ByteStream::create(tmp_doc_url, "wb"));
-+      char tfn[20];
-+      FILE *tfp;
-+      int tfd;
-+
-+      strlcpy(tfn, "/tmp/djvustream.XXXXXXXX", sizeof(tfn));
-+      if ((tfd = mkstemp(tfn)) == -1 || (tfp = fdopen(tfd, "w+")) == NULL) {
-+      if (tfd != -1) {
-+              unlink(tfn);
-+              close(tfd);
-+      }
-+      fprintf(stderr, "problem with temporary file: %s\n", tfn);
-+      G_THROW( ERR_MSG("DjVuDocEditor.init") );
-+      }
-+      tmp_doc_url=GURL::Filename::Native(tfn);
-+      const GP<ByteStream> gstr(ByteStream::create(tfp, "w+", true));
-       tmp_doc->write(gstr, true);        // Force DJVM format
-       gstr->flush();
-       doc_pool=DataPool::create(tmp_doc_url);
Index: djvulibre/pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/graphics/djvulibre/pkg/PFRAG.no-no_x11,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.no-no_x11
--- djvulibre/pkg/PFRAG.no-no_x11       30 Oct 2008 14:53:40 -0000      1.3
+++ djvulibre/pkg/PFRAG.no-no_x11       29 Aug 2010 10:22:47 -0000
@@ -4,9 +4,15 @@
 @comment lib/netscape/
 @comment lib/netscape/plugins/
 @comment lib/netscape/plugins/nsdejavu.so
+...@comment man/man1/djview.1
 @man man/man1/djview3.1
-share/djvu/djview3/
-share/djvu/djview3/desktop/
-share/djvu/djview3/desktop/djvulibre-djview3.desktop
-share/djvu/djview3/desktop/hi32-djview3.png
-share/djvu/djview3/desktop/register-djview-menu
+...@comment man/man1/nsdejavu.1
+share/applications/djvulibre-djview3.desktop
+...@comment share/djvu/djview3/
+share/icons/hicolor/32x32/apps/djvulibre-djview3.png
+share/icons/hicolor/64x64/apps/djvulibre-djview3.png
+share/icons/hicolor/scalable/apps/djvulibre-djview3.svg
+...@exec %D/bin/update-desktop-database
+...@unexec-delete %D/bin/update-desktop-database
+...@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> 
/dev/null || true
+...@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 
2> /dev/null || true
Index: djvulibre/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/djvulibre/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- djvulibre/pkg/PLIST 30 Oct 2008 14:53:40 -0000      1.3
+++ djvulibre/pkg/PLIST 29 Aug 2010 10:22:47 -0000
@@ -54,12 +54,6 @@ share/djvu/osi/cs/messages.xml
 share/djvu/osi/de/
 share/djvu/osi/de/libdjvu++.xml
 share/djvu/osi/de/messages.xml
-share/djvu/osi/desktop/
-share/djvu/osi/desktop/djvulibre-mime.xml
-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/register-djvu-mime
 share/djvu/osi/en/
 share/djvu/osi/en/djvutools-reference.xml
 share/djvu/osi/en/libdjvu++.xml
@@ -80,4 +74,9 @@ share/djvu/pubtext/
 share/djvu/pubtext/DjVuMessages.dtd
 share/djvu/pubtext/DjVuOCR.dtd
 share/djvu/pubtext/DjVuXML-s.dtd
+share/icons/hicolor/22x22/mimetypes/image-vnd.djvu.png
+share/icons/hicolor/32x32/mimetypes/image-vnd.djvu.png
+share/icons/hicolor/48x48/mimetypes/image-vnd.djvu.png
+share/icons/hicolor/64x64/mimetypes/image-vnd.djvu.png
+share/icons/hicolor/scalable/mimetypes/image-vnd.djvu.svg
 !%%no_x11%%

Reply via email to