From 87282da508f3206864c550dfcdc6ca911f8588c4 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Mon, 17 Dec 2012 13:54:23 +0000
Subject: update to 3.5.25 changes: -cleanup -bugfixes

---
 graphics/djvulibre-lib/Makefile                           |  5 +++--
 graphics/djvulibre-lib/PLIST                              |  4 +---
 graphics/djvulibre-lib/distinfo                           |  9 ++++-----
 .../djvulibre-lib/patches/patch-libjdvu_GSmartPointer.h   | 15 ---------------
 4 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 graphics/djvulibre-lib/patches/patch-libjdvu_GSmartPointer.h

(limited to 'graphics/djvulibre-lib')

diff --git a/graphics/djvulibre-lib/Makefile b/graphics/djvulibre-lib/Makefile
index 5cff7bc9faf..673fae46fa8 100644
--- a/graphics/djvulibre-lib/Makefile
+++ b/graphics/djvulibre-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2012/10/06 14:10:46 asau Exp $
+# $NetBSD: Makefile,v 1.14 2012/12/17 13:54:23 drochner Exp $
 
-DISTNAME=		djvulibre-3.5.24
+DISTNAME=		djvulibre-3.5.25.3
 PKGNAME=		${DISTNAME:S/-/-lib-/}
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=djvu/}
@@ -15,6 +15,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 
+WRKSRC=			${WRKDIR}/djvulibre-3.5.25
 PKGCONFIG_OVERRIDE+=	libdjvu/ddjvuapi.pc.in
 BUILD_DIRS=		libdjvu
 INSTALL_DIRS=		libdjvu
diff --git a/graphics/djvulibre-lib/PLIST b/graphics/djvulibre-lib/PLIST
index 7669ec2d675..4d84ac4a0ef 100644
--- a/graphics/djvulibre-lib/PLIST
+++ b/graphics/djvulibre-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:59:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/12/17 13:54:23 drochner Exp $
 include/libdjvu/ddjvuapi.h
 include/libdjvu/miniexp.h
 lib/libdjvulibre.la
@@ -9,8 +9,6 @@ share/djvu/osi/de/messages.xml
 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
diff --git a/graphics/djvulibre-lib/distinfo b/graphics/djvulibre-lib/distinfo
index c7ffad63f90..51c3996ab55 100644
--- a/graphics/djvulibre-lib/distinfo
+++ b/graphics/djvulibre-lib/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2012/03/21 20:03:31 hans Exp $
+$NetBSD: distinfo,v 1.11 2012/12/17 13:54:23 drochner Exp $
 
-SHA1 (djvulibre-3.5.24.tar.gz) = 075d1d4a333a2fe74e4c9240d853be016e27e983
-RMD160 (djvulibre-3.5.24.tar.gz) = cee93324ecfa7d832f29f390b4e8d82424b9eed0
-Size (djvulibre-3.5.24.tar.gz) = 2998853 bytes
+SHA1 (djvulibre-3.5.25.3.tar.gz) = ad35056aabb1950f385360ff59520a82a6f779ec
+RMD160 (djvulibre-3.5.25.3.tar.gz) = f91befc4d118cd5426f84abaa4f20ede920a2a2e
+Size (djvulibre-3.5.25.3.tar.gz) = 2543949 bytes
 SHA1 (patch-aa) = c819c6b1218b3178983bb48e53c4d3c0f7dd0227
 SHA1 (patch-ab) = 5e8f6d3b925da3a2a09b87a05d2b9564f9c2e7b4
 SHA1 (patch-ac) = 0c713031903aade12eda1d898595798a1468fd0a
 SHA1 (patch-ad) = 7fe0f2d2b7c242c44720e9b4b76aa665d2551e6b
-SHA1 (patch-libjdvu_GSmartPointer.h) = ff6acc69b0d3dc4cf00ad7c9a9863778ad33724f
diff --git a/graphics/djvulibre-lib/patches/patch-libjdvu_GSmartPointer.h b/graphics/djvulibre-lib/patches/patch-libjdvu_GSmartPointer.h
deleted file mode 100644
index 39cf56446a1..00000000000
--- a/graphics/djvulibre-lib/patches/patch-libjdvu_GSmartPointer.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libjdvu_GSmartPointer.h,v 1.1 2012/03/21 20:03:31 hans Exp $
-
---- libdjvu/GSmartPointer.h.orig	2011-03-06 18:43:17.000000000 +0100
-+++ libdjvu/GSmartPointer.h	2012-03-21 20:54:17.483636113 +0100
-@@ -97,6 +97,10 @@
- #include "DjVuGlobal.h"
- #include "atomic.h"
- 
-+#if defined(HAVE_SYS_TYPES_H)
-+#include <sys/types.h>
-+#endif
-+
- #ifdef HAVE_NAMESPACES
- namespace DJVU {
- # ifdef NOT_DEFINED // Just to fool emacs c++ mode
-- 
cgit v1.2.3