[csw-devel] SF.net SVN: gar:[21558] csw/mgar/pkg/djvulibre/trunk

[lblume at users.sourceforge.net]

Revision: 21558
          http://gar.svn.sourceforge.net/gar/?rev=21558&view=rev
Author:   lblume
Date:     2013-07-26 10:19:30 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
djvulibre/trunk: Bump version to 3.5.25.3; clean up deps

Modified Paths:
--------------
    csw/mgar/pkg/djvulibre/trunk/Makefile
    csw/mgar/pkg/djvulibre/trunk/checksums

Modified: csw/mgar/pkg/djvulibre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/djvulibre/trunk/Makefile	2013-07-26 09:35:40 UTC (rev 21557)
+++ csw/mgar/pkg/djvulibre/trunk/Makefile	2013-07-26 10:19:30 UTC (rev 21558)
@@ -1,5 +1,6 @@
 NAME = djvulibre
-VERSION = 3.5.24
+VERSION = 3.5.25
+GARSUBREV = 3
 GARTYPE = v2
 
 DESCRIPTION = DjVu standalone viewer, browser plug-in, command line tools
@@ -7,8 +8,8 @@
 endef
 
 SF_PROJECT = djvu
-MASTER_SITES = $(SF_MIRRORS)/DjVuLibre/$(VERSION)/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+MASTER_SITES = $(SF_MIRRORS)DjVuLibre/$(VERSION)/
+DISTFILES  = $(NAME)-$(VERSION).$(GARSUBREV).tar.gz
 PATCHFILES += ddjvu.cpp.patch
 
 VENDOR_URL = http://djvu.sourceforge.net/
@@ -19,23 +20,19 @@
 CATALOGNAME_CSWdjvulibre = djvulibre
 SPKG_DESC_CSWdjvulibre += DjVu standalone viewer and ommandline tools
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibtiff5
 RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibdjvulibre21
 # This is for legacy package expecting to find libdjvulibre.so.15 when pulling in CSWdjvulibre
 RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibdjvulibre15
 CHECKPKG_OVERRIDES_CSWdjvulibre += surplus-dependency|CSWlibdjvulibre15
 
-# What is this for?
-CHECKPKG_OVERRIDES_CSWdjvulibre += file-with-bad-content|/usr/share|root/opt/csw/share/djvu/osi/desktop/register-djvu-mime
-CHECKPKG_OVERRIDES_CSWdjvulibre += file-with-bad-content|/usr/local|root/opt/csw/share/djvu/osi/desktop/register-djvu-mime
-
 PACKAGES += CSWlibdjvulibre21
 SPKG_DESC_CSWlibdjvulibre21 += DjVu library, libdjvulibre.so.21
 PKGFILES_CSWlibdjvulibre21 += $(call pkgfiles_lib,libdjvulibre.so.21)
 OBSOLETED_BY_CSWlibdjvulibre21 += CSWdjvulibrert
 CATALOGNAME_CSWdjvulibrert = djvulibre_rt_stub
 RUNTIME_DEP_PKGS_CSWlibdjvulibre21 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibdjvulibre21 += CSWlibiconv2
 
 PACKAGES += CSWlibdjvulibre-dev
 SPKG_DESC_CSWlibdjvulibre-dev += Development files for libdjvulibre.so.21
@@ -56,6 +53,8 @@
 REINPLACE_WITH = |-norunpath$$1
 REINPLACE_FILES += config/ltmain.sh
 
+EXTRA_LINKER_FLAGS += -liconv
+
 BUILD64 = 1
 ISAEXEC = 1
 

Modified: csw/mgar/pkg/djvulibre/trunk/checksums
===================================================================
--- csw/mgar/pkg/djvulibre/trunk/checksums	2013-07-26 09:35:40 UTC (rev 21557)
+++ csw/mgar/pkg/djvulibre/trunk/checksums	2013-07-26 10:19:30 UTC (rev 21558)
@@ -1 +1 @@
-af83d27af5083198432a178d22b259c5  djvulibre-3.5.24.tar.gz
+5f45d6cd5700b4dd31b1eb963482089b  djvulibre-3.5.25.3.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.