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

skayser at users.sourceforge.net skayser at users.sourceforge.net
Fri Jul 31 11:43:04 CEST 2009


Revision: 5766
          http://gar.svn.sourceforge.net/gar/?rev=5766&view=rev
Author:   skayser
Date:     2009-07-31 09:43:01 +0000 (Fri, 31 Jul 2009)

Log Message:
-----------
libiconv: reverted to 5618, branched re-packaging attempt for future usage

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

Added Paths:
-----------
    csw/mgar/pkg/libiconv/branches/sync-pkgname/
    csw/mgar/pkg/libiconv/branches/sync-pkgname/Makefile
    csw/mgar/pkg/libiconv/branches/sync-pkgname/checksums
    csw/mgar/pkg/libiconv/branches/sync-pkgname/files/CSWiconv.README
    csw/mgar/pkg/libiconv/branches/sync-pkgname/files/patch-configure-stdbool.diff
    csw/mgar/pkg/libiconv/trunk/files/changelog.CSW

Removed Paths:
-------------
    csw/mgar/pkg/libiconv/branches/sync-pkgname/Makefile
    csw/mgar/pkg/libiconv/branches/sync-pkgname/checksums

Deleted: csw/mgar/pkg/libiconv/branches/sync-pkgname/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile	2009-06-27 23:16:20 UTC (rev 5396)
+++ csw/mgar/pkg/libiconv/branches/sync-pkgname/Makefile	2009-07-31 09:43:01 UTC (rev 5766)
@@ -1,152 +0,0 @@
-GARNAME = libiconv
-GARVERSION = 1.12
-CATEGORIES = lib
-
-GETTEXTNAME = gettext
-GETTEXTVERSION = 0.17
-
-DESCRIPTION = GNU iconv library
-define BLURB
-endef
-
-MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(GETTEXTNAME)-$(GETTEXTVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWlibiconv,)
-
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
-# Work around Sun Studio Preprocessor bug #6655406
-#   http://sunsolve.sun.com/search/document.do?assetkey=1-1-6655406-1
-PATCHFILES = patch-workaround-cc-bug-6655406.diff
-
-# BUILD64 = 1
-
-GETTEXTDISTNAME = $(GETTEXTNAME)-$(GETTEXTVERSION)
-
-default: build
-	$(DONADA)
-
-# -- Bootstrap --
-# There may not be a working gettext installation on the build system.
-# For a fully working libiconv it must be compiled against gettext which
-# itself has been compiled against libiconv. The bootstrap-compile is
-# therefore done in three steps:
-# 1. standalone libiconv
-# 2. gettext with newly build libiconv
-# 3. libiconv again with fully build gettext
-
-BOOTSTRAPDIR = $(WORKDIR)/bootstrap
-BOOTSTRAPCOOKIEDIR = $(BOOTSTRAPDIR)/cookies
-BOOTSTRAPBUILDDIR = $(BOOTSTRAPDIR)/build
-BOOTSTRAPINSTALLDIR = $(abspath $(BOOTSTRAPDIR)/instroot)
-
-# Extract libiconv and gettext for bootstrap and apply patches
-extract-bootstrap:
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-	EXTRACTDIR=$(BOOTSTRAPBUILDDIR)							\
-		$(MAKE) extract
-	$(MAKECOOKIE)
-
-patch-libiconv: extract-bootstrap
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-	WORKSRC=$(BOOTSTRAPBUILDDIR)/$(DISTNAME)					\
-		$(MAKE) patch
-	$(MAKECOOKIE)
-
-configure-libiconv: patch-libiconv
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-	CONFIGURE_ARGS="--prefix=$(BOOTSTRAPINSTALLDIR) --disable-nls"			\
-		$(MAKE) configure-$(BOOTSTRAPBUILDDIR)/$(DISTNAME)/configure
-	$(MAKECOOKIE)
-
-build-libiconv: configure-libiconv
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-		$(MAKE) build-$(BOOTSTRAPBUILDDIR)/$(DISTNAME)/Makefile
-	$(MAKECOOKIE)
-
-test-libiconv: build-libiconv
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-		$(MAKE) test-$(BOOTSTRAPBUILDDIR)/$(DISTNAME)/Makefile
-	$(MAKECOOKIE)
-
-install-libiconv: test-libiconv
-	cd $(BOOTSTRAPBUILDDIR)/$(DISTNAME) &&						\
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-		$(MAKE) install
-	$(MAKECOOKIE)
-
-
-patch-gettext: extract-bootstrap
-	@$(MAKECOOKIE)
-
-configure-gettext: install-libiconv patch-gettext
-	@# Add -lsec, otherweise acl_trivial can not be found
-	@# See gettext bug #21604 for details
-	@#   http://savannah.gnu.org/bugs/?21604
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-		$(MAKE) configure-$(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME)/configure	\
-			 LDFLAGS=-lsec base_prefix=$(BOOTSTRAPINSTALLDIR)
-	@$(MAKECOOKIE)
-
-build-gettext: configure-gettext
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-	$(MAKE) build-$(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME)/Makefile
-	@$(MAKECOOKIE)
-
-test-gettext: build-gettext
-	if [ -z "${SKIPTEST}" ]; then							\
-		cd $(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME) && gmake check;		\
-	fi
-	@$(MAKECOOKIE)
-
-install-gettext: test-gettext
-	cd $(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME) &&					\
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-		$(MAKE) install
-	@$(MAKECOOKIE)
-
-clean-source-gettext:
-	cd $(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME) &&					\
-	COOKIEDIR=$(BOOTSTRAPCOOKIEDIR)							\
-		gmake clean
-	-rm $(COOKIEDIR)/configure-gettext
-	-rm $(BOOTSTRAPCOOKIEDIR)/configure-$(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME)/configure
-	
-bootstrap: install-libiconv install-gettext
-	@$(MAKECOOKIE)
-
-pre-configure: bootstrap
-
-# Don't use libs in /opt/csw/lib or old libiconv.so will get picked up
-EXT_LDFLAGS =
-EXTRA_CFLAGS = -I$(BOOTSTRAPINSTALLDIR)/include
-EXTRA_LDFLAGS = -L$(BOOTSTRAPINSTALLDIR)/lib
-CONFIGURE_ARGS ?= $(DIRPATHS)
-
-# 'gmake test' shows three errors of coredumping printf's
-# This is due to bug #6550204
-#   http://sunsolve.sun.com/search/document.do?assetkey=1-1-6550204-1
-# and can safely be ignored as it is a failure in the testsuite.
-TEST_TARGET = check
-
-CLEAN_SCRIPTS = all bootstrap
-
-clean-bootstrap:
-	@echo " ==> Cleaning bootstrap"
-	@rm -rf $(BOOTSTRAPDIR)
-
-include gar/category.mk
-
-# Bootstrap:
-#   # Use gxgettext instead of xgettext, gmsgmerge instead of msgmerge
-#   PATH=/opt/csw/gnu:$PATH
-#   cd libiconv-1.12
-#   ./configure --prefix=/root/automatic-multiarch-compile/lib/libiconv/tmp/instroot --disable-nls
-#   gmake && gmake install
-#   cd ../gettext-0.17
-#   # Add -lsec, otherweise acl_trivial can not be found
-#   # See bug #21604 for details
-#   #   http://savannah.gnu.org/bugs/?21604
-#   LDFLAGS=-lsec ./configure --prefix=/root/automatic-multiarch-compile/lib/libiconv/tmp/instroot
-#   gmake && gmake install

