Skip to content
Permalink
Browse files

net/olsrd:

- Update to 0.9.8
- Switch to download from GitHub because they do not generate tarballs anymore
- Regenerate patches
- Fix portlint warnings
  • Loading branch information...
decke committed Aug 26, 2019
1 parent 8e3a3c4 commit 4504a6ba4ade134cf880c0418b001918866b7eaa
@@ -2,21 +2,24 @@
# $FreeBSD: head/net/olsrd/Makefile 453479 2017-11-04 19:30:37Z joneum $

PORTNAME= olsrd
DISTVERSION= 0.9.6.1
DISTVERSIONPREFIX= v
DISTVERSION= 0.9.8
CATEGORIES= net
MASTER_SITES= http://www.olsr.org/releases/0.9/

MAINTAINER= koue@chaosophia.net
COMMENT= OLSR routing daemon

LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/license.txt

MAKE_ARGS= VERBOSE=1
USES= bison gmake tar:bzip2
USES= bison gmake
USE_GITHUB= yes
USE_LDCONFIG= yes
USE_RC_SUBR= olsrd

GH_ACCOUNT= OLSR
MAKE_ARGS= VERBOSE=1

ALL_TARGET= build_all
INSTALL_TARGET= install_all

@@ -27,7 +30,6 @@ MULTI_IF_LIB_DEPENDS= libnet.so:net/libnet
MULTI_IF_MAKE_ARGS= LIBNET=1

post-patch:
@${REINPLACE_CMD} -e 's|/sbin/ldconfig|:|g' ${WRKSRC}/make/Makefile.fbsd
@${CP} ${WRKSRC}/src/cfgparser/cfgfile_gen.c \
${WRKSRC}/src/cfgparser/olsrd_conf.h \
${WRKSRC}/lib/httpinfo/src/
@@ -1,3 +1,3 @@
TIMESTAMP = 1509820621
SHA256 (olsrd-0.9.6.1.tar.bz2) = 9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612
SIZE (olsrd-0.9.6.1.tar.bz2) = 908871
TIMESTAMP = 1566815063
SHA256 (OLSR-olsrd-v0.9.8_GH0.tar.gz) = ee9e524224e5d5304dcf61f1dc5485c569da09d382934ff85b233be3e24821a3
SIZE (OLSR-olsrd-v0.9.8_GH0.tar.gz) = 14416300
@@ -1,8 +1,8 @@
--- lib/httpinfo/Makefile.orig 2016-11-22 19:39:42 UTC
--- lib/httpinfo/Makefile.orig 2019-08-11 08:09:47 UTC
+++ lib/httpinfo/Makefile
@@ -52,7 +52,6 @@ ifdef ADMIN_INTERFACE
CPPFLAGS += -DADMIN_INTERFACE
endif
@@ -54,7 +54,6 @@ endif

LDFLAGS += -lm

-OBJS += $(TOPDIR)/src/cfgparser/cfgfile_gen.o

@@ -1,8 +1,8 @@
--- make/Makefile.fbsd.orig 2016-11-22 19:39:42 UTC
--- make/Makefile.fbsd.orig 2019-08-11 08:09:47 UTC
+++ make/Makefile.fbsd
@@ -45,44 +45,49 @@
# FREEBSD SPECIFIC CONFIGURATION
#
@@ -47,44 +47,49 @@

LDCONFIG ?= /sbin/ldconfig

-PREFIX ?= /usr/local
-SBINDIR = $(PREFIX)/sbin
@@ -18,8 +18,8 @@
+mandir ?= $(prefix)/man
+sbindir ?= $(prefix)/sbin

-SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
-HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
-SRCS += $(sort $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c))
-HDRS += $(sort $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h))
+# the rest are defined in Makefile.inc, but we don't need to override defaults
+ETCDIR = $(DESTDIR)$(etcdir)
+LIBDIR = $(DESTDIR)$(libdir)
@@ -50,9 +50,9 @@
+PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so
+PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
+INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
+ /sbin/ldconfig -m $(LIBDIR)
+ $(LDCONFIG) -m $(LIBDIR)
+UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
+ /sbin/ldconfig -m $(LIBDIR)
+ $(LDCONFIG) -m $(LIBDIR)
+
ifdef OLSRD_PLUGIN
CFLAGS += -fPIC
@@ -62,9 +62,9 @@
-PLUGIN_SONAME ?= $(PLUGIN_NAME)
-PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
-INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
- /sbin/ldconfig
- $(LDCONFIG)
-UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \
- /sbin/ldconfig
- $(LDCONFIG)
-
-OS_LIB_PTHREAD = -pthread
+OS_LIB_PTHREAD = -lpthread
@@ -1,6 +1,6 @@
--- src/bsd/net.c.orig 2016-06-22 12:04:33 UTC
--- src/bsd/net.c.orig 2019-08-11 08:09:47 UTC
+++ src/bsd/net.c
@@ -125,6 +125,8 @@
@@ -124,6 +124,8 @@

#include <sys/sysctl.h>

0 comments on commit 4504a6b

Please sign in to comment.
You can’t perform that action at this time.