aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/distorm/Makefile69
-rw-r--r--devel/distorm/distinfo6
-rw-r--r--devel/py-distorm/Makefile53
-rw-r--r--devel/py-distorm/distinfo4
-rw-r--r--devel/py-distorm/files/patch-Makefile21
-rw-r--r--devel/py-distorm/pkg-descr10
-rw-r--r--devel/py-ptrace/Makefile5
7 files changed, 69 insertions, 99 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
diff --git a/devel/py-distorm/Makefile b/devel/py-distorm/Makefile
index 67423fb077a8..b3354abaf0f3 100644
--- a/devel/py-distorm/Makefile
+++ b/devel/py-distorm/Makefile
@@ -6,54 +6,9 @@
#
PORTNAME= distorm
-PORTVERSION= 1.7.30
-PORTREVISION= 1
-CATEGORIES= devel python
-MASTER_SITES= http://www.ragestorm.net/distorm/ \
- LOCAL/bf
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTFILES= ${PORTNAME}64-pkg${PORTVERSION}.tar.bz2 \
- diSlib64.py
-EXTRACT_ONLY= ${PORTNAME}64-pkg${PORTVERSION}.tar.bz2
-MAINTAINER= bf@FreeBSD.org
-COMMENT= Fast x86 and x86-64 disassembler library with Python interface
+COMMENT= Python interface for fast x86 and x86-64 disassembler library
-USE_BZIP2= yes
-USE_PYTHON= -2.7
-LICENSE= BSD
-
-WRKSRC= ${WRKDIR}/distorm64/build/linux
-ALL_TARGET= py
-PLIST_FILES= %%PYTHON_SITELIBDIR%%/distorm.so \
- %%PYTHON_SITELIBDIR%%/pydistorm.py \
- bin/diSlib64.py
-
-.if !defined(NOPORTDOCS)
-DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-PORTDOCS= distorm.html qa.txt vol1.html vol2.html README
-.endif
-
-post-patch:
- ${REINPLACE_CMD} -e "s,python2.5,${PYTHON_VERSION}," \
- ${WRKDIR}/distorm64/src/pydistorm.h
- ${REINPLACE_CMD} -e "s,libdistorm64.so,${PYTHON_SITELIBDIR}/distorm.so," \
- ${WRKDIR}/distorm64/python/pydistorm.py
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/distorm.so ${PYTHON_SITELIBDIR}
- ${INSTALL_SCRIPT} ${WRKDIR}/distorm64/python/pydistorm.py ${PYTHON_SITELIBDIR}
- ${ECHO_CMD} '#!'${PYTHON_CMD} | ${CAT} - ${DISTDIR}/diSlib64.py \
- > ${WRKDIR}/diSlib64.py
- ${INSTALL_SCRIPT} ${WRKDIR}/diSlib64.py ${PREFIX}/bin
-
-.if !defined(NOPORTDOCS)
-post-install:
- ${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS:NREADME}
- ${INSTALL_DATA} ${WRKDIR}/distorm64/doc/${f} ${DOCSDIR}
-.endfor
- ${INSTALL_DATA} ${WRKDIR}/distorm64/python/README ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
+PYTHON_SLAVEPORT= yes
+MASTERDIR= ${.CURDIR}/../distorm
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/py-distorm/distinfo b/devel/py-distorm/distinfo
deleted file mode 100644
index 73eecffaa111..000000000000
--- a/devel/py-distorm/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (distorm64-pkg1.7.30.tar.bz2) = bc2fc90e2111dfbba7fa397725ed6ae8b70477a3f7c60995e73d44a778a751be
-SIZE (distorm64-pkg1.7.30.tar.bz2) = 91976
-SHA256 (diSlib64.py) = e3958217bac5bfb32c99fea3b5534b8c2e98a63f9e63240685de35ee70043fba
-SIZE (diSlib64.py) = 27401
diff --git a/devel/py-distorm/files/patch-Makefile b/devel/py-distorm/files/patch-Makefile
deleted file mode 100644
index cb99e9738996..000000000000
--- a/devel/py-distorm/files/patch-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig 2008-05-12 02:39:48.081089220 -0400
-+++ Makefile 2008-05-13 03:58:39.453527116 -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
--CC = gcc
--CFLAGS = -O2 -Wall -fPIC -DSUPPORT_64BIT_OFFSET -D_DLL
-+CFLAGS += -fPIC -DSUPPORT_64BIT_OFFSET -D_DLL -I${LOCALBASE}/include
-
- all: clib py
-
-@@ -18,7 +17,7 @@
- ar rs ../../distorm64.a ${COBJS}
-
- py: ${PYOBJS}
-- ${CC} ${CFLAGS} ${VERSION} ${PYOBJS} -fPIC -shared -o ${TARGET}
-+ ${CC} ${CFLAGS} ${VERSION} ${PYOBJS} -fPIC -shared -o distorm.so
-
- install: libdistorm64.so
- install -s ${TARGET} /usr/local/lib
diff --git a/devel/py-distorm/pkg-descr b/devel/py-distorm/pkg-descr
deleted file mode 100644
index a6d8915cd949..000000000000
--- a/devel/py-distorm/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-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. Also included is a Python PE parser, diSlib64.py.
-
-WWW: http://www.ragestorm.net/distorm/
diff --git a/devel/py-ptrace/Makefile b/devel/py-ptrace/Makefile
index 3a409a1011b4..08501b75f1ed 100644
--- a/devel/py-ptrace/Makefile
+++ b/devel/py-ptrace/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ptrace
PORTVERSION= 0.6.3
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ DISTNAME= python-ptrace-${PORTVERSION}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Python binding of ptrace
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/distorm.so:${PORTSDIR}/devel/py-distorm
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/distorm3/libdistorm3.so:${PORTSDIR}/devel/py-distorm
USE_PYTHON= 2.5-2.7
USE_PYDISTUTILS= yes
@@ -25,7 +26,7 @@ LICENSE= GPLv2
ONLY_FOR_ARCHS= i386
post-patch:
- ${REINPLACE_CMD} -e 's|libdistorm64.so|${PYTHON_SITELIBDIR}/distorm.so|' \
+ ${REINPLACE_CMD} -e 's|libdistorm64.so|${PYTHON_SITELIBDIR}/distorm3/libdistorm3.so|' \
${WRKSRC}/ptrace/pydistorm.py
.include <bsd.port.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 12:41:16 +0000