Update to 2.5. Upstream Changelog is:

  2.3   1) Added the ability to do a partial search on callsign.  This allows
	   you to search for a prefix<area> or on a full callsign as in
	   prefix<area><suffix>

pkgsrc changes:

  Set LICENSE.
  Adapt to more modern upstream.
  Change to fltk13.
  Rototill upstream's makefile to use CXX to compile C++.

6 files changed, 91 insertions, 74 deletions

diff --git a/ham/fl_logbook/Makefile b/ham/fl_logbook/Makefile
index a61dd05ae05..0d4210a6774 100644
--- a/ham/fl_logbook/Makefile
+++ b/ham/fl_logbook/Makefile
@@ -1,29 +1,24 @@
-# $NetBSD: Makefile,v 1.7 2012/11/15 13:44:14 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2012/11/16 00:33:36 gdt Exp $
 #
 
-DISTNAME=		fl_logbook.121.src
-PKGNAME=		fl_logbook-1.21
-PKGREVISION=		3
+DISTNAME=		fl_logbook-2.5
 CATEGORIES=		ham
 MASTER_SITES=		http://www.w1hkj.com/LinuxApps/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.w1hkj.com/
 COMMENT=		FLTK-based amateur radio log book
-
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
+LICENSE=		gnu-gpl-v2
 
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
 
-MAKE_ENV+=		CFG=Release
-
-BUILD_TARGET=		#defined in dist Makefile
+MAKE_FILE=		makefile
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Release/fl_logbook ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/fl_logbook ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/fltk13/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/fl_logbook/distinfo b/ham/fl_logbook/distinfo
index fab04a3e185..ce0178490be 100644
--- a/ham/fl_logbook/distinfo
+++ b/ham/fl_logbook/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2011/11/25 21:59:57 joerg Exp $
+$NetBSD: distinfo,v 1.3 2012/11/16 00:33:36 gdt Exp $
 
-SHA1 (fl_logbook.121.src.tar.gz) = 739338598cce81c9c3cb5776a126ad21354352ca
-RMD160 (fl_logbook.121.src.tar.gz) = 90353a34238ede39024df4cabafcbceada7895ae
-Size (fl_logbook.121.src.tar.gz) = 54496 bytes
-SHA1 (patch-aa) = 4763255390f3bd3acc003a9fe65d47bf8713bf3e
-SHA1 (patch-src_date.h) = 9583276b68ca4c4e0edc725229ee4fba8cdc11d3
-SHA1 (patch-src_qso__db.cpp) = 1b8c616f689ec68daf47220c9dc28bfc8b19c715
-SHA1 (patch-src_qso__db.h) = 4cc3ddee3055edb4a50c98926a588e06a6e58ca4
+SHA1 (fl_logbook-2.5.tar.gz) = cbe13e21af25f4a7f897974d90b9f41171f0dc1f
+RMD160 (fl_logbook-2.5.tar.gz) = 5c7831a712c88c43179e7042cdf7f0d2fbdae4a9
+Size (fl_logbook-2.5.tar.gz) = 58672 bytes
+SHA1 (patch-aa) = a5648952f486455e9063ec3f6bf679f9842ec3b2
+SHA1 (patch-src_date.h) = 20a39aa4ccc7402c7243a77062fb3ec0dfa16e1f
+SHA1 (patch-src_qso__db.cpp) = 57fddc1aa5674614a0648f1c5e5d7c2a38bd6d4b
+SHA1 (patch-src_qso__db.h) = c355b5ef0f1c73de9c21739b79009c9eb5f76fc5
diff --git a/ham/fl_logbook/patches/patch-aa b/ham/fl_logbook/patches/patch-aa
index 44a05c0e31f..14f9fc89baa 100644
--- a/ham/fl_logbook/patches/patch-aa
+++ b/ham/fl_logbook/patches/patch-aa
@@ -1,51 +1,73 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/01/21 16:49:23 obache Exp $
+$NetBSD: patch-aa,v 1.2 2012/11/16 00:33:36 gdt Exp $
 
