Reformmated most ports.

ports/9base-mod/build

@@ -1,6 +1,9 @@
 #!/bin/sh -e
 
+# Fix a compile-time bug.
 export CFLAGS="$CFLAGS -fcommon"
+
+# Set what utils to make.
 cp makefile.mid ./Makefile
 
 make PREFIX=/usr
@@ -8,5 +11,6 @@ make PREFIX=/usr DESTDIR="$1" install
 
 # Prevent 9yacc from actually installing
 for file in /usr/bin/yacc /usr/yacc /usr/share/man/man1/yacc.1
-   do rm -rf "$1$file"
+do
+  rm -rf "$1$file"
 done

ports/ROX-Filer/build

@@ -14,7 +14,8 @@ cd ..
 install -Dm755 style.css "$1/usr/share/rox/style.css"
 
 for stuff in  Help Messages Options.xml ROX images .DirIcon
-  do mv $stuff "$1/usr/share/rox/$stuff"
+do
+  mv $stuff "$1/usr/share/rox/$stuff"
 done
 
 install -Dm755 ../rox.1 "$1/usr/share/man/man1"

ports/epdfview-git/build

@@ -1,7 +1,5 @@
 #!/bin/sh -e
 
-#patch -Np1 -i fixes.patch
-
 ./configure      \
    --prefix=/usr
 

ports/fvwm-patched/build

@@ -1,22 +1,9 @@
 #!/bin/sh -e
 
-patch -p1 < 01-TranslucentMenus.patch
+for patch in 01-TranslucentMenus.patch 02-ColourBorders.patch 03-ResizeOutlineThin.patch 04-Conditionals.patch 05-FlatSeparators.patch 06-BorderUnderTitle.patch 07-InactiveFont.patch 08-FluxRoundedCorners.patch 09-TopBorder.patch 10-ButtonWidth.patch 11-MultiBorder.patch 12-FvwmButtonsTips.patch 13-FvwmIconMan.patch 14-Hover.patch 15-FirstItemUnderPointer.patch 16-ThinGeometryProxy.patch
-patch -p1 < 02-ColourBorders.patch
+do
-patch -p1 < 03-ResizeOutlineThin.patch
+   patch -p1 < $patch
-patch -p1 < 04-Conditionals.patch
+done
-patch -p1 < 05-FlatSeparators.patch
-patch -p1 < 06-BorderUnderTitle.patch
-patch -p1 < 07-InactiveFont.patch
-patch -p1 < 08-FluxRoundedCorners.patch
-patch -p1 < 09-TopBorder.patch
-patch -p1 < 10-ButtonWidth.patch
-patch -p1 < 11-MultiBorder.patch
-patch -p1 < 12-FvwmButtonsTips.patch
-patch -p1 < 13-FvwmIconMan.patch
-patch -p1 < 14-Hover.patch
-patch -p1 < 15-FirstItemUnderPointer.patch
-patch -p1 < 16-ThinGeometryProxy.patch
-#patch -p1 < 17-MiniIconSize.patch
 
 ./configure       \
    --prefix=/usr  \

ports/fvwm2/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-./configure --prefix=/usr
+./configure      \
+   --prefix=/usr
 
 make
 make DESTDIR="$1" install

ports/fvwm3-git/build

@@ -2,18 +2,21 @@
 
 # Pull asciidoctor with the best tool available
 if [ -x /bin/axel ]
-then axel --output=tmp.tgz https://github.com/asciidoctor/asciidoctor/archive/refs/tags/v2.0.14.tar.gz
+then
-else curl --output tmp.tgz https://github.com/asciidoctor/asciidoctor/archive/refs/tags/v2.0.14.tar.gz
+   axel --output=tmp.tgz https://github.com/asciidoctor/asciidoctor/archive/refs/tags/v2.0.14.tar.gz
+else
+   curl --output tmp.tgz https://github.com/asciidoctor/asciidoctor/archive/refs/tags/v2.0.14.tar.gz
 fi
+
 # Unpack it and set its bindir into PATH for building FVWM docs
 tar xf tmp.tgz
 export PATH="$PWD/asciidoctor-2.0.14/bin/:$PATH"
 
 ./autogen.sh
+
 ./configure        \
    --prefix=/usr   \
    --enable-mandoc
 
-ls
 make
 make DESTDIR="$1" install

ports/gtk2-engines-clearlooks/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-./configure --prefix=/usr
+./configure      \
+   --prefix=/usr
 
 make
 make DESTDIR="$1" install

ports/gtk2-engines-murrine/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-./configure --prefix=/usr
+./configure     \
+   --prefix=/usr
 
 make
 make DESTDIR="$1" install

ports/hicolor/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-./autogen.sh --prefix=/usr
+./autogen.sh     \
+   --prefix=/usr
 
 make
 make DESTDIR="$1" install

ports/hummingbird-git/build

@@ -1,5 +1,6 @@
 #!/bin/sh -e
 
+# Fix an issue with reaping.
 sed -i 's/signal(SIGINT, handler);/signal(SIGINT, handler);\nsignal(SIGCHLD, handler);/' hummingbird.c
 
 make

ports/itstool/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-./configure --prefix=/usr
+./configure      \
+   --prefix=/usr
 
 make
 make DESTDIR="$1" install

ports/libXaw3d-git/build

@@ -5,7 +5,3 @@
 
 make
 make DESTDIR="$1" install
-
-#for lib in "$1/usr/lib/libXaw.7.so" "$1/usr/lib/libXaw.so" "$1/usr/lib/libXaw.so.6" "$1/usr/lib/libXaw.so.7" "$1/usr/lib/libXaw6.so" "$1/usr/lib/libXaw6.so.6" "$1/usr/lib/libXaw6.so.6.0.0" "$1/usr/lib/libXaw6.so.6.0.0.1" "$1/usr/lib/libXaw7.so "$1/usr/lib/libXaw7.so.7" "$1/usr/lib/libXaw7.so.7.0.0"
-#do ln -s "$1/usr/lib/libXaw3d.so" "$lib"
-#done

ports/libXpm/build

@@ -2,5 +2,6 @@
 
 ./configure      \
    --prefix=/usr
+
 make
 make DESTDIR="$1" install

ports/libarchive/build

@@ -10,6 +10,4 @@
 make
 make DESTDIR="$1" install
 
-ln -s bsdcat  "$1/usr/bin/cat"
-ln -s bsdcpio "$1/usr/bin/cpio"
 ln -s bsdtar  "$1/usr/bin/tar"

ports/libpipeline-git/build

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 # We need to run the included script, otherwise the build
-# will totally fail.
+# will fail.
 
 ./release.sh
 

ports/parcellite/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-./configure --prefix=/usr
+./configure      \
+   --prefix=/usr
 
 make
 make DESTDIR="$1" install

