[csw-devel] SF.net SVN: gar:[8644] csw/mgar/pkg/subversion/trunk/Makefile

[wahwah at users.sourceforge.net]

Revision: 8644
          http://gar.svn.sourceforge.net/gar/?rev=8644&view=rev
Author:   wahwah
Date:     2010-02-18 11:58:53 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
subversion: Added *-contrib and *-tools packages, added overrides for the symbol-not-found error.

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-02-18 11:14:25 UTC (rev 8643)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-02-18 11:58:53 UTC (rev 8644)
@@ -33,9 +33,14 @@
 
 PACKAGES  = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn
 PACKAGES += CSWpythonsvn CSWrbsvn CSWjavasvn
+PACKAGES += CSWsvn-contrib CSWsvn-tools
 
 SPKG_DESC_CSWsvn           = Version control rethought
+SPKG_DESC_CSWsvn-tools     = Additional subversion tools
+SPKG_DESC_CSWsvn-contrib   = Contributed subversion scripts
 CATALOGNAME_CSWsvn         = subversion
+CATALOGNAME_CSWsvn-contrib = subversion_contrib
+CATALOGNAME_CSWsvn-tools   = subversion_tools
 RUNTIME_DEP_PKGS_CSWsvn       = CSWapache2rt
 RUNTIME_DEP_PKGS_CSWsvn      += CSWbdb48
 RUNTIME_DEP_PKGS_CSWsvn      += CSWexpat
@@ -47,11 +52,12 @@
 RUNTIME_DEP_PKGS_CSWsvn      += CSWlibserf
 RUNTIME_DEP_PKGS_CSWsvn      += CSWsqlite3rt
 RUNTIME_DEP_PKGS_CSWsvn      += CSWzlib
-# There are additional requirements for $(docdir)/subversion/tools/ which
-# also contains the stack of hook-scripts. Should we add those?
-#RUNTIME_DEP_PKGS_CSWsvn      += CSWperl
-#RUNTIME_DEP_PKGS_CSWsvn      += CSWpython
-#RUNTIME_DEP_PKGS_CSWsvn      += CSWruby
+RUNTIME_DEP_PKGS_CSWsvn      += CSWlibserf
+RUNTIME_DEP_PKGS_CSWsvn-contrib += CSWperl
+RUNTIME_DEP_PKGS_CSWsvn-contrib += CSWpython
+RUNTIME_DEP_PKGS_CSWsvn-tools   += CSWperl
+RUNTIME_DEP_PKGS_CSWsvn-tools   += CSWpython
+RUNTIME_DEP_PKGS_CSWsvn-tools   += CSWruby
 
 SPKG_DESC_CSWsvn-devel     = Subversion Development Support
 CATALOGNAME_CSWsvn-devel   = subversion_devel
@@ -60,6 +66,12 @@
 PKGFILES_CSWsvn-devel      = $(PKGFILES_DEVEL)
 PKGFILES_CSWsvn-devel     += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW
 
+PKGFILES_CSWsvn-contrib    = $(docdir)/subversion/contrib.*
+ARCHALL_CSWsvn-contrib     = 1
+
+PKGFILES_CSWsvn-tools      = $(docdir)/subversion/tools.*
+ARCHALL_CSWsvn-tools       = 1
+
 SPKG_DESC_CSWap2svn        = Subversion Modules for Apache 2.2
 CATALOGNAME_CSWap2svn      = ap2_subversion
 RUNTIME_DEP_PKGS_CSWap2svn    = CSWsvn
@@ -187,6 +199,13 @@
 #     tail -f $(WORKSRC)/tests.log | grep merge_tests.py
 TEST_TARGET  = check
 
+# Overrides
+CHECKPKG_OVERRIDES_CSWap2svn = symbol-not-found
+CHECKPKG_OVERRIDES_CSWrbsvn = symbol-not-found
+CHECKPKG_OVERRIDES_CSWsvn = symbol-not-found|libsvn_ra-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWpythonsvn = symbol-not-found
+CHECKPKG_OVERRIDES_CSWpmsvn = symbol-not-found
+
 include gar/category.mk
 
 BINDING_LANGS   = java perl python ruby


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