pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gforth-snapshot: switch to today's snapshot, as recommended by upstream
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Wed Mar 19 23:37:48 2025 +0100
Changeset: 4175d72bdf8fbb811968be1483c701499ebfac7d
Modified Files:
gforth-snapshot/Makefile
gforth-snapshot/distinfo
Added Files:
gforth-snapshot/patches/patch-prim
Log Message:
gforth-snapshot: switch to today's snapshot, as recommended by upstream
Comment out some Makefile parts for later checks if they are still needed.
Add a patch that is needed.
Doesn't build, contacted upstream.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4175d72bdf8fbb811968be1483c701499ebfac7d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gforth-snapshot/Makefile | 67 +++++++++++++++-----------------------
gforth-snapshot/distinfo | 7 ++--
gforth-snapshot/patches/patch-prim | 13 ++++++++
3 files changed, 44 insertions(+), 43 deletions(-)
diffs:
diff --git a/gforth-snapshot/Makefile b/gforth-snapshot/Makefile
index 8208161245..736f29f98c 100644
--- a/gforth-snapshot/Makefile
+++ b/gforth-snapshot/Makefile
@@ -1,10 +1,13 @@
# $NetBSD: Makefile,v 1.50 2022/06/28 11:34:11 wiz Exp $
-DISTNAME= gforth-0.7.9_20250312
-PKGNAME= ${DISTNAME:S/_/pre/}
+DISTNAME= gforth
+PKGNAME= gforth-0.7.9pre20250319
CATEGORIES= lang
#MASTER_SITES= ${MASTER_SITE_GNU:=gforth/}
-MASTER_SITES+= https://git.savannah.gnu.org/cgit/gforth.git/snapshot/
+#MASTER_SITES+= https://git.savannah.gnu.org/cgit/gforth.git/snapshot/
+MASTER_SITES+= https://www.complang.tuwien.ac.at/forth/gforth/Snapshots/current/
+DIST_SUBDIR= gforth-${PKGVERSION_NOREV}
+EXTRACT_SUFX= .tar.xz
MAINTAINER= simonb%NetBSD.org@localhost
HOMEPAGE= https://www.complang.tuwien.ac.at/forth/gforth/
@@ -18,52 +21,36 @@ LICENSE= gnu-gpl-v3
# exclude vax and allow anything else.
NOT_FOR_PLATFORM= *-*-vax
-INFO_FILES= yes
+WRKSRC= ${WRKDIR}/gforth-${PKGVERSION_NOREV:S/pre/_/}
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= autoconf automake aclocal autoreconf m4
-USE_TOOLS+= gmake makeinfo gzip
-USE_TOOLS+= perl:build
+INFO_FILES= yes
+USE_TOOLS+= gmake m4 makeinfo gzip perl:build
-MAKE_JOBS_SAFE= no # fresh Gforth is required to build doc
-BUILD_TARGET= all info # doc
+#MAKE_JOBS_SAFE= no # fresh Gforth is required to build doc
+#BUILD_TARGET= all info # doc
TEST_TARGET= check
-# Make sure elisp will be installed even if no emacs installed.
-CONFIGURE_ENV+= EMACS=${PREFIX}/bin/emacs
-CFLAGS+= -Dunix
-BUILDLINK_TRANSFORM+= rm:-m486 # let it build with contemporary GCC
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \
- infodir=${PREFIX:Q}/${PKGINFODIR:Q} \
- mandir=${PREFIX:Q}/${PKGMANDIR:Q}
+#CFLAGS+= -Dunix
+#INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \
+# infodir=${PREFIX:Q}/${PKGINFODIR:Q} \
+# mandir=${PREFIX:Q}/${PKGMANDIR:Q}
-INSTALLATION_DIRS= share/emacs/site-lisp
+#INSTALLATION_DIRS= share/emacs/site-lisp
# Kernel image filename is arch dependent
-KERNEL_FI_cmd= \
- if ${TEST} ! -f ${WRKSRC}/Makefile; then \
- ${ECHO} "__nonexistent__"; \
- exit 0; \
- fi; \
- cd ${WRKSRC} && \
- { ${ECHO} 'prkern:'; \
- ${ECHO} ' @${ECHO} $$(kernel_fi)'; \
- ${ECHO} ; \
- ${CAT} Makefile; } | ${MAKE_PROGRAM} -f - prkern
-PLIST_SUBST+= KERNEL_FI=${KERNEL_FI_cmd:sh:Q}
-
-# Owing to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=31152,
-# demand at least gcc 4.3 for arm.
-.include "../../mk/bsd.prefs.mk"
-.if ${MACHINE_ARCH:Marm*} || ${MACHINE_ARCH:Mearm*}
-. if !empty(PKGSRC_COMPILER:Mgcc)
-GCC_REQD+= 4.3
-. endif
-.endif
-
-pre-configure:
- cd ${WRKSRC} && autoreconf -fiv
+#KERNEL_FI_cmd= \
+# if ${TEST} ! -f ${WRKSRC}/Makefile; then \
+# ${ECHO} "__nonexistent__"; \
+# exit 0; \
+# fi; \
+# cd ${WRKSRC} && \
+# { ${ECHO} 'prkern:'; \
+# ${ECHO} ' @${ECHO} $$(kernel_fi)'; \
+# ${ECHO} ; \
+# ${CAT} Makefile; } | ${MAKE_PROGRAM} -f - prkern
+#PLIST_SUBST+= KERNEL_FI=${KERNEL_FI_cmd:sh:Q}
# XXX Need test.
#.include "../../mk/dlopen.buildlink3.mk"
diff --git a/gforth-snapshot/distinfo b/gforth-snapshot/distinfo
index 7b4192ddf5..3b2cbdaef0 100644
--- a/gforth-snapshot/distinfo
+++ b/gforth-snapshot/distinfo
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.14 2021/10/26 10:51:36 nia Exp $
-BLAKE2s (gforth-0.7.9_20250312.tar.gz) = 3bd1426ff0db5c66aa47ebf7e04c7b90389cca1db17a112816906d600b3ad465
-SHA512 (gforth-0.7.9_20250312.tar.gz) = d1f2fa3b1e6b332ab69d10b593569fefcc165178e9a3020efa7ff289707ce747253f17e23419231545a82e96b2dd807b32e6b17be6ff71579f046aee376692dc
-Size (gforth-0.7.9_20250312.tar.gz) = 2874363 bytes
+BLAKE2s (gforth-0.7.9pre20250319/gforth.tar.xz) = 749f6f758e0ca0242c91a0e7a45ab4b5ca11023a6c30e1e1c9b156624931d8a7
+SHA512 (gforth-0.7.9pre20250319/gforth.tar.xz) = 25c329708c25951e685e80f612d301c8d8dbcfad20898af72b605492a54c8311d55e2751f33b977dcde083334602e00a108a53f8daea38565ea86057c2c65bfd
+Size (gforth-0.7.9pre20250319/gforth.tar.xz) = 4065596 bytes
SHA1 (patch-engine_forth.h) = 1f2437e79af9d107ba17590b8055e06262f93e57
SHA1 (patch-engine_support.c) = 7c7ec206f23857705f300e24bfdfb32b8fb0f994
+SHA1 (patch-prim) = 970ce0347c325d7a6405c0af2986b44275f9f693
diff --git a/gforth-snapshot/patches/patch-prim b/gforth-snapshot/patches/patch-prim
new file mode 100644
index 0000000000..5a169207ed
--- /dev/null
+++ b/gforth-snapshot/patches/patch-prim
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- prim.orig 2025-03-19 21:53:16.497071982 +0000
++++ prim
+@@ -2563,7 +2563,7 @@ gettimeofday(&time2,NULL);
+ time1.tv_sec = time2.tv_sec;
+ time1.tv_nsec = time2.tv_usec*1000;
+ #endif
+-dtime = timespec2ns(&time1);
++dtime = gf_timespec2ns(&time1);
+
+ (ns) ( uns nsec -- wior ) gforth-internal paren_ns
+ ""Wait for usec+uns, values precomputed in Forth""
Home |
Main Index |
Thread Index |
Old Index