remove old subversion-python

and add py-subversion to Makefile

5 files changed, 2 insertions, 150 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 39443e55c4b..7ba7e118c3a 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.437 2003/12/04 15:26:55 epg Exp $
+# $NetBSD: Makefile,v 1.438 2003/12/04 17:01:54 recht Exp $
 #
 
 COMMENT=	Development utilities
@@ -360,6 +360,7 @@ SUBDIR+=	py-kqueue
 SUBDIR+=	py-logging
 SUBDIR+=	py-pqueue
 SUBDIR+=	py-readline
+SUBDIR+=	py-subversion
 SUBDIR+=	py-unit
 SUBDIR+=	py-unitgui
 SUBDIR+=	py-zconfig
@@ -410,7 +411,6 @@ SUBDIR+=	stlport
 SUBDIR+=	stooop
 SUBDIR+=	subversion
 SUBDIR+=	subversion-base
-SUBDIR+=	subversion-python
 SUBDIR+=	swig
 #SUBDIR+=	swig-build	# conflicts with swig (soon to change)
 SUBDIR+=	swig-perl
diff --git a/devel/subversion-python/DESCR b/devel/subversion-python/DESCR
deleted file mode 100644
index f76ecd3c7e5..00000000000
--- a/devel/subversion-python/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The goal of the Subversion project is to build a version control system that
-is a compelling replacement for CVS in the open source community. The software
-is released under an Apache/BSD-style open source license.
-
-This package contains the Python bindings to the Subversion libraries
-and some programs that use them.  This includes cvs2svn, which
-converts CVS repositories to Subversion repositories.
diff --git a/devel/subversion-python/Makefile b/devel/subversion-python/Makefile
deleted file mode 100644
index 4ae344b547f..00000000000
--- a/devel/subversion-python/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/09/08 04:47:52 epg Exp $
-
-PKGNAME=	${PYPKGPREFIX}-subversion-${SVNVER}
-COMMENT=	Python bindings and tools for Subversion
-
-.include "../../devel/subversion/Makefile.common"
-
-CONFIGURE_ENV+=		PYTHON2=${PYTHONBIN}
-
-PY_PATCHPLIST=		YES
-PYBINMODULE=		YES
-PYTHON_PATCH_SCRIPTS=	tools/cvs2svn/cvs2svn.py \
-			tools/hook-scripts/mailer/mailer.py
-
-ALL_TARGET=		swig-py-lib swig-py
-INSTALL_TARGET=		install-swig-py-lib install-swig-py
-
-MAKE_ENV+=		EXTRA_CPPFLAGS=${BUILDLINK_CPPFLAGS}
-MAKEFLAGS+=		swig_pydir=${LOCALBASE}/${PYSITELIB}/libsvn \
-			swig_pydir_extra=${LOCALBASE}/${PYSITELIB}/svn
-
-TEST_TARGET=		all check
-
-post-install:
-	${RM} ${LOCALBASE}/${PYSITELIB}/libsvn/*.a
-	${RM} ${LOCALBASE}/${PYSITELIB}/libsvn/*.la
-	${INSTALL_DATA_DIR} ${SVNEXAMPLES}/python
-	${INSTALL_DATA} ${WRKSRC}/tools/examples/*.py ${SVNEXAMPLES}/python
-	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.py \
-		${SVNEXAMPLES}/hook-scripts
-	${INSTALL_DATA} \
-		${WRKSRC}/tools/hook-scripts/mailer/mailer.conf.example \
-		${SVNEXAMPLES}/hook-scripts
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/subversion/cvs2svn
-	${INSTALL_DATA} ${WRKSRC}/tools/cvs2svn/README ${SVNDOC}/cvs2svn
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/cvs2svn/cvs2svn.py \
-		${PREFIX}/bin/cvs2svn
-	${INSTALL_SCRIPT_DIR} ${LOCALBASE}/${PYSITELIB}/rcsparse
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/cvs2svn/rcsparse/*.py \
-		${LOCALBASE}/${PYSITELIB}/rcsparse
-
-.include "../../devel/subversion/buildlink2.mk"
-.include "../../devel/swig-build/buildlink2.mk"
-.include "../../devel/swig-python/buildlink2.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/subversion-python/PLIST b/devel/subversion-python/PLIST
deleted file mode 100644
index 03c95ba4447..00000000000
--- a/devel/subversion-python/PLIST
+++ /dev/null
@@ -1,71 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/08/15 23:42:59 epg Exp $
-bin/cvs2svn
-lib/libsvn_swig_py-1.a
-lib/libsvn_swig_py-1.la
-lib/libsvn_swig_py-1.so
-lib/libsvn_swig_py-1.so.0
-lib/libsvn_swig_py-1.so.0.0
-${PYSITELIB}/libsvn/__init__.py
-${PYSITELIB}/libsvn/__init__.pyc
-${PYSITELIB}/libsvn/_client.so
-${PYSITELIB}/libsvn/_core.so
-${PYSITELIB}/libsvn/_delta.so
-${PYSITELIB}/libsvn/_fs.so
-${PYSITELIB}/libsvn/_ra.so
-${PYSITELIB}/libsvn/_repos.so
-${PYSITELIB}/libsvn/_wc.so
-${PYSITELIB}/libsvn/client.py
-${PYSITELIB}/libsvn/client.pyc
-${PYSITELIB}/libsvn/core.py
-${PYSITELIB}/libsvn/core.pyc
-${PYSITELIB}/libsvn/delta.py
-${PYSITELIB}/libsvn/delta.pyc
-${PYSITELIB}/libsvn/fs.py
-${PYSITELIB}/libsvn/fs.pyc
-${PYSITELIB}/libsvn/ra.py
-${PYSITELIB}/libsvn/ra.pyc
-${PYSITELIB}/libsvn/repos.py
-${PYSITELIB}/libsvn/repos.pyc
-${PYSITELIB}/libsvn/wc.py
-${PYSITELIB}/libsvn/wc.pyc
-${PYSITELIB}/rcsparse/__init__.py
-${PYSITELIB}/rcsparse/common.py
-${PYSITELIB}/rcsparse/compat.py
-${PYSITELIB}/rcsparse/debug.py
-${PYSITELIB}/rcsparse/default.py
-${PYSITELIB}/rcsparse/texttools.py
-${PYSITELIB}/svn/__init__.py
-${PYSITELIB}/svn/__init__.pyc
-${PYSITELIB}/svn/client.py
-${PYSITELIB}/svn/client.pyc
-${PYSITELIB}/svn/core.py
-${PYSITELIB}/svn/core.pyc
-${PYSITELIB}/svn/delta.py
-${PYSITELIB}/svn/delta.pyc
-${PYSITELIB}/svn/fs.py
-${PYSITELIB}/svn/fs.pyc
-${PYSITELIB}/svn/ra.py
-${PYSITELIB}/svn/ra.pyc
-${PYSITELIB}/svn/repos.py
-${PYSITELIB}/svn/repos.pyc
-${PYSITELIB}/svn/util.py
-${PYSITELIB}/svn/util.pyc
-${PYSITELIB}/svn/wc.py
-${PYSITELIB}/svn/wc.pyc
-share/doc/subversion/cvs2svn/README
-share/examples/subversion/hook-scripts/mailer.conf.example
-share/examples/subversion/hook-scripts/mailer.py
-share/examples/subversion/python/blame.py
-share/examples/subversion/python/check-modified.py
-share/examples/subversion/python/dumpprops.py
-share/examples/subversion/python/getfile.py
-share/examples/subversion/python/geturl.py
-share/examples/subversion/python/putfile.py
-share/examples/subversion/python/revplist.py
-share/examples/subversion/python/svnlook.py
-share/examples/subversion/python/svnshell.py
-@dirrm share/examples/subversion/python
-@dirrm share/doc/subversion/cvs2svn
-@dirrm ${PYSITELIB}/svn
-@dirrm ${PYSITELIB}/rcsparse
-@dirrm ${PYSITELIB}/libsvn
diff --git a/devel/subversion-python/buildlink2.mk b/devel/subversion-python/buildlink2.mk
deleted file mode 100644
index d8b49037ea8..00000000000
--- a/devel/subversion-python/buildlink2.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/06/18 13:28:28 epg Exp $
-
-.if !defined(SUBVERSION_PYTHON_BUILDLINK2_MK)
-SUBVERSION_PYTHON_BUILDLINK2_MK=		#defined
-
-BUILDLINK_PACKAGES+=			subversion-python
-BUILDLINK_DEPENDS.subversion-python?=	${PYPKGPREFIX}-subversion-${SVNVER}:../../devel/subversion-python
-BUILDLINK_PKGSRCDIR.subversion-python?=	../../devel/subversion-python
-
-EVAL_PREFIX+=		BUILDLINK_PREFIX.subversion-python=subversion-python
-BUILDLINK_PREFIX.subversion-python_DEFAULT=	${LOCALBASE}
-
-.include "../../devel/subversion/buildlink2.mk"
-.include "../../devel/swig-python/buildlink2.mk"
-.include "../../lang/python/pyversion.mk"
-
-.include "../../devel/subversion/Makefile.version"
-
-BUILDLINK_TARGETS+=		subversion-python-buildlink
-
-subversion-python-buildlink: _BUILDLINK_USE
-
-.endif	# SUBVERSION_PYTHON_BUILDLINK2_MK