aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/quagga/Makefile8
-rw-r--r--net/quagga/files/patch-lib-zebra.h12
2 files changed, 14 insertions, 6 deletions
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 20798a6203d2..94035c13146f 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -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=${ENABLE_VTY_GROUP}
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=
diff --git a/net/quagga/files/patch-lib-zebra.h b/net/quagga/files/patch-lib-zebra.h
new file mode 100644
index 000000000000..9b28f862947f
--- /dev/null
+++ b/net/quagga/files/patch-lib-zebra.h
@@ -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