simplify build a bit, and allow any Python version >=2.2

2 files changed, 65 insertions, 69 deletions

diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 5bce0d98f24..67e2c4d37d3 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/14 12:08:00 abs Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/18 10:24:11 drochner Exp $
 #
 
 DISTNAME=	rdiff-backup-0.12.3
@@ -9,23 +9,19 @@ MAINTAINER=	davids@idiom.com
 HOMEPAGE=	http://rdiff-backup.stanford.edu/
 COMMENT=	Remote incremental backup utility
 
-PYTHON_VERSION_REQD=	22
+PYDISTUTILSPKG=		yes
+PYTHON_VERSIONS_ACCEPTED= 22 22pth 23 23pth
 USE_BUILDLINK2=		yes
 
 post-patch:
-	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		< ${WRKSRC}/setup.py > ${WRKSRC}/local_setup.py
-
-do-build:
-	cd ${WRKSRC}; ${PYTHONBIN} local_setup.py build
-
-do-install:
-	cd ${WRKSRC}; ${PYTHONBIN} local_setup.py install \
-		--prefix=${PREFIX} --skip-build
+	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		< ${WRKSRC}/setup.py > ${WRKSRC}/setup.py.tmp && \
+		${MV} ${WRKSRC}/setup.py.tmp ${WRKSRC}/setup.py
 
 BUILDLINK_DEPENDS.librsync=	librsync>=0.9.6
 
 .include "../../devel/librsync/buildlink2.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rdiff-backup/PLIST b/sysutils/rdiff-backup/PLIST
index 6ad55811ad1..46b4a7d898f 100644
--- a/sysutils/rdiff-backup/PLIST
+++ b/sysutils/rdiff-backup/PLIST
@@ -1,65 +1,65 @@
-@comment $NetBSD: PLIST,v 1.2 2003/08/14 12:08:00 abs Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/08/18 10:24:11 drochner Exp $
 bin/rdiff-backup
