Hi,

The latest biology/nutdb crashes on startup if its user specific
configuration in ~/.nutdb has not been initialized before.
It may work in case this configuration is suitably initialized,
but if you wipe out ~/.nutdb and try to run it you get this:

$ nutdb 
Can't open food file "/usr/local/lib/nut/sr23.nut" to create food database.
Press <enter> to continue...

Abort trap (core dumped) 

Another problem: the port compilation behaves differently in case
fltk-libraries are installed (errors are printed out), but this
error is ignored, so this is not serious.

Here is patch to fix these issues.  I touch both Makefile and
fltk/Makefile for the libdir problem (for consistency), even though
fltk/Makefile is not currently used by the port.

Juha

Index: biology/nutdb/Makefile
===================================================================
RCS file: /usr/cvs/OpenBSD/ports/biology/nutdb/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- biology/nutdb/Makefile      24 Aug 2011 19:29:24 -0000      1.28
+++ biology/nutdb/Makefile      26 Nov 2011 07:58:17 -0000
@@ -5,7 +5,7 @@
 V=             16.12
 DISTNAME=      nut-${V}
 PKGNAME=       nutdb-${V}
-REVISION=      0
+REVISION=      1
 CATEGORIES=    biology
 HOMEPAGE=      http://nut.sourceforge.net/
 
Index: biology/nutdb/patches/patch-Makefile
===================================================================
RCS file: /usr/cvs/OpenBSD/ports/biology/nutdb/patches/patch-Makefile,v
retrieving revision 1.12
diff -u -r1.12 patch-Makefile
--- biology/nutdb/patches/patch-Makefile        24 Aug 2011 19:29:24 -0000      
1.12
+++ biology/nutdb/patches/patch-Makefile        26 Nov 2011 08:15:50 -0000
@@ -1,7 +1,29 @@
 $OpenBSD: patch-Makefile,v 1.12 2011/08/24 19:29:24 naddy Exp $
---- Makefile.orig      Sun May 22 01:13:30 2011
-+++ Makefile   Wed Aug 24 21:24:50 2011
-@@ -24,7 +24,7 @@ else
+--- Makefile.orig      Sun May 22 02:13:30 2011
++++ Makefile   Sat Nov 26 10:15:31 2011
+@@ -1,5 +1,5 @@
+ prefix = /usr/local
+-libdir = $(prefix)/lib/nut
++libdir = $(prefix)/lib/nutdb
+ bindir = $(prefix)/bin
+ mandir = $(prefix)/man/man1
+ 
+@@ -8,14 +8,8 @@ FOODDIR := \"$(libdir)\"
+ EXECUTABLE := nut
+ LIBS := -lm
+ 
+-FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
+-ifeq ($(FLTK_CONFIG),)
+ HAVE_FLTK = 0
+ FLTK_NUT =
+-else
+-HAVE_FLTK = 1
+-FLTK_NUT = fltk/Nut
+-endif
+ 
+ OS := $(shell uname -s)
+ ifeq ($(OS),HP-UX)
+@@ -24,7 +18,7 @@ else
  CC = gcc
  endif
  
Index: biology/nutdb/patches/patch-fltk_Makefile
===================================================================
RCS file: biology/nutdb/patches/patch-fltk_Makefile
diff -N biology/nutdb/patches/patch-fltk_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ biology/nutdb/patches/patch-fltk_Makefile   26 Nov 2011 08:06:53 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- fltk/Makefile.orig Sat Nov 26 10:06:24 2011
++++ fltk/Makefile      Sat Nov 26 10:06:30 2011
+@@ -1,6 +1,6 @@
+ prefix = /usr/local
+ bindir = $(prefix)/bin
+-libdir = $(prefix)/lib/nut
++libdir = $(prefix)/lib/nutdb
+ 
+ NUTDIR := \".nutdb\"
+ FOODDIR := \"$(libdir)\"

Reply via email to