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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Sep 23 23:37:49 CEST 2011 

Revision: 15723
          http://gar.svn.sourceforge.net/gar/?rev=15723&view=rev
Author:   dmichelsen
Date:     2011-09-23 21:37:49 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
libicu, libicu46, libicu48: Skplit off old version

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

Added Paths:
-----------
    csw/mgar/pkg/libicu46/
    csw/mgar/pkg/libicu48/

Removed Paths:
-------------
    csw/mgar/pkg/libicu/

Modified: csw/mgar/pkg/libicu48/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libicu/trunk/Makefile	2011-08-28 19:44:23 UTC (rev 15455)
+++ csw/mgar/pkg/libicu48/trunk/Makefile	2011-09-23 21:37:49 UTC (rev 15723)
@@ -1,63 +1,83 @@
 # $Id$
 NAME = libicu
-VERSION = 4.6
+VERSION = 4.8.1
 CATEGORIES = lib
 
 DESCRIPTION = International Components for Unicode
 define BLURB
 endef
 
-# filename = icu4c-$(shell echo $(1) | tr '.' '_')-src.tgz
-_V-4.6 = 4_6
-filename = icu4c-$(_V-$(1))-src.tgz
-
 MASTER_SITES = http://download.icu-project.org/files/icu4c/$(VERSION)/
-SOURCEFILES = $(call filename,$(VERSION))
+SOURCEFILES = icu4c-$(subst .,_,$(VERSION))-src.tgz
 DISTFILES = $(SOURCEFILES)
 
-# icu-config is broken with ECHO_N/ECHO_C detection:
-#   http://bugs.icu-project.org/trac/ticket/7768
-#PATCHFILES = 0001-Add-workaround-for-echo-n.patch
+VENDOR_URL = http://icu-project.org/
 
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:_\d+)*)-src.tgz
+LICENSE = license.html
 
-PACKAGES += CSWlibicu46
-CATALOGNAME_CSWlibicu46 = libicu46
-SPKG_DESC_CSWlibicu46 = International Components for Unicode, libicu*.so.46
-PKGFILES_CSWlibicu46 = $(call baseisadirs,$(libdir),libicu.*\.so\.46(\.\d+)*)
-# These are ok. As they are all used and bundled together they are also
-# released together in one soname-specific package.
-CHECKPKG_OVERRIDES_CSWlibicu46 += shared-lib-pkgname-mismatch
+PACKAGES += CSWlibicudata48
+SPKG_DESC_CSWlibicudata48 = International Components for Unicode, libicudata.so.48
+PKGFILES_CSWlibicudata48 += $(call pkgfiles_lib,libicudata.so.48)
 
-PACKAGES += CSWlibicu-devel
-CATALOGNAME_CSWlibicu-devel = libicu_devel
-SPKG_DESC_CSWlibicu-devel = Development Files for libicu
-# This package is PKGFILES catchall
-RUNTIME_DEP_PKGS_CSWlibicu-devel = CSWlibicu46
+PACKAGES += CSWlibicui18n48
+SPKG_DESC_CSWlibicui18n48 = International Components for Unicode, libicui18n.so.48
+PKGFILES_CSWlibicui18n48 += $(call pkgfiles_lib,libicui18n.so.48)
+RUNTIME_DEP_PKGS_CSWlibicui18n48 += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWlibicui18n48 += CSWlibicudata48
 
-PACKAGES += CSWlibicu
-CATALOGNAME_CSWlibicu = libicu
-SPKG_DESC_CSWlibicu = $(DESCRIPTION)
-PKGFILES_CSWlibicu = NOFILES
-ARCHALL_CSWlibicu = 1
-# There are still legacy packages depending on CSWlibicu and expecting .so.42 in it.
-# Also depend on legacy soname-package until all these have been resolved.
-RUNTIME_DEP_PKGS_CSWlibicu += CSWlibicu42
-CHECKPKG_OVERRIDES_CSWlibicu += surplus-dependency|CSWlibicu42
-# This package is generated in a branch and cannot be found in this build.
-CHECKPKG_OVERRIDES_CSWlibicu += unidentified-dependency|CSWlibicu42
+PACKAGES += CSWlibicuio48
+SPKG_DESC_CSWlibicuio48 = International Components for Unicode, libicuio.so.48
+PKGFILES_CSWlibicuio48 += $(call pkgfiles_lib,libicuio.so.48)
+RUNTIME_DEP_PKGS_CSWlibicuio48 += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSWlibicuio48 += CSWlibicui18n
+RUNTIME_DEP_PKGS_CSWlibicuio48 += CSWlibicuuc48
 
