From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 11 13:32:36 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5CB98413;
 Sat, 11 Jan 2014 13:32:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2EFA51334;
 Sat, 11 Jan 2014 13:32:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0BDWZCs069662;
 Sat, 11 Jan 2014 13:32:36 GMT (envelope-from nemysis@svn.freebsd.org)
Received: (from nemysis@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0BDWZWA069661;
 Sat, 11 Jan 2014 13:32:35 GMT (envelope-from nemysis@svn.freebsd.org)
Message-Id: <201401111332.s0BDWZWA069661@svn.freebsd.org>
From: Rusmir Dusko <nemysis@FreeBSD.org>
Date: Sat, 11 Jan 2014 13:32:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339425 - head/games/capicity
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jan 2014 13:32:36 -0000

Author: nemysis
Date: Sat Jan 11 13:32:35 2014
New Revision: 339425
URL: http://svnweb.freebsd.org/changeset/ports/339425

Log:
  - Change Desktop entry file
  - Support STAGEDIR

Modified:
  head/games/capicity/Makefile

Modified: head/games/capicity/Makefile
==============================================================================
--- head/games/capicity/Makefile	Sat Jan 11 12:51:31 2014	(r339424)
+++ head/games/capicity/Makefile	Sat Jan 11 13:32:35 2014	(r339425)
@@ -31,8 +31,8 @@ PORTDOCS=	README changelog
 INSTALLS_ICONS=	yes
 ICON_SIZES=	16x16 22x22 24x24 32x32 48x48 64x64
 
-DESKTOP_ENTRIES="Capi City" "${COMMENT}" "${PORTNAME}" \
-		"${PORTNAME}" "Game;BoardGame;" false
+DESKTOP_ENTRIES="Capi City" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;BoardGame;" ""
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
@@ -40,30 +40,29 @@ OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/CapiCity ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/CapiCity \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .for d in games images
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 
 .if ${PORT_OPTIONS:MNLS}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ts ${DATADIR})
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ts ${STAGEDIR}${DATADIR})
 .endif
 
 .for s in ${ICON_SIZES}
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/icons/${s}.png \
-		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>