- Pass maintainership to games@

- Use new LIB_DEPENDS syntax
- Fix build with clang, remove USE_GCC
- Use canonical names for patches

5 files changed, 55 insertions, 229 deletions

diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile
index 1b58270c2462..c5ba8b769e57 100644
--- a/games/lordsawar/Makefile
+++ b/games/lordsawar/Makefile
@@ -5,26 +5,33 @@ PORTVERSION=	0.2.0
 CATEGORIES=	games
 MASTER_SITES=	SAVANNAH
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	games@FreeBSD.org
 COMMENT=	Warlords II clone
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
 		${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	tar:${PORTSDIR}/devel/libtar \
-		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		gnet-2:${PORTSDIR}/net/gnet2
+LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar \
+		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
+		libgnet-2.0.so:${PORTSDIR}/net/gnet2
 
 USES=		gettext gmake pkgconfig
 USE_GNOME=	gnomehier gtkmm24
 USE_SDL=	sdl image mixer
-USE_GCC=	any
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost-includedir=${LOCALBASE}/include
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.mk>
+PORTDATA=	*
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000000
+BROKEN=		does not build
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/games/lordsawar/files/patch-src_LocationList.h b/games/lordsawar/files/patch-src_LocationList.h
deleted file mode 100644
index e115fccd3b83..000000000000
--- a/games/lordsawar/files/patch-src_LocationList.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/LocationList.h.orig	2010-05-11 08:50:34.000000000 +0000
-+++ src/LocationList.h
-@@ -55,7 +55,7 @@ template<class T> class LocationList : p
- 
-   void add(T t)
-     {
--      push_back(t);
-+      this->push_back(t);
-       d_id[t->getId()] = t;
-       int size = t->getSize();
-       for (int i = 0; i < size; i++)
diff --git a/games/lordsawar/files/patch-src__LocationList.h b/games/lordsawar/files/patch-src__LocationList.h
new file mode 100644
index 000000000000..822975cecc4b
--- /dev/null
+++ b/games/lordsawar/files/patch-src__LocationList.h
@@ -0,0 +1,23 @@
+--- src/LocationList.h.orig	2010-05-11 12:50:34.000000000 +0400
++++ src/LocationList.h	2014-05-21 17:17:08.650652359 +0400
+@@ -55,7 +55,7 @@
+ 
+   void add(T t)
+     {
+-      push_back(t);
++      this->push_back(t);
+       d_id[t->getId()] = t;
+       int size = t->getSize();
+       for (int i = 0; i < size; i++)
+@@ -74,8 +74,9 @@
+ 	for (int j = 0; j < size; j++)
+ 	  {
+ 	    Vector<int> pos = t->getPos() + Vector<int>(i,j);
+-            if (d_object.find(pos) != d_object.end())
+-              d_object.erase(d_object.find(pos));
++            typename PositionMap::const_iterator it = d_object.find(pos);
++            if (it != d_object.end())
++              d_object.erase(it);
+ 	  }
+       delete t;
+     }
diff --git a/games/lordsawar/files/patch-src__armyproto.cpp b/games/lordsawar/files/patch-src__armyproto.cpp
new file mode 100644
index 000000000000..7bcf0bd348fe
--- /dev/null
+++ b/games/lordsawar/files/patch-src__armyproto.cpp
@@ -0,0 +1,12 @@
+Clang fix; initializer is not needed anyway, array is copied in ctor body
+--- src/armyproto.cpp.orig	2011-02-12 22:13:14.000000000 +0300
++++ src/armyproto.cpp	2014-05-16 19:24:16.982231310 +0400
+@@ -36,7 +36,7 @@
+ ArmyProto::ArmyProto(const ArmyProto& a)
+     :ArmyProtoBase(a),
+      d_defends_ruins(a.d_defends_ruins), 
+-     d_awardable(a.d_awardable), d_image_name(a.d_image_name),
++     d_awardable(a.d_awardable),
+      d_gender(Hero::NONE)
+ {
+   for (unsigned int c = Shield::WHITE; c <= Shield::NEUTRAL; c++)
diff --git a/games/lordsawar/pkg-plist b/games/lordsawar/pkg-plist
index 43e954bbb7ed..42de5f1b47e4 100644
--- a/games/lordsawar/pkg-plist
+++ b/games/lordsawar/pkg-plist
@@ -78,217 +78,12 @@ share/locale/ca/LC_MESSAGES/lordsawar.mo
 share/locale/da/LC_MESSAGES/lordsawar.mo
 share/locale/de/LC_MESSAGES/lordsawar.mo
 share/locale/nl/LC_MESSAGES/lordsawar.mo
-%%DATADIR%%/army/bigdefault.lwa
-%%DATADIR%%/army/default.lwa
-%%DATADIR%%/citynames.xml
-%%DATADIR%%/citysets/bigdefault.lwc
-%%DATADIR%%/citysets/bigdol.lwc
-%%DATADIR%%/citysets/default.lwc
-%%DATADIR%%/citysets/dol.lwc
-%%DATADIR%%/glade/about-dialog.ui
-%%DATADIR%%/glade/army-bonus-dialog.ui
-%%DATADIR%%/glade/army-gains-level-dialog.ui
-%%DATADIR%%/glade/army-info-window.ui
-%%DATADIR%%/glade/buy-production-dialog.ui
-%%DATADIR%%/glade/city-defeated-dialog.ui
-%%DATADIR%%/glade/city-info-window.ui
-%%DATADIR%%/glade/city-looted-dialog.ui
-%%DATADIR%%/glade/city-pillaged-dialog.ui
-%%DATADIR%%/glade/city-raze-dialog.ui
-%%DATADIR%%/glade/city-razed-dialog.ui
-%%DATADIR%%/glade/city-rename-dialog.ui
-%%DATADIR%%/glade/city-sacked-dialog.ui
-%%DATADIR%%/glade/city-window.ui
-%%DATADIR%%/glade/destination-dialog.ui
-%%DATADIR%%/glade/diplomacy-dialog.ui
-%%DATADIR%%/glade/diplomacy-report-dialog.ui
-%%DATADIR%%/glade/disband-stack-dialog.ui
-%%DATADIR%%/glade/editor/armyset-info-dialog.ui
-%%DATADIR%%/glade/editor/armyset-window.ui
-%%DATADIR%%/glade/editor/backpack-editor-dialog.ui
-%%DATADIR%%/glade/editor/city-editor-dialog.ui
-%%DATADIR%%/glade/editor/cityset-info-dialog.ui
-%%DATADIR%%/glade/editor/cityset-window.ui
-%%DATADIR%%/glade/editor/editor-quit-dialog.ui
-%%DATADIR%%/glade/editor/editor-recover-dialog.ui
-%%DATADIR%%/glade/editor/hero-editor-dialog.ui
-%%DATADIR%%/glade/editor/image-editor-dialog.ui
-%%DATADIR%%/glade/editor/itemlist-dialog.ui
-%%DATADIR%%/glade/editor/main-window.ui
-%%DATADIR%%/glade/editor/map-info-dialog.ui
-%%DATADIR%%/glade/editor/masked-image-editor-dialog.ui
-%%DATADIR%%/glade/editor/new-map-dialog.ui
-%%DATADIR%%/glade/editor/players-dialog.ui
-%%DATADIR%%/glade/editor/reward-editor-dialog.ui
-%%DATADIR%%/glade/editor/reward-list-dialog.ui
-%%DATADIR%%/glade/editor/ruin-editor-dialog.ui
-%%DATADIR%%/glade/editor/select-army-dialog.ui
-%%DATADIR%%/glade/editor/select-hidden-ruin-dialog.ui
-%%DATADIR%%/glade/editor/select-item-dialog.ui
-%%DATADIR%%/glade/editor/select-reward-dialog.ui
-%%DATADIR%%/glade/editor/shieldset-info-dialog.ui
-%%DATADIR%%/glade/editor/shieldset-window.ui
-%%DATADIR%%/glade/editor/signpost-editor-dialog.ui
-%%DATADIR%%/glade/editor/smallmap-editor-dialog.ui
-%%DATADIR%%/glade/editor/splash-window.ui
-%%DATADIR%%/glade/editor/stack-editor-dialog.ui
-%%DATADIR%%/glade/editor/switch-sets-dialog.ui
-%%DATADIR%%/glade/editor/temple-editor-dialog.ui
-%%DATADIR%%/glade/editor/tile-preview-dialog.ui
-%%DATADIR%%/glade/editor/tile-size-editor-dialog.ui
-%%DATADIR%%/glade/editor/tileset-explosion-picture-editor-dialog.ui
-%%DATADIR%%/glade/editor/tileset-flag-editor-dialog.ui
-%%DATADIR%%/glade/editor/tileset-info-dialog.ui
-%%DATADIR%%/glade/editor/tileset-selector-editor-dialog.ui
-%%DATADIR%%/glade/editor/tileset-smallmap-building-colors-dialog.ui
-%%DATADIR%%/glade/editor/tileset-window.ui
-%%DATADIR%%/glade/editor/tilestyle-organizer-dialog.ui
-%%DATADIR%%/glade/fight-order-dialog.ui
-%%DATADIR%%/glade/fight-window.ui
-%%DATADIR%%/glade/game-loaded-dialog.ui
-%%DATADIR%%/glade/game-lobby-dialog.ui
-%%DATADIR%%/glade/game-options-dialog.ui
-%%DATADIR%%/glade/game-over-dialog.ui
-%%DATADIR%%/glade/game-preferences-dialog.ui
-%%DATADIR%%/glade/game-quit-dialog.ui
-%%DATADIR%%/glade/game-window.ui
-%%DATADIR%%/glade/hero-brings-allies-dialog.ui
-%%DATADIR%%/glade/hero-dialog.ui
-%%DATADIR%%/glade/hero-levels-dialog.ui
-%%DATADIR%%/glade/hero-offer-dialog.ui
-%%DATADIR%%/glade/history-report-dialog.ui
-%%DATADIR%%/glade/item-bonus-dialog.ui
-%%DATADIR%%/glade/item-report-dialog.ui
-%%DATADIR%%/glade/load-scenario-dialog.ui
-%%DATADIR%%/glade/main-preferences-dialog.ui
-%%DATADIR%%/glade/medal-awarded-dialog.ui
-%%DATADIR%%/glade/military-advisor-dialog.ui
-%%DATADIR%%/glade/new-network-game-dialog.ui
-%%DATADIR%%/glade/new-profile-dialog.ui
-%%DATADIR%%/glade/new-random-map-dialog.ui
-%%DATADIR%%/glade/next-player-turn-dialog.ui
-%%DATADIR%%/glade/pick-network-game-to-join-dialog.ui
-%%DATADIR%%/glade/player-died-dialog.ui
-%%DATADIR%%/glade/player-resign-completed-dialog.ui
-%%DATADIR%%/glade/player-resign-dialog.ui
-%%DATADIR%%/glade/preferences-dialog.ui
-%%DATADIR%%/glade/quest-assigned-dialog.ui
-%%DATADIR%%/glade/quest-expired-dialog.ui
-%%DATADIR%%/glade/quest-report-dialog.ui
-%%DATADIR%%/glade/report-dialog.ui
-%%DATADIR%%/glade/ruin-report-dialog.ui
-%%DATADIR%%/glade/ruin-rewarded-dialog.ui
-%%DATADIR%%/glade/ruin-searched-dialog.ui
-%%DATADIR%%/glade/ruinfight-finished-dialog.ui
-%%DATADIR%%/glade/ruinfight-started-dialog.ui
-%%DATADIR%%/glade/sage-dialog.ui
-%%DATADIR%%/glade/signpost-change-dialog.ui
-%%DATADIR%%/glade/splash-window.ui
-%%DATADIR%%/glade/stack-info-dialog.ui
-%%DATADIR%%/glade/stack-info-window.ui
-%%DATADIR%%/glade/surrender-dialog.ui
-%%DATADIR%%/glade/surrender-refused-dialog.ui
-%%DATADIR%%/glade/temple-visit-dialog.ui
-%%DATADIR%%/glade/treachery-dialog.ui
-%%DATADIR%%/glade/triumphs-dialog.ui
-%%DATADIR%%/glade/use-item-dialog.ui
-%%DATADIR%%/glade/use-item-on-player-dialog.ui
-%%DATADIR%%/gtkrc
-%%DATADIR%%/heronames.xml
-%%DATADIR%%/map/2ndPunic37.map
-%%DATADIR%%/map/dol.map
-%%DATADIR%%/music/back1.ogg
-%%DATADIR%%/music/battle.ogg
-%%DATADIR%%/music/bless.ogg
-%%DATADIR%%/music/defeat.ogg
-%%DATADIR%%/music/hero.ogg
-%%DATADIR%%/music/intro.ogg
-%%DATADIR%%/music/music.xml
-%%DATADIR%%/music/victory.ogg
-%%DATADIR%%/ruinnames.xml
-%%DATADIR%%/shield/default.lws
-%%DATADIR%%/shield/dol.lws
-%%DATADIR%%/shield/plain.lws
-%%DATADIR%%/signposts.xml
-%%DATADIR%%/templenames.xml
-%%DATADIR%%/tilesets/bigdefault.lwt
-%%DATADIR%%/tilesets/bigstark.lwt
-%%DATADIR%%/tilesets/bigwesnoth.lwt
-%%DATADIR%%/tilesets/default.lwt
-%%DATADIR%%/tilesets/stark.lwt
-%%DATADIR%%/tilesets/wesnoth.lwt
-%%DATADIR%%/various/arrows.png
-%%DATADIR%%/various/back.bmp
-%%DATADIR%%/various/background.png
-%%DATADIR%%/various/bag.png
-%%DATADIR%%/various/bigmedals.png
-%%DATADIR%%/various/buttons.png
-%%DATADIR%%/various/castle_icon.png
-%%DATADIR%%/various/city_occupied.png
-%%DATADIR%%/various/cursors.png
-%%DATADIR%%/various/diplomacy-large.png
-%%DATADIR%%/various/diplomacy-small.png
-%%DATADIR%%/various/editor/button_12x12.png
-%%DATADIR%%/various/editor/button_1x1.png
-%%DATADIR%%/various/editor/button_2x2.png
-%%DATADIR%%/various/editor/button_3x3.png
-%%DATADIR%%/various/editor/button_6x6.png
-%%DATADIR%%/various/editor/button_bag.png
-%%DATADIR%%/various/editor/button_blank.png
-%%DATADIR%%/various/editor/button_bridge.png
-%%DATADIR%%/various/editor/button_castle.png
-%%DATADIR%%/various/editor/button_erase.png
-%%DATADIR%%/various/editor/button_move.png
-%%DATADIR%%/various/editor/button_port.png
-%%DATADIR%%/various/editor/button_road.png
-%%DATADIR%%/various/editor/button_ruin.png
-%%DATADIR%%/various/editor/button_selector.png
-%%DATADIR%%/various/editor/button_signpost.png
-%%DATADIR%%/various/editor/button_stack.png
-%%DATADIR%%/various/editor/button_temple.png
-%%DATADIR%%/various/hero-inactive.png
-%%DATADIR%%/various/hero-newlevel-female.png
-%%DATADIR%%/various/hero-newlevel-male.png
-%%DATADIR%%/various/hero.png
-%%DATADIR%%/various/items/items.xml
-%%DATADIR%%/various/lordsawar_logo.png
-%%DATADIR%%/various/medals_mask.png
-%%DATADIR%%/various/movebonus.png
-%%DATADIR%%/various/parley_offered.png
-%%DATADIR%%/various/parley_refused.png
-%%DATADIR%%/various/prodshieldset.png
-%%DATADIR%%/various/recruit_female.png
-%%DATADIR%%/various/recruit_male.png
-%%DATADIR%%/various/ruin_1.png
-%%DATADIR%%/various/ruin_2.png
-%%DATADIR%%/various/ship.png
-%%DATADIR%%/various/smallcity.png
-%%DATADIR%%/various/smalldefense.png
-%%DATADIR%%/various/smallexploredruin.png
-%%DATADIR%%/various/smallincome.png
-%%DATADIR%%/various/smallruinedcity.png
-%%DATADIR%%/various/smalltemple.png
-%%DATADIR%%/various/smalltreasury.png
-%%DATADIR%%/various/smallunexploredruin.png
-%%DATADIR%%/various/smallunexploredstronghold.png
-%%DATADIR%%/various/smallupkeep.png
-%%DATADIR%%/various/splash_screen.jpg
-%%DATADIR%%/various/tileset_icon.png
-%%DATADIR%%/various/tilestyles.png
-%%DATADIR%%/various/waypoints.png
-%%DATADIR%%/various/win.png
-@dirrm %%DATADIR%%/various/items
-@dirrm %%DATADIR%%/various/editor
-@dirrm %%DATADIR%%/various
-@dirrm %%DATADIR%%/tilesets
-@dirrm %%DATADIR%%/shield
-@dirrm %%DATADIR%%/music
-@dirrm %%DATADIR%%/map
-@dirrm %%DATADIR%%/glade/editor
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/citysets
-@dirrm %%DATADIR%%/army
-@dirrm %%DATADIR%%
 @dirrm share/gnome/help/lordsawar/C/figures
 @dirrm share/gnome/help/lordsawar/C
 @dirrm share/gnome/help/lordsawar
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons