pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

edelib21: Import edelib 2.1



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Jan 22 14:45:56 2025 +0100
Changeset:	b8590674aa78b145c0d21da0dbde89222fa00e91

Modified Files:
	Makefile
Added Files:
	edelib21/COMMIT_MSG
	edelib21/DESCR
	edelib21/Makefile
	edelib21/PLIST
	edelib21/buildlink3.mk
	edelib21/distinfo
	edelib21/options.mk
	edelib21/patches/patch-configure
	edelib21/patches/patch-src_IconChooser.cpp
	edelib21/patches/patch-src_MenuItem.cpp
	edelib21/patches/patch-src_WindowUtils.cpp
	edelib21/patches/patch-src_ts_scheme.c

Log Message:
edelib21: Import edelib 2.1

Required by EDE 2.1 desktop.

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

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

diffstat:
 Makefile                                   |   1 +
 edelib21/COMMIT_MSG                        |  37 +++
 edelib21/DESCR                             |   1 +
 edelib21/Makefile                          |  56 ++++
 edelib21/PLIST                             | 461 +++++++++++++++++++++++++++++
 edelib21/buildlink3.mk                     |  16 +
 edelib21/distinfo                          |  10 +
 edelib21/options.mk                        |  13 +
 edelib21/patches/patch-configure           |  15 +
 edelib21/patches/patch-src_IconChooser.cpp |  15 +
 edelib21/patches/patch-src_MenuItem.cpp    |  26 ++
 edelib21/patches/patch-src_WindowUtils.cpp |  41 +++
 edelib21/patches/patch-src_ts_scheme.c     |  26 ++
 13 files changed, 718 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index b12ed91572..7a92161ec6 100644
--- a/Makefile
+++ b/Makefile
@@ -803,6 +803,7 @@ SUBDIR+=	edb-debugger
 SUBDIR+=	edb-debugger-git
 SUBDIR+=	edbrowse
 SUBDIR+=	edelib
+SUBDIR+=	edelib21
 SUBDIR+=	edencommon
 SUBDIR+=	edid-decode
 SUBDIR+=	editorconfig-checker
