- Utilize option helper targets and drop unneeded newline and include of

  <bsd.port.options.mk>
- Do not attempt to create ${STAGEDIR}${DESKTOPDIR}: `share/applications'
  was added to mtree (Templates/BSD.local.dist) in r331266 2.5 years ago

1 files changed, 5 insertions, 9 deletions

diff --git a/misc/gonvert/Makefile b/misc/gonvert/Makefile
index 7b436a42868d..7747f088de31 100644
--- a/misc/gonvert/Makefile
+++ b/misc/gonvert/Makefile
@@ -18,14 +18,11 @@ NO_BUILD=	yes
 PORTDOCS=	CHANGELOG FAQ README THANKS
 
 OPTIONS_DEFINE=	DOCS NLS
-
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!/usr/bin/env python|g ; \
 		 s|/usr/share|${PREFIX}/share|g ; \
@@ -33,7 +30,6 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.glade ${STAGEDIR}${DATADIR}
@@ -41,13 +37,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png ${STAGEDIR}${DATADIR}/pixmaps/
 	${LN} -sf ${DATADIR}/pixmaps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MNLS}
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
+
+do-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/pl/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/i18n/pl_messages.gmo \
 		${STAGEDIR}${PREFIX}/share/locale/pl/LC_MESSAGES/gonvert.mo
-.endif
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>