From a52ed8d9fbc716dd8002be1efc26ae53471ee3d0 Mon Sep 17 00:00:00 2001
From: ngn <ngn@ngn.tf>
Date: Wed, 21 Aug 2024 04:53:33 +0300
Subject: [PATCH] fix: add sgml-common install script

---
 src/docbook-xsl-nons/pkg.sh |  1 +
 src/git/changes.md          |  3 +++
 src/git/pkg.sh              | 17 +++++------------
 src/sgml-common/pkg.sh      | 24 ++++++++++++++++++------
 src/xmlto/pkg.sh            |  1 +
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/docbook-xsl-nons/pkg.sh b/src/docbook-xsl-nons/pkg.sh
index e97b734..717e787 100644
--- a/src/docbook-xsl-nons/pkg.sh
+++ b/src/docbook-xsl-nons/pkg.sh
@@ -8,6 +8,7 @@ FILES=(
 )
 HASHES=(
   "2666d1488d6ced1551d15f31d7ed8c38"
+  "62375ca864fc198cb2b17d98209d0b8c"
   "a92c39715c54949ba9369add1809527b8f155b7e2a2b2e30cb4b39ee715f2e30"
 )
 DEPENDS=("libxml2" "docbook-xml")
diff --git a/src/git/changes.md b/src/git/changes.md
index 79cc79d..e9262d1 100644
--- a/src/git/changes.md
+++ b/src/git/changes.md
@@ -1,2 +1,5 @@
+# 2.44.0
+Updated to a newer upstream release
+
 # 2.41.0
 First version
diff --git a/src/git/pkg.sh b/src/git/pkg.sh
index 6e89f43..7ab84c6 100644
--- a/src/git/pkg.sh
+++ b/src/git/pkg.sh
@@ -2,14 +2,8 @@ NAME="git"
 DESC="Free and open source, distributed version control system"
 VERSION="2.44.0"
 
-FILES=(
-  "https://www.kernel.org/pub/software/scm/git/git-${VERSION}.tar.xz"
-  "https://www.kernel.org/pub/software/scm/git/git-manpages-${VERSION}.tar.xz"
-)
-HASHES=(
-  "7e4eb7c45e9ba7c90fa51deeea49732f"
-  "bc7a4c944492c76fc3cd766ce22e826d0241e43792c611d4fdc068e0df545877"
-)
+FILES=("https://www.kernel.org/pub/software/scm/git/git-${VERSION}.tar.xz")
+HASHES=("7e4eb7c45e9ba7c90fa51deeea49732f")
 
 DEPENDS=(
   "curl" "expat" "grep"
@@ -25,11 +19,10 @@ PACKAGE() {
             --with-gitconfig=/etc/gitconfig \
             --with-python=python3 
   make
-  make DESTDIR="${ROOTDIR}" perllibdir="/usr/lib/perl5/5.38/site_perl" install
+  make man
 
-  install -Ddm755 "${ROOTDIR}/usr/share/man"
-  tar -xf "../git-manpages-${VERSION}.tar.xz" \
-    -C "${ROOTDIR}/usr/share/man" --no-same-owner --no-overwrite-dir
+  make DESTDIR="${ROOTDIR}" perllibdir="/usr/lib/perl5/5.38/site_perl" install
+  make DESTDIR="${ROOTDIR}" install-man
 
   cd .. && rm -rf "${NAME}-${VERSION}"
 }
diff --git a/src/sgml-common/pkg.sh b/src/sgml-common/pkg.sh
index 1d828d7..7bb23e8 100644
--- a/src/sgml-common/pkg.sh
+++ b/src/sgml-common/pkg.sh
@@ -25,11 +25,23 @@ PACKAGE() {
   make DESTDIR="${ROOTDIR}" install
   make DESTDIR="${ROOTDIR}" docdir="/usr/share/doc" install
 
-  install-catalog --add "/etc/sgml/sgml-ent.cat" \
-    "${ROOTDIR}/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
-
-  install-catalog --add "/etc/sgml/sgml-docbook.cat" \
-    "${ROOTDIR}/etc/sgml/sgml-ent.cat"
-
   cd .. && rm -rf ${NAME}-${VERSION}
 }
+
+INSTALL(){
+  # remove old catalogs
+  install-catalog --remove /etc/sgml/sgml-ent.cat \
+    /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+
+  install-catalog --remove /etc/sgml/sgml-docbook.cat \
+    /etc/sgml/sgml-ent.cat
+
+  # install new ones
+  install-catalog --add /etc/sgml/sgml-ent.cat \
+    /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+
+  install-catalog --add /etc/sgml/sgml-docbook.cat \
+    /etc/sgml/sgml-ent.cat
+
+  exit 0
+}
diff --git a/src/xmlto/pkg.sh b/src/xmlto/pkg.sh
index a0ed40e..961890f 100644
--- a/src/xmlto/pkg.sh
+++ b/src/xmlto/pkg.sh
@@ -12,6 +12,7 @@ PACKAGE() {
   tar xf "${NAME}-${VERSION}.tar.bz2"
   cd "${NAME}-${VERSION}"
 
+  export CFLAGS="${CFLAGS} -std=gnu89"
   LINKS="/usr/bin/links" ./configure --prefix=/usr
   make
   make DESTDIR="${ROOTDIR}" install