Hi, This diff updates djvulibre to the latest release. Tested on amd64.
Comments ? OK ? -- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/djvulibre/Makefile,v retrieving revision 1.33 diff -u -p -r1.33 Makefile --- Makefile 27 Mar 2015 08:11:28 -0000 1.33 +++ Makefile 29 Mar 2015 10:04:33 -0000 @@ -2,9 +2,8 @@ COMMENT= view, decode and encode DjVu files -DISTNAME= djvulibre-3.5.25.3 -REVISION= 2 -SHARED_LIBS= djvulibre 25.0 # 25.0 +DISTNAME= djvulibre-3.5.27 +SHARED_LIBS= djvulibre 26.0 # 27.0 CATEGORIES= graphics print HOMEPAGE= http://djvu.sourceforge.net/ @@ -18,24 +17,27 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE: WANTLIB= c m jpeg pthread stdc++ tiff z +MODULES= converters/libiconv + LIB_DEPENDS= graphics/jpeg \ graphics/tiff -RUN_DEPENDS+= x11/gtk+3,-guic +RUN_DEPENDS+= misc/shared-mime-info \ + x11/gtk+3,-guic BUILD_DEPENDS+= x11/gnome/librsvg USE_GMAKE= Yes USE_GROFF = Yes -AUTOCONF_VERSION= 2.67 +AUTOCONF_VERSION= 2.69 CONFIGURE_STYLE= autoconf -CONFIGURE_ARGS= --with-jpeg=${LOCALBASE} \ +CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include \ + --with-jpeg=${LOCALBASE} \ --with-tiff=${LOCALBASE} +CONFIGURE_ENV+= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -liconv' NO_TEST= Yes - -WRKDIST= ${WRKDIR}/${DISTNAME:R} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/djvulibre/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 18 Jan 2015 03:14:08 -0000 1.8 +++ distinfo 29 Mar 2015 10:04:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (djvulibre-3.5.25.3.tar.gz) = iY1+1t0voxGlIbqpVAepGyCoctgMRegkVELWTxQsseA= -SIZE (djvulibre-3.5.25.3.tar.gz) = 2543949 +SHA256 (djvulibre-3.5.27.tar.gz) = 5pZoJSVlYDh1+4hQDN4Cv5PRLUijiE5HJpbIlugfUF8= +SIZE (djvulibre-3.5.27.tar.gz) = 3648522 Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/graphics/djvulibre/patches/patch-configure_ac,v retrieving revision 1.1 diff -u -p -r1.1 patch-configure_ac --- patches/patch-configure_ac 9 Jul 2012 14:18:16 -0000 1.1 +++ patches/patch-configure_ac 29 Mar 2015 10:04:33 -0000 @@ -1,12 +1,11 @@ $OpenBSD: patch-configure_ac,v 1.1 2012/07/09 14:18:16 shadchin Exp $ ---- configure.ac.orig Tue May 8 08:56:53 2012 -+++ configure.ac Mon Jul 9 19:41:00 2012 -@@ -117,7 +117,7 @@ AC_SUBST(LIBTOOL_DEPS) +--- configure.ac.orig Sun Mar 29 10:30:55 2015 ++++ configure.ac Sun Mar 29 10:31:17 2015 +@@ -129,7 +129,6 @@ RM="$RM -f" + # Libtool & Compilers + AC_PROG_CC + AC_PROG_CXX +-AC_OPTIMIZE # C++ AC_LANG(C++) --AC_CXX_OPTIMIZE -+AC_SUBST(OPTS) - AC_CXX_BOOL - AC_CXX_EXCEPTIONS - AC_CXX_TYPENAME Index: patches/patch-desktopfiles_Makefile_in =================================================================== RCS file: patches/patch-desktopfiles_Makefile_in diff -N patches/patch-desktopfiles_Makefile_in --- patches/patch-desktopfiles_Makefile_in 8 Jul 2012 09:13:59 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ -$OpenBSD: patch-desktopfiles_Makefile_in,v 1.2 2012/07/08 09:13:59 shadchin Exp $ ---- 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_icons = ${datadir}/icons/hicolor - - - # -------- all -@@ -79,13 +80,16 @@ register-djvu-mime: register-djvu-mime.in - install: install-djvu-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 - - # -------- misc - Index: patches/patch-libdjvu_miniexp_cpp =================================================================== RCS file: /cvs/ports/graphics/djvulibre/patches/patch-libdjvu_miniexp_cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-libdjvu_miniexp_cpp --- patches/patch-libdjvu_miniexp_cpp 8 Jul 2012 09:13:59 -0000 1.1 +++ patches/patch-libdjvu_miniexp_cpp 29 Mar 2015 10:04:33 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-libdjvu_miniexp_cpp,v 1.1 2012/07/08 09:13:59 shadchin Exp $ ---- 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 */ +--- libdjvu/miniexp.cpp.orig Wed Feb 11 09:35:37 2015 ++++ libdjvu/miniexp.cpp Sat Mar 28 21:24:09 2015 +@@ -1241,7 +1241,7 @@ static int stdio_fputs(miniexp_io_t *io, const char *s + + static int true_stdio_fgetc(miniexp_io_t *io) { FILE *f = (io->data[0]) ? (FILE*)(io->data[0]) : stdin; - return ::getc(f); + return ::fgetc(f); } - - static int + static int compat_getc() { + return true_stdio_fgetc(&miniexp_io); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/djvulibre/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 16 Mar 2015 18:07:46 -0000 1.7 +++ pkg/PLIST 29 Mar 2015 10:04:33 -0000 @@ -72,10 +72,22 @@ 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 +share/icons/hicolor/128x128/mimetypes/djvu.png +share/icons/hicolor/16x16/mimetypes/djvu.png +share/icons/hicolor/20x20/ +share/icons/hicolor/20x20/mimetypes/ +share/icons/hicolor/20x20/mimetypes/djvu.png +share/icons/hicolor/22x22/mimetypes/djvu.png +share/icons/hicolor/24x24/mimetypes/djvu.png +share/icons/hicolor/256x256/mimetypes/djvu.png +share/icons/hicolor/32x32/mimetypes/djvu.png +share/icons/hicolor/48x48/mimetypes/djvu.png +share/icons/hicolor/64x64/mimetypes/djvu.png +share/icons/hicolor/72x72/mimetypes/djvu.png +share/icons/hicolor/96x96/mimetypes/djvu.png +share/icons/hicolor/scalable/mimetypes/djvu.svgz +share/mime/packages/djvulibre-mime.xml @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 +@exec %D/bin/update-mime-database %D/share/mime +@unexec-delete %D/bin/update-mime-database %D/share/mime
