[csw-devel] SF.net SVN: gar:[19715] csw/mgar/pkg/libiconv/branches/bratislava/Makefile

[wahwah at users.sourceforge.net]

Revision: 19715
          http://gar.svn.sourceforge.net/gar/?rev=19715&view=rev
Author:   wahwah
Date:     2012-11-19 11:28:05 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
libiconv/branches/bratislava: checkpkg does not know about CSWcommon-less packages

Modified Paths:
--------------
    csw/mgar/pkg/libiconv/branches/bratislava/Makefile

Modified: csw/mgar/pkg/libiconv/branches/bratislava/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/branches/bratislava/Makefile	2012-11-19 11:02:35 UTC (rev 19714)
+++ csw/mgar/pkg/libiconv/branches/bratislava/Makefile	2012-11-19 11:28:05 UTC (rev 19715)
@@ -1,3 +1,4 @@
+# $Id$
 #
 # Long-term TODO:
 # See branches/sync-pkgname for an attempt to sync the CSW pkg name to
@@ -25,7 +26,6 @@
 CATALOGNAME_CSWlibiconv2 = libiconv2
 SPKG_DESC_CSWlibiconv2 = GNU iconv library, libiconv.so.2
 PKGFILES_CSWlibiconv2 += $(call pkgfiles_lib,libiconv.so.2)
-OBSOLETED_BY_CSWlibiconv2 += CSWiconv
 
 PACKAGES += CSWlibcharset1
 CATALOGNAME_CSWlibcharset1 = libcharset1
@@ -34,7 +34,6 @@
 # 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 += $(call baseisadirs,$(libdir),charset\.alias)
-OBSOLETED_BY_CSWlibcharset1 += CSWiconv
 
 PACKAGES += CSWlibiconv-dev
 CATALOGNAME_CSWlibiconv-dev = libiconv_dev
@@ -52,23 +51,15 @@
 PKGFILES_CSWlibiconv-utils += .*iconv\.1.*
 PKGFILES_CSWlibiconv-utils += .*/libiconv\.mo
 PKGFILES_CSWlibiconv-utils += $(call baseisadirs,$(libdir),preloadable_libiconv\.so)
-# The SONAME of preloadable_libiconv.so is set to libiconv.so.0, although it doesn't
-# matter in any way as this library is only used for LD_PRELOAD and is never being
-# linked against during compile time.
+
+# The SONAME of preloadable_libiconv.so is set to libiconv.so.0, although it
+# doesn't matter in any way as this library is only used for LD_PRELOAD and is
+# never being linked against during compile time.
 CHECKPKG_OVERRIDES_CSWlibiconv-utils += soname-not-part-of-filename|soname=libiconv.so.0|filename=preloadable_libiconv.so
 CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch
 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8
 
-# Removing this dependency to break a dependency cycle.
-# See:
-#  - http://lists.opencsw.org/pipermail/devel/2011-August/020098.html
-#
-# "CSWiconv needs CSWlibiconv-utils which needs CSWlibintl8 which needs
-# CSWiconv"
-#
-# OBSOLETED_BY_CSWlibiconv-utils += CSWiconv
-
 BUILD64_LIBS_ONLY = 1
 
 # 'gmake test' shows three errors of coredumping printf's
@@ -89,6 +80,18 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-rpath
 
+# bratislava settings
+COMMON_PKG_DEPENDS =
+INCLUDE_COMMONDIRS = 1
+CHECKPKG_OVERRIDES_CSWlibcharset1 += bad-location-of-file
+CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path
+CHECKPKG_OVERRIDES_CSWlibiconv-dev += bad-location-of-file
+CHECKPKG_OVERRIDES_CSWlibiconv-dev += disallowed-path
+CHECKPKG_OVERRIDES_CSWlibiconv-utils += bad-location-of-file
+CHECKPKG_OVERRIDES_CSWlibiconv-utils += disallowed-path
+CHECKPKG_OVERRIDES_CSWlibiconv2 += bad-location-of-file
+CHECKPKG_OVERRIDES_CSWlibiconv2 += disallowed-path
+
 include gar/category.mk
 
 post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME)

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