Date: Wed, 25 Sep 2013 09:46:54 -0700 From: Jason Helfman <jgh@FreeBSD.org> To: William Grzybowski <william88@gmail.com> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, Rusmir Dusko <nemysis@freebsd.org>, Jason Helfman <jgh@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r328299 - head/games/bubble-chains Message-ID: <CAMuy=%2BgjrLMv0Nq2TvdEB8R6aXMt4c%2B=OGSFS5=sRqFY%2BbqCdA@mail.gmail.com> In-Reply-To: <CAHtVNLM31UUq24F-2My6fe2WuqcLid=KNDEeUj7p5qDthqLVhw@mail.gmail.com> References: <201309251631.r8PGVQug087427@svn.freebsd.org> <CAMuy=%2BhehaRqp4hduyW1JibTQUuE%2B4EA7AQFDpPJEZasKcZc2g@mail.gmail.com> <CAHtVNLM31UUq24F-2My6fe2WuqcLid=KNDEeUj7p5qDthqLVhw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Great, thanks. Additionally, is there any reason why staging isn't being supported in recent commits? -jgh On Wed, Sep 25, 2013 at 9:43 AM, William Grzybowski <william88@gmail.com>wrote: > On Wed, Sep 25, 2013 at 1:36 PM, Jason Helfman <jgh@freebsd.org> wrote: > > You removed NO_STAGE, but are not supporting staging. This should be put > > back or fixed. > > Indeed, the patch he sent us did not have NO_STAGE removed, I'll talk to > him. > Sorry about that. > > > On Wed, Sep 25, 2013 at 9:31 AM, Rusmir Dusko <nemysis@freebsd.org> > wrote: > >> > >> Author: nemysis > >> Date: Wed Sep 25 16:31:26 2013 > >> New Revision: 328299 > >> URL: http://svnweb.freebsd.org/changeset/ports/328299 > >> > >> Log: > >> - Change Makefile header > >> - Change maintainer email to @FreeBSD.org > >> - Add USE_DOS2UNIX > >> - Change Desktop entry file > >> - Add DOCS Option > >> - Add post-configure, fix build with Clang > >> - Mute dir install > >> > >> Approved by: wg/pawel (mentors) > >> > >> Modified: > >> head/games/bubble-chains/Makefile > >> > >> Modified: head/games/bubble-chains/Makefile > >> > >> > ============================================================================== > >> --- head/games/bubble-chains/Makefile Wed Sep 25 16:05:48 2013 > >> (r328298) > >> +++ head/games/bubble-chains/Makefile Wed Sep 25 16:31:26 2013 > >> (r328299) > >> @@ -1,4 +1,4 @@ > >> -# Created by: nemysis@gmx.ch > >> +# Created by: nemysis <nemysis@gmx.ch> > >> # $FreeBSD$ > >> > >> PORTNAME= bubble-chains > >> @@ -9,7 +9,7 @@ MASTER_SITES= http://bubble-chains.sinte > >> DISTNAME= chains-${DISTVERSION} > >> EXTRACT_SUFX= -src.7z > >> > >> -MAINTAINER= nemysis@gmx.ch > >> +MAINTAINER= nemysis@FreeBSD.org > >> COMMENT= The aim is to remove all of the targets on each level > >> > >> LICENSE= GPLv2 > >> @@ -22,17 +22,17 @@ WRKSRC= ${WRKDIR}/chains-${PORTVERSION} > >> USE_SDL= sdl image mixer > >> USE_GL= glut glew glu > >> USE_XORG= xrandr > >> +USE_DOS2UNIX= *.pro *.cpp *.h *.ui *.ui *.rc *.htm *.dat *.css > >> USE_QT4= moc_build qmake_build rcc_build uic_build iconengines > >> imageformats \ > >> corelib svg xml opengl network > >> > >> - > >> PORTDOCS= README > >> > >> -DESKTOP_ENTRIES="Bubble Chains" "${COMMENT}" \ > >> - "${PREFIX}/share/pixmaps/${PORTNAME}.png" \ > >> +DESKTOP_ENTRIES="Bubble Chains" "${COMMENT}" "${PORTNAME}" \ > >> "${PORTNAME}" "Game;ArcadeGame;" false > >> > >> -NO_STAGE= yes > >> +OPTIONS_DEFINE= DOCS > >> + > >> .include <bsd.port.options.mk> > >> > >> P7ZIP_CMD= ${LOCALBASE}/bin/7z > >> @@ -50,6 +50,11 @@ do-configure: > >> @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ > >> ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} > >> > >> +post-configure: > >> + @${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS ?=|' \ > >> + -e 's|CXXFLAGS =|CXXFLAGS ?=|' \ > >> + ${WRKSRC}/Makefile > >> + > >> do-install: > >> ${INSTALL_PROGRAM} ${WRKSRC}/bin/chains > ${PREFIX}/bin/${PORTNAME} > >> @(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR}) > >> @@ -60,7 +65,7 @@ do-install: > >> ${PREFIX}/share/pixmaps/${PORTNAME}.ico > >> > >> .if ${PORT_OPTIONS:MDOCS} > >> - ${MKDIR} ${DOCSDIR} > >> + @${MKDIR} ${DOCSDIR} > >> ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} > >> .endif > >> > >> > > > > > > > > -- > > Jason Helfman | FreeBSD Committer > > jgh@FreeBSD.org | http://people.freebsd.org/~jgh | The Power to > Serve > > > > -- > William Grzybowski > ------------------------------------------ > Curitiba/PR - Brasil > > -- Jason Helfman | FreeBSD Committer jgh@FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMuy=%2BgjrLMv0Nq2TvdEB8R6aXMt4c%2B=OGSFS5=sRqFY%2BbqCdA>