net-misc/olsrd: Fix PIC, Makefile, license

svn path=/sunrise/; revision=1718

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index f38e60d0a0dbdcebbdbe1bec3a2e2164b1bb89c2..15880cbaf05075e3efd5400d8deff5209ff0448c 100644 (file)
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Nov 2006; Cedric Krier <ced@ced.homedns.org> olsrd-0.4.10.ebuild,
+  +files/olsrd-0.4.10-makefile.patch:
+  Fix PIC, Makefile, license
+
   28 Jul 2006; Cedric Krier <ced@ced.homedns.org> olsrd-0.4.10.ebuild,
   +files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch:
   add memleak patch and use correct CC

diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index a877a9f16b10da131aee06b849e134700273508d..3e488709e0dbf978d73267e38998ddb8453dac70 100644 (file)
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -6,19 +6,23 @@ AUX olsrd-0.4.10-gui_makefile.patch 523 RMD160 afa409cd3c8fb8e56cecc8c2787999832
 MD5 b920fd0f81deffd96b246c1d385829d0 files/olsrd-0.4.10-gui_makefile.patch 523
 RMD160 afa409cd3c8fb8e56cecc8c27879998329160408 files/olsrd-0.4.10-gui_makefile.patch 523
 SHA256 e721d838a2acbb7419f1c8b80687df2b90ad088a95cc991e61641a3802510c23 files/olsrd-0.4.10-gui_makefile.patch 523
+AUX olsrd-0.4.10-makefile.patch 5565 RMD160 6c6ba682e1263eaf1fc3fb72b74333374305b1dd SHA1 f4cd1be23129712ca39400c002b6314c32164828 SHA256 93706579549fe6e69af188a833435ba31fe2b74a97b2698f44e06d3d4a9e9c38
+MD5 267c7bedc012698ac836c13e0b56aacb files/olsrd-0.4.10-makefile.patch 5565
+RMD160 6c6ba682e1263eaf1fc3fb72b74333374305b1dd files/olsrd-0.4.10-makefile.patch 5565
+SHA256 93706579549fe6e69af188a833435ba31fe2b74a97b2698f44e06d3d4a9e9c38 files/olsrd-0.4.10-makefile.patch 5565
 AUX olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246 RMD160 2f0414c22e559fe03ab5968fa21b8c2c4a437ff6 SHA1 b042b511094020813a6fd0e43c99e03bb3e77117 SHA256 a9a5e96a138c65b32b62a73556a62feb529e95de34bb1b450652d81825459124
 MD5 2e80f148d7b40546d50cdecb4ea0ae4d files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246
 RMD160 2f0414c22e559fe03ab5968fa21b8c2c4a437ff6 files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246
 SHA256 a9a5e96a138c65b32b62a73556a62feb529e95de34bb1b450652d81825459124 files/olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246
 DIST olsrd-0.4.10.tar.bz2 490519 RMD160 a0432cb885efdf93ce36e7367a1346b6744c9f90 SHA1 78325658657c6b1aeebe106d02cabcc6eed2571c SHA256 af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3
-EBUILD olsrd-0.4.10.ebuild 2059 RMD160 48b271cba9b582abe0ded41ddd1d97215c8a1289 SHA1 054e152bd2b02c07e9eaf3f50f992cd9d3cad27b SHA256 46a47631c56c4bbd87f5b989c995b80f4ea6afbe19848ab153e8d39673a86b2f
-MD5 ce86003f126d99a3c9816ffd3c0e438a olsrd-0.4.10.ebuild 2059
-RMD160 48b271cba9b582abe0ded41ddd1d97215c8a1289 olsrd-0.4.10.ebuild 2059
-SHA256 46a47631c56c4bbd87f5b989c995b80f4ea6afbe19848ab153e8d39673a86b2f olsrd-0.4.10.ebuild 2059
-MISC ChangeLog 407 RMD160 63ef8d1826d2a083920ce0e16f8636fd596a0dfc SHA1 5ae51b5f2093f8bacfb34755c86e64dc47fd541f SHA256 37dad615d65be00e983be7843f123dec7691fe45b809c3bd1d6342b589ce19a6
-MD5 7f93e9756990bf6e73bc6a29570ab415 ChangeLog 407
-RMD160 63ef8d1826d2a083920ce0e16f8636fd596a0dfc ChangeLog 407
-SHA256 37dad615d65be00e983be7843f123dec7691fe45b809c3bd1d6342b589ce19a6 ChangeLog 407
+EBUILD olsrd-0.4.10.ebuild 1448 RMD160 9b3037220cc476012ae4105c6121980804909ed9 SHA1 2d5ed00bdaee0a598830b310fc79c3f27bf1643d SHA256 7da39b10b19e505ba2650f06ea3d9d6fbb5cb0e1a292fc2ebff81f5c0deafaec
+MD5 9c079b19b1b67f440226abaf06631ba2 olsrd-0.4.10.ebuild 1448
+RMD160 9b3037220cc476012ae4105c6121980804909ed9 olsrd-0.4.10.ebuild 1448
+SHA256 7da39b10b19e505ba2650f06ea3d9d6fbb5cb0e1a292fc2ebff81f5c0deafaec olsrd-0.4.10.ebuild 1448
+MISC ChangeLog 546 RMD160 a15da2fb605b0500a4e54f99bf554c08411a3ea9 SHA1 7f8feec5e9aba82349df7485dc35b1ae07e4591c SHA256 c0f3eec535f414ab6e109f576dd29a58ec08e5fad5b45a1621e79d0c4a71a931
+MD5 cbf71eccb25ccf5d4d8e42dd9781b7c2 ChangeLog 546
+RMD160 a15da2fb605b0500a4e54f99bf554c08411a3ea9 ChangeLog 546
+SHA256 c0f3eec535f414ab6e109f576dd29a58ec08e5fad5b45a1621e79d0c4a71a931 ChangeLog 546
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170

