Hi, Ports! This update package djvulibre to the latest release 3.5.24. Tested on i386 and amd64.
Comments ? OK ? -- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/djvulibre/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 6 Jan 2011 17:56:49 -0000 1.20 +++ Makefile 16 Mar 2011 17:40:12 -0000 @@ -2,14 +2,13 @@ COMMENT= view, decode and encode DjVu files -DISTNAME= djvulibre-3.5.23 -REVISION= 2 -SHARED_LIBS= djvulibre 23.0 +DISTNAME= djvulibre-3.5.24 +SHARED_LIBS= djvulibre 24.0 CATEGORIES= graphics print HOMEPAGE= http://djvu.sourceforge.net/ -MAINTAINER= Alexandr Shadchin <alexandr.shadc...@gmail.com> +MAINTAINER= Alexandr Shadchin <shadc...@openbsd.org> # GPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -44,11 +43,16 @@ CONFIGURE_ARGS= --with-jpeg=${LOCALBASE} CONFIGURE_ARGS+=--without-x .else MODULES= x11/qt3 + +WANTLIB += GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm drm expat +WANTLIB += fontconfig freetype lcms mng png pthread-stubs xcb + RUN_DEPENDS+= devel/desktop-file-utils -WANTLIB+= ICE SM X11 Xext Xau Xdmcp pthread-stubs xcb CONFIGURE_ARGS+=--enable-djview CONFIGURE_ENV+= QT_CFLAGS="-I${MODQT_INCDIR}" \ - QT_LIBS="-L${MODQT_LIBDIR} -lqt-mt" + QT_LIBS="-L${MODQT_LIBDIR} -lqt-mt" \ + CPPFLAGS="-I${X11BASE}/include" .endif NO_REGRESS= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/djvulibre/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 31 Aug 2010 21:06:35 -0000 1.5 +++ distinfo 16 Mar 2011 17:40:12 -0000 @@ -1,5 +1,5 @@ -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 +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 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/graphics/djvulibre/patches/patch-configure,v retrieving revision 1.3 diff -u -p -r1.3 patch-configure --- patches/patch-configure 31 Aug 2010 21:06:35 -0000 1.3 +++ patches/patch-configure 16 Mar 2011 17:40:12 -0000 @@ -1,11 +1,10 @@ $OpenBSD: patch-configure,v 1.3 2010/08/31 21:06:35 steven Exp $ ---- configure.orig Sun Aug 15 08:20:58 2010 -+++ configure Wed Aug 25 05:30:23 2010 -@@ -14886,14 +14886,11 @@ fi - CFLAGS= +--- configure.orig Sun Mar 6 22:43:17 2011 ++++ configure Sat Mar 12 21:08:54 2011 +@@ -14885,13 +14885,12 @@ fi for opt in $saved_CXXFLAGS ; do case $opt in -- -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;; + -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;; - -O*) ;; *) CXXFLAGS="$CXXFLAGS $opt" ;; esac @@ -13,55 +12,31 @@ $OpenBSD: patch-configure,v 1.3 2010/08/ for opt in $saved_CFLAGS ; do case $opt in - -O*|-g*) ;; ++ -g*) ;; *) CFLAGS="$CFLAGS $opt" ;; esac done -@@ -14925,7 +14922,7 @@ $as_echo_n "checking if $CXX accepts $opt... " >&6; } +@@ -14923,7 +14922,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.* - OPTS="$OPTS -O3" -+ OPTS="$OPTS" else { $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; } +@@ -14937,7 +14935,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.* - OPTS="$OPTS -O2" -+ OPTS="$OPTS" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -14985,7 +14982,6 @@ $as_echo "yes" >&6; } +@@ -14978,7 +14975,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.* +- OPTS="$OPTS $opt" + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - rm conftest.* -- opt="-mcpu=${host_cpu}" - - opt="$opt" - { $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;}
