Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Sep 2013 22:20:49 +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: r328204 - head/games/blockrage
Message-ID:  <201309242220.r8OMKna0090999@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Tue Sep 24 22:20:49 2013
New Revision: 328204
URL: http://svnweb.freebsd.org/changeset/ports/328204

Log:
  - Change maintainer email gmx.ch --> FreeBSD.org
  - Change Desktop entry file
  - Change REINPLACE_CMD, fix build with Clang
  - Mute dir install
  - Change pkg-plist, remove mtree
  
  Approved by:	wg/pawel (mentors)

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

Modified: head/games/blockrage/Makefile
==============================================================================
--- head/games/blockrage/Makefile	Tue Sep 24 22:17:16 2013	(r328203)
+++ head/games/blockrage/Makefile	Tue Sep 24 22:20:49 2013	(r328204)
@@ -10,56 +10,51 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}_icons${EXTRACT_SUFX}:icons
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Falling blocks game with 2-player hotseat mode
 
 LICENSE=	GPLv2
 
+USE_SDL=	sdl image mixer
 GNU_CONFIGURE=	yes
 ALL_TARGET=	${PORTNAME}
-USE_SDL=	sdl image mixer
-
 MAN6=		${PORTNAME}.6
 
 PORTDOCS=	ChangeLog KNOWN_BUGS README TODO
 
-OPTIONS_DEFINE=	DOCS
-
 INSTALLS_ICONS=	yes
 ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
 
 SUB_FILES=	${PORTNAME}
 
-DESKTOP_ENTRIES="Block Rage" "${COMMENT}" \
-		"share/pixmaps/${PORTNAME}.png" \
+DESKTOP_ENTRIES="Block Rage" "${COMMENT}" ${PORTNAME} \
 		"${PORTNAME}" "Game;ArcadeGame;" false
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_SUB+=	PORTDOCS=""
-.else
-PLIST_SUB+=	PORTDOCS="@comment "
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|MYCC=gcc|MYCC=|' \
-	-e 's| -O2 -Wall||' \
+	@${REINPLACE_CMD} \
+	-e 's|prefix=/usr/local|prefix=${PREFIX}|' \
+	-e 's|MYCC=gcc|MYCC?=${CC}|' \
+	-e 's|-s -O2 -Wall||' \
+	-e 's|sdl-config|$(SDL_CONFIG)|' \
+	-e 's|MAKE=make|MAKE=${MAKE}|' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|gcc -s|${CC}|' \
+		${WRKSRC}/src/Makefile.in
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/
-	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
-
 .for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
 .endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
 
-post-install:
 .for s in ${ICON_SIZES}
-	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	@${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps/
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
 		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
@@ -67,7 +62,7 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6/
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 

Modified: head/games/blockrage/pkg-plist
==============================================================================
--- head/games/blockrage/pkg-plist	Tue Sep 24 22:17:16 2013	(r328203)
+++ head/games/blockrage/pkg-plist	Tue Sep 24 22:20:49 2013	(r328204)
@@ -39,18 +39,6 @@ share/icons/hicolor/64x64/apps/blockrage
 share/icons/hicolor/72x72/apps/blockrage.png
 share/icons/hicolor/96x96/apps/blockrage.png
 share/pixmaps/blockrage.png
-@dirrmtry share/icons/hicolor/96x96/apps
-@dirrmtry share/icons/hicolor/96x96
-@dirrmtry share/icons/hicolor/72x72/apps
-@dirrmtry share/icons/hicolor/72x72
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm %%DATADIR%%/data/test
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%



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