svn commit: r401964 - head/deskutils/cdcat

Dmitry Marakasov amdmi3 at FreeBSD.org
Thu Nov 19 20:48:23 UTC 2015


Author: amdmi3
Date: Thu Nov 19 20:48:21 2015
New Revision: 401964
URL: https://svnweb.freebsd.org/changeset/ports/401964

Log:
  - Switch to options helpers
  - Simplify installation

Modified:
  head/deskutils/cdcat/Makefile

Modified: head/deskutils/cdcat/Makefile
==============================================================================
--- head/deskutils/cdcat/Makefile	Thu Nov 19 20:48:13 2015	(r401963)
+++ head/deskutils/cdcat/Makefile	Thu Nov 19 20:48:21 2015	(r401964)
@@ -62,25 +62,27 @@ pre-configure:
 	@${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
 
 do-install:
-	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin)
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}.png \
-		${STAGEDIR}${DATADIR})
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \
+		${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
-	(cd ${BUILD_WRKSRC}/lang && ${INSTALL_DATA} *.qm \
-		${STAGEDIR}${DATADIR}/translations)
+	${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm \
+		${STAGEDIR}${DATADIR}/translations
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}_logo.svg \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps)
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo.svg \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 .for size in 16 22 32 48 64
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}_logo_${size}x${size}.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png)
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo_${size}x${size}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png
 .endfor
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>


More information about the svn-ports-all mailing list