[Gsrc-commit] trunk r8737: some partial fixes

[Carl Hansen]

------------------------------------------------------------
revno: 8737
revision-id: carlhansen1234@gmail.com-20221103223123-0s3lynwfdy8ntu4x
parent: carlhansen1234@gmail.com-20221103222517-fe6errseiss259fr
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Thu 2022-11-03 15:31:23 -0700
message:
  some partial fixes
modified:
  doc/texinfo.tex                texinfo.tex-20210501180820-1twq5wdsrp9yr9h7-1
  pkg/freedesktop/systemd/Makefile makefile-20180621071243-gn4u9d58g4kz04si-3
  pkg/gnome/gtk/Makefile         makefile-20201216222440-dedqtlivmsoq83tk-3
  pkg/gnome/vte/Makefile         makefile-20160617013746-7ygosxqw3lxxvo7f-1451
  pkg/gnu/slib/Makefile          makefile-20160617014725-uokjfnggs70iry9h-1755
  pkg/gnu/slib/sha256sums        sha256sums-20160617014725-uokjfnggs70iry9h-1761
  pkg/other/fltk/config.mk       config.mk-20220403073729-vnslgfo3q1ugv9ki-2
  setup.sh.in                    setup.sh-20101106152402-ooxzqd6t2mhrnaq2-1

=== modified file 'doc/texinfo.tex'
--- a/doc/texinfo.tex   2022-09-22 00:36:22 +0000
+++ b/doc/texinfo.tex   2022-11-03 22:31:23 +0000
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2022-09-21.15}
+\def\texinfoversion{2022-08-27.12}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -241,6 +241,9 @@
 %
 \def\finalout{\overfullrule=0pt }
 
+\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
+\newdimen\topandbottommargin \topandbottommargin=.75in
+
 % Output a mark which sets \thischapter, \thissection and \thiscolor.
 % We dump everything together because we only have one kind of mark.
 % This works because we only use \botmark / \topmark, not \firstmark.
@@ -314,8 +317,16 @@
 \newbox\footlinebox
 
 % When outputting the double column layout for indices, an output routine
-% is run several times, hiding the original value of \topmark.  Hence, save
-% \topmark at the beginning.
+% is run several times, which hides the original value of \topmark.  This
+% can lead to a page heading being output and duplicating the chapter heading
+% of the index.  Hence, save the contents of \topmark at the beginning of
+% the output routine.  The saved contents are valid until we actually
+% \shipout a page.
+%
+% (We used to run a short output routine to actually set \topmark and 
+% \firstmark to the right values, but if this was called with an empty page 
+% containing whatsits for writing index entries, the whatsits would be thrown 
+% away and the index auxiliary file would remain empty.)
 %
 \newtoks\savedtopmark
 \newif\iftopmarksaved
@@ -340,9 +351,15 @@
   %
   \checkchapterpage
   %
-  % Make the heading and footing.  \makeheadline and \makefootline
-  % use the contents of \headline and \footline.
+  % Retrieve the information for the headings from the marks in the page,
+  % and call Plain TeX's \makeheadline and \makefootline, which use the
+  % values in \headline and \footline.
+  %
+  % Common context changes for both heading and footing.
+  % Do this outside of the \shipout so @code etc. will be expanded in
+  % the headline as they should be, not taken literally (outputting ''code).
   \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars}
+  %
   \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
   \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}%
   \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
@@ -600,6 +617,21 @@
 % @? is an end-of-sentence query.
 \def\?{?\spacefactor=\endofsentencespacefactor\space}
 
