SF.net SVN: gar:[25948] csw/mgar/pkg/subversion/trunk/Makefile

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Sep 19 17:15:20 CEST 2016 

Revision: 25948
          http://sourceforge.net/p/gar/code/25948
Author:   dmichelsen
Date:     2016-09-19 15:15:20 +0000 (Mon, 19 Sep 2016)
Log Message:
-----------
subversion/trunk: Adjust Python location, update to libintl9

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2016-09-19 05:33:02 UTC (rev 25947)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2016-09-19 15:15:20 UTC (rev 25948)
@@ -66,7 +66,8 @@
 PACKAGES += CSWsubversion
 SPKG_DESC_CSWsubversion = Version control rethought
 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWsubversion += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsubversion-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsubversion-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-subr1-0
@@ -80,6 +81,7 @@
 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-fs1-0
 RUNTIME_DEP_PKGS_CSWsubversion-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWsubversion += $(RUNTIME_DEP_PKGS_CSWsubversion-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWsubversion += $(RUNTIME_DEP_PKGS_CSWsubversion-$(GAROSREL)-$(GARCH))
 
 OBSOLETED_BY_CSWsubversion += CSWsvn
@@ -115,7 +117,8 @@
 PACKAGES += CSWlibsvn-auth-gnome-keyring1-0
 SPKG_DESC_CSWlibsvn-auth-gnome-keyring1-0 = Subversion library libsvn_auth_gnome_keyring-1.so.0
 PKGFILES_CSWlibsvn-auth-gnome-keyring1-0 += $(call pkgfiles_lib,libsvn_auth_gnome_keyring-1.so.0)
-RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibgnome-keyring0
 RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibsvn-subr1-0
@@ -129,32 +132,38 @@
 SPKG_DESC_CSWlibsvn-client1-0 = Subversion library libsvn_client-1.so.0
 PKGFILES_CSWlibsvn-client1-0 += $(call pkgfiles_lib,libsvn_client-1.so.0)
 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-subr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-ra1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-wc1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-diff1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-delta1-0
 SPKG_DESC_CSWlibsvn-delta1-0 = Subversion library libsvn_delta-1.so.0
 PKGFILES_CSWlibsvn-delta1-0 += $(call pkgfiles_lib,libsvn_delta-1.so.0)
-RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibsvn-subr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-diff1-0
 SPKG_DESC_CSWlibsvn-diff1-0 = Subversion library libsvn_diff-1.so.0
 PKGFILES_CSWlibsvn-diff1-0 += $(call pkgfiles_lib,libsvn_diff-1.so.0)
-RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibsvn-subr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-fs-base1-0
@@ -162,43 +171,51 @@
 PKGFILES_CSWlibsvn-fs-base1-0 += $(call pkgfiles_lib,libsvn_fs_base-1.so.0)
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-subr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWbdb48
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-fs-util1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-fs-fs1-0
 SPKG_DESC_CSWlibsvn-fs-fs1-0 = Subversion library libsvn_fs_fs-1.so.0
 PKGFILES_CSWlibsvn-fs-fs1-0 += $(call pkgfiles_lib,libsvn_fs_fs-1.so.0)
-RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-fs-util1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-subr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-fs-util1-0
 SPKG_DESC_CSWlibsvn-fs-util1-0 = Subversion library libsvn_fs_util-1.so.0
 PKGFILES_CSWlibsvn-fs-util1-0 += $(call pkgfiles_lib,libsvn_fs_util-1.so.0)
-RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibsvn-subr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-fs-x1-0
 SPKG_DESC_CSWlibsvn-fs-x1-0 = Subversion library libsvn_fs_x-1.so.0
 PKGFILES_CSWlibsvn-fs-x1-0 += $(call pkgfiles_lib,libsvn_fs_x-1.so.0)
-RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-fs-util1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-subr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-fs1-0
@@ -206,7 +223,8 @@
 PKGFILES_CSWlibsvn-fs1-0 += $(call pkgfiles_lib,libsvn_fs-1.so.0)
 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-subr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-x1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-base1-0
@@ -214,18 +232,21 @@
 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-util1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-fs1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-ra-local1-0
 SPKG_DESC_CSWlibsvn-ra-local1-0 = Subversion library libsvn_ra_local-1.so.0
 PKGFILES_CSWlibsvn-ra-local1-0 += $(call pkgfiles_lib,libsvn_ra_local-1.so.0)
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-subr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-repos1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-fs1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-ra-serf1-0
@@ -234,11 +255,13 @@
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibserf1-1
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibsvn-subr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-ra-svn1-0
@@ -246,11 +269,13 @@
 PKGFILES_CSWlibsvn-ra-svn1-0 += $(call pkgfiles_lib,libsvn_ra_svn-1.so.0)
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsvn-subr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-ra1-0
@@ -259,23 +284,27 @@
 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-local1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-subr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-svn1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-serf1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-repos1-0
 SPKG_DESC_CSWlibsvn-repos1-0 = Subversion library libsvn_repos-1.so.0
 PKGFILES_CSWlibsvn-repos1-0 += $(call pkgfiles_lib,libsvn_repos-1.so.0)
-RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-fs1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-subr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWlibsvn-subr1-0
@@ -285,20 +314,24 @@
 RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0-$(GAROSREL))
 
 PACKAGES += CSWlibsvn-wc1-0
 SPKG_DESC_CSWlibsvn-wc1-0 = Subversion library libsvn_wc-1.so.0
 PKGFILES_CSWlibsvn-wc1-0 += $(call pkgfiles_lib,libsvn_wc-1.so.0)
 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-subr1-0
-RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-diff1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-$(GAROSREL)-$(GARCH))
 
 PACKAGES += CSWap2-subversion
@@ -313,7 +346,7 @@
 RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-subr1-0
 RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWap2-subversion += $(RUNTIME_DEP_PKGS_CSWap2-subversion-$(GAROSREL)-$(GARCH))
 
 OBSOLETED_BY_CSWap2-subversion += CSWap2svn
@@ -329,7 +362,8 @@
 PKGFILES_CSWjavasvn += $(libdir)/svn-javahl/include.*
 PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW 
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWjavasvn-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWjavasvn-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-subr1-0
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-ra1-0
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-repos1-0
@@ -339,6 +373,7 @@
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-fs1-0
 RUNTIME_DEP_PKGS_CSWjavasvn-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GARCH))
 
 # This would go away when -norunpath would make it to the linker, but at this point this is difficult.
@@ -368,7 +403,7 @@
 RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-fs1-0
 RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibmagic1
 RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWpm-subversion += $(RUNTIME_DEP_PKGS_CSWpm-subversion-$(GAROSREL)-$(GARCH))
 
 OBSOLETED_BY_CSWpm-subversion += CSWpmsvn
@@ -382,7 +417,8 @@
 PKGFILES_CSWrb-subversion += $(libdir)/ruby.*
 PKGFILES_CSWrb-subversion += $(docdir)/$(CATALOGNAME_CSWrb-subversion)/changelog.CSW
 RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWrb-subversion-5.9 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWrb-subversion-5.10 += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-subr1-0
 RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-ra1-0
 RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-repos1-0
@@ -419,7 +455,7 @@
 RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-delta1-0
 RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-fs1-0
 RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWpy-subversion += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-subversion += $(RUNTIME_DEP_PKGS_CSWpy-subversion-$(GAROSREL)-$(GARCH))
 CHECKPKG_OVERRIDES_CSWpy-subversion += surplus-dependency|CSWpython
@@ -429,14 +465,14 @@
 OBSOLETED_BY_CSWpy-subversion = CSWpythonsvn
 
 # This is for /usr/share/lib/zoneinfo
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_delta.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_ra.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_fs.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_diff.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_client.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_core.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_wc.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_repos.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_delta.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_ra.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_fs.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_diff.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_client.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_core.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_wc.so
+CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/libsvn/_repos.so
 CHECKPKG_OVERRIDES_CSWpy-subversion += $(CHECKPKG_OVERRIDES_CSWpy-subversion-$(GAROSREL))
 
 # should be in lib ... put something below to at least make it compile.
@@ -619,8 +655,8 @@
 		-e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=v8 +-mt(.*)!$$1 -mcpu=v8 $$2!;' \
 		-e 's,/opt/solarisstudio12.3/bin/cc,/opt/csw/bin/gcc-5.2,g;' \
 		-e 's,(SWIG_PY_LINK = .*) -march=pentiumpro (.*),$$1 $$2,;' \
-		-e 's,(^swig_pydir =) .*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/subversion/libsvn,;' \
-		-e 's,(^swig_pydir_extra =).*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/subversion/svn,;' \
+		-e 's,(^swig_pydir =) .*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/libsvn,;' \
+		-e 's,(^swig_pydir_extra =).*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/svn,;' \
 		Makefile
 	/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-py
 	/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR)

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