[csw-devel] SF.net SVN: gar:[6888] csw/mgar/pkg
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sun Oct 18 12:30:05 CEST 2009
Revision: 6888
http://gar.svn.sourceforge.net/gar/?rev=6888&view=rev
Author: wahwah
Date: 2009-10-18 10:30:04 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
pysvn: Initial commit
Modified Paths:
--------------
csw/mgar/pkg/pysvn/trunk/Makefile
csw/mgar/pkg/pysvn/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/pysvn/
csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch
csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch
csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch
csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch
csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch
csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch
Modified: csw/mgar/pkg/pysvn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile 2009-10-14 22:42:38 UTC (rev 6868)
+++ csw/mgar/pkg/pysvn/trunk/Makefile 2009-10-18 10:30:04 UTC (rev 6888)
@@ -11,8 +11,8 @@
## For more information about GAR variables, please see:
## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
##
-GARNAME = mypkg
-GARVERSION = 1.0
+GARNAME = pysvn
+GARVERSION = 1.7.1
##
## The category that your software fits in. This is not a descriptive field, but
## influences the build process. Depending on the CATEGORIES setting, different
@@ -25,7 +25,7 @@
CATEGORIES = lib
##
## A one-line description of the package, which will appear in the pkginfo.
-DESCRIPTION = <please fill in>
+DESCRIPTION = python
##
## A longer description of the package. This is only for descriptive purposes
## inside the Makefile and is not used elsewhere.
@@ -35,11 +35,11 @@
##
## Upstream URL that should show up in the VENDOR field as well as on
## http://opencsw.org/packages/<packagename>.
-SPKG_SOURCEURL =
+SPKG_SOURCEURL = http://pysvn.tigris.org/
##
## Whitespace-separated list of URLs to download the source package from.
## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
-MASTER_SITES =
+MASTER_SITES = http://pysvn.barrys-emacs.org/source_kits/
##
## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
@@ -49,7 +49,12 @@
## A list of space separated patch filenames from files/ that are to be applied
## to the extracted software before the ./configure stage. Patches need to be
## included in the DISTFILES variable as well.
-## PATCHFILES =
+PATCHFILES = 0002-pysvn.hpp-string-includes-first.patch
+PATCHFILES += 0005-Use-dash-capital-R-for-runtime-path.patch
+PATCHFILES += 0006-Use-opt-csw-lib.patch
+PATCHFILES += 0003-bin-bash-instead-of-bin-sh.patch
+PATCHFILES += 0001-fixes-for-tests.patch
+PATCHFILES += 0008-gid-in-two-more-places.patch
##
## Whitespace-separated list of files which comprise this build. mGAR will look
## for the files in the $(FILEDIR) (trunk/files) directory and on the
@@ -120,10 +125,20 @@
## INITSMF =
## USERGROUP =
## A list of runtime package dependencies in the form of CSWfoo.
-## REQUIRED_PKGS =
+REQUIRED_PKGS = CSWexpat
+REQUIRED_PKGS += CSWgcc3core
+REQUIRED_PKGS += CSWgcc3corert
+REQUIRED_PKGS += CSWgcc3g++
+REQUIRED_PKGS += CSWgcc3g++rt
+REQUIRED_PKGS += CSWgcc4corert
+REQUIRED_PKGS += CSWgcc4g++rt
+REQUIRED_PKGS += CSWneon
+REQUIRED_PKGS += CSWsvn
+
##
## A list of packages necessary to build this package
-## PREREQUISITE_PKGS = $(REQUIRED_PKGS)
+PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel
+INCOMPATIBELE_PKGS = CSWpyxml
##
## When using non-empty $(PACKAGES):
## REQUIRED_PKGS_CSWpkgname =
@@ -142,10 +157,10 @@
## completely (for example when your software doesn't need to be compiled) assign
## this variable an empty value. The procedure works for configure, build,
## install and test steps.
-## CONFIGURE_SCRIPTS =
-## BUILD_SCRIPTS =
-## INSTALL_SCRIPTS =
-## TEST_SCRIPTS =
+CONFIGURE_SCRIPTS = pysvn
+BUILD_SCRIPTS = pysvn
+INSTALL_SCRIPTS = pysvn
+TEST_SCRIPTS = pysvn
##
## Compilation settings
##
@@ -172,11 +187,34 @@
##
## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
## GARCOMPILER = SOS11
+GARCOMPILER = GNU
##
-# Remove the following rules and uncomment the
-# include before building.
-all: .DEFAULT
-.DEFAULT:
- @true
-#include gar/category.mk
+include gar/category.mk
+
+configure-pysvn:
+ (cd $(WORKSRC)/Source \
+ && $(CONFIGURE_ENV) python setup.py configure \
+ --apr-inc-dir=/opt/csw/apache2/include \
+ --apr-lib-dir=/opt/csw/apache2/lib \
+ --svn-bin-dir=/opt/csw/bin \
+ --svn-inc-dir=/opt/csw/include/subversion-1 \
+ --svn-lib-dir=/opt/csw/lib/svn \
+ )
+ @$(MAKECOOKIE)
+
+build-pysvn:
+ (cd $(WORKSRC)/Source \
+ && $(BUILD_ENV) gmake \
+ )
+ @$(MAKECOOKIE)
+
+test-pysvn:
+ (cd $(WORKSRC)/Tests && gmake)
+ @$(MAKECOOKIE)
+
+install-pysvn:
+ ginstall -m 755 -d $(DESTDIR)$(libdir)/python/site-packages/pysvn
+ ginstall -m 644 $(WORKSRC)/Source/pysvn/__init__.py $(DESTDIR)$(libdir)/python/site-packages/pysvn
+ $(foreach F,$(wildcard $(WORKSRC)/Source/pysvn/_pysvn*.so),ginstall -m 755 $(F) $(DESTDIR)$(libdir)/python/site-packages/pysvn)
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/pysvn/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums 2009-10-14 22:42:38 UTC (rev 6868)
+++ csw/mgar/pkg/pysvn/trunk/checksums 2009-10-18 10:30:04 UTC (rev 6888)
@@ -0,0 +1,7 @@
+b698502c7a43d9623189924f08904c3a 0001-fixes-for-tests.patch
+20381f5964a9fc08b04eb6fc69a47d04 0002-pysvn.hpp-string-includes-first.patch
+64c9418717dee60ed1a613cc7d85c682 0003-bin-bash-instead-of-bin-sh.patch
+a69e791dd03491aca2cfeba83528389a 0005-Use-dash-capital-R-for-runtime-path.patch
+be7690f1395b76f984bf12de84418b68 0006-Use-opt-csw-lib.patch
+ac24c9b4348fd857353d1444c8448d8d 0008-gid-in-two-more-places.patch
+55688ec2083dcada32aa0a4128f6c309 pysvn-1.7.1.tar.gz
Added: csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch
===================================================================
--- csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch (rev 0)
+++ csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch 2009-10-18 10:30:04 UTC (rev 6888)
@@ -0,0 +1,53 @@
+From ec286163180177e43b95e5fce366b19cc7750f27 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Sun, 18 Oct 2009 11:04:23 +0100
+Subject: [PATCH] fixes for tests
+
+---
+ Tests/test-04.sh | 2 +-
+ Tests/test-05.sh | 2 +-
+ Tests/test-07.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Tests/test-04.sh b/Tests/test-04.sh
+index a8e2faa..c360615 100755
+--- a/Tests/test-04.sh
++++ b/Tests/test-04.sh
+@@ -30,7 +30,7 @@ cmd ${PYSVN} mkdir file://${TESTROOT}/repos/trunk -m "test-04 add trunk"
+ cmd ${PYSVN} mkdir file://${TESTROOT}/repos/trunk/test -m "test-04 add test"
+
+ echo Info: Install hooks
+-echo '#!/bin/sh' >${TESTROOT}/repos/hooks/pre-commit
++echo '#!/bin/bash' >${TESTROOT}/repos/hooks/pre-commit
+ echo export PYTHONPATH=$PYTHONPATH >>${TESTROOT}/repos/hooks/pre-commit
+ echo echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit
+ echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">>${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit
+diff --git a/Tests/test-05.sh b/Tests/test-05.sh
+index 32976c0..81f2754 100755
+--- a/Tests/test-05.sh
++++ b/Tests/test-05.sh
+@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+ cd ${WORKDIR}/Tests
+ echo WorkDir: ${WORKDIR}
+ echo PYTHON: ${PYTHON}
+-echo Username: $(id -u -n)
++echo Username: $(gid -u -n)
+
+ cmd () {
+ echo Info: CWD: $(pwd)
+diff --git a/Tests/test-07.sh b/Tests/test-07.sh
+index 903d321..d7c48a4 100755
+--- a/Tests/test-07.sh
++++ b/Tests/test-07.sh
+@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+ cd ${WORKDIR}/Tests
+ echo WorkDir: ${WORKDIR}
+ echo PYTHON: ${PYTHON}
+-echo Username: $(id -u -n)
++echo Username: $(gid -u -n)
+
+ cmd () {
+ echo Info: CWD: $(pwd)
+--
+1.6.3.2
+
Added: csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch
===================================================================
--- csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch (rev 0)
+++ csw/mgar/pkg/pysvn/trunk/files/0002-pysvn.hpp-string-includes-first.patch 2009-10-18 10:30:04 UTC (rev 6888)
@@ -0,0 +1,38 @@
+From 16c4295ff5290649ea7952624c5201992434b4bf Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Sun, 18 Oct 2009 09:27:32 +0100
+Subject: [PATCH 2/2] pysvn.hpp: <string> includes first
+
+---
+ Source/pysvn.hpp | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Source/pysvn.hpp b/Source/pysvn.hpp
+index 4a1d65c..ab60f82 100644
+--- a/Source/pysvn.hpp
++++ b/Source/pysvn.hpp
+@@ -7,6 +7,10 @@
+ //
+ // ====================================================================
+ //
++#include <string>
++#include <list>
++#include <map>
++
+ #include "Python.h"
+ #include "CXX/Objects.hxx"
+ #include "CXX/Extensions.hxx"
+@@ -14,10 +18,6 @@
+
+ #include "pysvn_svnenv.hpp"
+
+-#include <string>
+-#include <list>
+-#include <map>
+-
+ //--------------------------------------------------------------------------------
+ class pysvn_module : public Py::ExtensionModule<pysvn_module>
+ {
+--
+1.6.3.2
+
Added: csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch
===================================================================
--- csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch (rev 0)
+++ csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch 2009-10-18 10:30:04 UTC (rev 6888)
@@ -0,0 +1,85 @@
+From 848b922929a73b8c9587aec91876da7e544d376d Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Sun, 18 Oct 2009 10:38:05 +0100
+Subject: [PATCH 3/3] /bin/bash instead of /bin/sh
+
+---
+ Tests/test-01.sh | 2 +-
+ Tests/test-03.sh | 2 +-
+ Tests/test-04.sh | 4 ++--
+ Tests/test-05.sh | 2 +-
+ Tests/test-06.sh | 2 +-
+ Tests/test-07.sh | 2 +-
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Tests/test-01.sh b/Tests/test-01.sh
+index 22ef9d0..ed79049 100755
+--- a/Tests/test-01.sh
++++ b/Tests/test-01.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # need to get rid of any symbolic links in the WORKDIR
+ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+
+diff --git a/Tests/test-03.sh b/Tests/test-03.sh
+index bd36b00..7f63e5c 100755
+--- a/Tests/test-03.sh
++++ b/Tests/test-03.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # need to get rid of any symbolic links in the WORKDIR
+ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+
+diff --git a/Tests/test-04.sh b/Tests/test-04.sh
+index 1c61fdc..a8e2faa 100755
+--- a/Tests/test-04.sh
++++ b/Tests/test-04.sh
+@@ -1,11 +1,11 @@
+-#!/bin/sh
++#!/bin/bash
+ # need to get rid of any symbolic links in the WORKDIR
+ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+
+ cd ${WORKDIR}/Tests
+ echo WorkDir: ${WORKDIR}
+ echo PYTHON: ${PYTHON}
+-echo Username: $(id -u -n)
++echo Username: $(gid -u -n)
+
+ cmd () {
+ echo Info: Command: $*
+diff --git a/Tests/test-05.sh b/Tests/test-05.sh
+index 8e892b9..32976c0 100755
+--- a/Tests/test-05.sh
++++ b/Tests/test-05.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # need to get rid of any symbolic links in the WORKDIR
+ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+
+diff --git a/Tests/test-06.sh b/Tests/test-06.sh
+index 9b8cc6b..b6e2fb4 100755
+--- a/Tests/test-06.sh
++++ b/Tests/test-06.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # need to get rid of any symbolic links in the WORKDIR
+ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+
+diff --git a/Tests/test-07.sh b/Tests/test-07.sh
+index 5847027..903d321 100755
+--- a/Tests/test-07.sh
++++ b/Tests/test-07.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # need to get rid of any symbolic links in the WORKDIR
+ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+
+--
+1.6.3.2
+
Added: csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch
===================================================================
--- csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch (rev 0)
+++ csw/mgar/pkg/pysvn/trunk/files/0005-Use-dash-capital-R-for-runtime-path.patch 2009-10-18 10:30:04 UTC (rev 6888)
@@ -0,0 +1,25 @@
+From e1c99ab2895e81b627aeed5be5e71cb0655cc0b6 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Sun, 18 Oct 2009 09:36:12 +0100
+Subject: [PATCH 5/6] Use dash-capital-R for runtime path
+
+---
+ Source/setup_configure.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
+index 39c5019..8e4ccac 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -381,7 +381,7 @@ CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s
+ PYCXX=%(pycxx_dir)s
+ PYCXXSRC=%(pycxx_src_dir)s
+ LDSHARED=g++ -shared %(debug_cflags)s
+-LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
++LDLIBS=-L%(svn_lib_dir)s -R%(svn_lib_dir)s \
+ -lsvn_client-1 \
+ -lsvn_diff-1 \
+ -lsvn_repos-1 \
+--
+1.6.3.2
+
Added: csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch
===================================================================
--- csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch (rev 0)
+++ csw/mgar/pkg/pysvn/trunk/files/0006-Use-opt-csw-lib.patch 2009-10-18 10:30:04 UTC (rev 6888)
@@ -0,0 +1,25 @@
+From a110241e323d4029c2ebc82ee57b1af41adb47c1 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Sun, 18 Oct 2009 09:39:07 +0100
+Subject: [PATCH 6/6] Use /opt/csw/lib
+
+---
+ Source/setup_configure.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
+index 8e4ccac..36cda90 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -381,7 +381,7 @@ CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s
+ PYCXX=%(pycxx_dir)s
+ PYCXXSRC=%(pycxx_src_dir)s
+ LDSHARED=g++ -shared %(debug_cflags)s
+-LDLIBS=-L%(svn_lib_dir)s -R%(svn_lib_dir)s \
++LDLIBS=-L%(svn_lib_dir)s -L/opt/csw/lib -R/opt/csw/lib -R%(svn_lib_dir)s \
+ -lsvn_client-1 \
+ -lsvn_diff-1 \
+ -lsvn_repos-1 \
+--
+1.6.3.2
+
Added: csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch
===================================================================
--- csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch (rev 0)
+++ csw/mgar/pkg/pysvn/trunk/files/0008-gid-in-two-more-places.patch 2009-10-18 10:30:04 UTC (rev 6888)
@@ -0,0 +1,39 @@
+From 89ec666ff204e5d45f0d051ff5a2ed9e7236f7ef Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Sun, 18 Oct 2009 11:12:30 +0100
+Subject: [PATCH] gid in two more places
+
+---
+ Tests/test-01.sh | 2 +-
+ Tests/test-06.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Tests/test-01.sh b/Tests/test-01.sh
+index ed79049..bc11292 100755
+--- a/Tests/test-01.sh
++++ b/Tests/test-01.sh
+@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+ cd ${WORKDIR}/Tests
+ echo WorkDir: ${WORKDIR}
+ echo PYTHON: ${PYTHON}
+-echo Username: $(id -u -n)
++echo Username: $(gid -u -n)
+
+ cmd () {
+ echo Info: CWD: $(pwd)
+diff --git a/Tests/test-06.sh b/Tests/test-06.sh
+index b6e2fb4..07a8597 100755
+--- a/Tests/test-06.sh
++++ b/Tests/test-06.sh
+@@ -5,7 +5,7 @@ export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
+ cd ${WORKDIR}/Tests
+ echo WorkDir: ${WORKDIR}
+ echo PYTHON: ${PYTHON}
+-echo Username: $(id -u -n)
++echo Username: $(gid -u -n)
+
+ cmd () {
+ echo Info: CWD: $(pwd)
+--
+1.6.3.2
+
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