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

[dmichelsen at users.sourceforge.net]

Revision: 16589
          http://gar.svn.sourceforge.net/gar/?rev=16589&view=rev
Author:   dmichelsen
Date:     2011-12-21 14:37:32 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
djvulibre/trunk: Update to 3.5.24, general rework

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

Property Changed:
----------------
    csw/mgar/pkg/djvulibre/trunk/


Property changes on: csw/mgar/pkg/djvulibre/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/djvulibre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/djvulibre/trunk/Makefile	2011-12-21 13:28:35 UTC (rev 16588)
+++ csw/mgar/pkg/djvulibre/trunk/Makefile	2011-12-21 14:37:32 UTC (rev 16589)
@@ -1,5 +1,5 @@
 NAME = djvulibre
-VERSION = 3.5.22
+VERSION = 3.5.24
 CATEGORIES = apps
 
 DESCRIPTION = DjVu standalone viewer, browser plug-in, command line tools
@@ -9,69 +9,56 @@
 SF_PROJ = djvu
 MASTER_SITES = $(SF_MIRRORS)/DjVuLibre/$(VERSION)/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
+PATCHFILES += ddjvu.cpp.patch
 
-PACKAGES = CSWdjvulibre CSWdjvulibrert CSWdjvulibredevel
-CATALOGNAME_CSWdjvulibre = djvulibre
-CATALOGNAME_CSWdjvulibrert = djvulibre_rt
-CATALOGNAME_CSWdjvulibredevel = djvulibre_devel
+VENDOR_URL = http://djvu.sourceforge.net/
 
-SPKG_DESC_CSWdjvulibre += DjVu standalone viewer, browser plug-in, command linetools
-SPKG_DESC_CSWdjvulibrert += DjVu standalone viewer, browser plug-in, command line tools - runtime package
-SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package
+FOREIGN_PKGS += CSWlibdjvulibre15
 
-RUNTIME_DEP_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg
-RUNTIME_DEP_PKGS_CSWdjvulibre += CSWtiff
-RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWjpeg
-RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWiconv
-RUNTIME_DEP_PKGS_CSWdjvulibredevel += CSWdjvulibrert
+PACKAGES += CSWdjvulibre
+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 += 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
 
-PKGFILES_CSWdjvulibrert = $(PKGFILES_RT)
-PKGFILES_CSWdjvulibredevel = $(PKGFILES_DEVEL)
+# 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
 
-CHECKPKG_OVERRIDES_CSWdjvulibredevel += missing-dependency|CSWdjvulibre
+PACKAGES += CSWlibdjvulibre-dev
+SPKG_DESC_CSWlibdjvulibre-dev += Development files for libdjvulibre.so.21
+PKGFILES_CSWlibdjvulibre-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibdjvulibre-dev += CSWlibdjvulibre21
+OBSOLETED_BY_CSWlibdjvulibre-dev += CSWdjvulibredevel
+CATALOGNAME_CSWdjvulibredevel = djvulibre_devel_stub
 
-SPKG_SOURCEURL = http://djvu.sourceforge.net/
-
-LICENSE = COPYING
-
-PATCHFILES += ddjvu.cpp.patch
-
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=32953
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
-
-OPTS='-DNDEBUG'
-EXTRA_COMMON_EXPORTS += OPTS
-
+OPTS = '-DNDEBUG'
 PTHREAD_LIBS = -lpthread
 PTHREAD_CFLAGS = -D_REENTRANT
+EXTRA_COMMON_EXPORTS += OPTS
 EXTRA_COMMON_EXPORTS += PTHREAD_LIBS
 EXTRA_COMMON_EXPORTS += PTHREAD_CFLAGS
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+EXTRA_CXXFLAGS += -norunpath
+REINPLACE_MATCH = (\|-xarch=)
+REINPLACE_WITH = |-norunpath$$1
+REINPLACE_FILES += config/ltmain.sh
 
-X_CFLAGS = -I$(prefix)/X11/include
-X_LIBS = -L$(prefix)/X11/lib -R$(prefix)/X11/lib
-EXTRA_COMMON_EXPORTS += X_CFLAGS 
-EXTRA_COMMON_EXPORTS += X_LIBS 
-
-CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-
 BUILD64 = 1
 
-TEST_TARGET =
+# There is no testsuite
+TEST_SCRIPTS =
 
 include gar/category.mk
-
-post-install-isa-sparcv8:
-	@cp $(FILEDIR)/libdjvulibre.so.15.s $(INSTALLISADIR)$(libdir)/libdjvulibre.so.15
-	$(MAKECOOKIE)
-
-post-install-isa-i386:
-	@cp $(FILEDIR)/libdjvulibre.so.15.i $(INSTALLISADIR)$(libdir)/libdjvulibre.so.15
-	$(MAKECOOKIE)

Modified: csw/mgar/pkg/djvulibre/trunk/checksums
===================================================================
--- csw/mgar/pkg/djvulibre/trunk/checksums	2011-12-21 13:28:35 UTC (rev 16588)
+++ csw/mgar/pkg/djvulibre/trunk/checksums	2011-12-21 14:37:32 UTC (rev 16589)
@@ -1,2 +1 @@
-23e0083aef7878b2c9527d2e5e7a8fa9  ddjvu.cpp.patch
-d1513784ce0e4f37d71595dc34c95ec7  djvulibre-3.5.22.tar.gz
+af83d27af5083198432a178d22b259c5  djvulibre-3.5.24.tar.gz

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