From d5f61e6c5363e3638ccc9cffa1e9da67f22597c2 Mon Sep 17 00:00:00 2001
From: juanfra <juanfra@openbsd.org>
Date: Sat, 3 Dec 2022 19:48:55 +0000
Subject: [PATCH] Update to bacon 4.6.

---
 lang/bacon/Makefile                  | 11 ++++++-----
 lang/bacon/distinfo                  |  4 ++--
 lang/bacon/patches/patch-Makefile_in | 23 +++++++++++++++++++++--
 lang/bacon/pkg/PLIST                 | 16 ++++++++++++----
 4 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/lang/bacon/Makefile b/lang/bacon/Makefile
index 56a3c8dcab6..e8b791f799f 100644
--- a/lang/bacon/Makefile
+++ b/lang/bacon/Makefile
@@ -1,6 +1,6 @@
 COMMENT =		BASIC converter to C translator for Unix system
 
-DISTNAME =		bacon-4.1
+DISTNAME =		bacon-4.6
 
 CATEGORIES =		lang
 
@@ -19,21 +19,22 @@ COMPILER =		base-clang ports-gcc base-gcc
 MASTER_SITES =		https://www.basic-converter.org/stable/ \
 			https://www.basic-converter.org/museum/
 
-BUILD_DEPENDS =		shells/bash
+BUILD_DEPENDS =		shells/zsh
 RUN_DEPENDS =		devel/desktop-file-utils \
-			shells/bash
+			shells/bash \
+			x11/gtk+3,-guic
 LIB_DEPENDS =		x11/fltk
 
 PORTHOME =		${WRKDIR}
 
 CONFIGURE_STYLE =	gnu
 # Disable the gtk bacongui. It doesn't works on OpenBSD.
-CONFIGURE_ARGS =	--with-bash \
+CONFIGURE_ARGS =	--with-zsh \
 			--enable-gui-fltk \
 			--disable-gui-gtk
 CONFIGURE_ENV =		CPPFLAGS="`fltk-config --cxxflags`" \
 			CFLAGS="`fltk-config --cflags` ${CFLAGS}" \
-			CXXFLAGS="`fltk-config --cxxflags` -Wno-deprecated ${CXXFLAGS}" \
+			CXXFLAGS="`fltk-config --cxxflags` -Wno-deprecated -Wno-non-c-typedef-for-linkage ${CXXFLAGS}" \
 			LDFLAGS="-L. `fltk-config --ldflags`" \
 			CC=${CC} CXX=${CXX}
 
diff --git a/lang/bacon/distinfo b/lang/bacon/distinfo
index e36b5d916aa..443c465341b 100644
--- a/lang/bacon/distinfo
+++ b/lang/bacon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bacon-4.1.tar.gz) = hMmk6V8GmtZu0mnTk9iNEjMA3DFt+4vLMYgn6qvux3g=
-SIZE (bacon-4.1.tar.gz) = 480712
+SHA256 (bacon-4.6.tar.gz) = 5rzmOSS/+BCxXAaCKV/ZYnhuGFzDoM8f7AZaCzzubss=
+SIZE (bacon-4.6.tar.gz) = 683952
diff --git a/lang/bacon/patches/patch-Makefile_in b/lang/bacon/patches/patch-Makefile_in
index 29c09e3777c..bc615ea6d92 100644
--- a/lang/bacon/patches/patch-Makefile_in
+++ b/lang/bacon/patches/patch-Makefile_in
@@ -10,7 +10,26 @@ Index: Makefile.in
  STRIP           = @STRIP@
  CC              = @CC@
  CXX             = @CXX@
-@@ -66,11 +66,11 @@ install :
+@@ -52,14 +52,10 @@ install :
+ 		echo $(INSTALL) build/bacongui-gtk $(DESTDIR)$(BINDIR); \
+ 		$(INSTALL) -m 644 bacongui-gtk.desktop $(DESTDIR)$(DATADIR)/applications; \
+ 		echo $(INSTALL) -m 644 bacongui-gtk.desktop $(DESTDIR)$(DATADIR)/applications; \
+-		mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps; \
+-		echo mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps; \
+-		$(INSTALL) -m 644 icons/BaCon.png $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/bacon.png; \
+-		echo $(INSTALL) -m 644 icons/BaCon.png $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/bacon.png; \
+-		gtk-update-icon-cache; \
+-		echo gtk-update-icon-cache; \
+-		update-icon-caches /usr/share/icons/hicolor/* 2>/dev/null; \
+-		echo 'update-icon-caches /usr/share/icons/hicolor/*'; \
++		mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps; \
++		echo mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps; \
++		$(INSTALL) -m 644 icons/BaCon.png $(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/bacon.png; \
++		echo $(INSTALL) -m 644 icons/BaCon.png $(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/bacon.png; \
+ 	fi;
+ 	@if [ $(FLTK) = "true" -a -n "$(CXX)" ]; then \
+ 		$(INSTALL) build-cpp/bacongui-fltk $(DESTDIR)$(BINDIR); \
+@@ -74,11 +70,11 @@ install :
  	$(INSTALL) -m 644 icons/BaCon.xbm $(DESTDIR)$(DATADIR)/pixmaps
  	$(INSTALL) -m 644 icons/BaCon24.png $(DESTDIR)$(DATADIR)/pixmaps
  	$(INSTALL) -m 644 icons/BaConEyes.png $(DESTDIR)$(DATADIR)/pixmaps
@@ -26,4 +45,4 @@ Index: Makefile.in
 +		echo $(INSTALL) -m 644 syntax/bacon.st $(DESTDIR)$(DATADIR)/enscript/hl; \
  	fi;
  	mkdir -p $(DESTDIR)$(DATADIR)/BaCon
- 	$(INSTALL) -m 644 syntax/lower.m4 $(DESTDIR)$(DATADIR)/BaCon
+ 	$(INSTALL) -m 644 LICENSE $(DESTDIR)$(DATADIR)/BaCon
diff --git a/lang/bacon/pkg/PLIST b/lang/bacon/pkg/PLIST
index 382af5840c6..288ef543e2d 100644
--- a/lang/bacon/pkg/PLIST
+++ b/lang/bacon/pkg/PLIST
@@ -3,17 +3,25 @@ bin/bacon.sh
 @bin bin/bacongui-fltk
 share/BaCon/
 share/BaCon/LICENSE
-share/BaCon/bacon.lang
-share/BaCon/bacon.vim
-share/BaCon/lower.m4
-share/BaCon/upper.m4
+share/BaCon/documentation/
+share/BaCon/documentation/doc_frame.html
+share/BaCon/documentation/doc_index.html
+share/BaCon/documentation/documentation.html
+share/BaCon/documentation/documentation.txt
+share/BaCon/syntax/
+share/BaCon/syntax/bacon.lang
+share/BaCon/syntax/bacon.vim
+share/BaCon/syntax/lower.m4
+share/BaCon/syntax/upper.m4
 share/applications/bacongui-fltk.desktop
 share/enscript/
 share/enscript/hl/
 share/enscript/hl/bacon.st
+share/icons/hicolor/scalable/apps/bacon.png
 share/pixmaps/
 share/pixmaps/BaCon.png
 share/pixmaps/BaCon.xbm
 share/pixmaps/BaCon24.png
 share/pixmaps/BaConEyes.png
 @tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor