Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Feb 2017 14:41:54 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433414 - head/editors/gnotepad+
Message-ID:  <201702051441.v15EfsfO017588@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Feb  5 14:41:54 2017
New Revision: 433414
URL: https://svnweb.freebsd.org/changeset/ports/433414

Log:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Switch to USES=localbase
  - Optionize NLS
  - Switch to options helpers

Modified:
  head/editors/gnotepad+/Makefile
  head/editors/gnotepad+/pkg-plist

Modified: head/editors/gnotepad+/Makefile
==============================================================================
--- head/editors/gnotepad+/Makefile	Sun Feb  5 14:33:06 2017	(r433413)
+++ head/editors/gnotepad+/Makefile	Sun Feb  5 14:41:54 2017	(r433414)
@@ -12,33 +12,29 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple GTK-based text/HTML editor
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XORG=	xpm
 USE_GNOME=	gnomeprefix gtk12
-USES=		gettext
+USES=		gettext localbase:ldflags
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--disable-gnome
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-gnome --disable-nls
 
 DOCVERSION=	1.2.0
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-DOCS_DISTFILES=	${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}:doc
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-.include <bsd.port.options.mk>
+DOCS_DISTFILES=	${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}:doc
 
-post-extract:
-.if ${PORT_OPTIONS:MDOCS}
+post-extract-DOCS-on:
 	@${MV} ${WRKSRC}/docs ${WRKSRC}/docs.old
 	@${CP} -R ${WRKDIR}/${PORTNAME}-help-${DOCVERSION}/docs ${WRKSRC}/docs
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(use_gtkhtml=\)yes|\1no|g' ${WRKSRC}/configure

Modified: head/editors/gnotepad+/pkg-plist
==============================================================================
--- head/editors/gnotepad+/pkg-plist	Sun Feb  5 14:33:06 2017	(r433413)
+++ head/editors/gnotepad+/pkg-plist	Sun Feb  5 14:41:54 2017	(r433414)
@@ -146,6 +146,6 @@ share/gnome/help/gnotepad+/C/topic.dat
 %%DATADIR%%/xpm/tb_unordered.xpm
 %%DATADIR%%/xpm/tb_winclose.xpm
 %%DATADIR%%/xpm/tb_winnew.xpm
-share/locale/da/LC_MESSAGES/gnotepad+.mo
-share/locale/fr/LC_MESSAGES/gnotepad+.mo
-share/locale/ja/LC_MESSAGES/gnotepad+.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gnotepad+.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gnotepad+.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gnotepad+.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702051441.v15EfsfO017588>