[csw-devel] SF.net SVN: gar:[15026] csw/mgar/pkg/libdatrie/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15026
          http://gar.svn.sourceforge.net/gar/?rev=15026&view=rev
Author:   dmichelsen
Date:     2011-07-09 14:06:44 +0000 (Sat, 09 Jul 2011)

Log Message:
-----------
libdatrie: Update to 0.2.4, package split

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

Added Paths:
-----------
    csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch

Modified: csw/mgar/pkg/libdatrie/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdatrie/trunk/Makefile	2011-07-09 13:06:34 UTC (rev 15025)
+++ csw/mgar/pkg/libdatrie/trunk/Makefile	2011-07-09 14:06:44 UTC (rev 15026)
@@ -1,5 +1,5 @@
 NAME = libdatrie
-VERSION = 0.2.2
+VERSION = 0.2.4
 CATEGORIES = lib
 
 DESCRIPTION = Double array tree library
@@ -7,19 +7,35 @@
 endef
 
 MASTER_SITES = ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
+PATCHFILES += 0001-Remove-unnecessary-inclusing-of-stdint.h.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+VENDOR_URL = http://linux.thai.net/~thep/datrie/datrie.html
 
-SPKG_SOURCEURL = http://linux.thai.net/~thep/datrie/datrie.html
+PACKAGES += CSWlibdatrie1
+SPKG_DESC_CSWlibdatrie1 = Double array tree library, libdatrie.so.1
+PKGFILES_CSWlibdatrie1 += $(call pkgfiles_lib,libdatrie.so.1)
+OBSOLETED_BY_CSWlibdatrie1 += CSWlibdatrie
 
-RUNTIME_DEP_PKGS = CSWiconv
+PACKAGES += CSWlibdatrie-dev
+SPKG_DESC_CSWlibdatrie-dev = Development files for libdatrie.so.1
+PKGFILES_CSWlibdatrie-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibdatrie-dev += $(docdir)/libdatrie-dev/.*
+RUNTIME_DEP_PKGS_CSWlibdatrie-dev += CSWlibdatrie1
 
-EXTRA_LINKER_FLAGS = -liconv
+PACKAGES += CSWlibdatrie-utils
+SPKG_DESC_CSWlibdatrie-utils = Utility programs using libdatrie
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWlibdatrie1
+RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWiconv
+
 BUILD64 = 1
-CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --with-html-docdir=$(docdir)/libdatrie-dev/html
 
+# This is not properly detected
+BUILD_OVERRIDE_VARS = ICONV_LIBS
+BUILD_OVERRIDE_VAR_ICONV_LIBS = -liconv
+
 include gar/category.mk

Modified: csw/mgar/pkg/libdatrie/trunk/checksums
===================================================================
--- csw/mgar/pkg/libdatrie/trunk/checksums	2011-07-09 13:06:34 UTC (rev 15025)
+++ csw/mgar/pkg/libdatrie/trunk/checksums	2011-07-09 14:06:44 UTC (rev 15026)
@@ -1 +1 @@
-d1c93faf0c0d63e620c525c561940fdd  libdatrie-0.2.2.tar.gz
+7f7d592114f98db9e4c7171c3f2befc5  libdatrie-0.2.4.tar.gz

Added: csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch
===================================================================
--- csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch	                        (rev 0)
+++ csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch	2011-07-09 14:06:44 UTC (rev 15026)
@@ -0,0 +1,37 @@
+From 978cdfe1134e27b35897951bd44957a76573e45e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 9 Jul 2011 15:27:27 +0200
+Subject: [PATCH] Remove unnecessary inclusing of stdint.h
+
+---
+ datrie/darray.c |    1 -
+ datrie/tail.c   |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/datrie/darray.c b/datrie/darray.c
+index 234e904..02471e2 100644
+--- a/datrie/darray.c
++++ b/datrie/darray.c
+@@ -26,7 +26,6 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
+-#include <stdint.h>
+ #include <stdio.h>
+ 
+ #include "trie-private.h"
+diff --git a/datrie/tail.c b/datrie/tail.c
+index 4e31d9f..d835c57 100644
+--- a/datrie/tail.c
++++ b/datrie/tail.c
+@@ -26,7 +26,6 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
+-#include <stdint.h>
+ #include <stdio.h>
+ 
+ #include "tail.h"
+-- 
+1.7.6
+


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