Package pixz. Add pixz and plzip to mbase.

ports/official/core/sbase/build

@@ -5,3 +5,16 @@ cp makefile.mid ./Makefile
 
 make LDFLAGS="$LDFLAGS -static"
 make DESTDIR="$1" PREFIX=/usr install
+
+echo '#!/bin/sh
+exec grep -E "$@"
+' >> "$1/usr/bin/egrep"
+
+echo '#!/bin/sh
+exec grep -F "$@"
+' >> "$1/usr/bin/fgrep"
+
+for i in egrep fgrep
+do
+    chmod +x "$1/usr/bin/$i"
+done

ports/official/extra/pixz/build

@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --without-manpage
+
+make
+make DESTDIR="$1" install
+
+ln -s "/usr/bin/pixz" "$1/usr/bin/xz"

ports/official/extra/pixz/checksums

@@ -0,0 +1 @@
+d1b6de1c0399e54cbd18321b8091bbffef6d209ec136d4466f398689f62c3b5f

ports/official/extra/pixz/sources

@@ -0,0 +1 @@
+https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.gz

ports/official/extra/pixz/version

@@ -0,0 +1 @@
+1.0.7 1

ports/unofficial/rolling/xcalc-git/build

@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+patch -p1 < ttf.patch
+
 ./autogen.sh     \
    --prefix=/usr
 

ports/unofficial/rolling/xcalc-git/checksums

@@ -0,0 +1 @@
+cc41f913f511e837e1a3d3033e95b6c9b49a2ae1bf8b88012ab1e2b629e38dc4

ports/unofficial/rolling/xcalc-git/files/ttf.patch

@@ -0,0 +1,31 @@
+--- xcalc/xcalc.c	2022-02-22 08:59:06.524308991 -0400
++++ xcalc-ttf.c	2022-02-22 08:57:34.750312580 -0400
+@@ -48,6 +48,7 @@
+ #include <X11/Xaw/Label.h>
+ #include <X11/Xaw/Command.h>
+ #include <X11/Xaw/Toggle.h>
++#include <X11/Xaw3dxft/Xaw3dXft.h>
+ #include <X11/cursorfont.h>
+ #include "xcalc.h"
+ 
+@@ -113,6 +114,20 @@
+ int
+ main(int argc, char **argv)
+ {
++Xaw3dXftData *xaw3dxft_data=NULL;
++Xaw3dXftProc *xaw3dxft_proc=NULL;
++GET_XAW3DXFT_DATA(xaw3dxft_data);
++if(xaw3dxft_data)
++{
++    xaw3dxft_data->border_hack=1;
++    xaw3dxft_data->text_fg_alternate_color=0;
++    xaw3dxft_data->encoding=-1;
++    xaw3dxft_data->menu_spacing=1;
++    xaw3dxft_data->string_use_pixmap=0;
++    xaw3dxft_data->button_dashed=0;
++    xaw3dxft_data->show_tips=1;
++}
++
+     Arg		args[3];
+ 
+     XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);

ports/unofficial/rolling/xcalc-git/sources

@@ -1 +1,2 @@
 git+https://gitlab.freedesktop.org/xorg/app/xcalc.git
+files/ttf.patch

ports/unofficial/rolling/xmessage-git/build

@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+patch -p1 < ttf.patch
+
 ./autogen.sh     \
    --prefix=/usr
 

ports/unofficial/rolling/xmessage-git/checksums

@@ -0,0 +1 @@
+b7e9351cbb21bddc94481e6624773b31b66062dbdc16483d07a8a1f9f103cc91

ports/unofficial/rolling/xmessage-git/files/ttf.patch

