3 files changed, 37 insertions, 13 deletions
diff --git a/deskutils/pal/Makefile b/deskutils/pal/Makefile
index 9740c76a2979..0679cf13564c 100644
--- a/deskutils/pal/Makefile
+++ b/deskutils/pal/Makefile
@@ -9,26 +9,27 @@ MASTER_SITES=	SF/${PORTNAME}cal/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	h.skuhra@gmail.com
 COMMENT=	Calendar application
 
-USES=		pkgconfig gettext gmake tar:tgz
+USES=		gettext gmake ncurses pkgconfig readline tar:tgz
 USE_GNOME=	glib20
 ALL_TARGET=
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-MAN1=		pal.1
-
-.include <bsd.port.pre.mk>
-
 post-patch:
-	@${REINPLACE_CMD} -e "s,prefix = /usr,prefix = ${PREFIX},g;s,^CC,#CC,g" ${WRKSRC}/Makefile.defs
+	@${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
+	${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}${MANPREFIX}/man/man1/pal.1
-
-.include <bsd.port.post.mk>
+	@${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}${MANPREFIX}/man/man1/pal.1
+
+.include <bsd.port.mk>
diff --git a/deskutils/pal/files/patch-Makefile.defs b/deskutils/pal/files/patch-Makefile.defs
new file mode 100644
index 000000000000..953993c1226c
--- /dev/null
+++ b/deskutils/pal/files/patch-Makefile.defs
@@ -0,0 +1,12 @@
+--- 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_manage.c b/deskutils/pal/files/patch-src_manage.c
new file mode 100644
index 000000000000..889441eae7b5
--- /dev/null
+++ b/deskutils/pal/files/patch-src_manage.c
@@ -0,0 +1,11 @@
+--- manage.c.orig	2008-07-28 16:16:23.000000000 +0000
++++ manage.c
+@@ -403,7 +403,7 @@ void pal_manage(void)
+     rl_initialize();     /* Initialise readline so we can fiddle stuff */
+     rl_already_prompted = 1;
+     rl_redisplay_function = pal_rl_ncurses_hack;
+-    rl_pre_input_hook = (Function*) pal_rl_ncurses_hack;
++    rl_pre_input_hook = (rl_hook_func_t *) pal_rl_ncurses_hack;
+ 
+ 
+     /* initialize curses */