3 files changed, 174 insertions, 112 deletions

diff --git a/games/senken/Makefile b/games/senken/Makefile
index df4743dcf284..1aec71640bba 100644
--- a/games/senken/Makefile
+++ b/games/senken/Makefile
@@ -5,16 +5,20 @@
 # $FreeBSD$
 
 PORTNAME=	senken
-PORTVERSION=	0.2.6
-PORTREVISION=	2
+PORTVERSION=	0.3.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.contrib.andrew.cmu.edu/~tmartin/senken/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A city simulation game
 
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnometarget gtk20
 USE_SDL=	image sdl
-USE_GNOME=	gtk12
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-I/usr/X11R6/include||g  ; \
+		 s|-L/usr/X11R6/lib||g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/games/senken/distinfo b/games/senken/distinfo
index 551799559573..d6527247ce01 100644
--- a/games/senken/distinfo
+++ b/games/senken/distinfo
@@ -1,2 +1,2 @@
-MD5 (senken-0.2.6.tar.gz) = add156aff275c22e13bb0232e7aaec6f
-SIZE (senken-0.2.6.tar.gz) = 1181922
+MD5 (senken-0.3.0.tar.gz) = 464f03baddad251f999174a274f0f422
+SIZE (senken-0.3.0.tar.gz) = 1391010
diff --git a/games/senken/pkg-plist b/games/senken/pkg-plist
index 6a7b069af3ee..56d543e4fecd 100644
--- a/games/senken/pkg-plist
+++ b/games/senken/pkg-plist
@@ -1,108 +1,166 @@
 bin/senken
 bin/senkenserver
