3 files changed, 44 insertions, 27 deletions

diff --git a/misc/py-xdelta3/Makefile b/misc/py-xdelta3/Makefile
index a7726d316500..9598b4a803d6 100644
--- a/misc/py-xdelta3/Makefile
+++ b/misc/py-xdelta3/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 CATEGORIES?=	misc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -26,11 +26,32 @@ PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME}.so \
 		%%PYTHON_SITELIBDIR%%/xdelta3module.so \
 		%%PYTHON_SITELIBDIR%%/xdelta3.py
 
+post-patch:	.SILENT
+	${REINPLACE_CMD} -i.slave.bak -e '/^SWIG_FLAGS/s/=/& `python$$(PYVER)-config --cflags` -fpic/' \
+		-e '/^xdelta3module\.so:/,/^$$/ { s/ld/$$(CC)/; \
+			s/.*libpython.*\.so.*/`python$$(PYVER)-config --ldflags`/; \
+			/-lc/d; }' \
+		-e 's|/usr/include/python$$(PYVER)|${PYTHON_INCLUDEDIR}|' \
+		-e 's|/usr/lib/python$$(PYVER)|${PYTHON_LIBDIR}|' \
+		-e 's|/usr/lib/libpython|${LOCALBASE}/lib/libpython|' \
+		-e '/^all:/s/:.*/: swigtgt/' \
+		-e '/^PYVER/s/=.*/= ${PYTHON_VER}/' \
+		${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e "/^REL/s/=.*/='${PORTVERSION}'/" \
+		-e "/extra_compile_args.*\[/,/]/ { s/'-O3',//; s/'-g',//; }" \
+		${WRKSRC}/${PYSETUP}
+
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xdelta3module.so ${PYTHONPREFIX_SITELIBDIR}
+	${INSTALL_LIB} ${WRKSRC}/xdelta3module.so ${PYTHONPREFIX_SITELIBDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/xdelta3.py ${PYTHONPREFIX_SITELIBDIR}
 
-regression-test: build
+test:	build
 	${PYTHON_CMD} ${WRKSRC}/xdelta3-test.py
 
+broken-regression-test: build
+	@cd ${WRKSRC} && for d in build/lib.*-${PYTHON_VER}; do \
+		set -x; \
+		PYTHONPATH=$${d}: ${PYTHON_CMD} testing/xdelta3-regtest.py; \
+	done
+
 .include "${MASTERDIR}/Makefile"
diff --git a/misc/xdelta3/Makefile b/misc/xdelta3/Makefile
index 3ae3fc7eea09..c81f4c7a80c5 100644
--- a/misc/xdelta3/Makefile
+++ b/misc/xdelta3/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xdelta
-DISTVERSION=	3.0y
-PORTREVISION?=	0
+DISTVERSION=	3.0.0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES?=	misc devel
 MASTER_SITES=	GOOGLE_CODE
@@ -17,6 +17,7 @@ MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Open-source binary diff, VCDIFF/RFC 3284 delta compression
 
 USE_GMAKE=	yes
+PLIST_FILES?=	bin/xdelta3
 
 .include <bsd.port.pre.mk>
 
@@ -24,32 +25,27 @@ USE_GMAKE=	yes
 BROKEN=		Does not compile on sparc64
 .endif
 
-.if ${SLAVE_PORT:Mno}
-PLIST_FILES=	bin/xdelta3
-.endif
+post-patch:	master-post-patch
 
-post-patch:	.SILENT
+master-post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/^CFLAGS/s/=/+&/' \
 		-e 's/-O3//; s/-g//' \
-		-e '/^all:/,/^$$/ { s/:.*/: xdelta3/; /testing/d; }' \
-		${WRKSRC}/Makefile
-.if ${SLAVE_PORT:Myes}
-	${REINPLACE_CMD} -i.slave.bak -e '/^SWIG_FLAGS/s/=/& `python$$(PYVER)-config --cflags` -fpic/' \
-		-e '/^xdelta3module\.so:/,/^$$/ { s/ld/$$(CC)/; \
-			s/.*libpython.*\.so.*/`python$$(PYVER)-config --ldflags`/; \
-			/-lc/d; }' \
-		-e 's|/usr/include/python$$(PYVER)|${PYTHON_INCLUDEDIR}|' \
-		-e 's|/usr/lib/python$$(PYVER)|${PYTHON_LIBDIR}|' \
-		-e 's|/usr/lib/libpython|${LOCALBASE}/lib/libpython|' \
-		-e '/^all:/s/:.*/: swigtgt/' \
-		-e '/^PYVER/s/=.*/= ${PYTHON_VER}/' \
+		-e '/^all:/,/^$$/ { s/:.*/: xdelta3/; s/make/$$(MAKE)/; }' \
 		${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e "/^REL/s/=.*/='${PORTVERSION}'/" \
-		-e "/extra_compile_args.*\[/,/]/ { s/'-O3',//; s/'-g',//; }" \
-		${WRKSRC}/${PYSETUP}
-.else
+
+.if ${SLAVE_PORT:Mno}
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdelta3 ${PREFIX}/bin/
 .endif
 
+.if !target(test)
+test:	build
+	${WRKSRC}/xdelta3 test
+.endif
+
+.if !target(regression-test)
+regression-test: build
+	${WRKSRC}/testing/xdelta3-regtest
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/misc/xdelta3/distinfo b/misc/xdelta3/distinfo
index bee4377bdaae..e1a0c987aa70 100644
--- a/misc/xdelta3/distinfo
+++ b/misc/xdelta3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xdelta3.0y.tar.gz) = 13fc809e51016d5633b12029efed2dd0c8cb050154809684938dc291faf16a79
-SIZE (xdelta3.0y.tar.gz) = 228808
+SHA256 (xdelta3.0.0.tar.gz) = dfe61aac8d6ab301be2f3aed561d15f95f30a270e25d179f7cf0bde010ada102
+SIZE (xdelta3.0.0.tar.gz) = 282201