[csw-devel] SF.net SVN: gar:[12993] csw/mgar/pkg/gettext/trunk/Makefile

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Tue Jan 18 04:37:11 CET 2011 

Revision: 12993
          http://gar.svn.sourceforge.net/gar/?rev=12993&view=rev
Author:   bdwalton
Date:     2011-01-18 03:37:11 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
gettext/trunk: rip out package splitting and start over with just gettext and gettextdoc

Modified Paths:
--------------
    csw/mgar/pkg/gettext/trunk/Makefile

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2011-01-18 01:48:29 UTC (rev 12992)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2011-01-18 03:37:11 UTC (rev 12993)
@@ -7,39 +7,12 @@
 	GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages
 endef
 
-PACKAGES = CSWggettextrt CSWggettextdoc CSWggettext
-PACKAGES += CSWlibasprintf0 CSWlibgettextlib0-14-1 CSWlibgettextlib0-17
-PACKAGES += CSWlibgettextlib0-18-1 CSWlibgettextpo0 CSWlibgettextsrc0-17
-PACKAGES += CSWlibgettextsrc0-18-1 CSWlibintl2 CSWlibintl3 CSWlibintl8
+PACKAGES += CSWggettext CSWggettextdoc
 
-ARCHALL_CSWggettextel = 1
-
 CATALOGNAME_CSWggettext = ggettext
-CATALOGNAME_CSWggettextdoc = ggettextdoc
-CATALOGNAME_CSWggettextrt = ggettextrt
-CATALOGNAME_CSWlibasprintf0 = libasprintf0
-CATALOGNAME_CSWlibgettextlib0-14-1 = libgettextlib0_14_1
-CATALOGNAME_CSWlibgettextlib0-17 = libgettextlib0_17
-CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1
-CATALOGNAME_CSWlibgettextpo0 = libgettextpo0
-CATALOGNAME_CSWlibgettextsrc0-17 = libgettextsrc0_17
-CATALOGNAME_CSWlibgettextsrc0-18-1 = libgettextsrc0_18_1
-CATALOGNAME_CSWlibintl2 = libintl2
-CATALOGNAME_CSWlibintl3 = libintl3
-CATALOGNAME_CSWlibintl8 = libintl8
-SPKG_DESC_CSWggettext = GNU locale utilities and development headers
-SPKG_DESC_CSWggettextdoc = GNU locale documentation
-SPKG_DESC_CSWggettextrt = GNU locale runtime
-SPKG_DESC_CSWlibasprintf0 = GNU locale runtime, libasprintf.so.0
-SPKG_DESC_CSWlibgettextlib0-14-1 += GNU locale runtime, libgettextlib-0.14.1.so
-SPKG_DESC_CSWlibgettextlib0-17 += GNU locale runtime, libgettextlib-0.17.so
-SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale runtime, libgettextlib-0.18.1.so
-SPKG_DESC_CSWlibgettextpo0 += GNU locale runtime, libgettextpo.so.0
-SPKG_DESC_CSWlibgettextsrc0-17 += GNU locale runtime, libgettextsrc-0.17.so
-SPKG_DESC_CSWlibgettextsrc0-18-1 += GNU locale runtime, libgettextsrc-0.18.1.so
-SPKG_DESC_CSWlibintl2 += GNU locale runtime, libintl.so.2
-SPKG_DESC_CSWlibintl3 += GNU locale runtime, libintl.so.3
-SPKG_DESC_CSWlibintl8 += GNU locale runtime, libintl.so.8
+CATALOGNAME_CSWggettext = ggettextdoc
+SPKG_DESC_CSWggettext = GNU locale utilities
+SPKG_DESC_CSWggettextdoc = GNU locale utility documentation
 
 ARCHALL_CSWggettextdoc = 1
 
@@ -66,16 +39,10 @@
 NOISAEXEC = 1
 STRIP_LIBTOOL = 1
 
-RUNTIME_DEP_PKGS_CSWggettextrt = CSWlibgettextlib0-14-1
-RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl2 CSWlibintl3 CSWlibintl8
-RUNTIME_DEP_PKGS_CSWggettext = CSWiconv CSWexpat CSWncurses CSWlibxml2
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextpo0 CSWlibgettextsrc0-18-1
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-1 CSWlibintl8
 RUNTIME_DEP_PKGS_CSWggettextdoc = CSWggettext
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2 CSWncurses CSWiconv
-RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibintl8 += CSWiconv
 
+PKGFILES_CSWggettextdoc = $(PKGFILES_DOC)
+
 #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.
@@ -87,44 +54,6 @@
 MERGE_EXCLUDE_FILES += .*/iconv.m4
 MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/.*
 
-#This syntaxt skips 64-bit for some reason
-#PKGFILES_CSWggettextrt  = $(call baseisadirs,$(libdir),libintl\..*)
-#PKGFILES_CSWggettextrt += $(call baseisadirs,$(libdir),libasprintf\..*)
-#PKGFILES_CSWggettextrt += $(call baseisadirs,$(libdir),libgettextpo\..*) 
-PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0(\.\d+)*)
-PKGFILES_CSWlibgettextlib0-14-1 += $(call baseisadirs,$(libdir),libgettextlib-0.14\.1\.so)
-PKGFILES_CSWlibgettextlib0-14-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.14\.1\.so(\.\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_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.4\.0)
-PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0(\.\d+)*)
-PKGFILES_CSWlibgettextsrc0-17 += $(call baseisadirs,$(libdir),libgettextsrc-0\.17\.so)
-PKGFILES_CSWlibgettextsrc0-17 += $(call baseisadirs,$(libdir),libgettextsrc-0\.17\.so(\.\d+)*)
-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_CSWlibintl2 += $(call baseisadirs,$(libdir),libintl\.so\.2)
-PKGFILES_CSWlibintl2 += $(call baseisadirs,$(libdir),libintl\.so\.2(\.\d+)*)
-PKGFILES_CSWlibintl3 += $(call baseisadirs,$(libdir),libintl\.so\.3)
-PKGFILES_CSWlibintl3 += $(call baseisadirs,$(libdir),libintl\.so\.3(\.\d+)*)
-PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.0\.2)
-PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8(\.\d+)*)
-PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.1\.1)
-PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8(\.\d+)*)
-
-#so use this for now
-PKGFILES_CSWggettextdoc  = $(PKGFILES_DOC)
-
-CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWggettextdoc += surplus-dependency|CSWggettext
-CHECKPKG_OVERRIDES_CSWggettextel += surplus-dependency|CSWggettext
-# This lib is legacy from the old versions and can't be updated (easily)
-CHECKPKG_OVERRIDES_CSWggettext += bad-rpath-entry|/export/home/phil/build/gettext-0.14.1/gettext-tools/intl/.libs|opt/csw/lib/sparcv9/libgettextlib-0.14.1.so 
-# A few more legacy libs that we can't update.
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextsrc-0.17.so
-CHECKPKG_OVERRIDES_CSWlibgettextpo0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0
-# just until checkpkg doesn't squawk about this.
-CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacscommon
-
 SHELL = /bin/bash
 
 include gar/category.mk


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