-# The collisions will be there until CSWlibicu has also been updated.
-# This will happen at the same time as the CSWlibicu42 release.
-CHECKPKG_OVERRIDES_CSWlibicu46 += file-collision
-CHECKPKG_OVERRIDES_CSWlibicu-devel += file-collision
-CHECKPKG_OVERRIDES_CSWlibicu += file-collision
+PACKAGES += CSWlibicule48
+SPKG_DESC_CSWlibicule48 = International Components for Unicode, libicule.so.48
+PKGFILES_CSWlibicule48 += $(call pkgfiles_lib,libicule.so.48)
+RUNTIME_DEP_PKGS_CSWlibicule48 += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWlibicule48 += CSWlibicudata48
 
-LICENSE = license.html
+PACKAGES += CSWlibiculx48
+SPKG_DESC_CSWlibiculx48 = International Components for Unicode, libiculx.so.48
+PKGFILES_CSWlibiculx48 += $(call pkgfiles_lib,libiculx.so.48)
+RUNTIME_DEP_PKGS_CSWlibiculx48 += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWlibiculx48 += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSWlibiculx48 += CSWlibicule48
 
-VENDOR_URL = http://icu-project.org/
+PACKAGES += CSWlibicutest48
+SPKG_DESC_CSWlibicutest48 = International Components for Unicode, libicutest.so.48
+PKGFILES_CSWlibicutest48 += $(call pkgfiles_lib,libicutest.so.48)
+RUNTIME_DEP_PKGS_CSWlibicutest48 += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSWlibicutest48 += CSWlibicui18n
+RUNTIME_DEP_PKGS_CSWlibicutest48 += CSWlibicutu48
+RUNTIME_DEP_PKGS_CSWlibicutest48 += CSWlibicuuc48
 
+PACKAGES += CSWlibicutu48
+SPKG_DESC_CSWlibicutu48 = International Components for Unicode, libicutu.so.48
+PKGFILES_CSWlibicutu48 += $(call pkgfiles_lib,libicutu.so.48)
+RUNTIME_DEP_PKGS_CSWlibicutu48 += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWlibicutu48 += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSWlibicutu48 += CSWlibicui18n
+
+PACKAGES += CSWlibicuuc48
+SPKG_DESC_CSWlibicuuc48 = International Components for Unicode, libicuuc.so.48
+PKGFILES_CSWlibicuuc48 += $(call pkgfiles_lib,libicuuc.so.48)
+RUNTIME_DEP_PKGS_CSWlibicuuc48 += CSWlibicudata48
+
+PACKAGES += CSWlibicu-dev
+SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.48
+# This package is PKGFILES catchall
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio48
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule48
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx48
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest48
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu48
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc48
+OBSOLETED_BY_CSWlibicu-dev += CSWlibicu-devel
+
 DISTNAME = icu
 WORKSRC = $(WORKDIR)/$(DISTNAME)/source
 
@@ -68,11 +88,13 @@
 # libCrun is needed for all libs, libCstd for libicui18n.so only
 # Not having these does not cause errors during build of libicu, but the
 # packages using the libs will bail out as they assume the libs are self-contained.
-LINKER_FLAGS = -lCrun -lCstd
+LINKER_FLAGS = -lCrun -lCstd -norunpath
 
 BUILD64 = 1
-NOISAEXEC = 1
 NOISALIST = 1
-CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk
+
+post-extract-modulated:
+	-perl -pi -e 's,/usr/local,$(prefix),' \
+		$(WORKSRC)/source/config/icu-config-bottom

Modified: csw/mgar/pkg/libicu48/trunk/checksums
===================================================================
--- csw/mgar/pkg/libicu/trunk/checksums	2011-08-28 19:44:23 UTC (rev 15455)
+++ csw/mgar/pkg/libicu48/trunk/checksums	2011-09-23 21:37:49 UTC (rev 15723)
@@ -1 +1 @@
-43e56b71c407be5154de681eaa646a4a  icu4c-4_6-src.tgz
+af36f635271a239d76d038d6cf8da8df  icu4c-4_8_1-src.tgz

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

More information about the devel mailing list