From 2e538528183b7a004e7adb02312d5a30c54cb708 Mon Sep 17 00:00:00 2001 From: Mid Favila Date: Tue, 11 May 2021 01:07:37 -0300 Subject: [PATCH] Reformmated most ports. --- ports/9base-mod/build | 6 +++- ports/ROX-Filer/build | 3 +- ports/axel/build | 12 ++++---- ports/check/build | 4 +-- ports/claws-mail/build | 4 +-- ports/ctwm/build | 10 +++---- ports/deadbeef/build | 4 +-- ports/dosfstools/build | 10 +++---- ports/dtach-git/build | 4 +-- ports/editres-git/build | 4 +-- ports/eiwd/build | 12 ++++---- ports/epdfview-git/build | 6 ++-- ports/epic/build | 4 +-- ports/fbv-git/build | 4 +-- ports/ffmpeg/build | 44 ++++++++++++++--------------- ports/file/build | 4 +-- ports/fvwm-patched/build | 27 +++++------------- ports/fvwm2/build | 3 +- ports/fvwm3-git/build | 15 ++++++---- ports/gavin-bc-git/build | 4 +-- ports/gccmakedep-git/build | 4 +-- ports/gdb/build | 8 +++--- ports/gdbm/build | 6 ++-- ports/geany/build | 8 +++--- ports/gpicview/build | 12 ++++---- ports/gtk+2/build | 14 ++++----- ports/gtk2-engines-clearlooks/build | 3 +- ports/gtk2-engines-murrine/build | 3 +- ports/gv/build | 6 ++-- ports/hicolor/build | 3 +- ports/hummingbird-git/build | 1 + ports/imake-git/build | 4 +-- ports/inetutils/build | 24 ++++++++-------- ports/itstool/build | 3 +- ports/jansson/build | 4 +-- ports/leafpad/build | 4 +-- ports/less/build | 4 +-- ports/libXRes/build | 4 +-- ports/libXaw/build | 4 +-- ports/libXaw3d-git/build | 8 ++---- ports/libXdmcp/build | 4 +-- ports/libXpm/build | 5 ++-- ports/libao-git/build | 4 +-- ports/libarchive/build | 14 ++++----- ports/libbson-git/build | 22 +++++++-------- ports/libetpan/build | 4 +-- ports/libmbim/build | 4 +-- ports/libotr/build | 4 +-- ports/libpcap/build | 4 +-- ports/libpipeline-git/build | 6 ++-- ports/libxslt/build | 4 +-- ports/links2/build | 6 ++-- ports/lxtask/build | 4 +-- ports/mplayer/build | 6 ++-- ports/mrsh-git/build | 4 +-- ports/net-tools/build | 2 +- ports/netsurf-gtk2/build | 16 +++++------ ports/nilfs-utils/build | 4 +-- ports/nmap/build | 6 ++-- ports/nmh/build | 2 +- ports/ntp/build | 2 +- ports/oclock/build | 2 +- ports/oksh/build | 10 +++---- ports/parcellite/build | 3 +- ports/patch/build | 4 +-- ports/pciutils/build | 32 ++++++++++++--------- ports/pidgin-otr/build | 4 +-- ports/pidgin/build | 36 +++++++++++------------ ports/poppler-glib/build | 6 ++-- ports/procps-ng/build | 14 +++++---- ports/psmisc-git/build | 2 +- ports/purple-discord-git/build | 2 +- ports/qdbm/build | 4 +-- ports/redshift/build | 4 +-- ports/rxvt-unicode/build | 41 +++++++++++++-------------- ports/scheme48/build | 4 +-- ports/scrot/build | 6 ++-- ports/scsh-git/build | 6 ++-- ports/sed/build | 4 +-- ports/shadow/build | 22 ++++++--------- ports/shared-mime-info/build | 7 +++-- ports/smack-utils/build | 4 +-- ports/ssu/build | 12 ++++---- ports/stalonetray/build | 9 +++--- ports/sysklogd-git/build | 6 ++-- ports/syslinux/build | 18 ++++++------ ports/tabbed/build | 6 ++-- ports/tcl/build | 12 ++++---- ports/tcpdump/build | 6 ++-- ports/tcptrace-git/build | 7 +++-- ports/telegram-purple/build | 4 +-- ports/tine-git/build | 1 + ports/tk/build | 19 +++++++------ ports/tt++/build | 4 +-- ports/ubase-git-mod/build | 13 +++++---- ports/usbutils/build | 4 +-- ports/util-linux/build | 25 ++++++++-------- ports/viewres-git/build | 4 +-- ports/vorbis-tools-git/build | 4 +-- ports/webbrowser/build | 25 ++++++++++++++++ ports/wireless-tools/build | 11 ++++++-- ports/xbitmaps/build | 4 +-- ports/xcalc/build | 4 +-- ports/xclipboard/build | 4 +-- ports/xclock/build | 4 +-- ports/xdm/build | 6 ++-- ports/xedit/build | 4 +-- ports/xf86-input-kbd/build | 4 +-- ports/xf86-input-wacom/build | 4 +-- ports/xfd/build | 4 +-- ports/xfontsel/build | 4 +-- ports/xfsprogs/build | 36 +++++++++++------------ ports/xman/build | 4 +-- ports/xmessage/build | 4 +-- ports/xmh/build | 4 +-- ports/xmlto/build | 3 +- ports/xmore/build | 5 ++-- ports/xorg-cf/build | 4 +-- ports/xorg-fontutil/build | 4 +-- ports/xorg-mkfontscale/build | 6 ++-- ports/xrestop/build | 4 +-- ports/xrn/build | 5 ++-- ports/xset/build | 10 +++---- ports/xsetroot/build | 8 +++--- ports/xsm/build | 6 ++-- ports/xterm/build | 29 ++++++++++--------- ports/xvkbd/build | 6 ++-- ports/yasm/build | 3 +- 128 files changed, 531 insertions(+), 497 deletions(-) diff --git a/ports/9base-mod/build b/ports/9base-mod/build index fc5b38b..71b08f6 100755 --- a/ports/9base-mod/build +++ b/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 diff --git a/ports/ROX-Filer/build b/ports/ROX-Filer/build index 324eb3f..dd7b630 100755 --- a/ports/ROX-Filer/build +++ b/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" diff --git a/ports/axel/build b/ports/axel/build index 4a53c96..afc5f0d 100755 --- a/ports/axel/build +++ b/ports/axel/build @@ -1,11 +1,11 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --disable-nls \ - --disable-dependency-tracking \ - --disable-enable-silent-rules \ - --disable-option-checking +./configure \ + --prefix=/usr \ + --disable-nls \ + --disable-dependency-tracking \ + --disable-enable-silent-rules \ + --disable-option-checking make make DESTDIR="$1" install diff --git a/ports/check/build b/ports/check/build index 6daf22f..036cfd3 100755 --- a/ports/check/build +++ b/ports/check/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/claws-mail/build b/ports/claws-mail/build index debc143..f0bf4a6 100755 --- a/ports/claws-mail/build +++ b/ports/claws-mail/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./configure \ +./configure \ --disable-perl-plugin \ - --disable-gnutls \ + --disable-gnutls \ --prefix=/usr make diff --git a/ports/ctwm/build b/ports/ctwm/build index 73ea119..d9afc45 100755 --- a/ports/ctwm/build +++ b/ports/ctwm/build @@ -3,11 +3,11 @@ export DESTDIR="$1" export CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200809L" -cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_BUILD_TYPE=Release \ - -DUSE_XPM=OFF +cmake -B build \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DUSE_XPM=OFF cmake --build build cmake --install build diff --git a/ports/deadbeef/build b/ports/deadbeef/build index 6daf22f..036cfd3 100755 --- a/ports/deadbeef/build +++ b/ports/deadbeef/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/dosfstools/build b/ports/dosfstools/build index 88d9d4c..7aaf914 100755 --- a/ports/dosfstools/build +++ b/ports/dosfstools/build @@ -1,10 +1,10 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --mandir=/usr/share/man \ - --enable-compat-symlinks +./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --mandir=/usr/share/man \ + --enable-compat-symlinks make make DESTDIR="$1" install diff --git a/ports/dtach-git/build b/ports/dtach-git/build index 7cbe913..23656c7 100755 --- a/ports/dtach-git/build +++ b/ports/dtach-git/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make install -Dm755 dtach "$1/usr/bin/dtach" diff --git a/ports/editres-git/build b/ports/editres-git/build index 7850bbe..b2f475e 100755 --- a/ports/editres-git/build +++ b/ports/editres-git/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/eiwd/build b/ports/eiwd/build index f393be0..ac75b4f 100755 --- a/ports/eiwd/build +++ b/ports/eiwd/build @@ -1,11 +1,11 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --libexecdir=/usr/bin \ - --localstatedir=/var \ - --enable-monitor \ - --disable-dbus +./configure \ + --prefix=/usr \ + --libexecdir=/usr/bin \ + --localstatedir=/var \ + --enable-monitor \ + --disable-dbus make make DESTDIR="$1" install diff --git a/ports/epdfview-git/build b/ports/epdfview-git/build index c854210..036cfd3 100755 --- a/ports/epdfview-git/build +++ b/ports/epdfview-git/build @@ -1,9 +1,7 @@ #!/bin/sh -e -#patch -Np1 -i fixes.patch - -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/epic/build b/ports/epic/build index fda01b9..7fa5349 100755 --- a/ports/epic/build +++ b/ports/epic/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make diff --git a/ports/fbv-git/build b/ports/fbv-git/build index bb35a88..4ce26c1 100755 --- a/ports/fbv-git/build +++ b/ports/fbv-git/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make diff --git a/ports/ffmpeg/build b/ports/ffmpeg/build index a20b536..8633ca5 100755 --- a/ports/ffmpeg/build +++ b/ports/ffmpeg/build @@ -1,27 +1,27 @@ #!/bin/sh -e -./configure \ - --cc="${CC:-cc}" \ - --cxx="${CXX:-c++}" \ - --prefix=/usr \ - --enable-shared \ - --enable-gpl \ - --enable-version3 \ - --enable-nonfree \ - --enable-openssl \ - --enable-libass \ - --enable-libmp3lame \ - --enable-libopus \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libx265 \ - --enable-libxvid \ - --enable-libdrm \ - --x86asmexe=nasm \ - --disable-debug \ - --enable-libtheora \ - --disable-libxml2 \ - --enable-ffplay +./configure \ + --cc="${CC:-cc}" \ + --cxx="${CXX:-c++}" \ + --prefix=/usr \ + --enable-shared \ + --enable-gpl \ + --enable-version3 \ + --enable-nonfree \ + --enable-openssl \ + --enable-libass \ + --enable-libmp3lame \ + --enable-libopus \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libx265 \ + --enable-libxvid \ + --enable-libdrm \ + --x86asmexe=nasm \ + --disable-debug \ + --enable-libtheora \ + --disable-libxml2 \ + --enable-ffplay make make DESTDIR="$1" install diff --git a/ports/file/build b/ports/file/build index 6daf22f..036cfd3 100755 --- a/ports/file/build +++ b/ports/file/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/fvwm-patched/build b/ports/fvwm-patched/build index 016c038..64d512a 100755 --- a/ports/fvwm-patched/build +++ b/ports/fvwm-patched/build @@ -1,26 +1,13 @@ #!/bin/sh -e -patch -p1 < 01-TranslucentMenus.patch -patch -p1 < 02-ColourBorders.patch -patch -p1 < 03-ResizeOutlineThin.patch -patch -p1 < 04-Conditionals.patch -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 +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 +do + patch -p1 < $patch +done -./configure \ - --prefix=/usr \ - --enable-mandoc +./configure \ + --prefix=/usr \ + --enable-mandoc make make DESTDIR="$1" install diff --git a/ports/fvwm2/build b/ports/fvwm2/build index 5895332..036cfd3 100755 --- a/ports/fvwm2/build +++ b/ports/fvwm2/build @@ -1,6 +1,7 @@ #!/bin/sh -e -./configure --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/fvwm3-git/build b/ports/fvwm3-git/build index adcd846..ccfbd42 100755 --- a/ports/fvwm3-git/build +++ b/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 -else curl --output tmp.tgz https://github.com/asciidoctor/asciidoctor/archive/refs/tags/v2.0.14.tar.gz +then + 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 +./configure \ + --prefix=/usr \ + --enable-mandoc + make make DESTDIR="$1" install diff --git a/ports/gavin-bc-git/build b/ports/gavin-bc-git/build index 6daf22f..036cfd3 100755 --- a/ports/gavin-bc-git/build +++ b/ports/gavin-bc-git/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/gccmakedep-git/build b/ports/gccmakedep-git/build index 7850bbe..b2f475e 100755 --- a/ports/gccmakedep-git/build +++ b/ports/gccmakedep-git/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/gdb/build b/ports/gdb/build index 66017cb..0289908 100755 --- a/ports/gdb/build +++ b/ports/gdb/build @@ -11,10 +11,10 @@ export PATH=$PATH:$PWD mkdir _build cd _build -../configure \ - --prefix=/usr \ - --without-installed-readline \ - --disable-nls +../configure \ + --prefix=/usr \ + --without-installed-readline \ + --disable-nls make make DESTDIR="$1" install diff --git a/ports/gdbm/build b/ports/gdbm/build index 8829139..8c293e5 100755 --- a/ports/gdbm/build +++ b/ports/gdbm/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --enable-libgdbm-compat \ +./configure \ + --prefix=/usr \ + --enable-libgdbm-compat \ make make DESTDIR="$1" install diff --git a/ports/geany/build b/ports/geany/build index f1df993..562ec8e 100755 --- a/ports/geany/build +++ b/ports/geany/build @@ -1,9 +1,9 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --enable-gtk2 \ - --disable-vte +./configure \ + --prefix=/usr \ + --enable-gtk2 \ + --disable-vte make make DESTDIR="$1" install diff --git a/ports/gpicview/build b/ports/gpicview/build index 4cdebf7..ba9048b 100755 --- a/ports/gpicview/build +++ b/ports/gpicview/build @@ -1,11 +1,11 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --disable-static \ - --enable-fast-install \ - --disable-dependency-tracking \ - --disable-nls +./configure \ + --prefix=/usr \ + --disable-static \ + --enable-fast-install \ + --disable-dependency-tracking \ + --disable-nls make make DESTDIR="$1" install diff --git a/ports/gtk+2/build b/ports/gtk+2/build index 5cb9870..d8bc769 100755 --- a/ports/gtk+2/build +++ b/ports/gtk+2/build @@ -6,13 +6,13 @@ export CFLAGS="$CFLAGS -UGDK_PIXBUF_DISABLE_DEPRECATED" sed -i 's/modules demos tests/modules/' Makefile.am Makefile.in sed -i 's/docs m4macros/m4macros/' Makefile.am Makefile.in -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-debug=no \ - --disable-gtk-doc \ - --with-xinput=yes +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-debug=no \ + --disable-gtk-doc \ + --with-xinput=yes make make DESTDIR="$1" install diff --git a/ports/gtk2-engines-clearlooks/build b/ports/gtk2-engines-clearlooks/build index 5895332..036cfd3 100755 --- a/ports/gtk2-engines-clearlooks/build +++ b/ports/gtk2-engines-clearlooks/build @@ -1,6 +1,7 @@ #!/bin/sh -e -./configure --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/gtk2-engines-murrine/build b/ports/gtk2-engines-murrine/build index 5895332..dbaf1c2 100755 --- a/ports/gtk2-engines-murrine/build +++ b/ports/gtk2-engines-murrine/build @@ -1,6 +1,7 @@ #!/bin/sh -e -./configure --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/gv/build b/ports/gv/build index f50f3a5..c3b9b8f 100755 --- a/ports/gv/build +++ b/ports/gv/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --enable-SIGCHLD-fallback +./configure \ + --prefix=/usr \ + --enable-SIGCHLD-fallback make make DESTDIR="$1" install diff --git a/ports/hicolor/build b/ports/hicolor/build index 5773498..b2f475e 100755 --- a/ports/hicolor/build +++ b/ports/hicolor/build @@ -1,6 +1,7 @@ #!/bin/sh -e -./autogen.sh --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/hummingbird-git/build b/ports/hummingbird-git/build index f06e39c..79a5a9b 100755 --- a/ports/hummingbird-git/build +++ b/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 diff --git a/ports/imake-git/build b/ports/imake-git/build index 376d8ea..b2f475e 100755 --- a/ports/imake-git/build +++ b/ports/imake-git/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/inetutils/build b/ports/inetutils/build index f974ed4..efb4ae5 100755 --- a/ports/inetutils/build +++ b/ports/inetutils/build @@ -1,18 +1,18 @@ #!/bin/sh -e ./configure \ - --prefix=/usr \ - --libexecdir=/usr/sbin \ - --localstatedir=/var \ - --disable-logger \ - --disable-rcp \ - --disable-rexec \ - --disable-rlogin \ - --disable-rsh \ - --disable-servers \ - --disable-ping6 \ - --disable-dnsdomainname \ - --disable-hostname + --prefix=/usr \ + --libexecdir=/usr/sbin \ + --localstatedir=/var \ + --disable-logger \ + --disable-rcp \ + --disable-rexec \ + --disable-rlogin \ + --disable-rsh \ + --disable-servers \ + --disable-ping6 \ + --disable-dnsdomainname \ + --disable-hostname make make DESTDIR="$1" install diff --git a/ports/itstool/build b/ports/itstool/build index 5895332..036cfd3 100755 --- a/ports/itstool/build +++ b/ports/itstool/build @@ -1,6 +1,7 @@ #!/bin/sh -e -./configure --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/jansson/build b/ports/jansson/build index 4261be4..036cfd3 100755 --- a/ports/jansson/build +++ b/ports/jansson/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/leafpad/build b/ports/leafpad/build index 4261be4..036cfd3 100755 --- a/ports/leafpad/build +++ b/ports/leafpad/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/less/build b/ports/less/build index 6daf22f..036cfd3 100755 --- a/ports/less/build +++ b/ports/less/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libXRes/build b/ports/libXRes/build index 7850bbe..b2f475e 100755 --- a/ports/libXRes/build +++ b/ports/libXRes/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libXaw/build b/ports/libXaw/build index 4261be4..036cfd3 100755 --- a/ports/libXaw/build +++ b/ports/libXaw/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libXaw3d-git/build b/ports/libXaw3d-git/build index e2bed20..b2f475e 100755 --- a/ports/libXaw3d-git/build +++ b/ports/libXaw3d-git/build @@ -1,11 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr 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 diff --git a/ports/libXdmcp/build b/ports/libXdmcp/build index 4261be4..036cfd3 100755 --- a/ports/libXdmcp/build +++ b/ports/libXdmcp/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libXpm/build b/ports/libXpm/build index 0aae5ef..036cfd3 100755 --- a/ports/libXpm/build +++ b/ports/libXpm/build @@ -1,6 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr + make make DESTDIR="$1" install diff --git a/ports/libao-git/build b/ports/libao-git/build index 6184d1d..c64ab40 100755 --- a/ports/libao-git/build +++ b/ports/libao-git/build @@ -2,8 +2,8 @@ ./autogen.sh -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libarchive/build b/ports/libarchive/build index 6e30984..8924e33 100755 --- a/ports/libarchive/build +++ b/ports/libarchive/build @@ -1,15 +1,13 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --without-nettle \ - --without-openssl \ - --without-xml2 \ - --without-expat +./configure \ + --prefix=/usr \ + --without-nettle \ + --without-openssl \ + --without-xml2 \ + --without-expat 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" diff --git a/ports/libbson-git/build b/ports/libbson-git/build index 72ba16b..b393674 100755 --- a/ports/libbson-git/build +++ b/ports/libbson-git/build @@ -1,17 +1,17 @@ #!/bin/sh -e cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_BSON=ON \ - -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF \ - -DENABLE_EXAMPLES=OFF \ - -DENABLE_ICU=OFF \ - -DENABLE_MONGOC=OFF \ - -DENABLE_MONGODB_AWS_AUTH=OFF \ - -DENABLE_SASL=OFF \ - -DENABLE_TESTS=OFF \ - -DENABLE_UNINSTALL=OFF \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_BSON=ON \ + -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF \ + -DENABLE_EXAMPLES=OFF \ + -DENABLE_ICU=OFF \ + -DENABLE_MONGOC=OFF \ + -DENABLE_MONGODB_AWS_AUTH=OFF \ + -DENABLE_SASL=OFF \ + -DENABLE_TESTS=OFF \ + -DENABLE_UNINSTALL=OFF \ + -DCMAKE_BUILD_TYPE=Release make make DESTDIR="$1" install diff --git a/ports/libetpan/build b/ports/libetpan/build index 376d8ea..b2f475e 100755 --- a/ports/libetpan/build +++ b/ports/libetpan/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libmbim/build b/ports/libmbim/build index 6daf22f..036cfd3 100755 --- a/ports/libmbim/build +++ b/ports/libmbim/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libotr/build b/ports/libotr/build index 6daf22f..036cfd3 100755 --- a/ports/libotr/build +++ b/ports/libotr/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libpcap/build b/ports/libpcap/build index 6daf22f..036cfd3 100755 --- a/ports/libpcap/build +++ b/ports/libpcap/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libpipeline-git/build b/ports/libpipeline-git/build index e249045..549053a 100755 --- a/ports/libpipeline-git/build +++ b/ports/libpipeline-git/build @@ -1,12 +1,12 @@ #!/bin/sh -e # We need to run the included script, otherwise the build -# will totally fail. +# will fail. ./release.sh -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/libxslt/build b/ports/libxslt/build index 6daf22f..dbaf1c2 100755 --- a/ports/libxslt/build +++ b/ports/libxslt/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/links2/build b/ports/links2/build index e3412bb..e4dbaa1 100755 --- a/ports/links2/build +++ b/ports/links2/build @@ -2,9 +2,9 @@ patch -p1 < 01-links-tabbed.patch -./configure \ - --prefix=/usr \ - --enable-graphics +./configure \ + --prefix=/usr \ + --enable-graphics make make DESTDIR="$1" install diff --git a/ports/lxtask/build b/ports/lxtask/build index 4261be4..036cfd3 100755 --- a/ports/lxtask/build +++ b/ports/lxtask/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/mplayer/build b/ports/mplayer/build index 675acce..c958bf7 100755 --- a/ports/mplayer/build +++ b/ports/mplayer/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --enable-gui +./configure \ + --prefix=/usr \ + --enable-gui make make DESTDIR="$1" install diff --git a/ports/mrsh-git/build b/ports/mrsh-git/build index 6daf22f..036cfd3 100755 --- a/ports/mrsh-git/build +++ b/ports/mrsh-git/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/net-tools/build b/ports/net-tools/build index 0ec0dbb..a0ae990 100755 --- a/ports/net-tools/build +++ b/ports/net-tools/build @@ -1,7 +1,7 @@ #!/bin/sh -e # Change the SBINDIR and BINDIR to /usr/bin to keep kiss happy -sed -i 's/\/bin/\/usr\/bin/' Makefile +sed -i 's/\/bin/\/usr\/bin/' Makefile sed -i 's/\/sbin/\/usr\/bin/' Makefile ssu ./configure.sh config.in diff --git a/ports/netsurf-gtk2/build b/ports/netsurf-gtk2/build index 3ad790e..fe186f6 100755 --- a/ports/netsurf-gtk2/build +++ b/ports/netsurf-gtk2/build @@ -20,16 +20,16 @@ for p in html-parser html-tagset; do ( # Build standalone xxd to remove VIM requirement cc xxd/xxd.c -o xxd/xxd -make \ - LIBDIR=lib \ +make \ + LIBDIR=lib \ INCLUDEDIR=include \ - PREFIX=/usr \ + PREFIX=/usr \ TARGET=gtk2 -make \ - LIBDIR=lib \ +make \ + LIBDIR=lib \ INCLUDEDIR=include \ - PREFIX=/usr \ - TARGET=gtk2\ - DESTDIR="$1" \ + PREFIX=/usr \ + TARGET=gtk2 \ + DESTDIR="$1" \ install diff --git a/ports/nilfs-utils/build b/ports/nilfs-utils/build index 6daf22f..036cfd3 100755 --- a/ports/nilfs-utils/build +++ b/ports/nilfs-utils/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/nmap/build b/ports/nmap/build index 148d62c..68e6ddc 100755 --- a/ports/nmap/build +++ b/ports/nmap/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --without-zenmap +./configure \ + --prefix=/usr \ + --without-zenmap make make DESTDIR="$1" install diff --git a/ports/nmh/build b/ports/nmh/build index 2c814e4..a8ab97b 100755 --- a/ports/nmh/build +++ b/ports/nmh/build @@ -4,7 +4,7 @@ autoupdate ./autogen.sh -./configure \ +./configure \ --prefix=/usr \ --enable-tls diff --git a/ports/ntp/build b/ports/ntp/build index 4261be4..5767739 100755 --- a/ports/ntp/build +++ b/ports/ntp/build @@ -1,6 +1,6 @@ #!/bin/sh -e -./configure \ +./configure \ --prefix=/usr make diff --git a/ports/oclock/build b/ports/oclock/build index 6daf22f..f3fcf2c 100755 --- a/ports/oclock/build +++ b/ports/oclock/build @@ -1,6 +1,6 @@ #!/bin/sh -e -./configure \ +./configure \ --prefix=/usr make diff --git a/ports/oksh/build b/ports/oksh/build index 9cbf8f3..cf98978 100755 --- a/ports/oksh/build +++ b/ports/oksh/build @@ -1,11 +1,11 @@ #!/bin/sh -e -# We have an alternative system, use "ksh" and "sh" as binary names. -./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ +# We have an alternative system, use "ksh" and "sh" as binary names. +./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ --mandir=/usr/share/man \ - --enable-ksh \ + --enable-ksh \ --enable-sh make diff --git a/ports/parcellite/build b/ports/parcellite/build index 5895332..036cfd3 100755 --- a/ports/parcellite/build +++ b/ports/parcellite/build @@ -1,6 +1,7 @@ #!/bin/sh -e -./configure --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/patch/build b/ports/patch/build index 206a476..62c8362 100755 --- a/ports/patch/build +++ b/ports/patch/build @@ -2,8 +2,8 @@ export CFLAGS="$CFLAGS -static" -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/pciutils/build b/ports/pciutils/build index 6bc921d..ea4f434 100755 --- a/ports/pciutils/build +++ b/ports/pciutils/build @@ -1,20 +1,24 @@ #!/bin/sh -e -mk() { - make \ - CC="${CC:-cc}" \ - OPT="$CFLAGS -fPIC" \ - ZLIB=yes \ - PREFIX=/usr \ - SBINDIR=/usr/bin \ - SHAREDIR=/usr/share/hwdata \ - "$@" +mk() +{ + make \ + CC="${CC:-cc}" \ + OPT="$CFLAGS -fPIC" \ + ZLIB=yes \ + PREFIX=/usr \ + SBINDIR=/usr/bin \ + SHAREDIR=/usr/share/hwdata \ + "$@" } -for shared in yes no; do ( - cd "$shared" +for shared in yes no +do +( + cd "$shared" - mk SHARED="$shared" - mk SHARED="$shared" DESTDIR="$1" install install-lib -) done + mk SHARED="$shared" + mk SHARED="$shared" DESTDIR="$1" install install-lib +) +done diff --git a/ports/pidgin-otr/build b/ports/pidgin-otr/build index 6daf22f..036cfd3 100755 --- a/ports/pidgin-otr/build +++ b/ports/pidgin-otr/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/pidgin/build b/ports/pidgin/build index 9ea68ae..0e4d754 100755 --- a/ports/pidgin/build +++ b/ports/pidgin/build @@ -2,24 +2,24 @@ ls -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-gstreamer \ - --disable-avahi \ - --disable-gtkspell \ - --disable-meanwhile \ - --disable-idn \ - --disable-nm \ - --disable-tcl \ - --disable-dbus \ - --disable-screensaver \ - --disable-perl \ - --disable-sm \ - --disable-vv \ - --disable-dependency-tracking \ - --disable-nls \ - --with-dynamic-prpls=irc +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-gstreamer \ + --disable-avahi \ + --disable-gtkspell \ + --disable-meanwhile \ + --disable-idn \ + --disable-nm \ + --disable-tcl \ + --disable-dbus \ + --disable-screensaver \ + --disable-perl \ + --disable-sm \ + --disable-vv \ + --disable-dependency-tracking \ + --disable-nls \ + --with-dynamic-prpls=irc make make DESTDIR="$1" install diff --git a/ports/poppler-glib/build b/ports/poppler-glib/build index ecf70d4..1d003d4 100755 --- a/ports/poppler-glib/build +++ b/ports/poppler-glib/build @@ -2,9 +2,9 @@ export DESTDIR="$1" -cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DFLAG=1 \ +cmake -B build \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DFLAG=1 \ -DENABLE_LIBOPENJPEG=unmaintained cmake --build build diff --git a/ports/procps-ng/build b/ports/procps-ng/build index f8867b7..844733f 100755 --- a/ports/procps-ng/build +++ b/ports/procps-ng/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --sbindir=/usr/bin +./configure \ + --prefix=/usr \ + --sbindir=/usr/bin # Fix includes for w.c sed -i 's|HAVE_UTMPX_H|NO|g' w.c @@ -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" -rm "$1/usr/bin/uptime" +for file in sysctl uptime bc dc +do + rm "$1/usr/bin/$file" +done + rm -rf "$1/usr/share" diff --git a/ports/psmisc-git/build b/ports/psmisc-git/build index 08732d9..c64ab40 100755 --- a/ports/psmisc-git/build +++ b/ports/psmisc-git/build @@ -2,7 +2,7 @@ ./autogen.sh -./configure \ +./configure \ --prefix=/usr make diff --git a/ports/purple-discord-git/build b/ports/purple-discord-git/build index 5178f58..9c2c076 100755 --- a/ports/purple-discord-git/build +++ b/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" diff --git a/ports/qdbm/build b/ports/qdbm/build index 6daf22f..036cfd3 100755 --- a/ports/qdbm/build +++ b/ports/qdbm/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/redshift/build b/ports/redshift/build index 6daf22f..036cfd3 100755 --- a/ports/redshift/build +++ b/ports/redshift/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/rxvt-unicode/build b/ports/rxvt-unicode/build index 9daa156..2254d4f 100755 --- a/ports/rxvt-unicode/build +++ b/ports/rxvt-unicode/build @@ -1,26 +1,25 @@ #!/bin/sh -e -patch -p1 < rxvt-unicode-kerning.patch -patch -p1 < gentables.patch +for file in rxvt-unicode-kerning.patch gentables.patch +do + patch -p1 < $file -./configure \ - --prefix=/usr \ - --with-terminfo=/usr/share/terminfo \ - --enable-256-color \ - --enable-font-styles \ - --enable-xim \ - --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 +./configure \ + --prefix=/usr \ + --with-terminfo=/usr/share/terminfo \ + --enable-256-color \ + --enable-font-styles \ + --enable-xim \ + --enable-keepscrolling \ + --enable-selectionscrolling \ + --enable-smart-resize \ + --disable-frills \ + --disable-perl \ + --enable-mousewheel \ + --enable-text-blink \ + --enable-fading \ + --disable-utmp \ + --disable-wtmp \ + --disable-lastlog make DESTDIR="$1" install diff --git a/ports/scheme48/build b/ports/scheme48/build index 6daf22f..036cfd3 100755 --- a/ports/scheme48/build +++ b/ports/scheme48/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/scrot/build b/ports/scrot/build index bd1eb69..8b14622 100755 --- a/ports/scrot/build +++ b/ports/scrot/build @@ -1,8 +1,8 @@ #!/bin/sh -e -meson build \ - -Dprefix="$1/usr" \ - -Dmandir="$1/usr/share/man/" +meson build \ + -Dprefix="$1/usr" \ + -Dmandir="$1/usr/share/man/" cd build ninja diff --git a/ports/scsh-git/build b/ports/scsh-git/build index c082cac..daeda1a 100755 --- a/ports/scsh-git/build +++ b/ports/scsh-git/build @@ -3,9 +3,9 @@ git submodule update --init autoreconf -./configure \ - --prefix=/usr \ - --libdir=/usr/lib +./configure \ + --prefix=/usr \ + --libdir=/usr/lib make make DESTDIR="$1" install diff --git a/ports/sed/build b/ports/sed/build index 206a476..62c8362 100755 --- a/ports/sed/build +++ b/ports/sed/build @@ -2,8 +2,8 @@ export CFLAGS="$CFLAGS -static" -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/shadow/build b/ports/shadow/build index 4e550f4..f22e66c 100755 --- a/ports/shadow/build +++ b/ports/shadow/build @@ -1,18 +1,14 @@ #!/bin/sh -e -./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 \ - --without-selinux \ - --without-libpam +./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --disable-account-tools-setuid \ + --with-group-name-max-length=32 \ + --without-audit \ + --without-selinux \ + --without-libpam make make DESTDIR="$1" install diff --git a/ports/shared-mime-info/build b/ports/shared-mime-info/build index e4430bc..548cc0b 100755 --- a/ports/shared-mime-info/build +++ b/ports/shared-mime-info/build @@ -6,9 +6,10 @@ # Grab the package version. read -r version _ < "${0%/*}/version" -mkdir -p "$1/usr/share/mime/packages" \ - "$1/usr/share/pkgconfig" \ - "$1/usr/bin" +mkdir -p \ + "$1/usr/share/mime/packages" \ + "$1/usr/share/pkgconfig" \ + "$1/usr/bin" # Install with only English support. sed -e 's/_comment/comment/g' freedesktop.org.xml.in \ diff --git a/ports/smack-utils/build b/ports/smack-utils/build index 6184d1d..c64ab40 100755 --- a/ports/smack-utils/build +++ b/ports/smack-utils/build @@ -2,8 +2,8 @@ ./autogen.sh -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/ssu/build b/ports/ssu/build index 080e99b..962b926 100755 --- a/ports/ssu/build +++ b/ports/ssu/build @@ -1,9 +1,9 @@ #!/bin/sh -e make -make \ - PREFIX=/usr \ - DESTDIR="$1" \ - BINOWN="$(id -u)" \ - BINGRP="$(id -g)" \ - install +make \ + PREFIX=/usr \ + DESTDIR="$1" \ + BINOWN="$(id -u)" \ + BINGRP="$(id -g)" \ + install diff --git a/ports/stalonetray/build b/ports/stalonetray/build index 61857a6..036cfd3 100755 --- a/ports/stalonetray/build +++ b/ports/stalonetray/build @@ -1,8 +1,7 @@ #!/bin/sh -e - -./configure \ - --prefix=/usr - + +./configure \ + --prefix=/usr + make make DESTDIR="$1" install - diff --git a/ports/sysklogd-git/build b/ports/sysklogd-git/build index 43f40f4..c64ab40 100755 --- a/ports/sysklogd-git/build +++ b/ports/sysklogd-git/build @@ -1,9 +1,9 @@ #!/bin/sh -e -./autogen.sh +./autogen.sh -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/syslinux/build b/ports/syslinux/build index cf330b6..84ebf25 100755 --- a/ports/syslinux/build +++ b/ports/syslinux/build @@ -1,7 +1,9 @@ #!/bin/sh -e -patch -p1 < 0018-prevent-pow-optimization.patch -patch -p1 < fcommon.patch +for file in 0018-prevent-pow-optimization.patch fcommon.patch +do + patch -p1 < $file +done # Fix missing include. sed -i 's@vfs.h>@vfs.h>\n#include @' extlinux/main.c @@ -9,13 +11,13 @@ sed -i 's@vfs.h>@vfs.h>\n#include @' extlinux/main.c # Disable debugging and development "stuff". : > mk/devel.mk -make -j1 \ - PYTHON=python \ +make -j1 \ + PYTHON=python \ bios efi64 installer -make -j1 \ - INSTALLROOT="$1" \ - MANDIR=/usr/share/man \ - SBINDIR=/usr/bin \ +make -j1 \ + INSTALLROOT="$1" \ + MANDIR=/usr/share/man \ + SBINDIR=/usr/bin \ AUXDIR=/usr/lib/syslinux \ bios efi64 install diff --git a/ports/tabbed/build b/ports/tabbed/build index b6c132d..92e4aab 100755 --- a/ports/tabbed/build +++ b/ports/tabbed/build @@ -1,9 +1,7 @@ #!/bin/sh -e -# Adding this patch forces the libXft -# dependency, but the upstream (git) already -# uses it. It is also much better than the ancient -# logical X font description. +# Adding this patch forces the libXft dependency, but the upstream (git) already +# uses it. It is also much better than the ancient# logical X font description. patch -p1 < tabbed-0.6-xft.diff make diff --git a/ports/tcl/build b/ports/tcl/build index 6fd8850..381c601 100755 --- a/ports/tcl/build +++ b/ports/tcl/build @@ -4,12 +4,12 @@ IFS=. read -r maj min _ < "${0%/*}/version" rm -rf pkgs/sqlite3* -unix/configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-threads \ - --enable-64bit \ - --with-system-sqlite +unix/configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-threads \ + --enable-64bit \ + --with-system-sqlite make make INSTALL_ROOT="$1" install install-private-headers diff --git a/ports/tcpdump/build b/ports/tcpdump/build index ae24050..503bbf2 100755 --- a/ports/tcpdump/build +++ b/ports/tcpdump/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --sbindir=/usr/bin +./configure \ + --prefix=/usr \ + --sbindir=/usr/bin make make DESTDIR="$1" install diff --git a/ports/tcptrace-git/build b/ports/tcptrace-git/build index 1fb772a..a14a81e 100755 --- a/ports/tcptrace-git/build +++ b/ports/tcptrace-git/build @@ -1,9 +1,10 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --mandir=/usr +./configure \ + --prefix=/usr \ + --mandir=/usr make + install -Dm755 tcptrace "$1/usr/bin/tcptrace" install -Dm644 tcptrace.man "$1/usr/share/man/man1/tcptrace.1" diff --git a/ports/telegram-purple/build b/ports/telegram-purple/build index dcf3dc4..0b3ea10 100755 --- a/ports/telegram-purple/build +++ b/ports/telegram-purple/build @@ -4,8 +4,8 @@ git init git submodule update --recursive ./configure --prefix=/usr \ - --disable-libwebp \ - --disable-translation + --disable-libwebp \ + --disable-translation make make DESTDIR="$1" install diff --git a/ports/tine-git/build b/ports/tine-git/build index 6dd713d..e0a491d 100755 --- a/ports/tine-git/build +++ b/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" diff --git a/ports/tk/build b/ports/tk/build index b2c01fe..c4409fd 100755 --- a/ports/tk/build +++ b/ports/tk/build @@ -2,12 +2,12 @@ IFS=. read -r maj min _ < "${0%/*}/version" -unix/configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-threads \ - --disable-rpath \ - --enable-64bit +unix/configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-threads \ + --disable-rpath \ + --enable-64bit make make INSTALL_ROOT="$1" install install-private-headers @@ -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 - install -dm755 "$1/usr/include/tk-private/$dir" - install -m644 -t "$1/usr/include/tk-private/$dir" "$dir/"*.h +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 diff --git a/ports/tt++/build b/ports/tt++/build index d8facca..2cf15c1 100755 --- a/ports/tt++/build +++ b/ports/tt++/build @@ -2,8 +2,8 @@ cd src/ -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/ubase-git-mod/build b/ports/ubase-git-mod/build index 5876597..91ccd82 100755 --- a/ports/ubase-git-mod/build +++ b/ports/ubase-git-mod/build @@ -2,20 +2,21 @@ cp makefile.mid ./Makefile -for patch in *.patch; do - patch -p1 < "$patch" +for patch in *.patch +do + patch -p1 < "$patch" done -sed -i \ - -e "/^CFLAGS/s/=/= $CFLAGS -static/" \ +sed -i \ + -e "/^CFLAGS/s/=/= $CFLAGS -static/" \ -e "/^LDFLAGS/s/=/= $LDFLAGS -static/" \ config.mk # 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 diff --git a/ports/usbutils/build b/ports/usbutils/build index 6184d1d..c64ab40 100755 --- a/ports/usbutils/build +++ b/ports/usbutils/build @@ -2,8 +2,8 @@ ./autogen.sh -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/util-linux/build b/ports/util-linux/build index 4ccdfa2..276df6f 100755 --- a/ports/util-linux/build +++ b/ports/util-linux/build @@ -1,19 +1,16 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --localstatedir=/var \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --libdir=/usr/lib \ - --enable-libuuid \ - --enable-libblkid \ - --disable-makeinstall-chown \ - --disable-rpath \ - --without-udev \ - --without-python \ - --without-systemd \ - --disable-more +./configure \ + --prefix=/usr \ + --localstatedir=/var \ + --enable-libuuid \ + --enable-libblkid \ + --disable-makeinstall-chown \ + --disable-rpath \ + --without-udev \ + --without-python \ + --without-systemd \ + --disable-more make make DESTDIR="$1" install diff --git a/ports/viewres-git/build b/ports/viewres-git/build index 3303506..4fb3d28 100755 --- a/ports/viewres-git/build +++ b/ports/viewres-git/build @@ -2,8 +2,8 @@ autoupdate -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/vorbis-tools-git/build b/ports/vorbis-tools-git/build index 6184d1d..c64ab40 100755 --- a/ports/vorbis-tools-git/build +++ b/ports/vorbis-tools-git/build @@ -2,8 +2,8 @@ ./autogen.sh -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/webbrowser/build b/ports/webbrowser/build index 468625d..46cef8a 100755 --- a/ports/webbrowser/build +++ b/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 diff --git a/ports/wireless-tools/build b/ports/wireless-tools/build index 51d928e..6ef4971 100755 --- a/ports/wireless-tools/build +++ b/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 diff --git a/ports/xbitmaps/build b/ports/xbitmaps/build index 6daf22f..036cfd3 100755 --- a/ports/xbitmaps/build +++ b/ports/xbitmaps/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xcalc/build b/ports/xcalc/build index 7850bbe..b2f475e 100755 --- a/ports/xcalc/build +++ b/ports/xcalc/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xclipboard/build b/ports/xclipboard/build index 6184d1d..c64ab40 100755 --- a/ports/xclipboard/build +++ b/ports/xclipboard/build @@ -2,8 +2,8 @@ ./autogen.sh -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xclock/build b/ports/xclock/build index 6daf22f..036cfd3 100755 --- a/ports/xclock/build +++ b/ports/xclock/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xdm/build b/ports/xdm/build index 5bb75ed..2b27659 100755 --- a/ports/xdm/build +++ b/ports/xdm/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --with-xdmconfigdir=/etc/X11/xdm +./configure \ + --prefix=/usr \ + --with-xdmconfigdir=/etc/X11/xdm make make DESTDIR="$1" install diff --git a/ports/xedit/build b/ports/xedit/build index 7850bbe..b2f475e 100755 --- a/ports/xedit/build +++ b/ports/xedit/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xf86-input-kbd/build b/ports/xf86-input-kbd/build index 6184d1d..c64ab40 100755 --- a/ports/xf86-input-kbd/build +++ b/ports/xf86-input-kbd/build @@ -2,8 +2,8 @@ ./autogen.sh -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xf86-input-wacom/build b/ports/xf86-input-wacom/build index 6184d1d..c64ab40 100755 --- a/ports/xf86-input-wacom/build +++ b/ports/xf86-input-wacom/build @@ -2,8 +2,8 @@ ./autogen.sh -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xfd/build b/ports/xfd/build index 3345062..caf9a9d 100755 --- a/ports/xfd/build +++ b/ports/xfd/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - -prefix=/usr +./autogen.sh \ + -prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xfontsel/build b/ports/xfontsel/build index 7850bbe..456ea42 100755 --- a/ports/xfontsel/build +++ b/ports/xfontsel/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xfsprogs/build b/ports/xfsprogs/build index b61b6cf..77aaa54 100755 --- a/ports/xfsprogs/build +++ b/ports/xfsprogs/build @@ -3,16 +3,16 @@ # Bundle libinih just for xfsprogs export DESTDIR="$PWD/../libinih" -meson \ - -Dprefix=/ \ - -Ddefault_library=static \ - -Ddistro_install=true \ - -Dwith_INIReader=true \ - -Dmulti-line_entries=true \ - -Dutf-8_bom=true \ - -Dinline_comments=true \ - -Duse_heap=false \ - inih inih/output +meson \ + -Dprefix=/ \ + -Ddefault_library=static \ + -Ddistro_install=true \ + -Dwith_INIReader=true \ + -Dmulti-line_entries=true \ + -Dutf-8_bom=true \ + -Dinline_comments=true \ + -Duse_heap=false \ + inih inih/output ninja -C inih/output ninja -C inih/output install @@ -26,14 +26,14 @@ sed -i 's/bash/sh/' install-sh # Explicitly include instead of implicit inclusion. sed -i '1i#include ' include/linux.h -./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --disable-gettext +./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --disable-gettext make make \ - DIST_ROOT="$1" \ - PKG_ROOT_SBIN_DIR=/usr/bin \ - PKG_ROOT_LIB_DIR=/usr/lib \ - install + DIST_ROOT="$1" \ + PKG_ROOT_SBIN_DIR=/usr/bin \ + PKG_ROOT_LIB_DIR=/usr/lib \ + install diff --git a/ports/xman/build b/ports/xman/build index 7850bbe..b2f475e 100755 --- a/ports/xman/build +++ b/ports/xman/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xmessage/build b/ports/xmessage/build index 7850bbe..b2f475e 100755 --- a/ports/xmessage/build +++ b/ports/xmessage/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xmh/build b/ports/xmh/build index 6daf22f..036cfd3 100755 --- a/ports/xmh/build +++ b/ports/xmh/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xmlto/build b/ports/xmlto/build index 5895332..036cfd3 100755 --- a/ports/xmlto/build +++ b/ports/xmlto/build @@ -1,6 +1,7 @@ #!/bin/sh -e -./configure --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xmore/build b/ports/xmore/build index 9074f50..c64ab40 100755 --- a/ports/xmore/build +++ b/ports/xmore/build @@ -1,8 +1,9 @@ #!/bin/sh -e ./autogen.sh -./configure \ - --prefix=/usr + +./configure \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xorg-cf/build b/ports/xorg-cf/build index 7850bbe..b2f475e 100755 --- a/ports/xorg-cf/build +++ b/ports/xorg-cf/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xorg-fontutil/build b/ports/xorg-fontutil/build index 7850bbe..b2f475e 100755 --- a/ports/xorg-fontutil/build +++ b/ports/xorg-fontutil/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xorg-mkfontscale/build b/ports/xorg-mkfontscale/build index ed699eb..d828d23 100755 --- a/ports/xorg-mkfontscale/build +++ b/ports/xorg-mkfontscale/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr \ - --disable-dependency-tracking +./autogen.sh \ + --prefix=/usr \ + --disable-dependency-tracking make make DESTDIR="$1" install diff --git a/ports/xrestop/build b/ports/xrestop/build index 7850bbe..b2f475e 100755 --- a/ports/xrestop/build +++ b/ports/xrestop/build @@ -1,7 +1,7 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr +./autogen.sh \ + --prefix=/usr make make DESTDIR="$1" install diff --git a/ports/xrn/build b/ports/xrn/build index 1677279..4660a21 100755 --- a/ports/xrn/build +++ b/ports/xrn/build @@ -1,10 +1,11 @@ #!/bin/sh -e for autojunk in aclocal.m4 Makefile.am Makefile.in -do touch $autojunk +do + touch $autojunk done -./configure \ +./configure \ --prefix=/usr make diff --git a/ports/xset/build b/ports/xset/build index 80ce93e..ef42399 100755 --- a/ports/xset/build +++ b/ports/xset/build @@ -1,10 +1,10 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var make make DESTDIR="$1" install diff --git a/ports/xsetroot/build b/ports/xsetroot/build index 373bcee..568b1a1 100755 --- a/ports/xsetroot/build +++ b/ports/xsetroot/build @@ -1,9 +1,9 @@ #!/bin/sh -e -./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --localstatedir=/var +./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --localstatedir=/var make make DESTDIR="$1" install diff --git a/ports/xsm/build b/ports/xsm/build index 978abf7..d828d23 100755 --- a/ports/xsm/build +++ b/ports/xsm/build @@ -1,8 +1,8 @@ #!/bin/sh -e -./autogen.sh \ - --prefix=/usr \ - --disable-dependency-tracking +./autogen.sh \ + --prefix=/usr \ + --disable-dependency-tracking make make DESTDIR="$1" install diff --git a/ports/xterm/build b/ports/xterm/build index 8fab41f..0730af8 100755 --- a/ports/xterm/build +++ b/ports/xterm/build @@ -2,19 +2,20 @@ patch -p1 < posix-ptys.patch -./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --with-x \ - --enable-doublechars \ - --enable-widechars \ - --enable-freetype \ - --enable-ansi-color \ - --enable-88-color \ - --enable-256-color \ - --enable-exec-xterm \ - --enable-sixel-graphics \ - --enable-regis-graphics \ - --enable-toolbar +./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --with-x \ + --enable-doublechars \ + --enable-widechars \ + --enable-freetype \ + --enable-ansi-color \ + --enable-88-color \ + --enable-256-color \ + --enable-exec-xterm \ + --enable-sixel-graphics \ + --enable-regis-graphics \ + --enable-toolbar + make make DESTDIR="$1" install diff --git a/ports/xvkbd/build b/ports/xvkbd/build index 20d8f0b..cae8e54 100755 --- a/ports/xvkbd/build +++ b/ports/xvkbd/build @@ -1,9 +1,11 @@ #!/bin/sh -e -./configure \ - --prefix=/usr +./configure \ + --prefix=/usr make + # Work around a bug in the generated install script + mkdir -p "$1/usr/share/X11/app-defaults" make DESTDIR="$1" install diff --git a/ports/yasm/build b/ports/yasm/build index b09f976..33adfd2 100755 --- a/ports/yasm/build +++ b/ports/yasm/build @@ -2,7 +2,8 @@ sed -i 's#) ytasm.*#)#' Makefile.in && -./configure --prefix=/usr +./configure \ + --prefix=/usr make make DESTDIR="$1" install