dot

packages and services management
Log | Files | Refs | README

commit 8d58f93122dce66f3794aa6d091e17273c503d44
parent aaa9d5917bda7c663f98f721def8965658b1b4a6
Author: Josuah Demangeon <mail@josuah.net>
Date:   Fri, 31 Aug 2018 20:35:51 +0200

do not use /cur/ anymore

Diffstat:
Mbin/pack-add | 2+-
Mpack/9base-2.10.0/build | 6+++---
Mpack/acme-client-0.1.9/build | 4++--
Mpack/execline-2.5.0.0/build | 6+++---
Mpack/irssi-git/build | 4++--
Mpack/libgit2-0.27.2/build | 2+-
Mpack/libtox-0.1.10/build | 4++--
Mpack/links2-git/build | 4++--
Mpack/mpop-1.2.6/build | 4++--
Mpack/msmtp-1.6.5/build | 4++--
Mpack/netpgp-20140220/build | 4++--
Mpack/openvpn-2.4.6/build | 4++--
Mpack/opus-tools-0.1.10/build | 8++++----
Mpack/s6-2.7.1.1/build | 10+++++-----
Mpack/s6-dns-2.3.0.0/build | 6+++---
Mpack/s6-linux-init-0.4.0.0/build | 14+++++++-------
Mpack/s6-networking-2.3.0.2/build | 18+++++++++---------
Mpack/s6-portable-utils-2.2.1.1/build | 6+++---
Mpack/sacc-1.00/build | 2+-
Mpack/sacc-1.00/config.mk | 6++++--
Mpack/sacc-1.00/dep | 1+
Mpack/tinyldap-main/build | 4++--
Mpack/transmission-2.94/build | 16++++++++--------
Mpack/wireguard-0.0.20180524/build | 4++--
24 files changed, 73 insertions(+), 70 deletions(-)

