git: da56f3b5224a - main - deskutils/pal: Fix staging as non-root
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 15 Mar 2026 18:28:07 UTC
The branch main has been updated by uzsolt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=da56f3b5224a5b8a270565f652edede256d9a7a8
commit da56f3b5224a5b8a270565f652edede256d9a7a8
Author: Zsolt Udvari <uzsolt@FreeBSD.org>
AuthorDate: 2026-03-15 18:24:12 +0000
Commit: Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2026-03-15 18:27:48 +0000
deskutils/pal: Fix staging as non-root
Commit 762351258c50e620406f38c52a46559abc6b5814 broke staging as
non-root, fix it: remove "-o root" operands of "install" in projects's Makefile.
PR: 287207
Reported by: fuz
---
deskutils/pal/Makefile | 2 +-
deskutils/pal/files/patch-src_Makefile | 96 ++++++++++++++++++++++++++++++++--
2 files changed, 92 insertions(+), 6 deletions(-)
diff --git a/deskutils/pal/Makefile b/deskutils/pal/Makefile
index c6b5f79fab86..457bb7ea7567 100644
--- a/deskutils/pal/Makefile
+++ b/deskutils/pal/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pal
DISTVERSION= 0.4.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}cal/${PORTNAME}/${DISTVERSION}
diff --git a/deskutils/pal/files/patch-src_Makefile b/deskutils/pal/files/patch-src_Makefile
index 2587f18f7b7f..22c3bdd4f133 100644
--- a/deskutils/pal/files/patch-src_Makefile
+++ b/deskutils/pal/files/patch-src_Makefile
@@ -1,13 +1,99 @@
---- src/Makefile.orig 2025-06-06 18:30:59 UTC
+--- src/Makefile.orig 2008-07-28 16:16:23 UTC
+++ src/Makefile
-@@ -87,8 +87,8 @@ install-share:
+@@ -79,16 +79,16 @@ install-bin:
+ install-bin:
+ @echo " --- Installing binary --- "
+ @mkdir -p ${DESTDIR}${prefix}/bin;
+- install -m 0755 -o root pal ${DESTDIR}${prefix}/bin;
+- install -m 0755 -o root convert/vcard2pal ${DESTDIR}${prefix}/bin;
++ install -m 0755 pal ${DESTDIR}${prefix}/bin;
++ install -m 0755 convert/vcard2pal ${DESTDIR}${prefix}/bin;
+ @echo
+
+ install-share:
@echo " --- Installing global data --- "
@mkdir -p ${DESTDIR}${prefix}/share/pal;
- install -m 0644 -o root ../share/*.pal ${DESTDIR}${prefix}/share/pal
+- install -m 0644 -o root ../share/*.pal ${DESTDIR}${prefix}/share/pal
- @mkdir -p ${DESTDIR}/etc;
- install -m 0644 -o root ../pal.conf ${DESTDIR}/etc/
-+ @mkdir -p ${DESTDIR}${prefix}/share/examples/pal/
-+ install -m 0644 -o root ../pal.conf ${DESTDIR}${prefix}/share/examples/pal/
++ install -m 0644 ../share/*.pal ${DESTDIR}${prefix}/share/pal
++ @mkdir -p ${DESTDIR}${prefix}/share/examples/pal/;
++ install -m 0644 ../pal.conf ${DESTDIR}${prefix}/share/examples/pal/
@echo
# "install" will install the files needed by pal and also check to see
+@@ -112,8 +112,8 @@ install-man:
+ @echo " --- Installing man page --- "
+ cd ../; sed 's/PAL_VERSION/$(PAL_VERSION)/' pal.1.template | gzip -9 > pal.1.gz
+ @mkdir -p ${DESTDIR}${prefix}/share/man/man1/
+- install -m 0644 -o root ../pal.1.gz ${DESTDIR}${prefix}/share/man/man1/
+- install -m 0644 -o root convert/vcard2pal.1 ${DESTDIR}${prefix}/share/man/man1/
++ install -m 0644 ../pal.1.gz ${DESTDIR}${prefix}/share/man/man1/
++ install -m 0644 convert/vcard2pal.1 ${DESTDIR}${prefix}/share/man/man1/
+ rm ../pal.1.gz
+ @echo
+
+@@ -122,15 +122,15 @@ install-doc:
+ @echo " --- Installing docs --- "
+ @mkdir -p ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
+ cat ../COPYING | gzip -9 > ../COPYING.gz
+- install -m 0644 -o root ../COPYING.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
++ install -m 0644 ../COPYING.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
+ rm ../COPYING.gz
+ cat ../INSTALL | gzip -9 > ../INSTALL.gz
+- install -m 0644 -o root ../INSTALL.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
++ install -m 0644 ../INSTALL.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
+ rm ../INSTALL.gz
+ cat ../ChangeLog | gzip -9 > ../ChangeLog.gz
+- install -m 0644 -o root ../ChangeLog.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
++ install -m 0644 ../ChangeLog.gz ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
+ rm ../ChangeLog.gz
+- install -m 0644 -o root ../doc/example.css ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
++ install -m 0644 ../doc/example.css ${DESTDIR}${prefix}/share/doc/pal-$(PAL_VERSION);
+ @echo
+
+
+@@ -140,27 +140,27 @@ install-mo:
+ @# GERMAN
+ mkdir -p ${DESTDIR}${prefix}/share/locale/de/LC_MESSAGES/
+ cd ../po; msgfmt de.po -o de.mo
+- install -m 0644 -o root ../po/de.mo ${DESTDIR}${prefix}/share/locale/de/LC_MESSAGES/pal.mo
++ install -m 0644 ../po/de.mo ${DESTDIR}${prefix}/share/locale/de/LC_MESSAGES/pal.mo
+ rm ../po/de.mo
+ @# SWEDISH
+ mkdir -p ${DESTDIR}${prefix}/share/locale/sv/LC_MESSAGES/
+ cd ../po; msgfmt sv.po -o sv.mo
+- install -m 0644 -o root ../po/sv.mo ${DESTDIR}${prefix}/share/locale/sv/LC_MESSAGES/pal.mo
++ install -m 0644 ../po/sv.mo ${DESTDIR}${prefix}/share/locale/sv/LC_MESSAGES/pal.mo
+ rm ../po/sv.mo
+ @# SPANISH
+ mkdir -p ${DESTDIR}${prefix}/share/locale/es/LC_MESSAGES/
+ cd ../po; msgfmt es.po -o es.mo
+- install -m 0644 -o root ../po/es.mo ${DESTDIR}${prefix}/share/locale/es/LC_MESSAGES/pal.mo
++ install -m 0644 ../po/es.mo ${DESTDIR}${prefix}/share/locale/es/LC_MESSAGES/pal.mo
+ rm ../po/es.mo
+ @# POLISH
+ mkdir -p ${DESTDIR}${prefix}/share/locale/pl/LC_MESSAGES/
+ cd ../po; msgfmt pl.po -o pl.mo
+- install -m 0644 -o root ../po/pl.mo ${DESTDIR}${prefix}/share/locale/pl/LC_MESSAGES/pal.mo
++ install -m 0644 ../po/pl.mo ${DESTDIR}${prefix}/share/locale/pl/LC_MESSAGES/pal.mo
+ rm ../po/pl.mo
+ @# TURKISH
+ mkdir -p ${DESTDIR}${prefix}/share/locale/tr/LC_MESSAGES/
+ cd ../po; msgfmt tr.po -o tr.mo
+- install -m 0644 -o root ../po/tr.mo ${DESTDIR}${prefix}/share/locale/tr/LC_MESSAGES/pal.mo
++ install -m 0644 ../po/tr.mo ${DESTDIR}${prefix}/share/locale/tr/LC_MESSAGES/pal.mo
+ rm ../po/tr.mo
+ @echo
+
+@@ -175,8 +175,8 @@ uninstall: uninstall-mo uninstall-man
+ @echo " --- Removing doc directory --- "
+ rm -rf ${prefix}/share/doc/pal-$(PAL_VERSION);
+ @echo
+- @echo " --- Removing /etc/pal.conf --- "
+- rm -f /etc/pal.conf;
++ @echo " --- Removing ${prefix}/etc/pal.conf --- "
++ rm -f ${prefix}/etc/pal.conf;
+ @echo
+ @echo " --- Check for doc directories for other versions of pal --- "
+ @echo " NOTE: If you don't have other copies of pal installed, you can"