ports/pciutils/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-mk() {
+mk()
+{
   make                         \
     CC="${CC:-cc}"             \
     OPT="$CFLAGS -fPIC"        \
@@ -12,9 +13,12 @@ mk() {
 }
 
 
-for shared in yes no; do (
+for shared in yes no
+do
+(
   cd "$shared"
 
   mk SHARED="$shared"
   mk SHARED="$shared" DESTDIR="$1" install install-lib
-) done
+)
+done

ports/procps-ng/build

@@ -14,8 +14,10 @@ make CCLD="${CC:-cc} -all-static"
 make DESTDIR="$1" install
 
 # Prevent redundant junk from getting in.
-# Deal with the ugliness. It's 5AM and I want to sleep.
 
-rm "$1/usr/bin/sysctl"
+for file in sysctl uptime bc dc
-rm "$1/usr/bin/uptime"
+do
+   rm "$1/usr/bin/$file"
+done
+
 rm -rf "$1/usr/share"

ports/purple-discord-git/build

@@ -3,4 +3,4 @@
 DESTDIR="$1"
 
 make
-install -Dm 0644 libdiscord.so $DESTDIR/usr/lib/purple-2/libdiscord.so
+install -Dm 0644 libdiscord.so "$DESTDIR/usr/lib/purple-2/libdiscord.so"

ports/rxvt-unicode/build

@@ -1,7 +1,8 @@
 #!/bin/sh -e
 
-patch -p1 < rxvt-unicode-kerning.patch
+for file in rxvt-unicode-kerning.patch gentables.patch
-patch -p1 < gentables.patch
+do
+   patch -p1 < $file
 
 ./configure                            \
    --prefix=/usr                       \
@@ -12,13 +13,11 @@ patch -p1 < gentables.patch
    --enable-keepscrolling              \
    --enable-selectionscrolling         \
    --enable-smart-resize               \
-    --enable-transparency \
    --disable-frills                    \
    --disable-perl                      \
    --enable-mousewheel                 \
    --enable-text-blink                 \
    --enable-fading                     \
-    --enable-unicode3 \
    --disable-utmp                      \
    --disable-wtmp                      \
    --disable-lastlog

ports/shadow/build

@@ -2,12 +2,8 @@
 
 ./configure                        \
    --prefix=/usr                   \
-    --bindir=/usr/bin \
-    --sbindir=/usr/bin \
-    --libdir=/usr/lib \
    --mandir=/usr/share/man         \
    --sysconfdir=/etc               \
-    --disable-man \
    --disable-account-tools-setuid  \
    --with-group-name-max-length=32 \
    --without-audit                 \

ports/shared-mime-info/build

@@ -6,7 +6,8 @@
 # Grab the package version.
 read -r version _ < "${0%/*}/version"
 
-mkdir -p "$1/usr/share/mime/packages" \
+mkdir -p \
+   "$1/usr/share/mime/packages" \
    "$1/usr/share/pkgconfig"     \
    "$1/usr/bin"
 

ports/stalonetray/build

@@ -5,4 +5,3 @@
 
 make
 make DESTDIR="$1" install
-

ports/syslinux/build

@@ -1,7 +1,9 @@
 #!/bin/sh -e
 
-patch -p1 < 0018-prevent-pow-optimization.patch
+for file in 0018-prevent-pow-optimization.patch fcommon.patch
-patch -p1 < fcommon.patch
+do
+   patch -p1 < $file
+done
 
 # Fix missing <sys/sysmacros.h> include.
 sed -i 's@vfs.h>@vfs.h>\n#include <sys/sysmacros.h>@' extlinux/main.c

ports/tabbed/build

@@ -1,9 +1,7 @@
 #!/bin/sh -e
 
-# Adding this patch forces the libXft
+# Adding this patch forces the libXft dependency, but the upstream (git) already
-# dependency, but the upstream (git) already
+# uses it. It is also much better than the ancient# logical X font description.
-# uses it. It is also much better than the ancient
-# logical X font description.
 patch -p1 < tabbed-0.6-xft.diff
 
 make

ports/tcptrace-git/build

@@ -5,5 +5,6 @@
    --mandir=/usr
 
 make
+
 install -Dm755 tcptrace "$1/usr/bin/tcptrace"
 install -Dm644 tcptrace.man "$1/usr/share/man/man1/tcptrace.1"

ports/tine-git/build

@@ -4,4 +4,5 @@ sed -i s/ncursesw\\/ncurses.h/ncurses.h/ Makefile
 
 make
 make DESTDIR="$1" install all
+
 install -Dm 755 tine.1 "$1/usr/share/man/man1/tine.1"

ports/tk/build

@@ -16,7 +16,8 @@ ln -s "/usr/bin/wish${maj}.${min}" "$1/usr/bin/wish"
 ln -s "/usr/lib/libtk${maj}.${min}.so" "$1/usr/lib/libtk.so"
 
 # Finish installing private headers.
-for dir in compat generic generic/ttk unix; do
+for dir in compat generic generic/ttk unix
+do
   install -dm755 "$1/usr/include/tk-private/$dir"
   install -m644 -t "$1/usr/include/tk-private/$dir" "$dir/"*.h
 done

ports/ubase-git-mod/build

@@ -2,7 +2,8 @@
 
 cp makefile.mid ./Makefile
 
-for patch in *.patch; do
+for patch in *.patch
+do
   patch -p1 < "$patch"
 done
 
@@ -13,9 +14,9 @@ sed -i \
 
 # Prevent the following binaries from building
 for nobin in hostname
-do sed -i s/hostname// Makefile
+do
+  sed -i s/hostname// Makefile
 done
 
-
 make
 make DESTDIR="$1" PREFIX=/usr install

ports/util-linux/build

@@ -3,9 +3,6 @@
 ./configure                    \
    --prefix=/usr               \
    --localstatedir=/var        \
-    --bindir=/usr/bin \
-    --sbindir=/usr/bin \
-    --libdir=/usr/lib \
    --enable-libuuid            \
    --enable-libblkid           \
    --disable-makeinstall-chown \

ports/webbrowser/build

@@ -1,5 +1,17 @@
 #!/bin/sh -e
 
+printf "
+################################################################################
+################################################################################
+##                               Achtung!                                     ##
+##                   You should pay attention. We might need                  ##
+##                   your help with this one, bossman.                        ##
+################################################################################
+################################################################################
+"
+
+sleep 10
+
 git submodule update --init --recursive
 
 cp doc/mozconfig.example ./.mozconfig
@@ -7,6 +19,19 @@ cp doc/mozconfig.example ./.mozconfig
 sed -i 's/enable-jack/disable-jack/g' .mozconfig
 sed -i 's/$HOME/\/tmp/g' .mozconfig
 
+printf "
+################################################################################
+################################################################################
+##                               Achtung!                                     ##
+##                You can edit your browser's mozconfig now.                  ##
+##                Please take the time to look over this.                     ##
+################################################################################
+################################################################################
+"
+sleep 10
+
+${EDITOR:-vi} .mozconfig
+
 ./mach build
 ./mach package
 

ports/wireless-tools/build

@@ -3,16 +3,21 @@
 make
 
 for bin in iwconfig iwlist iwpriv iwspy iwgetid iwevent ifrename
-  do install -Dm755 $bin "$1/usr/bin/$bin"
+do
+  install -Dm755 $bin "$1/usr/bin/$bin"
 done
 
-install -Dm755 libiw.so.29    "$1/usr/lib/libiw.so.29" ; ln -s "$1/usr/lib/libiw.so.29" "$1/usr/lib/libiw.so"
+install -Dm755 libiw.so.29 "$1/usr/lib/libiw.so.29"
+ln -s "$1/usr/lib/libiw.so.29" "$1/usr/lib/libiw.so"
+
 install -Dm755 iwlib.h     "$1/usr/include/iwlib.h"
+
 install -Dm755 wireless.h  "$1/usr/include/wireless.h"
 
 install -Dm755 wireless.7  "$1/usr/share/man/man7/wireless.7"
 install -Dm755 iftab.5     "$1/usr/share/man/man5/iftab.5"
 
 for man in iwconfig.8 iwlist.8 iwpriv.8 iwspy.8 iwgetid.8 iwevent.8 ifrename.8
-  do install -Dm755 $man "$1/usr/share/man/man8/$man"
+do
+  install -Dm755 $man "$1/usr/share/man/man8/$man"
 done

ports/xmlto/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-./configure --prefix=/usr
+./configure      \
+   --prefix=/usr
 
 make
 make DESTDIR="$1" install

ports/xmore/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
 ./autogen.sh
+
 ./configure      \
    --prefix=/usr
 

ports/xrn/build

@@ -1,7 +1,8 @@
 #!/bin/sh -e
 
 for autojunk in aclocal.m4 Makefile.am Makefile.in
-do touch $autojunk
+do
+   touch $autojunk
 done
 
 ./configure       \

ports/xterm/build

@@ -16,5 +16,6 @@ patch -p1 < posix-ptys.patch
    --enable-sixel-graphics \
    --enable-regis-graphics \
    --enable-toolbar
+
 make
 make DESTDIR="$1" install

ports/xvkbd/build

@@ -4,6 +4,8 @@
    --prefix=/usr
 
 make
+
 # Work around a bug in the generated install script
+
 mkdir -p "$1/usr/share/X11/app-defaults"
 make DESTDIR="$1" install

ports/yasm/build

@@ -2,7 +2,8 @@
 
 sed -i 's#) ytasm.*#)#' Makefile.in &&
 
-./configure --prefix=/usr
+./configure      \
+   --prefix=/usr
 
 make
 make DESTDIR="$1" install