From 7028802409fde32f6c41793dc7e1932fd34a7191 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Thu, 4 Jul 2024 08:25:00 +0200 Subject: [PATCH 1/2] Fix installation path of the TERMINFO database --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5e5f7ef..a399d57 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ xgterm.pkg: ximtool.pkg # This re-uses the same build as ximtool xgterm/XGTerm.iconset/ install $(BUILDDIR)/x11iraf/xgterm/xgterm.man \ $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/man/xgterm.1 - TERMINFO=$(INSTDIR)/xgterm/XGTerm.app/Resources/terminfo tic \ + tic -v -o $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/terminfo \ $(BUILDDIR)/x11iraf/xgterm/xgterm.terminfo codesign -s - -i community.iraf.xgterm $(INSTDIR)/xgterm/XGTerm.app pkgbuild --identifier community.iraf.xgterm \ From 16785d7ead3399488dc62f7bf0c05519a57484fb Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Thu, 4 Jul 2024 20:45:16 +0200 Subject: [PATCH 2/2] Force symlinks instead of removing content first in xgterm postinstall --- xgterm/scripts/postinstall | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xgterm/scripts/postinstall b/xgterm/scripts/postinstall index 456df1a..079c6a7 100755 --- a/xgterm/scripts/postinstall +++ b/xgterm/scripts/postinstall @@ -11,7 +11,6 @@ APP_PATH=$2 mkdir -p /usr/local/bin/ /usr/local/share/man/man1/ /usr/local/share/terminfo/78 XGTERM_PATH=${APP_PATH}/XGTerm.app/Contents/Resources -rm -f /usr/local/bin/xgterm /usr/local/share/man/man1/xgterm.1 /usr/local/share/terminfo/78/xgterm -ln -s ${XGTERM_PATH}/bin/xgterm /usr/local/bin/ -ln -s ${XGTERM_PATH}/man/xgterm.1 /usr/local/share/man/man1/ -ln -s ${XGTERM_PATH}/terminfo/78/xgterm /usr/local/share/terminfo/78/ +ln -sf ${XGTERM_PATH}/bin/xgterm /usr/local/bin/ +ln -sf ${XGTERM_PATH}/man/xgterm.1 /usr/local/share/man/man1/ +ln -sf ${XGTERM_PATH}/terminfo/78/xgterm /usr/local/share/terminfo/78/