[Midnightbsd-cvs] mports: net/libdnet: Update to 1.11, fix shared library issue

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 1.11, fix shared library issue

Modified Files:
--------------
    mports/net/libdnet:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)

Added Files:
-----------
    mports/net/libdnet/files:
        patch-python__dnet.c (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/libdnet/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L net/libdnet/Makefile -L net/libdnet/Makefile -u -r1.2 -r1.3
--- net/libdnet/Makefile
+++ net/libdnet/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libdnet
-PORTVERSION=	1.10
-PORTREVISION=	1
+PORTVERSION=	1.11
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,24 +32,26 @@
 PLIST_SUB+=	MASTER="@comment "
 .else
 CONFIGURE_ARGS+=	--without-python
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_SUB+=	MASTER=""
 
 MAN3=	dnet.3
 MAN8=	dnet.8
 .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
+.include <bsd.port.pre.mk>
+
+.if !defined(LIBDNET_SLAVE)
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+
+post-build:
+	@cd ${WRKSRC}/src ; ${CC} ${CFLAGS} -shared -o libdnet.so .libs/addr-util.o .libs/addr.o .libs/blob.o .libs/ip-util.o .libs/ip6.o .libs/rand.o .libs/arp-bsd.o .libs/eth-bsd.o .libs/fw-pf.o .libs/intf.o .libs/ip.o .libs/route-bsd.o .libs/tun-bsd.o
 
-.if defined(BUILD_PYTHON_MODULE) && defined(MAINTAINER_MODE)
-test:	install
-	${PYTHON_CMD} ${INSTALL_WRKSRC}/test.py
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME}.so ${PREFIX}/lib/
+	@${LN} ${PREFIX}/lib/${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}.so.1
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net/libdnet/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/libdnet/distinfo -L net/libdnet/distinfo -u -r1.1 -r1.2
--- net/libdnet/distinfo
+++ net/libdnet/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdnet-1.10.tar.gz) = 416b765e9d9961501ac85e9a366fd219
-SHA256 (libdnet-1.10.tar.gz) = c6e2329df7556cc5004113b65d2d68740e87bbd15c5b2ef6c3fb7cde191cfe67
-SIZE (libdnet-1.10.tar.gz) = 419752
+MD5 (libdnet-1.11.tar.gz) = 04c394ed8e1e7fc455456e79e908916d
+SHA256 (libdnet-1.11.tar.gz) = 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53
+SIZE (libdnet-1.11.tar.gz) = 446233
--- /dev/null
+++ net/libdnet/files/patch-python__dnet.c
@@ -0,0 +1,20 @@
+--- ./python/dnet.c.orig	Tue Jul 10 12:35:10 2007
++++ ./python/dnet.c	Tue Jul 10 12:35:59 2007
+@@ -2726,7 +2726,7 @@
+   PyObject *__pyx_3 = 0;
+   unsigned short __pyx_4;
+   Py_INCREF(__pyx_v_self);
+-  ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
++  __pyx_v_next = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
+ 
+   /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */
+   __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max);
+@@ -2738,7 +2738,7 @@
+     Py_DECREF(__pyx_2); __pyx_2 = 0;
+     if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
+     Py_DECREF(((PyObject *)__pyx_v_next));
+-    ((PyObject *)__pyx_v_next) = __pyx_3;
++    __pyx_v_next = __pyx_3;
+     __pyx_3 = 0;
+ 
+     /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */