Update icu4c to 4.0, somehow based on a diff my MAINTAINER reworked by me.

Tested in a mulk muild, webkit and openoffice are happy with it.

ok robert@
This commit is contained in:
landry 2008-10-31 09:56:15 +00:00
parent 75fed9b56b
commit e974342660
14 changed files with 162 additions and 102 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2008/05/04 12:01:42 robert Exp $
# $OpenBSD: Makefile,v 1.6 2008/10/31 09:56:15 landry Exp $
SHARED_ONLY= Yes
COMMENT= International Components for Unicode
DISTNAME= icu4c-3_6-src
PKGNAME= icu4c-3.6p2
SO_VERSION= 0.0
DISTNAME= icu4c-4_0-src
PKGNAME= icu4c-4.0
SO_VERSION= 1.0
.for _lib in icudata icui18n icuio icule iculx icutu icuuc
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor
@ -14,7 +14,7 @@ CATEGORIES= textproc devel
HOMEPAGE= http://www.icu-project.org
MAINTAINER= Vincent Gross <marin.shadok@gmail.com>
MAINTAINER= Vincent Gross <dermiste@gmail.com>
# ICU
# http://source.icu-project.org/repos/icu/icu/trunk/license.html
@ -24,12 +24,10 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pthread stdc++
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icu/} \
ftp://ftp.software.ibm.com/software/globalization/icu/3.6/
MASTER_SITES= ftp://ftp.software.ibm.com/software/globalization/icu/4.0/ \
${MASTER_SITE_SOURCEFORGE:=icu/}
EXTRACT_SUFX= .tgz
SEPARATE_BUILD= concurrent
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \

View File