@@ -0,0 +1,31 @@
+--- xmessage/xmessage.c	2022-02-22 09:08:14.771287549 -0400
++++ xmessage-ttf.c	2022-02-22 09:07:06.450290221 -0400
+@@ -33,6 +33,7 @@
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Shell.h>
++#include <X11/Xaw3dxft/Xaw3dXft.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+@@ -298,6 +299,20 @@
+ int
+ main (int argc, char *argv[])
+ {
++Xaw3dXftData *xaw3dxft_data=NULL;
++Xaw3dXftProc *xaw3dxft_proc=NULL;
++GET_XAW3DXFT_DATA(xaw3dxft_data);
++if(xaw3dxft_data)
++{
++    xaw3dxft_data->border_hack=1;
++    xaw3dxft_data->text_fg_alternate_color=0;
++    xaw3dxft_data->encoding=-1;
++    xaw3dxft_data->menu_spacing=1;
++    xaw3dxft_data->string_use_pixmap=0;
++    xaw3dxft_data->button_dashed=0;
++    xaw3dxft_data->show_tips=1;
++}
++
+     Widget top, queryform;
+     XtAppContext app_con;
+     char *message_str;

ports/unofficial/rolling/xmessage-git/sources

@@ -1 +1,2 @@
 git+https://gitlab.freedesktop.org/xorg/app/xmessage.git
+files/ttf.patch

ports/unofficial/rolling/xrn-git/build

@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+patch -p1 < ttf.patch
+
 for autojunk in aclocal.m4 Makefile.am Makefile.in
 do
    touch $autojunk

ports/unofficial/rolling/xrn-git/checksums

@@ -0,0 +1 @@
+2b31dd829f2a77f4fd061cbffecc21e04657363b573fc8168dde6ddabd80d459

ports/unofficial/rolling/xrn-git/files/ttf.patch

@@ -0,0 +1,136 @@
+--- xrn/xrn.c	2022-02-22 08:49:49.002330796 -0400
++++ xrn-ttf/xrn.c	2022-02-22 08:49:08.976332361 -0400
+@@ -8,18 +8,18 @@
+  * that the above copyright notice appear in all copies and that both that
+  * copyright notice and this permission notice appear in supporting
+  * documentation, and that the name of the University of California not
+- * be used in advertising or publicity pertaining to distribution of 
++ * be used in advertising or publicity pertaining to distribution of
+  * the software without specific, written prior permission.  The University
+  * of California makes no representations about the suitability of this
+  * software for any purpose.  It is provided "as is" without express or
+  * implied warranty.
+  *
+- * THE UNIVERSITY OF CALIFORNIA DISCLAIMS ALL WARRANTIES WITH REGARD TO 
+- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND 
++ * THE UNIVERSITY OF CALIFORNIA DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+  * FITNESS, IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE FOR
+  * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+  * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
++ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+@@ -33,6 +33,7 @@
+ #include "utils.h"
+ #include <X11/Xos.h>
+ #include <X11/Intrinsic.h> /* so we have Widget */
++#include <X11/Xaw3dxft/Xaw3dXft.h>
+ #ifdef MOTIF
+ # include <Xm/Xm.h>
+ #endif
+@@ -74,27 +75,47 @@
+     int argc;
+     char **argv;
+ {
+-    Widget frame;
+ 
+-    int sv[2];
++Xaw3dXftData *xaw3dxft_data=NULL;
++Xaw3dXftProc *xaw3dxft_proc=NULL;
+ 
+-    pipe (sv);
+-    inchannel = sv[0];
+-    outchannel = sv[1];
++GET_XAW3DXFT_DATA(xaw3dxft_data);
+ 
+-    XRNState = 0;
++if(xaw3dxft_data)
++    {
++    xaw3dxft_data->border_hack=1;
++    xaw3dxft_data->text_fg_alternate_color=0;
++    xaw3dxft_data->encoding=-1;
++    xaw3dxft_data->menu_spacing=1;
++    xaw3dxft_data->string_use_pixmap=0;
++    xaw3dxft_data->button_dashed=0;
++    xaw3dxft_data->show_tips=1;
++    }
++else
++    return(1);
++
++
++Widget frame;
++
++int sv[2];
++
++pipe (sv);
++inchannel = sv[0];
++outchannel = sv[1];
++
++XRNState = 0;
+ 
+ #ifdef XFILESEARCHPATH
+-    AddPathToSearchPath(XFILESEARCHPATH);
++AddPathToSearchPath(XFILESEARCHPATH);
+ #endif
+-    
+-    TopLevel = Initialize(argc, argv);
+ 
+-    if (app_resources.cacheFilesMaxFiles < 10)
++TopLevel = Initialize(argc, argv);
++
++if (app_resources.cacheFilesMaxFiles < 10)
+       app_resources.cacheFilesMaxFiles = 10;
+     if (app_resources.cacheFilesMaxSize < 0)
+       app_resources.cacheFilesMaxSize = 1;
+-    
++
+     ehInstallSignalHandlers();
+     ehInstallErrorHandlers();
+ 
+@@ -105,14 +126,14 @@
+     if (app_resources.geometry != NIL(char)) {
+        GetMainFrameSize(TopLevel, (app_resources.geometry));
+     }
+-    
++
+     /* create the pane and its widgets */
+ 
+     frame = CreateMainFrame(TopLevel);
+ 
+     TopInfoLine = InfoLineCreate("info", "", frame);
+     BottomInfoLine = 0;
+-    
++
+     createButtons();
+ 
+     /* create the icon */
+@@ -124,7 +145,7 @@
+       Be sure that initializeNews() and determineMode() get called after
+       the main window is already realized.  -- jik 11/13/94
+       */
+-    
++
+     XtRealizeWidget(TopLevel);
+     XRNState |= XRN_X_UP;
+     xthWaitForMapped(TopLevel, False);
+@@ -150,7 +171,7 @@
+     }
+ 
+     XtAppAddInput(TopContext,
+-                inchannel, (XtPointer) XtInputReadMask, processMessage, (XtPointer) 0);
++		inchannel, (XtPointer) XtInputReadMask, processMessage, (XtPointer) 0);
+ 
+ #if XtSpecificationRelease < 6
+     MyMainLoop(TopContext);
+@@ -158,7 +179,7 @@
+     XtAppMainLoop(TopContext);
+ #endif
+     exit(0);
+-}       
++}
+ 
+ #ifdef XFILESEARCHPATH
+ static void AddPathToSearchPath(path)

