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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Jan 14 09:25:22 CET 2015


Revision: 24561
          http://sourceforge.net/p/gar/code/24561
Author:   dmichelsen
Date:     2015-01-14 08:25:22 +0000 (Wed, 14 Jan 2015)
Log Message:
-----------
subversion/trunk: Undo all of the wrong stuff since my last commit

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2015-01-13 10:01:40 UTC (rev 24560)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2015-01-14 08:25:22 UTC (rev 24561)
@@ -20,7 +20,7 @@
 #   http://subversion.apache.org/mailing-lists.html
 
 NAME = subversion
-VERSION = 1.8.11
+VERSION = 1.8.5
 GARTYPE = v2
 
 DESCRIPTION = Version control rethought
@@ -59,9 +59,6 @@
 SPKG_DESC_CSWsvn = Version control rethought
 CATALOGNAME_CSWsvn = subversion
 CHECKPKG_OVERRIDES_CSWsvn += catalogname-does-not-match-pkgname|pkgname=CSWsvn|catalogname=subversion|expected-catalogname=svn
-CHECKPKG_OVERRIDES_CSWsvn += file-needed-but-no-package-satisfies-it|/opt/csw/lib/svn/libsvn_ra_neon-1.so.0.0.0|CSWsvn|contains|symlink|/opt/csw/lib/svn/libsvn_ra_dav-1.so|which|needs|the|target|file:|/opt/csw/lib/svn/libsvn_ra_neon-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWsvn += file-needed-but-no-package-satisfies-it|/opt/csw/lib/svn/libsvn_ra_neon-1.so.0.0.0|CSWsvn|contains|symlink|/opt/csw/lib/svn/libsvn_ra_dav-1.so.0|which|needs|the|target|file:|/opt/csw/lib/svn/libsvn_ra_neon-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWsvn += file-with-bad-content|/usr/local|root/opt/csw/lib/svn/libsvn_repos-1.so.0.0.0
 RUNTIME_DEP_PKGS_CSWsvn = CSWbdb48
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibmagic1
@@ -72,16 +69,17 @@
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf1-1
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0
 RUNTIME_DEP_PKGS_CSWsvn_5.9 += CSWglib2
 RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn_$(GAROSREL))
 
-
 PACKAGES += CSWsvn-dev
 SPKG_DESC_CSWsvn-dev = Subversion Development Support
 PKGFILES_CSWsvn-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWsvn-dev += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW
+OBSOLETED_BY_CSWsvn-dev += CSWsvn-devel
 
 PACKAGES += CSWap2svn
 SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2
@@ -101,7 +99,6 @@
 RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48
 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibiconv2
 
-
 PACKAGES += CSWjavasvn
 SPKG_DESC_CSWjavasvn = Subversion Java Language Binding
 PKGFILES_CSWjavasvn += $(SVNLIB)/.*java.*
@@ -122,11 +119,11 @@
 # This would go away when -norunpath would make it to the linker, but at this point this is difficult.
 # Override for now as it is not harmful.
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 
-
 PACKAGES += CSWpmsvn
 SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding
 CATALOGNAME_CSWpmsvn = pm_subversion
@@ -137,6 +134,14 @@
 PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibz1
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibsqlite3-0
 
 PACKAGES += CSWrbsvn
 SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding
@@ -148,7 +153,6 @@
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby18-1
-#RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby1-9-1-1
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibmagic1
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibexpat1
@@ -158,9 +162,7 @@
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWrbsvn += dependency-on-stub|ruby_stub
 
-
 PACKAGES += CSWpythonsvn
 SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding
 PKGFILES_CSWpythonsvn += $(libdir)/python.*
@@ -190,7 +192,7 @@
 CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibmagic1
 CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1
 CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibsqlite3-0
-CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
+HECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsasl2-2
 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibaprutil1-0
 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWbdb48
@@ -200,15 +202,13 @@
 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibexpat1
 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsqlite3-0
 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibapr1-0
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibmagic1
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibapr1-0
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibaprutil1-0
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibsqlite3-0
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibmagic1
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibexpat1
+CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibsqlite3-0
 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibserf1-1
 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsasl2-2
 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibintl8
@@ -228,6 +228,8 @@
 CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibmagic1
 CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibexpat1
 CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsqlite3-0
+CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibserf1-1
+CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibiconv2
 
 # should be in lib ... put something below to at least make it compile.
 # on the svn mailing list people say we should not build the package

Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums	2015-01-13 10:01:40 UTC (rev 24560)
+++ csw/mgar/pkg/subversion/trunk/checksums	2015-01-14 08:25:22 UTC (rev 24561)
@@ -1 +1 @@
-766a89bbbb388f8eb76166672d3b9e49  subversion-1.8.11.tar.bz2
+77349caf0ef5a612c9718c53516a9934  subversion-1.8.5.tar.bz2

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