Attachment 118473 Details for Bug 160714 – a.diff

[patch] a.diff

a.diff (text/plain), 4.20 KB, created by h h on 2011-09-13 20:40:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: h h

Created: 2011-09-13 20:40:07 UTC

Size: 4.20 KB

patch

obsolete

>Index: misc/py-xdelta3/Makefile
>===================================================================
>RCS file: /a/.csup/ports/misc/py-xdelta3/Makefile,v
>retrieving revision 1.1
>diff -u -p -r1.1 Makefile
>--- misc/py-xdelta3/Makefile	11 Jul 2010 18:57:42 -0000	1.1
>+++ misc/py-xdelta3/Makefile	13 Sep 2011 19:30:28 -0000
>@@ -26,11 +26,32 @@ PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PYD
> 		%%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"
>Index: misc/xdelta3/Makefile
>===================================================================
>RCS file: /a/.csup/ports/misc/xdelta3/Makefile,v
>retrieving revision 1.7
>diff -u -p -r1.7 Makefile
>--- misc/xdelta3/Makefile	14 Aug 2010 07:55:41 -0000	1.7
>+++ misc/xdelta3/Makefile	13 Sep 2011 19:09:53 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	xdelta
>-DISTVERSION=	3.0y
>+DISTVERSION=	3.0.0
> PORTREVISION?=	0
> PORTEPOCH?=	1
> CATEGORIES?=	misc devel
>@@ -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>
>Index: misc/xdelta3/distinfo
>===================================================================
>RCS file: /a/.csup/ports/misc/xdelta3/distinfo,v
>retrieving revision 1.5
>diff -u -p -r1.5 distinfo
>--- misc/xdelta3/distinfo	19 Mar 2011 12:31:45 -0000	1.5
>+++ misc/xdelta3/distinfo	13 Sep 2011 17:22:45 -0000
>@@ -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

Actions: View | Diff

Attachments on bug 160714: 118473