[csw-devel] SF.net SVN: gar:[7092] csw/mgar/pkg/websvn/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Nov 3 18:36:59 CET 2009
Revision: 7092
http://gar.svn.sourceforge.net/gar/?rev=7092&view=rev
Author: dmichelsen
Date: 2009-11-03 17:36:58 +0000 (Tue, 03 Nov 2009)
Log Message:
-----------
websvn: Move to mGAR v2 and update to 2.2.1
Modified Paths:
--------------
csw/mgar/pkg/websvn/trunk/Makefile
csw/mgar/pkg/websvn/trunk/checksums
csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch
Removed Paths:
-------------
csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend
csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec
csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall
csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.preremove
Property Changed:
----------------
csw/mgar/pkg/websvn/trunk/
Property changes on: csw/mgar/pkg/websvn/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/websvn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/websvn/trunk/Makefile 2009-11-03 15:52:45 UTC (rev 7091)
+++ csw/mgar/pkg/websvn/trunk/Makefile 2009-11-03 17:36:58 UTC (rev 7092)
@@ -1,5 +1,5 @@
GARNAME = websvn
-GARVERSION = 2.0
+GARVERSION = 2.2.1
CATEGORIES = apps
DESCRIPTION = PHP based web interface of Subversion repositories
@@ -12,31 +12,36 @@
a particular revision.
endef
-MASTER_SITES = svn-http://websvn.tigris.org/svn/$(GARNAME)/tags/
-DISTFILES = $(GARVERSION)
-NOCHECKSUM = $(GARVERSION)
-SVNHTTP_CO_ARGS = --no-auth-cache --username guest --password guest
+# MASTER_SITES = svn-http://websvn.tigris.org/svn/$(GARNAME)/tags/
+# DISTFILES = $(GARVERSION)
+# NOCHECKSUM = $(GARVERSION)
+# SVNHTTP_CO_ARGS = --no-auth-cache --username guest --password guest
+MASTER_SITES = http://websvn.tigris.org/files/documents/1380/45918/
+DISTFILES = $(DISTNAME).tar.gz
+
SPKG_SOURCEURL = http://websvn.tigris.org/
-DISTFILES += $(call admfiles,CSWwebsvn,depend postinstall preremove)
+LICENSE = license.txt
+
+# DISTFILES += $(call admfiles,CSWwebsvn,depend postinstall preremove)
PATCHFILES = websvn-csw-config.patch
-WORKSRC = $(WORKDIR)/$(GARVERSION)
+REQUIRED_PKGS = CSWapache2 CSWdiffutils CSWsvn CSWenscript CSWgsed CSWgtar CSWgzip
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS =
TEST_SCRIPTS =
INSTALL_SCRIPTS = custom
+EXTRA_PAX_ARGS += -s ',^\.\(.*\)/distconfig.php$$,.\1/config.php,'
+
+PRESERVECONF = $(sharedstatedir)/www/websvn/include/config.php
+
+ARCHALL = 1
+
include gar/category.mk
-post-extract:
- @echo " ==> Preparing include/config.php.CSW"
- @cp $(WORKSRC)/include/distconfig.php \
- $(WORKSRC)/include/config.php.CSW
- @$(MAKECOOKIE)
-
install-custom:
@echo " ==> Installing $(GARNAME)"
@rm -rf $(DESTDIR)$(sharedstatedir)/www/websvn
Modified: csw/mgar/pkg/websvn/trunk/checksums
===================================================================
--- csw/mgar/pkg/websvn/trunk/checksums 2009-11-03 15:52:45 UTC (rev 7091)
+++ csw/mgar/pkg/websvn/trunk/checksums 2009-11-03 17:36:58 UTC (rev 7092)
@@ -1,5 +1,2 @@
-953d95d8a7ee6451acfb7ebb06893ae8 download/CSWwebsvn.gspec
-858def27dd10cc82f447b7220b3473f1 download/CSWwebsvn.depend
-afea5f097c11a1d4e3da2b790dd65fdf download/CSWwebsvn.postinstall
-67cef58e940c379cddd8a61e6023a6da download/CSWwebsvn.preremove
-b380450f1a5135649a0588cb8eaa10e4 download/websvn-csw-config.patch
+f7eb3d57840aa3d1917bb0c645794601 websvn-2.2.1.tar.gz
+c9e2b0372fe02393c2376c0ea707c522 websvn-csw-config.patch
Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend
===================================================================
--- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend 2009-11-03 15:52:45 UTC (rev 7091)
+++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend 2009-11-03 17:36:58 UTC (rev 7092)
@@ -1,7 +0,0 @@
-P CSWapache2 apache2 - Apache 2.2 web server
-P CSWdiffutils diffutils - GNU diff and related utils
-P CSWsvn subversion - Version control rethought
-P CSWenscript enscript - convert text files to PostScript
-P CSWgsed gsed - The GNU non-interactive text Stream-oriented EDitor (sed)
-P CSWgtar gtar - GNU tape archiver
-P CSWgzip gzip - GNU compression utility (replacement for compress)
Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec
===================================================================
--- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec 2009-11-03 15:52:45 UTC (rev 7091)
+++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec 2009-11-03 17:36:58 UTC (rev 7092)
@@ -1,5 +0,0 @@
-%var bitname websvn
-%var pkgname CSWwebsvn
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/licence.txt
Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall
===================================================================
--- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall 2009-11-03 15:52:45 UTC (rev 7091)
+++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall 2009-11-03 17:36:58 UTC (rev 7092)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-CONFDIR=${CSW_PREFIX}/apache2/share/htdocs/websvn/include
-
-# Copy templates
-template_list="config.php"
-
-echo Copying CSW templates:
-for file in $template_list
-do
- filepath=${CONFDIR}/$file
- if [ ! -f "$filepath" ] && [ -f "$filepath.CSW" ]; then
- echo " creating $filepath"
- cp $filepath.CSW $filepath
- else
- echo " preserving $filepath"
- fi
-done
-
-/usr/bin/cat <<EOF
-
-NOTE: You need to configure WebSVN. Edit the file
- "/opt/csw/apache2/share/htdocs/websvn/include/config.php"
-to do so.
-
-EOF
-
-exit 0
Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.preremove
===================================================================
--- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.preremove 2009-11-03 15:52:45 UTC (rev 7091)
+++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.preremove 2009-11-03 17:36:58 UTC (rev 7092)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-CONFDIR=${CSW_PREFIX}/apache2/share/htdocs/websvn/include
-
-# Copy templates
-template_list="config.php"
-
-echo Removing unmodified CSW templates:
-for file in $template_list
-do
- filepath=${CONFDIR}/$file
- if [ -f "${filepath}" ] && [ -f "${filepath}.CSW" ] && cmp -s "${filepath}" "${filepath}.CSW"; then
- echo " removing $filepath"
- rm -f "${filepath}"
- else
- echo " preserving $filepath"
- fi
-done
-
-exit 0
Modified: csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch
===================================================================
--- csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch 2009-11-03 15:52:45 UTC (rev 7091)
+++ csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch 2009-11-03 17:36:58 UTC (rev 7092)
@@ -1,6 +1,6 @@
-diff -Naur 2.0-orig/include/config.php.CSW 2.0-patched/include/config.php.CSW
---- 2.0-orig/include/config.php.CSW 2007-11-07 10:52:53.790976000 +0100
-+++ 2.0-patched/include/config.php.CSW 2007-11-07 10:58:37.414630000 +0100
+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.
//
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