From owner-svn-ports-head@freebsd.org  Thu Nov 19 20:48:22 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 DD50CA335A5;
 Thu, 19 Nov 2015 20:48:22 +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 8B5C61FD4;
 Thu, 19 Nov 2015 20:48:22 +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 tAJKmLdG081902;
 Thu, 19 Nov 2015 20:48:21 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJKmLKM081901;
 Thu, 19 Nov 2015 20:48:21 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201511192048.tAJKmLKM081901@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 19 Nov 2015 20:48:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r401964 - head/deskutils/cdcat
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Nov 2015 20:48:23 -0000

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>