Date: Sun, 27 Oct 2013 22:12:38 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Rusmir Dusko <nemysis@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r331825 - in head: audio/musescore audio/zynaddsubfx games/glob2 games/glob2/files Message-ID: <526DD626.1030507@FreeBSD.org> In-Reply-To: <201310280303.r9S33kTl055281@svn.freebsd.org> References: <201310280303.r9S33kTl055281@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --BadQqJecjirPhcLxXCMhfKkRLhcGt0hoM Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Why commit 3 different updates at once? These look unrelated and should be 3 commits. On 10/27/2013 10:03 PM, Rusmir Dusko wrote: > Author: nemysis > Date: Mon Oct 28 03:03:46 2013 > New Revision: 331825 > URL: http://svnweb.freebsd.org/changeset/ports/331825 >=20 > Log: > audio/musescore > =20 > - Bump PORTREVISION for dependency change > - Fix portaudio2 dependency due to recent commit > - Use the new format for LIB_DEPENDS > - Support STAGEDIR and add OPTIONS_SUB > - Add DOCS and Option > =20 > audio/zynaddsubfx > =20 > - Bump PORTREVISION for dependency change > - Fix portaudio2 dependency due to recent commit > - Use the new format for LIB_DEPENDS > - Add DOCS and EXAMPLES Options > - Change DOCS > - Support STAGEDIR and add OPTIONS_SUB > - Change pkg-plist, remove DOCS and EXAMPLES > =20 > games/glob2 > =20 > - Simplify master sites > - Bump PORTREVISION for dependency change > - Fix portaudio2 dependency due to recent commit > - Change comment > - Use the new format for LIB_DEPENDS > - Add DOCS and Option > - Change icons > - Use REINPLACE_CMD instead of files/patch-src_VoiceRecorder.cpp > - Adjust patches > - Change pkg-message > =20 > Approved by: pawel / wg (mentors, implicit) >=20 > Added: > head/games/glob2/files/patch-data__SConscript (contents, props chan= ged) > head/games/glob2/files/patch-src__ConfigFiles.h (contents, props ch= anged) > head/games/glob2/files/pkg-message.in (contents, props changed) > Deleted: > head/games/glob2/files/patch-src_ConfigFiles.h > head/games/glob2/files/patch-src_VoiceRecorder.cpp > head/games/glob2/pkg-message > Modified: > head/audio/musescore/Makefile > head/audio/zynaddsubfx/Makefile > head/audio/zynaddsubfx/pkg-plist > head/games/glob2/Makefile > head/games/glob2/files/patch-SConstruct > head/games/glob2/pkg-plist >=20 > Modified: head/audio/musescore/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/audio/musescore/Makefile Mon Oct 28 02:11:12 2013 (r331824) > +++ head/audio/musescore/Makefile Mon Oct 28 03:03:46 2013 (r331825) > @@ -3,8 +3,9 @@ > =20 > PORTNAME=3D musescore > PORTVERSION=3D 1.3 > +PORTREVISION=3D 1 > CATEGORIES=3D audio > -MASTER_SITES=3D SF/mscore/mscore/MuseScore-${PORTVERSION} > +MASTER_SITES=3D SF/mscore/mscore/MuseScore-${PORTVERSION}/ > DISTNAME=3D mscore-${PORTVERSION} > =20 > MAINTAINER=3D ports@FreeBSD.org > @@ -13,14 +14,10 @@ COMMENT=3D Free music composition & notati > LICENSE=3D GPLv2 > =20 > BUILD_DEPENDS=3D qtscriptgenerator>0:${PORTSDIR}/devel/qtscriptgenerat= or > -LIB_DEPENDS=3D sndfile:${PORTSDIR}/audio/libsndfile > +LIB_DEPENDS=3D libsndfile.so:${PORTSDIR}/audio/libsndfile > RUN_DEPENDS=3D qtscriptgenerator>0:${PORTSDIR}/devel/qtscriptgenerator= > =20 > -OPTIONS_DEFINE=3D JACK PORTAUDIO > -OPTIONS_DEFAULT=3DPORTAUDIO > - > USE_BZIP2=3D yes > -NO_STAGE=3D yes > USES=3D cmake:outsource > USE_QT4=3D corelib designer gui network script scripttools svg webkit = xml \ > linguist_build moc_build qmake_build rcc_build uic_build > @@ -31,22 +28,21 @@ MAKE_JOBS_UNSAFE=3D yes > =20 > DATADIR=3D ${PREFIX}/share/mscore-${PORTVERSION} > =20 > -.include <bsd.port.options.mk> > +PORTDOCS=3D ChangeLog NEWS README README.scripts > + > +OPTIONS_DEFINE=3D DOCS JACK PORTAUDIO > +OPTIONS_DEFAULT=3DPORTAUDIO > + > +OPTIONS_SUB=3D yes > =20 > -.if ${PORT_OPTIONS:MJACK} > -LIB_DEPENDS+=3D jack:${PORTSDIR}/audio/jack > -CMAKE_ARGS+=3D -DBUILD_JACK:BOOL=3DON > -.else > -CMAKE_ARGS+=3D -DBUILD_JACK:BOOL=3DOFF > -.endif > - > -.if ${PORT_OPTIONS:MPORTAUDIO} > -BUILD_DEPENDS+=3D portaudio>=3D19:${PORTSDIR}/audio/portaudio2 > -RUN_DEPENDS+=3D portaudio>=3D19:${PORTSDIR}/audio/portaudio2 > -CMAKE_ARGS+=3D -DBUILD_PORTAUDIO:BOOL=3DON > -.else > -CMAKE_ARGS+=3D -DBUILD_PORTAUDIO:BOOL=3DOFF > -.endif > +JACK_LIB_DEPENDS=3D libjack.so:${PORTSDIR}/audio/jack > +JACK_CMAKE_ON=3D -DBUILD_JACK:BOOL=3DON > +JACK_CMAKE_OFF=3D -DBUILD_JACK:BOOL=3DOFF > + > +PORTAUDIO_BUILD_DEPENDS=3Dportaudio2>=3D0:${PORTSDIR}/audio/portaudio2= > +PORTAUDIO_RUN_DEPENDS=3D portaudio2>=3D0:${PORTSDIR}/audio/portaudio2 > +PORTAUDIO_CMAKE_ON=3D -DBUILD_PORTAUDIO:BOOL=3DON > +PORTAUDIO_CMAKE_OFF=3D -DBUILD_PORTAUDIO:BOOL=3DOFF > =20 > post-patch: > @${FIND} ${WRKSRC} -name "CMakeLists.txt" -print0 | ${XARGS} -0 \ > @@ -58,4 +54,8 @@ post-patch: > @${ECHO_CMD} >> ${WRKSRC}/mscore/mscore/${file} > .endfor > =20 > +post-install: > + @${MKDIR} ${STAGEDIR}${DOCSDIR} > + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/mscore/|} ${STAGEDIR}${DOCSD= IR} > + > .include <bsd.port.mk> >=20 > Modified: head/audio/zynaddsubfx/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/audio/zynaddsubfx/Makefile Mon Oct 28 02:11:12 2013 (r331824) > +++ head/audio/zynaddsubfx/Makefile Mon Oct 28 03:03:46 2013 (r331825) > @@ -3,6 +3,7 @@ > =20 > PORTNAME=3D zynaddsubfx > PORTVERSION=3D 2.4.3 > +PORTREVISION=3D 1 > CATEGORIES=3D audio > MASTER_SITES=3D SF > DISTNAME=3D ZynAddSubFX-${PORTVERSION} > @@ -15,8 +16,11 @@ LICENSE=3D GPLv2 > LIB_DEPENDS=3D fftw3:${PORTSDIR}/math/fftw3 \ > mxml:${PORTSDIR}/textproc/mxml > =20 > -OPTIONS_DEFINE=3D GUI LASH LO JACK PORTAUDIO DOCS EXAMPLES > -OPTIONS_DEFAULT=3D GUI > +USE_BZIP2=3D yes > +USES=3D cmake pkgconfig > + > +OPTIONS_DEFINE=3D DOCS EXAMPLES GUI LASH LO JACK PORTAUDIO > +OPTIONS_DEFAULT=3D GUI PORTAUDIO > OPTIONS_RADIO=3D AUDIO > OPTIONS_RADIO_AUDIO=3D ALSAMIDI DSSI > OPTIONS_SUB=3D yes > @@ -25,32 +29,50 @@ ALSAMIDI_DESC=3D MIDI input through ALSA > DSSI_DESC=3D DSSI Plugin > LO_DESC=3D Open Sound Control support via LibLO > =20 > +ALSAMIDI_LIB_DEPENDS=3D libasound.so:${PORTSDIR}/audio/alsa-lib > ALSAMIDI_CMAKE_OFF=3D -DAlsaEnable:BOOL=3DOFF > -ALSAMIDI_LIB_DEPENDS=3D asound:${PORTSDIR}/audio/alsa-lib > + > +DSSI_LIB_DEPENDS=3D libdssialsacompat.so:${PORTSDIR}/audio/libdssials= acompat > DSSI_BUILD_DEPENDS=3D dssi>0:${PORTSDIR}/audio/dssi > +DSSI_RUN_DEPENDS=3D dssi>0:${PORTSDIR}/audio/dssi > DSSI_CFLAGS=3D -I${LOCALBASE}/include/dssi > DSSI_CMAKE_OFF=3D -DDssiEnable:BOOL=3DOFF > -DSSI_LIB_DEPENDS=3D dssialsacompat:${PORTSDIR}/audio/libdssialsacompa= t > -DSSI_RUN_DEPENDS=3D dssi>0:${PORTSDIR}/audio/dssi > -GUI_CMAKE_OFF=3D -DGuiModule:STRING=3DOFF > -GUI_LIB_DEPENDS=3D fltk:${PORTSDIR}/x11-toolkits/fltk > + > +GUI_LIB_DEPENDS=3D libfltk.so:${PORTSDIR}/x11-toolkits/fltk > GUI_ON=3D -DGuiModule:STRING=3Dfltk > -JACK_CMAKE_OFF=3D -DJackEnable:BOOL=3DOFF > -JACK_LIB_DEPENDS=3D jack:${PORTSDIR}/audio/jack > -LASH_CMAKE_OFF=3D -DLashEnabe:BOOL=3DOFF > -LASH_LIB_DEPENDS=3D lash:${PORTSDIR}/audio/lash > +GUI_CMAKE_OFF=3D -DGuiModule:STRING=3DOFF > + > +LO_LIB_DEPENDS=3D liblo.so:${PORTSDIR}/audio/liblo > LO_CMAKE_OFF=3D -DLibloEnable:BOOL=3DOFF > -LO_LIB_DEPENDS=3D lo:${PORTSDIR}/audio/liblo > -PORTAUDIO_BUILD_DEPENDS=3D portaudio>=3D19:${PORTSDIR}/audio/portaudio= 2 > + > +LASH_LIB_DEPENDS=3D liblash.so:${PORTSDIR}/audio/lash > +LASH_CMAKE_OFF=3D -DLashEnabe:BOOL=3DOFF > + > +JACK_LIB_DEPENDS=3D libjack.so:${PORTSDIR}/audio/jack > +JACK_CMAKE_OFF=3D -DJackEnable:BOOL=3DOFF > + > +PORTAUDIO_BUILD_DEPENDS=3D portaudio2>=3D0:${PORTSDIR}/audio/portaudio= 2 > +PORTAUDIO_RUN_DEPENDS=3D portaudio2>=3D0:${PORTSDIR}/audio/portaudio2= > PORTAUDIO_CFLAGS=3D -I${LOCALBASE}/include/portaudio2 > PORTAUDIO_CMAKE_OFF=3D -DPaEnabe:BOOL=3DOFF > PORTAUDIO_LDFLAGS=3D ${LOCALBASE}/lib/portaudio2/libportaudio.so > -PORTAUDIO_RUN_DEPENDS=3D portaudio>=3D19:${PORTSDIR}/audio/portaudio2= > =20 > -USE_BZIP2=3D yes > -USES=3D cmake pkgconfig > +PORTDOCS=3D * > + > +DOCSRCDIR1=3D ${WRKSRC} > +DOC_FILES1=3D AUTHORS.txt ChangeLog FAQ.txt HISTORY.txt README.txt > + > +DOCSRCDIR2=3D ${WRKSRC}/doc > +DOCSDIR2=3D ${DOCSDIR}/doc > +DOC_FILES2=3D adsynth.txt controller.txt envelope.txt filter.txt intro= =2Etxt \ > + lfo.txt mididefaults.txt nrpn.txt saving.txt zynaddsubfx.txt > + > +DOCSRCDIR3=3D ${WRKSRC}/doc/images > +DOCSDIR3=3D ${DOCSDIR}/doc/images > +DOC_FILES3=3D *.png *.jpg > + > +PORTEXAMPLES=3D * > =20 > -.include <bsd.port.options.mk> > .include <bsd.port.pre.mk> > =20 > .if ${ARCH} =3D=3D "ia64" || ${ARCH} =3D=3D "powerpc" || ${ARCH} =3D=3D= "sparc64" > @@ -72,19 +94,23 @@ post-patch: > /-g #/d ; \ > /pthread/d ; \ > s|lib64|lib|' ${WRKSRC}/src/CMakeLists.txt > - @${REINPLACE_CMD} -e \ > - 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src/Misc/Config.cpp > + @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src/Misc/C= onfig.cpp > + @${REINPLACE_CMD} -e 's|portaudio.h|portaudio2/portaudio.h|' ${WRKSRC= }/src/Nio/PaEngine.h > + > =20 > post-install: > ${MKDIR} ${STAGEDIR}${DATADIR}/banks > (cd ${WRKDIR}/${DISTNAME}/instruments/banks \ > && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/banks) > - ${MKDIR} ${STAGEDIR}${DOCSDIR} > -.for i in AUTHORS.txt FAQ.txt HISTORY.txt README.txt > - (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) > -.endfor > - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > - (cd ${WRKDIR}/${DISTNAME}/instruments/examples \ > - && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR}) > + > + @${MKDIR} ${STAGEDIR}${DOCSDIR} > + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDI= R} > + @${MKDIR} ${STAGEDIR}${DOCSDIR2} > + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDI= R2} > + @${MKDIR} ${STAGEDIR}${DOCSDIR3} > + ${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDI= R3} > + > + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > + @(cd ${WRKSRC}/instruments/examples && ${COPYTREE_SHARE} . ${STAGEDIR= }${EXAMPLESDIR}) > =20 > .include <bsd.port.post.mk> >=20 > Modified: head/audio/zynaddsubfx/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/audio/zynaddsubfx/pkg-plist Mon Oct 28 02:11:12 2013 (r331824)= > +++ head/audio/zynaddsubfx/pkg-plist Mon Oct 28 03:03:46 2013 (r331825)= > @@ -451,52 +451,6 @@ bin/zynaddsubfx > %%DATADIR%%/banks/SynthPiano/0069-Synth Piano 3 det.xiz > %%DATADIR%%/banks/SynthPiano/0070-Synth Piano 4.xiz > %%DATADIR%%/banks/SynthPiano/0071-Synth Piano 5.xiz > -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt > -%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt > -%%PORTDOCS%%%%DOCSDIR%%/HISTORY.txt > -%%PORTDOCS%%%%DOCSDIR%%/README.txt > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/0km.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 1.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 2.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 3.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 4.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 5.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 6.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio Dist 1.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio Dist 2.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio Flange 1.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio Flange 2.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Choir Reeds.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Choir Strings SynthBrass.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dist Guitar Strings 1.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dist Guitar Strings 2.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Drop.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Fantasy 1.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Fantasy 2.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Glass Choir.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/HighPass Saw Strings.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Ice Rhodes Strings.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/JI12.xsz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Legatto 1.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Legatto 2.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Legatto Strings.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Octave Strings.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Organ Choir Strings.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Saw.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Space 1.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Space 2.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Split_keyboard.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/String Reverb.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strings Reeds 1.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strings Reeds 2.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Struck String Big Reverb 1.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Struck String Big Reverb 2.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Supersaw.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Synth Bells Choir Reverb.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Synth Piano Reverb.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Synth.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bent_synth.xmz > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/photons.xmz > @dirrm %%DATADIR%%/banks/SynthPiano > @dirrm %%DATADIR%%/banks/Synth > @dirrm %%DATADIR%%/banks/Strings > @@ -519,5 +473,3 @@ bin/zynaddsubfx > @dirrm %%DATADIR%%/banks/Arpeggios > @dirrm %%DATADIR%%/banks > @dirrm %%DATADIR%% > -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% > -%%PORTDOCS%%@dirrm %%DOCSDIR%% >=20 > Modified: head/games/glob2/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/games/glob2/Makefile Mon Oct 28 02:11:12 2013 (r331824) > +++ head/games/glob2/Makefile Mon Oct 28 03:03:46 2013 (r331825) > @@ -1,44 +1,60 @@ > # Created by: thierry@pompo.net > # $FreeBSD$ > =20 > -PORTNAME=3D glob2 > -PORTVERSION=3D 0.9.4.4 > -PORTREVISION=3D 5 > -CATEGORIES=3D games > -MASTER_SITES=3D ${MASTER_SITE_SAVANNAH} > -MASTER_SITE_SUBDIR=3D ${PORTNAME}/${PORTVERSION:R} > - > -MAINTAINER=3D ports@FreeBSD.org > -COMMENT=3D Globulation 2 - a free and innovative strategy game > - > -LIB_DEPENDS=3D vorbis.4:${PORTSDIR}/audio/libvorbis \ > - speex.1:${PORTSDIR}/audio/speex \ > - fribidi.3:${PORTSDIR}/converters/fribidi \ > - boost_thread:${PORTSDIR}/devel/boost-libs \ > - freetype.9:${PORTSDIR}/print/freetype2 > +PORTNAME=3D glob2 > +PORTVERSION=3D 0.9.4.4 > +PORTREVISION=3D 6 > +CATEGORIES=3D games > +MASTER_SITES=3D SAVANNAH/${PORTNAME}/${PORTVERSION:R}/ > + > +MAINTAINER=3D ports@FreeBSD.org > +COMMENT=3D Globulation 2, free and innovative strategy game > + > +LICENSE=3D GPLv3 > + > +LIB_DEPENDS=3D libvorbis.so:${PORTSDIR}/audio/libvorbis \ > + libspeex.so:${PORTSDIR}/audio/speex \ > + libfribidi.so:${PORTSDIR}/converters/fribidi \ > + libboost_thread.so:${PORTSDIR}/devel/boost-libs \ > + libfreetype.so:${PORTSDIR}/print/freetype2 > # Should work with portaudio v19_20071207 > # Can be built with portaudio2 but does not run cleanly > -#LIB_DEPENDS+=3D portaudio.2:${PORTSDIR}/audio/portaudio2 > +#LIB_DEPENDS+=3D libportaudio.so:${PORTSDIR}/audio/portaudio2 > =20 > -USE_SDL=3D image net sdl ttf > -USE_GL=3D gl > -USE_GMAKE=3D yes > -USE_SCONS=3D yes > -#SCONS_ARGS=3D --portaudio=3Dtrue > -INSTALLS_ICONS=3D yes > -SCONS_BUILDENV=3D ${SCONS_ENV} > -#CFLAGS+=3D ${PTHREAD_CFLAGS} -I. `pkg-config --cflags portaudio-2.0`= -I${LOCALBASE}/include > -CFLAGS+=3D ${PTHREAD_CFLAGS} -I. -I${LOCALBASE}/include > -#LINKFLAGS=3D ${PTHREAD_LIBS} `pkg-config --libs portaudio-2.0` -L${L= OCALBASE}/lib > -LINKFLAGS=3D ${PTHREAD_LIBS} -L${LOCALBASE}/lib > - > -LICENSE=3D GPLv3 > - > -NO_STAGE=3D yes > -post-install: > - @${ECHO_MSG} > - @${CAT} ${PKGMESSAGE} > - @${ECHO_MSG} > +USES=3D gmake > +USE_SDL=3D image net sdl ttf > +USE_GL=3D gl > +USE_SCONS=3D yes > +#SCONS_ARGS+=3D --portaudio=3Dtrue > +#SCONS_BUILDENV=3D ${SCONS_ENV} > +SCONS_ARGS=3D CXXFLAGS+=3D" -g -pg" INSTALLDIR=3D"${STAGEDIR}${PREFIX}= /share" > +CFLAGS+=3D -Wno-return-type > + > +INSTALLS_ICONS=3D yes > +ICON_SIZES=3D 16x16 24x24 32x32 48x48 64x64 128x128 > + > +#CFLAGS+=3D ${PTHREAD_CFLAGS} -I. `pkg-config --cflags portaudio-2.0` = -I${LOCALBASE}/include > +CFLAGS+=3D ${PTHREAD_CFLAGS} -I. -I${LOCALBASE}/include > +#LINKFLAGS=3D ${PTHREAD_LIBS} `pkg-config --libs portaudio-2.0` -L${LO= CALBASE}/lib > +LINKFLAGS=3D ${PTHREAD_LIBS} -L${LOCALBASE}/lib > + > +PORTDOCS=3D README > + > +OPTIONS_DEFINE=3D DOCS > + > +SUB_FILES=3D pkg-message > + > +post-patch: > + @${REINPLACE_CMD} -e 's|/usr/local/bin|${STAGEDIR}${PREFIX}/bin|' \ > + ${WRKSRC}/SConstruct > + @${REINPLACE_CMD} -e 's|portaudio.h|portaudio2/portaudio.h|' ${WRKSRC= }/src/VoiceRecorder.cpp > + @${REINPLACE_CMD} -e 's|^Icon.*|Icon=3D${PORTNAME}|' \ > + ${WRKSRC}/data/${PORTNAME}.desktop > + > +.for s in 16 24 32 48 64 128 > + @cd ${WRKSRC}/data/icons && \ > + ${MV} glob2-icon-${s}x${s}.png ${PORTNAME}_${s}x${s}.png > +.endfor > =20 > manual-regression-test: > # Don't enable these tests on pointyhat, they take too long. > @@ -48,4 +64,16 @@ manual-regression-test: > (cd ${WRKSRC}/src && ./glob2 -test-games-nox) > .endif > =20 > +post-install: > +.for s in ${ICON_SIZES} > + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ > + ${INSTALL_DATA} ${WRKSRC}/data/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/ > + > + @${MKDIR} ${STAGEDIR}${DOCSDIR} > + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} > + > .include <bsd.port.mk> >=20 > Modified: head/games/glob2/files/patch-SConstruct > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/games/glob2/files/patch-SConstruct Mon Oct 28 02:11:12 2013 (r= 331824) > +++ head/games/glob2/files/patch-SConstruct Mon Oct 28 03:03:46 2013 (r= 331825) > @@ -1,5 +1,5 @@ > ---- SConstruct.orig 2009-08-30 19:23:30.000000000 +0000 > -+++ SConstruct 2013-01-28 16:42:04.024490217 +0000 > +--- ./SConstruct.orig 2009-08-30 21:23:30.000000000 +0200 > ++++ ./SConstruct 2013-10-28 02:21:28.000000000 +0100 > @@ -14,6 +14,7 @@ > =20 > def establish_options(env): > @@ -8,6 +8,21 @@ > opts.Add("CXXFLAGS", "Manually add to the CXXFLAGS", "-g") > opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "-g") > if isDarwinPlatform: > +@@ -22,10 +23,10 @@ > + opts.Add("INSTALLDIR", "Installation Directory", "/usr/local/sha= re") > + opts.Add("BINDIR", "Binary Installation Directory", "/usr/local/b= in") > + opts.Add("DATADIR", "Directory where data will be put, set to the= same as INSTALLDIR", "/usr/local/share") > +- opts.Add(BoolOption("release", "Build for release", 0)) > +- opts.Add(BoolOption("profile", "Build with profiling on", 0)) > +- opts.Add(BoolOption("mingw", "Build with mingw enabled if not aut= o-detected", 0)) > +- opts.Add(BoolOption("server", "Build only the YOG server, excludi= ng the game and any GUI/sound components", 0)) > ++ opts.Add(BoolVariable("release", "Build for release", 0)) > ++ opts.Add(BoolVariable("profile", "Build with profiling on", 0)) > ++ opts.Add(BoolVariable("mingw", "Build with mingw enabled if not a= uto-detected", 0)) > ++ opts.Add(BoolVariable("server", "Build only the YOG server, exclu= ding the game and any GUI/sound components", 0)) > + opts.Add("font", "Build the game using an alternative font placed= in the data/font folder", "sans.ttf") > + Help(opts.GenerateHelpText(env)) > + opts.Update(env) > @@ -111,14 +112,17 @@ > missing.append("zlib") > =20 >=20 > Added: head/games/glob2/files/patch-data__SConscript > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/games/glob2/files/patch-data__SConscript Mon Oct 28 03:03:46 2= 013 (r331825) > @@ -0,0 +1,9 @@ > +--- ./data/SConscript.orig 2009-06-14 12:11:30.000000000 +0200 > ++++ ./data/SConscript 2013-10-28 01:26:26.000000000 +0100 > +@@ -19,6 +19,5 @@ > + SConscript("fonts/SConscript") > + SConscript("gfx/SConscript") > + SConscript("gui/SConscript") > +-SConscript("icons/SConscript") > + SConscript("zik/SConscript") > + =20 >=20 > Added: head/games/glob2/files/patch-src__ConfigFiles.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/games/glob2/files/patch-src__ConfigFiles.h Mon Oct 28 03:03:46= 2013 (r331825) > @@ -0,0 +1,15 @@ > +--- ./src/ConfigFiles.h.orig 2009-06-14 12:11:34.000000000 +0200 > ++++ ./src/ConfigFiles.h 2013-10-28 01:26:26.000000000 +0100 > +@@ -178,7 +178,11 @@ > + else > + { > + std::cerr << "ConfigVector::get(" << static_cast<unsigned int>(id)= << ") : warning : id is not valid, returning default" << std::endl; > +- assert(false); > ++ // FreeBSD: patch impoted from glob2's CVS > ++ // assert(false); > ++ // I commented the assert because it crashed glob2 > ++ // sometimes, when a building was repaired. > ++ // This has to be really fixed! > + return &defaultEntry; > + } > + } >=20 > Added: head/games/glob2/files/pkg-message.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/games/glob2/files/pkg-message.in Mon Oct 28 03:03:46 2013 (r33= 1825) > @@ -0,0 +1,18 @@ > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > + > +Globulation 2 has been installed. > + > +You can try to launch it typing > + > + glob2 > + > +Anyway, it will not always work, so it is suggested that you type > + > + glob2 --help > + > +and read about command lines arguments. > + > +Try to use -G option if you have problems with dri and glx (OpenGL), > +or -m if you have problems with sound, or -C to disable custom cursor.= > + > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >=20 > Modified: head/games/glob2/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/games/glob2/pkg-plist Mon Oct 28 02:11:12 2013 (r331824) > +++ head/games/glob2/pkg-plist Mon Oct 28 03:03:46 2013 (r331825) > @@ -1737,23 +1737,13 @@ share/applications/glob2.desktop > %%DATADIR%%/scripts/tutorial_part2.sgsl > %%DATADIR%%/scripts/tutorial_part3.sgsl > %%DATADIR%%/scripts/tutorial_part4.sgsl > -share/icons/hicolor/128x128/apps/glob2-icon-128x128.png > -share/icons/hicolor/16x16/apps/glob2-icon-16x16.png > -share/icons/hicolor/24x24/apps/glob2-icon-24x24.png > -share/icons/hicolor/32x32/apps/glob2-icon-32x32.png > -share/icons/hicolor/48x48/apps/glob2-icon-48x48.png > -@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/24x24/apps > -@dirrmtry share/icons/hicolor/24x24 > -@dirrmtry share/icons/hicolor/16x16/apps > -@dirrmtry share/icons/hicolor/16x16 > -@dirrmtry share/icons/hicolor/128x128/apps > -@dirrmtry share/icons/hicolor/128x128 > -@dirrmtry share/icons/hicolor > -@dirrmtry share/icons > +share/icons/hicolor/128x128/apps/glob2.png > +share/icons/hicolor/16x16/apps/glob2.png > +share/icons/hicolor/24x24/apps/glob2.png > +share/icons/hicolor/32x32/apps/glob2.png > +share/icons/hicolor/48x48/apps/glob2.png > +share/icons/hicolor/64x64/apps/glob2.png > +share/pixmaps/glob2.png > @dirrm %%DATADIR%%/scripts > @dirrm %%DATADIR%%/maps > @dirrm %%DATADIR%%/data/zik >=20 --=20 Regards, Bryan Drewery --BadQqJecjirPhcLxXCMhfKkRLhcGt0hoM Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSbdYnAAoJEG54KsA8mwz5qacP/1sK8tE+zGlK2txD7HC1cSvZ FUr/l8tkz3VVI1cNltzafBiBmitEOVIqh95L4/QD5q3Ednu8EkjPO15W7qcgZyNG OsKptT8qxVuDcJnTTn0hvjHJmMoKZJILwkyD0EHfIDfbOndpb+bASSu9AQiSUg8e +fHWv0StPMhG3Xjm9w8OCEVb9KlPH23gdwY7x/JX5ZCZ1xLuSyCqzL7Whv59g5oG IXxN1GLga1thsVIqkWErENpzN/RKh9SzhVtFlIVtMw80wU+IZuAv14byCyS1E78T 8GdJEH/2hMfmFlyAUXYQtPwz+aYEF2llOV0Ds+488aG+WQ5FJer8K337NXL/bPDt otzziuT2CCrjdwOXV3HRsFVsP/LA8FVgc/Ge3ZjrBg4QAFcCGcaBusSdbM0VBYzu R5NT+3orFwMi50x8kwjxtRGmMM3KQ5r8D6Qyvnzj2Kq2HW7jgg2LF5xJpDAYaIL+ 6ppEEg4fI4Fk058Y3wlawj53pu0QpWHJ/KuaoEX7lm3+z/QhuuEMeOzI8rUCITLB WFojqezcjGiGGdkmb7Vh4jR+voYWWS53goLMsHWxbBl3z36B0jdWZLoogNkEZwts eNvXqPJS1VpjmFJQccwenFJmdDvi4oJ6FVlRb4xpfG6hoXqpqy6e4sdIuJJr7Vcq MvxR+R9azx6xL9wfYG8V =NEd3 -----END PGP SIGNATURE----- --BadQqJecjirPhcLxXCMhfKkRLhcGt0hoM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?526DD626.1030507>