From owner-svn-ports-all@freebsd.org Sat Apr 16 08:58:18 2016 Return-Path: Delivered-To: svn-ports-all@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 ABAC5B10BF5; Sat, 16 Apr 2016 08:58:18 +0000 (UTC) (envelope-from danfe@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 584E210A0; Sat, 16 Apr 2016 08:58:18 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3G8wH5C002334; Sat, 16 Apr 2016 08:58:17 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3G8wHYY002333; Sat, 16 Apr 2016 08:58:17 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201604160858.u3G8wHYY002333@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 16 Apr 2016 08:58:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413420 - head/net/x2goclient X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Apr 2016 08:58:18 -0000 Author: danfe Date: Sat Apr 16 08:58:17 2016 New Revision: 413420 URL: https://svnweb.freebsd.org/changeset/ports/413420 Log: - Remove INSTALLS_ICONS knob (not to be used for Qt-based programs) - Do not attempt to create ${STAGEDIR}${DESKTOPDIR}: `share/applications' was added to mtree (Templates/BSD.local.dist) in r331266 2.5 years ago - Stop cd'ing when operating on a single argument for better readability and not having to request a sub-shell for every install recipe command Modified: head/net/x2goclient/Makefile Modified: head/net/x2goclient/Makefile ============================================================================== --- head/net/x2goclient/Makefile Sat Apr 16 08:47:00 2016 (r413419) +++ head/net/x2goclient/Makefile Sat Apr 16 08:58:17 2016 (r413420) @@ -24,7 +24,6 @@ USE_XORG= xpm USE_QT4= gui network svg \ linguisttools_build moc_build rcc_build uic_build QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}" -INSTALLS_ICONS= yes OPTIONS_DEFINE= DOCS LDAP OPTIONS_DEFAULT= LDAP @@ -46,28 +45,26 @@ pre-build: @(cd ${WRKSRC} && ${DO_MAKE_BUILD} compiler_TSQM_make_all) do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} x2goclient \ - ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} x2goclient.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1) - @${MKDIR} ${STAGEDIR}${DESKTOPDIR} - (cd ${WRKSRC}/desktop && ${INSTALL_DATA} x2goclient.desktop \ - ${STAGEDIR}${DESKTOPDIR}) + ${INSTALL_PROGRAM} ${WRKSRC}/x2goclient ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/man1/x2goclient.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/desktop/x2goclient.desktop \ + ${STAGEDIR}${DESKTOPDIR} .for i in 16x16 32x32 48x48 64x64 128x128 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps - (cd ${WRKSRC}/res/img/icons/${i} && ${INSTALL_DATA} x2goclient.png \ - ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps) + ${INSTALL_DATA} ${WRKSRC}/res/img/icons/${i}/x2goclient.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/icons - (cd ${WRKSRC}/res/img/icons && ${INSTALL_DATA} x2goclient.xpm \ - ${STAGEDIR}${DATADIR}/icons) + ${INSTALL_DATA} ${WRKSRC}/res/img/icons/x2goclient.xpm \ + ${STAGEDIR}${DATADIR}/icons .for i in x2goclient.png x2gosession.png - (cd ${WRKSRC}/res/img/icons/128x128 && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${DATADIR}/icons) + ${INSTALL_DATA} ${WRKSRC}/res/img/icons/128x128/${i} \ + ${STAGEDIR}${DATADIR}/icons .endfor post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR} .include