misc/gpsim: update 0.31.0 → 0.32.0

Reported by:	portscout

5 files changed, 26 insertions, 17 deletions

diff --git a/misc/gpsim/Makefile b/misc/gpsim/Makefile
index 15f61bfa1b88..4a9d28ab633c 100644
--- a/misc/gpsim/Makefile
+++ b/misc/gpsim/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gpsim
-DISTVERSION=	0.31.0
-PORTREVISION=	1
+DISTVERSION=	0.32.0
 CATEGORIES=	misc
 MASTER_SITES=	SF
 
@@ -14,15 +13,18 @@ LICENSE_COMB=	multi
 BUILD_DEPENDS=	gpasm:devel/gputils
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libpopt.so:devel/popt
 RUN_DEPENDS=	gpasm:devel/gputils
 
 USES=		compiler:c++11-lang gmake gnome libtool localbase:ldflags pathfix pkgconfig readline
 USE_CXXSTD=	c++11
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 pango
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
+
 INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
 
 CONFLICTS_BUILD=	ga
 
diff --git a/misc/gpsim/distinfo b/misc/gpsim/distinfo
index db0eede38865..6dff412e57bc 100644
--- a/misc/gpsim/distinfo
+++ b/misc/gpsim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571981677
-SHA256 (gpsim-0.31.0.tar.gz) = 110ee6be3a5d02b32803a91e480cbfc9d423ef72e0830703fc0bc97b9569923f
-SIZE (gpsim-0.31.0.tar.gz) = 3454179
+TIMESTAMP = 1698993663
+SHA256 (gpsim-0.32.0.tar.gz) = 8ef4fb64c993b205d943b300fb9dcb8cc0c4c9d0e8d8d47fdc088fe9c3c42468
+SIZE (gpsim-0.32.0.tar.gz) = 3621850
diff --git a/misc/gpsim/files/patch-Makefile.in b/misc/gpsim/files/patch-Makefile.in
new file mode 100644
index 000000000000..7b9b82634e57
--- /dev/null
+++ b/misc/gpsim/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+- workaround for the regression: build breakage in the 'doc' folder in 0.32.0
+- reported to the upstream author Scott Dattalo via e-mail on 2023-11-03.
+
+--- Makefile.in.orig	2023-11-03 16:11:02 UTC
++++ Makefile.in
+@@ -387,7 +387,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+ pkgconfig_DATA = @PACKAGE_NAME@.pc
+-SUBDIRS = eXdbm src cli xpms gui modules extras gpsim examples doc regression 
++SUBDIRS = eXdbm src cli xpms gui modules extras gpsim examples regression 
+ EXTRA_DIST = PROCESSORS HISTORY README.EXAMPLES ANNOUNCE README.MODULES \
+ 	README INSTALL.gpsim COPYING.LESSER \
+ 	config_win32.h.in \
diff --git a/misc/gpsim/files/patch-src_modules.cc b/misc/gpsim/files/patch-src_modules.cc
deleted file mode 100644
index e4b080af4465..000000000000
--- a/misc/gpsim/files/patch-src_modules.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules.cc.orig	2019-10-25 05:47:58 UTC
-+++ src/modules.cc
-@@ -47,7 +47,7 @@ License along with this library; if not, see
- #undef interface
- #endif
- 
--#include "error.h"
-+//#include "error.h"
- #include "gpsim_interface.h"
- #include "stimuli.h"
- #include "symbol.h"
diff --git a/misc/gpsim/pkg-plist b/misc/gpsim/pkg-plist
index 8520ad2699ea..58a529c20976 100644
--- a/misc/gpsim/pkg-plist
+++ b/misc/gpsim/pkg-plist
@@ -15,6 +15,7 @@ include/gpsim/16bit-tmrs.h
 include/gpsim/ValueCollections.h
 include/gpsim/a2d_v2.h
 include/gpsim/a2dconverter.h
+include/gpsim/at.h
 include/gpsim/attributes.h
 include/gpsim/bit.h
 include/gpsim/bitlog.h
@@ -72,6 +73,7 @@ include/gpsim/pic-ioports.h
 include/gpsim/pic-packages.h
 include/gpsim/pic-processor.h
 include/gpsim/pic-registers.h
+include/gpsim/pid.h
 include/gpsim/pie.h
 include/gpsim/pir.h
 include/gpsim/pm_rd.h
@@ -96,6 +98,7 @@ include/gpsim/ttoken.h
 include/gpsim/uart.h
 include/gpsim/ui.h
 include/gpsim/value.h
+include/gpsim/wdt.h
 include/gpsim/xref.h
 include/gpsim/zcd.h
 lib/libgpsim.a
@@ -126,3 +129,4 @@ lib/libgpsimgui.a
 lib/libgpsimgui.so
 lib/libgpsimgui.so.0
 lib/libgpsimgui.so.0.0.0
+libdata/pkgconfig/gpsim.pc