Bug 156896 - Update of games/megaglest-data
Summary: Update of games/megaglest-data
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Stephen Montgomery-Smith
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-09 01:00 UTC by Sven Moeller
Modified: 2011-07-21 05:30 UTC (History)
0 users

See Also:


Attachments
file.diff (2.92 KB, patch)
2011-05-09 01:00 UTC, Sven Moeller
no flags Details | Diff
megaglest-data-3.5.1-diff.txt (2.81 KB, text/plain)
2011-05-10 23:55 UTC, Sven Moeller
no flags Details
megaglest-data-3.5.2-diff.txt (2.85 KB, text/plain)
2011-06-15 00:26 UTC, Sven Moeller
no flags Details
megaglest-data-3.5.2-diff.txt (429.74 KB, text/plain)
2011-06-15 00:22 UTC, Sven Moeller
no flags Details
megaglest-data-3.5.2-diff.txt (2.82 KB, text/plain)
2011-07-02 22:54 UTC, Sven Moeller
no flags Details
pkg-plist (425.00 KB, text/plain)
2011-07-16 16:24 UTC, Stephen Montgomery-Smith
no flags Details
megaglest-data-patch.txt (3.55 KB, text/plain)
2011-07-16 16:52 UTC, Stephen Montgomery-Smith
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Sven Moeller 2011-05-09 01:00:20 UTC
Yesterday Upstream had released an Update of MegaGlest. This is the update for the corresponding megaglest-data port.

Please find attached diff file.

Thanks.

Fix: Patch attached with submission follows:
Comment 1 Sven Moeller 2011-05-10 23:55:12 UTC
Upstream has updated the distfiles. I was told by one of the upstream 
members and the change is recorded here: 
http://sourceforge.net/apps/trac/megaglest/changeset/2253

On the MegaGlest forums was it explained too:

http://glest.org/glest_board/index.php?topic=7086.msg72740#msg72740

Please find attached a complete new patch file which was generated 
against PORTVERSION 3.4.0.


Sven
Comment 2 Sven Moeller 2011-06-15 00:22:50 UTC
Here's another update. Please find attached diff file. This diff was 
made against 3.4.0
Comment 3 Sven Moeller 2011-06-15 00:26:39 UTC
I'm sorry, i made a diff including the work directory.

