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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Sun Jul 17 22:22:27 CEST 2011 

Revision: 15090
          http://gar.svn.sourceforge.net/gar/?rev=15090&view=rev
Author:   dmichelsen
Date:     2011-07-17 20:22:27 +0000 (Sun, 17 Jul 2011)

Log Message:
-----------
subversion: Try 1.7.0alpha3, forward-port patches, try PYCOMPILE and -norunpath, skip contrib/ for now

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile
    csw/mgar/pkg/subversion/trunk/checksums
    csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch

Added Paths:
-----------
    csw/mgar/pkg/subversion/trunk/files/0002-Fix-location-of-bindings.patch

Removed Paths:
-------------
    csw/mgar/pkg/subversion/trunk/files/subversion161.diff

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2011-07-17 20:01:06 UTC (rev 15089)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2011-07-17 20:22:27 UTC (rev 15090)
@@ -2,6 +2,8 @@
 #
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
+# ! Install does not work as there is no contrib any more. Where is this stuff?
+#
 # * How about shipping a changelog.CSW (example in files/)?
 # * The language binding packages all have a whole stack of dependencies
 #   (mostly the same libs that the main svn package has). Are those really
@@ -22,7 +24,7 @@
 #   http://subversion.apache.org/mailing-lists.html
 
 NAME = subversion
-VERSION = 1.7.0-alpha2
+VERSION = 1.7.0-alpha3
 CATEGORIES = utils
 
 DESCRIPTION = Version control rethought
@@ -35,8 +37,11 @@
 MASTER_SITES = http://archive.apache.org/dist/subversion/
 #MASTER_SITES = http://orac.ece.utexas.edu/pub/svn/1.6.7/yuletide-eggnog/
 DISTFILES    = $(NAME)-$(VERSION).tar.bz2
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
+BUILD_DEP_PKGS += CSWlibexpat-dev
+BUILD_DEP_PKGS += CSWlibserf-dev
+BUILD_DEP_PKGS += CSWlibsqlite3-dev
+
 PACKAGES  = CSWsvn
 SPKG_DESC_CSWsvn           = Version control rethought
 CATALOGNAME_CSWsvn         = subversion
@@ -105,10 +110,10 @@
 RUNTIME_DEP_PKGS_CSWjavasvn   += CSWapr-util
 RUNTIME_DEP_PKGS_CSWjavasvn   += CSWbdb48
 RUNTIME_DEP_PKGS_CSWjavasvn   += CSWapr
-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/v8|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|/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/v8|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
 
 PACKAGES += CSWpmsvn
 SPKG_DESC_CSWpmsvn         = Subversion Perl Language Binding
@@ -172,9 +177,13 @@
 # Fix: Add java headers for nested classes
 # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
 PATCHFILES += javahl_headers_for_nested_classes.diff
-PATCHFILES += subversion161.diff
+
+# Hardcode location of system wide configuration to /etc/opt/csw/subversion
 PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch
 
+# Relocate locations of foreign language bindings
+PATCHFILES += 0002-Fix-location-of-bindings.patch
+
 SVNLIB     = $(prefix)/lib/svn
 JAVA_HOME  = /usr/jdk1.6.0_20
 
@@ -190,10 +199,11 @@
 RUNPATH_ISALIST  = $(libdir)
 #RUNPATH_ISALIST += $(filter-out /opt/csw/apache2/lib $(SVNLIB),$(EXTRA_LIB)) 
 
-EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
-PROTOTYPE_MODIFIERS += cswpycompile
-PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py
-PROTOTYPE_CLASS_cswpycompile = cswpycompile
+#EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
+#PROTOTYPE_MODIFIERS += cswpycompile
+#PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py
+#PROTOTYPE_CLASS_cswpycompile = cswpycompile
+PYCOMPILE = 1
 
 # All of the perl modules go to $(libdir)/perl/site_perl. We are not interested
 # in the version specific perl directory which only contains a perllocal.pod.
@@ -237,7 +247,8 @@
 
 PI_DEPENDS += copy-templates
 PI_DEPENDS += create-ra_dav-symlinks
-PI_DEPENDS += install-extras
+# TBD: There is no contrib/ in 1.7.0 any more, how to proceed? Other tarball? Or just drop in the future?
+# PI_DEPENDS += install-extras
 PI_DEPENDS += $(BINDING_TARGETS)
 
 post-install-modulated: $(PI_DEPENDS)
@@ -329,6 +340,7 @@
 	$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-rb
 	@$(MAKECOOKIE)
 
