From owner-svn-ports-head@freebsd.org Sat Nov 19 21:39:29 2016 Return-Path: Delivered-To: svn-ports-head@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 A0BA8C4B041; Sat, 19 Nov 2016 21:39:29 +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 5E67D1625; Sat, 19 Nov 2016 21:39:29 +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 uAJLdSLU090277; Sat, 19 Nov 2016 21:39:28 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAJLdS3a090275; Sat, 19 Nov 2016 21:39:28 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201611192139.uAJLdS3a090275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 19 Nov 2016 21:39:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426539 - in head/editors/aee: . 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Nov 2016 21:39:29 -0000 Author: marino Date: Sat Nov 19 21:39:28 2016 New Revision: 426539 URL: https://svnweb.freebsd.org/changeset/ports/426539 Log: editors/aee: modernize makefile and support ports ncurses Approved by: general and ncurses blankets. Modified: head/editors/aee/Makefile head/editors/aee/files/patch-create.mk.aee Modified: head/editors/aee/Makefile ============================================================================== --- head/editors/aee/Makefile Sat Nov 19 21:17:58 2016 (r426538) +++ head/editors/aee/Makefile Sat Nov 19 21:39:28 2016 (r426539) @@ -13,46 +13,39 @@ COMMENT= Easy editor with both curses an LICENSE= ART10 USES= ncurses - -OPTIONS_DEFINE= XAE -XAE_DESC= Build X11 version 'xae' +PLIST_FILES= bin/aee bin/rae man/man1/aee.1.gz %%DATADIR%%/help.ae +ALL_TARGET= main MAKE_JOBS_UNSAFE= yes -PLIST_FILES= bin/aee bin/rae man/man1/aee.1.gz %%DATADIR%%/help.ae - -.include +OPTIONS_DEFINE= XAE -.if ${PORT_OPTIONS:MXAE} -USE_XORG= x11 -ALL_TARGET= both -PLIST_FILES+= bin/xae bin/rxae -DESKTOP_ENTRIES="Xae" "" "" "xae" "" false -.else -ALL_TARGET= main -.endif +XAE_DESC= Build X11 version 'xae' +XAE_USE= XORG=x11 +XAE_PLIST_FILES= bin/xae bin/rxae +XAE_ALL_TARGET= xae +XAE_DESKTOP_ENTRIES= "Xae" "" "" "xae" "" false post-patch: -.for i in create.mk.aee create.mk.xae @${REINPLACE_CMD} -e \ 's|cc|${CC}|g ; \ s|"-s"|""|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${i} -.endfor -.for i in aee.1 localize.c - @${REINPLACE_CMD} -e \ - 's|/usr/local/lib|${DATADIR}|g' ${WRKSRC}/${i} -.endfor + s|/usr/X11R6|${LOCALBASE}|g' \ + ${WRKSRC}/create.mk.aee \ + ${WRKSRC}/create.mk.xae + @${REINPLACE_CMD} -e 's|/usr/local/lib|${DATADIR}|g' \ + ${WRKSRC}/aee.1 \ + ${WRKSRC}/localize.c do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} aee ${STAGEDIR}${PREFIX}/bin) - (cd ${STAGEDIR}${PREFIX}/bin && ${LN} aee rae) - (cd ${WRKSRC} && ${INSTALL_MAN} aee.1 ${STAGEDIR}${MANPREFIX}/man/man1) @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC} && ${INSTALL_DATA} help.ae ${STAGEDIR}${DATADIR}) -.if ${PORT_OPTIONS:MXAE} - (cd ${WRKSRC} && ${INSTALL_PROGRAM} xae ${STAGEDIR}${PREFIX}/bin) + ${INSTALL_PROGRAM} ${WRKSRC}/aee ${STAGEDIR}${PREFIX}/bin + (cd ${STAGEDIR}${PREFIX}/bin && ${LN} aee rae) + ${INSTALL_MAN} ${WRKSRC}/aee.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/help.ae ${STAGEDIR}${DATADIR} + +do-install-XAE-on: + ${INSTALL_PROGRAM} ${WRKSRC}/xae ${STAGEDIR}${PREFIX}/bin (cd ${STAGEDIR}${PREFIX}/bin && ${LN} xae rxae) -.endif .include Modified: head/editors/aee/files/patch-create.mk.aee ============================================================================== --- head/editors/aee/files/patch-create.mk.aee Sat Nov 19 21:17:58 2016 (r426538) +++ head/editors/aee/files/patch-create.mk.aee Sat Nov 19 21:39:28 2016 (r426539) @@ -5,7 +5,7 @@ # rather than local curses) -if [ -n "$terminfo_exists" -a -z "$termcap_exists" ] -+if true ++if false then echo "Neither terminfo or termcap are on this system! " if [ -f /usr/include/curses.h ]