3 files changed, 209 insertions, 1 deletions

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 89cafeea7fe8..7aebcea30a2c 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_BZIP2=	yes
+USE_PYTHON=	yes
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
@@ -43,15 +44,29 @@ CONFLICTS=	freeciv-1* freeciv-gtk-1*
 USE_GNOME+=	gtk20
 PKGNAMESUFFIX?=	-gtk2
 CONFIGURE_ARGS+=	--enable-client=gtk2
+PLIST_SUB+=	XAW="@comment "
+PLIST_SUB+=	GTK="@comment "
+PLIST_SUB+=	GTK2=""
 .elif defined(WITH_GTK) || defined(WITH_GTK12)
 CONFLICTS=	freeciv-1* freeciv-gtk2-1*
 USE_GNOME+=	imlib gtk12
 PKGNAMESUFFIX?=	-gtk
 CONFIGURE_ARGS+=	--enable-client=gtk
+PLIST_SUB+=	XAW="@comment "
+PLIST_SUB+=	GTK2="@comment "
+PLIST_SUB+=	GTK=""
 .else
 CONFLICTS=	freeciv-gtk-1* freeciv-gtk2-1*
+.if ${X_WINDOW_SYSTEM:L} == xorg
+LIB_DEPENDS+=	Xaw3d.7:${PORTSDIR}/x11-toolkits/Xaw3d
+.else
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
+CONFIGURE_ARGS+=	--enable-client=xaw3d
+PLIST_SUB+=	GTK="@comment "
+PLIST_SUB+=	GTK2="@comment "
+PLIST_SUB+=	XAW=""
+.endif
 
 pre-fetch:
 .if defined(AUTO_DEPENDS)
diff --git a/games/freeciv/files/patch-configure b/games/freeciv/files/patch-configure
new file mode 100644
index 000000000000..07cd2de8e8f2
--- /dev/null
+++ b/games/freeciv/files/patch-configure
@@ -0,0 +1,191 @@
+--- configure.orig	Sat May  7 01:37:34 2005
++++ configure	Sat May  7 01:47:40 2005
+@@ -12203,13 +12203,13 @@
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test x"$ac_tr_lib" = x"HAVE_LIBX11"     \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12316,13 +12316,13 @@
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test x"$ac_tr_lib" = x"HAVE_LIBX11"     \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12425,13 +12425,13 @@
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test x"$ac_tr_lib" = x"HAVE_LIBX11"     \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12530,13 +12530,13 @@
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test x"$ac_tr_lib" = x"HAVE_LIBX11"     \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12641,13 +12641,13 @@
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test x"$ac_tr_lib" = x"HAVE_LIBX11"     \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12749,13 +12749,13 @@
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test x"$ac_tr_lib" = x"HAVE_LIBX11"     \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12858,13 +12858,13 @@
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test x"$ac_tr_lib" = x"HAVE_LIBX11"     \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12967,13 +12967,13 @@
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test x"$ac_tr_lib" = x"HAVE_LIBX11"     \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -13074,13 +13074,13 @@
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test x"$ac_tr_lib" = x"HAVE_LIBX11"     \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
++        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 6223251f4b82..dd37f8e9a2fb 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -24,7 +24,6 @@ bin/civmanual
 %%DATADIR%%/default/techs.ruleset
 %%DATADIR%%/default/terrain.ruleset
 %%DATADIR%%/default/units.ruleset
-%%DATADIR%%/freeciv.rc-2.0
 %%DATADIR%%/helpdata.txt
 %%DATADIR%%/history/buildings.ruleset
 %%DATADIR%%/history/game.ruleset
@@ -298,6 +297,9 @@ bin/civmanual
 %%DATADIR%%/isophex/terrain2.spec
 %%DATADIR%%/isophex/tiles.png
 %%DATADIR%%/isophex/tiles.spec
+%%XAW%%%%DATADIR%%/Freeciv
+%%GTK%%%%DATADIR%%/freeciv.rc
+%%GTK2%%%%DATADIR%%/freeciv.rc-2.0
 share/locale/da/LC_MESSAGES/freeciv.mo
 share/locale/ca/LC_MESSAGES/freeciv.mo
 share/locale/cs/LC_MESSAGES/freeciv.mo