From thierry@pompo.net  Sat Feb 17 21:45:52 2007
Return-Path: <thierry@pompo.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1A91816A406
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Feb 2007 21:45:52 +0000 (UTC)
	(envelope-from thierry@pompo.net)
Received: from smtp3-g19.free.fr (smtp3-g19.free.fr [212.27.42.29])
	by mx1.freebsd.org (Postfix) with ESMTP id B407A13C491
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Feb 2007 21:45:51 +0000 (UTC)
	(envelope-from thierry@pompo.net)
Received: from graf.pompo.net (graf.pompo.net [81.56.186.139])
	by smtp3-g19.free.fr (Postfix) with ESMTP id BE7C949F94
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Feb 2007 22:45:50 +0100 (CET)
Received: by graf.pompo.net (Postfix, from userid 1001)
	id A471C11446; Sat, 17 Feb 2007 22:45:46 +0100 (CET)
Message-Id: <20070217214546.A471C11446@graf.pompo.net>
Date: Sat, 17 Feb 2007 22:45:46 +0100 (CET)
From: Thierry Thomas <thierry@FreeBSD.org>
Reply-To: Thierry Thomas <thierry@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Yonatan <onatan@gmail.com>
Subject: net/py-libdnet: unbreak.
X-Send-Pr-Version: 3.113
X-GNATS-Notify: onatan@gmail.com

>Number:         109262
>Category:       ports
>Synopsis:       net/py-libdnet: unbreak.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    tmclaugh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 17 21:50:03 GMT 2007
>Closed-Date:    Mon Mar 12 17:55:51 GMT 2007
>Last-Modified:  Mon Mar 12 18:00:10 GMT 2007
>Originator:     Thierry Thomas
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 6.2-STABLE FreeBSD 6.2-STABLE #0: Sun Jan 28 10:29:56 CET 2007 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF060511 i386


	
>Description:
	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.

>How-To-Repeat:
	See logs on pointyhat
	<http://portsmon.droso.net/portoverview.py?category=net&portname=py-libdnet>

>Fix:
	Please apply the following patches:

--- libdnet.diff begins here ---
diff -urN net/libdnet.orig/Makefile net/libdnet/Makefile
--- net/libdnet.orig/Makefile	Sun Feb  4 17:07:36 2007
+++ net/libdnet/Makefile	Sat Feb 17 22:31:15 2007
@@ -20,6 +20,7 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 
 SLAVE_DIRS=	net/py-libdnet
 
@@ -27,23 +28,17 @@
 USE_PYTHON=	yes
 CONFIGURE_ARGS+=	--with-python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}/python
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/dnet.so
-PLIST_SUB+=	MASTER="@comment "
+PLIST_SUB+=	MASTER="@comment " PYMOD=""
+CONFLICTS=	libdnet-1.*
 .else
 CONFIGURE_ARGS+=	--without-python
-USE_LDCONFIG=	yes
-PLIST_SUB+=	MASTER=""
+PLIST_SUB+=	MASTER="" PYMOD="@comment "
+CONFLICTS=	py*-libdnet-1.*
 
 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} "===>"
@@ -63,8 +58,8 @@
 	@${LN} ${PREFIX}/lib/${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}.so.1
 
 .if defined(BUILD_PYTHON_MODULE) && defined(MAINTAINER_MODE)
-test:	install
+regression-test:	install
 	${PYTHON_CMD} ${INSTALL_WRKSRC}/test.py
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN net/libdnet.orig/pkg-plist net/libdnet/pkg-plist
--- net/libdnet.orig/pkg-plist	Tue Oct 10 10:03:42 2006
+++ net/libdnet/pkg-plist	Sat Feb 17 22:05:30 2007
@@ -4,8 +4,9 @@
 %%MASTER%%lib/libdnet.1
 %%MASTER%%lib/libdnet.a
 %%MASTER%%lib/libdnet.la
-%%MASTER%%lib/libdnet.so
-%%MASTER%%lib/libdnet.so.1
+lib/libdnet.so
+lib/libdnet.so.1
+%%PYMOD%%%%PYTHON_SITELIBDIR%%/dnet.so
 %%MASTER%%include/dnet.h
 %%MASTER%%include/dnet/addr.h
 %%MASTER%%include/dnet/arp.h
diff -urN net/py-libdnet.orig/Makefile net/py-libdnet/Makefile
--- net/py-libdnet.orig/Makefile	Wed Feb 14 21:34:29 2007
+++ net/py-libdnet/Makefile	Sat Feb 17 21:57:10 2007
@@ -5,13 +5,9 @@
 # $FreeBSD: ports/net/py-libdnet/Makefile,v 1.6 2007/02/11 01:23:31 kris Exp $
 #
 
-COMMENT=	Python module for libdnet
-
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2007-04-10
-
 MASTERDIR=	${.CURDIR}/../libdnet
+
+COMMENT=	Python module for libdnet
 
 BUILD_PYTHON_MODULE=	yes
 
--- libdnet.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Feb 17 21:50:32 UTC 2007 
Responsible-Changed-Why:  
freebsd-python@ wants to have py- PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109262 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Feb 17 21:51:34 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109262 
State-Changed-From-To: feedback->open 
State-Changed-By: tmclaugh 
State-Changed-When: Sat Feb 17 22:04:21 UTC 2007 
State-Changed-Why:  
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 
Responsible-Changed-By: tmclaugh 
Responsible-Changed-When: Sat Feb 17 22:04:21 UTC 2007 
Responsible-Changed-Why:  
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. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109262 

From: Tom McLaughlin <tmclaugh@FreeBSD.org>
To: bug-followup@FreeBSD.org, thierry@FreeBSD.org
Cc:  
Subject: Re: ports/109262: net/py-libdnet: unbreak.
Date: Tue, 27 Feb 2007 23:26:28 -0500

 --=-hfGXI1UR9saEmJZRJYRM
 Content-Type: multipart/mixed; boundary="=-EKyOBaCEwnPdP5bBHpN+"
 
 
 --=-EKyOBaCEwnPdP5bBHpN+
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 
 Hi, can I get a maintainer OK for the attached patches?  The following
 are a better way of breaking out the ports into a MASTER/SLAVE
 relationship.  The SLAVE port now depends on the MASTER port so if a
 person has libdnet installed and a port requires py-libdnet, py-libdnet
 installs instead of failing because of a conflict.  In the meantime I'll
 tinderbox the patches as well.  Thanks.
 
 tom
 
 --=-EKyOBaCEwnPdP5bBHpN+
 Content-Disposition: attachment; filename=libdnet-MASTER.diff
 Content-Type: text/x-patch; name=libdnet-MASTER.diff; charset=us-ascii
 Content-Transfer-Encoding: base64
 
 SW5kZXg6IE1ha2VmaWxlDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvcGN2cy9wb3J0cy9u
 ZXQvbGliZG5ldC9NYWtlZmlsZSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjYNCmRpZmYgLXUg
 LXIxLjI2IE1ha2VmaWxlDQotLS0gTWFrZWZpbGUJMzAgSmFuIDIwMDcgMTk6MzI6MzUgLTAwMDAJ
 MS4yNg0KKysrIE1ha2VmaWxlCTI4IEZlYiAyMDA3IDA0OjE3OjA3IC0wMDAwDQpAQCAtNyw1MCAr
 NywyOSBAQA0KIA0KIFBPUlROQU1FPQlsaWJkbmV0DQogUE9SVFZFUlNJT049CTEuMTENCi1DQVRF
 R09SSUVTPQluZXQNCitQT1JUUkVWSVNJT04/PQkxDQorQ0FURUdPUklFUz89CW5ldA0KIE1BU1RF
 Ul9TSVRFUz0JJHtNQVNURVJfU0lURV9TT1VSQ0VGT1JHRX0NCiBNQVNURVJfU0lURV9TVUJESVI9
 CSR7UE9SVE5BTUV9DQotLmlmIGRlZmluZWQoQlVJTERfUFlUSE9OX01PRFVMRSkNCi1QS0dOQU1F
 UFJFRklYPQkke1BZVEhPTl9QS0dOQU1FUFJFRklYfQ0KLS5lbmRpZg0KIA0KLU1BSU5UQUlORVI9
 CW9uYXRhbkBnbWFpbC5jb20NCitNQUlOVEFJTkVSPz0Jb25hdGFuQGdtYWlsLmNvbQ0KIENPTU1F
 TlQ/PQlBIHNpbXBsZSBpbnRlcmZhY2UgdG8gbG93IGxldmVsIG5ldHdvcmtpbmcgcm91dGluZXMN
 CiANCiBHTlVfQ09ORklHVVJFPQl5ZXMNCiBDT05GSUdVUkVfVEFSR0VUPS0tYnVpbGQ9JHtNQUNI
 SU5FX0FSQ0h9LXBvcnRibGQtZnJlZWJzZCR7T1NSRUx9DQogVVNFX0dNQUtFPQl5ZXMNCiANCi1T
 TEFWRV9ESVJTPQluZXQvcHktbGliZG5ldA0KLQ0KLS5pZiBkZWZpbmVkKEJVSUxEX1BZVEhPTl9N
 T0RVTEUpDQotVVNFX1BZVEhPTj0JeWVzDQotQ09ORklHVVJFX0FSR1MrPQktLXdpdGgtcHl0aG9u
 DQotSU5TVEFMTF9XUktTUkM9CSR7QlVJTERfV1JLU1JDfS9weXRob24NCi1QTElTVF9GSUxFUz0J
 JSVQWVRIT05fU0lURUxJQkRJUiUlL2RuZXQuc28NCi1QTElTVF9TVUIrPQlNQVNURVI9IkBjb21t
 ZW50ICINCi0uZWxzZQ0KLUNPTkZJR1VSRV9BUkdTKz0JLS13aXRob3V0LXB5dGhvbg0KKy5pZiAh
 ZGVmaW5lZChMSUJETkVUX1NMQVZFKQ0KK0NPTkZJR1VSRV9BUkdTKz0tLXdpdGhvdXQtcHl0aG9u
 DQogVVNFX0xEQ09ORklHPQl5ZXMNCi1QTElTVF9TVUIrPQlNQVNURVI9IiINCiANCiBNQU4zPQlk
 bmV0LjMNCiBNQU44PQlkbmV0LjgNCiAuZW5kaWYNCiANCiAuaW5jbHVkZSA8YnNkLnBvcnQucHJl
 Lm1rPg0KLS5pZiAke09TVkVSU0lPTn0gPCA1MDAwMDANCi1JR05PUkU9CQlkb2Vzbid0IGJ1aWxk
 IG9uIEZyZWVCU0QgNC54DQotLmVuZGlmDQogDQotDQotcHJlLWV2ZXJ5dGhpbmc6Og0KLS5pZiAh
 ZGVmaW5lZChCVUlMRF9QWVRIT05fTU9EVUxFKQ0KLQlAJHtFQ0hPX01TR30gIj09PT4iDQotCUAk
 e0VDSE9fTVNHfSAiPT09PiBZb3UgY2FuIGFkZCBweXRob24gc3VwcG9ydCB3aXRoIHRoZSBwb3J0
 ICR7U0xBVkVfRElSU30uIg0KLQlAJHtFQ0hPX01TR30gIj09PT4iDQotCUBzbGVlcCAyDQotLmVu
 ZGlmDQorLmlmICFkZWZpbmVkKExJQkRORVRfU0xBVkUpDQogDQogcG9zdC1wYXRjaDoNCiAJQCR7
 UkVJTlBMQUNFX0NNRH0gLWUgJ3N8ZWNobyBhb3V0fGVjaG8gZWxmfCcgJHtXUktTUkN9L2NvbmZp
 Z3VyZQ0KQEAgLTYxLDEwICs0MCw2IEBADQogcG9zdC1pbnN0YWxsOg0KIAkke0lOU1RBTExfUFJP
 R1JBTX0gJHtXUktTUkN9L3NyYy8ke1BPUlROQU1FfS5zbyAke1BSRUZJWH0vbGliLw0KIAlAJHtM
 Tn0gJHtQUkVGSVh9L2xpYi8ke1BPUlROQU1FfS5zbyAke1BSRUZJWH0vbGliLyR7UE9SVE5BTUV9
 LnNvLjENCi0NCi0uaWYgZGVmaW5lZChCVUlMRF9QWVRIT05fTU9EVUxFKSAmJiBkZWZpbmVkKE1B
 SU5UQUlORVJfTU9ERSkNCi10ZXN0OglpbnN0YWxsDQotCSR7UFlUSE9OX0NNRH0gJHtJTlNUQUxM
 X1dSS1NSQ30vdGVzdC5weQ0KIC5lbmRpZg0KIA0KIC5pbmNsdWRlIDxic2QucG9ydC5wb3N0Lm1r
 Pg0KSW5kZXg6IHBrZy1wbGlzdA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21lL3BjdnMvcG9y
 dHMvbmV0L2xpYmRuZXQvcGtnLXBsaXN0LHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS43DQpkaWZm
 IC11IC1yMS43IHBrZy1wbGlzdA0KLS0tIHBrZy1wbGlzdAkxMCBPY3QgMjAwNiAwODowMzo0MiAt
 MDAwMAkxLjcNCisrKyBwa2ctcGxpc3QJMjggRmViIDIwMDcgMDQ6MTc6MDcgLTAwMDANCkBAIC0x
 LDI1ICsxLDI1IEBADQotJSVNQVNURVIlJXNiaW4vZG5ldA0KLSUlTUFTVEVSJSViaW4vZG5ldC1j
 b25maWcNCi0lJU1BU1RFUiUlbGliL2xpYmRuZXQNCi0lJU1BU1RFUiUlbGliL2xpYmRuZXQuMQ0K
 LSUlTUFTVEVSJSVsaWIvbGliZG5ldC5hDQotJSVNQVNURVIlJWxpYi9saWJkbmV0LmxhDQotJSVN
 QVNURVIlJWxpYi9saWJkbmV0LnNvDQotJSVNQVNURVIlJWxpYi9saWJkbmV0LnNvLjENCi0lJU1B
 U1RFUiUlaW5jbHVkZS9kbmV0LmgNCi0lJU1BU1RFUiUlaW5jbHVkZS9kbmV0L2FkZHIuaA0KLSUl
 TUFTVEVSJSVpbmNsdWRlL2RuZXQvYXJwLmgNCi0lJU1BU1RFUiUlaW5jbHVkZS9kbmV0L2Jsb2Iu
 aA0KLSUlTUFTVEVSJSVpbmNsdWRlL2RuZXQvZXRoLmgNCi0lJU1BU1RFUiUlaW5jbHVkZS9kbmV0
 L2Z3LmgNCi0lJU1BU1RFUiUlaW5jbHVkZS9kbmV0L2ljbXAuaA0KLSUlTUFTVEVSJSVpbmNsdWRl
 L2RuZXQvaW50Zi5oDQotJSVNQVNURVIlJWluY2x1ZGUvZG5ldC9pcC5oDQotJSVNQVNURVIlJWlu
 Y2x1ZGUvZG5ldC9pcDYuaA0KLSUlTUFTVEVSJSVpbmNsdWRlL2RuZXQvb3MuaA0KLSUlTUFTVEVS
 JSVpbmNsdWRlL2RuZXQvcmFuZC5oDQotJSVNQVNURVIlJWluY2x1ZGUvZG5ldC9yb3V0ZS5oDQot
 JSVNQVNURVIlJWluY2x1ZGUvZG5ldC90Y3AuaA0KLSUlTUFTVEVSJSVpbmNsdWRlL2RuZXQvdHVu
 LmgNCi0lJU1BU1RFUiUlaW5jbHVkZS9kbmV0L3VkcC5oDQotJSVNQVNURVIlJUBkaXJybSBpbmNs
 dWRlL2RuZXQNCitzYmluL2RuZXQNCitiaW4vZG5ldC1jb25maWcNCitsaWIvbGliZG5ldA0KK2xp
 Yi9saWJkbmV0LjENCitsaWIvbGliZG5ldC5hDQorbGliL2xpYmRuZXQubGENCitsaWIvbGliZG5l
 dC5zbw0KK2xpYi9saWJkbmV0LnNvLjENCitpbmNsdWRlL2RuZXQuaA0KK2luY2x1ZGUvZG5ldC9h
 ZGRyLmgNCitpbmNsdWRlL2RuZXQvYXJwLmgNCitpbmNsdWRlL2RuZXQvYmxvYi5oDQoraW5jbHVk
 ZS9kbmV0L2V0aC5oDQoraW5jbHVkZS9kbmV0L2Z3LmgNCitpbmNsdWRlL2RuZXQvaWNtcC5oDQor
 aW5jbHVkZS9kbmV0L2ludGYuaA0KK2luY2x1ZGUvZG5ldC9pcC5oDQoraW5jbHVkZS9kbmV0L2lw
 Ni5oDQoraW5jbHVkZS9kbmV0L29zLmgNCitpbmNsdWRlL2RuZXQvcmFuZC5oDQoraW5jbHVkZS9k
 bmV0L3JvdXRlLmgNCitpbmNsdWRlL2RuZXQvdGNwLmgNCitpbmNsdWRlL2RuZXQvdHVuLmgNCitp
 bmNsdWRlL2RuZXQvdWRwLmgNCitAZGlycm0gaW5jbHVkZS9kbmV0DQo=
 
 
 --=-EKyOBaCEwnPdP5bBHpN+
 Content-Disposition: attachment; filename=py-libdnet-SLAVE.diff
 Content-Type: text/x-patch; name=py-libdnet-SLAVE.diff; charset=us-ascii
 Content-Transfer-Encoding: base64
 
 SW5kZXg6IE1ha2VmaWxlDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvcGN2cy9wb3J0cy9u
 ZXQvcHktbGliZG5ldC9NYWtlZmlsZSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNg0KZGlmZiAt
 dSAtcjEuNiBNYWtlZmlsZQ0KLS0tIE1ha2VmaWxlCTExIEZlYiAyMDA3IDAxOjIzOjMxIC0wMDAw
 CTEuNg0KKysrIE1ha2VmaWxlCTI4IEZlYiAyMDA3IDA0OjIzOjU4IC0wMDAwDQpAQCAtNSwxNyAr
 NSwyOSBAQA0KICMgJEZyZWVCU0Q6IHBvcnRzL25ldC9weS1saWJkbmV0L01ha2VmaWxlLHYgMS42
 IDIwMDcvMDIvMTEgMDE6MjM6MzEga3JpcyBFeHAgJA0KICMNCiANCitQT1JUUkVWSVNJT049CTEN
 CitDQVRFR09SSUVTPQluZXQgcHl0aG9uDQorUEtHTkFNRVBSRUZJWD0JJHtQWVRIT05fUEtHTkFN
 RVBSRUZJWH0NCisNCiBDT01NRU5UPQlQeXRob24gbW9kdWxlIGZvciBsaWJkbmV0DQogDQotQlJP
 S0VOPQkJSW5jb21wbGV0ZSBwa2ctcGxpc3QNCi1ERVBSRUNBVEVEPQkke0JST0tFTn0NCi1FWFBJ
 UkFUSU9OX0RBVEU9MjAwNy0wNC0xMA0KK0xJQl9ERVBFTkRTPQlkbmV0LjE6JHtQT1JUU0RJUn0v
 bmV0L2xpYmRuZXQNCisNCitOT1RfRk9SX0FSQ0hTPQlpYTY0DQorTk9UX0ZPUl9BUkNIU19SRUFT
 T05faWE2ND0JZmFpbHMgdG8gYnVpbGQgd2l0aCBpbnRlcm5hbCBjb21waWxlciBlcnJvcg0KIA0K
 IE1BU1RFUkRJUj0JJHsuQ1VSRElSfS8uLi9saWJkbmV0DQorQlVJTERfV1JLU1JDPQkke1dSS1NS
 Q30vcHl0aG9uDQorSU5TVEFMTF9XUktTUkM9CSR7QlVJTERfV1JLU1JDfQ0KK0RFU0NSPQkJJHsu
 Q1VSRElSfS9wa2ctZGVzY3INCitQTElTVD0JCSR7LkNVUkRJUn0vcGtnLXBsaXN0DQogDQotQlVJ
 TERfUFlUSE9OX01PRFVMRT0JeWVzDQorTElCRE5FVF9TTEFWRT0JeWVzDQogDQotTk9UX0ZPUl9B
 UkNIUz0JCQlpYTY0DQotTk9UX0ZPUl9BUkNIU19SRUFTT05faWE2ND0JZmFpbHMgdG8gYnVpbGQg
 d2l0aCBpbnRlcm5hbCBjb21waWxlciBlcnJvcg0KK1VTRV9QWVRIT049CXllcw0KK0NPTkZJR1VS
 RV9BUkdTPQktLXdpdGgtcHl0aG9uDQorDQorcmVncmVzc2lvbi10ZXN0OiBpbnN0YWxsDQorCSR7
 UFlUSE9OX0NNRH0gJHtJTlNUQUxMX1dSS1NSQ30vdGVzdC5weQ0KIA0KIC5pbmNsdWRlICIke01B
 U1RFUkRJUn0vTWFrZWZpbGUiDQpJbmRleDogcGtnLWRlc2NyDQo9PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmls
 ZTogcGtnLWRlc2NyDQpkaWZmIC1OIHBrZy1kZXNjcg0KLS0tIC9kZXYvbnVsbAkxIEphbiAxOTcw
 IDAwOjAwOjAwIC0wMDAwDQorKysgcGtnLWRlc2NyCTI4IEZlYiAyMDA3IDA0OjIzOjU4IC0wMDAw
 DQpAQCAtMCwwICsxLDggQEANCitQeXRob24gd3JhcHBlciBhcm91bmQgbGliZG5ldCB3aGljaCBw
 cm92aWRlcyBhIHNpbXBsaWZpZWQsIHBvcnRhYmxlDQoraW50ZXJmYWNlIHRvIHNldmVyYWwgbG93
 LWxldmVsIG5ldHdvcmtpbmcgcm91dGluZXMsIGluY2x1ZGluZyBuZXR3b3JrDQorYWRkcmVzcyBt
 YW5pcHVsYXRpb24sIGtlcm5lbCBhcnAoNCkgY2FjaGUgYW5kIHJvdXRlKDQpIHRhYmxlIGxvb2t1
 cCBhbmQNCittYW5pcHVsYXRpb24sIG5ldHdvcmsgZmlyZXdhbGxpbmcsIG5ldHdvcmsgaW50ZXJm
 YWNlIGxvb2t1cCBhbmQNCittYW5pcHVsYXRpb24sIGFuZCByYXcgSVAgcGFja2V0IGFuZCBFdGhl
 cm5ldCBmcmFtZSB0cmFuc21pc3Npb24uIEl0IGlzDQoraW50ZW5kZWQgdG8gY29tcGxlbWVudCB0
 aGUgZnVuY3Rpb25hbGl0eSBwcm92aWRlZCBieSBwY2FwKDMpLg0KKw0KK1dXVzogaHR0cDovL2xp
 YmRuZXQuc291cmNlZm9yZ2UubmV0Lw0KSW5kZXg6IHBrZy1wbGlzdA0KPT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNT
 IGZpbGU6IHBrZy1wbGlzdA0KZGlmZiAtTiBwa2ctcGxpc3QNCi0tLSAvZGV2L251bGwJMSBKYW4g
 MTk3MCAwMDowMDowMCAtMDAwMA0KKysrIHBrZy1wbGlzdAkyOCBGZWIgMjAwNyAwNDoyMzo1OCAt
 MDAwMA0KQEAgLTAsMCArMSBAQA0KKyUlUFlUSE9OX1NJVEVMSUJESVIlJS9kbmV0LnNvDQo=
 
 
 --=-EKyOBaCEwnPdP5bBHpN+--
 
 --=-hfGXI1UR9saEmJZRJYRM
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Description: This is a digitally signed message part
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (FreeBSD)
 
 iD8DBQBF5QRz4zniJeL3s9gRAv+KAKC3TbJPdRmf4AsQJNf0Jxhe58U5pACfdShO
 fRiCYpyWKOjVqfjJRX4NIRU=
 =tq54
 -----END PGP SIGNATURE-----
 
 --=-hfGXI1UR9saEmJZRJYRM--
 

From: Tom McLaughlin <tmclaugh@FreeBSD.org>
To: bug-followup@FreeBSD.org, thierry@FreeBSD.org
Cc:  
Subject: Re: ports/109262: net/py-libdnet: unbreak.
Date: Wed, 28 Feb 2007 00:22:22 -0500

 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 
State-Changed-By: tmclaugh 
State-Changed-When: Wed Feb 28 13:03:15 UTC 2007 
State-Changed-Why:  
Wait for maintainer feedback for patch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109262 
State-Changed-From-To: feedback->closed 
State-Changed-By: tmclaugh 
State-Changed-When: Mon Mar 12 17:43:05 UTC 2007 
State-Changed-Why:  
Committed patches to split out py-libdnet so it only installs the python 
module. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109262 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109262: commit references a PR
Date: Mon, 12 Mar 2007 17:51:58 +0000 (UTC)

 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"
 
>Unformatted:
