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

[skayser at users.sourceforge.net]

Revision: 5645
          http://gar.svn.sourceforge.net/gar/?rev=5645&view=rev
Author:   skayser
Date:     2009-07-24 22:40:50 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
libiconv: consistent pkg naming, provide meta pkg for backwards compatibility

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

Added Paths:
-----------
    csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README

Modified: csw/mgar/pkg/libiconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile	2009-07-24 17:56:43 UTC (rev 5644)
+++ csw/mgar/pkg/libiconv/trunk/Makefile	2009-07-24 22:40:50 UTC (rev 5645)
@@ -17,27 +17,37 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-# 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 CSWiconvdevel
+# 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_CSWiconv = libiconv
-CATALOGNAME_CSWiconvdevel = libiconv_devel
+CATALOGNAME_CSWlibiconv = libiconv
+CATALOGNAME_CSWlibiconvdevel = libiconv_devel
+CATALOGNAME_CSWiconv = iconv
 
-SPKG_DESC_CSWiconv = GNU iconv library
-SPKG_DESC_CSWiconvdevel = GNU iconv library development pacakge
+SPKG_DESC_CSWlibiconv = GNU iconv library
+SPKG_DESC_CSWlibiconvdevel = GNU iconv library development package
+SPKG_DESC_CSWiconv = GNU iconv library - meta package (deprecated)
 
-PKGFILES_CSWiconvdevel = $(PKGFILES_DEVEL) .*.3.html
-# All other unspecified files go into CSWlibiconv
+# CSWiconv is a dependencies-only pkg
+PKGFILES_CSWiconv = $(docdir)/CSWiconv/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_CSWiconvdevel = CSWiconv
+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
@@ -74,4 +84,6 @@
 post-install-modulated:
 	ginstall -D $(WORKSRC)/srcm4/iconv.m4 \
 		$(DESTDIR)$(datadir)/aclocal/iconv.m4
+	ginstall -D $(FILEDIR)/CSWiconv.README \
+		$(DESTDIR)$(docdir)/CSWiconv/README.CSW
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README
===================================================================
--- csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README	                        (rev 0)
+++ csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README	2009-07-24 22:40:50 UTC (rev 5645)
@@ -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.


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