svn commit: r368946 - in head/net/quagga: . files

[Tijl Coosemans]

Author: tijl
Date: Mon Sep 22 14:43:34 2014
New Revision: 368946
URL: http://svnweb.freebsd.org/changeset/ports/368946
QAT: https://qat.redports.org/buildarchive/r368946/

Log:
  - Add patch after the recent SOCK_RAW bug fix in FreeBSD head (r270929)
  - Fix DLMALLOC option
  - Remove unused SCRIPTS_ENV
  
  PR:		193244 193825
  Submitted by:	Olivier Cochard-Labbé <olivier at cochard.me>

Added:
  head/net/quagga/files/patch-lib-zebra.h   (contents, props changed)
Modified:
  head/net/quagga/Makefile

Modified: head/net/quagga/Makefile
==============================================================================
--- head/net/quagga/Makefile	Mon Sep 22 14:42:28 2014	(r368945)
+++ head/net/quagga/Makefile	Mon Sep 22 14:43:34 2014	(r368946)
@@ -3,7 +3,7 @@
 
 PORTNAME=	quagga
 PORTVERSION=	0.99.22.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net ipv6
 MASTER_SITES=	SAVANNAH
 MASTER_SITE_SUBDIR=	quagga
@@ -61,10 +61,6 @@ CONFIGURE_ARGS+=--enable-vty-group=${ENA
 
 CONFIGURE_ARGS+=--enable-vtysh
 
-SCRIPTS_ENV=	PREFIX=${PREFIX} PKG_PREFIX=${PREFIX} \
-		SYSCONF_DIR=${SYSCONF_DIR} SYSSTATE_DIR=${SYSSTATE_DIR} \
-		ENABLE_USER=${ENABLE_USER} ENABLE_GROUP=${ENABLE_GROUP}
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MISISD}
@@ -103,7 +99,7 @@ CONFIGURE_ARGS+=--enable-tcp-zebra
 
 .if ${PORT_OPTIONS:MDLMALLOC}
 LIB_DEPENDS+=	libdlmalloc.so:${PORTSDIR}/devel/libdlmalloc
-LDFLAGS+=	-ldlmalloc
+LIBS+=		-L${LOCALBASE}/lib -ldlmalloc
 SUB_LIST=	RCLDCONFIG=ldconfig
 .else
 SUB_LIST=	RCLDCONFIG=

Added: head/net/quagga/files/patch-lib-zebra.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/quagga/files/patch-lib-zebra.h	Mon Sep 22 14:43:34 2014	(r368946)
@@ -0,0 +1,12 @@
+--- lib/zebra.h.orig	2014-03-16 09:54:05.510349508 +0100
++++ lib/zebra.h	2014-03-16 10:57:36.640087484 +0100
+@@ -355,7 +355,8 @@
+  * OpenBSD: network byte order, apart from older versions which are as per 
+  *          *BSD
+  */
+-#if defined(__NetBSD__) || defined(__FreeBSD__) \
++#if defined(__NetBSD__) \
++   || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) \
+    || (defined(__OpenBSD__) && (OpenBSD < 200311)) \
+    || (defined(SUNOS_5) && defined(WORDS_BIGENDIAN))
+ #define HAVE_IP_HDRINCL_BSD_ORDER