Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Oct 2013 18:58:57 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332273 - head/games/qnetwalk
Message-ID:  <201310311858.r9VIwvRN014560@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Oct 31 18:58:57 2013
New Revision: 332273
URL: http://svnweb.freebsd.org/changeset/ports/332273

Log:
  - Support staging
  - Use upstream installation and don't install unneeded files (1)
  
  Submitted by:	makc (1)

Modified:
  head/games/qnetwalk/Makefile
  head/games/qnetwalk/pkg-plist

Modified: head/games/qnetwalk/Makefile
==============================================================================
--- head/games/qnetwalk/Makefile	Thu Oct 31 18:56:50 2013	(r332272)
+++ head/games/qnetwalk/Makefile	Thu Oct 31 18:58:57 2013	(r332273)
@@ -14,30 +14,24 @@ LICENSE=	GPLv2
 
 USE_QT4=	corelib gui qmake_build moc_build rcc_build
 USE_SDL=	mixer
-
-MAN6=		qnetwalk.6
+DESTDIRNAME=	INSTALL_ROOT
 
 PORTDOCS=	ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/games|$$$${PREFIX}/bin|; \
+		s|/usr/share/man|$$$${PREFIX}/man|; \
+		s|/usr/share|$$$${PREFIX}/share|; \
+		/INSTALLS.*menu/ d' ${WRKSRC}/${PORTNAME}.pro
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "pics sounds translations" ${DATADIR})
-	@${LN} -sf ${DATADIR}/pics/computer2.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-	${INSTALL_DATA} ${WRKSRC}/menu/qnetwalk.desktop ${PREFIX}/share/applications
-
-	${INSTALL_MAN} ${MAN6:S|^|${WRKSRC}/|} ${MAN6PREFIX}/man/man6
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/games/qnetwalk/pkg-plist
==============================================================================
--- head/games/qnetwalk/pkg-plist	Thu Oct 31 18:56:50 2013	(r332272)
+++ head/games/qnetwalk/pkg-plist	Thu Oct 31 18:58:57 2013	(r332273)
@@ -1,60 +1,23 @@
 bin/qnetwalk
+man/man6/qnetwalk.6.gz
 share/applications/qnetwalk.desktop
-share/pixmaps/qnetwalk.png
-%%DATADIR%%/pics/background.png
-%%DATADIR%%/pics/cable0001.png
-%%DATADIR%%/pics/cable0010.png
-%%DATADIR%%/pics/cable0011.png
-%%DATADIR%%/pics/cable0100.png
-%%DATADIR%%/pics/cable0101.png
-%%DATADIR%%/pics/cable0110.png
-%%DATADIR%%/pics/cable0111.png
-%%DATADIR%%/pics/cable1000.png
-%%DATADIR%%/pics/cable1001.png
-%%DATADIR%%/pics/cable1010.png
-%%DATADIR%%/pics/cable1011.png
-%%DATADIR%%/pics/cable1100.png
-%%DATADIR%%/pics/cable1101.png
-%%DATADIR%%/pics/cable1110.png
-%%DATADIR%%/pics/computer1.png
-%%DATADIR%%/pics/computer2.png
-%%DATADIR%%/pics/focus.png
-%%DATADIR%%/pics/highscores.png
-%%DATADIR%%/pics/homepage.png
-%%DATADIR%%/pics/locked.png
-%%DATADIR%%/pics/newgame.png
-%%DATADIR%%/pics/qnetwalk.png
-%%DATADIR%%/pics/quit.png
-%%DATADIR%%/pics/server.png
-%%DATADIR%%/pics/shadow.png
+share/pixmaps/qnetwalk.xpm
 %%DATADIR%%/sounds/click.wav
 %%DATADIR%%/sounds/connect.wav
 %%DATADIR%%/sounds/start.wav
 %%DATADIR%%/sounds/turn.wav
 %%DATADIR%%/sounds/win.wav
 %%DATADIR%%/translations/qnetwalk_de.qm
-%%DATADIR%%/translations/qnetwalk_de.ts
 %%DATADIR%%/translations/qnetwalk_es.qm
-%%DATADIR%%/translations/qnetwalk_es.ts
 %%DATADIR%%/translations/qnetwalk_fr.qm
-%%DATADIR%%/translations/qnetwalk_fr.ts
 %%DATADIR%%/translations/qnetwalk_it.qm
-%%DATADIR%%/translations/qnetwalk_it.ts
 %%DATADIR%%/translations/qnetwalk_nl.qm
-%%DATADIR%%/translations/qnetwalk_nl.ts
 %%DATADIR%%/translations/qnetwalk_pl.qm
-%%DATADIR%%/translations/qnetwalk_pl.ts
 %%DATADIR%%/translations/qnetwalk_pt_BR.qm
-%%DATADIR%%/translations/qnetwalk_pt_BR.ts
 %%DATADIR%%/translations/qnetwalk_ru.qm
-%%DATADIR%%/translations/qnetwalk_ru.ts
 %%DATADIR%%/translations/qnetwalk_tr.qm
-%%DATADIR%%/translations/qnetwalk_tr.ts
 %%DATADIR%%/translations/qnetwalk_ua.qm
-%%DATADIR%%/translations/qnetwalk_ua.ts
 %%DATADIR%%/translations/qnetwalk_zh_CN.qm
-%%DATADIR%%/translations/qnetwalk_zh_CN.ts
 @dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/pics
 @dirrm %%DATADIR%%



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