@ -1,5 +1,5 @@
MD5 (icu4c-3_6-src.tgz) = YkP3oZ4D4FQDzoTll1ENTA==
RMD160 (icu4c-3_6-src.tgz) = siesn/YBk2K8TQHBhDOGmw4P8cI=
SHA1 (icu4c-3_6-src.tgz) = tYDCgC5062r35eGbBcfXxdjGI/k=
SHA256 (icu4c-3_6-src.tgz) = UTXo1p1iBtMgUV33ru5wJ3Easa752NvylXGpepdGsEE=
SIZE (icu4c-3_6-src.tgz) = 10183358
MD5 (icu4c-4_0-src.tgz) = KasJ2Etyp0lTy7TT1XWeFA==
RMD160 (icu4c-4_0-src.tgz) = yA3FC5F3tgoBkeoJXEwcM2DSxvQ=
SHA1 (icu4c-4_0-src.tgz) = /x0/oITS3/FA9rX1PcFWb9teuxc=
SHA256 (icu4c-4_0-src.tgz) = p1YbhrxICInqaE2Dma86PgezPdALrXhN45NsyO2aE4c=
SIZE (icu4c-4_0-src.tgz) = 12326130

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_Makefile_in,v 1.1.1.1 2007/07/19 21:52:09 simon Exp $
--- source/Makefile.in.orig Thu Mar 30 02:33:20 2006
+++ source/Makefile.in Thu Jul 19 22:38:13 2007
@@ -174,8 +174,8 @@ $(top_builddir)/config/Makefile.inc: $(srcdir)/config/
$OpenBSD: patch-source_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
--- source/Makefile.in.orig Mon Sep 22 21:04:14 2008
+++ source/Makefile.in Wed Oct 29 11:15:42 2008
@@ -184,8 +184,8 @@ $(top_builddir)/config/Makefile.inc: $(srcdir)/config/
$(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
-$(RMV) $@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_common_Makefile_in,v 1.2 2007/08/06 21:17:43 steven Exp $
--- source/common/Makefile.in.orig Fri Jun 30 16:42:58 2006
+++ source/common/Makefile.in Mon Aug 6 19:07:32 2007
@@ -60,7 +60,7 @@ CPPFLAGS += -I$(top_builddir)/common
$OpenBSD: patch-source_common_Makefile_in,v 1.3 2008/10/31 09:56:15 landry Exp $
--- source/common/Makefile.in.orig Mon Sep 22 21:03:28 2008
+++ source/common/Makefile.in Wed Oct 29 11:51:13 2008
@@ -62,7 +62,7 @@ CPPFLAGS += -I$(top_builddir)/common
endif
CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/i18n $(LIBCPPFLAGS)
DEFS += -DU_COMMON_IMPLEMENTATION
@ -10,7 +10,7 @@ $OpenBSD: patch-source_common_Makefile_in,v 1.2 2007/08/06 21:17:43 steven Exp $
# $(LIBICUDT) is either stub data or the real DLL common data.
LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
@@ -124,12 +124,6 @@ ifneq ($(ENABLE_STATIC),)
@@ -126,21 +126,9 @@ ifneq ($(ENABLE_STATIC),)
endif
ifneq ($(ENABLE_SHARED),)
$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
@ -18,8 +18,17 @@ $OpenBSD: patch-source_common_Makefile_in,v 1.2 2007/08/06 21:17:43 steven Exp $
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
-ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
endif
-endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
-ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
-endif
-ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
-endif
-endif
endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
$(SVC_HOOK_INC):

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-source_config_icu-config-bottom,v 1.1 2007/10/02 20:53:29 jasper Exp $
--- source/config/icu-config-bottom.orig Tue Oct 2 22:50:37 2007
+++ source/config/icu-config-bottom Tue Oct 2 22:50:56 2007
$OpenBSD: patch-source_config_icu-config-bottom,v 1.2 2008/10/31 09:56:15 landry Exp $
--- source/config/icu-config-bottom.orig Mon Sep 22 21:03:42 2008
+++ source/config/icu-config-bottom Wed Oct 29 11:15:42 2008
@@ -3,7 +3,7 @@
## Copyright (c) 2002-2005, International Business Machines Corporation and
## Copyright (c) 2002-2007, International Business Machines Corporation and
## others. All Rights Reserved.
-ICUUC_FILE=${libdir}/${ICULIBS_COMMON_LIB_NAME}

View File

@ -1,18 +1,9 @@
Needed to adjust the version numbering scheme. Without it,
librairies ends up with weird names.
--- source/configure.orig Tue Aug 15 10:24:14 2006
+++ source/configure Mon Aug 6 16:46:52 2007
@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION LIB_VERSION LIB_VERSION_MAJOR UNICODE_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA U_MAKE DOXYGEN ARFLAGS COMPILE_LINK_ENVVAR LIB_M ENABLE_SHARED ENABLE_STATIC ENABLE_DEBUG ENABLE_RELEASE U_DEFAULT_SHOW_DRAFT RANLIB ac_ct_RANLIB AR U_DISABLE_RENAMING U_ENABLE_TRACING ENABLE_RPATH U_INLINE THREADS_TRUE ICU_USE_THREADS HAVE_MMAP GENCCODE_ASSEMBLY CPP EGREP U_HAVE_INTTYPES_H U_IOSTREAM_SOURCE U_IS_BIG_ENDIAN U_HAVE_NL_LANGINFO U_HAVE_NL_LANGINFO_CODESET U_NL_LANGINFO_CODESET U_HAVE_NAMESPACE U_OVERRIDE_CXX_ALLOCATION U_HAVE_PLACEMENT_NEW U_HAVE_POPEN U_HAVE_TZSET U_TZSET U_HAVE_TZNAME U_TZNAME U_HAVE_TIMEZONE U_TIMEZONE HAVE_INT8_T HAVE_UINT8_T HAVE_INT16_T HAVE_UINT16_T HAVE_INT32_T HAVE_UINT32_T HAVE_INT64_T HAVE_UINT64_T U_HAVE_WCHAR_H U_HAVE_WCSCPY U_SIZEOF_WCHAR_T EXTRAS_TRUE ICUIO_TRUE LAYOUT_TRUE thedatadir pkgicudatadir thepkgicudatadir DATA_PACKAGING_MODE ICULIBSUFFIX U_HAVE_LIB_SUFFIX ICULIBSUFFIXCNAME TESTS_TRUE SAMPLES_TRUE ICUDATA_CHAR platform platform_make_fragment_name platform_make_fragment ld_rpath_suf AIX_SHLIB LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION ENTRYPOINT_VERSION LIB_VERSION LIB_VERSION_MAJOR UNICODE_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA U_MAKE DOXYGEN ARFLAGS COMPILE_LINK_ENVVAR LIB_M ENABLE_SHARED ENABLE_STATIC ENABLE_DEBUG ENABLE_RELEASE U_DEFAULT_SHOW_DRAFT RANLIB ac_ct_RANLIB AR U_DISABLE_RENAMING U_ENABLE_TRACING ENABLE_RPATH U_INLINE THREADS_TRUE ICU_USE_THREADS HAVE_MMAP GENCCODE_ASSEMBLY CPP EGREP U_HAVE_INTTYPES_H U_IOSTREAM_SOURCE U_IS_BIG_ENDIAN U_HAVE_NL_LANGINFO U_HAVE_NL_LANGINFO_CODESET U_NL_LANGINFO_CODESET U_HAVE_NAMESPACE U_OVERRIDE_CXX_ALLOCATION U_HAVE_PLACEMENT_NEW U_HAVE_POPEN U_HAVE_TZSET U_TZSET U_HAVE_TZNAME U_TZNAME U_HAVE_TIMEZONE U_TIMEZONE HAVE_INT8_T HAVE_UINT8_T HAVE_INT16_T HAVE_UINT16_T HAVE_INT32_T HAVE_UINT32_T HAVE_INT64_T HAVE_UINT64_T U_HAVE_WCHAR_H U_HAVE_WCSCPY U_SIZEOF_WCHAR_T EXTRAS_TRUE ICUIO_TRUE LAYOUT_TRUE thedatadir pkgicudatadir thepkgicudatadir DATA_PACKAGING_MODE ICULIBSUFFIX U_HAVE_LIB_SUFFIX ICULIBSUFFIXCNAME TESTS_TRUE SAMPLES_TRUE ICUDATA_CHAR platform platform_make_fragment_name platform_make_fragment ld_rpath_suf AIX_SHLIB LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1347,6 +1347,7 @@ echo "$as_me: error: Cannot determine ICU version numb
--- source/configure.orig Mon Sep 22 21:04:14 2008
+++ source/configure Wed Oct 29 11:15:42 2008
@@ -1359,6 +1359,7 @@ echo "$as_me: error: Cannot determine ICU version numb
{ (exit 1); exit 1; }; }
fi
fi
@ -20,7 +11,7 @@ librairies ends up with weird names.
LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`
LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
@@ -8363,6 +8364,7 @@ s,@ECHO_T@,$ECHO_T,;t t
@@ -9091,6 +9092,7 @@ s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t
s,@PACKAGE@,$PACKAGE,;t t
s,@VERSION@,$VERSION,;t t

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_i18n_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
--- source/i18n/Makefile.in.orig Mon Aug 6 19:10:18 2007
+++ source/i18n/Makefile.in Mon Aug 6 19:10:27 2007
@@ -114,12 +114,6 @@ ifneq ($(ENABLE_STATIC),)
$OpenBSD: patch-source_i18n_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
--- source/i18n/Makefile.in.orig Mon Sep 22 21:03:06 2008
+++ source/i18n/Makefile.in Wed Oct 29 11:29:53 2008
@@ -118,21 +118,9 @@ ifneq ($(ENABLE_STATIC),)
endif
ifneq ($(ENABLE_SHARED),)
$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
@ -9,8 +9,17 @@ $OpenBSD: patch-source_i18n_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
-ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
endif
-endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
-ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
-endif
-ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
-endif
-endif
endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
install-headers:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_icudefs_mk_in,v 1.2 2007/08/06 21:17:43 steven Exp $
--- source/icudefs.mk.in.orig Tue Sep 20 22:32:08 2005
+++ source/icudefs.mk.in Mon Aug 6 18:58:08 2007
@@ -42,7 +42,7 @@ SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
$OpenBSD: patch-source_icudefs_mk_in,v 1.3 2008/10/31 09:56:15 landry Exp $
--- source/icudefs.mk.in.orig Mon Sep 22 21:04:14 2008
+++ source/icudefs.mk.in Wed Oct 29 11:15:42 2008
@@ -44,7 +44,7 @@ SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
ICUDATA_DIR = @pkgicudatadir@/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_io_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
--- source/io/Makefile.in.orig Mon Aug 6 19:08:02 2007
+++ source/io/Makefile.in Mon Aug 6 19:08:14 2007
@@ -99,12 +99,6 @@ ifneq ($(ENABLE_STATIC),)
$OpenBSD: patch-source_io_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
--- source/io/Makefile.in.orig Mon Sep 22 21:03:42 2008
+++ source/io/Makefile.in Wed Oct 29 11:45:50 2008
@@ -101,21 +101,9 @@ ifneq ($(ENABLE_STATIC),)
endif
ifneq ($(ENABLE_SHARED),)
$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
@ -9,8 +9,17 @@ $OpenBSD: patch-source_io_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
-ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
endif
-endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
-ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
-endif
-ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
-endif
-endif
endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
install-headers:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_layout_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
--- source/layout/Makefile.in.orig Mon Aug 6 19:08:27 2007
+++ source/layout/Makefile.in Mon Aug 6 19:08:34 2007
@@ -168,12 +168,6 @@ ifneq ($(ENABLE_STATIC),)
$OpenBSD: patch-source_layout_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
--- source/layout/Makefile.in.orig Mon Sep 22 21:04:12 2008
+++ source/layout/Makefile.in Wed Oct 29 11:34:57 2008
@@ -171,21 +171,9 @@ ifneq ($(ENABLE_STATIC),)
endif
ifneq ($(ENABLE_SHARED),)
$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
@ -9,8 +9,17 @@ $OpenBSD: patch-source_layout_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
-ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
endif
-endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
-ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
-endif
-ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
-endif
-endif
endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
install-headers:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_layoutex_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
--- source/layoutex/Makefile.in.orig Mon Aug 6 19:09:59 2007
+++ source/layoutex/Makefile.in Mon Aug 6 19:10:10 2007
@@ -98,12 +98,6 @@ ifneq ($(ENABLE_STATIC),)
$OpenBSD: patch-source_layoutex_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
--- source/layoutex/Makefile.in.orig Mon Sep 22 21:04:10 2008
+++ source/layoutex/Makefile.in Wed Oct 29 11:35:11 2008
@@ -102,21 +102,9 @@ ifneq ($(ENABLE_STATIC),)
endif
ifneq ($(ENABLE_SHARED),)
$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
@ -9,8 +9,17 @@ $OpenBSD: patch-source_layoutex_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
-ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
endif
-endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
-ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
-endif
-ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
-endif
-endif
endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
install-headers:

View File

@ -1,8 +1,8 @@
Needed to fix a linker warning message about size mismatch. Credits to
Andreas Vogele <andreas@kurzegrasse.de> for this one.
--- source/stubdata/Makefile.in.orig Fri Dec 2 11:21:34 2005
+++ source/stubdata/Makefile.in Mon Aug 6 19:27:16 2007
--- source/stubdata/Makefile.in.orig Mon Sep 22 21:03:42 2008
+++ source/stubdata/Makefile.in Wed Oct 29 11:50:47 2008
@@ -41,6 +41,7 @@ ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
@ -11,7 +11,7 @@ Andreas Vogele <andreas@kurzegrasse.de> for this one.
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
ifneq ($(top_builddir),$(top_srcdir))
@@ -87,12 +88,6 @@ ifneq ($(ENABLE_STATIC),)
@@ -87,21 +88,9 @@ ifneq ($(ENABLE_STATIC),)
endif
ifneq ($(ENABLE_SHARED),)
$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
@ -19,8 +19,17 @@ Andreas Vogele <andreas@kurzegrasse.de> for this one.
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
-ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
endif
-endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
-ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
-endif
-ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
-endif
-endif
endif
ifneq ($(IMPORT_LIB_EXT),)
$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
dist-local:

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-source_tools_toolutil_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
--- source/tools/toolutil/Makefile.in.orig Mon Aug 6 19:21:08 2007
+++ source/tools/toolutil/Makefile.in Mon Aug 6 19:21:17 2007
@@ -86,12 +86,6 @@ ifneq ($(ENABLE_STATIC),)
endif
$OpenBSD: patch-source_tools_toolutil_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
--- source/tools/toolutil/Makefile.in.orig Mon Sep 22 21:03:38 2008
+++ source/tools/toolutil/Makefile.in Wed Oct 29 11:15:42 2008
@@ -85,12 +85,6 @@ install-library: all-local
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
ifneq ($(ENABLE_SHARED),)
$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
-ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))

View File

@ -1,13 +1,13 @@
@comment $OpenBSD: PLIST,v 1.2 2007/08/06 21:17:43 steven Exp $
bin/derb
bin/genbrk
bin/gencnval
bin/genctd
bin/genrb
@comment $OpenBSD: PLIST,v 1.3 2008/10/31 09:56:15 landry Exp $
@bin bin/derb
@bin bin/genbrk
@bin bin/gencnval
@bin bin/genctd
@bin bin/genrb
bin/icu-config
bin/makeconv
bin/pkgdata
bin/uconv
@bin bin/makeconv
@bin bin/pkgdata
@bin bin/uconv
include/layout/
include/layout/LEFontInstance.h
include/layout/LEGlyphFilter.h
@ -20,7 +20,11 @@ include/layout/LETypes.h
include/layout/LayoutEngine.h
include/layout/ParagraphLayout.h
include/layout/RunArrays.h
include/layout/loengine.h
include/layout/playout.h
include/layout/plruns.h
include/unicode/
include/unicode/basictz.h
include/unicode/brkiter.h
include/unicode/calendar.h
include/unicode/caniter.h
@ -36,6 +40,11 @@ include/unicode/dcfmtsym.h
include/unicode/decimfmt.h
include/unicode/docmain.h
include/unicode/dtfmtsym.h
include/unicode/dtintrv.h
include/unicode/dtitvfmt.h
include/unicode/dtitvinf.h
include/unicode/dtptngen.h
include/unicode/dtrule.h
include/unicode/fieldpos.h
include/unicode/fmtable.h
include/unicode/format.h
@ -50,11 +59,14 @@ include/unicode/numfmt.h
include/unicode/parseerr.h
include/unicode/parsepos.h
include/unicode/platform.h
include/unicode/plurfmt.h
include/unicode/plurrule.h
include/unicode/ppalmos.h
include/unicode/putil.h
include/unicode/pwin32.h
include/unicode/rbbi.h
include/unicode/rbnf.h
include/unicode/rbtz.h
include/unicode/regex.h
include/unicode/rep.h
include/unicode/resbund.h
@ -69,6 +81,8 @@ include/unicode/symtable.h
include/unicode/tblcoll.h
include/unicode/timezone.h
include/unicode/translit.h
include/unicode/tzrule.h
include/unicode/tztrans.h
include/unicode/ubidi.h
include/unicode/ubrk.h
include/unicode/ucal.h
@ -87,6 +101,7 @@ include/unicode/ucsdet.h
include/unicode/ucurr.h
include/unicode/udat.h
include/unicode/udata.h
include/unicode/udatpg.h
include/unicode/udeprctd.h
include/unicode/udraft.h
include/unicode/uenum.h
@ -133,9 +148,10 @@ include/unicode/utrace.h
include/unicode/utrans.h
include/unicode/utypes.h
include/unicode/uversion.h
include/unicode/vtzone.h
lib/icu/
lib/icu/3.6/
lib/icu/3.6/Makefile.inc
lib/icu/4.0/
lib/icu/4.0/Makefile.inc
lib/icu/Makefile.inc
lib/icu/current
@lib lib/libicudata.so.${LIBicudata_VERSION}
@ -159,15 +175,16 @@ lib/icu/current
@man man/man8/gensprep.8
@man man/man8/genuca.8
@man man/man8/icupkg.8
sbin/genccode
sbin/gencmn
sbin/gensprep
sbin/genuca
sbin/icupkg
sbin/icuswap
@bin sbin/genccode
@bin sbin/gencmn
@bin sbin/gensprep
@bin sbin/genuca
@bin sbin/icupkg
@bin sbin/icuswap
share/icu/
share/icu/3.6/
share/icu/3.6/config/
share/icu/3.6/config/mh-bsd-gcc
share/icu/3.6/license.html
@comment share/icu/3.6/mkinstalldirs
share/icu/4.0/
share/icu/4.0/config/
share/icu/4.0/config/mh-bsd-gcc
share/icu/4.0/license.html
@comment share/icu/4.0/install-sh
@comment share/icu/4.0/mkinstalldirs