Bug 125590 - [patch] games/lordsawar update to 0.0.9
Summary: [patch] games/lordsawar update to 0.0.9
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: Dmitry Marakasov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-07-14 06:50 UTC by Alex Kozlov
Modified: 2008-07-31 19:30 UTC (History)
0 users

See Also:


Attachments
file.diff (9.82 KB, patch)
2008-07-14 06:50 UTC, Alex Kozlov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex Kozlov 2008-07-14 06:50:03 UTC
Update Lords a War to 0.0.9

Fix: Patch attached with submission follows:
Comment 1 Dmitry Marakasov freebsd_committer freebsd_triage 2008-07-15 00:27:55 UTC
Responsible Changed
From-To: freebsd-ports-bugs->amdmi3

I'll take it.
Comment 2 Dmitry Marakasov freebsd_committer freebsd_triage 2008-07-17 23:53:09 UTC
State Changed
From-To: open->feedback

Awaiting feedback
Comment 3 Dmitry Marakasov 2008-07-17 23:53:17 UTC
> Synopsis: [patch] games/lordsawar update to 0.0.9

Does not build

Logs: http://people.freebsd.org/~amdmi3/logs/

Also, configure fails when built WITHOUT_SOUND,
http://people.freebsd.org/~amdmi3/lordsawar-nosound-0.0.9.log
but I've fixed that:
http://people.freebsd.org/~amdmi3/l.patch

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 4 Alex Kozlov 2008-07-18 07:35:37 UTC
On Thu, Jul 17, 2008 at 09:53:18PM +0000, amdmi3@FreeBSD.org wrote:
> Synopsis: [patch] games/lordsawar update to 0.0.9
> 
> State-Changed-From-To: open->feedback
> State-Changed-By: amdmi3
> State-Changed-When: Thu Jul 17 22:53:09 UTC 2008
> State-Changed-Why: 
> Awaiting feedback
Sorry, but I did not recieve mail in which You are asking for feedback.
Can You please repeat it (maybe with cc: bug-followup@ just in case).


--
Adios
Comment 5 Dmitry Marakasov 2008-07-18 21:51:46 UTC
* Alex Kozlov (spam@rm-rf.kiev.ua) wrote:

> > Awaiting feedback
> Sorry, but I did not recieve mail in which You are asking for feedback.
> Can You please repeat it (maybe with cc: bug-followup@ just in case).
Sorry, local mail delivery problems. The mail is now out.

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 6 Alex Kozlov 2008-07-20 16:27:25 UTC
On Mon, Jul 18, 2008 at 02:53:17 +0400, Dmitry Marakasov wrote:

>> Synopsis: [patch] games/lordsawar update to 0.0.9
>
>Does not build
>
>Logs: http://people.freebsd.org/~amdmi3/logs/
Just to confirm. It's build with USE_GCC= 3.4 ?

>Also, configure fails when built WITHOUT_SOUND,
>http://people.freebsd.org/~amdmi3/lordsawar-nosound-0.0.9.log
>but I've fixed that:
>http://people.freebsd.org/~amdmi3/l.patch
WITHOUT_SOUND reveal another bug in configure.
I contact the author, but forecast is not very good.

Try this patch:

Index: games/lordsawar/files/patch-configure
@@ -1,5 +1,5 @@
 Index: configure
-@@ -4622,7 +4622,7 @@
+@@ -4577,7 +4577,7 @@
      LDFLAGS="$LDFLAGS -lSDL_mixer"
      LIBS="-lSDL_mixer $LIBS"
  