+svn-java: EXTRA_LINKER_FLAGS += -norunpath
 svn-java:
 	@echo " ==> Building Java bindings"
 	touch $(WORKSRC)/subversion/bindings/javahl/native/*.c

Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums	2011-07-17 20:01:06 UTC (rev 15089)
+++ csw/mgar/pkg/subversion/trunk/checksums	2011-07-17 20:22:27 UTC (rev 15090)
@@ -1 +1 @@
-237341332d0790e5798cc9a5043f00bf  subversion-1.7.0-alpha2.tar.bz2
+f96db6e195c49a38db4282440fac65e3  subversion-1.7.0-alpha3.tar.bz2

Modified: csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch	2011-07-17 20:01:06 UTC (rev 15089)
+++ csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch	2011-07-17 20:22:27 UTC (rev 15090)
@@ -1,6 +1,6 @@
-From e522142a1517f9c9ffdd670eb2fd0aa974a9a9a1 Mon Sep 17 00:00:00 2001
-From: Rupert Thurner <rupert at build8s.(none)>
-Date: Sun, 20 Dec 2009 12:33:52 -0600
+From 0c866a35b462bc704a48e91d1d17a38a0175b743 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 17 Jul 2011 21:54:47 +0200
 Subject: [PATCH] make subversion sysconfigdir as it should be for csw
 
 ---
@@ -8,18 +8,18 @@
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/subversion/libsvn_subr/config_impl.h b/subversion/libsvn_subr/config_impl.h
-index b5c9d4b..67d46aa 100644
+index d795771..0bc6464 100644
 --- a/subversion/libsvn_subr/config_impl.h
 +++ b/subversion/libsvn_subr/config_impl.h
-@@ -110,7 +110,7 @@ svn_error_t *svn_config__parse_registry(svn_config_t *cfg,
- #ifdef WIN32
- #  define SVN_CONFIG__SUBDIRECTORY    "Subversion"
- #else  /* ! WIN32 */
+@@ -121,7 +121,7 @@ svn_error_t *svn_config__parse_registry(svn_config_t *cfg,
+ #  define SVN_CONFIG__SYS_DIRECTORY   "subversion"
+ #  define SVN_CONFIG__USR_DIRECTORY   "subversion"
+ #else  /* ! WIN32 && ! __HAIKU__ */
 -#  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
 +#  define SVN_CONFIG__SYS_DIRECTORY   "/etc/opt/csw/subversion"
  #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
  #endif /* WIN32 */
  
 -- 
-1.6.5.1
+1.7.6
 

Copied: csw/mgar/pkg/subversion/trunk/files/0002-Fix-location-of-bindings.patch (from rev 15086, csw/mgar/pkg/subversion/trunk/files/subversion161.diff)
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/0002-Fix-location-of-bindings.patch	                        (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/0002-Fix-location-of-bindings.patch	2011-07-17 20:22:27 UTC (rev 15090)
@@ -0,0 +1,50 @@
+From 986ad30cb4787968527abcb3743ec4b9fee130f2 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 17 Jul 2011 21:50:56 +0200
+Subject: [PATCH] Fix location of bindings
+
+---
+ Makefile.in                               |   10 +++++-----
+ subversion/bindings/swig/python/svn/fs.py |    2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 03133c6..8661d07 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -85,14 +85,14 @@ swig_pl_libdir = @libdir@
+ swig_rb_libdir = @libdir@
+ 
+ ### these possibly need further discussion
+-swig_pydir = @libdir@/svn-python/libsvn
+-swig_pydir_extra = @libdir@/svn-python/svn
+-swig_pldir = @libdir@/svn-perl
++swig_pydir = @libdir@/python/site-packages/libsvn
++swig_pydir_extra = @libdir@/python/site-packages/svn
++#swig_pldir = @libdir@/svn-perl
+ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
+ toolsdir = @bindir@/svn-tools
+ 
+-javahl_javadir = @libdir@/svn-javahl
+-javahl_javahdir = @libdir@/svn-javahl/include
++javahl_javadir = @libdir@
++javahl_javahdir = @libdir@/include
+ javahl_libdir = @libdir@
+ javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work
+ javahl_test_srcdir=$(abs_srcdir)/subversion/bindings/javahl
+diff --git a/subversion/bindings/swig/python/svn/fs.py b/subversion/bindings/swig/python/svn/fs.py
+index e82e495..438ad06 100644
+--- a/subversion/bindings/swig/python/svn/fs.py
++++ b/subversion/bindings/swig/python/svn/fs.py
+@@ -109,7 +109,7 @@ class FileDiff:
+ 
+     # use an array for the command to avoid the shell and potential
+     # security exposures
+-    cmd = ["diff"] \
++    cmd = ["gdiff"] \
+           + self.diffoptions \
+           + [self.tempfile1, self.tempfile2]
+ 
+-- 
+1.7.6
+

Deleted: csw/mgar/pkg/subversion/trunk/files/subversion161.diff
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/subversion161.diff	2011-07-17 20:01:06 UTC (rev 15089)
+++ csw/mgar/pkg/subversion/trunk/files/subversion161.diff	2011-07-17 20:22:27 UTC (rev 15090)
@@ -1,33 +0,0 @@
---- subversion-1.5.5/Makefile.in.orig	2008-08-26 12:27:56.000000000 -0500
-+++ subversion-1.5.5/Makefile.in	2009-02-21 17:26:25.849467074 -0600
-@@ -68,15 +69,15 @@
- swig_rb_libdir = @libdir@
- 
- ### these possibly need further discussion
--swig_pydir = @libdir@/svn-python/libsvn
--swig_pydir_extra = @libdir@/svn-python/svn
--swig_pldir = @libdir@/svn-perl
-+swig_pydir = @prefix@/lib/python/site-packages/libsvn
-+swig_pydir_extra = @prefix@/lib/python/site-packages/svn
-+#swig_pldir = @libdir@/svn-perl
- swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
- contribdir = @bindir@/svn-contrib
- toolsdir = @bindir@/svn-tools
- 
--javahl_javadir = @libdir@/svn-javahl
--javahl_javahdir = @libdir@/svn-javahl/include
-+javahl_javadir = @libdir@
-+javahl_javahdir = @libdir@/include
- javahl_libdir = @libdir@
- javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work
- 
---- subversion-1.5.5/subversion/bindings/swig/python/svn/fs.py.orig	2009-02-21 17:00:06.832094681 -0600
-+++ subversion-1.5.5/subversion/bindings/swig/python/svn/fs.py	2009-02-21 16:59:46.198583440 -0600
-@@ -97,7 +97,7 @@
- 
-     # use an array for the command to avoid the shell and potential
-     # security exposures
--    cmd = ["diff"] \
-+    cmd = ["gdiff"] \
-           + self.diffoptions \
-           + [self.tempfile1, self.tempfile2]


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