-share/senken/games/bigcity.game
-share/senken/games/easy.game
-share/senken/games/growcity.game
-share/senken/games/iowa.game
-share/senken/games/justplay.game
-share/senken/games/makemoney.game
-share/senken/img/tiles.data
-share/senken/img/aboutimg.xpm
-share/senken/img/f_small_green.bmp
-share/senken/img/terrain/Makefile.in
-share/senken/img/terrain/sea.png
-share/senken/img/zone/Makefile.in
-share/senken/img/zone/commerce.png
-share/senken/img/zone/farm.png
-share/senken/img/zone/farm_slope.png
-share/senken/img/zone/house.png
-share/senken/img/zone/industry.png
-share/senken/img/zone/office.png
-share/senken/img/road/Makefile.in
-share/senken/img/road/road_0.png
-share/senken/img/road/road_1.png
-share/senken/img/road/road_end_ne.png
-share/senken/img/road/road_end_nw.png
-share/senken/img/road/road_end_se.png
-share/senken/img/road/road_end_sw.png
-share/senken/img/road/road_ne.png
-share/senken/img/road/road_no___.png
-share/senken/img/road/road_no_ne.png
-share/senken/img/road/road_no_nw.png
-share/senken/img/road/road_no_se.png
-share/senken/img/road/road_no_sw.png
-share/senken/img/road/road_nw.png
-share/senken/img/road/road_se.png
-share/senken/img/road/road_sw.png
-share/senken/img/road/road_turn_e.png
-share/senken/img/road/road_turn_n.png
-share/senken/img/road/road_turn_s.png
-share/senken/img/road/road_turn_w.png
-share/senken/img/power/Makefile.in
-share/senken/img/power/nuclear-045.png
-share/senken/img/power/nuclear-135.png
-share/senken/img/power/nuclear-225.png
-share/senken/img/power/nuclear-315.png
-share/senken/img/government/Makefile.in
-share/senken/img/government/firedept-045.png
-share/senken/img/government/firedept-135.png
-share/senken/img/government/firedept-225.png
-share/senken/img/government/firedept-315.png
-share/senken/img/government/police-045.png
-share/senken/img/government/police-135.png
-share/senken/img/government/police-225.png
-share/senken/img/government/police-315.png
-share/senken/img/government/watertower-045.png
-share/senken/img/government/watertower-135.png
-share/senken/img/government/watertower-225.png
-share/senken/img/government/watertower-315.png
-share/senken/img/house/Makefile.in
-share/senken/img/house/house1-045.png
-share/senken/img/house/house1-135.png
-share/senken/img/house/house1-225.png
-share/senken/img/house/house1-315.png
-share/senken/img/house/house2-045.png
-share/senken/img/house/house2-135.png
-share/senken/img/house/house2-225.png
-share/senken/img/house/house2-315.png
-share/senken/img/industrial/Makefile.in
-share/senken/img/industrial/conserverie-045.png
-share/senken/img/industrial/conserverie-135.png
-share/senken/img/industrial/conserverie-225.png
-share/senken/img/industrial/conserverie-315.png
-share/senken/img/industrial/tanks-045.png
-share/senken/img/industrial/tanks-135.png
-share/senken/img/industrial/tanks-225.png
-share/senken/img/industrial/tanks-315.png
-share/senken/img/industrial/warehouse-045.png
-share/senken/img/industrial/warehouse-135.png
-share/senken/img/industrial/warehouse-225.png
-share/senken/img/industrial/warehouse-315.png
-share/senken/img/commercial/Makefile.in
-share/senken/img/commercial/foodstand-045.png
-share/senken/img/commercial/foodstand-135.png
-share/senken/img/commercial/foodstand-225.png
-share/senken/img/commercial/foodstand-315.png
-share/senken/img/commercial/gas-045.png
-share/senken/img/commercial/gas-135.png
-share/senken/img/commercial/gas-225.png
-share/senken/img/commercial/gas-315.png
-share/senken/img/commercial/hardware-045.png
-share/senken/img/commercial/hardware-135.png
-share/senken/img/commercial/hardware-225.png
-share/senken/img/commercial/hardware-315.png
-share/senken/img/commercial/restaurant-045.png
-share/senken/img/commercial/restaurant-135.png
-share/senken/img/commercial/restaurant-225.png
-share/senken/img/commercial/restaurant-315.png
-@dirrm share/senken/games
-@dirrm share/senken/img/terrain
-@dirrm share/senken/img/zone
-@dirrm share/senken/img/road
-@dirrm share/senken/img/power
-@dirrm share/senken/img/government
-@dirrm share/senken/img/house
-@dirrm share/senken/img/industrial
-@dirrm share/senken/img/commercial
-@dirrm share/senken/img
-@dirrm share/senken
+%%DATADIR%%/games/bigcity.game
+%%DATADIR%%/games/easy.game
+%%DATADIR%%/games/growcity.game
+%%DATADIR%%/games/iowa.game
+%%DATADIR%%/games/justplay.game
+%%DATADIR%%/games/makemoney.game
+%%DATADIR%%/img/aboutimg.xpm
+%%DATADIR%%/img/apartment.png
+%%DATADIR%%/img/apartment2.png
+%%DATADIR%%/img/apartment3.png
+%%DATADIR%%/img/apartment4.png
+%%DATADIR%%/img/bar.png
+%%DATADIR%%/img/brothel.png
+%%DATADIR%%/img/coal.png
+%%DATADIR%%/img/commercial/Makefile.am
+%%DATADIR%%/img/commercial/Makefile.in
+%%DATADIR%%/img/commercial/foodstand-045.png
+%%DATADIR%%/img/commercial/foodstand-135.png
+%%DATADIR%%/img/commercial/foodstand-225.png
+%%DATADIR%%/img/commercial/foodstand-315.png
+%%DATADIR%%/img/commercial/gas-045.png
+%%DATADIR%%/img/commercial/gas-135.png
+%%DATADIR%%/img/commercial/gas-225.png
+%%DATADIR%%/img/commercial/gas-315.png
+%%DATADIR%%/img/commercial/hardware-045.png
+%%DATADIR%%/img/commercial/hardware-135.png
+%%DATADIR%%/img/commercial/hardware-225.png
+%%DATADIR%%/img/commercial/hardware-315.png
+%%DATADIR%%/img/commercial/restaurant-045.png
+%%DATADIR%%/img/commercial/restaurant-135.png
+%%DATADIR%%/img/commercial/restaurant-225.png
+%%DATADIR%%/img/commercial/restaurant-315.png
+%%DATADIR%%/img/conveniencestore.png
+%%DATADIR%%/img/dessert_pattern.png
+%%DATADIR%%/img/dump_empty.png
+%%DATADIR%%/img/dump_full.png
+%%DATADIR%%/img/f_small_green.bmp
+%%DATADIR%%/img/factory.png
+%%DATADIR%%/img/factory2.png
+%%DATADIR%%/img/farm.png
+%%DATADIR%%/img/field_pattern.png
+%%DATADIR%%/img/golfcourse.png
+%%DATADIR%%/img/government/Makefile.am
+%%DATADIR%%/img/government/Makefile.in
+%%DATADIR%%/img/government/firedept-045.png
+%%DATADIR%%/img/government/firedept-135.png
+%%DATADIR%%/img/government/firedept-225.png
+%%DATADIR%%/img/government/firedept-315.png
+%%DATADIR%%/img/government/police-045.png
+%%DATADIR%%/img/government/police-135.png
+%%DATADIR%%/img/government/police-225.png
+%%DATADIR%%/img/government/police-315.png
+%%DATADIR%%/img/government/watertower-045.png
+%%DATADIR%%/img/government/watertower-135.png
+%%DATADIR%%/img/government/watertower-225.png
+%%DATADIR%%/img/government/watertower-315.png
+%%DATADIR%%/img/hospital.png
+%%DATADIR%%/img/hospital2.png
+%%DATADIR%%/img/house/Makefile.am
+%%DATADIR%%/img/house/Makefile.in
+%%DATADIR%%/img/house/house1-045.png
+%%DATADIR%%/img/house/house1-135.png
+%%DATADIR%%/img/house/house1-225.png
+%%DATADIR%%/img/house/house1-315.png
+%%DATADIR%%/img/house/house2-045.png
+%%DATADIR%%/img/house/house2-135.png
+%%DATADIR%%/img/house/house2-225.png
+%%DATADIR%%/img/house/house2-315.png
+%%DATADIR%%/img/house1.png
+%%DATADIR%%/img/house2.png
+%%DATADIR%%/img/industrial/Makefile.am
+%%DATADIR%%/img/industrial/Makefile.in
+%%DATADIR%%/img/industrial/conserverie-045.png
+%%DATADIR%%/img/industrial/conserverie-135.png
+%%DATADIR%%/img/industrial/conserverie-225.png
+%%DATADIR%%/img/industrial/conserverie-315.png
+%%DATADIR%%/img/industrial/tanks-045.png
+%%DATADIR%%/img/industrial/tanks-135.png
+%%DATADIR%%/img/industrial/tanks-225.png
+%%DATADIR%%/img/industrial/tanks-315.png
+%%DATADIR%%/img/industrial/warehouse-045.png
+%%DATADIR%%/img/industrial/warehouse-135.png
+%%DATADIR%%/img/industrial/warehouse-225.png
+%%DATADIR%%/img/industrial/warehouse-315.png
+%%DATADIR%%/img/minifactory.png
+%%DATADIR%%/img/minirestaurant.png
+%%DATADIR%%/img/minischool.png
+%%DATADIR%%/img/office.png
+%%DATADIR%%/img/office2.png
+%%DATADIR%%/img/park.png
+%%DATADIR%%/img/police.png
+%%DATADIR%%/img/pool.png
+%%DATADIR%%/img/port.png
+%%DATADIR%%/img/power/Makefile.am
+%%DATADIR%%/img/power/Makefile.in
+%%DATADIR%%/img/power/nuclear-045.png
+%%DATADIR%%/img/power/nuclear-135.png
+%%DATADIR%%/img/power/nuclear-225.png
+%%DATADIR%%/img/power/nuclear-315.png
+%%DATADIR%%/img/powergas.png
+%%DATADIR%%/img/pump.png
+%%DATADIR%%/img/road/Makefile.am
+%%DATADIR%%/img/road/Makefile.in
+%%DATADIR%%/img/road/road_0.png
+%%DATADIR%%/img/road/road_1.png
+%%DATADIR%%/img/road/road_end_ne.png
+%%DATADIR%%/img/road/road_end_nw.png
+%%DATADIR%%/img/road/road_end_se.png
+%%DATADIR%%/img/road/road_end_sw.png
+%%DATADIR%%/img/road/road_ne.png
+%%DATADIR%%/img/road/road_no___.png
+%%DATADIR%%/img/road/road_no_ne.png
+%%DATADIR%%/img/road/road_no_nw.png
+%%DATADIR%%/img/road/road_no_se.png
+%%DATADIR%%/img/road/road_no_sw.png
+%%DATADIR%%/img/road/road_nw.png
+%%DATADIR%%/img/road/road_se.png
+%%DATADIR%%/img/road/road_sw.png
+%%DATADIR%%/img/road/road_turn_e.png
+%%DATADIR%%/img/road/road_turn_n.png
+%%DATADIR%%/img/road/road_turn_s.png
+%%DATADIR%%/img/road/road_turn_w.png
+%%DATADIR%%/img/rowhouse.png
+%%DATADIR%%/img/school.png
+%%DATADIR%%/img/sewage.png
+%%DATADIR%%/img/sfhouses.png
+%%DATADIR%%/img/supermarket.png
+%%DATADIR%%/img/terrain/Makefile.am
+%%DATADIR%%/img/terrain/Makefile.in
+%%DATADIR%%/img/terrain/sea.png
+%%DATADIR%%/img/tiles.data
+%%DATADIR%%/img/tree.png
+%%DATADIR%%/img/tree2.png
+%%DATADIR%%/img/tree3.png
+%%DATADIR%%/img/tree4.png
+%%DATADIR%%/img/university.png
+%%DATADIR%%/img/w_cloudy.png
+%%DATADIR%%/img/w_cloudy.xpm
+%%DATADIR%%/img/w_partcloudy.png
+%%DATADIR%%/img/w_partcloudy.xpm
+%%DATADIR%%/img/w_rain.png
+%%DATADIR%%/img/w_rain.xpm
+%%DATADIR%%/img/w_sun.xpm
+%%DATADIR%%/img/w_sunny.png
+%%DATADIR%%/img/w_sunny.xpm
+%%DATADIR%%/img/zone/Makefile.am
+%%DATADIR%%/img/zone/Makefile.in
+%%DATADIR%%/img/zone/commerce.png
+%%DATADIR%%/img/zone/farm.png
+%%DATADIR%%/img/zone/farm_slope.png
+%%DATADIR%%/img/zone/house.png
+%%DATADIR%%/img/zone/industry.png
+%%DATADIR%%/img/zone/office.png
+@dirrm %%DATADIR%%/img/zone
+@dirrm %%DATADIR%%/img/terrain
+@dirrm %%DATADIR%%/img/road
+@dirrm %%DATADIR%%/img/power
+@dirrm %%DATADIR%%/img/industrial
+@dirrm %%DATADIR%%/img/house
+@dirrm %%DATADIR%%/img/government
+@dirrm %%DATADIR%%/img/commercial
+@dirrm %%DATADIR%%/img
+@dirrm %%DATADIR%%/games
+@dirrm %%DATADIR%%