diff --git a/edelib21/COMMIT_MSG b/edelib21/COMMIT_MSG
new file mode 100644
index 0000000000..3ddfefe64b
--- /dev/null
+++ b/edelib21/COMMIT_MSG
@@ -0,0 +1,37 @@
+devel/edelib: Add version 2.1
+
+Small and portable C++ library for EDE (Equinox Desktop Environment).
+
+Aims are to provide enough background for easier EDE components construction
+and development.
+
+Upstream changelog for version 2.1
+----------------------------------
+- Added tooltip support for menu items.
+- edelib can be compiled without DBus binding. EDELIB_HAVE_DBUS #ifdef can be
+  used to check if edelib has DBus support.
+- Added edelib-dbus-explorer, a dynamic UI tool for exploring and communicating
+  with DBus services via a builtin Scheme interpreter.
+- Fixed various bugs in bundled Scheme interpreter, detected after TinyCLOS
+  tests.
+- Faster (append) and fixed (gcd) and (lcm) in Scheme interpreter.
+- Added JSON module for Scheme interpreter.
+- Added workaround for missing _SC_GETPW_R_SIZE_MAX on Minix.
+- Added str_hash() function for simple hash computing from string, which
+  unified hashing code through edelib.
+- edelib now ships its own rgb.txt as the Minix X11 distribution keeps it in
+  uncommon places.
+- Theme engine is using C++ RTTI (optional feature) to figure out how to update
+  widget fonts.
+- Fixed a couple of warnings produced by clang.
+- Font cache engine will prevent registering fonts if already registered.
+- FontChooser is now using font cache for querying fonts.
+- edelib-convert-icontheme can use rsvg-convert now.
+- Redesigned icon chooser dialog: now the user can also choose icons not found
+  in the icon theme.
+- Small dir_list() optimization.
+- Fixed core dumping for bundled Jam on Minix.
+- Added support for querying NETWM window states.
+- Expandable group can now read global scrollbar size.
+- Icon theme engine now supports searching for icons when exact icon size wasn't
+  found; this completes full support for fd.o icon theme specification.
diff --git a/edelib21/DESCR b/edelib21/DESCR
new file mode 100644
index 0000000000..c28ec38160
--- /dev/null
+++ b/edelib21/DESCR
@@ -0,0 +1 @@
+Libraries for Equinox Desktop (EDE).
diff --git a/edelib21/Makefile b/edelib21/Makefile
new file mode 100644
index 0000000000..ee14c5262c
--- /dev/null
+++ b/edelib21/Makefile
@@ -0,0 +1,56 @@
+# $NetBSD: Makefile,v 1.12 2012/11/17 10:22:45 kristerw Exp $
+
+DISTNAME=	edelib-2.1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ede/}
+
+MAINTAINER=	pkgsrc-users%users.sourceforge.net@localhost
+HOMEPAGE=	https://edeproject.org/
+COMMENT=	Libraries for Equinox Desktop
+LICENSE=	gnu-lgpl-v2 # or later
+
+USE_LANGUAGES=		c c++
+USE_CC_FEATURES+=	c99
+USE_CXX_FEATURES+=	c++11
+USE_FEATURES+=		snprintf vsnprintf
+USE_TOOLS+=		gsed pkg-config
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-dbus
+CONFIGURE_ARGS+=	--disable-rtti
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--disable-largefile
+
+TOOL_DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+=	jam-[0-9]*:../../devel/jam
+
+.include "../../mk/bsd.prefs.mk"
+
+# Solaris /bin/sh is really bad, so use TOOLS_PLATFORM.sh if it's been defined.
+.if ${OPSYS} == "SunOS"
+REPLACE_SH+=	autogen.sh configure \
+		src/tinyscheme/gen-c-string.sh \
+		test/abicheck.sh tools/geniconmap
+.endif
+
+REPLACE_PYTHON=	tools/edelib-convert-icontheme tools/edelib-mk-indextheme
+
+CHECK_PORTABILITY_SKIP=	test/run-all.sh
+
+PKGCONFIG_OVERRIDE+=	edelib-dbus.pc.in
+PKGCONFIG_OVERRIDE+=	edelib-gui.pc.in
+PKGCONFIG_OVERRIDE+=	edelib.pc.in
+
+.include "options.mk"
+
+do-build:
+	cd ${WRKSRC} && env ${MAKE_ENV} jam -q
+
+do-install:
+	cd ${WRKSRC} && env ${INSTALL_ENV} ${MAKE_ENV} jam install
+
+.include "../../lang/python/application.mk"
+.include "../../mk/fam.buildlink3.mk"
+.include "../../wip/fltk14-devel/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/edelib21/PLIST b/edelib21/PLIST
new file mode 100644
index 0000000000..4d4ca156fe
--- /dev/null
+++ b/edelib21/PLIST
@@ -0,0 +1,461 @@
+@comment $NetBSD$
+bin/edelib-catchsegv
+bin/edelib-convert-icontheme
+bin/edelib-mk-indextheme
+bin/edelib-script
+bin/edelib-update-font-cache
+include/edelib/AnimateBox.h
+include/edelib/Color.h
+include/edelib/ColorDb.h
+include/edelib/Config.h
+include/edelib/DateTime.h
+include/edelib/Debug.h
+include/edelib/DesktopFile.h
+include/edelib/DirWatch.h
+include/edelib/Directory.h
+include/edelib/Ede.h
+include/edelib/ExpandableGroup.h
+include/edelib/File.h
+include/edelib/FileTest.h
+include/edelib/FontCache.h
+include/edelib/FontChooser.h
+include/edelib/ForeignCallback.h
+include/edelib/Functional.h
+include/edelib/IconChooser.h
+include/edelib/IconLoader.h
+include/edelib/IconTheme.h
+include/edelib/List.h
+include/edelib/Listener.h
+include/edelib/MenuBar.h
+include/edelib/MenuBase.h
+include/edelib/MenuButton.h
+include/edelib/MenuItem.h
+include/edelib/MenuTooltip.h
+include/edelib/MessageBox.h
+include/edelib/MimeType.h
+include/edelib/Missing.h
+include/edelib/Namespace.h
+include/edelib/Netwm.h
+include/edelib/Nls.h
+include/edelib/Pty.h
+include/edelib/PtyProcess.h
+include/edelib/Regex.h
+include/edelib/Resource.h
+include/edelib/Run.h
+include/edelib/Scheme.h
+include/edelib/SchemeEditor.h
+include/edelib/SevenSeg.h
+include/edelib/Sipc.h
+include/edelib/StrUtil.h
+include/edelib/String.h
+include/edelib/TableBase.h
+include/edelib/TempFile.h
+include/edelib/Theme.h
+include/edelib/ThemeLoader.h
+include/edelib/TiXml.h
+include/edelib/Util.h
+include/edelib/Version.h
+include/edelib/Window.h
+include/edelib/WindowUtils.h
+include/edelib/WindowXid.h
+include/edelib/XSettingsClient.h
+include/edelib/XSettingsCommon.h
+include/edelib/XSettingsManager.h
+include/edelib/edelib-config.h
+include/edelib/edelib-global.h
+include/edelib/for-each-macro.h
+include/edelib/ts/opdefines.h
+include/edelib/ts/scheme-private.h
+include/edelib/ts/scheme.h
+lib/edelib/sslib/init-2.ss
+lib/edelib/sslib/init.ss
+lib/edelib/sslib/theme.ss
+lib/libedelib.la
+lib/libedelib_gui.la
+lib/pkgconfig/edelib-gui-no-images.pc
+lib/pkgconfig/edelib-gui.pc
+lib/pkgconfig/edelib.pc
+share/doc/${PKGNAME}.0/COPYING
+share/doc/${PKGNAME}.0/INSTALL
+share/doc/${PKGNAME}.0/README
+share/doc/${PKGNAME}.0/html/AnimateBox_8h_source.html
+share/doc/${PKGNAME}.0/html/ColorDb_8h_source.html
+share/doc/${PKGNAME}.0/html/Color_8h_source.html
+share/doc/${PKGNAME}.0/html/Config_8h_source.html
+share/doc/${PKGNAME}.0/html/DateTime_8h_source.html
+share/doc/${PKGNAME}.0/html/Debug_8h_source.html
+share/doc/${PKGNAME}.0/html/DesktopFile_8h_source.html
+share/doc/${PKGNAME}.0/html/DirWatch_8h_source.html
+share/doc/${PKGNAME}.0/html/Directory_8h_source.html
+share/doc/${PKGNAME}.0/html/EdbusConnection_8h_source.html
+share/doc/${PKGNAME}.0/html/EdbusContainer_8h_source.html
+share/doc/${PKGNAME}.0/html/EdbusData_8h_source.html
+share/doc/${PKGNAME}.0/html/EdbusDict_8h_source.html
+share/doc/${PKGNAME}.0/html/EdbusError_8h_source.html
+share/doc/${PKGNAME}.0/html/EdbusList_8h_source.html
+share/doc/${PKGNAME}.0/html/EdbusMessage_8h_source.html
+share/doc/${PKGNAME}.0/html/EdbusObjectPath_8h_source.html
+share/doc/${PKGNAME}.0/html/Ede_8h_source.html
+share/doc/${PKGNAME}.0/html/ExpandableGroup_8h_source.html
+share/doc/${PKGNAME}.0/html/FileTest_8h_source.html
+share/doc/${PKGNAME}.0/html/File_8h_source.html
+share/doc/${PKGNAME}.0/html/FontCache_8h_source.html
+share/doc/${PKGNAME}.0/html/FontChooser_8h_source.html
+share/doc/${PKGNAME}.0/html/ForeignCallback_8h_source.html
+share/doc/${PKGNAME}.0/html/Functional_8h_source.html
+share/doc/${PKGNAME}.0/html/IconChooser_8h_source.html
+share/doc/${PKGNAME}.0/html/IconLoader_8h_source.html
+share/doc/${PKGNAME}.0/html/IconTheme_8h_source.html
+share/doc/${PKGNAME}.0/html/List_8h_source.html
+share/doc/${PKGNAME}.0/html/Listener_8h_source.html
+share/doc/${PKGNAME}.0/html/MenuBar_8h_source.html
+share/doc/${PKGNAME}.0/html/MenuBase_8h_source.html
+share/doc/${PKGNAME}.0/html/MenuButton_8h_source.html
+share/doc/${PKGNAME}.0/html/MenuItem_8h_source.html
+share/doc/${PKGNAME}.0/html/MenuTooltip_8h_source.html
+share/doc/${PKGNAME}.0/html/MessageBox_8h_source.html
+share/doc/${PKGNAME}.0/html/MimeType_8h_source.html
+share/doc/${PKGNAME}.0/html/Missing_8h_source.html
+share/doc/${PKGNAME}.0/html/Namespace_8h_source.html
+share/doc/${PKGNAME}.0/html/Netwm_8h_source.html
+share/doc/${PKGNAME}.0/html/Nls_8h_source.html
+share/doc/${PKGNAME}.0/html/PtyProcess_8h_source.html
+share/doc/${PKGNAME}.0/html/Pty_8h_source.html
+share/doc/${PKGNAME}.0/html/Regex_8h_source.html
+share/doc/${PKGNAME}.0/html/Resource_8h_source.html
+share/doc/${PKGNAME}.0/html/Run_8h_source.html
+share/doc/${PKGNAME}.0/html/SchemeEditor_8h_source.html
+share/doc/${PKGNAME}.0/html/Scheme_8h_source.html
+share/doc/${PKGNAME}.0/html/SevenSeg_8h_source.html
+share/doc/${PKGNAME}.0/html/Sipc_8h_source.html
+share/doc/${PKGNAME}.0/html/StrUtil_8h_source.html
+share/doc/${PKGNAME}.0/html/String_8h_source.html
+share/doc/${PKGNAME}.0/html/TableBase_8h_source.html
+share/doc/${PKGNAME}.0/html/TempFile_8h_source.html
+share/doc/${PKGNAME}.0/html/ThemeLoader_8h_source.html
+share/doc/${PKGNAME}.0/html/Theme_8h_source.html
+share/doc/${PKGNAME}.0/html/TiXml_8h_source.html
+share/doc/${PKGNAME}.0/html/Util_8h_source.html
+share/doc/${PKGNAME}.0/html/Version_8h_source.html
+share/doc/${PKGNAME}.0/html/WindowUtils_8h_source.html
+share/doc/${PKGNAME}.0/html/WindowXid_8h_source.html
+share/doc/${PKGNAME}.0/html/Window_8h_source.html
+share/doc/${PKGNAME}.0/html/XSettingsClient_8h_source.html
+share/doc/${PKGNAME}.0/html/XSettingsCommon_8h_source.html
+share/doc/${PKGNAME}.0/html/XSettingsManager_8h_source.html
+share/doc/${PKGNAME}.0/html/annotated.html
+share/doc/${PKGNAME}.0/html/bc_s.png
+share/doc/${PKGNAME}.0/html/bc_sd.png
+share/doc/${PKGNAME}.0/html/classTiXmlAttribute-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlAttribute.html
+share/doc/${PKGNAME}.0/html/classTiXmlAttribute.png
+share/doc/${PKGNAME}.0/html/classTiXmlBase-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlBase.html
+share/doc/${PKGNAME}.0/html/classTiXmlBase.png
+share/doc/${PKGNAME}.0/html/classTiXmlComment-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlComment.html
+share/doc/${PKGNAME}.0/html/classTiXmlComment.png
+share/doc/${PKGNAME}.0/html/classTiXmlDeclaration-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlDeclaration.html
+share/doc/${PKGNAME}.0/html/classTiXmlDeclaration.png
+share/doc/${PKGNAME}.0/html/classTiXmlDocument-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlDocument.html
+share/doc/${PKGNAME}.0/html/classTiXmlDocument.png
+share/doc/${PKGNAME}.0/html/classTiXmlElement-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlElement.html
+share/doc/${PKGNAME}.0/html/classTiXmlElement.png
+share/doc/${PKGNAME}.0/html/classTiXmlHandle-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlHandle.html
+share/doc/${PKGNAME}.0/html/classTiXmlNode-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlNode.html
+share/doc/${PKGNAME}.0/html/classTiXmlNode.png
+share/doc/${PKGNAME}.0/html/classTiXmlPrinter-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlPrinter.html
+share/doc/${PKGNAME}.0/html/classTiXmlPrinter.png
+share/doc/${PKGNAME}.0/html/classTiXmlText-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlText.html
+share/doc/${PKGNAME}.0/html/classTiXmlText.png
+share/doc/${PKGNAME}.0/html/classTiXmlUnknown-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlUnknown.html
+share/doc/${PKGNAME}.0/html/classTiXmlUnknown.png
+share/doc/${PKGNAME}.0/html/classTiXmlVisitor-members.html
+share/doc/${PKGNAME}.0/html/classTiXmlVisitor.html
+share/doc/${PKGNAME}.0/html/classTiXmlVisitor.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1AnimateBox-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1AnimateBox.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1AnimateBox.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1ApplicationBootstrap-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1ApplicationBootstrap.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1ColorDb-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1ColorDb.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Config-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Config.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Config.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1Date-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Date.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1DesktopFile-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1DesktopFile.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1DesktopFile.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1DirWatch-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1DirWatch.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusConnection-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusConnection.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusContainer-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusContainer.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusData-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusData.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusError-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusError.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusList-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusList.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusList.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusMessage-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusMessage.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusObjectPath-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1EdbusObjectPath.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1ExpandableGroup-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1ExpandableGroup.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1ExpandableGroup.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1File-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1File.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1FontCache-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1FontCache.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1IconLoader-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1IconLoader.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1IconTheme-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1IconTheme.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuBar-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuBar.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuBar.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuBase-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuBase.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuBase.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuButton-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuButton.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuButton.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuTooltip-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MenuTooltip.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MessageBox-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MessageBox.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MessageBox.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1MimeType-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1MimeType.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1PTY-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1PTY.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1PtyProcess-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1PtyProcess.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Regex-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Regex.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Resource-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Resource.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1SchemeEditor-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1SchemeEditor.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1SchemeEditor.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1SevenSeg-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1SevenSeg.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1SevenSeg.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1SipcClient-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1SipcClient.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1SipcServer-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1SipcServer.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1String-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1String.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1TableBase-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1TableBase.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1TableBase.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1TempFile-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1TempFile.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Theme-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Theme.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1ThemeLoader-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1ThemeLoader.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Time-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Time.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1TimeZone-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1TimeZone.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Window-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Window.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1Window.png
+share/doc/${PKGNAME}.0/html/classedelib_1_1XSettingsClient-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1XSettingsClient.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1XSettingsManager-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1XSettingsManager.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1list-members.html
+share/doc/${PKGNAME}.0/html/classedelib_1_1list.html
+share/doc/${PKGNAME}.0/html/classes.html
+share/doc/${PKGNAME}.0/html/clipboard.js
+share/doc/${PKGNAME}.0/html/closed.png
+share/doc/${PKGNAME}.0/html/dbusdoc.html
+share/doc/${PKGNAME}.0/html/deprecated.html
+share/doc/${PKGNAME}.0/html/dir_9a09b4dfda82e3e665e31092d1c3ec8d.html
+share/doc/${PKGNAME}.0/html/dir_ea7e191d99ca4ee8a6e1a0ef21601957.html
+share/doc/${PKGNAME}.0/html/doc.svg
+share/doc/${PKGNAME}.0/html/docd.svg
+share/doc/${PKGNAME}.0/html/doxygen.css
+share/doc/${PKGNAME}.0/html/doxygen.svg
+share/doc/${PKGNAME}.0/html/doxygen_crawl.html
+share/doc/${PKGNAME}.0/html/dynsections.js
+share/doc/${PKGNAME}.0/html/edelib-config_8h_source.html
+share/doc/${PKGNAME}.0/html/edelib-global_8h_source.html
+share/doc/${PKGNAME}.0/html/files.html
+share/doc/${PKGNAME}.0/html/folderclosed.svg
+share/doc/${PKGNAME}.0/html/folderclosedd.svg
+share/doc/${PKGNAME}.0/html/folderopen.svg
+share/doc/${PKGNAME}.0/html/folderopend.svg
+share/doc/${PKGNAME}.0/html/for-each-macro_8h_source.html
+share/doc/${PKGNAME}.0/html/functions.html
+share/doc/${PKGNAME}.0/html/functions_b.html
+share/doc/${PKGNAME}.0/html/functions_c.html
+share/doc/${PKGNAME}.0/html/functions_d.html
+share/doc/${PKGNAME}.0/html/functions_e.html
+share/doc/${PKGNAME}.0/html/functions_enum.html
+share/doc/${PKGNAME}.0/html/functions_eval.html
+share/doc/${PKGNAME}.0/html/functions_f.html
+share/doc/${PKGNAME}.0/html/functions_func.html
+share/doc/${PKGNAME}.0/html/functions_func_b.html
+share/doc/${PKGNAME}.0/html/functions_func_c.html
+share/doc/${PKGNAME}.0/html/functions_func_d.html
+share/doc/${PKGNAME}.0/html/functions_func_e.html
+share/doc/${PKGNAME}.0/html/functions_func_f.html
+share/doc/${PKGNAME}.0/html/functions_func_g.html
+share/doc/${PKGNAME}.0/html/functions_func_h.html
+share/doc/${PKGNAME}.0/html/functions_func_i.html
+share/doc/${PKGNAME}.0/html/functions_func_k.html
+share/doc/${PKGNAME}.0/html/functions_func_l.html
+share/doc/${PKGNAME}.0/html/functions_func_m.html
+share/doc/${PKGNAME}.0/html/functions_func_n.html
+share/doc/${PKGNAME}.0/html/functions_func_o.html
+share/doc/${PKGNAME}.0/html/functions_func_p.html
+share/doc/${PKGNAME}.0/html/functions_func_q.html
+share/doc/${PKGNAME}.0/html/functions_func_r.html
+share/doc/${PKGNAME}.0/html/functions_func_s.html
+share/doc/${PKGNAME}.0/html/functions_func_t.html
+share/doc/${PKGNAME}.0/html/functions_func_u.html
+share/doc/${PKGNAME}.0/html/functions_func_v.html
+share/doc/${PKGNAME}.0/html/functions_func_w.html
+share/doc/${PKGNAME}.0/html/functions_func_x.html
+share/doc/${PKGNAME}.0/html/functions_func_y.html
+share/doc/${PKGNAME}.0/html/functions_func_z.html
+share/doc/${PKGNAME}.0/html/functions_func_~.html
+share/doc/${PKGNAME}.0/html/functions_g.html
+share/doc/${PKGNAME}.0/html/functions_h.html
+share/doc/${PKGNAME}.0/html/functions_i.html
+share/doc/${PKGNAME}.0/html/functions_j.html
+share/doc/${PKGNAME}.0/html/functions_k.html
+share/doc/${PKGNAME}.0/html/functions_l.html
+share/doc/${PKGNAME}.0/html/functions_m.html
+share/doc/${PKGNAME}.0/html/functions_n.html
+share/doc/${PKGNAME}.0/html/functions_o.html
+share/doc/${PKGNAME}.0/html/functions_p.html
+share/doc/${PKGNAME}.0/html/functions_q.html
+share/doc/${PKGNAME}.0/html/functions_r.html
+share/doc/${PKGNAME}.0/html/functions_s.html
+share/doc/${PKGNAME}.0/html/functions_t.html
+share/doc/${PKGNAME}.0/html/functions_type.html
+share/doc/${PKGNAME}.0/html/functions_u.html
+share/doc/${PKGNAME}.0/html/functions_v.html
+share/doc/${PKGNAME}.0/html/functions_vars.html
+share/doc/${PKGNAME}.0/html/functions_w.html
+share/doc/${PKGNAME}.0/html/functions_x.html
+share/doc/${PKGNAME}.0/html/functions_y.html
+share/doc/${PKGNAME}.0/html/functions_z.html
+share/doc/${PKGNAME}.0/html/functions_~.html
+share/doc/${PKGNAME}.0/html/group__dbus.html
+share/doc/${PKGNAME}.0/html/group__foreigncallback.html
+share/doc/${PKGNAME}.0/html/group__functional.html
+share/doc/${PKGNAME}.0/html/group__macros.html
+share/doc/${PKGNAME}.0/html/group__missing.html
+share/doc/${PKGNAME}.0/html/group__scheme.html
+share/doc/${PKGNAME}.0/html/group__widgets.html
+share/doc/${PKGNAME}.0/html/group__wm.html
+share/doc/${PKGNAME}.0/html/hierarchy.html
+share/doc/${PKGNAME}.0/html/icon_chooser.jpg
+share/doc/${PKGNAME}.0/html/index.html
+share/doc/${PKGNAME}.0/html/jquery.js
+share/doc/${PKGNAME}.0/html/menu.js
+share/doc/${PKGNAME}.0/html/menudata.js
+share/doc/${PKGNAME}.0/html/minus.svg
+share/doc/${PKGNAME}.0/html/minusd.svg
+share/doc/${PKGNAME}.0/html/namespaceedelib.html
+share/doc/${PKGNAME}.0/html/namespacemembers.html
+share/doc/${PKGNAME}.0/html/namespacemembers_c.html
+share/doc/${PKGNAME}.0/html/namespacemembers_d.html
+share/doc/${PKGNAME}.0/html/namespacemembers_e.html
+share/doc/${PKGNAME}.0/html/namespacemembers_enum.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_d.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_e.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_f.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_i.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_l.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_m.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_n.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_r.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_w.html
+share/doc/${PKGNAME}.0/html/namespacemembers_eval_x.html
+share/doc/${PKGNAME}.0/html/namespacemembers_f.html
+share/doc/${PKGNAME}.0/html/namespacemembers_func.html
+share/doc/${PKGNAME}.0/html/namespacemembers_i.html
+share/doc/${PKGNAME}.0/html/namespacemembers_l.html
+share/doc/${PKGNAME}.0/html/namespacemembers_m.html
+share/doc/${PKGNAME}.0/html/namespacemembers_n.html
+share/doc/${PKGNAME}.0/html/namespacemembers_o.html
+share/doc/${PKGNAME}.0/html/namespacemembers_r.html
+share/doc/${PKGNAME}.0/html/namespacemembers_s.html
+share/doc/${PKGNAME}.0/html/namespacemembers_type.html
+share/doc/${PKGNAME}.0/html/namespacemembers_u.html
+share/doc/${PKGNAME}.0/html/namespacemembers_w.html
+share/doc/${PKGNAME}.0/html/namespacemembers_x.html
+share/doc/${PKGNAME}.0/html/namespaces.html
+share/doc/${PKGNAME}.0/html/nav_f.png
+share/doc/${PKGNAME}.0/html/nav_fd.png
+share/doc/${PKGNAME}.0/html/nav_g.png
+share/doc/${PKGNAME}.0/html/nav_h.png
+share/doc/${PKGNAME}.0/html/nav_hd.png
+share/doc/${PKGNAME}.0/html/navtree.css
+share/doc/${PKGNAME}.0/html/open.png
+share/doc/${PKGNAME}.0/html/pages.html
+share/doc/${PKGNAME}.0/html/plus.svg
+share/doc/${PKGNAME}.0/html/plusd.svg
+share/doc/${PKGNAME}.0/html/resize.js
+share/doc/${PKGNAME}.0/html/sevenseg.jpg
+share/doc/${PKGNAME}.0/html/splitbar.png
+share/doc/${PKGNAME}.0/html/splitbard.png
+share/doc/${PKGNAME}.0/html/structedelib_1_1EdbusDict-members.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1EdbusDict.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1EdbusDict.png
+share/doc/${PKGNAME}.0/html/structedelib_1_1EdbusDictEntry-members.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1EdbusDictEntry.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1EdbusVariant-members.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1EdbusVariant.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1FontInfo-members.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1FontInfo.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1MenuItem.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1RegexMatch-members.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1RegexMatch.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1XSettingsColor-members.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1XSettingsColor.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1XSettingsData-members.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1XSettingsData.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1XSettingsList-members.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1XSettingsList.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1XSettingsSetting-members.html
+share/doc/${PKGNAME}.0/html/structedelib_1_1XSettingsSetting.html
+share/doc/${PKGNAME}.0/html/sync_off.png
+share/doc/${PKGNAME}.0/html/sync_on.png
+share/doc/${PKGNAME}.0/html/tab_a.png
+share/doc/${PKGNAME}.0/html/tab_ad.png
+share/doc/${PKGNAME}.0/html/tab_b.png
+share/doc/${PKGNAME}.0/html/tab_bd.png
+share/doc/${PKGNAME}.0/html/tab_h.png
+share/doc/${PKGNAME}.0/html/tab_hd.png
+share/doc/${PKGNAME}.0/html/tab_s.png
+share/doc/${PKGNAME}.0/html/tab_sd.png
+share/doc/${PKGNAME}.0/html/tabs.css
+share/doc/${PKGNAME}.0/html/themedoc.html
+share/doc/${PKGNAME}.0/html/themeintro.html
+share/doc/${PKGNAME}.0/html/themelanguage.html
+share/doc/${PKGNAME}.0/html/themelayout.html
+share/doc/${PKGNAME}.0/html/todo.html
+share/doc/${PKGNAME}.0/html/topics.html
+share/edelib/colors/rgb.txt
diff --git a/edelib21/buildlink3.mk b/edelib21/buildlink3.mk
new file mode 100644
index 0000000000..5f60aa994b
--- /dev/null
+++ b/edelib21/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2012/11/12 23:26:27 christtrekker Exp $
+
+BUILDLINK_TREE+=	edelib
+
+.if !defined(EDELIB_BUILDLINK3_MK)
+EDELIB_BUILDLINK3_MK:=
+
+USE_CC_FEATURES+=	c99
+USE_CXX_FEATURES+=	c++11
+
+BUILDLINK_API_DEPENDS.edelib+=	edelib>=2.0
+BUILDLINK_PKGSRCDIR.edelib?=	../../wip/edelib
+
+.endif	# EDELIB_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-edelib
diff --git a/edelib21/distinfo b/edelib21/distinfo
new file mode 100644
index 0000000000..27f9229e9a
--- /dev/null
+++ b/edelib21/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.3 2012/11/05 21:35:38 christtrekker Exp $
+
+BLAKE2s (edelib-2.1.tar.gz) = 7a4c52366b9c449e4ca4130507803b2c838d253f0d5a9cbc7ec340619505da2b
+SHA512 (edelib-2.1.tar.gz) = 9e42b0caa1ea41957e35cc48513152a5ca6d0107ba0044b1a39d3896687f3bf84158ac09c552fa3311ff79201ffe5a9917d415696ea8eb34159887a64a6cd924
+Size (edelib-2.1.tar.gz) = 1054649 bytes
+SHA1 (patch-configure) = 59421a623818638176c7db3f54f8dc22224fd1f3
+SHA1 (patch-src_IconChooser.cpp) = fc7be4087c7583f4b56566081aa3a546c6bc3f24
+SHA1 (patch-src_MenuItem.cpp) = 4e09bd56428e135c9ff2ef01e182e7a6f04c9077
+SHA1 (patch-src_WindowUtils.cpp) = fee40f37b3e20c01858ecf986123b319bf7daadd
+SHA1 (patch-src_ts_scheme.c) = b026653b5d6cf25e144fc84445ffc237e8701b46
diff --git a/edelib21/options.mk b/edelib21/options.mk
new file mode 100644
index 0000000000..95091ef405
--- /dev/null
+++ b/edelib21/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.edelib
+PKG_SUPPORTED_OPTIONS=	nls
+PKG_SUGGESTED_OPTIONS=	nls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mnls)
+CONFIGURE_ARGS+=	--enable-nls
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif
diff --git a/edelib21/patches/patch-configure b/edelib21/patches/patch-configure
new file mode 100644
index 0000000000..ef055a867b
--- /dev/null
+++ b/edelib21/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Support for FLTK 1.4.x.
+
+--- configure.orig	2025-01-20 15:38:10.504185150 +0000
++++ configure
+@@ -5764,7 +5764,7 @@ $as_echo "yes" >&6; }
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 			;;
+-						"1.3."[0123456789])
++						"1.4."[0123456789])
+ 			HAVE_FL_TREE=1
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
diff --git a/edelib21/patches/patch-src_IconChooser.cpp b/edelib21/patches/patch-src_IconChooser.cpp
new file mode 100644
index 0000000000..2ac7ff4c94
--- /dev/null
+++ b/edelib21/patches/patch-src_IconChooser.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add missing header for free().
+
+--- src/IconChooser.cpp.orig	2014-06-21 21:24:07.000000000 +0000
++++ src/IconChooser.cpp
+@@ -18,6 +18,8 @@
+  * along with this library. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <cstdlib>
++
+ #include <FL/Fl_Double_Window.H>
+ #include <FL/Fl.H>
+ #include <FL/Fl_Button.H>
diff --git a/edelib21/patches/patch-src_MenuItem.cpp b/edelib21/patches/patch-src_MenuItem.cpp
new file mode 100644
index 0000000000..d3e5e505ab
--- /dev/null
+++ b/edelib21/patches/patch-src_MenuItem.cpp
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Function clear_overlay() is no longer available since FLTK 1.3.
+
+--- src/MenuItem.cpp.orig	2014-06-21 21:24:07.000000000 +0000
++++ src/MenuItem.cpp
+@@ -305,7 +305,8 @@ menutitle::menutitle(int X, int Y, int W
+   set_modal();
+   clear_border();
+   menu = L;
+-  if (L->labelcolor_ || Fl::scheme() || L->labeltype_ > FL_NO_LABEL) clear_overlay();
++  // clear_overlay() is no longer available since FLTK 1.3
++  //if (L->labelcolor_ || Fl::scheme() || L->labeltype_ > FL_NO_LABEL) clear_overlay();
+ }
+ 
+ menuwindow::menuwindow(const MenuItem* m, int X, int Y, int Wp, int Hp,
+@@ -394,7 +395,8 @@ menuwindow::menuwindow(const MenuItem* m
+       w1 = int(fl_width(fl_shortcut_label(m->shortcut_))) + 8;
+       if (w1 > hotKeysw) hotKeysw = w1;
+     }
+-    if (m->labelcolor_ || Fl::scheme() || m->labeltype_ > FL_NO_LABEL) clear_overlay();
++    // clear_overlay() is no longer available since FLTK 1.3
++    //if (m->labelcolor_ || Fl::scheme() || m->labeltype_ > FL_NO_LABEL) clear_overlay();
+   }
+ 
+   if (selected >= 0 && !Wp) X -= W/2;
diff --git a/edelib21/patches/patch-src_WindowUtils.cpp b/edelib21/patches/patch-src_WindowUtils.cpp
new file mode 100644
index 0000000000..e7ff9d5fe7
--- /dev/null
+++ b/edelib21/patches/patch-src_WindowUtils.cpp
@@ -0,0 +1,41 @@
+$NetBSD$
+
+Function sendxjun() is no longer available since FLTK 1.3.
+
+fl_show_iconic() replaced with show_next_window_iconic() for FLTK 1.4.
+
+--- src/WindowUtils.cpp.orig	2014-06-21 21:24:07.000000000 +0000
++++ src/WindowUtils.cpp
+@@ -33,7 +33,7 @@
+  * These are defined in FLTK as hidden variables for some internal hacks, but are used here.
+  * XXX: possible changes in future FLTK versions
+  */
+-extern char fl_show_iconic;
++//extern char fl_show_iconic;
+ extern int  fl_disable_transient_for;
+ 
+ EDELIB_NS_BEGIN
+@@ -140,8 +140,8 @@ void window_xid_create(Fl_Window* win, v
+ 
+ 		XChangeProperty(fl_display, xp->xid, WM_PROTOCOLS, XA_ATOM, 32, 0, (unsigned char*)&WM_DELETE_WINDOW, 1);
+ 
+-		// send size limits and border:
+-		xp->sendxjunk();
++		// send size limits and border (no longer available since FLTK 1.3)
++		//xp->sendxjunk();
+ 
+ 		// set the class property, which controls the icon used:
+ 		if(win->xclass()) {
+@@ -194,10 +194,10 @@ void window_xid_create(Fl_Window* win, v
+ 		hints->input = True;
+ 		hints->flags = InputHint;
+ 
+-		if(fl_show_iconic) {
++		if(win->show_next_window_iconic()) {
+ 			hints->flags |= StateHint;
+ 			hints->initial_state = IconicState;
+-			fl_show_iconic = 0;
++			win->show_next_window_iconic(0);
+ 			showit = 0;
+ 		}
+ 
diff --git a/edelib21/patches/patch-src_ts_scheme.c b/edelib21/patches/patch-src_ts_scheme.c
new file mode 100644
index 0000000000..ffc305fce2
--- /dev/null
+++ b/edelib21/patches/patch-src_ts_scheme.c
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Removed INLINE to fix unresolved symbols.
+
+--- src/ts/scheme.c.orig	2014-06-21 21:24:07.000000000 +0000
++++ src/ts/scheme.c
+@@ -202,8 +202,8 @@ INTERFACE double rvalue(pointer p)    { 
+ INTERFACE  long charvalue(pointer p)  { return ivalue_unchecked(p); }
+ 
+ INTERFACE INLINE int is_port(pointer p)     { return (type(p)==T_PORT); }
+-INTERFACE INLINE int is_inport(pointer p)  { return is_port(p) && p->_object._port->kind & port_input; }
+-INTERFACE INLINE int is_outport(pointer p) { return is_port(p) && p->_object._port->kind & port_output; }
++INTERFACE int is_inport(pointer p)  { return is_port(p) && p->_object._port->kind & port_input; }
++INTERFACE int is_outport(pointer p) { return is_port(p) && p->_object._port->kind & port_output; }
+ 
+ INTERFACE INLINE int is_pair(pointer p)     { return (type(p)==T_PAIR); }
+ #define car(p)           ((p)->_object._cons._car)
+@@ -228,7 +228,7 @@ INTERFACE INLINE char *syntaxname(pointe
+ static const char *procname(pointer x);
+ 
+ INTERFACE INLINE int is_closure(pointer p)  { return (type(p)==T_CLOSURE); }
+-INTERFACE INLINE int is_macro(pointer p)    { return (type(p)==T_MACRO); }
++INTERFACE int is_macro(pointer p)    { return (type(p)==T_MACRO); }
+ INTERFACE INLINE pointer closure_code(pointer p)   { return car(p); }
+ INTERFACE INLINE pointer closure_env(pointer p)    { return cdr(p); }
+ 


Home | Main Index | Thread Index | Old Index