Fix path to nutdb's config files and build the gui version. Problem noted

by Juha Erkkila (with a diff, but I fixed the problems in a different way).

biology/nutdb/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.28 2011/08/24 19:29:24 naddy Exp $
+# $OpenBSD: Makefile,v 1.29 2011/11/28 10:18:53 sthen Exp $
 
 COMMENT=	record and analyze your meals for nutrient composition
 
 V=		16.12
 DISTNAME=	nut-${V}
 PKGNAME=	nutdb-${V}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	biology
 HOMEPAGE=	http://nut.sourceforge.net/
 
@@ -15,18 +15,23 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c m
+WANTLIB += X11 Xau Xdmcp Xext c fltk m pthread stdc++
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nut/}
 
 NO_REGRESS=	Yes
 
-MAKE_FLAGS+=	CC="${CC}" prefix=${PREFIX}
+LIB_DEPENDS=	x11/fltk
+
+MAKE_FLAGS+=	CC="${CC}" \
+		prefix=${PREFIX} \
+		libdir=${PREFIX}/lib/nutdb
 
 USE_GMAKE=	Yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nut ${PREFIX}/bin/nutdb
+	${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${PREFIX}/bin/Nutdb
 	${INSTALL_MAN} ${WRKSRC}/nut.1 ${PREFIX}/man/man1/nutdb.1
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/nutdb
 	${INSTALL_DATA} ${WRKSRC}/raw.data/* ${PREFIX}/lib/nutdb

biology/nutdb/patches/patch-fltk_Makefile

@@ -0,0 +1,12 @@
+$OpenBSD: patch-fltk_Makefile,v 1.1 2011/11/28 10:18:53 sthen Exp $
+--- fltk/Makefile.orig	Mon Nov 28 10:11:29 2011
++++ fltk/Makefile	Mon Nov 28 10:11:38 2011
+@@ -16,7 +16,7 @@ CC = gcc
+ CXX = g++
+ endif
+ 
+-CFLAGS := -I.. `fltk-config --optim --cflags` -O -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
++CFLAGS := -I.. `fltk-config --cflags` -O -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+ 
+ ifeq ($(CXX),g++)
+ CFLAGS += -Wall -fno-inline -ansi

biology/nutdb/pkg/PLIST

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.9 2010/12/01 08:40:16 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.10 2011/11/28 10:18:53 sthen Exp $
+@bin bin/Nutdb
 @bin bin/nutdb
 lib/nutdb/
 lib/nutdb/FOOD_DES.txt