From 394685c44545afbe987a195671b8471e44cc5f1d Mon Sep 17 00:00:00 2001
From: ngn <ngn@ngn.tf>
Date: Thu, 22 Aug 2024 07:26:02 +0300
Subject: [PATCH] update: rename mc to confer

---
 src/{libxslt => confer}/.gitignore |  0
 src/{mc => confer}/changes.md      |  2 +-
 src/confer/pkg.sh                  | 22 +++++++++++++++++++
 src/libxslt/changes.md             |  2 --
 src/links/pkg.sh                   | 34 ++++++++++++++++++++----------
 src/mc/.gitignore                  |  3 ---
 src/mc/pkg.sh                      | 12 -----------
 7 files changed, 46 insertions(+), 29 deletions(-)
 rename src/{libxslt => confer}/.gitignore (100%)
 rename src/{mc => confer}/changes.md (63%)
 create mode 100644 src/confer/pkg.sh
 delete mode 100644 src/libxslt/changes.md
 delete mode 100644 src/mc/.gitignore
 delete mode 100644 src/mc/pkg.sh

diff --git a/src/libxslt/.gitignore b/src/confer/.gitignore
similarity index 100%
rename from src/libxslt/.gitignore
rename to src/confer/.gitignore
diff --git a/src/mc/changes.md b/src/confer/changes.md
similarity index 63%
rename from src/mc/changes.md
rename to src/confer/changes.md
index d488173..a902b2f 100644
--- a/src/mc/changes.md
+++ b/src/confer/changes.md
@@ -1,2 +1,2 @@
-# 24.01
+# 24.03
 First version
diff --git a/src/confer/pkg.sh b/src/confer/pkg.sh
new file mode 100644
index 0000000..ceba21e
--- /dev/null
+++ b/src/confer/pkg.sh
@@ -0,0 +1,22 @@
+# general info
+NAME="confer"
+DESC="MatterLinux configuration manager"
+VERSION="24.03"
+
+# required files
+FILES=("https://git.matterlinux.xyz/Matter/confer/archive/${VERSION}.tar.gz")
+HASHES=("4166da9e5f9544bc2aa931dc12926d244007c9ed93945d4a4e375e739e0e1fd8")
+
+# install and build depends
+DEPENDS=("libgit2" "libinih" "curl")
+BUILD=("gettext")
+
+PACKAGE(){
+  tar xf "${VERSION}.tar.gz"
+  cd "${NAME}"
+
+  make
+  make DESTDIR="${ROOTDIR}" install
+
+  cd .. && rm -r "${NAME}"
+}
diff --git a/src/libxslt/changes.md b/src/libxslt/changes.md
deleted file mode 100644
index 3a6bfc2..0000000
--- a/src/libxslt/changes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1.1.39
-First version
diff --git a/src/links/pkg.sh b/src/links/pkg.sh
index a192f33..3a0b838 100644
--- a/src/links/pkg.sh
+++ b/src/links/pkg.sh
@@ -1,24 +1,36 @@
 NAME="links"
 DESC="Text and graphics mode WWW browser"
 VERSION="2.29"
-FILES=("http://links.twibright.com/download/links-2.29.tar.bz2")
+
+FILES=("http://links.twibright.com/download/links-${VERSION}.tar.bz2")
 HASHES=("f60b87ffee090c5d6820951eba710572")
+
 DEPENDS=(
-  "libevent" "libavif" "libpng"
-  "libjpeg-turbo" "librsvg" "libtiff"
-  "brotli" "gpm"
+  "brotli" "bzip2" "gpm"
+  "libevent" "zstd" "openssl"
+  "xz" "libpng" "librsvg"
+  "libtiff" "libx11"
 )
+BUILD=("libxt")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.bz2
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.bz2"
+  cd "${NAME}-${VERSION}"
 
-  ./configure --prefix=/usr --enable-graphics --mandir=/usr/share/man
-  make && make DESTDIR="$ROOTDIR" install
+  sed -i '/AC_PROG_CC/a AC_PROG_CXX/' configure.in
+  autoreconf -fi
+  ./configure --prefix=/usr           \
+              --enable-graphics       \
+              --mandir=/usr/share/man \
+              --disable-javascript    \
+              --with-x --with-fb
 
-  install -v -d -m755 "$ROOTDIR/usr/share/doc/links-$VERSION"
+  make
+  make DESTDIR="${ROOTDIR}" install
+
+  install -v -d -m755 "${ROOTDIR}/usr/share/doc/links-${VERSION}"
   install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO \
-    "$ROOTDIR/usr/share/doc/links-$VERSION"
+    "${ROOTDIR}/usr/share/doc/links-${VERSION}"
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }
diff --git a/src/mc/.gitignore b/src/mc/.gitignore
deleted file mode 100644
index 8b56c9f..0000000
--- a/src/mc/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.cache/
-dist/
-root/
diff --git a/src/mc/pkg.sh b/src/mc/pkg.sh
deleted file mode 100644
index 01d4648..0000000
--- a/src/mc/pkg.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-NAME="mc"
-DESC="MatterLinux configuration manager"
-VERSION="24.01"
-FILES=("https://git.matterlinux.xyz/Matter/mc/archive/$VERSION.tar.gz")
-HASHES=("efae005c78681fa29e80c21cd1d5377718bfabf1de7b9a6fc85d1c1ff0451569")
-DEPENDS=("libgit2" "libinih")
-
-PACKAGE() {
-  tar xf $VERSION.tar.gz && cd $NAME
-  make && make DESTDIR="$ROOTDIR" install
-  cd .. && rm -r $NAME
-}