From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- net-misc/olsrd/files/olsrd | 26 ++++++++++++++++++++++++ net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch | 11 ++++++++++ net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch | 22 ++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 net-misc/olsrd/files/olsrd create mode 100644 net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch create mode 100644 net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch (limited to 'net-misc/olsrd/files') diff --git a/net-misc/olsrd/files/olsrd b/net-misc/olsrd/files/olsrd new file mode 100644 index 000000000000..5b0a68a8d9ac --- /dev/null +++ b/net-misc/olsrd/files/olsrd @@ -0,0 +1,26 @@ +#!/sbin/runscript + +depend() { + need net +} + +checkconfig() { + if [ ! -e /etc/olsrd.conf ]; then + eerror "You need a /etc/olsrd.conf file to run olsrd" + eerror "There is sample file in /usr/share/doc/olsrd-version/" + return 1 + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting olsrd" + start-stop-daemon --start --quiet --background --exec /usr/sbin/olsrd + eend $? +} + +stop() { + ebegin "Stopping olsrd" + start-stop-daemon --stop --quiet --exec /usr/sbin/olsrd + eend $? +} diff --git a/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch b/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch new file mode 100644 index 000000000000..9a8683e9d3e8 --- /dev/null +++ b/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -71,8 +71,6 @@ + switch: + $(MAKECMD) -C $(SWITCHDIR) + +-# generate it always +-.PHONY: src/builddata.c + src/builddata.c: + @$(RM) "$@" + @echo "#include \"defs.h\"" >> "$@" diff --git a/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch b/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch new file mode 100644 index 000000000000..12e983daca41 --- /dev/null +++ b/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch @@ -0,0 +1,22 @@ +--- a/gui/linux-gtk/Makefile ++++ b/gui/linux-gtk/Makefile +@@ -1,8 +1,8 @@ + CC ?= gcc + +-CFLAGS += -Wall `pkg-config --cflags gtk+-2.0` ++CFLAGS += -Wall $(shell pkg-config --cflags gdk-pixbuf-2.0 glib-2.0 gtk+-2.0) + LDFLAGS += +-LIBS := `pkg-config --libs gtk+-2.0` -lm ++LIBS := $(shell pkg-config --libs gdk-pixbuf-2.0 glib-2.0 gtk+-2.0) -lm + + OBJS= src/main.o src/interface.o src/callbacks.o src/ipc.o \ + src/packet.o src/nodes.o src/routes.o +@@ -10,7 +10,7 @@ + all: olsrd-gui + + olsrd-gui: $(OBJS) +- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + clean: + rm -f $(OBJS) olsrd-gui -- cgit v1.2.3-65-gdbad