svn commit: r302766 - head/games/moagg

[Guido Falsi]

On Sun, Aug 19, 2012 at 02:41:24PM -0700, Jason Helfman wrote:
> On Sun, Aug 19, 2012 at 10:07 AM, Guido Falsi <madpilot at freebsd.org> wrote:
> 
> > Author: madpilot
> > Date: Sun Aug 19 17:07:55 2012
> > New Revision: 302766
> > URL: http://svn.freebsd.org/changeset/ports/302766
> >
> > Log:
> >   - Remove own OPTION "DATA"
> >   - Honour NOPORTDATA instead of own option
> >
> >   PR:           ports/170736
> > http://www.FreeBSD.org/cgi/query-pr.cgi?pr=170736
> >   Submitted by: nemysis <nemysis at gmx.ch> (maintainer)
> >   Approved by:  crees, tabthorpe (mentors, implicit)
> >
> > Modified:
> >   head/games/moagg/Makefile
> >
> > Modified: head/games/moagg/Makefile
> >
> > ==============================================================================
> > --- head/games/moagg/Makefile   Sun Aug 19 17:02:42 2012        (r302765)
> > +++ head/games/moagg/Makefile   Sun Aug 19 17:07:55 2012        (r302766)
> > @@ -20,9 +20,6 @@ COMMENT=      Pilot a small space ship
> >
> >  LICENSE=       GPLv2
> >
> > -OPTIONS_DEFINE=        DATA
> > -OPTIONS_DEFAULT=       DATA
> > -
> >  USE_ZIP=       yes
> >  USE_JAVA=      yes
> >  JAVA_VERSION=  1.5+
> > @@ -47,7 +44,7 @@ do-install:
> >         ${INSTALL_SCRIPT} ${WRKSRC}/run.sh.new ${PREFIX}/bin/${PORTNAME}
> >
> >  # Data
> > -.if ${PORT_OPTIONS:MDATA}
> > +.if !defined (NOPORTDATA)
> >         ${MKDIR} ${DATADIR}
> >         @(cd ${WRKSRC} && ${COPYTREE_SHARE} "data ghosts jar" ${DATADIR})
> >  .  for d in hiscores.dat log4j.properties
> >
> >
> If it always requires DATA, per pr, why is there a check? Shouldn't DATA be
> installed without a check, and
> not honor NOPORTDATA?

Perhaps you're right. My first idea was that the NOPORTDATA flag had the
sole purpose of stopping a port to writing to DATADIR, installing the
game engine without datafiles could make sense in certain situations,
but I now notice the jar files too really go to datadir too...So I could
agree.

BTW the port already had this problem, it was just bound to the local
DATA option.

I'll contact the maintainer and ask him what he really prefers to do
about this.

-- 
Guido Falsi <madpilot at FreeBSD.org>