@@ -8,7 +8,18 @@
  
         if test "$cross_compiling" = yes; then
    { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -13798,8 +13798,7 @@
+@@ -4655,8 +4655,8 @@
+ _ACEOF
+ 
+ else
+-    CFLAGS=$ac_save_CFLAGS
+-    LDFLAGS="$ac_save_LDFLAGS"
++    CFLAGS=$ac_save_cflags
++    LDFLAGS="$ac_save_ldflags"
+     LIBS="$ac_save_libs"
+ fi
+ 
+@@ -12271,8 +12271,7 @@
  
  rm -f src/main.o
  
@@ -17,4 +28,4 @@
 +eval LORDSAWAR_DATADIR="$datadir/lordsawar"
  
  
- ac_config_files="$ac_config_files dat/Makefile dat/army/Makefile dat/army/default/Makefile dat/army/bigdefault/Makefile dat/tilesets/Makefile dat/tilesets/default/Makefile dat/tilesets/default/misc/Makefile dat/tilesets/bigdefault/Makefile dat/tilesets/bigdefault/misc/Makefile dat/shield/Makefile dat/shield/default/Makefile dat/shield/plain/Makefile dat/citysets/Makefile dat/citysets/default/Makefile dat/citysets/bigdefault/Makefile dat/various/Makefile dat/various/items/Makefile dat/various/editor/Makef ile dat/map/Makefile dat/ggz/Makefile dat/ggz/lordsawar.dsc dat/ggz/lordsawar-server.dsc dat/music/Makefile dat/glade/Makefile dat/glade/editor/Makefile intl/Makefile po/Makefile.in po/Makefile Makefile src/Makefile doc/Makefile src/server/Makefile src/editor/Makefile src/gui/Makefile"
+ ac_config_files="$ac_config_files dat/Makefile dat/army/Makefile dat/army/default/Makefile dat/army/bigdefault/Makefile dat/tilesets/Makefile dat/tilesets/default/Makefile dat/tilesets/default/misc/Makefile dat/tilesets/bigdefault/Makefile dat/tilesets/bigdefault/misc/Makefile dat/shield/Makefile dat/shield/default/Makefile dat/shield/plain/Makefile dat/citysets/Makefile dat/citysets/default/Makefile dat/citysets/bigdefault/Makefile dat/various/Makefile dat/various/items/Makefile dat/various/editor/Makef ile dat/map/Makefile dat/music/Makefile dat/glade/Makefile dat/glade/editor/Makefile intl/Makefile po/Makefile.in po/Makefile Makefile src/Makefile doc/Makefile src/editor/Makefile src/gui/Makefile"
Comment 7 Dmitry Marakasov 2008-07-23 19:47:43 UTC
* Alex Kozlov (spam@rm-rf.kiev.ua) wrote:

> >Does not build
> >
> >Logs: http://people.freebsd.org/~amdmi3/logs/
> Just to confirm. It's build with USE_GCC= 3.4 ?
Erm, no. There's no USE_GCC in the port so it's built with gcc 3.4 on
FreeBSD 6.3 and gcc 4.2 on FreeBSD 7.0.

> >Also, configure fails when built WITHOUT_SOUND,
> >http://people.freebsd.org/~amdmi3/lordsawar-nosound-0.0.9.log
> >but I've fixed that:
> >http://people.freebsd.org/~amdmi3/l.patch
> WITHOUT_SOUND reveal another bug in configure.
> I contact the author, but forecast is not very good.
> 
> Try this patch:
Is it to be used instead of my patch or in addition to?
Anyway, it still does not build.

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 8 dfilter service freebsd_committer freebsd_triage 2008-07-31 17:06:00 UTC
amdmi3      2008-07-31 16:05:43 UTC

  FreeBSD ports repository

  Modified files:
    games/lordsawar      Makefile distinfo pkg-plist 
    games/lordsawar/files patch-configure patch-src_game.cpp 
  Added files:
    games/lordsawar/files patch-src_herotemplates.cpp 
  Log:
  - Update Lords a War to 0.0.9
  
  PR:             ports/125590
  Submitted by:   Alex Kozlov <spam at rm-rf dot kiev dot ua> (maintainer)
  Approved by:    miwi (mentor)
  
  Revision  Changes    Path
  1.4       +3 -3      ports/games/lordsawar/Makefile
  1.2       +3 -3      ports/games/lordsawar/distinfo
  1.2       +14 -3     ports/games/lordsawar/files/patch-configure
  1.2       +6 -94     ports/games/lordsawar/files/patch-src_game.cpp
  1.1       +94 -0     ports/games/lordsawar/files/patch-src_herotemplates.cpp (new)
  1.2       +21 -9     ports/games/lordsawar/pkg-plist
_______________________________________________
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 9 Dmitry Marakasov freebsd_committer freebsd_triage 2008-07-31 17:08:13 UTC
State Changed
From-To: feedback->closed

The ports now builds fine, seems like there was temporary problem with 
gtkmm/glibmm/... stuff. So, committed, thanks!
Comment 10 Alex Kozlov 2008-07-31 19:29:29 UTC
On Thu, Jul 31, 2008 at 04:08:14PM, amdmi3@FreeBSD.org wrote:
> Synopsis: [patch] games/lordsawar update to 0.0.9
> 
> State-Changed-From-To: feedback->closed
> State-Changed-By: amdmi3
> State-Changed-When: Thu Jul 31 16:08:13 UTC 2008
> State-Changed-Why: 
> The ports now builds fine, seems like there was temporary problem with
> gtkmm/glibmm/... stuff. So, committed, thanks!
> 
Apparently my last reply has been lost. Sorry about that.
Well, now it's not actual. Thank You for Your work and patience.


--
Adios