From owner-svn-ports-all@FreeBSD.ORG Fri Dec 27 22:16:48 2013 Return-Path: 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 19966851; Fri, 27 Dec 2013 22:16:48 +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 0548C1454; Fri, 27 Dec 2013 22:16:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRMGlV4048273; Fri, 27 Dec 2013 22:16:47 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRMGlWf048269; Fri, 27 Dec 2013 22:16:47 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312272216.rBRMGlWf048269@svn.freebsd.org> From: Rusmir Dusko Date: Fri, 27 Dec 2013 22:16:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337817 - head/games/lmarbles 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Dec 2013 22:16:48 -0000 Author: nemysis Date: Fri Dec 27 22:16:47 2013 New Revision: 337817 URL: http://svnweb.freebsd.org/changeset/ports/337817 Log: - Change master sites - USES gmake instead of USE_GMAKE - Support STAGEDIR - Add DOCS Option - Change REINPLACE_CMD, change lmarbles.desktop.in - Disable all warnings with -w - Fix permissions and change owner Approved by: pawel / wg (mentors, implicit) Modified: head/games/lmarbles/Makefile head/games/lmarbles/pkg-plist Modified: head/games/lmarbles/Makefile ============================================================================== --- head/games/lmarbles/Makefile Fri Dec 27 22:16:08 2013 (r337816) +++ head/games/lmarbles/Makefile Fri Dec 27 22:16:47 2013 (r337817) @@ -6,7 +6,7 @@ PORTVERSION= 1.0.8 PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/lgames/${PORTNAME} \ - SF/nemysisfreebsdp/:icons + SF/nemysisfreebsdp/${CATEGORIES}/:icons DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}_icons${EXTRACT_SUFX}:icons @@ -15,13 +15,11 @@ COMMENT= Atomix-like game of moving marb LICENSE= GPLv2 +USES= gmake USE_SDL= sdl mixer -USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${ETCDIR} -MAN6= ${PORTNAME}.6 - PORTDOCS= * DOCSRCDIR1= ${WRKSRC} @@ -31,29 +29,29 @@ DOCSRCDIR2= ${WRKSRC}/src/manual DOCSDIR2= ${DOCSDIR}/manual DOC_FILES2= *.jpg *.html -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|(datadir)/icons|(datadir)/pixmaps|g' \ - -e 's|(datadir)/pixmaps/lmarbles32.gif|(datadir)/pixmaps/lmarbles32.png|g' \ - -e 's|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|g' \ + @${REINPLACE_CMD} -e 's|(datadir)/icons|(datadir)/pixmaps|g ; \ + s|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|-m 666||g' \ - -e 's|lmarbles.prfs|lmarbles.prfs.sample|g' \ + @${REINPLACE_CMD} -e 's|@CFLAGS@|@CFLAGS@ -w| ; \ + s|-m 666||g ; \ + s|lmarbles.prfs|lmarbles.prfs.sample|g' \ ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|icons/lmarbles48.gif|icons/lmarbles48.png|' \ + ${WRKSRC}/lmarbles.desktop.in post-install: - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png ${PREFIX}/share/pixmaps/ - @if [ ! -f ${ETCDIR}/lmarbles.prfs ] ; then \ - ${INSTALL_DATA} ${ETCDIR}/lmarbles.prfs.sample ${ETCDIR}/lmarbles.prfs ; \ - fi - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR} - ${MKDIR} ${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2} -.endif + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + + @${CHMOD} -R 464 ${STAGEDIR}${ETCDIR}/lmarbles.prfs.sample + @${CHOWN} root:games ${STAGEDIR}${ETCDIR}/lmarbles.prfs.sample + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} .include Modified: head/games/lmarbles/pkg-plist ============================================================================== --- head/games/lmarbles/pkg-plist Fri Dec 27 22:16:08 2013 (r337816) +++ head/games/lmarbles/pkg-plist Fri Dec 27 22:16:47 2013 (r337817) @@ -1,4 +1,8 @@ bin/lmarbles +@unexec if cmp -s %D/%%ETCDIR%%/lmarbles.prfs.sample %D/%%ETCDIR%%/lmarbles.prfs ; then rm -f %D/%%ETCDIR%%/lmarbles.prfs ; fi +%%ETCDIR%%/lmarbles.prfs.sample +@exec if [ ! -f %D/%%ETCDIR%%/lmarbles.prfs ] ; then cp -p %D/%F %B/lmarbles.prfs ; fi +man/man6/lmarbles.6.gz share/applications/lmarbles.desktop %%DATADIR%%/gfx/board.bmp %%DATADIR%%/gfx/f_red.bmp @@ -75,7 +79,4 @@ share/pixmaps/lmarbles48.png @dirrm %%DATADIR%%/gfx/metal @dirrm %%DATADIR%%/gfx @dirrm %%DATADIR%% -@unexec if cmp -s %D/%%ETCDIR%%/lmarbles.prfs.sample %D/%%ETCDIR%%/lmarbles.prfs ; then rm -f %D/%%ETCDIR%%/lmarbles.prfs ; fi -%%ETCDIR%%/lmarbles.prfs.sample -@exec if [ ! -f %D/%%ETCDIR%%/lmarbles.prfs ] ; then cp -p %D/%F %B/lmarbles.prfs ; fi @dirrmtry %%ETCDIR%%