8 files changed, 63 insertions, 49 deletions
diff --git a/deskutils/pal/Makefile b/deskutils/pal/Makefile
index 4e3331102985..c6b5f79fab86 100644
--- a/deskutils/pal/Makefile
+++ b/deskutils/pal/Makefile
@@ -1,34 +1,21 @@
 PORTNAME=	pal
-PORTVERSION=	0.4.3
-PORTREVISION=	4
+DISTVERSION=	0.4.3
+PORTREVISION=	5
 CATEGORIES=	deskutils
-MASTER_SITES=	SF/${PORTNAME}cal/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}cal/${PORTNAME}/${DISTVERSION}
 
-MAINTAINER=	h.skuhra@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Calendar application
 WWW=		https://palcal.sourceforge.net/
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USES=		gettext gmake gnome ncurses pkgconfig readline tar:tgz
 USE_GNOME=	glib20
-ALL_TARGET=
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,prefix = /usr,prefix = ${PREFIX},g;s,^CC,#CC,g" \
-		${WRKSRC}/Makefile.defs
 
-post-build:
-	${REINPLACE_CMD} -e "s,VERSION,${PORTVERSION},g" \
-		${WRKDIR}/${PORTNAME}-${PORTVERSION}/pal.1.template
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pal ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/share/*.pal \
-		${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/pal.conf \
-		${STAGEDIR}${DATADIR}
-	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/pal.1.template \
-		${STAGEDIR}${PREFIX}/share/man/man1/pal.1
+MAKE_ARGS=	prefix=${PREFIX}
+ALL_TARGET=
+BINARY_ALIAS=	make=gmake
 
 .include <bsd.port.mk>
diff --git a/deskutils/pal/distinfo b/deskutils/pal/distinfo
index 552fb3c14a4d..0d926f96220a 100644
--- a/deskutils/pal/distinfo
+++ b/deskutils/pal/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1749233407
 SHA256 (pal-0.4.3.tgz) = ce470cb7be76522ff58cd0325ad7817b6cc2132a5e0cea55de8c9eb63b54551c
 SIZE (pal-0.4.3.tgz) = 130865
diff --git a/deskutils/pal/files/patch-Makefile.defs b/deskutils/pal/files/patch-Makefile.defs
deleted file mode 100644
index 953993c1226c..000000000000
--- a/deskutils/pal/files/patch-Makefile.defs
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.defs.orig	2016-11-20 04:17:33 UTC
-+++ Makefile.defs
-@@ -23,6 +23,6 @@ ifeq ($(DEBUG),1)
- DEFS    += -DG_DISABLE_DEPRECATED -DDEBUG
- endif
- 
--CFLAGS   = ${OPT} 
--CPPFLAGS = ${INCLDIR} ${DEFS}
--LDFLAGS  = ${LIBDIR} ${LIBS}
-+CFLAGS   += ${OPT} 
-+CPPFLAGS += ${INCLDIR} ${DEFS}
-+LDFLAGS  += ${LIBDIR} ${LIBS}
diff --git a/deskutils/pal/files/patch-src-Makefile b/deskutils/pal/files/patch-src-Makefile
deleted file mode 100644
index da1d801d4110..000000000000
--- a/deskutils/pal/files/patch-src-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2008-07-28 18:16:23.000000000 +0200
-+++ Makefile	2013-09-12 23:52:39.000000000 +0200
-@@ -3,7 +3,7 @@
- include Makefile.defs
- 
- INCLDIR = -I${prefix}/include `pkg-config --cflags glib-2.0`
--LIBDIR  =
-+LIBDIR  = -L/usr/lib
- LIBS    = `pkg-config --libs glib-2.0` -lreadline -lncurses
- 
- SRC     = main.c colorize.c output.c input.c event.c rl.c html.c latex.c \
diff --git a/deskutils/pal/files/patch-src_Makefile b/deskutils/pal/files/patch-src_Makefile
new file mode 100644
index 000000000000..2587f18f7b7f
--- /dev/null
+++ b/deskutils/pal/files/patch-src_Makefile
@@ -0,0 +1,13 @@
+--- src/Makefile.orig	2025-06-06 18:30:59 UTC
++++ src/Makefile
+@@ -87,8 +87,8 @@ install-share:
+ 	@echo " --- Installing global data --- "
+ 	@mkdir -p ${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/
+ 	@echo
+ 
+ # "install" will install the files needed by pal and also check to see
diff --git a/deskutils/pal/files/patch-src_Makefile.defs b/deskutils/pal/files/patch-src_Makefile.defs
new file mode 100644
index 000000000000..4d33db6ce39f
--- /dev/null
+++ b/deskutils/pal/files/patch-src_Makefile.defs
@@ -0,0 +1,29 @@
+--- src/Makefile.defs.orig	2025-06-06 18:04:30 UTC
++++ src/Makefile.defs
+@@ -3,13 +3,13 @@
+ 
+ # directory to install to. Depending on your distribution, you might
+ # want to change this to /usr/local
+-prefix = /usr
+-CC      = gcc
++prefix ?= /usr
++CC      ?= gcc
+ 
+ PAL_VERSION = 0.4.3
+ 
+ # used for portage, rpm, ...
+-DESTDIR =
++DESTDIR ?=
+ 
+ # optimizations/warnings
+ OPT     = -O2 -Wall
+@@ -23,6 +23,6 @@ endif
+ DEFS    += -DG_DISABLE_DEPRECATED -DDEBUG
+ endif
+ 
+-CFLAGS   = ${OPT} 
+-CPPFLAGS = ${INCLDIR} ${DEFS}
+-LDFLAGS  = ${LIBDIR} ${LIBS}
++CFLAGS   ?= ${OPT} 
++CPPFLAGS += ${INCLDIR} ${DEFS}
++LDFLAGS  += ${LIBDIR} ${LIBS}
diff --git a/deskutils/pal/files/patch-src_manage.c b/deskutils/pal/files/patch-src_manage.c
index 889441eae7b5..42d74d907742 100644
--- a/deskutils/pal/files/patch-src_manage.c
+++ b/deskutils/pal/files/patch-src_manage.c
@@ -1,5 +1,5 @@
---- manage.c.orig	2008-07-28 16:16:23.000000000 +0000
-+++ manage.c
+--- src/manage.c.orig	2025-06-06 18:09:24 UTC
++++ src/manage.c
 @@ -403,7 +403,7 @@ void pal_manage(void)
      rl_initialize();     /* Initialise readline so we can fiddle stuff */
      rl_already_prompted = 1;
diff --git a/deskutils/pal/pkg-plist b/deskutils/pal/pkg-plist
index 1751ded901a8..d15895a62f4f 100644
--- a/deskutils/pal/pkg-plist
+++ b/deskutils/pal/pkg-plist
@@ -1,5 +1,12 @@
 bin/pal
+bin/vcard2pal
+share/locale/de/LC_MESSAGES/pal.mo
+share/locale/es/LC_MESSAGES/pal.mo
+share/locale/pl/LC_MESSAGES/pal.mo
+share/locale/sv/LC_MESSAGES/pal.mo
+share/locale/tr/LC_MESSAGES/pal.mo
 share/man/man1/pal.1.gz
+share/man/man1/vcard2pal.1.gz
 %%DATADIR%%/australia.pal
 %%DATADIR%%/austria.pal
 %%DATADIR%%/birth-death.pal
@@ -9,6 +16,6 @@ share/man/man1/pal.1.gz
 %%DATADIR%%/lotr.pal
 %%DATADIR%%/music.pal
 %%DATADIR%%/pagan.pal
-%%DATADIR%%/pal.conf
 %%DATADIR%%/us.pal
 %%DATADIR%%/world.pal
+%%EXAMPLESDIR%%/pal.conf