From owner-svn-ports-all@freebsd.org Sun Nov 20 04:33:17 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C00EC4886B; Sun, 20 Nov 2016 04:33:17 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0656A1EA9; Sun, 20 Nov 2016 04:33:16 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAK4XGd8057382; Sun, 20 Nov 2016 04:33:16 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAK4XF2v057379; Sun, 20 Nov 2016 04:33:15 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201611200433.uAK4XF2v057379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 20 Nov 2016 04:33:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426553 - in head/deskutils/pal: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Nov 2016 04:33:17 -0000 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@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 - 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 +.include 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 */