From c4c24177f08dc8e9a6a071a3a46ef804a73df3b7 Mon Sep 17 00:00:00 2001 From: Kubilay Kocak Date: Mon, 24 Jun 2019 03:24:44 +0000 Subject: [PATCH] editors/nano: Make several port improvements * Switch to https:// MASTER_SITES * Use provided .xz for distribution file, saving: 50.5% / 1415kB * Add LICENSE_FILE * Remove CPPFLAGS/LDFLAGS variables, added 19 years ago when the port was first created. [1] They are incorrectly (globally) scoped, no longer necessary and incorrect for the ncurses:base case. Instead use Uses/ncurses.mk variables and provide these to configure to ensure includes/lib searches and linking are never mixed between base and ports. [1] ports r29979 Approved by: danilo (maintainer) MFH: 2019Q2 (blanket: bugfix) Differential_Revision: D20660 --- editors/nano/Makefile | 10 ++++++---- editors/nano/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/editors/nano/Makefile b/editors/nano/Makefile index 7861580dddd1..0797b9bdc89f 100644 --- a/editors/nano/Makefile +++ b/editors/nano/Makefile @@ -4,23 +4,25 @@ PORTNAME= nano PORTVERSION= 4.2 CATEGORIES= editors -MASTER_SITES= http://www.nano-editor.org/dist/v${PORTVERSION:R}/ GNU +MASTER_SITES= https://www.nano-editor.org/dist/v${PORTVERSION:R}/ GNU MAINTAINER= danilo@FreeBSD.org COMMENT= Nano's ANOther editor, an enhanced free Pico clone LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -USES= charsetfix ncurses +USES= charsetfix ncurses tar:xz CONFLICTS= nano-devel-2* GNU_CONFIGURE= yes CONFIGURE_ARGS= --docdir=${DOCSDIR} --enable-utf8 +CONFIGURE_ENV+= NCURSESW_CFLAGS="-I${NCURSESINC}" \ + NCURSESW_LIBS="-L${NCURSESLIB} -lncursesw" + MAKE_ARGS+= install_htmlmanDATA=install-htmlmanDATA -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS EXAMPLES NLS OPTIONS_SUB= yes diff --git a/editors/nano/distinfo b/editors/nano/distinfo index 00a80957b0f3..54f1258a318d 100644 --- a/editors/nano/distinfo +++ b/editors/nano/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556227857 -SHA256 (nano-4.2.tar.gz) = c06e456890a93e7a61317a938c70caacaa2bfd6161a52b2731df83875ebbcf80 -SIZE (nano-4.2.tar.gz) = 2928595 +TIMESTAMP = 1560579916 +SHA256 (nano-4.2.tar.xz) = 1143defce62e391b241252ffdb6e5c1ded56cfe26d46ee81b796abe0ccc45df9 +SIZE (nano-4.2.tar.xz) = 1478972