diff --git a/net-misc/olsrd/files/olsrd-0.4.10-makefile.patch b/net-misc/olsrd/files/olsrd-0.4.10-makefile.patch
new file mode 100644 (file)
index 0000000..941d6d7
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.4.10-makefile.patch
@@ -0,0 +1,175 @@
+diff -ru olsrd-0.4.10~/gui/linux-gtk/Makefile olsrd-0.4.10/gui/linux-gtk/Makefile
+--- olsrd-0.4.10~/gui/linux-gtk/Makefile       2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/gui/linux-gtk/Makefile        2006-11-01 17:51:27.000000000 +0100
+@@ -1,7 +1,7 @@
+-CC=   gcc
++CC?=  gcc
+ #CC=     arm-linux-gcc
+ 
+-CFLAGS= -Wall `pkg-config --cflags gtk+-2.0` #-g #to use GDB
++CFLAGS+= -Wall `pkg-config --cflags gtk+-2.0` #-g #to use GDB
+ LFLAGS= `pkg-config --libs gtk+-2.0`
+ 
+ SRCS= src/main.c src/interface.c src/callbacks.c src/ipc.c \
+@@ -23,4 +23,5 @@
+       rm -f $(OBJS)
+ 
+ install:
+-      cp ./olsrd-gui /usr/bin/
++      mkdir -p ${DESTDIR}/usr/bin
++      cp ./olsrd-gui ${DESTDIR}/usr/bin/
+diff -ru olsrd-0.4.10~/make/Makefile.fbsd olsrd-0.4.10/make/Makefile.fbsd
+--- olsrd-0.4.10~/make/Makefile.fbsd   2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/make/Makefile.fbsd    2006-11-01 17:51:05.000000000 +0100
+@@ -2,12 +2,12 @@
+ # FREEBSD SPECIFIC CONFIGURATION
+ #
+ 
+-INSTALL_PREFIX ?= /usr/local
+-SBINDIR = $(INSTALL_PREFIX)/sbin
+-ETCDIR = $(INSTALL_PREFIX)/etc
+-LIBDIR = $(INSTALL_PREFIX)/lib
+-DOCDIR = $(INSTALL_PREFIX)/share/doc
+-MANDIR = $(INSTALL_PREFIX)/man
++DESTDIR ?= /usr/local
++SBINDIR = $(DESTDIR)/sbin
++ETCDIR = $(DESTDIR)/etc
++LIBDIR = $(DESTDIR)/lib
++DOCDIR = $(DESTDIR)/share/doc
++MANDIR = $(DESTDIR)/man
+ 
+ SRCS +=               $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
+ HDRS +=               $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
+@@ -22,8 +22,8 @@
+ 
+ ifdef LIBNET
+ 
+-CFLAGS +=     -DSPOOF -I$(INSTALL_PREFIX)/include
+-LIBS +=               -L$(INSTALL_PREFIX)/lib -lnet
++CFLAGS +=     -DSPOOF -I$(DESTDIR)/include
++LIBS +=               -L$(DESTDIR)/lib -lnet
+ 
+ endif
+ 
+diff -ru olsrd-0.4.10~/make/Makefile.linux olsrd-0.4.10/make/Makefile.linux
+--- olsrd-0.4.10~/make/Makefile.linux  2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/make/Makefile.linux   2006-11-01 17:51:05.000000000 +0100
+@@ -2,8 +2,8 @@
+ # LINUX SPECIFIC CONFIGURATION
+ #
+ 
+-INSTALL_PREFIX ?=
+-LIBDIR =      $(INSTALL_PREFIX)/usr/lib
++DESTDIR ?=
++LIBDIR =      $(DESTDIR)/usr/lib
+ 
+ SRCS +=       $(wildcard src/linux/*.c) $(wildcard src/unix/*.c)
+ HDRS +=               $(wildcard src/linux/*.h) $(wildcard src/unix/*.h)
+diff -ru olsrd-0.4.10~/make/Makefile.nbsd olsrd-0.4.10/make/Makefile.nbsd
+--- olsrd-0.4.10~/make/Makefile.nbsd   2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/make/Makefile.nbsd    2006-11-01 17:51:05.000000000 +0100
+@@ -2,8 +2,8 @@
+ # NETBSD SPECIFIC CONFIGURATION
+ #
+ 
+-INSTALL_PREFIX ?=
+-LIBDIR =      $(INSTALL_PREFIX)/usr/lib
++DESTDIR ?=
++LIBDIR =      $(DESTDIR)/usr/lib
+ 
+ SRCS +=               $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
+ HDRS +=               $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
+diff -ru olsrd-0.4.10~/make/Makefile.obsd olsrd-0.4.10/make/Makefile.obsd
+--- olsrd-0.4.10~/make/Makefile.obsd   2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/make/Makefile.obsd    2006-11-01 17:51:05.000000000 +0100
+@@ -2,8 +2,8 @@
+ # OPENBSD SPECIFIC CONFIGURATION
+ #
+ 
+-INSTALL_PREFIX ?=
+-LIBDIR =      $(INSTALL_PREFIX)/usr/lib
++DESTDIR ?=
++LIBDIR =      $(DESTDIR)/usr/lib
+ 
+ SRCS +=               $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
+ HDRS +=               $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
+diff -ru olsrd-0.4.10~/make/Makefile.osx olsrd-0.4.10/make/Makefile.osx
+--- olsrd-0.4.10~/make/Makefile.osx    2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/make/Makefile.osx     2006-11-01 17:51:05.000000000 +0100
+@@ -2,8 +2,8 @@
+ # MAC OSX SPECIFIC CONFIGURATION
+ #
+ 
+-INSTALL_PREFIX ?=
+-LIBDIR =      $(INSTALL_PREFIX)/usr/lib
++DESTDIR ?=
++LIBDIR =      $(DESTDIR)/usr/lib
+ 
+ SRCS +=               $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
+ HDRS +=               $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
+diff -ru olsrd-0.4.10~/make/Makefile.win32 olsrd-0.4.10/make/Makefile.win32
+--- olsrd-0.4.10~/make/Makefile.win32  2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/make/Makefile.win32   2006-11-01 17:51:05.000000000 +0100
+@@ -2,7 +2,7 @@
+ # WINDOWS32 SPECIFIC CONFIGURATION
+ #
+ 
+-INSTALL_PREFIX ?=
++DESTDIR ?=
+ EXENAME = olsrd.exe
+ 
+ SRCS +=               $(wildcard src/win32/*.c)
+diff -ru olsrd-0.4.10~/make/Makefile.wince olsrd-0.4.10/make/Makefile.wince
+--- olsrd-0.4.10~/make/Makefile.wince  2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/make/Makefile.wince   2006-11-01 17:51:05.000000000 +0100
+@@ -2,8 +2,8 @@
+ # WINDOWS CE SPECIFIC CONFIGURATION
+ #
+ 
+-INSTALL_PREFIX ?=
+-LIBDIR =      $(INSTALL_PREFIX)/usr/lib
++DESTDIR ?=
++LIBDIR =      $(DESTDIR)/usr/lib
+ 
+ SRCS +=               $(wildcard src/win32/*.c)
+ HDRS +=               $(wildcard src/win32/*.h)
+diff -ru olsrd-0.4.10~/Makefile.inc olsrd-0.4.10/Makefile.inc
+--- olsrd-0.4.10~/Makefile.inc 2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/Makefile.inc  2006-11-01 18:02:31.000000000 +0100
+@@ -1,17 +1,17 @@
+ # programs
+ CC ?=                 gcc
+-STRIP ?=      strip
++STRIP ?=      true    
+ BISON ?=      bison
+ FLEX ?=               flex
+ TAGCMD ?=     etags
+ 
+ # target directories and names
+-#INSTALL_PREFIX = 
+-SBINDIR = $(INSTALL_PREFIX)/usr/sbin
+-ETCDIR = $(INSTALL_PREFIX)/etc
+-LIBDIR = $(INSTALL_PREFIX)/usr/lib
+-DOCDIR = $(INSTALL_PREFIX)/usr/share/doc
+-MANDIR = $(INSTALL_PREFIX)/usr/share/man
++# DESTDIR =
++SBINDIR = $(DESTDIR)/usr/sbin
++ETCDIR = $(DESTDIR)/etc
++LIBDIR = $(DESTDIR)/usr/lib
++DOCDIR = $(DESTDIR)/usr/share/doc
++MANDIR = $(DESTDIR)/usr/share/man
+ CFGFILE = $(ETCDIR)/olsrd.conf
+ EXENAME = olsrd
+ 
+diff -ru olsrd-0.4.10~/src/cfgparser/Makefile olsrd-0.4.10/src/cfgparser/Makefile
+--- olsrd-0.4.10~/src/cfgparser/Makefile       2006-11-01 17:50:34.000000000 +0100
++++ olsrd-0.4.10/src/cfgparser/Makefile        2006-11-01 18:17:04.000000000 +0100
+@@ -74,7 +74,7 @@
+ LDFLAGS +=    -shared -Wl,-soname,$(LIBNAME)
+ endif
+ 
+-CFLAGS +=     -DMAKELIB
++CFLAGS +=     -DMAKELIB -fPIC
+ NAME =                $(LIBNAME)
+ 
+ endif

diff --git a/net-misc/olsrd/olsrd-0.4.10.ebuild b/net-misc/olsrd/olsrd-0.4.10.ebuild
index 209dc148b12e5b2653f245f57b21f93e7315bb81..24bf4cf539f693c80871899ee7157e6ba786dfb3 100644 (file)
--- a/net-misc/olsrd/olsrd-0.4.10.ebuild
+++ b/net-misc/olsrd/olsrd-0.4.10.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.olsr.org/"
 SRC_URI="http://www.olsr.org/releases/${PV%.*}/${P}.tar.bz2"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="as-is"
 KEYWORDS="~x86"
 IUSE="gtk"
 
@@ -18,18 +18,14 @@ DEPEND="gtk? ( =x11-libs/gtk+-2* )"
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}/${P}-gui_makefile.patch"
+
+       epatch "${FILESDIR}/${P}-makefile.patch"
        epatch "${FILESDIR}/${P}-memleak_in_olsr_remove_scheduler_event.patch"
 }
 
 src_compile() {
        cd "${S}"
-       emake OS=linux CC=$(tc-getCC) || die "emake failed"
-
-       for module in dot_draw dyn_gw httpinfo nameservice powerinfo secure ; do
-               cd "${S}/lib/${module}"
-               emake OS=linux CC=$(tc-getCC) || die "emake failed"
-       done
+       emake OS=linux CC=$(tc-getCC) build_all || die "emake failed"
 
        if use gtk ; then
                cd "${S}/gui/linux-gtk"
@@ -39,36 +35,22 @@ src_compile() {
 }
 
 src_install() {
-       dosbin olsrd
+       emake DESTDIR="${D}" install_all || die "emake install_all failed"
 
-       doman files/olsrd.conf.5.gz files/olsrd.8.gz
+       if use gtk; then
+               cd "${S}/gui/linux-gtk"
+               emake DESTDIR="${D}" install || die "emake install failed"
+       fi
 
-       dolib lib/dot_draw/olsrd_dot_draw.so.0.3 lib/dyn_gw/olsrd_dyn_gw.so.0.4
-       dolib lib/httpinfo/olsrd_httpinfo.so.0.1 lib/nameservice/olsrd_nameservice.so.0.2
-       dolib lib/powerinfo/olsrd_power.so.0.3 lib/secure/olsrd_secure.so.0.5
+       doinitd "${FILESDIR}/olsrd"
 
-       dodoc files/olsrd.conf.default.rfc files/olsrd.conf.default.lq \
-               lib/dyn_gw/README_DYN_GW lib/dot_draw/README_DOT_DRAW \
-               lib/httpinfo/README_HTTPINFO lib/powerinfo/README_POWER
+       cd "${S}"
+       dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
+               README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
+               README-Link-Quality.html files/olsrd.conf.default.rfc \
+               files/olsrd.conf.default.lq lib/dyn_gw/README_DYN_GW \
+               lib/dot_draw/README_DOT_DRAW lib/httpinfo/README_HTTPINFO \
+               lib/powerinfo/README_POWER
        newdoc lib/nameservice/README README-NAMESERVICE
        newdoc lib/secure/SOLSR-README README-SECURE
-
-       use gtk && dobin gui/linux-gtk/olsrd-gui
-
-       doinitd "${FILESDIR}/olsrd"
-}
-
-pkg_postinst() {
-       ewarn "You must have root privileges to run olsrd!"
-       elog
-       elog "olsrd uses the config file /etc/olsrd.conf"
-       elog "There are two example config files"
-       elog
-       elog "  /usr/share/doc/${PF}/olsrd.conf.default.rfc.gz"
-       elog "  /usr/share/doc/${PF}/olsrd.conf.default.lq.gz"
-       elog
-       elog "First one uses RFC conform OLSR and the second uses"
-       elog "the Link Quality Extensions:"
-       elog
-       elog "  http://www.olsr.org/docs/README-Link-Quality.html"
 }