---- Makefile.orig	2006-11-21 14:10:53.000000000 +0000
-+++ Makefile
-@@ -10,7 +10,6 @@ else
- endif
- 
- PROJECT = fl_logbook
--CC = "/usr/bin/g++"
- 
- ifeq ($(CFG),Debug)
-   OBJ_DIR = Debug
-@@ -19,9 +18,9 @@ ifeq ($(CFG),Debug)
-   C_INCLUDE_DIRS = -I"src" 
-   C_PREPROC = 
-   CFLAGS = -pipe `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -ggdb2 -O0 -fno-rtti -fexceptions 
--  LIB_DIRS = -L"src/lib" -L"../../../../../usr/local/lib" 
-+  LIB_DIRS = -L"src/lib"
-   LIBS = 
--  LDFLAGS = -pipe `fltk-config --ldstaticflags`
-+  LDFLAGS = -pipe `fltk-config --ldflags`
- endif
- 
- ifeq ($(CFG),Release)
-@@ -31,9 +30,9 @@ ifeq ($(CFG),Release)
-   C_INCLUDE_DIRS = -I"src" 
-   C_PREPROC = 
-   CFLAGS = -pipe `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -g0 -O2 -fno-rtti -fexceptions 
--  LIB_DIRS = -L"src/lib" -L"../../../../../usr/local/lib" 
-+  LIB_DIRS = -L"src/lib"
-   LIBS =
--  LDFLAGS = -pipe -s `fltk-config --ldstaticflags`
-+  LDFLAGS = -pipe -s `fltk-config --ldflags`
- endif
- 
- SRC_OBJS = \
-@@ -52,12 +51,12 @@ SRC_OBJS = \
- 
- define build_target
- @echo Linking...
--@$(CC) -o "$(OUTPUT_DIR)/$(TARGET)" $(SRC_OBJS) $(LIB_DIRS) $(LIBS) $(LDFLAGS)
-+@$(CXX) -o "$(OUTPUT_DIR)/$(TARGET)" $(SRC_OBJS) $(LIB_DIRS) $(LIBS) $(LDFLAGS)
- endef
- 
- define compile_source
- @echo Compiling $<
--@$(CC) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@"
-+@$(CXX) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@"
- endef
- 
- .PHONY: print_header directories
+Use $(CXX) to build C++ programs.
+
+--- makefile.orig	2008-01-25 17:02:00.000000000 +0000
++++ makefile
+@@ -6,7 +6,6 @@
+ #

+ 

+ SRC = src/

+-CC = g++

+ CCFLAG = `fltk-config --cxxflags` -I$(SRC) -Wno-deprecated 

+ LIBS = `fltk-config --ldflags`

+ 

+@@ -16,45 +15,45 @@ LIBS = `fltk-config --ldflags`

+ all: fl_logbook

+ 

+ adif_io.o: $(SRC)adif_io.cpp

+-	$(CC) $(CCFLAG) -c $(SRC)adif_io.cpp

++	$(CXX) $(CCFLAG) -c $(SRC)adif_io.cpp

+ 

+ support.o: $(SRC)support.cpp

+-	$(CC) $(CCFLAG) -c $(SRC)support.cpp

++	$(CXX) $(CCFLAG) -c $(SRC)support.cpp

+ 

+ ipcdata.o: $(SRC)ipcdata.cpp $(SRC)ipcdata.h

+-	$(CC) $(CCFLAG) -c $(SRC)ipcdata.cpp

++	$(CXX) $(CCFLAG) -c $(SRC)ipcdata.cpp

+ 	

+ multipsklog.o: $(SRC)multipsklog.cpp

+-	$(CC) $(CCFLAG) -c $(SRC)multipsklog.cpp

++	$(CXX) $(CCFLAG) -c $(SRC)multipsklog.cpp

+ 

+ qso_db.o: $(SRC)qso_db.cpp

+-	$(CC) $(CCFLAG) -c $(SRC)qso_db.cpp

++	$(CXX) $(CCFLAG) -c $(SRC)qso_db.cpp

+ 

+ lgbook.o:$(SRC)lgbook.cpp

+-	$(CC) $(CCFLAG) -c $(SRC)lgbook.cpp

++	$(CXX) $(CCFLAG) -c $(SRC)lgbook.cpp

+  

+ calendar.o:$(SRC)calendar.cxx

+-	$(CC) $(CCFLAG) -c $(SRC)calendar.cxx

