[csw-devel] SF.net SVN: gar:[8557] csw/mgar

[dmichelsen at users.sourceforge.net]

Revision: 8557
          http://gar.svn.sourceforge.net/gar/?rev=8557&view=rev
Author:   dmichelsen
Date:     2010-02-15 13:34:03 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
mGAR v2: Make package name on CHECKPKG_OVERRIDE implicit

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk
    csw/mgar/pkg/gkrellm/trunk/Makefile
    csw/mgar/pkg/libsoup/trunk/Makefile
    csw/mgar/pkg/libxslt/trunk/Makefile
    csw/mgar/pkg/mutt/trunk/Makefile
    csw/mgar/pkg/openldap/trunk/Makefile
    csw/mgar/pkg/setoolkit/trunk/Makefile
    csw/mgar/pkg/tcpwrappers/trunk/Makefile

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-02-15 13:06:00 UTC (rev 8556)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-02-15 13:34:03 UTC (rev 8557)
@@ -674,7 +674,7 @@
 	@echo "[ Generating checkpkg override for package $* ]"
 	$(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides
 	$(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O";)) | \
-		perl -F'\|' -ane 'unshift @F,"$*" if(@F<2); $$F[0].=":"; print join(" ", at F );' \
+		perl -F'\|' -ane 'unshift @F,"$*"; $$F[0].=":"; print join(" ", at F );' \
 		> $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*)
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/gkrellm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/Makefile	2010-02-15 13:06:00 UTC (rev 8556)
+++ csw/mgar/pkg/gkrellm/trunk/Makefile	2010-02-15 13:34:03 UTC (rev 8557)
@@ -65,7 +65,7 @@
 
 # This is for the missing X11 symbol XSolarisIASetProcessInfo.
 # It does no harm, though.
-CHECKPKG_OVERRIDES = CSWgkrellm|symbol-not-found|gkrellm
+CHECKPKG_OVERRIDES = symbol-not-found|gkrellm
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libsoup/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsoup/trunk/Makefile	2010-02-15 13:06:00 UTC (rev 8556)
+++ csw/mgar/pkg/libsoup/trunk/Makefile	2010-02-15 13:34:03 UTC (rev 8557)
@@ -45,10 +45,10 @@
 
 # libgnutls.so.11 no longer exists, but in case someone still use libsoup-2.0.so
 # and still have libgnutls.so.11 we override checkpkg
-CHECKPKG_OVERRIDES += CSWlibsoup|orphan-soname|libgnutls.so.11
-CHECKPKG_OVERRIDES += CSWlibsoup|symbol-not-found|libsoup-2.0.so.0.0.0
+CHECKPKG_OVERRIDES += orphan-soname|libgnutls.so.11
+CHECKPKG_OVERRIDES += symbol-not-found|libsoup-2.0.so.0.0.0
 # Possible bug in checkpkg
-CHECKPKG_OVERRIDES += CSWlibsoup|symbol-not-found|libsoup-gnome-2.4.so.1.2.0
+CHECKPKG_OVERRIDES += symbol-not-found|libsoup-gnome-2.4.so.1.2.0
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 

Modified: csw/mgar/pkg/libxslt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxslt/trunk/Makefile	2010-02-15 13:06:00 UTC (rev 8556)
+++ csw/mgar/pkg/libxslt/trunk/Makefile	2010-02-15 13:34:03 UTC (rev 8557)
@@ -53,6 +53,6 @@
 PKGFILES_CSWpylibxslt = $(libdir)/python.*
 PKGFILES_CSWpylibxslt += $(docdir)/libxslt-python-$(GARVERSION)/.*
 
-CHECKPKG_OVERRIDES = CSWpylibxslt|symbol-not-found|libxsltmod.so
+CHECKPKG_OVERRIDES = symbol-not-found|libxsltmod.so
 
 include gar/category.mk

Modified: csw/mgar/pkg/mutt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mutt/trunk/Makefile	2010-02-15 13:06:00 UTC (rev 8556)
+++ csw/mgar/pkg/mutt/trunk/Makefile	2010-02-15 13:34:03 UTC (rev 8557)
@@ -100,7 +100,7 @@
 ALTERNATIVE_slang = $(bindir)/mutt mutt $(bindir)/mutt-slang 200
 
 # This warning from checkpkg is obviously wrong...
-CHECKPKG_OVERRIDES_CSWmutt-base = CSWmutt-base|missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWmutt-base = missing-dependency|CSWperl
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2010-02-15 13:06:00 UTC (rev 8556)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2010-02-15 13:34:03 UTC (rev 8557)
@@ -121,7 +121,7 @@
 CHECKPKG_OVERRIDES = symbol-not-found
 CHECKPKG_OVERRIDES_CSWoldapdevel  = symbol-not-found
 # The devel package depends on rt instead of the full package, that is ok.
-CHECKPKG_OVERRIDES_CSWoldapdevel += CSWoldapdevel|missing-dependency|CSWoldap
+CHECKPKG_OVERRIDES_CSWoldapdevel += missing-dependency|CSWoldap
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/setoolkit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/setoolkit/trunk/Makefile	2010-02-15 13:06:00 UTC (rev 8556)
+++ csw/mgar/pkg/setoolkit/trunk/Makefile	2010-02-15 13:34:03 UTC (rev 8557)
@@ -41,7 +41,7 @@
 
 # This is intended behaviour as the missing symbols are provided by the "se" binary
 # and the libs are to be used only by "se".
-CHECKPKG_OVERRIDES  = CSWsetoolkit|symbol-not-found|libsegui.so
-CHECKPKG_OVERRIDES += CSWsetoolkit|symbol-not-found|libsenet.so
+CHECKPKG_OVERRIDES  = symbol-not-found|libsegui.so
+CHECKPKG_OVERRIDES += symbol-not-found|libsenet.so
 
 include gar/category.mk

Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/Makefile	2010-02-15 13:06:00 UTC (rev 8556)
+++ csw/mgar/pkg/tcpwrappers/trunk/Makefile	2010-02-15 13:34:03 UTC (rev 8557)
@@ -76,10 +76,10 @@
 
 # These binaries link against libwrap.so which will be linked by alternatives
 # after package install. Until then they can obviously not link properly.
-CHECKPKG_OVERRIDES  = CSWtcpwrap|symbol-not-found|tcpdmatch
-CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|tcpd
-CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|try-from
-CHECKPKG_OVERRIDES += CSWtcpwrap|symbol-not-found|tcpdchk
+CHECKPKG_OVERRIDES  = symbol-not-found|tcpdmatch
+CHECKPKG_OVERRIDES += symbol-not-found|tcpd
+CHECKPKG_OVERRIDES += symbol-not-found|try-from
+CHECKPKG_OVERRIDES += symbol-not-found|tcpdchk
 
 include gar/category.mk
 


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