чување d59d4b026f2699272936f2aff6ef514df05e682e
родитељ 118a243c724b6f019f862a79727fe5af9f19d64a
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Thu, 28 Jul 2022 19:56:43 +0200
Replaced vis+lua+lpeg (for the moment?) with vim, as it didn't work well with tmux+netbsd-curses
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 4, додавања: 164(+), брисања: 119(-)
diff --git a/01-cross.sh b/01-cross.sh
@@ -89,9 +89,11 @@ do
fi
case ${url} in
- git:*|git+https:*) git_clone "${dirtb}" ${url##git+} ${delay};;
- http:*|https:*) fetch_pkg ${url} "${dirtb}" ${delay};;
- *) ;;
+ git:*|git+https:*)
+ git_clone "${dirtb}" ${url##git+} ${delay};;
+ ftp:*|http:*|https:*)
+ fetch_pkg ${url} "${dirtb}" ${delay};;
+ *) ;;
esac
if [ -n "${md5}" ]; then
if ! printf "%s %s" "${md5}" "${G_PKG}/${tarball}" | \
diff --git a/03-packages.sh b/03-packages.sh
@@ -3917,117 +3917,159 @@ mkpk_install()
fi
end_substep
-begin_substep lua-5.3.6
-if [ -e /sucks/lib/liblua5.3.a ]; then
- msg info "%s exists, skipping %s" /sucks/lib/liblua5.3.a ${pkg}
-elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
- unpack_pkg ${pkg} /
-else
- extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
- (
- cd_or_fail ${G_SRC}/${pkg}
-
- apply_patch packages -Np0 -i \
- ${G_PAT}/lua53-void/liblua.so.patch
-
- cp_or_fail ${G_FIL}/lua53-galeb/lua.pc ${G_SRC}/${pkg}
-
- cat <<! >MKPK
-mkpk_name()
-{
- printf "%s" "${pkg}"
-}
-
-mkpk_install()
-{
- CFLAGS='-Os'
- LDFLAGS='-s'
- DESTDIR=/build
- export CFLAGS LDFLAGS DESTDIR
-
- /${TLD}/bin/sed -Ei src/Makefile \\
- -e '/^LUA_(SO|A|T)=/ s,lua,lua5.3,' \\
- -e '/LUAC_T=/ s,luac,luac5.3,'
-
- make MYCFLAGS="\${CFLAGS} -fPIC" \\
- INSTALL_DATA="/${TLD}/bin/cp -d" \\
- LUA_SO=liblua5.3.so ${JN} linux || exit 1
-
- make INSTALL=/${TLD}/bin/install INSTALL_DATA="/${TLD}/bin/cp -d" \\
- INSTALL_TOP="/build/sucks" \\
- TO_BIN="lua5.3 luac5.3" \\
- TO_LIB="liblua5.3.a liblua5.3.so" \\
- INSTALL_INC="/build/sucks/include/lua5.3" \\
- INSTALL_LMOD="/build/sucks/share/lua5.3" \\
- INSTALL_CMOD="/build/sucks/lib/lua5.3" \\
- INSTALL_MAN="/build/sucks/share/man/man1" install || exit 1
-
- /${TLD}/bin/ln -s liblua5.4.so.5.3.6 /build/sucks/lib/liblua5.3.so.5.3
- /${TLD}/bin/install -Dm644 lua.pc /build/sucks/lib/pkgconfig/lua.pc
- /${TLD}/bin/install -Dm644 lua.pc /build/sucks/lib/pkgconfig/lua5.3.pc
-}
-!
- mkpk ${pkg}
- remove_dir ${G_SRC}/${pkg}
- unpack_pkg ${pkg} /
- ) || exit 1
-fi
-end_substep
-
-begin_substep lpeg-1.0.2
-if [ -e /sucks/lib/lua5.3/lpeg.a ]; then
- msg info "%s exists, skipping %s" /sucks/lib/lua5.3/lpeg.a ${pkg}
-elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
- unpack_pkg ${pkg} /
-else
- extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
- (
- cd_or_fail ${G_SRC}/${pkg}
-
- cp_or_fail ${G_FIL}/lpeg-galeb/lpeg.pc ${G_SRC}/${pkg}
-
- cat <<! >MKPK
-mkpk_name()
-{
- printf "%s" "${pkg}"
-}
-
-mkpk_install()
-{
- CFLAGS='-Os'
- LDFLAGS='-s'
- DESTDIR=/build
- export CFLAGS LDFLAGS DESTDIR
-
- /${TLD}/bin/sed -i makefile \\
- -e '/^LUADIR =/ s,\.\./lua/,/sucks/include/lua5.3,' \\
- -e "/^COPT =/ s,=.*,= \${CFLAGS} -DNDEBUG,"
- printf 'lpeg.a: \$(FILES)\n' >> makefile
- printf "\tar cru lpeg.a *.o\n" >> makefile
+# Needed for vis
+# begin_substep lua-5.3.6
+# if [ -e /sucks/lib/liblua5.3.a ]; then
+# msg info "%s exists, skipping %s" /sucks/lib/liblua5.3.a ${pkg}
+# elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+# unpack_pkg ${pkg} /
+# else
+# extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
+# (
+# cd_or_fail ${G_SRC}/${pkg}
+#
+# apply_patch packages -Np0 -i \
+# ${G_PAT}/lua53-void/liblua.so.patch
+#
+# cp_or_fail ${G_FIL}/lua53-galeb/lua.pc ${G_SRC}/${pkg}
+#
+# cat <<! >MKPK
+# mkpk_name()
+# {
+# printf "%s" "${pkg}"
+# }
+#
+# mkpk_install()
+# {
+# CFLAGS='-Os'
+# LDFLAGS='-s'
+# DESTDIR=/build
+# export CFLAGS LDFLAGS DESTDIR
+#
+# /${TLD}/bin/sed -Ei src/Makefile \\
+# -e '/^LUA_(SO|A|T)=/ s,lua,lua5.3,' \\
+# -e '/LUAC_T=/ s,luac,luac5.3,'
+#
+# make MYCFLAGS="\${CFLAGS} -fPIC" \\
+# INSTALL_DATA="/${TLD}/bin/cp -d" \\
+# LUA_SO=liblua5.3.so ${JN} linux || exit 1
+#
+# make INSTALL=/${TLD}/bin/install INSTALL_DATA="/${TLD}/bin/cp -d" \\
+# INSTALL_TOP="/build/sucks" \\
+# TO_BIN="lua5.3 luac5.3" \\
+# TO_LIB="liblua5.3.a liblua5.3.so" \\
+# INSTALL_INC="/build/sucks/include/lua5.3" \\
+# INSTALL_LMOD="/build/sucks/share/lua5.3" \\
+# INSTALL_CMOD="/build/sucks/lib/lua5.3" \\
+# INSTALL_MAN="/build/sucks/share/man/man1" install || exit 1
+#
+# /${TLD}/bin/ln -s liblua5.4.so.5.3.6 /build/sucks/lib/liblua5.3.so.5.3
+# /${TLD}/bin/install -Dm644 lua.pc /build/sucks/lib/pkgconfig/lua.pc
+# /${TLD}/bin/install -Dm644 lua.pc /build/sucks/lib/pkgconfig/lua5.3.pc
+# }
+# !
+# mkpk ${pkg}
+# remove_dir ${G_SRC}/${pkg}
+# unpack_pkg ${pkg} /
+# ) || exit 1
+# fi
+# end_substep
- make ${JN} || exit 1
- make ${JN} lpeg.a || exit 1
+# Needed for vis
+# begin_substep lpeg-1.0.2
+# if [ -e /sucks/lib/lua5.3/lpeg.a ]; then
+# msg info "%s exists, skipping %s" /sucks/lib/lua5.3/lpeg.a ${pkg}
+# elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+# unpack_pkg ${pkg} /
+# else
+# extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
+# (
+# cd_or_fail ${G_SRC}/${pkg}
+#
+# cp_or_fail ${G_FIL}/lpeg-galeb/lpeg.pc ${G_SRC}/${pkg}
+#
+# cat <<! >MKPK
+# mkpk_name()
+# {
+# printf "%s" "${pkg}"
+# }
+#
+# mkpk_install()
+# {
+# CFLAGS='-Os'
+# LDFLAGS='-s'
+# DESTDIR=/build
+# export CFLAGS LDFLAGS DESTDIR
+#
+# /${TLD}/bin/sed -i makefile \\
+# -e '/^LUADIR =/ s,\.\./lua/,/sucks/include/lua5.3,' \\
+# -e "/^COPT =/ s,=.*,= \${CFLAGS} -DNDEBUG,"
+# printf 'lpeg.a: \$(FILES)\n' >> makefile
+# printf "\tar cru lpeg.a *.o\n" >> makefile
+#
+# make ${JN} || exit 1
+# make ${JN} lpeg.a || exit 1
+#
+# /${TLD}/bin/install -Dm755 lpeg.so /build/sucks/lib/lua5.3/lpeg.so
+# /${TLD}/bin/install -Dm755 lpeg.a /build/sucks/lib/lua5.3/lpeg.a
+# /${TLD}/bin/install -Dm644 lpeg.pc /build/sucks/lib/pkgconfig/lpeg.pc
+# /${TLD}/bin/install -Dm644 re.lua /build/sucks/share/lua5.3/re.lua
+# }
+# !
+# mkpk ${pkg}
+# remove_dir ${G_SRC}/${pkg}
+# unpack_pkg ${pkg} /
+# ) || exit 1
+# fi
+# end_substep
- /${TLD}/bin/install -Dm755 lpeg.so /build/sucks/lib/lua5.3/lpeg.so
- /${TLD}/bin/install -Dm755 lpeg.a /build/sucks/lib/lua5.3/lpeg.a
- /${TLD}/bin/install -Dm644 lpeg.pc /build/sucks/lib/pkgconfig/lpeg.pc
- /${TLD}/bin/install -Dm644 re.lua /build/sucks/share/lua5.3/re.lua
-}
-!
- mkpk ${pkg}
- remove_dir ${G_SRC}/${pkg}
- unpack_pkg ${pkg} /
- ) || exit 1
-fi
-end_substep
+# Doesn't work properly with netbsd-curses+tmux
+# begin_substep vis-0.7
+# if [ -x /bin/vis ]; then
+# msg info "%s exists, skipping %s" /bin/vis ${pkg}
+# elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+# unpack_pkg ${pkg} /
+# else
+# extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
+# (
+# cd_or_fail ${G_SRC}/${pkg}
+#
+# cat <<! >MKPK
+# mkpk_name()
+# {
+# printf "%s" "${pkg}"
+# }
+#
+# mkpk_install()
+# {
+# CFLAGS='-Os -static --static -fcommon'
+# LDFLAGS='-static --static -fcommon'
+# DESTDIR=/build
+# export CFLAGS LDFLAGS DESTDIR
+#
+# ./configure --prefix=/
+#
+# make ${JN}
+# make install-strip
+#
+# ln -s vis /build/bin/vi
+# ln -s vis.1 /build/share/man/man1/vi.1
+# }
+# !
+# mkpk ${pkg}
+# remove_dir ${G_SRC}/${pkg}
+# unpack_pkg ${pkg} /
+# ) || exit 1
+# fi
+# end_substep
-begin_substep vis-0.7
-if [ -x /bin/vis ]; then
- msg info "%s exists, skipping %s" /bin/vis ${pkg}
+begin_substep vim-8.1
+if [ -x /bin/vim ]; then
+ msg info "%s exists, skipping %s" /bin/vim ${pkg}
elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
unpack_pkg ${pkg} /
else
- extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.gz
+ extract_pkg ${G_SRC} vim81 ${pkg}.tar.bz2 ${pkg}
(
cd_or_fail ${G_SRC}/${pkg}
@@ -4044,13 +4086,15 @@ mkpk_install()
DESTDIR=/build
export CFLAGS LDFLAGS DESTDIR
- ./configure --prefix=/
-
- make ${JN}
- make install-strip
+ ./configure --prefix=/ \\
+ --sysconfdir=/etc \\
+ --docdir=/share/doc/${pkg} \\
+ --disable-selinux \\
+ --disable-netbeans \\
+ --without-x || exit 1
- ln -s vis /build/bin/vi
- ln -s vis.1 /build/share/man/man1/vi.1
+ make ${JN} || exit 1
+ make install || exit 1
}
!
mkpk ${pkg}
diff --git a/lib/gensums b/lib/gensums
@@ -25,9 +25,9 @@ do
fi
case ${url} in
- http:*|https:*) md5=$(md5sum ${G_PKG}/${tarball} | \
- cut -d ' ' -f1);;
- *) md5='';;
+ ftp:*|http:*|https:*) md5=$(md5sum ${G_PKG}/${tarball} | \
+ cut -d ' ' -f1);;
+ *) md5='';;
esac
if [ -n "${md5}" ]; then
printf "%s\t%s\t%s\n" "${url}" "${dirtb}" "${md5}" >>newfile
diff --git a/lib/pkgs.tsv b/lib/pkgs.tsv
@@ -1,4 +1,5 @@
URL Directory/Tarball MD5 Sum
+ftp://ftp.vim.org/pub/vim/unix/vim-8.1.tar.bz2 1739a1df312305155285f0cfa6118294
git+https://git.adelielinux.org/adelie/musl-locales.git musl-locales-20220708
git+https://git.sr.ht/~strahinja/reflow reflow-20220716
git+https://git.sr.ht/~strahinja/svc svc-20220720
@@ -133,8 +134,6 @@ https://www.kernel.org/pub/linux/utils/kbd/kbd-2.4.0.tar.xz 3cac5be0096fcf7b32d
https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz e81e63acd80697d001c8d85c1acb38a0
https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-5.17.0.tar.xz 8ade96ee93f37fba7e1beec89f1a54bf
https://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz 08bf514d59660391c3a21b3977a16c8c
-https://www.lua.org/ftp/lua-5.3.6.tar.gz 83f23dbd5230140a3770d5f54076948d
https://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.7.tar.bz2 bf84143905a6a903dbd4d4b911a2a2b8
https://www.python.org/ftp/python/3.9.9/Python-3.9.9.tar.xz 11d12076311563252a995201248d17e5
https://www.zlib.net/pigz/pigz-2.7.tar.gz 2d084221ba829d29f344305845a313f3
-http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz d342571886f1abcb7afe6a83d024d583
