cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix build on 64-bit arch following last update

Browse Source 
- tighten RUN_DEPENDS for -plugins
- remove some patches and most of the custom do-install in favour
of passing variables to make and using upstream's build infrastructure.
- tidy Makefile

ok sebastia@, maintainer timeout
This commit is contained in:
sthen 2010-07-06 07:41:46 +00:00
parent b34586e102
commit 6b103e74ba
6 changed files with 50 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
net/olsrd/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2010/06/14 12:36:34 sebastia Exp $
# $OpenBSD: Makefile,v 1.9 2010/07/06 07:41:46 sthen Exp $
COMMENT-main= OLSR routing daemon
COMMENT-gui= OLSR routing daemon GUI
@ -6,13 +6,14 @@ COMMENT-plugins= OLSR routing daemon plugins
VERSION= 0.6.0
DISTNAME= olsrd-${VERSION}
PKGNAME-main= olsrd-${VERSION}
PKGNAME-main= olsrd-${VERSION}p0
PKGNAME-gui= olsrd-gui-${VERSION}
PKGNAME-plugins= olsrd-plugins-${VERSION}
CATEGORIES= net
PKGNAME-plugins= olsrd-plugins-${VERSION}p0
CATEGORIES= net
HOMEPAGE= http://www.olsr.org/
MASTER_SITES= http://www.olsr.org/releases/0.6/
MASTER_SITES= ${HOMEPAGE}releases/0.6/
MAINTAINER= Martin Reindl <martin@openbsd.org>
@ -23,56 +24,55 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MULTI_PACKAGES= -main -gui -plugins
BUILD_DEPENDS= ::devel/bison
WANTLIB-main= c
WANTLIB-gui += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-gui += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB-gui += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
WANTLIB-gui += gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB-gui += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-render-util
WANTLIB-gui += z
LIB_DEPENDS-gui= gtk-x11-2.0.,gdk-x11-2.0.,gdk_pixbuf-2.0.::x11/gtk+2
RUN_DEPENDS-plugins= ::net/olsrd
WANTLIB-gui= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb \
xcb-render xcb-render-util z
RUN_DEPENDS-plugins=:olsrd-${VERSION}:net/olsrd
USE_GMAKE= Yes
NO_REGRESS= Yes
BUILD_DEPENDS= ::devel/bison
MODULES= gcc3
MODGCC3_ARCHES= sparc
ALL_TARGET= build_all
MAKE_FLAGS= DEBUG=0
FAKE_FLAGS= SBINDIR=${DESTDIR}/${PREFIX}/sbin \
ETCDIR=${DESTDIR}/${PREFIX}/share/examples/olsrd \
LIBDIR=${DESTDIR}/${PREFIX}/lib/olsrd-plugins \
DOCDIR=${DESTDIR}/${PREFIX}/share/doc/olsrd \
MANDIR=${DESTDIR}/${PREFIX}/man
ALL_TARGET= all libs
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/plugin_loader.c
post-build:
@cd ${WRKSRC}/gui/linux-gtk; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
cd ${WRKSRC}/gui/linux-gtk; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
INSTALL_TARGET= install_all
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/olsrd ${PREFIX}/sbin
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/olsrd-plugins
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/gui/linux-gtk/olsrd-gui ${PREFIX}/sbin
@mkdir -p ${PREFIX}/lib/olsrd-plugins
${INSTALL_PROGRAM} ${WRKSRC}/lib/dot_draw/olsrd_dot_draw.so ${PREFIX}/lib/olsrd-plugins
${INSTALL_SCRIPT} ${WRKSRC}/lib/dot_draw/olsr-topology-view.pl ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/lib/dyn_gw/olsrd_dyn_gw.so ${PREFIX}/lib/olsrd-plugins
${INSTALL_PROGRAM} ${WRKSRC}/lib/dyn_gw_plain/olsrd_dyn_gw_plain.so ${PREFIX}/lib/olsrd-plugins
${INSTALL_PROGRAM} ${WRKSRC}/lib/httpinfo/olsrd_httpinfo.so ${PREFIX}/lib/olsrd-plugins
${INSTALL_PROGRAM} ${WRKSRC}/lib/mini/olsrd_mini.so ${PREFIX}/lib/olsrd-plugins
${INSTALL_PROGRAM} ${WRKSRC}/lib/nameservice/olsrd_nameservice.so ${PREFIX}/lib/olsrd-plugins
${INSTALL_PROGRAM} ${WRKSRC}/lib/pgraph/olsrd_pgraph.so ${PREFIX}/lib/olsrd-plugins
${INSTALL_PROGRAM} ${WRKSRC}/lib/secure/olsrd_secure.so ${PREFIX}/lib/olsrd-plugins
${INSTALL_PROGRAM} ${WRKSRC}/lib/txtinfo/olsrd_txtinfo.so ${PREFIX}/lib/olsrd-plugins
${INSTALL_PROGRAM} ${WRKSRC}/lib/watchdog/olsrd_watchdog.so ${PREFIX}/lib/olsrd-plugins
@cd ${WRKSRC}/files && ${GUNZIP_CMD} olsrd.conf.5.gz olsrd.8.gz
${INSTALL_MAN} ${WRKSRC}/files/olsrd.conf.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/files/olsrd.8 ${PREFIX}/man/man8
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/olsrd
${INSTALL_SCRIPT} ${WRKSRC}/lib/dot_draw/olsr-topology-view.pl \
${PREFIX}/bin
cd ${PREFIX}/man; ${GUNZIP_CMD} man5/olsrd.conf.5.gz man8/olsrd.8.gz
${INSTALL_DATA} ${WRKSRC}/files/olsrd.conf.default.* \
${PREFIX}/share/examples/olsrd
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/olsrd
@for i in CHANGELOG README README-Link-Quality*; do \
${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/olsrd; \
done
cd ${WRKSRC}; ${INSTALL_DATA} CHANGELOG README README-Link-Quality* \
${PREFIX}/share/doc/olsrd
.include <bsd.port.mk>

12
net/olsrd/patches/patch-Makefile_inc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_inc,v 1.1 2010/06/14 12:36:34 sebastia Exp $
--- Makefile.inc.orig Sat Jun 5 18:44:09 2010
+++ Makefile.inc Sat Jun 5 18:44:18 2010
@@ -5,7 +5,7 @@
#
# activate debugging with 1 or deactivate with 0
-DEBUG ?= 1
+DEBUG ?= 0
# compile OLSR_PRINTF out
NO_DEBUG_MESSAGES ?= 0

11
net/olsrd/patches/patch-make_Makefile_obsd
View File

@ -1,15 +1,6 @@
$OpenBSD: patch-make_Makefile_obsd,v 1.1 2010/06/14 12:36:34 sebastia Exp $
$OpenBSD: patch-make_Makefile_obsd,v 1.2 2010/07/06 07:41:46 sthen Exp $
--- make/Makefile.obsd.orig Wed Mar 31 19:03:53 2010
+++ make/Makefile.obsd Sun Jun 13 13:42:51 2010
@@ -3,7 +3,7 @@
#
DESTDIR ?=
-LIBDIR = $(DESTDIR)/usr/lib
+LIBDIR = $(DESTDIR)/usr/lib/olsrd-plugins
SRCS += $(wildcard src/bsd/*.c src/unix/*.c)
HDRS += $(wildcard src/bsd/*.h src/unix/*.h)
@@ -11,9 +11,8 @@ HDRS += $(wildcard src/bsd/*.h src/unix/*.h)
CPPFLAGS += -D__OpenBSD__
LIBS +=

19
net/olsrd/patches/patch-src_cfgparser_Makefile
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-src_cfgparser_Makefile,v 1.4 2008/09/04 08:52:29 martin Exp $
--- src/cfgparser/Makefile.orig Wed Aug 27 12:54:24 2008
+++ src/cfgparser/Makefile Wed Aug 27 12:56:52 2008
@@ -71,13 +71,14 @@ else
ifeq (${OS}, osx)
LDFLAGS += -dynamiclib -single_module
else
-LDFLAGS += -shared -Wl,-soname,$(LIBNAME)
+LDFLAGS += -shared -fPIC -Wl,-soname,$(LIBNAME)
endif
ifeq (${OS}, win32)
LDFLAGS += -Wl,--out-implib=libolsrd_cfgparser.a -Wl,--export-all-symbols
endif
+CFLAGS += -fPIC
CPPFLAGS += -DMAKELIB
NAME = $(LIBNAME)

11
net/olsrd/patches/patch-src_cfgparser_local_mk Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_cfgparser_local_mk,v 1.1 2010/07/06 07:41:46 sthen Exp $
--- src/cfgparser/local.mk.orig Wed Mar 31 18:03:53 2010
+++ src/cfgparser/local.mk Tue Jun 29 15:25:30 2010
@@ -73,5 +73,7 @@ $(C)oparse.c: $(C)oparse.y $(C)olsrd_conf.h $(C)Makefi
$(C)oparse.o: CFLAGS := $(filter-out -Wunreachable-code,$(CFLAGS))
+$(C)cfgfile_gen.o: CFLAGS += -fPIC
+
# and a few files to be cleaned
TMPFILES += $(foreach pat,oscan.c oparse.c oparse.h,$(C)$(pat) $(C)$(pat)-tmp)

3
net/olsrd/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1 2010/06/14 12:36:34 sebastia Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2010/07/06 07:41:46 sthen Exp $
@pkgpath net/olsrd
@man man/man5/olsrd.conf.5
@man man/man8/olsrd.8
@ -9,6 +9,7 @@ share/doc/olsrd/README
share/doc/olsrd/README-Link-Quality-Fish-Eye.txt
share/doc/olsrd/README-Link-Quality.html
share/examples/olsrd/
@comment share/examples/olsrd/olsrd.conf
share/examples/olsrd/olsrd.conf.default.full
share/examples/olsrd/olsrd.conf.default.lq
share/examples/olsrd/olsrd.conf.default.lq-fisheye