head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.1.4.1
	OPENPKG_E1_FP:1.1.4.1
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.1.4.1
	OPENPKG_2_STABLE_20060622:1.1
	OPENPKG_2_STABLE:1.1.0.4
	OPENPKG_2_STABLE_BP:1.1
	OPENPKG_2_5_RELEASE:1.1
	OPENPKG_2_5_SOLID:1.1.0.2
	OPENPKG_2_5_SOLID_BP:1.1
	OPENPKG_CW_FP:1.1;
locks; strict;
comment	@# @;


1.4
date	2009.04.30.19.09.04;	author rse;	state Exp;
branches;
next	1.3;
commitid	0zX8MIH1rewbE4Mt;

1.3
date	2007.10.27.14.58.52;	author cs;	state Exp;
branches;
next	1.2;
commitid	rneqi38DyC8rYeDs;

1.2
date	2006.10.16.06.16.01;	author rse;	state Exp;
branches;
next	1.1;
commitid	v7Nk7MkuSbdoaSQr;

1.1
date	2005.03.16.21.52.08;	author rse;	state Exp;
branches
	1.1.4.1;
next	;

1.1.4.1
date	2006.10.16.14.51.07;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.4
log
@upgrading package: icu 3.8 -> 4.2
@
text
@Index: source/config/Makefile.inc.in
--- source/config/Makefile.inc.in.orig	2009-04-28 20:05:54 +0200
+++ source/config/Makefile.inc.in	2009-04-29 20:48:07 +0200
@@@@ -39,7 +39,7 @@@@
 UNICODE_VERSION = @@UNICODE_VERSION@@
 
 # The prefix for ICU libraries, normally 'icu'
-ICUPREFIX = icu
+ICUPREFIX = sicu
 PACKAGE = @@PACKAGE@@
 LIBICU = lib$(ICUPREFIX)
 
@@@@ -113,7 +113,7 @@@@
 ICULIBS_BASE = $(LIBS) -L$(libdir)
 
 # for icu-config to test with
-ICULIBS_COMMON_LIB_NAME = ${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
+ICULIBS_COMMON_LIB_NAME = ${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${A}
 
 # ICULIBS is the set of libraries your application should link
 # with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
Index: source/icudefs.mk.in
--- source/icudefs.mk.in.orig	2009-04-28 20:06:34 +0200
+++ source/icudefs.mk.in	2009-04-29 20:48:07 +0200
@@@@ -140,7 +140,7 @@@@
 ifeq ($(ENABLE_RPATH),YES)
 RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
 endif
-LDFLAGS = @@LDFLAGS@@ $(RPATHLDFLAGS)
+LDFLAGS = -L$(LIBDIR) -L$(top_builddir)/stubdata @@LDFLAGS@@ $(RPATHLDFLAGS)
 
 # What kind of libraries are we building and linking against?
 ENABLE_STATIC = @@ENABLE_STATIC@@
Index: source/data/Makefile.in
--- source/data/Makefile.in.orig	2009-04-28 20:06:32 +0200
+++ source/data/Makefile.in	2009-04-30 08:42:30 +0200
@@@@ -164,11 +164,11 @@@@
 install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL)
 	$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR)
 ifeq ($(PKGDATA_MODE),files)
-	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)
-	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE)
-	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE)
-	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE)
-	$(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(TRANSLIT_TREE)
+	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)
+	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE)
+	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE)
+	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE)
+	$(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(TRANSLIT_TREE)
 endif
 ifneq ($(ENABLE_STATIC),)
 ifeq ($(PKGDATA_MODE),dll)
@


1.3
log
@upgrading package: icu 3.6 -> 3.8
@
text
@d2 3
a4 3
--- source/config/Makefile.inc.in.orig	2005-07-23 00:58:08 +0200
+++ source/config/Makefile.inc.in	2006-10-15 20:08:10 +0200
@@@@ -38,7 +38,7 @@@@
d13 1
a13 1
@@@@ -112,7 +112,7 @@@@
d23 3
a25 3
--- source/icudefs.mk.in.orig	2005-09-20 22:32:08 +0200
+++ source/icudefs.mk.in	2006-10-15 20:08:10 +0200
@@@@ -126,7 +126,7 @@@@
d34 20
a53 12
Index: source/common/putil.c
--- source/common/putil.c.orig	2007-09-14 01:18:00 +0200
+++ source/common/putil.c	2007-10-27 16:40:08 +0200
@@@@ -576,7 +576,7 @@@@
 #if !UCONFIG_NO_FILE_IO && (defined(U_DARWIN) || defined(U_LINUX) || defined(U_BSD))
 /* These platforms are likely to use Olson timezone IDs. */
 #define CHECK_LOCALTIME_LINK 1
-#if defined(U_LINUX)
+#if defined(U_LINUX) || defined(U_BSD)
 #define TZDEFAULT       "/etc/localtime"
 #define TZZONEINFO      "/usr/share/zoneinfo/"
 #else
@


1.2
log
@upgrading package: icu 3.4.1 -> 3.6
@
text
@d34 12
@


1.1
log
@fix icu-config script
@
text
@d2 2
a3 2
--- source/config/Makefile.inc.in.orig	2004-06-02 01:12:22 +0200
+++ source/config/Makefile.inc.in	2005-03-16 22:44:41 +0100
d13 1
a13 1
@@@@ -100,7 +100,7 @@@@
d22 12
@


1.1.4.1
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@d2 2
a3 2
--- source/config/Makefile.inc.in.orig	2005-07-23 00:58:08 +0200
+++ source/config/Makefile.inc.in	2006-10-15 20:08:10 +0200
d13 1
a13 1
@@@@ -112,7 +112,7 @@@@
a21 12
Index: source/icudefs.mk.in
--- source/icudefs.mk.in.orig	2005-09-20 22:32:08 +0200
+++ source/icudefs.mk.in	2006-10-15 20:08:10 +0200
@@@@ -126,7 +126,7 @@@@
 ifeq ($(ENABLE_RPATH),YES)
 RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
 endif
-LDFLAGS = @@LDFLAGS@@ $(RPATHLDFLAGS)
+LDFLAGS = -L$(LIBDIR) -L$(top_builddir)/stubdata @@LDFLAGS@@ $(RPATHLDFLAGS)
 
 # What kind of libraries are we building and linking against?
 ENABLE_STATIC = @@ENABLE_STATIC@@
@