dot

packages and services management
Log | Files | Refs | README

commit ae7675f8dd9f4860abc8332143495922d7fe16c2
parent add3caa4306c37e66da8b868db2bc7147b2af59c
Author: Josuah Demangeon <mail@josuah.net>
Date:   Wed, 14 Mar 2018 11:21:15 +0100

OPT -> prefix

Diffstat:
Mbin/edit | 2+-
Mbin/pack | 7++++---
Mpack/9pfs/build | 6+++---
Mpack/b2sum/build | 2+-
Mpack/collectd/build | 4++--
Mpack/djbdns/build | 4++--
Mpack/dvtm/build | 2+-
Mpack/dwm/build | 2+-
Mpack/ed/build | 4++--
Mpack/enchive/build | 4++--
Mpack/entr/build | 2+-
Mpack/farbfeld-resize/build | 4++--
Mpack/farbfeld/build | 2+-
Mpack/git/build | 2+-
Mpack/lchat/build | 6+++---
Mpack/libav/build | 2+-
Mpack/libbearssl/build | 8++++----
Mpack/libevent/build | 2+-
Mpack/libmusl/build | 2+-
Mpack/libowfat/build | 2+-
Mpack/libtox/build | 2+-
Mpack/libvpx/build | 2+-
Mpack/man-linux/build | 2+-
Mpack/man-posix/build | 2+-
Mpack/mandoc/build | 12++++++------
Mpack/minilisp/build | 4++--
Mpack/mpop/build | 2+-
Mpack/msmtp/build | 4++--
Mpack/mujs/build | 2+-
Mpack/mupdf/build | 2+-
Mpack/ngircd/build | 4++--
Mpack/oksh/build | 6+++---
Mpack/opentracker/build | 2+-
Mpack/opus-tools/build | 2+-
Mpack/os-linux/build | 6+++---
Mpack/ratox/build | 2+-
Apack/redis/tar | 1+
Mpack/reflex/build | 4++--
Mpack/runit/build | 8++++----
Mpack/scron/build | 2+-
Mpack/sfeed/build | 4++--
Mpack/st/build | 2+-
Mpack/tinc/build | 4++--
Mpack/tinyssh/build | 4++--
Mpack/u9fs/build | 4++--
Mpack/ucspi-tcp/build | 4++--
Mpack/ucspi-unix/build | 6+++---
Mpack/yacc/build | 4++--
48 files changed, 87 insertions(+), 85 deletions(-)