This time the diff does not include the work directory.
Comment 4 Sven Moeller 2011-07-02 22:54:34 UTC
Am 09.05.2011 02:00, schrieb FreeBSD-gnats-submit@FreeBSD.org:
> Thank you very much for your problem report.
> It has the internal identification `ports/156896'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs.
>
> You can access the state of your problem report at any time
> via this link:
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=156896
>
>> Category:       ports
>> Responsible:    freebsd-ports-bugs
>> Synopsis:       Update of megaglest-data Port
>> Arrival-Date:   Mon May 09 00:00:20 UTC 2011

Hello,

this updated patch file fixes the use of PORTREVISION.

Thanks.

Sven
Comment 5 Stephen Montgomery-Smith freebsd_committer freebsd_triage 2011-07-16 04:06:12 UTC
Responsible Changed
From-To: freebsd-ports-bugs->stephen

I'll take it.
Comment 6 Stephen Montgomery-Smith 2011-07-16 05:41:36 UTC
You cannot use a construction like this:

+#               this way $PLIST won't be deleted by "make clean"
+PLIST=          ${PORTSDIR}/games/${PORTNAME}${PKGNAMESUFFIX}/pkg-plist

The port is not supposed to change itself.  You either want a static 
pkg-plist, or you need a pkg-plist that is deleted by "make clean."

I'll change this back to what it was before when I commit it.  (Or my 
mentor might tell me I need to go to the static pkg-list, which is 
probably preferable.)
Comment 7 Sven Moeller 2011-07-16 11:15:45 UTC
Hi,

thanks for this correction. Beat told that too ;-)
I agree that a static pkg-plist might be the better one. Maybe i find =
some spare time tonight to change this, but i can't promise.

Just another thing needs to be fixed. For the desktop icons i was =
awaiting that /usr/local/share/applications is present. But it seems =
that this directory isn't present by default. I was trying to figure out =
how other ports (e.g. warzone2100, freeciv) handle that. But didn't find =
a command like "mkdir -p /usr/local/share/applications". So, i'm not =
sure if such a command should be added to the installation part. What's =
your opinion? Please see the build log at: =
https://gecko.chruetertee.ch/index.php?action=3Ddescribe_port&id=3D1677

thanks and kind regards
Sven

Am 16.07.2011 um 06:41 schrieb Stephen Montgomery-Smith:

> You cannot use a construction like this:
>=20
> +#               this way $PLIST won't be deleted by "make clean"
> +PLIST=3D          =
${PORTSDIR}/games/${PORTNAME}${PKGNAMESUFFIX}/pkg-plist
>=20
> The port is not supposed to change itself.  You either want a static =
pkg-plist, or you need a pkg-plist that is deleted by "make clean."
>=20
> I'll change this back to what it was before when I commit it.  (Or my =
mentor might tell me I need to go to the static pkg-list, which is =
probably preferable.)
Comment 8 Stephen Montgomery-Smith 2011-07-16 16:24:05 UTC
On 07/16/2011 06:10 AM, Sven Möller wrote:
> The following reply was made to PR ports/156896; it has been noted by GNATS.
>
> From: =?iso-8859-1?Q?Sven_M=F6ller?=<smoeller@nichthelfer.de>
> To: Stephen Montgomery-Smith<stephen@missouri.edu>
> Cc: bug-followup@FreeBSD.org
> Subject: Re: ports/156896: Update of games/megaglest-data
> Date: Sat, 16 Jul 2011 12:15:45 +0200
>
>   Hi,
>
>   thanks for this correction. Beat told that too ;-)
>   I agree that a static pkg-plist might be the better one. Maybe i find =
>   some spare time tonight to change this, but i can't promise.

I can do that for you.  It will take me a minute.  I have attached it here.

You also need to add a mkdir -p to pkg-plist for the empty directories. 
  Then you can replace the @dirrmtry by @dirrm.  Look at the following 
fragment of the diff:

  .for DIR in data maps scenarios techs tilesets tutorials
         @cd ${WRKSRC} && \
+               ${FIND} ${DIR} -type d -empty | ${SORT} -r | ${SED} -e 
's|^|@exec ${MKDIR} %D/%%DATADIR%%/|' -e 's|$$| > /dev/null 2>\&1|' >> 
${PLIST} && \
                 ${FIND} ${DIR} -type f | ${SORT} | ${SED} -e 
's|^|%%DATADIR%%/|' >> ${PLIST} && \
-                       ${FIND} ${DIR} -type d | ${SORT} -r | ${SED} -e 
's|^|@dirrmtry %%DATADIR%%/|' >> ${PLIST}
+               ${FIND} ${DIR} -type d | ${SORT} -r | ${SED} -e 
's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
  .endfor


>
>   Just another thing needs to be fixed. For the desktop icons i was =
>   awaiting that /usr/local/share/applications is present. But it seems =
>   that this directory isn't present by default. I was trying to figure out =
>   how other ports (e.g. warzone2100, freeciv) handle that. But didn't find =
>   a command like "mkdir -p /usr/local/share/applications". So, i'm not =
>   sure if such a command should be added to the installation part. What's =
>   your opinion? Please see the build log at: =
>   https://gecko.chruetertee.ch/index.php?action=3Ddescribe_port&id=3D1677

Yes, use ${MKDIR} ${PREFIX}/share/applications.

In those other situations, it is probably being done by the "make install."

(By the way, I wasn't sure what I was supposed to be looking at in the 
web page you sent me.)
Comment 9 Stephen Montgomery-Smith freebsd_committer freebsd_triage 2011-07-16 16:44:17 UTC
State Changed
From-To: open->feedback

The maintainer/submitter may want to make some other changes to this port.
Comment 10 Stephen Montgomery-Smith 2011-07-16 16:52:14 UTC
I also made some other changes - see the attached patch.  This is still 
with the dynamic pkg-plist.  This patch is applied to 3.4.0 which is in 
the ports right now.  Can you make further changes working from this patch?
Comment 11 Stephen Montgomery-Smith 2011-07-19 05:06:02 UTC
I'm ready to commit this PR and ports/156895.  I'm just waiting to see 
if you want to add some desktop icons.

You might find this website useful, which will automate a lot of the 
desktop stuff for you:

http://www.freebsd.org/doc/en/books/porters-handbook/using-x11.html#DESKTOP-ENTRIES

If you want to commit now, and handle this with a later PR, that would 
be fine as well.
Comment 12 Sven Moeller 2011-07-19 06:02:46 UTC
Am 19.07.2011 06:06, schrieb Stephen Montgomery-Smith:
> I'm ready to commit this PR and ports/156895.  I'm just waiting to see 
> if you want to add some desktop icons.
>
> You might find this website useful, which will automate a lot of the 
> desktop stuff for you:
>
> http://www.freebsd.org/doc/en/books/porters-handbook/using-x11.html#DESKTOP-ENTRIES 
>
>
> If you want to commit now, and handle this with a later PR, that would 
> be fine as well.
Hi Stephen,

thanks for your help, i really appreciate it! Ok, if you're ready to 
commit, do it. This week i won't have time to work on the port. Thanks 
for the link, i'll check this out.

Thanks & kind regards

Sven
Comment 13 dfilter service freebsd_committer freebsd_triage 2011-07-21 05:21:07 UTC
stephen     2011-07-21 04:20:58 UTC

  FreeBSD ports repository

  Modified files:
    games/megaglest-data Makefile distinfo 
  Log:
  - Update to 3.5.2.
  - Corrected dynamic plist to accomodate empty directories.
  
  PR:             ports/156896
  Submitted by:   Sven Moeller <smoeller@nichthelfer.de>
  Approved by:    maho (mentor)
  
  Revision  Changes    Path
  1.2       +15 -19    ports/games/megaglest-data/Makefile
  1.2       +2 -2      ports/games/megaglest-data/distinfo
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 14 Stephen Montgomery-Smith freebsd_committer freebsd_triage 2011-07-21 05:22:19 UTC
State Changed
From-To: feedback->closed

Committed, thanks.  I decided to use your dynamic plist, at least for now.  If people don't like it, we can change it later.  Since your dynamic plist is created before installation from ${WRKSRC}, it should be reliable and robust.