-lib/python2.2/site-packages/rdiff_backup/C.so
-lib/python2.2/site-packages/rdiff_backup/FilenameMapping.py
-lib/python2.2/site-packages/rdiff_backup/FilenameMapping.pyc
-lib/python2.2/site-packages/rdiff_backup/Globals.py
-lib/python2.2/site-packages/rdiff_backup/Globals.pyc
-lib/python2.2/site-packages/rdiff_backup/Hardlink.py
-lib/python2.2/site-packages/rdiff_backup/Hardlink.pyc
-lib/python2.2/site-packages/rdiff_backup/Main.py
-lib/python2.2/site-packages/rdiff_backup/Main.pyc
-lib/python2.2/site-packages/rdiff_backup/Rdiff.py
-lib/python2.2/site-packages/rdiff_backup/Rdiff.pyc
-lib/python2.2/site-packages/rdiff_backup/Security.py
-lib/python2.2/site-packages/rdiff_backup/Security.pyc
-lib/python2.2/site-packages/rdiff_backup/SetConnections.py
-lib/python2.2/site-packages/rdiff_backup/SetConnections.pyc
-lib/python2.2/site-packages/rdiff_backup/TempFile.py
-lib/python2.2/site-packages/rdiff_backup/TempFile.pyc
-lib/python2.2/site-packages/rdiff_backup/Time.py
-lib/python2.2/site-packages/rdiff_backup/Time.pyc
-lib/python2.2/site-packages/rdiff_backup/__init__.py
-lib/python2.2/site-packages/rdiff_backup/__init__.pyc
-lib/python2.2/site-packages/rdiff_backup/_librsync.so
-lib/python2.2/site-packages/rdiff_backup/backup.py
-lib/python2.2/site-packages/rdiff_backup/backup.pyc
-lib/python2.2/site-packages/rdiff_backup/connection.py
-lib/python2.2/site-packages/rdiff_backup/connection.pyc
-lib/python2.2/site-packages/rdiff_backup/increment.py
-lib/python2.2/site-packages/rdiff_backup/increment.pyc
-lib/python2.2/site-packages/rdiff_backup/iterfile.py
-lib/python2.2/site-packages/rdiff_backup/iterfile.pyc
-lib/python2.2/site-packages/rdiff_backup/lazy.py
-lib/python2.2/site-packages/rdiff_backup/lazy.pyc
-lib/python2.2/site-packages/rdiff_backup/librsync.py
-lib/python2.2/site-packages/rdiff_backup/librsync.pyc
-lib/python2.2/site-packages/rdiff_backup/log.py
-lib/python2.2/site-packages/rdiff_backup/log.pyc
-lib/python2.2/site-packages/rdiff_backup/manage.py
-lib/python2.2/site-packages/rdiff_backup/manage.pyc
-lib/python2.2/site-packages/rdiff_backup/metadata.py
-lib/python2.2/site-packages/rdiff_backup/metadata.pyc
-lib/python2.2/site-packages/rdiff_backup/regress.py
-lib/python2.2/site-packages/rdiff_backup/regress.pyc
-lib/python2.2/site-packages/rdiff_backup/restore.py
-lib/python2.2/site-packages/rdiff_backup/restore.pyc
-lib/python2.2/site-packages/rdiff_backup/robust.py
-lib/python2.2/site-packages/rdiff_backup/robust.pyc
-lib/python2.2/site-packages/rdiff_backup/rorpiter.py
-lib/python2.2/site-packages/rdiff_backup/rorpiter.pyc
-lib/python2.2/site-packages/rdiff_backup/rpath.py
-lib/python2.2/site-packages/rdiff_backup/rpath.pyc
-lib/python2.2/site-packages/rdiff_backup/selection.py
-lib/python2.2/site-packages/rdiff_backup/selection.pyc
-lib/python2.2/site-packages/rdiff_backup/static.py
-lib/python2.2/site-packages/rdiff_backup/static.pyc
-lib/python2.2/site-packages/rdiff_backup/statistics.py
-lib/python2.2/site-packages/rdiff_backup/statistics.pyc
+${PYSITELIB}/rdiff_backup/C.so
+${PYSITELIB}/rdiff_backup/FilenameMapping.py
+${PYSITELIB}/rdiff_backup/FilenameMapping.pyc
+${PYSITELIB}/rdiff_backup/Globals.py
+${PYSITELIB}/rdiff_backup/Globals.pyc
+${PYSITELIB}/rdiff_backup/Hardlink.py
+${PYSITELIB}/rdiff_backup/Hardlink.pyc
+${PYSITELIB}/rdiff_backup/Main.py
+${PYSITELIB}/rdiff_backup/Main.pyc
+${PYSITELIB}/rdiff_backup/Rdiff.py
+${PYSITELIB}/rdiff_backup/Rdiff.pyc
+${PYSITELIB}/rdiff_backup/Security.py
+${PYSITELIB}/rdiff_backup/Security.pyc
+${PYSITELIB}/rdiff_backup/SetConnections.py
+${PYSITELIB}/rdiff_backup/SetConnections.pyc
+${PYSITELIB}/rdiff_backup/TempFile.py
+${PYSITELIB}/rdiff_backup/TempFile.pyc
+${PYSITELIB}/rdiff_backup/Time.py
+${PYSITELIB}/rdiff_backup/Time.pyc
+${PYSITELIB}/rdiff_backup/__init__.py
+${PYSITELIB}/rdiff_backup/__init__.pyc
+${PYSITELIB}/rdiff_backup/_librsync.so
+${PYSITELIB}/rdiff_backup/backup.py
+${PYSITELIB}/rdiff_backup/backup.pyc
+${PYSITELIB}/rdiff_backup/connection.py
+${PYSITELIB}/rdiff_backup/connection.pyc
+${PYSITELIB}/rdiff_backup/increment.py
+${PYSITELIB}/rdiff_backup/increment.pyc
+${PYSITELIB}/rdiff_backup/iterfile.py
+${PYSITELIB}/rdiff_backup/iterfile.pyc
+${PYSITELIB}/rdiff_backup/lazy.py
+${PYSITELIB}/rdiff_backup/lazy.pyc
+${PYSITELIB}/rdiff_backup/librsync.py
+${PYSITELIB}/rdiff_backup/librsync.pyc
+${PYSITELIB}/rdiff_backup/log.py
+${PYSITELIB}/rdiff_backup/log.pyc
+${PYSITELIB}/rdiff_backup/manage.py
+${PYSITELIB}/rdiff_backup/manage.pyc
+${PYSITELIB}/rdiff_backup/metadata.py
+${PYSITELIB}/rdiff_backup/metadata.pyc
+${PYSITELIB}/rdiff_backup/regress.py
+${PYSITELIB}/rdiff_backup/regress.pyc
+${PYSITELIB}/rdiff_backup/restore.py
+${PYSITELIB}/rdiff_backup/restore.pyc
+${PYSITELIB}/rdiff_backup/robust.py
+${PYSITELIB}/rdiff_backup/robust.pyc
+${PYSITELIB}/rdiff_backup/rorpiter.py
+${PYSITELIB}/rdiff_backup/rorpiter.pyc
+${PYSITELIB}/rdiff_backup/rpath.py
+${PYSITELIB}/rdiff_backup/rpath.pyc
+${PYSITELIB}/rdiff_backup/selection.py
+${PYSITELIB}/rdiff_backup/selection.pyc
+${PYSITELIB}/rdiff_backup/static.py
+${PYSITELIB}/rdiff_backup/static.pyc
+${PYSITELIB}/rdiff_backup/statistics.py
+${PYSITELIB}/rdiff_backup/statistics.pyc
 man/man1/rdiff-backup.1
 share/doc/${PKGNAME}/CHANGELOG
 share/doc/${PKGNAME}/COPYING
 share/doc/${PKGNAME}/FAQ.html
 share/doc/${PKGNAME}/README
 @dirrm share/doc/${PKGNAME}
-@dirrm lib/python2.2/site-packages/rdiff_backup
+@dirrm ${PYSITELIB}/rdiff_backup