Unbreak net/py-libdnet (fix plist). Since I'm there: - define USE_LDCONFIG for slave and master ports; - add CONFLICTS; - remove the BROKEN line for FreeBSD 4.x; - s/test/regression-test/; - pet portlint. Fix: Please apply the following patches: How-To-Repeat: See logs on pointyhat <http://portsmon.droso.net/portoverview.py?category=net&portname=py-libdnet>
Responsible Changed From-To: freebsd-ports-bugs->freebsd-python freebsd-python@ wants to have py- PRs
State Changed From-To: open->feedback Awaiting maintainers feedback
State Changed From-To: feedback->open Grab, I have a patch here to turn py-libdnet into a slave port of libdnet which is a better fix. I had thought this had already been committed. Will take a look at my patch to make sure there aren't any lingering problems which caused this to not be committed.
Responsible Changed From-To: freebsd-python->tmclaugh Grab, I have a patch here to turn py-libdnet into a slave port of libdnet which is a better fix. I had thought this had already been committed. Will take a look at my patch to make sure there aren't any lingering problems which caused this to not be committed.
Both ports Tinderbox fine. Also, attached are non-base64 encoded patches for the okay. ---py-libdnet-SLAVE.diff--- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/py-libdnet/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 11 Feb 2007 01:23:31 -0000 1.6 +++ Makefile 28 Feb 2007 05:15:42 -0000 @@ -5,17 +5,30 @@ # $FreeBSD: ports/net/py-libdnet/Makefile,v 1.6 2007/02/11 01:23:31 kris Exp $ # +PORTREVISION= 1 +CATEGORIES= net python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + COMMENT= Python module for libdnet -BROKEN= Incomplete pkg-plist -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2007-04-10 +LIB_DEPENDS= dnet.1:${PORTSDIR}/net/libdnet + +NOT_FOR_ARCHS= ia64 +NOT_FOR_ARCHS_REASON_ia64= fails to build with internal compiler error MASTERDIR= ${.CURDIR}/../libdnet +INSTALL_WRKSRC= ${WRKSRC}/python +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist -BUILD_PYTHON_MODULE= yes +LIBDNET_SLAVE= yes -NOT_FOR_ARCHS= ia64 -NOT_FOR_ARCHS_REASON_ia64= fails to build with internal compiler error +USE_PYTHON= yes +CONFIGURE_ARGS= --with-python + +.if defined(MAINTAINER_MODE) +regression-test: install + ${PYTHON_CMD} ${INSTALL_WRKSRC}/test.py +.endif .include "${MASTERDIR}/Makefile" Index: pkg-descr =================================================================== RCS file: pkg-descr diff -N pkg-descr --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-descr 28 Feb 2007 05:15:42 -0000 @@ -0,0 +1,8 @@ +Python wrapper around libdnet which provides a simplified, portable +interface to several low-level networking routines, including network +address manipulation, kernel arp(4) cache and route(4) table lookup and +manipulation, network firewalling, network interface lookup and +manipulation, and raw IP packet and Ethernet frame transmission. It is +intended to complement the functionality provided by pcap(3). + +WWW: http://libdnet.sourceforge.net/ Index: pkg-plist =================================================================== RCS file: pkg-plist diff -N pkg-plist --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-plist 28 Feb 2007 05:15:42 -0000 @@ -0,0 +1 @@ +%%PYTHON_SITELIBDIR%%/dnet.so ---py-libdnet-SLAVE.diff--- ---libdnet-MASTER.diff--- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/libdnet/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 30 Jan 2007 19:32:35 -0000 1.26 +++ Makefile 28 Feb 2007 04:17:07 -0000 @@ -7,50 +7,29 @@ PORTNAME= libdnet PORTVERSION= 1.11 -CATEGORIES= net +PORTREVISION?= 1 +CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -.if defined(BUILD_PYTHON_MODULE) -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -.endif -MAINTAINER= onatan@gmail.com +MAINTAINER?= onatan@gmail.com COMMENT?= A simple interface to low level networking routines GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes -SLAVE_DIRS= net/py-libdnet - -.if defined(BUILD_PYTHON_MODULE) -USE_PYTHON= yes -CONFIGURE_ARGS+= --with-python -INSTALL_WRKSRC= ${BUILD_WRKSRC}/python -PLIST_FILES= %%PYTHON_SITELIBDIR%%/dnet.so -PLIST_SUB+= MASTER="@comment " -.else -CONFIGURE_ARGS+= --without-python +.if !defined(LIBDNET_SLAVE) +CONFIGURE_ARGS+=--without-python USE_LDCONFIG= yes -PLIST_SUB+= MASTER="" MAN3= dnet.3 MAN8= dnet.8 .endif .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -IGNORE= doesn't build on FreeBSD 4.x -.endif - -pre-everything:: -.if !defined(BUILD_PYTHON_MODULE) - @${ECHO_MSG} "===>" - @${ECHO_MSG} "===> You can add python support with the port ${SLAVE_DIRS}." - @${ECHO_MSG} "===>" - @sleep 2 -.endif +.if !defined(LIBDNET_SLAVE) post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure @@ -61,10 +40,6 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME}.so ${PREFIX}/lib/ @${LN} ${PREFIX}/lib/${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}.so.1 - -.if defined(BUILD_PYTHON_MODULE) && defined(MAINTAINER_MODE) -test: install - ${PYTHON_CMD} ${INSTALL_WRKSRC}/test.py .endif .include <bsd.port.post.mk> Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net/libdnet/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- pkg-plist 10 Oct 2006 08:03:42 -0000 1.7 +++ pkg-plist 28 Feb 2007 04:17:07 -0000 @@ -1,25 +1,25 @@ -%%MASTER%%sbin/dnet -%%MASTER%%bin/dnet-config -%%MASTER%%lib/libdnet -%%MASTER%%lib/libdnet.1 -%%MASTER%%lib/libdnet.a -%%MASTER%%lib/libdnet.la -%%MASTER%%lib/libdnet.so -%%MASTER%%lib/libdnet.so.1 -%%MASTER%%include/dnet.h -%%MASTER%%include/dnet/addr.h -%%MASTER%%include/dnet/arp.h -%%MASTER%%include/dnet/blob.h -%%MASTER%%include/dnet/eth.h -%%MASTER%%include/dnet/fw.h -%%MASTER%%include/dnet/icmp.h -%%MASTER%%include/dnet/intf.h -%%MASTER%%include/dnet/ip.h -%%MASTER%%include/dnet/ip6.h -%%MASTER%%include/dnet/os.h -%%MASTER%%include/dnet/rand.h -%%MASTER%%include/dnet/route.h -%%MASTER%%include/dnet/tcp.h -%%MASTER%%include/dnet/tun.h -%%MASTER%%include/dnet/udp.h -%%MASTER%%@dirrm include/dnet +sbin/dnet +bin/dnet-config +lib/libdnet +lib/libdnet.1 +lib/libdnet.a +lib/libdnet.la +lib/libdnet.so +lib/libdnet.so.1 +include/dnet.h +include/dnet/addr.h +include/dnet/arp.h +include/dnet/blob.h +include/dnet/eth.h +include/dnet/fw.h +include/dnet/icmp.h +include/dnet/intf.h +include/dnet/ip.h +include/dnet/ip6.h +include/dnet/os.h +include/dnet/rand.h +include/dnet/route.h +include/dnet/tcp.h +include/dnet/tun.h +include/dnet/udp.h +@dirrm include/dnet ---libdnet-MASTER.diff---
State Changed From-To: open->feedback Wait for maintainer feedback for patch.
State Changed From-To: feedback->closed Committed patches to split out py-libdnet so it only installs the python module.
tmclaugh 2007-03-12 17:51:53 UTC FreeBSD ports repository Modified files: . UPDATING net/libdnet Makefile pkg-plist net/py-libdnet Makefile Added files: net/py-libdnet pkg-descr pkg-plist Log: Fix py-libdnet. The py-libdnet port has been seperated out as a slave port to libdnet and is now dependent on libdnet. py-libdnet now only installs the libdnet python module. Since files previously owned by py-libdnet are now owned by its dependency, in order to upgrade correctly, py-libdnet must be deinstall and then reinstalled manually. PR: 109262 Submitted by: thierry and me Approved by: maintainer timeout Revision Changes Path 1.478 +11 -1 ports/UPDATING 1.27 +6 -31 ports/net/libdnet/Makefile 1.8 +25 -25 ports/net/libdnet/pkg-plist 1.7 +18 -6 ports/net/py-libdnet/Makefile 1.1 +8 -0 ports/net/py-libdnet/pkg-descr (new) 1.1 +1 -0 ports/net/py-libdnet/pkg-plist (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"