After many problems with silent upstream distfile changes,

switch to a locally-rolled distfile; update to svn r185;
patch and bump revision of a dependent port.

2 files changed, 62 insertions, 13 deletions

diff --git a/devel/distorm/Makefile b/devel/distorm/Makefile
index b44b88955a8d..3038565ea169 100644
--- a/devel/distorm/Makefile
+++ b/devel/distorm/Makefile
@@ -5,25 +5,58 @@
 # $FreeBSD$
 #
 
-PORTNAME=	distorm
-PORTVERSION=	3.0.0
-PORTREVISION=	3
+PORTNAME?=	distorm
+DISTVERSION=	20110625-r185
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		LOCAL/bf
-DISTNAME=	${PORTNAME}${PORTVERSION:R:R}
+.if defined(PYTHON_SLAVEPORT)
+CATEGORIES+=	python
+.endif
+MASTER_SITES=	LOCAL/bf
+.if defined(PYTHON_SLAVEPORT)
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+.endif
+.if defined(PYTHON_SLAVEPORT) || make(makesum)
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dislib.py
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER=	bf@FreeBSD.org
-COMMENT=	Fast x86 and x86-64 disassembler library
+COMMENT?=	Fast x86 and x86-64 disassembler library
 
 LICENSE=	GPLv3
 
 USE_DOS2UNIX=	yes
-USE_ZIP=	yes
+USE_XZ =	yes
+
+.if defined(PYTHON_SLAVEPORT)
+USE_PYTHON=		-2.7
+
+USE_PYDISTUTILS=		yes
+PYDISTUTILS_PKGNAME=		distorm3
+PYDISTUTILS_PKGVERSION =	1.0
+
+PLIST_DIRS=	%%PYTHON_SITELIBDIR%%/distorm3
+
+PLIST_FILES =	bin/dislib.py \
+		%%PYTHON_SITELIBDIR%%/distorm3/sample.py \
+		%%PYTHON_SITELIBDIR%%/distorm3/__init__.py \
+		%%PYTHON_SITELIBDIR%%/distorm3/libdistorm3.so \
+		%%PYTHON_SITELIBDIR%%/distorm3/sample.pyc \
+		%%PYTHON_SITELIBDIR%%/distorm3/__init__.pyc \
+		%%PYTHON_SITELIBDIR%%/distorm3/sample.pyo \
+		%%PYTHON_SITELIBDIR%%/distorm3/__init__.pyo
+.else
 USE_LDCONFIG=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/make/linux
-PLIST_FILES=	bin/disasm lib/libdistorm3.a lib/libdistorm3.so lib/libdistorm3.so.0
+
+PLIST_FILES=	bin/disasm \
+		include/distorm.h \
+		include/mnemonics.h \
+		lib/libdistorm3.a \
+		lib/libdistorm3.so \
+		lib/libdistorm3.so.1
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -33,6 +66,18 @@ PICFLAG?=	-fPIC
 PICFLAG?=	-fpic
 .endif
 
+.if defined(PYTHON_SLAVEPORT)
+post-extract:
+	@${CP} ${_DISTDIR}/dislib.py ${WRKSRC}
+
+post-patch:
+	@${REINPLACE_CMD} -e "1{x;s|^|#!${PYTHON_CMD}|;G;}" ${WRKSRC}/dislib.py
+	@${REINPLACE_CMD} -e "\|extra_compile_args=|s| '-O2',||" ${WRKSRC}/setup.py
+
+post-install:
+	@${INSTALL_SCRIPT} ${WRKSRC}/dislib.py ${PREFIX}/bin
+
+.else
 do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 	EXTRAFLAGS="${PICFLAG} -DDISTORM_DYNAMIC" ${MAKE} ${_MAKE_JOBS} \
@@ -44,9 +89,11 @@ do-build:
 	${BUILD_WRKSRC}/libdistorm3.a
 
 do-install:
-	(cd ${BUILD_WRKSRC}; ${INSTALL_LIB} libdistorm3.a ${PREFIX}/lib; \
-	${INSTALL_LIB} libdistorm3.so ${PREFIX}/lib/libdistorm3.so.0; \
+	@(cd ${BUILD_WRKSRC}; ${INSTALL_LIB} libdistorm3.a ${PREFIX}/lib; \
+	${INSTALL_LIB} libdistorm3.so ${PREFIX}/lib/libdistorm3.so.1; \
 	${LN} -sf ${PREFIX}/lib/libdistorm3.so.0 ${PREFIX}/lib/libdistorm3.so; \
 	${INSTALL_PROGRAM} disasm ${PREFIX}/bin)
+	@${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include
 
+.endif
 .include <bsd.port.post.mk>
diff --git a/devel/distorm/distinfo b/devel/distorm/distinfo
index 1d47763510e3..6efe6ad122ba 100644
--- a/devel/distorm/distinfo
+++ b/devel/distorm/distinfo
@@ -1,2 +1,4 @@
-SHA256 (distorm3.zip) = 4fba8606caab377d10646953a205507a1faa184047f869cc13e62b1ebf4a1b0e
-SIZE (distorm3.zip) = 205761
+SHA256 (distorm-20110625-r185.tar.xz) = a297cea7a42c52b98302b7be3f6e813e14542bc30d33700a816a401d9e8fe2db
+SIZE (distorm-20110625-r185.tar.xz) = 136156
+SHA256 (dislib.py) = ad2d3dda291887ec93f000e30e5f02a77f4e446be0c3042beb7b1e99c5e6e640
+SIZE (dislib.py) = 27405