[csw-devel] SF.net SVN: gar:[20126] csw/mgar/pkg/websvn/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Jan 14 14:08:33 CET 2013
Revision: 20126
http://gar.svn.sourceforge.net/gar/?rev=20126&view=rev
Author: dmichelsen
Date: 2013-01-14 13:08:32 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
websvn/trunk: Update to 2.3.3
Modified Paths:
--------------
csw/mgar/pkg/websvn/trunk/Makefile
csw/mgar/pkg/websvn/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/websvn/trunk/files/0001-Use-CSW-tools.patch
Removed Paths:
-------------
csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch
Modified: csw/mgar/pkg/websvn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/websvn/trunk/Makefile 2013-01-14 12:57:31 UTC (rev 20125)
+++ csw/mgar/pkg/websvn/trunk/Makefile 2013-01-14 13:08:32 UTC (rev 20126)
@@ -1,5 +1,5 @@
NAME = websvn
-VERSION = 2.2.1
+VERSION = 2.3.3
GARTYPE = v2
DESCRIPTION = PHP based web interface of Subversion repositories
@@ -12,16 +12,32 @@
a particular revision.
endef
-MASTER_SITES = http://websvn.tigris.org/files/documents/1380/45918/
-DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES = websvn-csw-config.patch
+MASTER_SITES += http://websvn.tigris.org/files/documents/1380/49056/
+DISTFILES += $(DISTNAME).tar.gz
+PATCHFILES += 0001-Use-CSW-tools.patch
-SPKG_SOURCEURL = http://websvn.tigris.org/
+VENDOR_URL = http://websvn.tigris.org/
LICENSE = license.txt
-RUNTIME_DEP_PKGS = CSWapache2 CSWdiffutils CSWsvn CSWenscript CSWgsed CSWgtar CSWgzip
+RUNTIME_DEP_PKGS += CSWapache2
+RUNTIME_DEP_PKGS += CSWdiffutils
+RUNTIME_DEP_PKGS += CSWsvn
+RUNTIME_DEP_PKGS += CSWenscript
+RUNTIME_DEP_PKGS += CSWgsed
+RUNTIME_DEP_PKGS += CSWgtar
+RUNTIME_DEP_PKGS += CSWgzip
+RUNTIME_DEP_PKGS += CSWzip
+# Checkpkg can not check any of these
+CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWdiffutils
+CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWsvn
+CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWenscript
+CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWgsed
+CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWgtar
+CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWgzip
+CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWzip
+
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS =
TEST_SCRIPTS =
@@ -41,6 +57,7 @@
@ginstall -d $(DESTDIR)$(sharedstatedir)/www/websvn
@cp -rp $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/websvn/htdocs
@find $(DESTDIR)$(prefix) -name .svn -exec rm -rf \{\} \;
+ @find $(DESTDIR)$(prefix) -name .git -exec rm -rf \{\} \;
@rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn
@ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs
@ln -s $(sharedstatedir)/www/websvn/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn
Modified: csw/mgar/pkg/websvn/trunk/checksums
===================================================================
--- csw/mgar/pkg/websvn/trunk/checksums 2013-01-14 12:57:31 UTC (rev 20125)
+++ csw/mgar/pkg/websvn/trunk/checksums 2013-01-14 13:08:32 UTC (rev 20126)
@@ -1,2 +1 @@
-f7eb3d57840aa3d1917bb0c645794601 websvn-2.2.1.tar.gz
-c9e2b0372fe02393c2376c0ea707c522 websvn-csw-config.patch
+bc1821caf77a3225aa810e8f19400ea6 websvn-2.3.3.tar.gz
Added: csw/mgar/pkg/websvn/trunk/files/0001-Use-CSW-tools.patch
===================================================================
--- csw/mgar/pkg/websvn/trunk/files/0001-Use-CSW-tools.patch (rev 0)
+++ csw/mgar/pkg/websvn/trunk/files/0001-Use-CSW-tools.patch 2013-01-14 13:08:32 UTC (rev 20126)
@@ -0,0 +1,52 @@
+From fb48c17024edd5db6ed5181e772724121703815e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 14 Jan 2013 14:04:54 +0100
+Subject: [PATCH] Use CSW tools
+
+---
+ include/distconfig.php | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/distconfig.php b/include/distconfig.php
+index bf4e95a..bf34be0 100644
+--- a/include/distconfig.php
++++ b/include/distconfig.php
+@@ -33,20 +33,27 @@
+ // Configure these lines if your commands aren't on your path.
+ //
+ // $config->setSVNCommandPath('Path/to/svn/command/'); // e.g. c:\\program files\\subversion\\bin
++$config->setSVNCommandPath('/opt/csw/bin'); // e.g. c:\\program files\\subversion\\bin
+ // $config->setDiffPath('Path/to/diff/command/');
++$config->setDiffPath('/opt/csw/gnu');
+
+ // For syntax colouring, if option enabled...
+ // $config->setEnscriptPath('Path/to/enscript/command/');
++$config->setEnscriptPath('/opt/csw/bin');
+ // $config->setSedPath('Path/to/sed/command/');
++$config->setSedPath('/opt/csw/gnu');
+
+ // For delivered tarballs, if option enabled...
+ // $config->setTarPath('Path/to/tar/command/');
++$config->setTarPath('/opt/csw/gnu');
+
+ // For delivered GZIP'd files and tarballs, if option enabled...
+ // $config->setGZipPath('Path/to/gzip/command/');
++$config->setGZipPath('/opt/csw/bin');
+
+ // download folder/file zipped ...
+ // $config->setZipPath('Path/to/zip/command/');
++$config->setZipPath('/opt/csw/bin');
+
+ // Uncomment this line to trust server certificates
+ // This may useful if you use self-signed certificates and have no chance to accept the certificate once via cli
+@@ -363,6 +370,7 @@ $config->setMinDownloadLevel(2);
+ // If you have version 1.6.3 or newer use the following line.
+ //
+ // $config->useEnscript();
++$config->useEnscript();
+ //
+ // If you have version 1.6.2 or older use the following line.
+ //
+--
+1.8.0
+
Deleted: csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch
===================================================================
--- csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch 2013-01-14 12:57:31 UTC (rev 20125)
+++ csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch 2013-01-14 13:08:32 UTC (rev 20126)
@@ -1,43 +0,0 @@
-diff -Naur 2.0-orig/include/distconfig.php 2.0-patched/include/distconfig.php
---- 2.0-orig/include/distconfig.php 2007-11-07 10:52:53.790976000 +0100
-+++ 2.0-patched/include/distconfig.php 2007-11-07 10:58:37.414630000 +0100
-@@ -33,17 +33,23 @@
- // Configure these lines if your commands aren't on your path.
- //
- // $config->setSVNCommandPath('Path/to/svn and svnlook/ e.g. c:\\program files\\subversion\\bin');
-+$config->setSVNCommandPath('/opt/csw/bin');
- // $config->setDiffPath('Path/to/diff/command/');
-+$config->setPath($config->diff, '/opt/csw/bin', "gdiff");
-
- // For syntax colouring, if option enabled...
- // $config->setEnscriptPath('Path/to/enscript/command/');
-+$config->setEnscriptPath('/opt/csw/bin');
- // $config->setSedPath('Path/to/sed/command/');
-+$config->setPath($config->sed, '/opt/csw/bin', "gsed");
-
- // For delivered tarballs, if option enabled...
- // $config->setTarPath('Path/to/tar/command/');
-+$config->setPath($config->tar, '/opt/csw/bin', "gtar");
-
- // For delivered GZIP'd files and tarballs, if option enabled...
- // $config->setGZipPath('Path/to/gzip/command/');
-+$config->setGZipPath('/opt/csw/bin');
-
- // }}}
-
-@@ -230,6 +236,7 @@
- // repositories.
- //
- // $config->allowDownload();
-+$config->allowDownload();
- //
- // To change the global option for individual repositories, uncomment and replicate
- // the required line below (replacing 'myrep' for the name of the repository to be changed).
-@@ -285,6 +292,7 @@
- // Set the path above.
- //
- // $config->useEnscript();
-+$config->useEnscript();
-
- // Enscript need to be told what the contents of a file are so that it can be colourised
- // correctly. WebSVN includes a predefined list of mappings from file extension to Enscript
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