fl_logbook: Test with FLTK 1.4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fl_logbook: Test with FLTK 1.4
From: Michael Baeuerle (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Wed, 22 Jan 2025 17:23:10 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Jan 22 18:22:08 2025 +0100
Changeset:	cc4b5954270a645615e60724c5375c86528d7c1b

Modified Files:
	Makefile
Added Files:
	fl_logbook/COMMIT_MSG
	fl_logbook/DESCR
	fl_logbook/Makefile
	fl_logbook/PLIST
	fl_logbook/distinfo
	fl_logbook/patches/patch-makefile
	fl_logbook/patches/patch-src_date.h
	fl_logbook/patches/patch-src_qso__db.cpp
	fl_logbook/patches/patch-src_qso__db.h
	fl_logbook/patches/patch-src_support.cpp
	fl_logbook/patches/patch-src_table.h

Log Message:
fl_logbook: Test with FLTK 1.4

- Include FLTK headers from subdirectory "FL"
- Update and document patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cc4b5954270a645615e60724c5375c86528d7c1b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                 |  1 +
 fl_logbook/COMMIT_MSG                    |  4 ++
 fl_logbook/DESCR                         |  2 +
 fl_logbook/Makefile                      | 25 +++++++++++
 fl_logbook/PLIST                         |  2 +
 fl_logbook/distinfo                      | 11 +++++
 fl_logbook/patches/patch-makefile        | 73 ++++++++++++++++++++++++++++++++
 fl_logbook/patches/patch-src_date.h      | 24 +++++++++++
 fl_logbook/patches/patch-src_qso__db.cpp | 11 +++++
 fl_logbook/patches/patch-src_qso__db.h   | 26 ++++++++++++
 fl_logbook/patches/patch-src_support.cpp | 12 ++++++
 fl_logbook/patches/patch-src_table.h     | 25 +++++++++++
 12 files changed, 216 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index ab882f10e3..33d137f053 100644
--- a/Makefile
+++ b/Makefile
@@ -964,6 +964,7 @@ SUBDIR+=	firefox-hg
 SUBDIR+=	firefox-wrapper
 SUBDIR+=	firefox102
 SUBDIR+=	firehose
+SUBDIR+=	fl_logbook
 SUBDIR+=	flag
 SUBDIR+=	flam3-svn
 SUBDIR+=	flamegraph-rs
diff --git a/fl_logbook/COMMIT_MSG b/fl_logbook/COMMIT_MSG
new file mode 100644
index 0000000000..fa72f81b5e
--- /dev/null
+++ b/fl_logbook/COMMIT_MSG
@@ -0,0 +1,4 @@
+ham/fl_logbook: Switch to FLTK 1.4
+
+- Include FLTK headers from subdirectory "FL"
+- Update and document patches
diff --git a/fl_logbook/DESCR b/fl_logbook/DESCR
new file mode 100644
index 0000000000..a1c3f357ca
--- /dev/null
+++ b/fl_logbook/DESCR
@@ -0,0 +1,2 @@
+FlLogbook is a amateur radio operator log book written using the Fast
+Light Toolkit.
diff --git a/fl_logbook/Makefile b/fl_logbook/Makefile
new file mode 100644
index 0000000000..990c3c3bb7
--- /dev/null
+++ b/fl_logbook/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD$
+
+DISTNAME=		fl_logbook-2.5
+PKGREVISION=		8
+CATEGORIES=		ham
+MASTER_SITES=		http://www.w1hkj.com/LinuxApps/
+
+MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=		http://www.w1hkj.com/
+COMMENT=		FLTK-based amateur radio log book
+LICENSE=		gnu-gpl-v2
+
+USE_LANGUAGES=		c++
+USE_TOOLS+=		gmake
+
+MAKE_FILE=		makefile
+
+INSTALLATION_DIRS=	bin
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/fl_logbook ${DESTDIR}${PREFIX}/bin
+
+.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/fl_logbook/PLIST b/fl_logbook/PLIST
new file mode 100644
index 0000000000..ab8255655b
--- /dev/null
+++ b/fl_logbook/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+bin/fl_logbook
diff --git a/fl_logbook/distinfo b/fl_logbook/distinfo
new file mode 100644
index 0000000000..3d2a8f271e
--- /dev/null
+++ b/fl_logbook/distinfo
@@ -0,0 +1,11 @@
+$NetBSD$
+
+BLAKE2s (fl_logbook-2.5.tar.gz) = e1f26ce4d1bdcdbc7c673043a8686f259322389c8c9f5fd7adbb0e4c6804b6c2
+SHA512 (fl_logbook-2.5.tar.gz) = 0ea8dfd2cfa5b726baa059800a7696081c4cb13d624b66a5637a4881438335388defeac11000dbc91be39a584758845a58a480bc83894383cc432aa2d8e50a36
+Size (fl_logbook-2.5.tar.gz) = 58672 bytes
+SHA1 (patch-makefile) = 43a12601220b055cb2f8b2495e4341d630bd9a81
+SHA1 (patch-src_date.h) = a7aa27272941fc57ea67c22ec2e912266d854c40
+SHA1 (patch-src_qso__db.cpp) = 88fa1ced8b6b582137d8ad881d82247609cacbae
+SHA1 (patch-src_qso__db.h) = db3e368625c59577834250b54bada2af4aaa453c
+SHA1 (patch-src_support.cpp) = f3a54181305de562a01c0ee27c0ffdcf6a77f9e7
+SHA1 (patch-src_table.h) = 1014f2f0b26dbb96ce06e65c04761a4b507cc056
diff --git a/fl_logbook/patches/patch-makefile b/fl_logbook/patches/patch-makefile
new file mode 100644
index 0000000000..6f3e49e224
--- /dev/null
+++ b/fl_logbook/patches/patch-makefile
@@ -0,0 +1,73 @@
+$NetBSD$
+
+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/fl_logbook/patches/patch-src_date.h b/fl_logbook/patches/patch-src_date.h
new file mode 100644
index 0000000000..a9b3ae2c5c
--- /dev/null
+++ b/fl_logbook/patches/patch-src_date.h
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Use C++ headers for iostream and iomanip.
+
+--- src/date.h.orig	2006-09-11 15:40:15.000000000 +0000
++++ src/date.h
+@@ -25,13 +25,15 @@
+ #ifndef DATE_H
+ #define DATE_H
+ 
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
++using namespace std;
++
+ typedef enum {
+   SUNDAY,
+   MONDAY,
diff --git a/fl_logbook/patches/patch-src_qso__db.cpp b/fl_logbook/patches/patch-src_qso__db.cpp
new file mode 100644
index 0000000000..74f84a6fb3
--- /dev/null
+++ b/fl_logbook/patches/patch-src_qso__db.cpp
@@ -0,0 +1,11 @@
+$NetBSD$
+
+Add missing header.
+
+--- src/qso_db.cpp.orig	2007-02-16 20:19:59.000000000 +0000
++++ src/qso_db.cpp
+@@ -1,3 +1,4 @@
++#include <cstring>
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include "qso_db.h"
diff --git a/fl_logbook/patches/patch-src_qso__db.h b/fl_logbook/patches/patch-src_qso__db.h
new file mode 100644
index 0000000000..c1f2e7f501
--- /dev/null
+++ b/fl_logbook/patches/patch-src_qso__db.h
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Add missing headers.
+
+--- src/qso_db.h.orig	2005-09-02 10:18:51.000000000 +0000
++++ src/qso_db.h
+@@ -1,8 +1,8 @@
+ #ifndef QSO_DB
+ #define QSO_DB
+ 
+-#include <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
+ //#include <istream>
+ //#include <ostream>
+ //#include <fstream>
+@@ -12,6 +12,8 @@
+ 
+ #include "adif_def.h"
+ //#include "myprofile.h"
++
++using namespace std;
+ 
+ #ifndef TRUE
+ #define TRUE 1
diff --git a/fl_logbook/patches/patch-src_support.cpp b/fl_logbook/patches/patch-src_support.cpp
new file mode 100644
index 0000000000..1d0bc3dd41
--- /dev/null
+++ b/fl_logbook/patches/patch-src_support.cpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Include FLTK header "FL/Fl_File_Chooser.H".
+
+--- src/support.cpp.orig	2007-11-18 05:14:57.000000000 +0000
++++ src/support.cpp
+@@ -1,4 +1,4 @@
+-#include <FL/fl_file_chooser.H>
++#include <FL/Fl_File_Chooser.H>
+ 
+ #include <stdlib.h>
+ 
diff --git a/fl_logbook/patches/patch-src_table.h b/fl_logbook/patches/patch-src_table.h
new file mode 100644
index 0000000000..56f27c0d6a
--- /dev/null
+++ b/fl_logbook/patches/patch-src_table.h
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Include FLTK headers from subdirectory "FL".
+
+--- src/table.h.orig	2006-09-11 15:37:21.000000000 +0000
++++ src/table.h
+@@ -26,12 +26,12 @@
+ #ifndef __TABLE_HH
+ #define __TABLE_HH
+ 
+-#include <Fl/Fl.H>
+-#include <Fl/Fl_Widget.H>
+-#include <Fl/Fl_Scroll.H>
+-#include <Fl/Fl_Scrollbar.H>
+-#include <Fl/Fl_Box.H>
+-#include <Fl/Fl_Menu_Item.H>
++#include <FL/Fl.H>
++#include <FL/Fl_Widget.H>
++#include <FL/Fl_Scroll.H>
++#include <FL/Fl_Scrollbar.H>
++#include <FL/Fl_Box.H>
++#include <FL/Fl_Menu_Item.H>
+ #include <stdlib.h>
+ #include <vector>
+
Prev by Date: tigervnc: Test with FLTK 1.4.
Next by Date: tuxpaint-config: Switch to FLTK 1.4
Previous by Thread: tigervnc: Test with FLTK 1.4.
Next by Thread: tuxpaint-config: Switch to FLTK 1.4
Indexes:
Home | Main Index | Thread Index | Old Index