aboutsummaryrefslogtreecommitdiff
path: root/net/olsrd
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2006-03-17 15:08:02 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2006-03-17 15:08:02 +0000
commita29985d551dc72368f098a832e98f02ddcaece7c (patch)
tree256d78c37f052898ae215983cf740358c5c1c8ce /net/olsrd
parent0bc33760701ea441e4822be10449f6f3deb38994 (diff)
downloadports-a29985d551dc72368f098a832e98f02ddcaece7c.tar.gz
ports-a29985d551dc72368f098a832e98f02ddcaece7c.zip
Notes
Diffstat (limited to 'net/olsrd')
-rw-r--r--net/olsrd/Makefile13
-rw-r--r--net/olsrd/distinfo6
-rw-r--r--net/olsrd/files/patch-Makefile75
-rw-r--r--net/olsrd/pkg-plist10
4 files changed, 36 insertions, 68 deletions
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index d97aadba8b54..acf7a0a09f61 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= olsrd
-PORTVERSION= 0.4.9
-PORTREVISION= 2
+PORTVERSION= 0.4.10
CATEGORIES= net
MASTER_SITES= http://www.olsr.org/releases/0.4/
@@ -28,10 +27,14 @@ MAN8= olsrd.8
MAN5= olsrd.conf.5
MANCOMPRESSED= yes
+ALL_TARGET= build_all
+INSTALL_TARGET= install_all
+
.if defined(WITH_MULTI_IF)
-MAKE_ARGS+= OS=fbsd-ll
-.else
-MAKE_ARGS+= OS=fbsd
+MAKE_ARGS+= LIBNET=1
+.endif
+.if defined(PREFIX)
+MAKE_ARGS+= INSTALL_PREFIX=${PREFIX}
.endif
.include <bsd.port.pre.mk>
diff --git a/net/olsrd/distinfo b/net/olsrd/distinfo
index 3d4866eb42f9..aaf0465833ce 100644
--- a/net/olsrd/distinfo
+++ b/net/olsrd/distinfo
@@ -1,3 +1,3 @@
-MD5 (olsrd-0.4.9.tar.gz) = adf236fd4d7c38ad39186ed5bf1ba95d
-SHA256 (olsrd-0.4.9.tar.gz) = d0b9068e25b112837e84dff18a67470cd13cd5a1f8a8971fa904d5480db6faad
-SIZE (olsrd-0.4.9.tar.gz) = 416910
+MD5 (olsrd-0.4.10.tar.gz) = cb6313649d19b05e5d8d5eaf866bb98d
+SHA256 (olsrd-0.4.10.tar.gz) = 53fa52bf88a2fc12e3459b826f1fae56ed2b389eb6a3e465753f2bb547926e44
+SIZE (olsrd-0.4.10.tar.gz) = 596097
diff --git a/net/olsrd/files/patch-Makefile b/net/olsrd/files/patch-Makefile
index be266a57d769..2cc0b83fb98d 100644
--- a/net/olsrd/files/patch-Makefile
+++ b/net/olsrd/files/patch-Makefile
@@ -1,65 +1,22 @@
---- Makefile.orig Thu Mar 31 20:39:24 2005
-+++ Makefile Sat Apr 9 00:09:42 2005
-@@ -47,7 +47,9 @@
- CCWARNINGS = -Wall -Wmissing-prototypes -Wstrict-prototypes \
- -Wmissing-declarations -Wsign-compare
-
--INSTALL_PREFIX ?=
-+PREFIX?= /usr/local
-+INSTALL_PREFIX?= ${PREFIX}
-+CFGFILE?= ${INSTALL_PREFIX}/etc/olsrd.conf
-
- INCLUDES = -Isrc
-
-@@ -84,7 +86,7 @@
-
- SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
- HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
--CFLAGS ?= $(CCWARNINGS) -O2 -g
-+CFLAGS += -DOLSRD_GLOBAL_CONF_FILE=\"${CFGFILE}\"
- LIBS = -lm
- MAKEDEPEND = makedepend -f $(DEPFILE) -D__FreeBSD__ $(INCLUDES) $(SRCS)
-
-@@ -96,8 +98,8 @@
-
- SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
- HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
--CFLAGS ?= -Wall -Wmissing-prototypes -O2 -g -DSPOOF -I/usr/local/include
--LIBS = -lm -L/usr/local/lib -lnet
-+CFLAGS += -DSPOOF -I${LOCALBASE}/include -DOLSRD_GLOBAL_CONF_FILE=\"${CFGFILE}\"
-+LIBS = -lm -L${LOCALBASE}/lib -lnet
- MAKEDEPEND = makedepend -f $(DEPFILE) -D__FreeBSD__ $(INCLUDES) $(SRCS)
-
- all: cfgparser olsrd
-@@ -292,8 +294,8 @@
-
- install_bin:
- $(STRIP) olsrd
-- mkdir -p $(INSTALL_PREFIX)/usr/sbin
-- install -m 755 olsrd $(INSTALL_PREFIX)/usr/sbin
-+ mkdir -p $(INSTALL_PREFIX)/sbin
-+ install -m 755 olsrd $(INSTALL_PREFIX)/sbin
+--- Makefile.orig Tue Jan 3 22:45:38 2006
++++ Makefile Tue Mar 7 19:25:12 2006
+@@ -90,13 +90,13 @@
install_olsrd: install_bin
@echo ========= C O N F I G U R A T I O N - F I L E ============
-@@ -303,15 +305,15 @@
- @echo can be found at files/olsrd.conf.default.lq
+- @echo olsrd uses the configfile $(INSTALL_PREFIX)/etc/olsr.conf
+- @echo a default configfile. A sample RFC-compliance aimed
+- @echo configfile can be installed. Note that a LQ-based configfile
+- @echo can be found at files/olsrd.conf.default.lq
++ @echo olsrd uses the configfile $(CFGFILE)
++ @echo an RFC compliant version is installed as $(CFGFILE).rfc
++ @echo an LQ version is installed as $(CFGFILE).lq
++ @echo copy and edit one of these to $(CFGFILE)
@echo ==========================================================
- mkdir -p $(INSTALL_PREFIX)/etc
-- cp -i files/olsrd.conf.default.rfc $(INSTALL_PREFIX)/etc/olsrd.conf
-+ cp files/olsrd.conf.default.rfc $(INSTALL_PREFIX)/etc/olsrd.conf.default
+- mkdir -p $(ETCDIR)
+- -cp -i files/olsrd.conf.default.rfc $(CFGFILE)
++ -cp files/olsrd.conf.default.rfc $(CFGFILE).rfc
++ -cp files/olsrd.conf.default.lq $(CFGFILE).lq
@echo -------------------------------------------
- @echo Edit $(INSTALL_PREFIX)/etc/olsrd.conf before running olsrd!!
+ @echo Edit $(CFGFILE) before running olsrd!!
@echo -------------------------------------------
- @echo Installing manpages olsrd\(8\) and olsrd.conf\(5\)
-- mkdir -p $(INSTALL_PREFIX)/usr/share/man/man8/
-- cp files/olsrd.8.gz $(INSTALL_PREFIX)/usr/share/man/man8/olsrd.8.gz
-- mkdir -p $(INSTALL_PREFIX)/usr/share/man/man5/
-- cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)/usr/share/man/man5/olsrd.conf.5.gz
-+ mkdir -p $(INSTALL_PREFIX)/man/man8/
-+ cp files/olsrd.8.gz $(INSTALL_PREFIX)/man/man8/olsrd.8.gz
-+ mkdir -p $(INSTALL_PREFIX)/man/man5/
-+ cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)/man/man5/olsrd.conf.5.gz
-
- #
- # PLUGINS
diff --git a/net/olsrd/pkg-plist b/net/olsrd/pkg-plist
index e73637036074..ea7fec2feca7 100644
--- a/net/olsrd/pkg-plist
+++ b/net/olsrd/pkg-plist
@@ -1,2 +1,10 @@
sbin/olsrd
-etc/olsrd.conf.default
+etc/olsrd.conf.rfc
+etc/olsrd.conf.lq
+lib/olsrd_dot_draw.so.0.3
+lib/olsrd_dyn_gw.so.0.4
+lib/olsrd_httpinfo.so.0.1
+lib/olsrd_mini.so.0.1
+lib/olsrd_nameservice.so.0.2
+lib/olsrd_power.so.0.3
+lib/olsrd_secure.so.0.5