+% @frenchspacing on|off  says whether to put extra space after punctuation.
+%
+\def\onword{on}
+\def\offword{off}
+%
+\parseargdef\frenchspacing{%
+  \def\temp{#1}%
+  \ifx\temp\onword \plainfrenchspacing
+  \else\ifx\temp\offword \plainnonfrenchspacing
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @frenchspacing option `\temp', must be on|off}%
+  \fi\fi
+}
+
 % @w prevents a word break.  Without the \leavevmode, @w at the
 % beginning of a paragraph, when TeX is still in vertical mode, would
 % produce a whole line of output instead of starting the paragraph.
@@ -2777,11 +2809,12 @@
 \def\var#1{%
   \let\saveaftersmartic = \aftersmartic
   \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
-  %
-  \ifflagclear{txicodevaristt}%
-    {\def\varnext{{{\sl #1}}\smartitaliccorrection}}%
-    {\def\varnext{\smartslanted{#1}}}%
-  \varnext
+  \ifusingtt{%
+    \ifflagclear{txicodevaristt}%
+       {{\sl #1}}%
+       {{\ttsl #1}}%
+  }{{\sl #1}}%
+  \smartitaliccorrection
 }
 
 % To be removed after next release
@@ -2835,24 +2868,6 @@
 \catcode`@=\other
 \def\endofsentencespacefactor{3000}% default
 
-% @frenchspacing on|off  says whether to put extra space after punctuation.
-%
-\def\onword{on}
-\def\offword{off}
-%
-\let\frenchspacingsetting\plainnonfrenchspacing % used in output routine
-\parseargdef\frenchspacing{%
-  \def\temp{#1}%
-  \ifx\temp\onword \let\frenchspacingsetting\plainfrenchspacing
-  \else\ifx\temp\offword \let\frenchspacingsetting\plainnonfrenchspacing
-  \else
-    \errhelp = \EMsimple
-    \errmessage{Unknown @frenchspacing option `\temp', must be on|off}%
-  \fi\fi
-  \frenchspacingsetting
-}
-
-
 % @t, explicit typewriter.
 \def\t#1{%
   {\tt \defcharsdefault \plainfrenchspacing #1}%
@@ -3442,9 +3457,10 @@
      \ifx\textnominalsize\xwordpt
        % for 10pt running text, lllsize (8pt) is too small for the A in LaTeX.
        % Revert to plain's \scriptsize, which is 7pt.
-       \count255=\the\fam $\fam\count255 \scriptstyle A$%
+       % \count255=\the\fam $\fam\count255 \scriptstyle A$%
+         \switchtolllsize A%
      \else
-       \ifx\curfontsize\smallword
+       \iffalse % x\curfontsize\smallword
          % For footnotes and indices
          \count255=\the\fam $\fam\count255 \scriptstyle A$%
        \else
@@ -3829,16 +3845,15 @@
 \newtoks\oddfootline     % footline on odd pages
 
 % Now make \makeheadline and \makefootline in Plain TeX use those variables
-\headline={{\textfonts\rm\frenchspacingsetting
+\headline={{\textfonts\rm
             \ifchapterpage
               \ifodd\pageno\the\oddchapheadline\else\the\evenchapheadline\fi
             \else
               \ifodd\pageno\the\oddheadline\else\the\evenheadline\fi
             \fi}}
 
-\footline={{\textfonts\rm\frenchspacingsetting
-            \ifodd\pageno \the\oddfootline \else \the\evenfootline \fi}%
-           \HEADINGShook}
+\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
+                            \else \the\evenfootline \fi}\HEADINGShook}
 \let\HEADINGShook=\relax
 
 % Commands to set those variables.
@@ -3964,7 +3979,7 @@
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\folio\hfil\thistitle}}
 \global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\evenchapheadline={\line{\folio\hfil\thistitle}}
+\global\evenchapheadline={\line{\folio\hfil}}
 \global\oddchapheadline={\line{\hfil\folio}}
 \global\let\contentsalignmacro = \chapoddpage
 }
@@ -4352,7 +4367,8 @@
 % undo it ourselves.
 \def\headitemfont{\b}% for people to use in the template row; not changeable
 \def\headitem{%
-  \crcr % must appear first
+  \checkenv\multitable
+  \crcr
   \gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings
   \global\everytab={\bf}% can't use \headitemfont since the parsing differs
   \the\everytab % for the first item
@@ -6755,11 +6771,6 @@
     \ifnum\romancount=0 \global\romancount=\pagecount \fi
 }
 
-% \raggedbottom in plain.tex hardcodes \topskip so override it
-\catcode`\@=11
-\def\raggedbottom{\advance\topskip by 0pt plus60pt \r@ggedbottomtrue}
-\catcode`\@=\other
-
 % redefined for the two-volume lispref.  We always output on
 % \jobname.toc even if this is redefined.
 %
@@ -7120,7 +7131,7 @@
   % collide with the section heading.
   \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
   %
-  \setbox\groupbox=\vtop\bgroup
+  \setbox\groupbox=\vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
       \hbox\bgroup
@@ -7806,8 +7817,6 @@
 % Print arguments.  Use slanted for @def*, typewriter for @deftype*.
 \def\defunargs#1{%
   \df \ifdoingtypefn \tt \else \sl \fi
-  \ifflagclear{txicodevaristt}{}%
-    {\def\var##1{{\setregularquotes \ttsl ##1}}}%
   #1%
 }
 
@@ -9318,12 +9327,6 @@
     \imagexxx #1,,,,,\finish
   \fi
 }
-
-% Approximate height of a line in the standard text font.
-\newdimen\capheight
-\setbox0=\vbox{\tenrm H}
-\capheight=\ht0
-
 %
 % Arguments to @image:
 % #1 is (mandatory) image filename; we tack on .eps extension.
@@ -9353,7 +9356,7 @@
     %
     % Place image in a \vtop for a top page margin that is (close to) correct,
     % as \topskip glue is relative to the first baseline.
-    \vtop\bgroup \kern -\capheight \vskip-\parskip
+    \vtop\bgroup\hrule height 0pt\vskip-\parskip
   \fi
   %
   % Enter horizontal mode so that indentation from an enclosing
@@ -11230,9 +11233,13 @@
   %
   \vsize = #1\relax
   \advance\vsize by \topskip
+  \outervsize = \vsize
+  \advance\outervsize by 2\topandbottommargin
   \txipageheight = \vsize
   %
   \hsize = #2\relax
+  \outerhsize = \hsize
+  \advance\outerhsize by 0.5in
   \txipagewidth = \hsize
   %
   \normaloffset = #4\relax

=== modified file 'pkg/freedesktop/systemd/Makefile'
--- a/pkg/freedesktop/systemd/Makefile  2022-10-06 04:13:17 +0000
+++ b/pkg/freedesktop/systemd/Makefile  2022-11-03 22:31:23 +0000
@@ -22,7 +22,7 @@
 
 NAME =    systemd
 GARNAME = systemd
-GARVERSION =  251
+GARVERSION =  252
 HOME_URL = https://www.freedesktop.org/wiki/Software/systemd/
 DESCRIPTION = Init replacement, daemon manager, and more.
 define BLURB
@@ -56,10 +56,8 @@
        mkdir -p $(WORKSRC)
        $(MAKECOOKIE)
 
-post-fetch:
-       $(MAKE) fetch-git
+fetch:  fetch-git
 
-# not right
 
 build-it: fetch-git
        mkdir -p $(WORKOBJ)

=== modified file 'pkg/gnome/gtk/Makefile'
--- a/pkg/gnome/gtk/Makefile    2022-10-26 22:24:30 +0000
+++ b/pkg/gnome/gtk/Makefile    2022-11-03 22:31:23 +0000
@@ -21,7 +21,7 @@
 
 NAME =    GTK 4
 GARNAME = gtk
-GARVERSION = 4.8.2
+GARVERSION = 4.9.1
 HOME_URL = http://www.gnome.org/
 DESCRIPTION =  gtk 4 GNOME toolkit to create user interfaces
 define BLURB

=== modified file 'pkg/gnome/vte/Makefile'
--- a/pkg/gnome/vte/Makefile    2022-10-28 21:49:46 +0000
+++ b/pkg/gnome/vte/Makefile    2022-11-03 22:31:23 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2016,2017,2018,2019,2021  Carl Hansen <carlhansen@gnu.org>
+# Copyright © 2016,2017,2018,2019,2021,2022  Carl Hansen <carlhansen@gnu.org>
 #
 # This file is part of GSRC, the GNU Source Release Collection.
 # http://www.gnu.org/software/gsrc

=== modified file 'pkg/gnu/slib/Makefile'
--- a/pkg/gnu/slib/Makefile     2022-10-22 09:37:35 +0000
+++ b/pkg/gnu/slib/Makefile     2022-11-03 22:31:23 +0000
@@ -1,5 +1,5 @@
 # Copyright © 2013, 2014, 2015 Brandon Invergo <brandon@invergo.net>
-# Copyright © 2020 Carl Hansen <carlhansen@gnu.org>
+# Copyright © 2020, 2022 Carl Hansen <carlhansen@gnu.org>
 #
 # This file is part of GSRC, the GNU Source Release Collection.
 # http://www.gnu.org/software/gsrc
@@ -22,7 +22,7 @@
 
 NAME = SLIB scheme library
 GARNAME = slib
-GARVERSION = 3b6
+GARVERSION = 3b7
 HOME_URL =  http://www.gnu.org/software/slib
 DESCRIPTION = Portable library for Scheme
 define BLURB
@@ -33,67 +33,70 @@
 endef
 
 ######################################################################
-
-
-MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = $(GARNAME)/
-DISTFILES = $(DISTNAME).tar.gz
-SIGFILES = $(DISTNAME).tar.gz.sig
-
-BUILDDEPS = 
+#http://groups.csail.mit.edu/mac/ftpdir/scm/slib-3b7.zip
+
+#MASTER_SITES = $(MASTER_GNU)
+#MASTER_SUBDIR = $(GARNAME)/
+MASTER_SITES = http://groups.csail.mit.edu/
+MASTER_SUBDIR =  mac/ftpdir/scm/
+DISTFILES = $(DISTNAME).zip
+SIGFILES = 
+
+BUILDDEPS = guile 
 # guile,  scm, or other scheme; see README
 LIBDEPS  =
+WORKSRC = $(WORKDIR)/slib
+WORKOBJ = $(WORKSRC)
 
 ######################################################################
 CONFIGURE_SCRIPTS = my
 BUILD_SCRIPTS = my
 
 ## Configuration options for slib ##
+# quote from docs:
 # Choose the targets you want to install SLIB for. `system' installs SLIB to 
 # $(prefix)/lib/slib for general use with Scheme interpreters; `guile' installs
 # it to $(prefix)/share/guile/slib for use with Guile
-INSTALL_TARGETS = system guile
+INSTALL_TARGETS =  guile
+#INSTALL_TARGETS = system guile
 INSTALL_SCRIPTS = $(INSTALL_TARGETS) info
 
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
 include ../../../gar/gar.lib/info.mk
 include config.mk
 
 .PHONY:  post-extract configure-my build-my custom-pre-install install-guile
 
+
 post-extract:
-       cd $(WORKDIR) && ln -f -s $(DISTNAME) slib
-       @echo mkdir -p $(packageprefix)/share/slib
-       mkdir -p $(packageprefix)/share/slib
+       echo s
+       cd $(WORKDIR) &&  cp -a slib $(packageprefix)/share/
        $(MAKECOOKIE)
 
-#      cp -r $(WORKSRC)/* $(packageprefix)/share/slib
-#
-
 configure-my:
        cd $(WORKSRC) && ./configure --prefix=$(prefix)
        $(MAKECOOKIE)
 
 
 
-build-my: configure
+build-my: configure-my
        @echo make infoz
        $(MAKE) -C $(WORKSRC) infoz
        $(MAKECOOKIE)
 
 custom-pre-install:
        @echo installing
-       DESTDIR=$(packageprefix) &&  make -C $(WORKSRC) install
+       DESTDIR=$(packageprefix)   $(MAKE) -C $(WORKSRC) install
        $(MAKECOOKIE)
 
 install-guile:
        @echo -e "[$(OK)install$(OFF)] $(MSG)Installing SLIB for Guile$(OFF)"
-       @$(MAKE) -C $(WORKSRC) install-lib DESTDIR=$(packagedestdir) \
+       @$(MAKE) -C $(WORKSRC) install-lib DESTDIR=$(packageDESTDIR) \
                libdir=$(prefix)/share/guile/ $(OUTPUT)
        $(MAKECOOKIE)
 
-install-system: install-$(WORKSRC)/Makefile-DESTDIR
-       $(MAKECOOKIE)
+#install-system: install-$(WORKSRC)/Makefile-DESTDIR
+#      $(MAKECOOKIE)
 
 #install-info:
 #      @printf "[$(OK)install$(OFF)] $(MSG)Installing info files\n$(OFF)"
@@ -123,3 +126,5 @@
 #      ls -Ral $(prefix)/packages/$(DISTNAME)-DEST
 #      $(MAKECOOKIE)
 #
+include ../../../gar/varb.mk
+

=== modified file 'pkg/gnu/slib/sha256sums'
--- a/pkg/gnu/slib/sha256sums   2020-02-17 03:27:37 +0000
+++ b/pkg/gnu/slib/sha256sums   2022-11-03 22:31:23 +0000
@@ -1,2 +1,1 @@
-f87762730299758c3c53e0f8997565bac7b25814781ebae6e4bd4d80d110ad91  
download/slib-3b6.tar.gz
-33bc5ed6ef81e9708f59b96647b1b873e98acf9fd8c495f0b9387c7f2d24e5b2  
download/slib-3b6.tar.gz.sig
+f5d5cdad335395a5a5aa37effe28aa8078b216ea39911f651929678f1ac228b6  
download/slib-3b7.zip

=== modified file 'pkg/other/fltk/config.mk'
--- a/pkg/other/fltk/config.mk  2022-04-03 07:38:19 +0000
+++ b/pkg/other/fltk/config.mk  2022-11-03 22:31:23 +0000
@@ -2,4 +2,5 @@
 ## adjust as needed
 
 CONFIGURE_OPTS ?= 
-BUILD_OPTS ?=
+BUILD_OPTS ?= CPPFLAGS+=-fPIC
+

=== modified file 'setup.sh.in'
--- a/setup.sh.in       2021-08-26 05:37:48 +0000
+++ b/setup.sh.in       2022-11-03 22:31:23 +0000
@@ -61,4 +61,4 @@
 # this to reflect the versions of Python that you have installed on 
 # your system.
 export ORIG_PYTHONPATH=$PYTHONPATH
-export 
PYTHONPATH=$GSRC/lib/python2.7/site-packages/:$GSRC/lib/python3.9/site-packages:$GSRC/lib64/python3.9/site-packages:$PYTHONPATH}
+export 
PYTHONPATH=$GSRC/lib/python2.7/site-packages/:$GSRC/lib/python3.11/site-packages:$GSRC/lib64/python3.11/site-packages:$PYTHONPATH}