On Tue, May 01, 2012 at 01:43:50AM +0600, Alexandr Shadchin wrote: > Hi, > > This update package djvulibre to the latest release 3.5.25.2. > Tested on amd64. > > Change: > - Removed the deprecated djview3 code. > - Removed the deprecated cothreads code. > - Removed the unmaintained japanese man pages. > - Added ddjvu option to skip corrupted pages. > - Miniexp API is now reentrant. > - Bug fixes all around. > > Comments ? OK ? >
Update to 3.5.25.3. OK ? -- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/djvulibre/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile 15 Jun 2012 08:32:16 -0000 1.26 +++ Makefile 7 Jul 2012 09:22:35 -0000 @@ -2,9 +2,8 @@ COMMENT= view, decode and encode DjVu files -DISTNAME= djvulibre-3.5.24 -REVISION= 4 -SHARED_LIBS= djvulibre 24.0 +DISTNAME= djvulibre-3.5.25.3 +SHARED_LIBS= djvulibre 25.0 CATEGORIES= graphics print HOMEPAGE= http://djvu.sourceforge.net/ @@ -19,41 +18,23 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/} -FLAVORS= no_x11 -FLAVOR?= - WANTLIB= c m jpeg pthread stdc++ tiff z LIB_DEPENDS= graphics/jpeg \ graphics/tiff +RUN_DEPENDS+= x11/gtk+2,-guic + USE_GMAKE= Yes USE_LIBTOOL= Yes USE_GROFF = Yes + CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --with-jpeg=${LOCALBASE} \ - --with-tiff=${LOCALBASE} \ - --with-extra-libraries=${LOCALBASE}/lib \ - --disable-i18n - -.if ${FLAVOR:Mno_x11} -CONFIGURE_ARGS+=--without-x -.else -MODULES= x11/qt3 - -WANTLIB += GL ICE SM X11 Xcursor Xdamage Xext Xfixes -WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm drm expat -WANTLIB += fontconfig freetype lcms mng png xcb - -RUN_DEPENDS+= devel/desktop-file-utils \ - x11/gtk+2,-guic - -CONFIGURE_ARGS+=--enable-djview -CONFIGURE_ENV+= QT_CFLAGS="-I${MODQT_INCDIR}" \ - QT_LIBS="-L${MODQT_LIBDIR} -lqt-mt" \ - CPPFLAGS="-I${X11BASE}/include" -.endif + --with-tiff=${LOCALBASE} NO_REGRESS= Yes + +WRKDIST= ${WRKDIR}/${DISTNAME:R} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/djvulibre/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 17 Mar 2011 14:56:54 -0000 1.6 +++ distinfo 7 Jul 2012 09:22:35 -0000 @@ -1,5 +1,5 @@ -MD5 (djvulibre-3.5.24.tar.gz) = r4PSevUIMZhDKheNIrJZxQ== -RMD160 (djvulibre-3.5.24.tar.gz) = zukzJOz6fYMvKfOQtOjYJCS57tA= -SHA1 (djvulibre-3.5.24.tar.gz) = B10dSjM6L+dOTJJA2FO+AW4n6YM= -SHA256 (djvulibre-3.5.24.tar.gz) = wHNMgdIqDkWMP7Xv1MPqsFG8tq2HQPWleEwfVplIJTQ= -SIZE (djvulibre-3.5.24.tar.gz) = 2998853 +MD5 (djvulibre-3.5.25.3.tar.gz) = X0XWzVcAtN0xseuWNIIImw== +RMD160 (djvulibre-3.5.25.3.tar.gz) = +RvvxNEYzVQm+Eq6pPIO3pIKKi4= +SHA1 (djvulibre-3.5.25.3.tar.gz) = rTUFaquxlQ84U2D/WVIKgqb3eew= +SHA256 (djvulibre-3.5.25.3.tar.gz) = iY1+1t0voxGlIbqpVAepGyCoctgMRegkVELWTxQsseA= +SIZE (djvulibre-3.5.25.3.tar.gz) = 2543949 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/graphics/djvulibre/patches/patch-configure,v retrieving revision 1.4 diff -u -p -r1.4 patch-configure --- patches/patch-configure 17 Mar 2011 14:56:54 -0000 1.4 +++ patches/patch-configure 7 Jul 2012 09:22:35 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.4 2011/03/17 14:56:54 shadchin Exp $ ---- configure.orig Sun Mar 6 22:43:17 2011 -+++ configure Sat Mar 12 21:08:54 2011 -@@ -14885,13 +14885,12 @@ fi +--- configure.orig Sun Mar 18 04:49:02 2012 ++++ configure Sun Apr 15 20:28:01 2012 +@@ -14740,13 +14740,12 @@ fi for opt in $saved_CXXFLAGS ; do case $opt in -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;; @@ -16,7 +16,7 @@ $OpenBSD: patch-configure,v 1.4 2011/03/ *) CFLAGS="$CFLAGS $opt" ;; esac done -@@ -14923,7 +14922,6 @@ $as_echo_n "checking if $CXX accepts $opt... " >&6; } +@@ -14778,7 +14777,6 @@ $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.* @@ -24,7 +24,7 @@ $OpenBSD: patch-configure,v 1.4 2011/03/ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -14937,7 +14935,6 @@ $as_echo_n "checking if $CXX accepts $opt... " >&6; } +@@ -14792,7 +14790,6 @@ $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.* @@ -32,7 +32,7 @@ $OpenBSD: patch-configure,v 1.4 2011/03/ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -14978,7 +14975,6 @@ $as_echo_n "checking if $CXX accepts $opt... " >&6; } +@@ -14833,7 +14830,6 @@ $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.* Index: patches/patch-desktopfiles_Makefile_in =================================================================== RCS file: /cvs/ports/graphics/djvulibre/patches/patch-desktopfiles_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-desktopfiles_Makefile_in --- patches/patch-desktopfiles_Makefile_in 3 Sep 2010 21:20:49 -0000 1.1 +++ patches/patch-desktopfiles_Makefile_in 7 Jul 2012 09:22:35 -0000 @@ -1,17 +1,16 @@ $OpenBSD: patch-desktopfiles_Makefile_in,v 1.1 2010/09/03 21:20:49 sthen Exp $ ---- 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@ +--- desktopfiles/Makefile.in.orig Tue May 8 08:56:53 2012 ++++ desktopfiles/Makefile.in Fri May 25 23:28:15 2012 +@@ -40,6 +40,7 @@ XDG_DESKTOP_MENU = @XDG_DESKTOP_MENU@ + 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_YES@install: install-djview-files +@@ -79,13 +80,16 @@ register-djvu-mime: register-djvu-mime.in + install: install-djvu-files install-djvu-files: FORCE - ${INSTALL} -d ${DESTDIR}${datadir_djvu} @@ -32,22 +31,5 @@ $OpenBSD: patch-desktopfiles_Makefile_in + ${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: patches/patch-libdjvu_miniexp_cpp =================================================================== RCS file: patches/patch-libdjvu_miniexp_cpp diff -N patches/patch-libdjvu_miniexp_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libdjvu_miniexp_cpp 7 Jul 2012 09:22:35 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libdjvu/miniexp.cpp.orig Tue May 8 08:56:53 2012 ++++ libdjvu/miniexp.cpp Fri May 25 23:28:15 2012 +@@ -1008,7 +1008,7 @@ stdio_fgetc(miniexp_io_t *io) + 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 ::fgetc(f); + } + + static int Index: pkg/PFRAG.no-no_x11 =================================================================== RCS file: pkg/PFRAG.no-no_x11 diff -N pkg/PFRAG.no-no_x11 --- pkg/PFRAG.no-no_x11 15 Jun 2012 08:32:16 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -@comment $OpenBSD: PFRAG.no-no_x11,v 1.7 2012/06/15 08:32:16 ajacoutot Exp $ -@comment bin/djview -@bin bin/djview3 -@comment lib/netscape/ -@comment lib/netscape/plugins/ -@comment lib/netscape/plugins/nsdejavu.so -@comment man/man1/djview.1 -@man man/man1/djview3.1 -@comment man/man1/nsdejavu.1 -share/applications/djvulibre-djview3.desktop -@comment share/djvu/djview3/ -share/icons/hicolor/22x22/mimetypes/image-vnd.djvu.png -share/icons/hicolor/32x32/apps/djvulibre-djview3.png -share/icons/hicolor/32x32/mimetypes/image-vnd.djvu.png -share/icons/hicolor/48x48/mimetypes/image-vnd.djvu.png -share/icons/hicolor/64x64/apps/djvulibre-djview3.png -share/icons/hicolor/64x64/mimetypes/image-vnd.djvu.png -share/icons/hicolor/scalable/apps/djvulibre-djview3.svg -share/icons/hicolor/scalable/mimetypes/image-vnd.djvu.svg -@exec %D/bin/update-desktop-database -@unexec-delete %D/bin/update-desktop-database -@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor -@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/djvulibre/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 18 Sep 2010 13:46:59 -0000 1.5 +++ pkg/PLIST 7 Jul 2012 09:22:35 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.5 2010/09/18 13:46:59 ajacoutot Exp $ +@pkgpath graphics/djvulibre,no_x11 %%SHARED%% @comment bin/any2djvu @bin bin/bzz @@ -58,8 +59,6 @@ share/djvu/osi/en/ 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/ share/djvu/osi/fr/libdjvu++.xml share/djvu/osi/fr/messages.xml @@ -74,4 +73,10 @@ share/djvu/pubtext/ share/djvu/pubtext/DjVuMessages.dtd share/djvu/pubtext/DjVuOCR.dtd share/djvu/pubtext/DjVuXML-s.dtd -!%%no_x11%% +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 +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
