4 files changed, 41 insertions, 46 deletions

diff --git a/devel/distorm/Makefile b/devel/distorm/Makefile
index da454750ea28..01d93382a29d 100644
--- a/devel/distorm/Makefile
+++ b/devel/distorm/Makefile
@@ -6,35 +6,30 @@
 #
 
 PORTNAME=	distorm
-PORTVERSION=	1.7.30
+PORTVERSION=	3.0.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.ragestorm.net/distorm/
-DISTNAME=	${PORTNAME}64-pkg${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
+		LOCAL/bf
+DISTNAME=	${PORTNAME}${PORTVERSION:R:R}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Fast x86 and x86-64 disassembler library
 
-USE_BZIP2=	yes
+LICENSE=	GPLv3
+
+USE_ZIP=	yes
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/distorm64/build/linux
+WRKSRC=		${WRKDIR}/distorm3/build/linux
 ALL_TARGET=	clib
-PLIST_FILES=	bin/disasm lib/libdistorm64.a lib/libdistorm64.so
+PLIST_FILES=	bin/disasm lib/libdistorm3.a lib/libdistorm3.so
 
-.ifndef(NOPORTDOCS)
-PORTDOCS=	distorm.html qa.txt vol1.html vol2.html
-.endif
+post-build:
+	${CC} ${CFLAGS} -o ${WRKSRC}/disasm ${WRKSRC}/../../linuxproj/main.c \
+		${WRKSRC}/libdistorm3.a
 
 do-install:
-	( cd ${WRKSRC} && ${INSTALL_PROGRAM} libdistorm64.a libdistorm64.so ${PREFIX}/lib \
+	( cd ${WRKSRC} && ${INSTALL_DATA} libdistorm3.a libdistorm3.so ${PREFIX}/lib \
 	&& ${INSTALL_PROGRAM} disasm ${PREFIX}/bin )
 
-.ifndef(NOPORTDOCS)
-post-install:
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKDIR}/distorm64/doc/${f} ${DOCSDIR}
-.endfor
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/distorm/distinfo b/devel/distorm/distinfo
index b18af26db6cc..6d4a2b302eaa 100644
--- a/devel/distorm/distinfo
+++ b/devel/distorm/distinfo
@@ -1,3 +1,3 @@
-MD5 (distorm64-pkg1.7.30.tar.bz2) = e436f2b3f0b1baf1350cca15c01e78e5
-SHA256 (distorm64-pkg1.7.30.tar.bz2) = bc2fc90e2111dfbba7fa397725ed6ae8b70477a3f7c60995e73d44a778a751be
-SIZE (distorm64-pkg1.7.30.tar.bz2) = 91976
+MD5 (distorm3.zip) = 6d8622de0a498574faec761354efa2cc
+SHA256 (distorm3.zip) = 91a4076cee10137f825ffc3bd8a28648cd80597b707974b63a908a5c572ff96f
+SIZE (distorm3.zip) = 177250
diff --git a/devel/distorm/files/patch-Makefile b/devel/distorm/files/patch-Makefile
index fa77b74037a3..ca9d9e9a6257 100644
--- a/devel/distorm/files/patch-Makefile
+++ b/devel/distorm/files/patch-Makefile
@@ -1,22 +1,23 @@
---- Makefile.orig	2008-05-12 02:39:48.081089220 -0400
-+++ Makefile	2008-05-13 03:48:02.113028254 -0400
-@@ -5,8 +5,7 @@
- TARGET	= libdistorm64.so
- COBJS	= ../../src/x86defs.o ../../src/wstring.o ../../src/textdefs.o ../../src/prefix.o ../../src/operands.o ../../src/insts.o ../../src/instructions.o ../../src/distorm.o ../../src/decoder.o
- PYOBJS	= ../../src/x86defs.o ../../src/wstring.o ../../src/textdefs.o ../../src/pydistorm.o ../../src/prefix.o ../../src/operands.o ../../src/insts.o ../../src/instructions.o ../../src/decoder.o
+--- ./Makefile.orig	2010-10-04 23:38:43.000000000 -0400
++++ ./Makefile	2010-10-04 23:41:25.000000000 -0400
+@@ -4,8 +4,7 @@
+ 
+ TARGET	= libdistorm3.so
+ COBJS	= ../../mnemonics.o ../../src/wstring.o ../../src/textdefs.o ../../src/x86defs.o ../../src/prefix.o ../../src/operands.o ../../src/insts.o ../../src/instructions.o ../../src/distorm.o ../../src/decoder.o
 -CC	= gcc
--CFLAGS	= -O2 -Wall -fPIC -DSUPPORT_64BIT_OFFSET -D_DLL
-+CFLAGS	+= -fPIC -DSUPPORT_64BIT_OFFSET -D_DLL
+-CFLAGS	= -fPIC -O2 -Wall -DSUPPORT_64BIT_OFFSET -DLIBDISTORM
++CFLAGS	+= -fPIC -DSUPPORT_64BIT_OFFSET -DLIBDISTORM
  
- all: clib py
+ all: clib
  
-@@ -15,7 +14,8 @@
+@@ -13,8 +12,8 @@
+ 	/bin/rm -rf ../../src/*.o ${TARGET} ../../distorm3.a ../../mnemonics.o
  
  clib: ${COBJS}
- 	${CC} ${CFLAGS} ${VERSION} ${COBJS} -fPIC -shared -o ${TARGET}
--	ar rs ../../distorm64.a ${COBJS}
-+	ar rs libdistorm64.a ${COBJS}
-+	${CC} ${CFLAGS} -o disasm ../../linuxproj/main.c libdistorm64.a
+-	${CC} ${CFLAGS} ${VERSION} ${COBJS} -shared -o ${TARGET}
+-	ar rs ../../distorm3.a ${COBJS}
++	${CC} ${CFLAGS} ${LDFLAGS} ${COBJS} -shared -o ${TARGET}
++	${AR} rs libdistorm3.a ${COBJS}
  
- py: ${PYOBJS}
- 	${CC} ${CFLAGS} ${VERSION} ${PYOBJS} -fPIC -shared -o ${TARGET}
+ install: libdistorm3.so
+ 	install -s ${TARGET} /usr/local/lib
diff --git a/devel/distorm/pkg-descr b/devel/distorm/pkg-descr
index f662bb7d0aae..6bbd39d5bbae 100644
--- a/devel/distorm/pkg-descr
+++ b/devel/distorm/pkg-descr
@@ -1,10 +1,9 @@
-diStorm is a binary stream disassembler. It's capable of disassembling
-80x86 instructions in 16, 32, and 64 bits (AMD64, X86-64). In
-addition, it disassembles FPU, MMX, SSE, SSE2, SSE3, SSE4, 3DNow!
-(with extensions), new x86-64 instruction sets, VMX, and AMD's SVM! 
-diStorm was written to decode every instruction quickly and accurately,
-with robust handling of valid and unused prefixes. It supports
-multi-threading, which means you can disassemble several streams 
-simultaneously.
+diStorm is a binary stream disassembler of x86 instructions. It can operate
+in 16, 32, and 64 bit modes, and supports FPU, MMX, SSE, SSE2, SSE3, SSE4,
+3DNow! (with extensions), x86-64, VMX, AMD SVM, and AVX instruction sets.
+diStorm was written to decode every instruction quickly and accurately, with
+robust handling of valid and unused prefixes. The output is a special structure
+that can describe any x86 instruction, and later be formatted into text for
+display.
 
-WWW: http://www.ragestorm.net/distorm/
+WWW: http://code.google.com/p/distorm/