[csw-devel] SF.net SVN: gar:[17869] csw/mgar/pkg/libthai/trunk

[dmichelsen at users.sourceforge.net]

Revision: 17869
          http://gar.svn.sourceforge.net/gar/?rev=17869&view=rev
Author:   dmichelsen
Date:     2012-04-25 12:46:27 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
libthai/trunk: Update to 0.1.17

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

Added Paths:
-----------
    csw/mgar/pkg/libthai/trunk/files/0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch

Modified: csw/mgar/pkg/libthai/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libthai/trunk/Makefile	2012-04-25 12:09:13 UTC (rev 17868)
+++ csw/mgar/pkg/libthai/trunk/Makefile	2012-04-25 12:46:27 UTC (rev 17869)
@@ -1,5 +1,5 @@
 NAME = libthai
-VERSION = 0.1.12
+VERSION = 0.1.17
 CATEGORIES = lib
 GARTYPE = v2
 
@@ -14,31 +14,30 @@
 endef
 
 MASTER_SITES = http://linux.thai.net/pub/thailinux/software/libthai/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PATCHFILES = 0001-Remove-unknown-compiler-macro.patch
+DISTFILES += $(DISTNAME).tar.gz
 
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=34448
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES += 0001-Remove-unknown-compiler-macro.patch
+PATCHFILES += 0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch
 
-PACKAGES = CSWlibthai CSWlibthaidevel
+VENDOR_URL = http://linux.thai.net/projects/libthai/
 
-CATALOGNAME_CSWlibthai = libthai
-CATALOGNAME_CSWlibthaidevel = libthai_devel
+BUILD_DEP_PKGS += CSWlibdatrie-dev
+BUILD_DEP_PKGS += CSWlibdatrie-utils
 
-SPKG_DESC_CSWlibthai = Thai language support routines
-SPKG_DESC_CSWlibthaidevel = Thai language support routines development files
+PACKAGES += CSWlibthai0
+SPKG_DESC_CSWlibthai0 = Thai language support routines, libthai.so.0
+PKGFILES_CSWlibthai0 += $(call pkgfiles_lib,libthai.so.0)
+PKGFILES_CSWlibthai0 += $(sharedstatedir)/libthai/thbrk.tri
+RUNTIME_DEP_PKGS_CSWlibthai0 = CSWlibdatrie1
+OBSOLETED_BY_CSWlibthai0 += CSWlibthai
 
-SPKG_SOURCEURL = http://linux.thai.net/projects/libthai/
+PACKAGES += CSWlibthai-dev
+SPKG_DESC_CSWlibthai-dev = Thai language support routines development files
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibthai-dev = CSWlibthai0
+OBSOLETED_BY_CSWlibthai-dev += CSWlibthaidevel
+CATALOGNAME_CSWlibthaidevel = libthai_devel_stub
 
-RUNTIME_DEP_PKGS_CSWlibthai = CSWlibdatrie
-RUNTIME_DEP_PKGS_CSWlibthaidevel = CSWlibthai
-PREREQUISUITE_PKGS = $(RUNTIME_DEP_PKGS_CSWlibthai)
-
 BUILD64_LIBS_ONLY = 1
-CONFIGURE_ARGS = $(DIRPATHS)
 
-PKGFILES_CSWlibthaidevel = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibthaidevel += $(docdir)/.*
-
 include gar/category.mk

Modified: csw/mgar/pkg/libthai/trunk/checksums
===================================================================
--- csw/mgar/pkg/libthai/trunk/checksums	2012-04-25 12:09:13 UTC (rev 17868)
+++ csw/mgar/pkg/libthai/trunk/checksums	2012-04-25 12:46:27 UTC (rev 17869)
@@ -1,2 +1 @@
-11c46f4c6a8a3525861b750f890fee5e  0001-Remove-unknown-compiler-macro.patch
-e206313d5a60ce98bc3be83d60373554  libthai-0.1.12.tar.gz
+d94ddbf5e5a09a911c459f0a4ad1c041  libthai-0.1.17.tar.gz

Added: csw/mgar/pkg/libthai/trunk/files/0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch
===================================================================
--- csw/mgar/pkg/libthai/trunk/files/0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch	                        (rev 0)
+++ csw/mgar/pkg/libthai/trunk/files/0002-Use-stdint.h-only-when-available-and-use-limits.h-fo.patch	2012-04-25 12:46:27 UTC (rev 17869)
@@ -0,0 +1,72 @@
+From 09758dc94dd2f70a92120843c7d28754bef85ef2 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at opencsw.org>
+Date: Wed, 25 Apr 2012 14:23:49 +0200
+Subject: [PATCH] Use stdint.h only when available and use limits.h for
+ SIZE_MAX
+
+---
+ src/thbrk/brk-maximal.c |    6 ++++++
+ src/thbrk/thbrk.c       |    8 ++++++++
+ src/thwbrk/thwbrk.c     |    7 +++++++
+ 3 files changed, 21 insertions(+)
+
+diff --git a/src/thbrk/brk-maximal.c b/src/thbrk/brk-maximal.c
+index 2ee9842..663013b 100644
+--- a/src/thbrk/brk-maximal.c
++++ b/src/thbrk/brk-maximal.c
+@@ -26,7 +26,13 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
++
++#if defined( HAVE_STDINT_H )
+ #include <stdint.h>
++#elif defined( HAVE_INTTYPES_H )
++#include <inttypes.h>
++#endif
++
+ #include <stdio.h>
+ #include <limits.h>
+ #include <datrie/trie.h>
+diff --git a/src/thbrk/thbrk.c b/src/thbrk/thbrk.c
+index 2fefffa..2b221d5 100644
+--- a/src/thbrk/thbrk.c
++++ b/src/thbrk/thbrk.c
+@@ -26,7 +26,15 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
++
++#if defined( HAVE_STDINT_H )
+ #include <stdint.h>
++#elif defined( HAVE_INTTYPES_H )
++#include <inttypes.h>
++#endif
++
++#include <limits.h>
++
+ #include <thai/tis.h>
+ #include <thai/thctype.h>
+ #include <thai/thbrk.h>
+diff --git a/src/thwbrk/thwbrk.c b/src/thwbrk/thwbrk.c
+index 8543df9..2ef8173 100644
+--- a/src/thwbrk/thwbrk.c
++++ b/src/thwbrk/thwbrk.c
+@@ -26,7 +26,14 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++
++#if defined( HAVE_STDINT_H )
+ #include <stdint.h>
++#elif defined( HAVE_INTTYPES_H )
++#include <inttypes.h>
++#endif
++
++#include <limits.h>
+ #include <stdlib.h>
+ 
+ #include <thai/thailib.h>
+-- 
+1.7.10
+

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