Date: Wed, 26 Mar 2014 18:19:32 GMT From: Antoine Brodin <antoine@freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Cc: Onatan <onatan@gmail.com> Subject: ports/187977: [patch] update net/libdnet to version 1.12 Message-ID: <201403261819.s2QIJWp3040086@pepperseed.dreadbsd.org> Resent-Message-ID: <201403261910.s2QJA0Fo021056@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187977
>Category: ports
>Synopsis: [patch] update net/libdnet to version 1.12
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 26 19:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Antoine Brodin
>Release: FreeBSD 11.0-CURRENT amd64
>Organization:
none
>Environment:
System: FreeBSD everglades 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r263370M: Wed Mar 19 17:55:07 UTC 2014 ab@everglades:/usr/obj/usr/src/sys/MYGENERICFAST amd64
>Description:
- Update to version 1.12
- Remove patches
- Simplify installation
>How-To-Repeat:
>Fix:
--- libdnet.diff begins here ---
Index: net/libdnet/Makefile
===================================================================
--- net/libdnet/Makefile (revision 349276)
+++ net/libdnet/Makefile (working copy)
@@ -2,16 +2,18 @@
# $FreeBSD$
PORTNAME= libdnet
-PORTVERSION= 1.11
-PORTREVISION?= 3
+PORTVERSION= 1.12
CATEGORIES?= net
-MASTER_SITES= SF/libdnet/libdnet/libdnet-${PORTVERSION}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER?= onatan@gmail.com
-COMMENT= A simple interface to low level networking routines
+COMMENT= Simple interface to low level networking routines
+LICENSE= BSD3CLAUSE
+
GNU_CONFIGURE= yes
-USES= gmake
+CONFIGURE_ENV= ac_cv_dnet_bsd_bpf=yes
+USES= libtool tar:tgz
.if !defined(LIBDNET_SLAVE)
CONFIGURE_ARGS+= --without-python
@@ -18,19 +20,7 @@
USE_LDCONFIG= yes
.endif
-.include <bsd.port.pre.mk>
-
-.if !defined(LIBDNET_SLAVE)
-
post-patch:
- @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} 's|shrext|shrext_cmds|g' ${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
-
-post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib/
- @${LN} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.1
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net/libdnet/distinfo
===================================================================
--- net/libdnet/distinfo (revision 349276)
+++ net/libdnet/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (libdnet-1.11.tar.gz) = 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53
-SIZE (libdnet-1.11.tar.gz) = 446233
+SHA256 (libdnet-1.12.tgz) = 83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026
+SIZE (libdnet-1.12.tgz) = 970125
Index: net/libdnet/files/patch-configure
===================================================================
--- net/libdnet/files/patch-configure (revision 349276)
+++ net/libdnet/files/patch-configure (working copy)
@@ -1,14 +0,0 @@
---- configure.orig 2008-06-26 05:04:55.000000000 +0000
-+++ configure 2008-06-26 05:05:13.000000000 +0000
-@@ -21924,11 +21924,7 @@
- if test "${ac_cv_dnet_bsd_bpf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -c /dev/bpf0 ; then
- ac_cv_dnet_bsd_bpf=yes
-- else
-- ac_cv_dnet_bsd_bpf=no
-- fi
- fi
-
- echo "$as_me:$LINENO: result: $ac_cv_dnet_bsd_bpf" >&5
Index: net/libdnet/files/patch-python__dnet.c
===================================================================
--- net/libdnet/files/patch-python__dnet.c (revision 349276)
+++ net/libdnet/files/patch-python__dnet.c (working copy)
@@ -1,20 +0,0 @@
---- ./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 */
Index: net/libdnet/pkg-descr
===================================================================
--- net/libdnet/pkg-descr (revision 349276)
+++ net/libdnet/pkg-descr (working copy)
@@ -5,4 +5,4 @@
packet and Ethernet frame transmission. It is intended to complement
the functionality provided by pcap(3).
-WWW: http://libdnet.sourceforge.net/
+WWW: https://code.google.com/p/libdnet/
Index: net/libdnet/pkg-plist
===================================================================
--- net/libdnet/pkg-plist (revision 349276)
+++ net/libdnet/pkg-plist (working copy)
@@ -1,11 +1,10 @@
sbin/dnet
bin/dnet-config
-lib/libdnet
-lib/libdnet.1
lib/libdnet.a
lib/libdnet.la
lib/libdnet.so
lib/libdnet.so.1
+lib/libdnet.so.1.0.1
include/dnet.h
include/dnet/addr.h
include/dnet/arp.h
--- libdnet.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403261819.s2QIJWp3040086>