From owner-svn-ports-branches@freebsd.org Mon Oct 19 14:57:29 2015 Return-Path: Delivered-To: svn-ports-branches@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 96496A19BF0; Mon, 19 Oct 2015 14:57:29 +0000 (UTC) (envelope-from amdmi3@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 67E861AB7; Mon, 19 Oct 2015 14:57:29 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JEvSHa026465; Mon, 19 Oct 2015 14:57:28 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JEvSei026463; Mon, 19 Oct 2015 14:57:28 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510191457.t9JEvSei026463@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 19 Oct 2015 14:57:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399687 - branches/2015Q4/palm/jpilot X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 14:57:29 -0000 Author: amdmi3 Date: Mon Oct 19 14:57:28 2015 New Revision: 399687 URL: https://svnweb.freebsd.org/changeset/ports/399687 Log: MFH: r399686 - Add LICENSE_FILE - Switch to options helpers - Don't install COPYING which is handled by license framework - Fix build with disabled NLS Approved by: portmgr blanket Approved by: ports-secteam blanket Modified: branches/2015Q4/palm/jpilot/Makefile branches/2015Q4/palm/jpilot/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/palm/jpilot/Makefile ============================================================================== --- branches/2015Q4/palm/jpilot/Makefile Mon Oct 19 14:56:30 2015 (r399686) +++ branches/2015Q4/palm/jpilot/Makefile Mon Oct 19 14:57:28 2015 (r399687) @@ -14,6 +14,7 @@ MAINTAINER?= samm@os2.kiev.ua COMMENT= Desktop Organizer Software for the Palm Pilot LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpisock.so:${PORTSDIR}/palm/pilot-link @@ -24,19 +25,14 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-pilot-prefix=${LOCALBASE} USE_GNOME+= gtk20 intltool -OPTIONS_DEFINE= DOCS NLS INSTALL_TARGET= install-strip -.include +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +NLS_USES_OFF= gettext-tools post-build: cd ${WRKSRC}/docs && ${MAKE_CMD} @@ -53,7 +49,7 @@ post-install: .for ext in html png jpg ${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${STAGEDIR}${DOCSDIR} .endfor -.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO +.for i in AUTHORS BUGS ChangeLog INSTALL README TODO ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/icons/README ${STAGEDIR}${DOCSDIR}/README.icons Modified: branches/2015Q4/palm/jpilot/pkg-plist ============================================================================== --- branches/2015Q4/palm/jpilot/pkg-plist Mon Oct 19 14:56:30 2015 (r399686) +++ branches/2015Q4/palm/jpilot/pkg-plist Mon Oct 19 14:57:28 2015 (r399687) @@ -12,7 +12,6 @@ man/man1/jpilot.1.gz share/applications/jpilot.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README @@ -69,23 +68,23 @@ share/applications/jpilot.desktop %%DATADIR%%/jpilotrc.green %%DATADIR%%/jpilotrc.purple %%DATADIR%%/jpilotrc.steel -share/locale/ca/LC_MESSAGES/jpilot.mo -share/locale/cs/LC_MESSAGES/jpilot.mo -share/locale/da/LC_MESSAGES/jpilot.mo -share/locale/de/LC_MESSAGES/jpilot.mo -share/locale/es/LC_MESSAGES/jpilot.mo -share/locale/fr/LC_MESSAGES/jpilot.mo -share/locale/it/LC_MESSAGES/jpilot.mo -share/locale/ja/LC_MESSAGES/jpilot.mo -share/locale/ko/LC_MESSAGES/jpilot.mo -share/locale/nb/LC_MESSAGES/jpilot.mo -share/locale/nl/LC_MESSAGES/jpilot.mo -share/locale/pt_BR/LC_MESSAGES/jpilot.mo -share/locale/ru/LC_MESSAGES/jpilot.mo -share/locale/rw/LC_MESSAGES/jpilot.mo -share/locale/sv/LC_MESSAGES/jpilot.mo -share/locale/tr/LC_MESSAGES/jpilot.mo -share/locale/uk/LC_MESSAGES/jpilot.mo -share/locale/vi/LC_MESSAGES/jpilot.mo -share/locale/zh_CN/LC_MESSAGES/jpilot.mo -share/locale/zh_TW/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/ca/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/cs/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/da/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/de/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/es/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/fr/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/it/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/ja/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/ko/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/nb/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/nl/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/ru/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/rw/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/sv/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/tr/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/uk/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/vi/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/jpilot.mo