3 files changed, 10 insertions, 30 deletions
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index 217171940ac8..f296e22cf611 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -21,24 +21,25 @@ COMMENT=	Python module for the libnet packet construction library
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig1.1:${PORTSDIR}/devel/swig11 \
 		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
 
-BROKEN=		Does not compile after python 2.4 update
-
-USE_REINPLACE=	yes
 USE_PYTHON=	yes
-USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+MAKE_ARGS=	SWIG=${LOCALBASE}/bin/swig1.1 \
+		LIBNET_INCLUDES=-I${LOCALBASE}/include \
+		PYTHON_INCLUDES=-I${PYTHON_INCLUDEDIR} \
+		CFLAGS="${CFLAGS} `libnet-config --defines` -fPIC" \
+		LIBNET_LIB=${LOCALBASE}/lib/libnet.a \
+		CC=${CC}
+
+PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/libnet.py \
+		lib/%%PYTHON_VERSION%%/site-packages/libnetcmodule.so
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 BROKEN=		"Does not compile on amd64 (tries to link non-PIC libnet.a into PIC shared library)"
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
-		s,%%PYTHON_INCLUDEDIR%%,${PYTHON_INCLUDEDIR},g ; \
-		s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
-
 do-install:
 .for file in libnet.py libnetcmodule.so
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PYTHON_SITELIBDIR}
diff --git a/net/py-libnet/files/patch-Makefile b/net/py-libnet/files/patch-Makefile
deleted file mode 100644
index 5290da4c165e..000000000000
--- a/net/py-libnet/files/patch-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	Mon Oct 15 08:54:55 2001
-+++ Makefile	Fri Nov 21 15:44:14 2003
-@@ -1,10 +1,10 @@
- 
--SWIG=/usr/local/bin/swig
--CC=gcc -g
--PYTHON_INCLUDES=-I/usr/include/python1.5
--LIBNET_INCLUDES=-I/usr/include/libnet
--CFLAGS=`libnet-config --defines`
--LIBNET_LIB=/usr/lib/libnet.a
-+SWIG=/usr/local/bin/swig1.1
-+#CC=gcc -g
-+PYTHON_INCLUDES=-I/usr/local/include/python2.3
-+LIBNET_INCLUDES=-I/usr/local/include
-+CFLAGS+=`libnet-config --defines` -fPIC
-+LIBNET_LIB=/usr/local/lib/libnet.a
- 
- OBJS= libnet.o exception.o error.o interface.o
- 
diff --git a/net/py-libnet/pkg-plist b/net/py-libnet/pkg-plist
deleted file mode 100644
index 742fbe635180..000000000000
--- a/net/py-libnet/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/%%PYTHON_VERSION%%/site-packages/libnet.py
-lib/%%PYTHON_VERSION%%/site-packages/libnetcmodule.so