diff --git a/bin/pack-add b/bin/pack-add @@ -1,4 +1,4 @@ -#!/bin/sh -ex +#!/bin/sh -e # build a program into /opt/<package>/<version> and symlink it into /local test -h "/etc/pack/$1" && set -- "$(readlink "/etc/pack/$1")" diff --git a/pack/9base-2.10.0/build b/pack/9base-2.10.0/build @@ -1,11 +1,11 @@ #!/bin/sh -ex -export CFLAGS="-I'/opt/libz/cur/include'" -export LDFLAGS="-L'/opt/libz/cur/lib'" +export CFLAGS="-I'/opt/libz/include'" +export LDFLAGS="-L'/opt/libz/lib'" ./configure --prefix="$PREFIX" \ --without-tcltk \ --without-iconv \ - --with-zlib=/opt/libz/cur/current + --with-zlib=/opt/libz/current gmake install diff --git a/pack/acme-client-0.1.9/build b/pack/acme-client-0.1.9/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export CFLAGS=-I"'/opt/libressl/cur/include'" -export LDFLAGS=-L"'/opt/libressl/cur/lib'" +export CFLAGS=-I"'/opt/libressl/include'" +export LDFLAGS=-L"'/opt/libressl/lib'" export PATH=$PACK:$PATH gmake MAN1DIR="$PREFIX/share/man/man1" PREFIX="$PREFIX" install diff --git a/pack/execline-2.5.0.0/build b/pack/execline-2.5.0.0/build @@ -2,8 +2,8 @@ ./configure \ --prefix="$PREFIX" \ - --with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \ - --with-include=/opt/libskarnet/cur/include \ - --with-lib=/opt/libskarnet/cur/lib/skalibs + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs gmake install diff --git a/pack/irssi-git/build b/pack/irssi-git/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export OPENSSL_CFLAGS='-I/opt/libressl/cur/include' -export OPENSSL_LIBS='-L/opt/libressl/cur/lib -lssl' +export OPENSSL_CFLAGS='-I/opt/libressl/include' +export OPENSSL_LIBS='-L/opt/libressl/lib -lssl' cp -R "$PACK"/* . ./configure \ diff --git a/pack/libgit2-0.27.2/build b/pack/libgit2-0.27.2/build @@ -9,7 +9,7 @@ rm -fR "$SOURCE/src/win32/" cd src cc -c -fPIC \ - -I./ -I"/opt/libressl/cur/include" -I../include/ -I../deps/http-parser/ \ + -I./ -I"/opt/libressl/include" -I../include/ -I../deps/http-parser/ \ ./*.c ./*/*.c ./*/*/*.c ../deps/http-parser/*.c cc -shared -o libgit2.so *.o ar -rcs libgit2.a *.o diff --git a/pack/libtox-0.1.10/build b/pack/libtox-0.1.10/build @@ -1,7 +1,7 @@ #!/bin/sh -ex ./configure --prefix="$PREFIX" \ - --with-libsodium-libs=/opt/libsodium/cur/lib \ - --with-libsodium-headers=/opt/libsodium/cur/include + --with-libsodium-libs=/opt/libsodium/lib \ + --with-libsodium-headers=/opt/libsodium/include make install diff --git a/pack/links2-git/build b/pack/links2-git/build @@ -1,8 +1,8 @@ #!/bin/sh -ex make \ - CFLAGS="-I'/opt/libressl/cur/include'" \ - LDFLAGS="-L'/opt/libressl/cur/lib'" + CFLAGS="-I'/opt/libressl/include'" \ + LDFLAGS="-L'/opt/libressl/lib'" mkdir -p "$PREFIX/bin" "$PREFIX/share/man/man1" cp links "$PREFIX/bin" cp links.1 "$PREFIX/share/man/man1" diff --git a/pack/mpop-1.2.6/build b/pack/mpop-1.2.6/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export libssl_CFLAGS="-I'/opt/libressl/cur/include'" -export libssl_LIBS="-static -L'/opt/libressl/cur/lib' -lssl -lcrypto" +export libssl_CFLAGS="-I'/opt/libressl/include'" +export libssl_LIBS="-static -L'/opt/libressl/lib' -lssl -lcrypto" ./configure --prefix="$PREFIX" diff --git a/pack/msmtp-1.6.5/build b/pack/msmtp-1.6.5/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export libssl_CFLAGS="-I'/opt/libressl/cur/include'" -export libssl_LIBS="-L'/opt/libressl/cur/lib' -lssl -lcrypto" +export libssl_CFLAGS="-I'/opt/libressl/include'" +export libssl_LIBS="-L'/opt/libressl/lib' -lssl -lcrypto" export PKG_CONFIG=/bin/true ./configure --prefix="$PREFIX" \ diff --git a/pack/netpgp-20140220/build b/pack/netpgp-20140220/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export CFLAGS="-I/opt/libressl/cur/include" -export LDFLAGS="-L/opt/libressl/cur/lib" +export CFLAGS="-I/opt/libressl/include" +export LDFLAGS="-L/opt/libressl/lib" ./configure --prefix="$PREFIX" \ --with-openssl="/opt/libressl/current/lib" diff --git a/pack/openvpn-2.4.6/build b/pack/openvpn-2.4.6/build @@ -7,7 +7,7 @@ touch .gitignore .gitattributes --enable-iproute2 \ --disable-lzo \ --disable-plugin-auth-pam \ - CFLAGS="-I/opt/libmbedtls/cur/include -I/opt/liblz4/cur/include" \ - LDFLAGS="-L/opt/liblz4/cur/lib -L/opt/libmbedtls/cur/lib -lmbedtls -llz4 -static" + CFLAGS="-I/opt/libmbedtls/include -I/opt/liblz4/include" \ + LDFLAGS="-L/opt/liblz4/lib -L/opt/libmbedtls/lib -lmbedtls -llz4 -static" make install diff --git a/pack/opus-tools-0.1.10/build b/pack/opus-tools-0.1.10/build @@ -1,9 +1,9 @@ #!/bin/sh -ex -export CFLAGS="$CFLAGS -I/opt/libogg/cur/include" -export LDFLAGS="$CFLAGS -L/opt/libogg/cur/lib -lopus" -export CFLAGS="$CFLAGS -I/opt/libopus/cur/include" -export LDFLAGS="$CFLAGS -L/opt/libopus/cur/lib -lopus" +export CFLAGS="$CFLAGS -I/opt/libogg/include" +export LDFLAGS="$CFLAGS -L/opt/libogg/lib -lopus" +export CFLAGS="$CFLAGS -I/opt/libopus/include" +export LDFLAGS="$CFLAGS -L/opt/libopus/lib -lopus" ./configure --prefix="$PREFIX" \ --with-ogg=/opt/libogg/cur \ diff --git a/pack/s6-2.7.1.1/build b/pack/s6-2.7.1.1/build @@ -2,10 +2,10 @@ ./configure \ --prefix="$PREFIX" \ - --with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \ - --with-include=/opt/libskarnet/cur/include \ - --with-lib=/opt/libskarnet/cur/lib/skalibs \ - --with-include=/opt/execline/cur/include \ - --with-lib=/opt/execline/cur/lib/execline + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs \ + --with-include=/opt/execline/include \ + --with-lib=/opt/execline/lib/execline gmake install diff --git a/pack/s6-dns-2.3.0.0/build b/pack/s6-dns-2.3.0.0/build @@ -2,8 +2,8 @@ ./configure \ --prefix=$PREFIX/ \ - --with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \ - --with-include=/opt/libskarnet/cur/include \ - --with-lib=/opt/libskarnet/cur/lib/skalibs + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs gmake install diff --git a/pack/s6-linux-init-0.4.0.0/build b/pack/s6-linux-init-0.4.0.0/build @@ -2,12 +2,12 @@ ./configure \ --prefix="$PREFIX" \ - --with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \ - --with-include=/opt/libskarnet/cur/include \ - --with-lib=/opt/libskarnet/cur/lib/skalibs \ - --with-include=/opt/execline/cur/include \ - --with-lib=/opt/execline/cur/lib/execline \ - --with-include=/opt/s6/cur/include \ - --with-lib=/opt/s6/cur/lib/s6 + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs \ + --with-include=/opt/execline/include \ + --with-lib=/opt/execline/lib/execline \ + --with-include=/opt/s6/include \ + --with-lib=/opt/s6/lib/s6 gmake install diff --git a/pack/s6-networking-2.3.0.2/build b/pack/s6-networking-2.3.0.2/build @@ -2,15 +2,15 @@ ./configure \ --prefix=$PREFIX/ \ - --with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \ - --with-include=/opt/libskarnet/cur/include \ - --with-lib=/opt/libskarnet/cur/lib/skalibs \ - --with-include=/opt/execline/cur/include \ - --with-lib=/opt/execline/cur/lib/execline \ - --with-include=/opt/s6/cur/include \ - --with-lib=/opt/s6/cur/lib/s6 \ - --with-include=/opt/s6-dns/cur/include \ - --with-lib=/opt/s6-dns/cur/lib/s6-dns \ + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs \ + --with-include=/opt/execline/include \ + --with-lib=/opt/execline/lib/execline \ + --with-include=/opt/s6/include \ + --with-lib=/opt/s6/lib/s6 \ + --with-include=/opt/s6-dns/include \ + --with-lib=/opt/s6-dns/lib/s6-dns \ --enable-ssl=bearssl \ --with-ssl-path=/opt/libbearssl/cur diff --git a/pack/s6-portable-utils-2.2.1.1/build b/pack/s6-portable-utils-2.2.1.1/build @@ -2,8 +2,8 @@ ./configure \ --prefix="$PREFIX" \ - --with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \ - --with-include=/opt/libskarnet/cur/include \ - --with-lib=/opt/libskarnet/cur/lib/skalibs + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs gmake install diff --git a/pack/sacc-1.00/build b/pack/sacc-1.00/build @@ -1,4 +1,4 @@ #!/bin/sh -ex -cp "$PACK/config.mk" ./config.mk +cp "$PACK/config.mk" . make PREFIX="$PREFIX" install diff --git a/pack/sacc-1.00/config.mk b/pack/sacc-1.00/config.mk @@ -2,9 +2,11 @@ PREFIX = /usr/local MANDIR = $(PREFIX)/share/man/man1 +CC = cc -I/opt/libcurses/include -L/opt/libcurses/lib -static + # UI type # txt (textual) #UI=txt # ti (screen-oriented) -UI=ti -LIBS=-lcurses +UI = ti +LIBS = -lcurses diff --git a/pack/sacc-1.00/dep b/pack/sacc-1.00/dep @@ -1 +1,2 @@ gmake +libcurses diff --git a/pack/tinyldap-main/build b/pack/tinyldap-main/build @@ -1,11 +1,11 @@ #!/bin/sh -ex rm -rf tinyldap -make DIET='sh -cx "cc -I/opt/libowfat/cur/include/ -L/opt/libowfat/lib/ \$$@"' +make DIET='sh -cx "cc -I/opt/libowfat/include/ -L/opt/libowfat/lib/ \$$@"' mkdir -p "$PREFIX/bin/" cp addindex bindrequest dumpidx ldapclient ldapclient_str parse tinyldap \ tinyldap_debug tinyldap_standalone \ "$PREFIX/bin/" -#cc -L/opt/libowfat/cur/lib/ -L./ -I/opt/libowfat/cur/include/ -I./ -pipe "$PACK/checkpassword.c" -lowfat +#cc -L/opt/libowfat/lib/ -L./ -I/opt/libowfat/include/ -I./ -pipe "$PACK/checkpassword.c" -lowfat diff --git a/pack/transmission-2.94/build b/pack/transmission-2.94/build @@ -3,20 +3,20 @@ export PKG_CONFIG=$(which true) export LIBS="$LIBS -lcurl" -export CFLAGS="$CFLAGS -I/opt/libcurl/cur/include" -export LDFLAGS="$LDFLAGS -L/opt/libcurl/cur/lib" +export CFLAGS="$CFLAGS -I/opt/libcurl/include" +export LDFLAGS="$LDFLAGS -L/opt/libcurl/lib" export LIBS="$LIBS -levent" -export CFLAGS="$CFLAGS -I/opt/libevent/cur/include" -export LDFLAGS="$LDFLAGS -L/opt/libevent/cur/lib" +export CFLAGS="$CFLAGS -I/opt/libevent/include" +export LDFLAGS="$LDFLAGS -L/opt/libevent/lib" export LIBS="$LIBS -lz" -export CFLAGS="$CFLAGS -I/opt/libz/cur/include" -export LDFLAGS="$LDFLAGS -L/opt/libz/cur/lib" +export CFLAGS="$CFLAGS -I/opt/libz/include" +export LDFLAGS="$LDFLAGS -L/opt/libz/lib" export LIBS="$LIBS -lssl -lcrypto" -export CFLAGS="$CFLAGS -I/opt/libressl/cur/include" -export LDFLAGS="$LDFLAGS -L/opt/libressl/cur/lib" +export CFLAGS="$CFLAGS -I/opt/libressl/include" +export LDFLAGS="$LDFLAGS -L/opt/libressl/lib" export CFLAGS="$CFLAGS -I$PWD" export LDFLAGS="$LDFLAGS -static" diff --git a/pack/wireguard-0.0.20180524/build b/pack/wireguard-0.0.20180524/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export CFLAGS='-I/opt/libmnl/cur/include' -export LDFLAGS='-L/opt/libmnl/cur/lib' +export CFLAGS='-I/opt/libmnl/include' +export LDFLAGS='-L/opt/libmnl/lib' cd src sed -i 's/install -v/install/g;s/@install/install/g' tools/Makefile