Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2013 20:25:25 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330670 - head/games/netwalk
Message-ID:  <201310172025.r9HKPPR6022054@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Thu Oct 17 20:25:25 2013
New Revision: 330670
URL: http://svnweb.freebsd.org/changeset/ports/330670

Log:
  - Change Makefile header
  - Bump PORTREVISION
  - Change master sites, use supplied icons
  - Recreate tarball, new GH_COMMIT
  - Change maintainer email to @FreeBSD.org
  - USES gmake iconv
  - Support STAGEDIR
  - Add DOCS Option
  - Change REINPLACE_CMD, fix build with Clang
  - Mute dir install
  - Change WWW
  - Use pkg-plist instead of PLIST_FILES and PLIST_DIRS
  
  Approved by:	pawel (mentor)

Added:
  head/games/netwalk/pkg-plist   (contents, props changed)
Modified:
  head/games/netwalk/Makefile
  head/games/netwalk/distinfo   (contents, props changed)
  head/games/netwalk/pkg-descr   (contents, props changed)

Modified: head/games/netwalk/Makefile
==============================================================================
--- head/games/netwalk/Makefile	Thu Oct 17 20:03:24 2013	(r330669)
+++ head/games/netwalk/Makefile	Thu Oct 17 20:25:25 2013	(r330670)
@@ -1,17 +1,12 @@
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	netwalk
 PORTVERSION=	0.4.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	GITHUB \
-		GOOGLE_CODE:icons
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		screenshot-0.4.8.png:icons
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Game where the object is to connect every terminal to the main server
 
 LICENSE=	GPLv3
@@ -20,43 +15,42 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	blynn
 GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	634e7c9
+GH_COMMIT=	cb6b089
 
+USES=		gmake iconv
 USE_SDL=	sdl ttf
-USE_GMAKE=	yes
-USES=		iconv
 USE_XORG=	x11 xau xdmcp
+MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 ALL_TARGET=
 
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-
-PLIST_FILES=	bin/${PORTNAME} \
-		share/netwalk/Vera.ttf \
-		share/pixmaps/${PORTNAME}.png
-PLIST_DIRSTRY=	share/netwalk
-
 PORTDOCS=	README
 
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 96x96 128x128
+
 DESKTOP_ENTRIES="NetWalk" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}" "Game;LogicGame;" "false"
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} \
+	-e 's|CC = gcc|CC = ${CC}|' \
+	-e 's|CFLAGS=-Wall -O2 -fomit-frame-pointer|CFLAGS+= -fomit-frame-pointer|' \
 	-e 's|sdl-config|$(SDL_CONFIG)|' \
-	-e 's|CC=gcc|CC?=g++|' \
-	-e 's|CFLAGS=-Wall -O2 -fomit-frame-pointer|CFLAGS+=-Wall -O2 -fomit-frame-pointer|' \
 	-e 's|PREFIX = /usr|PREFIX = ${PREFIX}|' \
 		${WRKSRC}/Makefile
 
 post-install:
-	${INSTALL_DATA} ${_DISTDIR}/screenshot-0.4.8.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+.for s in ${ICON_SIZES}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
+	${INSTALL_DATA} ${WRKSRC}/icons/${PORTNAME}_${s}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+.endfor
+	${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>

Modified: head/games/netwalk/distinfo
==============================================================================
--- head/games/netwalk/distinfo	Thu Oct 17 20:03:24 2013	(r330669)
+++ head/games/netwalk/distinfo	Thu Oct 17 20:25:25 2013	(r330670)
@@ -1,4 +1,2 @@
-SHA256 (netwalk/netwalk-0.4.10.tar.gz) = b7c5ad78e732e103a6ed820970f90dcf91612a8f0e5608dae58725445cda7df7
-SIZE (netwalk/netwalk-0.4.10.tar.gz) = 71244
-SHA256 (netwalk/screenshot-0.4.8.png) = 3a7c6364c77fbff203758eecb6648f876697d41c3b88e0d759af1ab3238fca22
-SIZE (netwalk/screenshot-0.4.8.png) = 1952
+SHA256 (netwalk-0.4.10.tar.gz) = 7665a282d71a4361ba1aacf40f068fe190d1d99540963cab2b3edff605d5f4b0
+SIZE (netwalk-0.4.10.tar.gz) = 91727

Modified: head/games/netwalk/pkg-descr
==============================================================================
--- head/games/netwalk/pkg-descr	Thu Oct 17 20:03:24 2013	(r330669)
+++ head/games/netwalk/pkg-descr	Thu Oct 17 20:25:25 2013	(r330670)
@@ -5,5 +5,4 @@ also imagine them to be water mains, ele
 In this version, not only must every terminal be connected, but every piece of
 cable must also be connected to the main server somehow.
 
-WWW: https://code.google.com/p/netwalk/
 WWW: https://github.com/blynn/netwalk

Added: head/games/netwalk/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/netwalk/pkg-plist	Thu Oct 17 20:25:25 2013	(r330670)
@@ -0,0 +1,9 @@
+bin/netwalk
+share/icons/hicolor/128x128/apps/netwalk.png
+share/icons/hicolor/32x32/apps/netwalk.png
+share/icons/hicolor/48x48/apps/netwalk.png
+share/icons/hicolor/64x64/apps/netwalk.png
+share/icons/hicolor/96x96/apps/netwalk.png
+%%DATADIR%%/Vera.ttf
+share/pixmaps/netwalk.png
+@dirrm %%DATADIR%%



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