++	$(CXX) $(CCFLAG) -c $(SRC)calendar.cxx

+  

+ combo.o:$(SRC)combo.cxx

+-	$(CC) $(CCFLAG) -c $(SRC)combo.cxx

++	$(CXX) $(CCFLAG) -c $(SRC)combo.cxx

+  

+ date.o:$(SRC)date.cxx

+-	$(CC) $(CCFLAG) -c $(SRC)date.cxx

++	$(CXX) $(CCFLAG) -c $(SRC)date.cxx

+  

+ table.o:$(SRC)table.cxx

+-	$(CC) $(CCFLAG) -c $(SRC)table.cxx

++	$(CXX) $(CCFLAG) -c $(SRC)table.cxx

+  

+ fileio.o:$(SRC)fileio.cpp

+-	$(CC) $(CCFLAG) -c $(SRC)fileio.cpp

++	$(CXX) $(CCFLAG) -c $(SRC)fileio.cpp

+  

+ fl_logbook.o: $(SRC)fl_logbook.cpp

+-	$(CC) $(CCFLAG) -c $(SRC)fl_logbook.cpp

++	$(CXX) $(CCFLAG) -c $(SRC)fl_logbook.cpp

+ 

+ fl_logbook:  fl_logbook.o lgbook.o qso_db.o combo.o \

+ 		adif_io.o multipsklog.o support.o \

+ 		calendar.o date.o table.o fileio.o ipcdata.o

+-	$(CC) $(CCFLAG) \

++	$(CXX) $(CCFLAG) \

+ 		fl_logbook.o lgbook.o qso_db.o combo.o \

+ 		adif_io.o multipsklog.o support.o \

+ 		calendar.o date.o table.o fileio.o ipcdata.o \

diff --git a/ham/fl_logbook/patches/patch-src_date.h b/ham/fl_logbook/patches/patch-src_date.h
index 441b6b59836..c02b24a4f2d 100644
--- a/ham/fl_logbook/patches/patch-src_date.h
+++ b/ham/fl_logbook/patches/patch-src_date.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_date.h,v 1.1 2011/11/25 21:59:57 joerg Exp $
+$NetBSD: patch-src_date.h,v 1.2 2012/11/16 00:33:36 gdt Exp $
 
---- src/date.h.orig	2011-11-25 17:49:57.000000000 +0000
+--- src/date.h.orig	2006-09-11 15:40:15.000000000 +0000
 +++ src/date.h
 @@ -25,13 +25,15 @@
  #ifndef DATE_H
diff --git a/ham/fl_logbook/patches/patch-src_qso__db.cpp b/ham/fl_logbook/patches/patch-src_qso__db.cpp
index 4f023c47fab..6366d46d201 100644
--- a/ham/fl_logbook/patches/patch-src_qso__db.cpp
+++ b/ham/fl_logbook/patches/patch-src_qso__db.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_qso__db.cpp,v 1.1 2011/11/25 21:59:57 joerg Exp $
+$NetBSD: patch-src_qso__db.cpp,v 1.2 2012/11/16 00:33:36 gdt Exp $
 
---- src/qso_db.cpp.orig	2011-11-25 17:52:09.000000000 +0000
+--- src/qso_db.cpp.orig	2007-02-16 20:19:59.000000000 +0000
 +++ src/qso_db.cpp
 @@ -1,3 +1,4 @@
 +#include <cstring>
diff --git a/ham/fl_logbook/patches/patch-src_qso__db.h b/ham/fl_logbook/patches/patch-src_qso__db.h
index b8f832aab4f..82df4d989a3 100644
--- a/ham/fl_logbook/patches/patch-src_qso__db.h
+++ b/ham/fl_logbook/patches/patch-src_qso__db.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_qso__db.h,v 1.1 2011/11/25 21:59:57 joerg Exp $
+$NetBSD: patch-src_qso__db.h,v 1.2 2012/11/16 00:33:36 gdt Exp $
 
---- src/qso_db.h.orig	2011-11-25 17:49:53.000000000 +0000
+--- src/qso_db.h.orig	2005-09-02 10:18:51.000000000 +0000
 +++ src/qso_db.h
 @@ -1,8 +1,8 @@
  #ifndef QSO_DB