CVS commit: pkgsrc/cad/gtkwave

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Mar 18 07:00:47 UTC 2026

Modified Files:
        pkgsrc/cad/gtkwave: Makefile
Added Files:
        pkgsrc/cad/gtkwave: options.mk

Log Message:
gtkwave: fix build on Darwin + cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 pkgsrc/cad/gtkwave/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/cad/gtkwave/options.mk

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

Modified files:

Index: pkgsrc/cad/gtkwave/Makefile
diff -u pkgsrc/cad/gtkwave/Makefile:1.148 pkgsrc/cad/gtkwave/Makefile:1.149
--- pkgsrc/cad/gtkwave/Makefile:1.148   Tue Jan 27 08:39:04 2026
+++ pkgsrc/cad/gtkwave/Makefile Wed Mar 18 07:00:47 2026
@@ -1,52 +1,40 @@
-# $NetBSD: Makefile,v 1.148 2026/01/27 08:39:04 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.149 2026/03/18 07:00:47 adam Exp $
 
-DISTNAME=              gtkwave-3.3.125
-PKGREVISION=           3
-CATEGORIES=            cad
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gtkwave/}
-#MASTER_SITES=         http://home.nc.rr.com/gtkwave/
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              https://gtkwave.sourceforge.net/
-COMMENT=               Electronic waveform viewer
-LICENSE=               gnu-gpl-v3
+DISTNAME=      gtkwave-3.3.125
+PKGREVISION=   3
+CATEGORIES=    cad
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gtkwave/}
+#MASTER_SITES= http://home.nc.rr.com/gtkwave/
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://gtkwave.sourceforge.net/
+COMMENT=       Electronic waveform viewer
+LICENSE=       gnu-gpl-v3
 
-TOOL_DEPENDS+=         gperf-[0-9]*:../../devel/gperf
+TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
 
-GNU_CONFIGURE=         yes
-USE_TOOLS+=            gmake pkg-config
 USE_LANGUAGES+=                c c++
+USE_TOOLS+=            gmake pkg-config
+GNU_CONFIGURE=         yes
 
 PTHREAD_AUTO_VARS=             yes
 CHECK_PORTABILITY_SKIP+=       contrib/bundle_for_osx/*.sh
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.gtkwave
-PKG_SUPPORTED_OPTIONS= gtkwave-tcl gconf
-PKG_SUGGESTED_OPTIONS= gconf
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtkwave-tcl)
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-tcl
-.endif
+.include "options.mk"
 
-.if !empty(PKG_OPTIONS:Mgconf)
-CONFIGURE_ARGS+=       --with-gconf
-.include "../../devel/gconfmm/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+.include "../../x11/gtk-mac-integration/buildlink3.mk"
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/cad/gtkwave/options.mk
diff -u /dev/null pkgsrc/cad/gtkwave/options.mk:1.1
--- /dev/null   Wed Mar 18 07:00:48 2026
+++ pkgsrc/cad/gtkwave/options.mk       Wed Mar 18 07:00:47 2026
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2026/03/18 07:00:47 adam Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gtkwave
+PKG_SUPPORTED_OPTIONS= gtkwave-tcl gconf
+PKG_SUGGESTED_OPTIONS= gconf
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtkwave-tcl)
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-tcl
+.endif
+
+.if !empty(PKG_OPTIONS:Mgconf)
+CONFIGURE_ARGS+=       --with-gconf
+.include "../../devel/gconfmm/buildlink3.mk"
+.endif