ports/109262: net/py-libdnet: unbreak.

[Thierry Thomas]

>Number:         109262
>Category:       ports
>Synopsis:       net/py-libdnet: unbreak.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 17 21:50:03 GMT 2007
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: