Date: Mon, 6 Jan 2014 02:55:05 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185517: net/net6: Fix build on -current Message-ID: <20140106025505.24286189f52dfbf07770d5c7@yahoo.com> Resent-Message-ID: <201401051810.s05IA7wG085146@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185517
>Category: ports
>Synopsis: net/net6: Fix build on -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 05 18:10:07 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
New file:
files/patch-inc__address.hpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net/net6/Makefile net/net6/Makefile
--- /usr/ports/net/net6/Makefile 2013-11-06 21:53:47.000000000 +0900
+++ net/net6/Makefile 2014-01-06 00:00:00.000000000 +0900
@@ -12,24 +12,21 @@
LICENSE= GPLv2
-LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
- gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS= libsigc-2.0.so.0:${PORTSDIR}/devel/libsigc++20 \
+ libgnutls.so:${PORTSDIR}/security/gnutls
-USES= pathfix pkgconfig
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+
+USES= pathfix pkgconfig
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
+
+.include <bsd.port.options.mk>
.include <bsd.port.mk>
diff -urN /usr/ports/net/net6/files/patch-inc__address.hpp net/net6/files/patch-inc__address.hpp
--- /usr/ports/net/net6/files/patch-inc__address.hpp 1970-01-01 09:00:00.000000000 +0900
+++ net/net6/files/patch-inc__address.hpp 2014-01-06 00:00:00.000000000 +0900
@@ -0,0 +1,15 @@
+--- inc/address.hpp.orig
++++ inc/address.hpp
+@@ -25,10 +25,10 @@
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #else
++#include <sys/types.h>
+ #include <sys/socket.h>
+-#include <netinet/in_systm.h>
+ #include <netinet/in.h>
+-#include <netinet/ip.h>
++#include <arpa/inet.h>
+ #endif
+
+ #include <list>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140106025505.24286189f52dfbf07770d5c7>