Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Apr 2016 17:41:13 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413307 - head/misc/gonvert
Message-ID:  <201604141741.u3EHfDoN073589@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Apr 14 17:41:13 2016
New Revision: 413307
URL: https://svnweb.freebsd.org/changeset/ports/413307

Log:
  - 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

Modified:
  head/misc/gonvert/Makefile

Modified: head/misc/gonvert/Makefile
==============================================================================
--- head/misc/gonvert/Makefile	Thu Apr 14 17:13:00 2016	(r413306)
+++ head/misc/gonvert/Makefile	Thu Apr 14 17:41:13 2016	(r413307)
@@ -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>



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