- 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
MFH:		2015Q4 (blanket)

2 files changed, 27 insertions, 32 deletions

diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 543c794c7f9b..eff6c98bfd5a 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -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 <bsd.port.options.mk>
+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
diff --git a/palm/jpilot/pkg-plist b/palm/jpilot/pkg-plist
index aad822e1c7ee..9424aa02ad30 100644
--- a/palm/jpilot/pkg-plist
+++ b/palm/jpilot/pkg-plist
@@ -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