ports/unofficial/rolling/xrn-git/sources

@@ -1 +1,2 @@
 git+https://github.com/jikamens/xrn
+files/ttf.patch

ports/unofficial/rolling/xrn-git/version

@@ -1 +1 @@
-git 1
+git 2

ports/unofficial/stable/emacs-mod/build

@@ -4,7 +4,7 @@
     --prefix=/usr \
     --with-modules \
     --with-xft \
-    --with-x-toolkit=motif \
+    --with-x-toolkit=lucid \
     --without-dbus \
     --without-gconf \
     --without-gsettings \

ports/unofficial/stable/emacs-mod/depends

@@ -1,4 +1,4 @@
-motif
+libXaw3dXft
 giflib
 gnutls
 libjpeg-turbo

ports/unofficial/stable/gnugrep/build

@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-export CFLAGS="$CFLAGS -Wno-error -static"
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
-
-install -Dm755 src/grep "$1/usr/bin/ggrep"

ports/unofficial/stable/gnugrep/checksums

@@ -1 +0,0 @@
-667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e

ports/unofficial/stable/gnugrep/sources

@@ -1 +0,0 @@
-https://ftp.gnu.org/gnu/grep/grep-3.6.tar.xz

ports/unofficial/stable/gnugrep/version

@@ -1 +0,0 @@
-3.6 1 

ports/unofficial/stable/iptables/sources

@@ -1 +1 @@
-https://www.netfilter.org/projects/iptables/files/iptables-1.8.7.tar.bz2
+https://netfilter.org/projects/iptables/files/iptables-1.8.7.tar.bz2

ports/unofficial/stable/pcc/checksums

@@ -1 +1 @@
-fc8b21fe44a4390bda74f63b0f344cc7013379b3a2aa3ff6882a70c19274a20e
+3722ec486630e7a55199d2cc9f2f010464cd165a6003eec97a317e6204d00b8f

ports/unofficial/stable/xless/checksums

@@ -1,4 +1,4 @@
 02407ddd78a09a0af9b74e87311cba8c4561ae0e8161ab99b1ad52a557d7bf19
 425aa7145416638686d9fb90a03a284416d3509472b2f976b3196a3a5ac2fd6e
-d49615fb5140dcd720654879fe0ee2e408d33e4400ab04486febeaddb02df8c6
+9c973a757023a224ec7be4860f68e85bfc80717a4c500f0ea9937757f7e86dc2
 2f734e457578a83c109384eb0c283f97f45b5bf457faaa608d96785f36e52b09

ports/unofficial/stable/xless/depends

@@ -1,4 +1,7 @@
+fontconfig
+freetype-harfbuzz
+libX11
 libXaw3dXft
-gccmakedep-git make
+libXft
-imake-git make
+libXmu
-xorg-cf-git make
+libXt

ports/unofficial/stable/xless/files/ttf.patch

@@ -19,10 +19,10 @@
 +
 +if(xaw3dxft_data)
 +{
-+xaw3dxft_data->border_hack=0;
++xaw3dxft_data->border_hack=1;
-+xaw3dxft_data->text_fg_alternate_color=1;
++xaw3dxft_data->text_fg_alternate_color=0;
 +xaw3dxft_data->encoding=-1;
-+xaw3dxft_data->menu_spacing=3;
++xaw3dxft_data->menu_spacing=1;
 +xaw3dxft_data->string_use_pixmap=0;
 +xaw3dxft_data->button_dashed=0;
 +xaw3dxft_data->show_tips=1;