SF.net SVN: gar:[22468] csw/mgar/pkg/gettext/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Nov 11 15:05:31 CET 2013
Revision: 22468
http://gar.svn.sourceforge.net/gar/?rev=22468&view=rev
Author: dmichelsen
Date: 2013-11-11 14:05:29 +0000 (Mon, 11 Nov 2013)
Log Message:
-----------
gettext/trunk: Update to 0.18.3.1 and complete rework, drop legacy stuff
Modified Paths:
--------------
csw/mgar/pkg/gettext/trunk/Makefile
csw/mgar/pkg/gettext/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
csw/mgar/pkg/gettext/trunk/files/0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch
csw/mgar/pkg/gettext/trunk/files/0003-Patch-around-thread-handling-differences-between-9-a.patch
csw/mgar/pkg/gettext/trunk/files/CSWggettext.cswreleasenotes
csw/mgar/pkg/gettext/trunk/files/CSWggettextdoc.cswreleasenotes
csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.14.1.so.i
csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.14.1.so.s
csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.14.1.so.s9
csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.amd64
csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.i
csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s
csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s9
csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.amd64
csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.i
csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s
csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s9
csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.amd64
csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.i
csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s
csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s9
csw/mgar/pkg/gettext/trunk/files/libintl.so.2.i
csw/mgar/pkg/gettext/trunk/files/libintl.so.2.s
csw/mgar/pkg/gettext/trunk/files/libintl.so.2.s9
csw/mgar/pkg/gettext/trunk/files/libintl.so.3.i
csw/mgar/pkg/gettext/trunk/files/libintl.so.3.s
csw/mgar/pkg/gettext/trunk/files/libintl.so.3.s9
csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.amd64.keep
csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.i.keep
csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s.keep
csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s9.keep
csw/mgar/pkg/gettext/trunk/files/test-wcwidth.patch
Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile 2013-11-11 09:20:09 UTC (rev 22467)
+++ csw/mgar/pkg/gettext/trunk/Makefile 2013-11-11 14:05:29 UTC (rev 22468)
@@ -1,5 +1,5 @@
NAME = gettext
-VERSION = 0.18.1.1
+VERSION = 0.18.3.1
GARTYPE = v2
PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
@@ -9,198 +9,160 @@
GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages
endef
-# a few legacy packages that we still need to depend on for dependency reasons
+MASTER_SITES += $(GNU_MIRROR)
+DISTFILES += $(NAME)-$(VERSION).tar.gz
+DISTFILES += CSWggettext.cswreleasenotes
+
+# A few legacy packages that we still need to depend on for dependency reasons
# that we no longer want to rebuild and carry.
FOREIGN_PACKAGES += CSWlibgettextlib0-14-1
FOREIGN_PACKAGES += CSWlibgettextlib0-17
FOREIGN_PACKAGES += CSWlibgettextsrc0-17
FOREIGN_PACKAGES += CSWlibintl2
+OBSOLETED_BY_CSWlibintl2 += CSWggettextrt
FOREIGN_PACKAGES += CSWlibintl3
+OBSOLETED_BY_CSWlibintl3 += CSWggettextrt
-BUILD_DEP_PKGS += CSWlibncurses-dev CSWlibxml2-dev CSWlibexpat-dev
-BUILD_DEP_PKGS += CSWlibiconv-dev CSWggettext-dev
+BUILD_DEP_PKGS += CSWlibncurses-dev
+BUILD_DEP_PKGS += CSWlibxml2-dev
+BUILD_DEP_PKGS += CSWlibexpat-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWggettext-dev
PACKAGES += CSWggettext
-PACKAGES += CSWggettextdoc
-PACKAGES += CSWlibasprintf0
-PACKAGES += CSWlibgettextlib0-18-1
-PACKAGES += CSWlibgettextpo0
-PACKAGES += CSWlibgettextsrc0-18-1
-PACKAGES += CSWlibintl8
-PACKAGES += CSWggettext-dev
-PACKAGES += CSWggettext-data
-PACKAGES += CSWggettextrt
-
-CATALOGNAME_CSWlibasprintf0 = libasprintf0
-CATALOGNAME_CSWggettext = ggettext
-CATALOGNAME_CSWggettextdoc = ggettextdoc
-CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1
-CATALOGNAME_CSWlibgettextpo0 = libgettextpo0
-CATALOGNAME_CSWlibgettextsrc0-18-1 = libgettextsrc0_18_1
-CATALOGNAME_CSWlibintl8 = libintl8
-CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1
-CATALOGNAME_CSWggettext-dev = ggettext_dev
-CATALOGNAME_CSWggettext-data = ggettext_data
-CATALOGNAME_CSWggettextrt = ggettextrt
-
SPKG_DESC_CSWggettext = GNU locale utilities
-SPKG_DESC_CSWggettextdoc = GNU locale utility documentation
-SPKG_DESC_CSWlibasprintf0 += GNU locale utilities, libasprintf.so.0
-SPKG_DESC_CSWggettext-dev = GNU locale utilities, development files
-SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so
-SPKG_DESC_CSWlibgettextpo0 += GNU locale utilities, libgettextpo.so.0
-SPKG_DESC_CSWlibgettextsrc0-18-1 += GNU locale utilities, libgettextsrc-0.18.1.so
-SPKG_DESC_CSWlibintl8 += GNU locale utilities, libintl.so.8
-SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so
-SPKG_DESC_CSWggettext-data += GNU locale utilities, translation files
-SPKG_DESC_CSWggettextrt += GNU locale utilities, transitional dependency package
-
RUNTIME_DEP_PKGS_CSWggettext += CSWlibexpat1
RUNTIME_DEP_PKGS_CSWggettext += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-3
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-18-3
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgomp1
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibasprintf0
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextpo0
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibunistring0
+RUNTIME_DEP_PKGS_CSWggettext += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWggettext-data
+CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacs-common
+# Legacy. Remove after these libs are no longer used by packages depending on any of them.
RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-14-1
+CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-14-1
RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-17
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-1
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-18-1
+CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-17
RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl2
+CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl2
RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl3
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWggettext += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-1
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-18-1
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibasprintf0
-RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibgettextpo0
-RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl2
-RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl3
-RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWggettextrt += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl3
+
+PACKAGES += CSWlibasprintf0
+SPKG_DESC_CSWlibasprintf0 += GNU locale utilities, libasprintf.so.0
+PKGFILES_CSWlibasprintf0 += $(call pkgfiles_lib,libasprintf.so.0)
+RUNTIME_DEP_PKGS_CSWlibasprintf0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibasprintf0 += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWlibasprintf0 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibasprintf0 += surplus-dependency|CSWggettext-data
+OBSOLETED_BY_CSWlibasprintf0 += CSWggettextrt
+
+PACKAGES += CSWlibgettextlib0-18-3
+SPKG_DESC_CSWlibgettextlib0-18-3 += GNU locale utilities, libgettextlib-0.18.3.so
+PKGFILES_CSWlibgettextlib0-18-3 += $(call pkgfiles_lib,libgettextlib-0.18.3.so)
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibunistring0
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-3 += surplus-dependency|CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-3 += soname-equals-filename
+
+PACKAGES += CSWlibgettextpo0
+SPKG_DESC_CSWlibgettextpo0 += GNU locale utilities, libgettextpo.so.0
+PKGFILES_CSWlibgettextpo0 += $(call pkgfiles_lib,libgettextpo.so.0)
RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibunistring0
+RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibgettextlib0-18-1
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibintl8 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data
+OBSOLETED_BY_CSWlibgettextpo0 += CSWggettextrt
-PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so)
-PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*)
-PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.4\.0)
-PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0(\.\d+)*)
-PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.5\.1)
-PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so)
-PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so(\.\d+)*)
-PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.0\.2)
-PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.1\.1)
-PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8(\.\d+)*)
-PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so)
-PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*)
-PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0\.0\.0)
-PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0(\.\d+)*)
-PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_CONFIG)
-PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_STATICLIB)
-PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_LIBTOOL)
-PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_PKGCONFIG)
-PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_INCLUDEDIR)
-PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_ACLOCAL)
-PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_CONFIG_MANPAGE)
-PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE)
-PKGFILES_CSWggettest-dev += $(libdir)/libgettextlib.so
-PKGFILES_CSWggettest-dev += $(libdir)/libgettextpo.so
-PKGFILES_CSWggettest-dev += $(libdir)/libgettextsrc.so
-PKGFILES_CSWggettest-dev += $(libdir)/libintl.so
-PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*mo
-PKGFILES_CSWggettextrt += /opt/csw/share/.*ggettextrt.*
-PKGFILES_CSWggettextdoc = $(PKGFILES_DOC)
+PACKAGES += CSWlibgettextsrc0-18-3
+SPKG_DESC_CSWlibgettextsrc0-18-3 += GNU locale utilities, libgettextsrc-0.18.3.so
+PKGFILES_CSWlibgettextsrc0-18-3 += $(call pkgfiles_lib,libgettextsrc-0.18.3.so)
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibgettextlib0-18-3
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibunistring0
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += surplus-dependency|CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWggettext += discouraged-path-in-pkgmap|/opt/csw/share/gettext/archive.git.tar.gz
-CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacscommon
-CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibgettextpo0
-CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibasprintf0
-CHECKPKG_OVERRIDES_CSWlibgettextpo0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0
-CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-1 += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-1 += soname-equals-filename
+PACKAGES += CSWlibintl8
+SPKG_DESC_CSWlibintl8 += GNU locale utilities, libintl.so.8
+PKGFILES_CSWlibintl8 += $(call pkgfiles_lib,libintl.so.8)
+RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibintl8 += CSWggettext-data
CHECKPKG_OVERRIDES_CSWlibintl8 += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibasprintf0 += surplus-dependency|CSWggettext-data
+OBSOLETED_BY_CSWlibintl8 += CSWggettextrt
-CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-prefix.m4
-CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-link.m4
+PACKAGES += CSWggettext-dev
+SPKG_DESC_CSWggettext-dev = GNU locale utilities, development files
+# Why is this needed?
+PKGFILES_DEVEL_SHAREDLIBLINK =
+PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWggettext-dev += $(PKGFILES_DOC)
+PKGFILES_CSWggettext-dev += $(sharedstatedir)/gettext/.*
+PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libgettextlib.so)
+PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libgettextpo.so)
+PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libgettextsrc.so)
+PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libintl.so)
+PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*\.mo
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-3
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-18-3
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8
+OBSOLETED_BY_CSWggettext-dev += CSWggettextdoc
+CHECKPKG_OVERRIDES_CSWggettext-dev += missing-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWggettextdoc += file-with-bad-content
-
-ARCHALL_CSWggettextrt = 1
+PACKAGES += CSWggettext-data
+SPKG_DESC_CSWggettext-data += GNU locale utilities, translation files
ARCHALL_CSWggettext-data = 1
-ARCHALL_CSWggettextdoc = 1
+OBSOLETED_BY_CSWggettext-data += CSWggettextrt
-COMPILE_ELISP = 1
+GARCOMPILER = GNU
-MASTER_SITES = $(GNU_MIRROR)
-
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += CSWggettextdoc.cswreleasenotes
-DISTFILES += CSWggettext.cswreleasenotes
-
-PATCHFILES += 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
-PATCHFILES += 0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch
-
-#This patch is not a simple 'make it compile' so we flag the feature
-#patch below
-PATCHFILES += 0003-Patch-around-thread-handling-differences-between-9-a.patch
-VERSION_FLAG_PATCH = 1
-
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --program-prefix=g
-#Dont' depend on packages that depend on me
+# Dont' depend on packages that depend on me
CONFIGURE_ARGS += --with-included-glib
CONFIGURE_ARGS += --with-included-libcroco
-#No glibc
+# No glibc
CONFIGURE_ARGS += --with-included-gettext
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
BUILD64_LIBS_ONLY = 1
-STRIP_LIBTOOL = 1
-EXTRA_LINKER_FLAGS = -xnorunpath
+#EXTRA_LINKER_FLAGS = -xnorunpath
-#NOTE: gettext tests are sensitive to bash environment variables, make sure
-# custom paths are prefixed by $PATH, may be better to set aside
-# ~/.bashrc, etc. during build.
-#provided by iconv
MERGE_EXCLUDE_FILES = .*/charset.alias
MERGE_EXCLUDE_FILES += .*/locale.alias
MERGE_EXCLUDE_FILES += .*/iconv.m4
-MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/.*
-SHELL = /bin/bash
+COMPILE_ELISP = 1
+# Just 4 ACL tests are failing
+SKIPTEST ?= 1
+
include gar/category.mk
-PATH := /opt/csw/gnu:$(PATH)
-
#Include old libraries for compatibility with existing packages
# TODO: Convert to modulated builds
-post-install-isa-sparcv8:
+
+post-install-isa-sparcv8plus:
@mkdir $(INSTALLISADIR)/opt/csw/share/java
@mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
$(MAKECOOKIE)
@@ -209,7 +171,7 @@
@rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
$(MAKECOOKIE)
-post-install-isa-i386:
+post-install-isa-pentium_pro:
@mkdir $(INSTALLISADIR)/opt/csw/share/java
@mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
$(MAKECOOKIE)
@@ -218,19 +180,14 @@
@rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
$(MAKECOOKIE)
-post-merge:
+post-merge-all:
@echo "Setting up gnu links..."
- @(cd $(PKGROOT)$(prefix); \
- mkdir gnu; cd gnu; \
- for f in ../bin/g*; do \
- echo Linking $$f; \
- base=$$(basename $$f); \
- gln -s $$f ./$${base/g/}; \
- done )
+ ginstall -d $(DESTDIR)$(prefix)/gnu
+ $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
@echo "Fixing usr/local and usr/share references..."
@(cd $(PKGROOT); \
- find .$(docdir) .$(datadir)/aclocal -type f -print0 | \
- xargs -0 perl -pi \
+ gfind .$(docdir) .$(datadir)/aclocal -type f -print0 | \
+ gxargs -0 perl -pi \
-e "s#/usr/share#/opt/csw/share#g;" \
-e "s#/usr/local#/opt/csw#g;"; \
perl -pi \
Modified: csw/mgar/pkg/gettext/trunk/checksums
===================================================================
--- csw/mgar/pkg/gettext/trunk/checksums 2013-11-11 09:20:09 UTC (rev 22467)
+++ csw/mgar/pkg/gettext/trunk/checksums 2013-11-11 14:05:29 UTC (rev 22468)
@@ -1,3 +1 @@
-a772021542b5c511ea9542a06996ed64 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
-56f02edaf64175e69988f78bb53c8753 0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch
-3dd55b952826d2b32f51308f2f91aa89 gettext-0.18.1.1.tar.gz
+3fc808f7d25487fc72b5759df7419e02 gettext-0.18.3.1.tar.gz
Deleted: csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
===================================================================
--- csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch 2013-11-11 09:20:09 UTC (rev 22467)
+++ csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch 2013-11-11 14:05:29 UTC (rev 22468)
@@ -1,66 +0,0 @@
-From 2ecccf6cc0d6b295ce6839b3ba9a92e430b1cf7a Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Thu, 26 Aug 2010 03:44:59 +0200
-Subject: [PATCH] Use the auto-detected SHELL to run convert-archive
-
-The convert-archive script was failing on Solaris due to a nested {}
-construct that it's broken /bin/sh couldn't handle. We now force the
-use of the auto-detected POSIX-compliant SHELL to run that script.
-
-We alter both Makefile.in and Makefile.am, which makes this change
-sticky across automake invocations. We bumped this after applying Peter
-Felecan's configure changes.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- gettext-tools/misc/Makefile.am | 4 ++--
- gettext-tools/misc/Makefile.in | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/gettext-tools/misc/Makefile.am b/gettext-tools/misc/Makefile.am
-index 4147e18..14cdc93 100644
---- a/gettext-tools/misc/Makefile.am
-+++ b/gettext-tools/misc/Makefile.am
-@@ -52,7 +52,7 @@ archive.git.tar.gz: archive.dir.tar.gz
- else \
- inputfile='$(srcdir)'/archive.dir.tar.gz; \
- fi; \
-- ./convert-archive dir git "$$inputfile" $@
-+ $(SHELL) ./convert-archive dir git "$$inputfile" $@
-
- # The archive.cvs.tar.gz is generated from archive.dir.tar.gz.
- archive.cvs.tar.gz: archive.dir.tar.gz
-@@ -61,7 +61,7 @@ archive.cvs.tar.gz: archive.dir.tar.gz
- else \
- inputfile='$(srcdir)'/archive.dir.tar.gz; \
- fi; \
-- ./convert-archive dir cvs "$$inputfile" $@
-+ $(SHELL) ./convert-archive dir cvs "$$inputfile" $@
-
- # Emacs Lisp code.
-
-diff --git a/gettext-tools/misc/Makefile.in b/gettext-tools/misc/Makefile.in
-index 8d2b112..bc42b35 100644
---- a/gettext-tools/misc/Makefile.in
-+++ b/gettext-tools/misc/Makefile.in
-@@ -1533,7 +1533,7 @@ archive.git.tar.gz: archive.dir.tar.gz
- else \
- inputfile='$(srcdir)'/archive.dir.tar.gz; \
- fi; \
-- ./convert-archive dir git "$$inputfile" $@
-+ $(SHELL) ./convert-archive dir git "$$inputfile" $@
-
- # The archive.cvs.tar.gz is generated from archive.dir.tar.gz.
- archive.cvs.tar.gz: archive.dir.tar.gz
-@@ -1542,7 +1542,7 @@ archive.cvs.tar.gz: archive.dir.tar.gz
- else \
- inputfile='$(srcdir)'/archive.dir.tar.gz; \
- fi; \
-- ./convert-archive dir cvs "$$inputfile" $@
-+ $(SHELL) ./convert-archive dir cvs "$$inputfile" $@
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---
-1.7.3.2
-
Deleted: csw/mgar/pkg/gettext/trunk/files/0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch
===================================================================
--- csw/mgar/pkg/gettext/trunk/files/0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch 2013-11-11 09:20:09 UTC (rev 22467)
+++ csw/mgar/pkg/gettext/trunk/files/0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch 2013-11-11 14:05:29 UTC (rev 22468)
@@ -1,32 +0,0 @@
-From f07d0231074a94edc074f4732d4fd979faad3829 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Mon, 30 Aug 2010 02:48:17 +0200
-Subject: [PATCH] Update ltmain.sh to prevent libtool stripping runpath options
-
-Libtool was stripping some or all of the -xnorunpath and -norunpath
-options at various points during the compilation of libasprintf.
-This prevents that from happening so we don't get things like:
-/opt/SUNWspro/lib/rw7:/opt/SUNWspro/lib/v8:/opt/SUNWspro/lib in the
-R{,UN}PATH variables of the library header.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- build-aux/ltmain.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
-index 0dd6f3a..5cab855 100644
---- a/build-aux/ltmain.sh
-+++ b/build-aux/ltmain.sh
-@@ -4901,7 +4901,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-xnorunpath|-norunpath)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
---
-1.7.1
-
Deleted: csw/mgar/pkg/gettext/trunk/files/0003-Patch-around-thread-handling-differences-between-9-a.patch
===================================================================
--- csw/mgar/pkg/gettext/trunk/files/0003-Patch-around-thread-handling-differences-between-9-a.patch 2013-11-11 09:20:09 UTC (rev 22467)
+++ csw/mgar/pkg/gettext/trunk/files/0003-Patch-around-thread-handling-differences-between-9-a.patch 2013-11-11 14:05:29 UTC (rev 22468)
@@ -1,209 +0,0 @@
-From 7b7e1cd6f404e2f397192a32c305039be558ee42 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Mon, 31 Jan 2011 04:37:26 +0100
-Subject: [PATCH] Patch around thread handling differences between 9 and 10
-
-Apply Peter Felecan's patches that avoid some issues with thread
-handling. Solaris 10 handles things properly where 9 didn't. If
-built on 9 but run on 10, change behaviours to work correctly.
-
-Issue detailed here:
-http://lists.opencsw.org/pipermail/maintainers/2011-January/013668.html
-
-Upstream bug filed here:
-http://savannah.gnu.org/bugs/?32087
-
-(This is two original patches merged to one.)
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- gettext-runtime/intl/threadlib.c | 36 +++++++++++++++++++++++
- gettext-runtime/m4/threadlib.m4 | 4 +-
- gettext-tools/gnulib-lib/glthread/threadlib.c | 36 +++++++++++++++++++++++
- gettext-tools/libgettextpo/glthread/threadlib.c | 36 +++++++++++++++++++++++
- 4 files changed, 110 insertions(+), 2 deletions(-)
-
-diff --git a/gettext-runtime/intl/threadlib.c b/gettext-runtime/intl/threadlib.c
-index cb4fe4f..04017e1 100644
---- a/gettext-runtime/intl/threadlib.c
-+++ b/gettext-runtime/intl/threadlib.c
-@@ -30,6 +30,9 @@
- # include <stdlib.h>
-
- # if PTHREAD_IN_USE_DETECTION_HARD
-+#include <strings.h>
-+#include <errno.h>
-+#include <sys/utsname.h>
-
- /* The function to be executed by a dummy thread. */
- static void *
-@@ -44,6 +47,39 @@ glthread_in_use (void)
- static int tested;
- static int result; /* 1: linked with -lpthread, 0: only with libc */
-
-+ /* dynamic detection for running on Solaris 5.10 or higher; starting
-+ * with Solaris 10 the libc resolves correctly the POSIX threads
-+ * symbols. */
-+ if (!tested)
-+ {
-+ struct utsname un;
-+ if(uname(&un) != -1)
-+ {
-+ if(strcmp(un.sysname, "SunOS") == 0)
-+ {
-+ char* dot = strchr(un.release, '.');
-+ errno = 0;
-+ if(dot != (char*)0)
-+ {
-+ int minor = atoi(dot + 1);
-+ *dot = '\0';
-+ if(!errno)
-+ {
-+ int major = atoi(un.release);
-+ if(!errno)
-+ {
-+ if(major >= 5 && minor >= 10)
-+ {
-+ tested = 1;
-+ result = 1;
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+
- if (!tested)
- {
- pthread_t thread;
-diff --git a/gettext-runtime/m4/threadlib.m4 b/gettext-runtime/m4/threadlib.m4
-index 05cc4ff..b2b801b 100644
---- a/gettext-runtime/m4/threadlib.m4
-+++ b/gettext-runtime/m4/threadlib.m4
-@@ -159,12 +159,12 @@ int main ()
- # need to link with libpthread in order to create multiple threads.
- AC_CHECK_LIB([pthread], [pthread_kill],
- [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-- # On Solaris and HP-UX, most pthread functions exist also in libc.
-+ # On Solaris < 2.10 and HP-UX, most pthread functions exist also in libc.
- # Therefore pthread_in_use() needs to actually try to create a
- # thread: pthread_create from libc will fail, whereas
- # pthread_create will actually create a thread.
- case "$host_os" in
-- solaris* | hpux*)
-+ solaris2.[1-9] | solaris2.[1-9].* | hpux*)
- AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
- [Define if the pthread_in_use() detection is hard.])
- esac
-diff --git a/gettext-tools/gnulib-lib/glthread/threadlib.c b/gettext-tools/gnulib-lib/glthread/threadlib.c
-index 292e6a5..2abc79d 100644
---- a/gettext-tools/gnulib-lib/glthread/threadlib.c
-+++ b/gettext-tools/gnulib-lib/glthread/threadlib.c
-@@ -29,6 +29,9 @@
- # include <stdlib.h>
-
- # if PTHREAD_IN_USE_DETECTION_HARD
-+#include <strings.h>
-+#include <errno.h>
-+#include <sys/utsname.h>
-
- /* The function to be executed by a dummy thread. */
- static void *
-@@ -43,6 +46,39 @@ glthread_in_use (void)
- static int tested;
- static int result; /* 1: linked with -lpthread, 0: only with libc */
-
-+ /* dynamic detection for running on Solaris 5.10 or higher; starting
-+ * with Solaris 10 the libc resolves correctly the POSIX threads
-+ * symbols. */
-+ if (!tested)
-+ {
-+ struct utsname un;
-+ if(uname(&un) != -1)
-+ {
-+ if(strcmp(un.sysname, "SunOS") == 0)
-+ {
-+ char* dot = strchr(un.release, '.');
-+ errno = 0;
-+ if(dot != (char*)0)
-+ {
-+ int minor = atoi(dot + 1);
-+ *dot = '\0';
-+ if(!errno)
-+ {
-+ int major = atoi(un.release);
-+ if(!errno)
-+ {
-+ if(major >= 5 && minor >= 10)
-+ {
-+ tested = 1;
-+ result = 1;
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+
- if (!tested)
- {
- pthread_t thread;
-diff --git a/gettext-tools/libgettextpo/glthread/threadlib.c b/gettext-tools/libgettextpo/glthread/threadlib.c
-index 292e6a5..2abc79d 100644
---- a/gettext-tools/libgettextpo/glthread/threadlib.c
-+++ b/gettext-tools/libgettextpo/glthread/threadlib.c
-@@ -29,6 +29,9 @@
- # include <stdlib.h>
-
- # if PTHREAD_IN_USE_DETECTION_HARD
-+#include <strings.h>
-+#include <errno.h>
-+#include <sys/utsname.h>
-
- /* The function to be executed by a dummy thread. */
- static void *
-@@ -43,6 +46,39 @@ glthread_in_use (void)
- static int tested;
- static int result; /* 1: linked with -lpthread, 0: only with libc */
-
-+ /* dynamic detection for running on Solaris 5.10 or higher; starting
-+ * with Solaris 10 the libc resolves correctly the POSIX threads
-+ * symbols. */
-+ if (!tested)
-+ {
-+ struct utsname un;
-+ if(uname(&un) != -1)
-+ {
-+ if(strcmp(un.sysname, "SunOS") == 0)
-+ {
-+ char* dot = strchr(un.release, '.');
-+ errno = 0;
-+ if(dot != (char*)0)
-+ {
-+ int minor = atoi(dot + 1);
-+ *dot = '\0';
-+ if(!errno)
-+ {
-+ int major = atoi(un.release);
-+ if(!errno)
-+ {
-+ if(major >= 5 && minor >= 10)
-+ {
-+ tested = 1;
-+ result = 1;
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+
- if (!tested)
- {
- pthread_t thread;
---
-1.7.3.2
-
Deleted: csw/mgar/pkg/gettext/trunk/files/CSWggettext.cswreleasenotes
===================================================================
--- csw/mgar/pkg/gettext/trunk/files/CSWggettext.cswreleasenotes 2013-11-11 09:20:09 UTC (rev 22467)
+++ csw/mgar/pkg/gettext/trunk/files/CSWggettext.cswreleasenotes 2013-11-11 14:05:29 UTC (rev 22468)
@@ -1 +0,0 @@
-usr/local references: stock checks in aclocal inputs.
Deleted: csw/mgar/pkg/gettext/trunk/files/CSWggettextdoc.cswreleasenotes
===================================================================
--- csw/mgar/pkg/gettext/trunk/files/CSWggettextdoc.cswreleasenotes 2013-11-11 09:20:09 UTC (rev 22467)
+++ csw/mgar/pkg/gettext/trunk/files/CSWggettextdoc.cswreleasenotes 2013-11-11 14:05:29 UTC (rev 22468)
@@ -1 +0,0 @@
-usr/local, usr/share references: samples, overridden
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.14.1.so.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.14.1.so.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.14.1.so.s9
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.amd64
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextlib-0.17.so.s9
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.amd64
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextpo.so.0.4.0.s9
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.amd64
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libgettextsrc-0.17.so.s9
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.2.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.2.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.2.s9
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.3.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.3.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.3.s9
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.amd64.keep
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.i.keep
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s.keep
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/libintl.so.8.0.2.s9.keep
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/gettext/trunk/files/test-wcwidth.patch
===================================================================
--- csw/mgar/pkg/gettext/trunk/files/test-wcwidth.patch 2013-11-11 09:20:09 UTC (rev 22467)
+++ csw/mgar/pkg/gettext/trunk/files/test-wcwidth.patch 2013-11-11 14:05:29 UTC (rev 22468)
@@ -1,51 +0,0 @@
---- gettext-0.17/gettext-tools/gnulib-tests/test-wcwidth.c 2007-10-22 19:42:40.000000000 -0500
-+++ ../../../test-wcwidth.c 2009-01-31 21:29:03.000000000 -0600
-@@ -1,5 +1,5 @@
- /* Test of wcwidth() function.
-- Copyright (C) 2007 Free Software Foundation, Inc.
-+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -23,6 +23,9 @@
- #include <locale.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
-+
-+#include "localcharset.h"
-
- #define ASSERT(expr) \
- do \
-@@ -30,6 +33,7 @@
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-+ fflush (stderr); \
- abort (); \
- } \
- } \
-@@ -45,7 +49,13 @@
- ASSERT (wcwidth (wc) == 1);
-
- /* Switch to an UTF-8 locale. */
-- if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-+ if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL
-+ /* Check whether it's really an UTF-8 locale.
-+ On OpenBSD 4.0, the setlocale call succeeds only for the LC_CTYPE
-+ category and therefore returns "C/fr_FR.UTF-8/C/C/C/C", but the
-+ LC_CTYPE category is effectively set to an ASCII LC_CTYPE category;
-+ in particular, locale_charset() returns "ASCII". */
-+ && strcmp (locale_charset (), "UTF-8") == 0)
- {
- /* Test width of ASCII characters. */
- for (wc = 0x20; wc < 0x7F; wc++)
-@@ -57,7 +67,7 @@
-
- /* Test width of some format control characters. */
- ASSERT (wcwidth (0x200E) <= 0);
-- ASSERT (wcwidth (0x2060) == 0);
-+ ASSERT (wcwidth (0x2060) <= 0);
- #if 0 /* wchar_t may be only 16 bits. */
- ASSERT (wcwidth (0xE0001) <= 0);
- ASSERT (wcwidth (0xE0044) <= 0);
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