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

valholla at users.sourceforge.net valholla at users.sourceforge.net
Tue Apr 28 21:31:31 CEST 2009 

Revision: 4590
          http://gar.svn.sourceforge.net/gar/?rev=4590&view=rev
Author:   valholla
Date:     2009-04-28 19:31:31 +0000 (Tue, 28 Apr 2009)

Log Message:
-----------
add tools and contrib to package

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

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

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2009-04-27 18:18:33 UTC (rev 4589)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2009-04-28 19:31:31 UTC (rev 4590)
@@ -80,7 +80,7 @@
 # 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 += subversion156.diff
+PATCHFILES += subversion161.diff
 
 DEPENDS = server/apache2
 DEPENDS = lib/neon
@@ -113,19 +113,20 @@
 TEST_SCRIPTS = skip
 
 test-skip:
-	@$(DONADA)
+	@$(MAKECOOKIE)
 
 include gar/category.mk
 
 BINDING_LANGS   = java perl python ruby
 BINDING_TARGETS = $(foreach LANG,$(BINDING_LANGS),svn-$(LANG))
 
-PI_DEPENDS  = $(BINDING_TARGETS)
+PI_DEPENDS  = install-extras
+PI_DEPENDS += $(BINDING_TARGETS)
 PI_DEPENDS += copy-templates
 PI_DEPENDS += fix-install
 
 post-install-modulated: $(PI_DEPENDS)
-	$(DONADA)
+	$(MAKECOOKIE)
 
 post-configure-modulated:
 	@echo "~~~ Fixing Libtool ~~~"
@@ -147,7 +148,7 @@
 	else \
 	    perl -i -pe 's|-xarch=386|-march=i386|' $(WORKSRC)/*.gcc; \
 	fi )
-	$(DONADA)
+	$(MAKECOOKIE)
 
 fix-install:
 	@(grm -fr $(DESTDIR)$(prefix)/lib/perl/5.8.8)
@@ -160,8 +161,17 @@
 	ginstall -m 0644 \
 		$(WORKDIR)/svn_access.conf.CSW \
 		$(DESTDIR)$(prefix)/apache2/etc
-	$(DONADA)
+	$(MAKECOOKIE)
 
+install-extras:
+	@(ginstall -d $(DESTDIR)$(docdir)/tools)
+	@(ginstall -d $(DESTDIR)$(docdir)/contrib)
+	@(gcp -R $(WORKSRC)/tools/* $(DESTDIR)$(docdir)/tools/)
+	@(gcp -R $(WORKSRC)/contrib/* $(DESTDIR)$(docdir)/contrib/)
+	@$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-tools
+	@$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-contrib
+	@$(MAKECOOKIE)
+
 svn-python:
 	@echo " ==> Building Python bindings"
 	@touch \
@@ -170,7 +180,7 @@
 	@$(BUILD_ENV)   gmake -C $(WORKSRC) swig-py
 	#@$(TEST_ENV)   gmake -C $(WORKSRC) check-swig-py
 	@$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py 
-	$(DONADA)
+	$(MAKECOOKIE)
 
 svn-perl:
 	@echo " ==> Building Perl bindings"
@@ -180,7 +190,7 @@
 	@$(BUILD_ENV)   gmake -C $(WORKSRC) swig-pl
 	#@$(TEST_ENV)   gmake -C $(WORKSRC) check-swig-pl
 	@$(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl
-	$(DONADA)
+	$(MAKECOOKIE)
 
 svn-ruby:
 	@echo " ==> Building Ruby bindings"
@@ -188,13 +198,13 @@
 	$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) swig-rb
 	#@$(TEST_ENV) gmake -f Makefile.gcc -C $(WORKSRC) check-swig-rb
 	@$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb
-	$(DONADA)
+	$(MAKECOOKIE)
 
 svn-java:
 	@echo " ==> Building Java bindings"
 	@touch $(WORKSRC)/subversion/bindings/javahl/native/*.c
 	$(BUILD_ENV)   gmake -C $(WORKSRC) javahl;
 	$(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl;
-	$(DONADA)
+	$(MAKECOOKIE)
 
 

Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums	2009-04-27 18:18:33 UTC (rev 4589)
+++ csw/mgar/pkg/subversion/trunk/checksums	2009-04-28 19:31:31 UTC (rev 4590)
@@ -3,9 +3,7 @@
 395ec6d1bfe07efadc1c0aa8816673fa  download/CSWsvn.checkinstall
 41ec540885de7c34625768aa1fb9682b  download/fixme.sh
 f107831ad0c702ff32e51df6a207237b  download/httpd-svn.conf.CSW
-6caa3c518b84c2b3f6a33b61d1b022e3  download/i386-gcc.diff
 f0aa58c145ae99f8e4d72499ab826169  download/javahl_headers_for_nested_classes.diff
-91d4c5a963192f113602b1bd1917d0cb  download/sparc-gcc.diff
 95708b96b920faeffca017f43ec96777  download/subversion-1.6.1.tar.bz2
-f7d05c59656dcf01fb844295c9912f78  download/subversion156.diff
+f7d05c59656dcf01fb844295c9912f78  download/subversion161.diff
 1b532d3055708a97771f5cd959983628  download/svn_access.conf.CSW

Deleted: csw/mgar/pkg/subversion/trunk/files/subversion156.diff
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/subversion156.diff	2009-04-27 18:18:33 UTC (rev 4589)
+++ csw/mgar/pkg/subversion/trunk/files/subversion156.diff	2009-04-28 19:31:31 UTC (rev 4590)
@@ -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]

Copied: csw/mgar/pkg/subversion/trunk/files/subversion161.diff (from rev 4589, csw/mgar/pkg/subversion/trunk/files/subversion156.diff)
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/subversion161.diff	                        (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/subversion161.diff	2009-04-28 19:31:31 UTC (rev 4590)
@@ -0,0 +1,33 @@
+--- 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