Copied: csw/mgar/pkg/libiconv/branches/sync-pkgname/Makefile (from rev 5647, csw/mgar/pkg/libiconv/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/libiconv/branches/sync-pkgname/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libiconv/branches/sync-pkgname/Makefile	2009-07-31 09:43:01 UTC (rev 5766)
@@ -0,0 +1,97 @@
+# Right now we have liciconv as CSWiconv. This could be an attempt to
+# synchronize the pkgname to the upstream name of libiconv. At the
+# time of writing there were other bits and pieces of the OpenCSW
+# stack breaking, so this potential disruptive attempt was postponed.
+#
+# For a short discussion see:
+# http://lists.opencsw.org/pipermail/maintainers/2009-July/003406.html
+#
+GARNAME = libiconv
+GARVERSION = 1.13.1
+CATEGORIES = lib
+
+DESCRIPTION = GNU iconv library
+define BLURB
+  Some programs, like mailers and web browsers, must be able to convert
+  between a given text encoding and the user's encoding. Other programs
+  internally store strings in Unicode, to facilitate internal processing,
+  and need to convert between internal string representation (Unicode) and
+  external string representation (a traditional encoding) when they are
+  doing I/O. GNU libiconv is a conversion library for both kinds of
+  applications. 
+endef
+
+MASTER_SITES = $(GNU_MIRROR)
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# We have to take care of the package naming. We once had CSWiconv
+# (pkgname) as libiconv (software name). Now we have a consistent
+# naming but still need to provide CSWiconv as a depencies-only
+# package.
+PACKAGES = CSWlibiconv CSWlibiconvdevel CSWiconv
+
+CATALOGNAME_CSWlibiconv = libiconv
+CATALOGNAME_CSWlibiconvdevel = libiconv_devel
+CATALOGNAME_CSWiconv = iconv
+
+SPKG_DESC_CSWlibiconv = GNU iconv library
+SPKG_DESC_CSWlibiconvdevel = GNU iconv library development package
+SPKG_DESC_CSWiconv = GNU iconv library - meta package (deprecated)
+
+# CSWiconv is a dependencies-only pkg
+PKGFILES_CSWiconv = $(docdir)/iconv/README.CSW
+
+# Devel files in _devel pkg, remaining files go into CSWlibiconv
+PKGFILES_CSWlibiconvdevel = $(PKGFILES_DEVEL) .*.3.html
+
+# Dependencies:
+#  Some of the utility programs 'depend' on ggettext.
+#  But DO NOT put CSWggettext in depend, or it will break things!!!
+#  Read: Circular dependency between ggettextrt and libiconv
+
+REQUIRED_PKGS_CSWlibiconvdevel = CSWlibiconv
+REQUIRED_PKGS_CSWiconv = CSWlibiconv CSWlibiconvdevel
+
+# CSWiconv depends on CSWlibiconv which we don't have yet
+ENABLE_CHECK = 0
+
+# The current 1.12 only has a 32-Bit iconv binary, leave it that way
+EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/bin/.*/iconv
+NO_ISAEXEC = 1
+BUILD64 = 1
+
+# Optimize. -fast causes ./configure on Sparc to hang on the stdbool.h test.
+# Patch the stdbool test away, stdbool is only available in C99 anyway.
+#
+# See the following posts for details
+# - http://lists.opencsw.org/pipermail/maintainers/2009-July/003152.html
+# - http://forums.sun.com/thread.jspa?threadID=5397065&tstart=0
+OPT_FLAGS_SOS = -fast -xnolibmopt
+PATCHFILES += patch-configure-stdbool.diff
+
+# 'gmake test' shows three errors of coredumping printf's
+#
+#   ./check-translitfailure . TranslitFail1 ISO-8859-1 ASCII
+#   ./check-subst
+#   Segmentation Fault - core dumped
+#   Segmentation Fault - core dumped
+#   Segmentation Fault - core dumped
+#   ./test-shiftseq
+#
+# This is due to bug #6550204
+#   http://sunsolve.sun.com/search/document.do?assetkey=1-1-6550204-1
+# and can safely be ignored as it is a failure in the testsuite.
+TEST_TARGET = check
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-rpath
+
+include gar/category.mk
+
+post-install-modulated:
+	ginstall -D $(WORKSRC)/srcm4/iconv.m4 \
+		$(DESTDIR)$(datadir)/aclocal/iconv.m4
+	ginstall -D $(FILEDIR)/CSWiconv.README \
+		$(DESTDIR)$(docdir)/iconv/README.CSW
+	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/libiconv/branches/sync-pkgname/checksums
===================================================================
--- csw/mgar/pkg/libiconv/trunk/checksums	2009-06-27 23:16:20 UTC (rev 5396)
+++ csw/mgar/pkg/libiconv/branches/sync-pkgname/checksums	2009-07-31 09:43:01 UTC (rev 5766)
@@ -1,4 +0,0 @@
-c2be282595751535a618ae0edeb8f648  download/libiconv-1.12.tar.gz
-58a2bc6d39c0ba57823034d55d65d606  download/gettext-0.17.tar.gz
-84ac87a6e3e82a6749815d030f9f966c  download/CSWlibiconv.gspec
-8a4c4cc08a021936cb72538b6e26ce61  download/patch-workaround-cc-bug-6655406.diff

Copied: csw/mgar/pkg/libiconv/branches/sync-pkgname/checksums (from rev 5618, csw/mgar/pkg/libiconv/trunk/checksums)
===================================================================
--- csw/mgar/pkg/libiconv/branches/sync-pkgname/checksums	                        (rev 0)
+++ csw/mgar/pkg/libiconv/branches/sync-pkgname/checksums	2009-07-31 09:43:01 UTC (rev 5766)
@@ -0,0 +1,2 @@
+7ab33ebd26687c744a37264a330bbe9a  download/libiconv-1.13.1.tar.gz
+9c66308f6f3bfe70afc4fc67c07d7de3  download/patch-configure-stdbool.diff

Copied: csw/mgar/pkg/libiconv/branches/sync-pkgname/files/CSWiconv.README (from rev 5645, csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README)
===================================================================
--- csw/mgar/pkg/libiconv/branches/sync-pkgname/files/CSWiconv.README	                        (rev 0)
+++ csw/mgar/pkg/libiconv/branches/sync-pkgname/files/CSWiconv.README	2009-07-31 09:43:01 UTC (rev 5766)
@@ -0,0 +1,3 @@
+Note: iconv is a transitional meta-package that pulls in libiconv and 
+libiconvdevel. Please consider switching to one or both of these pkgs
+as iconv may be dropped in the future.

Copied: csw/mgar/pkg/libiconv/branches/sync-pkgname/files/patch-configure-stdbool.diff (from rev 5618, csw/mgar/pkg/libiconv/trunk/files/patch-configure-stdbool.diff)
===================================================================
--- csw/mgar/pkg/libiconv/branches/sync-pkgname/files/patch-configure-stdbool.diff	                        (rev 0)
+++ csw/mgar/pkg/libiconv/branches/sync-pkgname/files/patch-configure-stdbool.diff	2009-07-31 09:43:01 UTC (rev 5766)
@@ -0,0 +1,135 @@
+diff --speed-large-files --minimal -Nru libiconv-1.13.orig/configure libiconv-1.13/configure
+--- libiconv-1.13.orig/configure	2009-03-26 13:10:59.000000000 +0100
++++ libiconv-1.13/configure	2009-07-18 15:01:23.206092991 +0200
+@@ -20233,121 +20233,6 @@
+   REPLACE_GETLINE=0;
+   REPLACE_PERROR=0;
+ 
+-{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
+-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+-if test "${ac_cv_header_stdbool_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-	  #include <stdbool.h>
+-	  #ifndef bool
+-	   "error: bool is not defined"
+-	  #endif
+-	  #ifndef false
+-	   "error: false is not defined"
+-	  #endif
+-	  #if false
+-	   "error: false is not 0"
+-	  #endif
+-	  #ifndef true
+-	   "error: true is not defined"
+-	  #endif
+-	  #if true != 1
+-	   "error: true is not 1"
+-	  #endif
+-	  #ifndef __bool_true_false_are_defined
+-	   "error: __bool_true_false_are_defined is not defined"
+-	  #endif
+-
+-	  struct s { _Bool s: 1; _Bool t; } s;
+-
+-	  char a[true == 1 ? 1 : -1];
+-	  char b[false == 0 ? 1 : -1];
+-	  char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+-	  char d[(bool) 0.5 == true ? 1 : -1];
+-	  bool e = &s;
+-	  char f[(_Bool) 0.0 == false ? 1 : -1];
+-	  char g[true];
+-	  char h[sizeof (_Bool)];
+-	  char i[sizeof s.t];
+-	  enum { j = false, k = true, l = false * true, m = true * 256 };
+-	  _Bool n[m];
+-	  char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+-	  char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+-	  #if defined __xlc__ || defined __GNUC__
+-	   /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+-	      reported by James Lemley on 2005-10-05; see
+-	      http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+-	      This test is not quite right, since xlc is allowed to
+-	      reject this program, as the initializer for xlcbug is
+-	      not one of the forms that C requires support for.
+-	      However, doing the test right would require a run-time
+-	      test, and that would make cross-compilation harder.
+-	      Let us hope that IBM fixes the xlc bug, and also adds
+-	      support for this kind of constant expression.  In the
+-	      meantime, this test will reject xlc, which is OK, since
+-	      our stdbool.h substitute should suffice.  We also test
+-	      this with GCC, where it should work, to detect more
+-	      quickly whether someone messes up the test in the
+-	      future.  */
+-	   char digs[] = "0123456789";
+-	   int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+-	  #endif
+-	  /* Catch a bug in an HP-UX C compiler.  See
+-	     http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+-	     http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+-	   */
+-	  _Bool q = true;
+-	  _Bool *pq = &q;
+-
+-int
+-main ()
+-{
+-
+-	  *pq |= q;
+-	  *pq |= ! q;
+-	  /* Refer to every declared value, to avoid compiler optimizations.  */
+-	  return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+-		  + !m + !n + !o + !p + !q + !pq);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_header_stdbool_h=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_stdbool_h=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+ $as_echo "$ac_cv_header_stdbool_h" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for _Bool" >&5
+@@ -20525,7 +20525,7 @@
+ 
+ fi
+ 
+-   if test $ac_cv_header_stdbool_h = yes; then
++   if test "$ac_cv_header_stdbool_h" = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_STDBOOL_H 1
+

Modified: csw/mgar/pkg/libiconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile	2009-07-31 09:36:11 UTC (rev 5765)
+++ csw/mgar/pkg/libiconv/trunk/Makefile	2009-07-31 09:43:01 UTC (rev 5766)
@@ -1,3 +1,8 @@
+#
+# Long-term TODO:
+# See branches/sync-pkgname for an attempt to sync the CSW pkg name to
+# the upstream name and split off a devel pkg.
+#
 GARNAME = libiconv
 GARVERSION = 1.13.1
 CATEGORIES = lib
@@ -17,37 +22,12 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-# We have to take care of the package naming. We once had CSWiconv
-# (pkgname) as libiconv (software name). Now we have a consistent
-# naming but still need to provide CSWiconv as a depencies-only
-# package.
-PACKAGES = CSWlibiconv CSWlibiconvdevel CSWiconv
+# 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
 
-CATALOGNAME_CSWlibiconv = libiconv
-CATALOGNAME_CSWlibiconvdevel = libiconv_devel
-CATALOGNAME_CSWiconv = iconv
-
-SPKG_DESC_CSWlibiconv = GNU iconv library
-SPKG_DESC_CSWlibiconvdevel = GNU iconv library development package
-SPKG_DESC_CSWiconv = GNU iconv library - meta package (deprecated)
-
-# CSWiconv is a dependencies-only pkg
-PKGFILES_CSWiconv = $(docdir)/iconv/README.CSW
-
-# Devel files in _devel pkg, remaining files go into CSWlibiconv
-PKGFILES_CSWlibiconvdevel = $(PKGFILES_DEVEL) .*.3.html
-
-# Dependencies:
-#  Some of the utility programs 'depend' on ggettext.
-#  But DO NOT put CSWggettext in depend, or it will break things!!!
-#  Read: Circular dependency between ggettextrt and libiconv
-
-REQUIRED_PKGS_CSWlibiconvdevel = CSWlibiconv
-REQUIRED_PKGS_CSWiconv = CSWlibiconv CSWlibiconvdevel
-
-# CSWiconv depends on CSWlibiconv which we don't have yet
-ENABLE_CHECK = 0
-
 # The current 1.12 only has a 32-Bit iconv binary, leave it that way
 EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/bin/.*/iconv
 NO_ISAEXEC = 1
@@ -81,9 +61,10 @@
 
 include gar/category.mk
 
+post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME)
 post-install-modulated:
+	ginstall -d $(DOCDEST)
+	cp $(FILEDIR)/changelog.CSW $(DOCDEST)
 	ginstall -D $(WORKSRC)/srcm4/iconv.m4 \
 		$(DESTDIR)$(datadir)/aclocal/iconv.m4
-	ginstall -D $(FILEDIR)/CSWiconv.README \
-		$(DESTDIR)$(docdir)/iconv/README.CSW
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/libiconv/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/libiconv/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/libiconv/trunk/files/changelog.CSW	2009-07-31 09:43:01 UTC (rev 5766)
@@ -0,0 +1,5 @@
+libiconv (1.13.1,REV=2009.07.31)
+
+  * Adopted and updated to 1.13.1. (Closes #2973, #3524, #3662)
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Fri, 31 Jul 2009 11:07:44 +0200


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