diff --git a/bin/edit b/bin/edit @@ -6,4 +6,4 @@ # emacs(1)-style input key bindings for everything REPL. This also permit to # change the $EDITOR without reloading the environment variables. -exec vi "$@" +exec vim "$@" diff --git a/bin/pack b/bin/pack @@ -1,7 +1,8 @@ #!/bin/sh -e -export OPT="$PACKROOT/opt/$2" -export SRC="$PACKROOT/src/$2" +SRC="$PACKROOT/src/$2" + +export PREFIX="$PACKROOT/opt/$2" export CFLAGS="-I'$PACKROOT/include'" export LDFLAGS="-L'$PACKROOT/lib'" @@ -19,7 +20,7 @@ case "$1" in (*.txz|*.tar.xz) xz -d - ;; esac | tar -xf - -C "$SRC" || rmdir "$SRC" - find "$SRC" -mindepth 2 -maxdepth 2 -exec mv {} "$SRC" \; + find "$SRC" -mindepth 2 -maxdepth 2 -exec mv {} "$SRC" + rmdir "$SRC"/* 2>/dev/null || true ;; (git) diff --git a/pack/9pfs/build b/pack/9pfs/build @@ -2,6 +2,6 @@ make -mkdir -p "$OPT/bin" "$OPT/share/man/man1" -cp 9pfs "$OPT/bin" -cp 9pfs.1 "$OPT/share/man/man1" +mkdir -p "$PREFIX/bin" "$PREFIX/share/man/man1" +cp 9pfs "$PREFIX/bin" +cp 9pfs.1 "$PREFIX/share/man/man1" diff --git a/pack/b2sum/build b/pack/b2sum/build @@ -3,4 +3,4 @@ cd b2sum make NO_OPENMP='1' -make PREFIX="$OPT" install +make PREFIX="$PREFIX" install diff --git a/pack/collectd/build b/pack/collectd/build @@ -3,8 +3,8 @@ ! patch -Nup1 < "$PKG/OpenBSD.patch" ./configure \ - --prefix="$OPT" \ - --sbindir="$OPT/bin" \ + --prefix="$PREFIX" \ + --sbindir="$PREFIX/bin" \ --localstatedir="$HOME/var" \ --sysconfdir="$HOME/.config" \ --disable-perl \ diff --git a/pack/djbdns/build b/pack/djbdns/build @@ -2,7 +2,7 @@ echo gcc -O2 -include /usr/include/errno.h > conf-cc -mkdir -p "$OPT/bin" +mkdir -p "$PREFIX/bin" make @@ -12,4 +12,4 @@ cp \ tinydns-data tinydns-get tinydns-edit axfr-get axfrdns-conf axfrdns \ dnsip dnsipq dnsname dnstxt dnsmx dnsfilter random-ip dnsqr dnsq \ dnstrace dnstracesort cachetest utime rts \ - "$OPT/bin" + "$PREFIX/bin" diff --git a/pack/dvtm/build b/pack/dvtm/build @@ -3,7 +3,7 @@ cp -f "$PACK/dvtm/config.mk" config.mk cp -f "$PACK/dvtm/config.h" config.h -make PREFIX="$OPT" install +make PREFIX="$PREFIX" install mkdir -p "$HOME/.terminfo/d" cp -f dvtm.info.cdb "$HOME/.terminfo/d/dvtm-256color" diff --git a/pack/dwm/build b/pack/dwm/build @@ -3,4 +3,4 @@ cp -f "$PACK/dwm"/*.h . cp -f "$PACK/dwm/config.mk" config.mk -make PREFIX="$OPT" install +make PREFIX="$PREFIX" install diff --git a/pack/ed/build b/pack/ed/build @@ -1,5 +1,5 @@ #!/bin/sh -ex -mkdir -p "$OPT/bin" +mkdir -p "$PREFIX/bin" -cc -o "$OPT/bin/ed" ed.c +cc -o "$PREFIX/bin/ed" ed.c diff --git a/pack/enchive/build b/pack/enchive/build @@ -2,5 +2,5 @@ make -mkdir -p "$OPT/bin" -cp enchive "${OPT}/bin" +mkdir -p "$PREFIX/bin" +cp enchive "${PREFIX}/bin" diff --git a/pack/entr/build b/pack/entr/build @@ -2,4 +2,4 @@ ./configure -make PREFIX="$OPT" install +make PREFIX="$PREFIX" install diff --git a/pack/farbfeld-resize/build b/pack/farbfeld-resize/build @@ -2,5 +2,5 @@ make -mkdir -p "$OPT/bin" -cp resize "$OPT/bin/resize" +mkdir -p "$PREFIX/bin" +cp resize "$PREFIX/bin/resize" diff --git a/pack/farbfeld/build b/pack/farbfeld/build @@ -10,4 +10,4 @@ case "$(uname)" in esac $make -$make MANPREFIX="$OPT/share/man" PREFIX="$OPT" install +$make MANPREFIX="$PREFIX/share/man" PREFIX="$PREFIX" install diff --git a/pack/git/build b/pack/git/build @@ -1,7 +1,7 @@ #!/bin/sh -ex ./configure \ - --prefix="$OPT" \ + --prefix="$PREFIX" \ --without-tcltk exec "$PACK/build/make" diff --git a/pack/lchat/build b/pack/lchat/build @@ -2,10 +2,10 @@ tee config.mk << EOF LIBS = -lutf -BINDIR = $OPT/bin -MAN1DIR = $OPT/share/man/man1 +BINDIR = $PREFIX/bin +MAN1DIR = $PREFIX/share/man/man1 EOF -mkdir -p "$OPT/share/man/man1" "$OPT/bin" +mkdir -p "$PREFIX/share/man/man1" "$PREFIX/bin" make install diff --git a/pack/libav/build b/pack/libav/build @@ -1,5 +1,5 @@ #!/bin/sh -ex -./configure --prefix="$OPT" --enable-avplay +./configure --prefix="$PREFIX" --enable-avplay make install diff --git a/pack/libbearssl/build b/pack/libbearssl/build @@ -11,8 +11,8 @@ esac $make -mkdir -p "$OPT/bin" "$OPT/lib" "$OPT/include" +mkdir -p "$PREFIX/bin" "$PREFIX/lib" "$PREFIX/include" -cp build/brssl build/test* "$OPT/bin" -cp build/libbearssl.* "$OPT/lib" -cp inc/* "$OPT/include" +cp build/brssl build/test* "$PREFIX/bin" +cp build/libbearssl.* "$PREFIX/lib" +cp inc/* "$PREFIX/include" diff --git a/pack/libevent/build b/pack/libevent/build @@ -2,7 +2,7 @@ pattern='OPENSSL_VERSION_NUMBER .*L$' -./configure --prefix="$OPT" --without-openssl +./configure --prefix="$PREFIX" --without-openssl grep -rl "$pattern" | while IFS='' read -r file do diff --git a/pack/libmusl/build b/pack/libmusl/build @@ -1,6 +1,6 @@ #!/bin/sh -ex -export LDFLAGS="$LDFLAGS -Wl,-rpath-link=$PACKROOT$OPT/lib" +export LDFLAGS="$LDFLAGS -Wl,-rpath-link=$PACKROOT$PREFIX/lib" export CC="$CC -L$PACKROOT/lib -isystem $PACKROOT/include" [ -n "$CROSS_COMPILE" ] && CONFFLAGS="$CONFFLAGS --host=$CROSS_COMPILE" diff --git a/pack/libowfat/build b/pack/libowfat/build @@ -9,4 +9,4 @@ case "$(uname)" in ;; esac -make prefix="$OPT" install +make prefix="$PREFIX" install diff --git a/pack/libtox/build b/pack/libtox/build @@ -7,7 +7,7 @@ export VPX_LIBS="-L$PACKROOT/lib" export CFLAGS="-I$PACKROOT/include/opus" ./configure \ - --prefix="$OPT" \ + --prefix="$PREFIX" \ --with-dependency-search="$PACKROOT" make install diff --git a/pack/libvpx/build b/pack/libvpx/build @@ -1,7 +1,7 @@ #!/bin/sh -x ./configure \ - --prefix="$OPT" \ + --prefix="$PREFIX" \ --enable-pic \ --disable-libyuv \ --disable-unit-tests \ diff --git a/pack/man-linux/build b/pack/man-linux/build @@ -1,3 +1,3 @@ #!/bin/sh -e -make prefix="$OPT" install +make prefix="$PREFIX" install diff --git a/pack/man-posix/build b/pack/man-posix/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -make prefix="$OPT" install +make prefix="$PREFIX" install diff --git a/pack/mandoc/build b/pack/mandoc/build @@ -1,12 +1,12 @@ #!/bin/sh -ex tee configure.local << EOF -PREFIX="$OPT" -BINDIR="$OPT/bin" -SBINDIR="$OPT/bin" -INCLUDEDIR="$OPT/include/mandoc" -LIBDIR="$OPT/lib/mandoc" -MANDIR="$OPT/share/man" +PREFIX="$PREFIX" +BINDIR="$PREFIX/bin" +SBINDIR="$PREFIX/bin" +INCLUDEDIR="$PREFIX/include/mandoc" +LIBDIR="$PREFIX/lib/mandoc" +MANDIR="$PREFIX/share/man" BUILD_DB=1 EOF diff --git a/pack/minilisp/build b/pack/minilisp/build @@ -2,6 +2,6 @@ make -mkdir -p "$OPT/bin" +mkdir -p "$PREFIX/bin" -cp minilisp "$OPT/bin" +cp minilisp "$PREFIX/bin" diff --git a/pack/mpop/build b/pack/mpop/build @@ -4,7 +4,7 @@ export libssl_CFLAGS="-I$PACKROOT/include" export libssl_LIBS="-L$PACKROOT/lib -lssl -lcrypto" ./configure \ - --prefix="$OPT" \ + --prefix="$PREFIX" \ --with-tls='openssl' make diff --git a/pack/msmtp/build b/pack/msmtp/build @@ -5,9 +5,9 @@ export libssl_LIBS="-L$PACKROOT/lib -lssl -lcrypto" ./configure \ - --prefix="$OPT" \ + --prefix="$PREFIX" \ --with-tls=openssl make -ln -s "$OPT/bin/msmtp" "$OPT/bin/sendmail" +ln -s "$PREFIX/bin/msmtp" "$PREFIX/bin/sendmail" diff --git a/pack/mujs/build b/pack/mujs/build @@ -9,4 +9,4 @@ case "$(uname)" in ;; esac -$make prefix="$OPT" install +$make prefix="$PREFIX" install diff --git a/pack/mupdf/build b/pack/mupdf/build @@ -2,4 +2,4 @@ case "$(uname)" in (*BSD) make='gmake' ;; (*) make='make' ;; esac -$make prefix="$OPT" install +$make prefix="$PREFIX" install diff --git a/pack/ngircd/build b/pack/ngircd/build @@ -1,9 +1,9 @@ #!/bin/sh -ex ./configure \ - --prefix="$OPT" \ + --prefix="$PREFIX" \ --sysconfdir="$HOME/.config" \ - --sbindir="$OPT/bin" \ + --sbindir="$PREFIX/bin" \ --with-openssl make install diff --git a/pack/oksh/build b/pack/oksh/build @@ -1,12 +1,12 @@ #!/bin/sh -e ./configure \ - --prefix="$OPT" \ - --mandir="$OPT/share/man" \ + --prefix="$PREFIX" \ + --mandir="$PREFIX/share/man" \ --enable-ksh \ --enable-sh \ --enable-static -mkdir -p "$OPT/bin" "$OPT/share/man/man1" +mkdir -p "$PREFIX/bin" "$PREFIX/share/man/man1" exec "$PACK/build/make" diff --git a/pack/opentracker/build b/pack/opentracker/build @@ -4,4 +4,4 @@ make \ LIBOWFAT_HEADERS="$PACKROOT/include" \ LIBOWFAT_LIBRARY="$PACKROOT/lib" -make PREFIX="$OPT" install +make PREFIX="$PREFIX" install diff --git a/pack/opus-tools/build b/pack/opus-tools/build @@ -12,6 +12,6 @@ export FLAC_CFLAGS="-I'$PACKROOT/include'" ./configure \ --with-ogg="$PACKROOT" \ --with-opus="$PACKROOT" \ - --prefix="$OPT" + --prefix="$PREFIX" exec "$PACK/build/gmake" diff --git a/pack/os-linux/build b/pack/os-linux/build @@ -18,11 +18,11 @@ make $MAKEFLAGS ARCH="$ARCH" KCONFIG_ALLCONFIG=my.config DISABLE_PAX_PLUGINS=y a if [ "$PKGNAME" = "linux-headers" ] then - make $MAKEFLAGS ARCH="$ARCH" prefix="$OPT" INSTALL_HDR_PATH="$OPT" headers_install + make $MAKEFLAGS ARCH="$ARCH" prefix="$PREFIX" INSTALL_HDR_PATH="$PREFIX" headers_install exit 0 fi make $MAKEFLAGS ARCH="$ARCH" CROSS_COMPILE="$($CC -dumpmachine)-" CC="$CC" CFLAGS="$CFLAGS" DISABLE_PAX_PLUGINS=y KBUILD_BUILD_USER=root KBUILD_BUILD_HOST=anon -grep -q -E '=m$' my.config && make INSTALL_MOD_PATH="$OPT" DISABLE_PAX_PLUGINS=y modules_install || true -mkdir -p "$OPT/boot" && cp -f "$KPATH" "$OPT/boot/" +grep -q -E '=m$' my.config && make INSTALL_MOD_PATH="$PREFIX" DISABLE_PAX_PLUGINS=y modules_install || true +mkdir -p "$PREFIX/boot" && cp -f "$KPATH" "$PREFIX/boot/" diff --git a/pack/ratox/build b/pack/ratox/build @@ -2,4 +2,4 @@ cp -f "$PACK/ratox/config.mk" "config.mk" -make PREFIX="$OPT" install +make PREFIX="$PREFIX" install diff --git a/pack/redis/tar b/pack/redis/tar @@ -0,0 +1 @@ +http://download.redis.io/releases/redis-4.0.8.tar.gz diff --git a/pack/reflex/build b/pack/reflex/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -./configure --prefix="$OPT" +./configure --prefix="$PREFIX" make install -ln -s "$OPT/bin/reflex" "$OPT/bin/flex" +ln -s "$PREFIX/bin/reflex" "$PREFIX/bin/flex" diff --git a/pack/runit/build b/pack/runit/build @@ -8,7 +8,7 @@ fi package/compile -mkdir -p "$OPT/share/man/man8" -cp man/* "$OPT/share/man/man8" -mkdir -p "$OPT/bin" -cp command/* "$OPT/bin" +mkdir -p "$PREFIX/share/man/man8" +cp man/* "$PREFIX/share/man/man8" +mkdir -p "$PREFIX/bin" +cp command/* "$PREFIX/bin" diff --git a/pack/scron/build b/pack/scron/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -make PREFIX="$OPT" MANPREFIX="$OPT/share/man" install +make PREFIX="$PREFIX" MANPREFIX="$PREFIX/share/man" install diff --git a/pack/sfeed/build b/pack/sfeed/build @@ -1,7 +1,7 @@ #!/bin/sh -ex cp "$PACK/sfeed/sfeed_twtxt.c" "$SRC" -make MANPREFIX="$OPT/share/man" PREFIX="$OPT" install +make MANPREFIX="$PREFIX/share/man" PREFIX="$PREFIX" install make BIN='sfeed_twtxt' -cp "$SRC/sfeed_twtxt" "$OPT/bin/sfeed_twtxt" +cp "$SRC/sfeed_twtxt" "$PREFIX/bin/sfeed_twtxt" diff --git a/pack/st/build b/pack/st/build @@ -6,4 +6,4 @@ cp "$PACK/st/config.h" config.h cp "$PACK/st/config.mk" config.mk cp "$PACK/st/$THEME.h" colors.h -make PREFIX="$OPT" install +make PREFIX="$PREFIX" install diff --git a/pack/tinc/build b/pack/tinc/build @@ -1,8 +1,8 @@ #!/bin/sh -ex ./configure \ - --prefix="$OPT" \ - --sbindir="$OPT/bin" \ + --prefix="$PREFIX" \ + --sbindir="$PREFIX/bin" \ --sysconfdir="$HOME/.config" \ --localstatedir="$HOME/var" \ --disable-lzo \ diff --git a/pack/tinyssh/build b/pack/tinyssh/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -echo "$OPT/bin" > conf-bin -echo "$OPT/share/man" > conf-man +echo "$PREFIX/bin" > conf-bin +echo "$PREFIX/share/man" > conf-man make make install diff --git a/pack/u9fs/build b/pack/u9fs/build @@ -1,4 +1,4 @@ #!/bin/sh -ex -mkdir -p "$OPT/bin" -make DESTROOT="$OPT" install +mkdir -p "$PREFIX/bin" +make DESTROOT="$PREFIX" install diff --git a/pack/ucspi-tcp/build b/pack/ucspi-tcp/build @@ -4,9 +4,9 @@ echo gcc -O2 -include /usr/include/errno.h > conf-cc make -mkdir -p "$OPT/bin" +mkdir -p "$PREFIX/bin" cp \ tcpserver tcprules tcprulescheck argv0 recordio tcpclient who@ date@ \ finger@ http@ tcpcat mconnect mconnect-io addcr delcr fixcrio \ rblsmtpd rts \ - "$OPT/bin" + "$PREFIX/bin" diff --git a/pack/ucspi-unix/build b/pack/ucspi-unix/build @@ -2,6 +2,6 @@ make -mkdir -p "$OPT/bin" "$OPT/share/man/man1" -cp unixcat unixclient unixserver "$OPT/bin" -cp unixclient.1 unixserver.1 "$OPT/share/man/man1" +mkdir -p "$PREFIX/bin" "$PREFIX/share/man/man1" +cp unixcat unixclient unixserver "$PREFIX/bin" +cp unixclient.1 unixserver.1 "$PREFIX/share/man/man1" diff --git a/pack/yacc/build b/pack/yacc/build @@ -2,6 +2,6 @@ ./configure -make PREFIX="$OPT" install +make PREFIX="$PREFIX" install -mv "$OPT/bin/oyacc" "$OPT/bin/yacc" +mv "$PREFIX/bin/oyacc" "$PREFIX/bin/yacc"