[csw-devel] SF.net SVN: gar:[13793] csw/mgar/pkg/libiconv/trunk

[dmichelsen at users.sourceforge.net]

Revision: 13793
          http://gar.svn.sourceforge.net/gar/?rev=13793&view=rev
Author:   dmichelsen
Date:     2011-03-14 12:28:32 +0000 (Mon, 14 Mar 2011)

Log Message:
-----------
libiconv: Work towards package split, has checkpkg issues

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

Modified: csw/mgar/pkg/libiconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile	2011-03-14 12:02:31 UTC (rev 13792)
+++ csw/mgar/pkg/libiconv/trunk/Makefile	2011-03-14 12:28:32 UTC (rev 13793)
@@ -25,11 +25,32 @@
 # Package naming is a bit unfortunate CSWiconv vs. libiconv :/ but
 # that's not something i want to change right now. CSWiconv has
 # heaps of dependents.
-PACKAGES = CSWiconv
-CATALOGNAME_CSWiconv = libiconv
+#PACKAGES = CSWiconv
+#CATALOGNAME_CSWiconv = libiconv
 
-# The current 1.12 only has a 32-Bit iconv binary, leave it that way
-EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/bin/.*/iconv
+PACKAGES += CSWlibiconv2
+CATALOGNAME_CSWlibiconv2 = libiconv2
+SPKG_DESC_CSWlibiconv2 = GNU iconv library, libiconv.so.2
+PKGFILES_CSWlibiconv2 += $(call pkgfiles_lib,libiconv.so.2)
+PKGFILES_CSWlibiconv2 += $(libdir)/preloadable_libiconv.so
+
+PACKAGES += CSWlibcharset1
+CATALOGNAME_CSWlibcharset1 = libcharset1
+SPKG_DESC_CSWlibcharset1 = GNU iconv charset library, libcharset.so.1
+PKGFILES_CSWlibcharset1 += $(call pkgfiles_lib,libcharset.so.1)
+# Now *this* time it is ok, iconv is the only package that is allowed to ship this!
+CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path|opt/csw/lib/charset.alias
+PKGFILES_CSWlibcharset1 += $(libdir)/charset.alias
+
+PACKAGES += CSWlibiconv-utils
+CATALOGNAME_CSWlibiconv-utils = libiconv_utils
+SPKG_DESC_CSWlibiconv-utils = GNU iconv utility programs
+PKGFILES_CSWlibiconv-utils += $(bindir)/.*
+PKGFILES_CSWlibiconv-utils += .*iconv\.1.*
+RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibcharset1
+OBSOLETES_CSWlibiconv-utils = CSWiconv
+
 NOISAEXEC = 1
 BUILD64 = 1
 
@@ -59,6 +80,8 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-rpath
 
+MERGE_DIRS_isa-extra = $(libdir)
+
 include gar/category.mk
 
 post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME)

Modified: csw/mgar/pkg/libiconv/trunk/checksums
===================================================================
--- csw/mgar/pkg/libiconv/trunk/checksums	2011-03-14 12:02:31 UTC (rev 13792)
+++ csw/mgar/pkg/libiconv/trunk/checksums	2011-03-14 12:28:32 UTC (rev 13793)
@@ -1,2 +1 @@
-7ab33ebd26687c744a37264a330bbe9a  download/libiconv-1.13.1.tar.gz
-9c66308f6f3bfe70afc4fc67c07d7de3  download/patch-configure-stdbool.diff
+7ab33ebd26687c744a37264a330bbe9a  libiconv-1.13.1.tar.gz


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