[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update: freeciv



hi

here is patch which upgrades freeciv to 1.13.0
changelog is available at http://www.freeciv.org/news/releases/NEWS-1.13.0

besides applying this patch following files should be removed:
patches/patch-configure_in
patches/patch-server_stdinhand_c
patches/patch-server_stdinhand_h

i've set myself as maintainer because there is vacancy 

alek
-- 
Wang-mu wzruszyła ramionami.
- Przyszłość jest tysiącem nici, ale przeszłość tkaniną, której nie można
spleść na nowo. Może byłabym szczęśliwa. Może nie.
 -- Orson Scott Card, Ksenocyd
diff -uNr freeciv/Makefile freeciv.new/Makefile
--- freeciv/Makefile	Thu Oct 25 04:19:12 2001
+++ freeciv.new/Makefile	Wed Jul 17 10:51:29 2002
@@ -2,11 +2,13 @@
 
 COMMENT=	"Civilization clone for X11; multiplayer"
 
-DISTNAME=	freeciv-1.12.0
+DISTNAME=	freeciv-1.13.0
 CATEGORIES=	games
 NEED_VERSION=	1.474
 HOMEPAGE=	http://www.freeciv.org/
 
+MAINTAINER=	Aleksander Piotrowski <aleksander_(_dot_)_piotrowski_(_at_)_piestrak_(_dot_)_waw_(_dot_)_pl>
+
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -14,8 +16,9 @@
 PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/
+EXTRACT_SUFX=	.tar.bz2
 
-FLAVORS=	gtk
+FLAVORS=	gtk esd sdl
 FLAVOR?=
 
 MODULES=	gettext
@@ -26,8 +29,22 @@
 CONFIGURE_ARGS=	--with-xaw
 .endif
 
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+.if ${FLAVOR:L:Msdl}
+LIB_DEPENDS+=	SDL_mixer::devel/sdl-mixer
+CONFIGURE_ARGS+=	--with-sdl-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--disable-sdl-mixer
+.endif
+
+.if ${FLAVOR:L:Mesd}
+LIB_DEPENDS+=	esd.2::audio/esound
+CONFIGURE_ARGS+=	--with-esd-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--disable-esd
+.endif
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I/usr/X11R6/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L/usr/X11R6/lib"
 
 .include <bsd.port.mk>
diff -uNr freeciv/distinfo freeciv.new/distinfo
--- freeciv/distinfo	Thu Mar 21 21:10:33 2002
+++ freeciv.new/distinfo	Mon Jul 15 10:29:22 2002
@@ -1,3 +1,3 @@
-MD5 (freeciv-1.12.0.tar.gz) = e30efc38b30acebbcf8d8133fe7b4807
-RMD160 (freeciv-1.12.0.tar.gz) = e639e35f63c456417260291e8ec3dbc67b79bbae
-SHA1 (freeciv-1.12.0.tar.gz) = 345513d12eb80fca3b13efc03be349f1668e4d0d
+MD5 (freeciv-1.13.0.tar.bz2) = a3544f113dbab77f3c6f00130c1bf181
+RMD160 (freeciv-1.13.0.tar.bz2) = eab405b82fd5c7f7a1f5037f44af3e5ce4d0ece3
+SHA1 (freeciv-1.13.0.tar.bz2) = 7cc9c419b9e601368154752313fdf73cfe6a2892
diff -uNr freeciv/patches/patch-configure freeciv.new/patches/patch-configure
--- freeciv/patches/patch-configure	Fri Aug 24 03:59:19 2001
+++ freeciv.new/patches/patch-configure	Tue Jul 16 23:15:32 2002
@@ -1,64 +1,12 @@
-$OpenBSD: patch-configure,v 1.4 2001/08/24 01:59:19 naddy Exp $
---- configure.orig	Fri Aug 10 13:45:12 2001
-+++ configure	Wed Aug 22 21:16:03 2001
-@@ -5789,9 +5789,9 @@ You may need to install a readline \"dev
- Configuring server without readline support." 1>&2
- 	    fi
- 	else
--	    	    echo $ac_n "checking for rl_completion_matches in -lreadline""... $ac_c" 1>&6
--echo "configure:5794: checking for rl_completion_matches in -lreadline" >&5
--ac_lib_var=`echo readline'_'rl_completion_matches | sed 'y%./+-%__p_%'`
-+	    	    echo $ac_n "checking for completion_matches in -lreadline""... $ac_c" 1>&6
-+echo "configure:5794: checking for completion_matches in -lreadline" >&5
-+ac_lib_var=`echo readline'_'completion_matches | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5803,10 +5803,10 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char rl_completion_matches();
-+char completion_matches();
- 
- int main() {
--rl_completion_matches()
-+completion_matches()
- ; return 0; }
- EOF
- if { (eval echo configure:5813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -5830,7 +5830,7 @@ else
- have_readline_lib=0
+$OpenBSD$
+--- configure.orig	Mon Jul 15 15:30:45 2002
++++ configure	Mon Jul 15 15:32:58 2002
+@@ -7294,7 +7295,7 @@ else
+ have_new_readline_lib=0
  fi
  
--	    if test "$have_readline_lib" = "0"; then
-+	    if test "$have_readline_lib" = "1"; then
- 	        										
- 		echo $ac_n "checking for initscr in -ltermlib""... $ac_c" 1>&6
- echo "configure:5837: checking for initscr in -ltermlib" >&5
-@@ -5994,9 +5994,9 @@ fi
- 
- 
- 		if test x"$HAVE_TERMCAP" != "x"; then
--		    		    		    		    echo $ac_n "checking for rl_filename_completion_function in -lreadline""... $ac_c" 1>&6
--echo "configure:5999: checking for rl_filename_completion_function in -lreadline" >&5
--ac_lib_var=`echo readline'_'rl_filename_completion_function | sed 'y%./+-%__p_%'`
-+		    		    		    		    echo $ac_n "checking for filename_completion_function in -lreadline""... $ac_c" 1>&6
-+echo "configure:5999: checking for filename_completion_function in -lreadline" >&5
-+ac_lib_var=`echo readline'_'filename_completion_function | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6008,10 +6008,10 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char rl_filename_completion_function();
-+char filename_completion_function();
- 
- int main() {
--rl_filename_completion_function()
-+filename_completion_function()
- ; return 0; }
- EOF
- if { (eval echo configure:6018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-           if test "$have_readline_lib" != "1" && test "$have_new_readline_lib" != "1"; then
++           if test "$have_readline_lib" == "1" && test "$have_new_readline_lib" != "1"; then
+                                                                                           
+                echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6
+ echo "configure:7301: checking for tgetent in -ltermlib" >&5
 		    if test "$have_readline_lib" = "1"; then
diff -uNr freeciv/pkg/DESCR freeciv.new/pkg/DESCR
--- freeciv/pkg/DESCR	Fri Aug 24 03:59:19 2001
+++ freeciv.new/pkg/DESCR	Wed Jul 17 10:13:53 2002
@@ -4,4 +4,9 @@
 mostly rule-compatible with Civilization II, published by Sid Meier
 and Microprose.
 
+Flavors:
+ * gtk - build UI using GTK widgets
+ * sdl - sound support using SDL library
+ * esd - sound support using ESD library
+
 WWW: ${HOMEPAGE}
diff -uNr freeciv/pkg/PLIST freeciv.new/pkg/PLIST
--- freeciv/pkg/PLIST	Fri Aug 24 03:59:19 2001
+++ freeciv.new/pkg/PLIST	Tue Jul 16 09:13:10 2002
@@ -1,4 +1,4 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.7 2001/08/24 01:59:19 naddy Exp $
+_(_at_)_comment $OpenBSD$
 bin/civclient
 bin/civserver
 share/freeciv/Freeciv
@@ -17,7 +17,6 @@
 share/freeciv/civ2/techs.ruleset
 share/freeciv/civ2/terrain.ruleset
 share/freeciv/civ2/units.ruleset
-share/freeciv/classic/terrain.ruleset
 share/freeciv/default/buildings.ruleset
 share/freeciv/default/cities.ruleset
 share/freeciv/default/game.ruleset
@@ -26,36 +25,26 @@
 share/freeciv/default/techs.ruleset
 share/freeciv/default/terrain.ruleset
 share/freeciv/default/units.ruleset
-share/freeciv/engels.tilespec
-share/freeciv/engels/cities.spec
-share/freeciv/engels/cities.xpm
-share/freeciv/engels/explosions.spec
-share/freeciv/engels/explosions.xpm
-share/freeciv/engels/flags.spec
-share/freeciv/engels/flags.xpm
-share/freeciv/engels/roads.spec
-share/freeciv/engels/roads.xpm
-share/freeciv/engels/tiles.spec
-share/freeciv/engels/tiles.xpm
-share/freeciv/engels/units.spec
-share/freeciv/engels/units.xpm
-share/freeciv/engels_shields.tilespec
 share/freeciv/freeciv.rc
+share/freeciv/freeciv.rc-2.0
 share/freeciv/helpdata.txt
-share/freeciv/hires.tilespec
-share/freeciv/hires/cities.spec
-share/freeciv/hires/cities.xpm
-share/freeciv/hires/icons.spec
-share/freeciv/hires/icons.xpm
-share/freeciv/hires/nuke.spec
-share/freeciv/hires/nuke.xpm
-share/freeciv/hires/terrain1.spec
-share/freeciv/hires/terrain1.xpm
-share/freeciv/hires/terrain2.spec
-share/freeciv/hires/terrain2.xpm
-share/freeciv/hires/tiles.spec
-share/freeciv/hires/units.spec
-share/freeciv/hires/units.xpm
+share/freeciv/isotrident.tilespec
+share/freeciv/isotrident/cities.spec
+share/freeciv/isotrident/cities.xpm
+share/freeciv/isotrident/flags.spec
+share/freeciv/isotrident/flags.xpm
+share/freeciv/isotrident/nuke.spec
+share/freeciv/isotrident/nuke.xpm
+share/freeciv/isotrident/small.spec
+share/freeciv/isotrident/small.xpm
+share/freeciv/isotrident/terrain1.spec
+share/freeciv/isotrident/terrain1.xpm
+share/freeciv/isotrident/terrain2.spec
+share/freeciv/isotrident/terrain2.xpm
+share/freeciv/isotrident/tiles.spec
+share/freeciv/isotrident/tiles.xpm
+share/freeciv/isotrident/units.spec
+share/freeciv/isotrident/units.xpm
 share/freeciv/misc/chiefs.spec
 share/freeciv/misc/chiefs.xpm
 share/freeciv/misc/intro.xpm
@@ -133,13 +122,12 @@
 share/freeciv/nation/viking.ruleset
 share/freeciv/nation/welsh.ruleset
 share/freeciv/nation/zulu.ruleset
-share/freeciv/scenario/british-isles-80x76-v2.51.sav
-share/freeciv/scenario/earth-160x90-v1.sav
+share/freeciv/scenario/british-isles-85x80-v2.80.sav
 share/freeciv/scenario/earth-160x90-v2.sav
-share/freeciv/scenario/earth-80x50-v1.sav
 share/freeciv/scenario/earth-80x50-v2.sav
-share/freeciv/scenario/europe-200x100-v1.sav
 share/freeciv/scenario/europe-200x100-v2.sav
+share/freeciv/scenario/hagworld-120x60-v1.2.sav
+share/freeciv/scenario/iberian-peninsula-136x100-v1.0.sav
 share/freeciv/trident.tilespec
 share/freeciv/trident/auto_ll.spec
 share/freeciv/trident/cities.spec
@@ -155,9 +143,11 @@
 share/freeciv/trident/units.spec
 share/freeciv/trident/units.xpm
 share/freeciv/trident_shields.tilespec
+share/locale/da/LC_MESSAGES/freeciv.mo
 share/locale/de/LC_MESSAGES/freeciv.mo
 share/locale/en_GB/LC_MESSAGES/freeciv.mo
 share/locale/es/LC_MESSAGES/freeciv.mo
+share/locale/fi/LC_MESSAGES/freeciv.mo
 share/locale/fr/LC_MESSAGES/freeciv.mo
 share/locale/hu/LC_MESSAGES/freeciv.mo
 share/locale/it/LC_MESSAGES/freeciv.mo
@@ -174,10 +164,8 @@
 @dirrm share/freeciv/scenario
 @dirrm share/freeciv/nation
 @dirrm share/freeciv/misc
-_(_at_)_dirrm share/freeciv/hires
-_(_at_)_dirrm share/freeciv/engels
+_(_at_)_dirrm share/freeciv/isotrident
 @dirrm share/freeciv/default
-_(_at_)_dirrm share/freeciv/classic
 @dirrm share/freeciv/civ2
 @dirrm share/freeciv/civ1
 @dirrm share/freeciv