[csw-devel] SF.net SVN: gar:[16586] csw/mgar/pkg

Wed Dec 21 11:39:48 CET 2011

Revision: 16586
          http://gar.svn.sourceforge.net/gar/?rev=16586&view=rev
Author:   dmichelsen
Date:     2011-12-21 10:39:47 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
djvulibre15: Split off legacy library

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

Added Paths:
-----------
    csw/mgar/pkg/djvulibre15/
    csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.i386
    csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.sparc

Removed Paths:
-------------
    csw/mgar/pkg/djvulibre15/trunk/files/ddjvu.cpp.patch

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


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


Modified: csw/mgar/pkg/djvulibre15/trunk/Makefile
===================================================================

--- csw/mgar/pkg/djvulibre/trunk/Makefile	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/djvulibre15/trunk/Makefile	2011-12-21 10:39:47 UTC (rev 16586)
@@ -1,5 +1,5 @@
 NAME = djvulibre
-VERSION = 3.5.22
+VERSION = 3.5.20.2
 CATEGORIES = apps
 
 DESCRIPTION = DjVu standalone viewer, browser plug-in, command line tools
@@ -8,70 +8,33 @@
 
 SF_PROJ = djvu
 MASTER_SITES = $(SF_MIRRORS)/DjVuLibre/$(VERSION)/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES += libdjvulibre.so.15.sparc
+DISTFILES += libdjvulibre.so.15.i386
 
-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
+PACKAGES += CSWlibdjvulibre15
+SPKG_DESC_CSWlibdjvulibre15 += DjVu library, libdjvulibre.so.15
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibdjvulibre15 += CSWlibjpeg62
+RUNTIME_DEP_PKGS_CSWlibdjvulibre15 += CSWlibiconv2
 
-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
+# This is a legacy lib, keep old errors until this expires out
+CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += license-missing|/opt/csw/share/doc/libdjvulibre15/license
+CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += bad-rpath-entry|/lib|opt/csw/lib/libdjvulibre.so.15.5.0
+CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libdjvulibre.so.15.5.0
+CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libdjvulibre.so.15.5.0
+CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libdjvulibre.so.15.5.0
 
-PKGFILES_CSWdjvulibrert = $(PKGFILES_RT)
-PKGFILES_CSWdjvulibredevel = $(PKGFILES_DEVEL)
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
 
-
-CHECKPKG_OVERRIDES_CSWdjvulibredevel += missing-dependency|CSWdjvulibre
-
-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
-
-PTHREAD_LIBS = -lpthread
-PTHREAD_CFLAGS = -D_REENTRANT
-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
-
-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 =
-
 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)
+install-custom:
+	ginstall -d $(DESTDIR)$(libdir)
+	ginstall $(WORKDIR)/libdjvulibre.so.15.$(GARCH) $(DESTDIR)$(libdir)/libdjvulibre.so.15.5.0
+	gln -s libdjvulibre.so.15.5.0 $(DESTDIR)$(libdir)/libdjvulibre.so.15
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/djvulibre15/trunk/checksums
===================================================================
--- csw/mgar/pkg/djvulibre/trunk/checksums	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/djvulibre15/trunk/checksums	2011-12-21 10:39:47 UTC (rev 16586)
@@ -1,2 +0,0 @@
-23e0083aef7878b2c9527d2e5e7a8fa9  ddjvu.cpp.patch
-d1513784ce0e4f37d71595dc34c95ec7  djvulibre-3.5.22.tar.gz

Deleted: csw/mgar/pkg/djvulibre15/trunk/files/ddjvu.cpp.patch
===================================================================
--- csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/djvulibre15/trunk/files/ddjvu.cpp.patch	2011-12-21 10:39:47 UTC (rev 16586)
@@ -1,13 +0,0 @@
---- djvulibre-3.5.22.orig/tools/ddjvu.cpp	2009-02-13 10:46:27.000000000 +0100
-+++ djvulibre-3.5.22/tools/ddjvu.cpp	2010-01-07 17:45:43.925544787 +0100
-@@ -66,6 +66,10 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
-+#if (defined(__SUNPRO_CC) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) && !defined(__sparcv9)
-+using std::__flsbuf;
-+using std::__filbuf;
-+#endif
- #include <stdarg.h>
- #include <string.h>
- #include <locale.h>

Added: csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.i386
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.i386
___________________________________________________________________
Added: svn:mime-type
   + application/x-sharedlib

Added: csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.sparc
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.sparc
___________________________________________________________________
Added: svn:mime-type
   + application/x-sharedlib

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

