svn commit: r426553 - in head/deskutils/pal: . files

[John Marino]

Author: marino
Date: Sun Nov 20 04:33:15 2016
New Revision: 426553
URL: https://svnweb.freebsd.org/changeset/ports/426553

Log:
  deskutils/pal: Document ncurses, readline requirements, honor flags
  
  Also:
    * Provide patch for ports readline support
    * Remove nonfunctional MAN1 definition
    * Remove unnecessary pre/post includes
    * Wrap to 80 columns
  
  Approved by:	ncurses and general blankets

Added:
  head/deskutils/pal/files/patch-Makefile.defs   (contents, props changed)
  head/deskutils/pal/files/patch-src_manage.c   (contents, props changed)
Modified:
  head/deskutils/pal/Makefile

Modified: head/deskutils/pal/Makefile
==============================================================================
--- head/deskutils/pal/Makefile	Sun Nov 20 03:55:23 2016	(r426552)
+++ head/deskutils/pal/Makefile	Sun Nov 20 04:33:15 2016	(r426553)
@@ -9,26 +9,27 @@ MASTER_SITES=	SF/${PORTNAME}cal/${PORTNA
 MAINTAINER=	h.skuhra at 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
+	@${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>
+.include <bsd.port.mk>

Added: head/deskutils/pal/files/patch-Makefile.defs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/pal/files/patch-Makefile.defs	Sun Nov 20 04:33:15 2016	(r426553)
@@ -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}

Added: head/deskutils/pal/files/patch-src_manage.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/pal/files/patch-src_manage.c	Sun Nov 20 04:33:15 2016	(r426553)
@@ -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 */