From 4688ecb2f17efac10033519ebc204d48d9c5bb0d Mon Sep 17 00:00:00 2001 From: naddy Date: Fri, 24 Aug 2001 01:59:19 +0000 Subject: [PATCH] Update to 1.12.0. --- games/freeciv/Makefile | 28 +++-- games/freeciv/files/md5 | 6 +- games/freeciv/patches/patch-configure | 100 ++++++++++-------- games/freeciv/patches/patch-configure_in | 24 +++++ games/freeciv/patches/patch-po_Makefile.in.in | 23 ---- .../freeciv/patches/patch-server_stdinhand_c | 46 ++++++++ .../freeciv/patches/patch-server_stdinhand_h | 12 +++ games/freeciv/pkg/DESCR | 6 +- games/freeciv/pkg/PLIST | 46 ++++++-- 9 files changed, 198 insertions(+), 93 deletions(-) create mode 100644 games/freeciv/patches/patch-configure_in delete mode 100644 games/freeciv/patches/patch-po_Makefile.in.in create mode 100644 games/freeciv/patches/patch-server_stdinhand_c create mode 100644 games/freeciv/patches/patch-server_stdinhand_h diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index 52351f3905b..dcc5a350016 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -1,35 +1,33 @@ -# $OpenBSD: Makefile,v 1.28 2001/06/05 21:45:53 naddy Exp $ +# $OpenBSD: Makefile,v 1.29 2001/08/24 01:59:19 naddy Exp $ -COMMENT= "Civilization clone for X; multiplayer" +COMMENT= "Civilization clone for X11; multiplayer" -DISTNAME= freeciv-1.11.4 -PKGNAME= ${DISTNAME}p1 +DISTNAME= freeciv-1.12.0 CATEGORIES= games -NEED_VERSION= 1.402 -MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ - +NEED_VERSION= 1.441 HOMEPAGE= http://www.freeciv.org/ -LIB_DEPENDS= intl.1::devel/gettext - -MAINTAINER= ports@openbsd.org - +# GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -CONFIGURE_STYLE= gnu -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ FLAVORS= gtk FLAVOR?= -.if ${FLAVOR:L} == "gtk" +LIB_DEPENDS= intl.1::devel/gettext + +.if ${FLAVOR:L:Mgtk} LIB_DEPENDS+= Imlib.19::graphics/imlib .else CONFIGURE_ARGS= --with-xaw .endif +CONFIGURE_STYLE= gnu +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + .include diff --git a/games/freeciv/files/md5 b/games/freeciv/files/md5 index a4101d73bb3..ab16f6c4234 100644 --- a/games/freeciv/files/md5 +++ b/games/freeciv/files/md5 @@ -1,3 +1,3 @@ -MD5 (freeciv-1.11.4.tar.gz) = 7f6de102bba326e6da5699f5ad125fad -RMD160 (freeciv-1.11.4.tar.gz) = a64bd2925e83018f6b7ccf7152abe7e965e5f59d -SHA1 (freeciv-1.11.4.tar.gz) = 56c4617c633e657371f9beffd0cec82e4382091b +MD5 (freeciv-1.12.0.tar.gz) = e30efc38b30acebbcf8d8133fe7b4807 +RMD160 (freeciv-1.12.0.tar.gz) = e639e35f63c456417260291e8ec3dbc67b79bbae +SHA1 (freeciv-1.12.0.tar.gz) = 345513d12eb80fca3b13efc03be349f1668e4d0d diff --git a/games/freeciv/patches/patch-configure b/games/freeciv/patches/patch-configure index cba910af2bd..9e4070013d7 100644 --- a/games/freeciv/patches/patch-configure +++ b/games/freeciv/patches/patch-configure @@ -1,48 +1,64 @@ -$OpenBSD: patch-configure,v 1.3 2001/06/03 22:03:56 brad Exp $ ---- configure.orig Thu Jul 20 19:26:32 2000 -+++ configure Sun Jun 3 23:25:42 2001 -@@ -2882,7 +2882,7 @@ else - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo -@@ -5878,7 +5878,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a +$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 - ac_save_LIBS="$LIBS" --LIBS="-lreadline $SERVER_LIBS $LIBS" -+LIBS="-lreadline -lcurses $SERVER_LIBS $LIBS" - cat > conftest.$ac_ext <&6 -- SERVER_LIBS="-lreadline $SERVER_LIBS" -+ SERVER_LIBS="-lreadline -lcurses $SERVER_LIBS" - cat >> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -5830,7 +5830,7 @@ else + have_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 - ac_save_LIBS="$LIBS" --LIBS="-lreadline $SERVER_LIBS $LIBS" -+LIBS="-lreadline -lcurses $SERVER_LIBS $LIBS" - cat > conftest.$ac_ext <&6 -- SERVER_LIBS="-lreadline $SERVER_LIBS" -+ SERVER_LIBS="-lreadline -lcurses $SERVER_LIBS" - cat >> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then diff --git a/games/freeciv/patches/patch-configure_in b/games/freeciv/patches/patch-configure_in new file mode 100644 index 00000000000..d0ecf53507c --- /dev/null +++ b/games/freeciv/patches/patch-configure_in @@ -0,0 +1,24 @@ +$OpenBSD: patch-configure_in,v 1.1 2001/08/24 01:59:19 naddy Exp $ +--- configure.in.orig Fri Aug 10 13:44:27 2001 ++++ configure.in Wed Aug 22 21:15:58 2001 +@@ -394,9 +394,9 @@ Configuring server without readline supp + fi + else + dnl Readline lib +- AC_CHECK_LIB(readline, rl_completion_matches, ++ AC_CHECK_LIB(readline, completion_matches, + have_readline_lib=1, have_readline_lib=0) +- if test "$have_readline_lib" = "0"; then ++ if test "$have_readline_lib" = "1"; then + dnl Many readline installations are broken in that they + dnl don't set the dependesy on the curses lib up correctly. + dnl We give them a hand by trying to guess what might be needed. +@@ -413,7 +413,7 @@ Configuring server without readline supp + dnl We can't check for rl_completion_matches() again, + dnl cause the result is cached. And autoconf doesn't + dnl seem to have a way to uncache it. +- AC_CHECK_LIB(readline, rl_filename_completion_function, ++ AC_CHECK_LIB(readline, filename_completion_function, + have_readline_lib=1, have_readline_lib=0, + "$HAVE_TERMCAP") + if test "$have_readline_lib" = "1"; then diff --git a/games/freeciv/patches/patch-po_Makefile.in.in b/games/freeciv/patches/patch-po_Makefile.in.in deleted file mode 100644 index b0d6da078d2..00000000000 --- a/games/freeciv/patches/patch-po_Makefile.in.in +++ /dev/null @@ -1,23 +0,0 @@ ---- po/Makefile.in.in.orig Sat Jul 22 02:27:02 2000 -+++ po/Makefile.in.in Sat Jul 22 02:27:33 2000 -@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@ - install-data-no: all - install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ -- $(MKINSTALLDIRS) $(datadir); \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ -- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ -@@ -123,7 +123,7 @@ install-data-yes: all - *) destdir=$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ -- dir=$$destdir/$$lang/LC_MESSAGES; \ -+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ diff --git a/games/freeciv/patches/patch-server_stdinhand_c b/games/freeciv/patches/patch-server_stdinhand_c new file mode 100644 index 00000000000..ea83c7356b7 --- /dev/null +++ b/games/freeciv/patches/patch-server_stdinhand_c @@ -0,0 +1,46 @@ +$OpenBSD: patch-server_stdinhand_c,v 1.1 2001/08/24 01:59:19 naddy Exp $ +--- server/stdinhand.c.orig Wed Aug 22 20:54:53 2001 ++++ server/stdinhand.c Wed Aug 22 20:56:14 2001 +@@ -3568,31 +3568,31 @@ the word to complete. We can use the en + in case we want to do some simple parsing. Return the array of matches, + or NULL if there aren't any. + **************************************************************************/ +-char **freeciv_completion(const char *text, int start, int end) ++char **freeciv_completion(char *text, int start, int end) + { + char **matches = (char **)NULL; + + if (is_help(start)) { +- matches = rl_completion_matches(text, help_generator); ++ matches = completion_matches(text, help_generator); + } else if (is_command(start)) { +- matches = rl_completion_matches(text, command_generator); ++ matches = completion_matches(text, command_generator); + } else if (is_rulesout(start)) { +- matches = rl_completion_matches(text, rulesout_generator); ++ matches = completion_matches(text, rulesout_generator); + } else if (is_list(start)) { +- matches = rl_completion_matches(text, list_generator); ++ matches = completion_matches(text, list_generator); + } else if (is_cmdlevel_arg2(start)) { +- matches = rl_completion_matches(text, cmdlevel_arg2_generator); ++ matches = completion_matches(text, cmdlevel_arg2_generator); + } else if (is_cmdlevel_arg1(start)) { +- matches = rl_completion_matches(text, cmdlevel_arg1_generator); ++ matches = completion_matches(text, cmdlevel_arg1_generator); + } else if (is_connection(start)) { +- matches = rl_completion_matches(text, connection_generator); ++ matches = completion_matches(text, connection_generator); + } else if (is_player(start)) { +- matches = rl_completion_matches(text, player_generator); ++ matches = completion_matches(text, player_generator); + } else if (is_server_option(start)) { +- matches = rl_completion_matches(text, option_generator); ++ matches = completion_matches(text, option_generator); + } else if (is_filename(start)) { + /* This function we get from readline */ +- matches = rl_completion_matches(text, rl_filename_completion_function); ++ matches = completion_matches(text, filename_completion_function); + } else /* We have no idea what to do */ + matches = NULL; + diff --git a/games/freeciv/patches/patch-server_stdinhand_h b/games/freeciv/patches/patch-server_stdinhand_h new file mode 100644 index 00000000000..177556f1d5c --- /dev/null +++ b/games/freeciv/patches/patch-server_stdinhand_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-server_stdinhand_h,v 1.1 2001/08/24 01:59:19 naddy Exp $ +--- server/stdinhand.h.orig Wed Aug 22 21:18:22 2001 ++++ server/stdinhand.h Wed Aug 22 21:18:39 2001 +@@ -37,7 +37,7 @@ enum cmdlevel_id access_level_for_next_c + void notify_if_first_access_level_is_available(void); + + #ifdef HAVE_LIBREADLINE +-char **freeciv_completion(const char *text, int start, int end); ++char **freeciv_completion(char *text, int start, int end); + #endif + + #endif /* FC__STDINHAND_H */ diff --git a/games/freeciv/pkg/DESCR b/games/freeciv/pkg/DESCR index 750692d2743..6f058202ddd 100644 --- a/games/freeciv/pkg/DESCR +++ b/games/freeciv/pkg/DESCR @@ -1,3 +1,7 @@ -This is a multiplayer 'Civilisation(tm)' clone for X. +Freeciv is a turn-based strategy game, in which each player becomes +the leader of a civilization, fighting to obtain the ultimate goal: +the extinction of all other civilizations. Freeciv aims to be +mostly rule-compatible with Civilization II, published by Sid Meier +and Microprose. WWW: ${HOMEPAGE} diff --git a/games/freeciv/pkg/PLIST b/games/freeciv/pkg/PLIST index bac6a15f00e..e2a86dfdd46 100644 --- a/games/freeciv/pkg/PLIST +++ b/games/freeciv/pkg/PLIST @@ -1,15 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.6 2001/06/03 21:30:42 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.7 2001/08/24 01:59:19 naddy Exp $ bin/civclient bin/civserver share/freeciv/Freeciv -share/freeciv/freeciv.rc -share/freeciv/engels.tilespec -share/freeciv/engels_shields.tilespec -share/freeciv/trident.tilespec -share/freeciv/trident_shields.tilespec -share/freeciv/helpdata.txt share/freeciv/civ1.serv -share/freeciv/civ2.serv share/freeciv/civ1/buildings.ruleset share/freeciv/civ1/game.ruleset share/freeciv/civ1/governments.ruleset @@ -17,12 +10,14 @@ share/freeciv/civ1/nations.ruleset share/freeciv/civ1/techs.ruleset share/freeciv/civ1/terrain.ruleset share/freeciv/civ1/units.ruleset +share/freeciv/civ2.serv share/freeciv/civ2/buildings.ruleset share/freeciv/civ2/game.ruleset share/freeciv/civ2/governments.ruleset 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 @@ -31,6 +26,7 @@ share/freeciv/default/nations.ruleset 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 @@ -43,6 +39,23 @@ 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/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/misc/chiefs.spec share/freeciv/misc/chiefs.xpm share/freeciv/misc/intro.xpm @@ -67,15 +80,18 @@ share/freeciv/nation/boer.ruleset share/freeciv/nation/brazilian.ruleset share/freeciv/nation/canadian.ruleset share/freeciv/nation/carthaginian.ruleset +share/freeciv/nation/catalan.ruleset +share/freeciv/nation/chilean.ruleset share/freeciv/nation/chinese.ruleset share/freeciv/nation/cornish.ruleset +share/freeciv/nation/croatian.ruleset share/freeciv/nation/czech.ruleset share/freeciv/nation/danish.ruleset share/freeciv/nation/dunedain.ruleset share/freeciv/nation/dutch.ruleset share/freeciv/nation/egyptian.ruleset -share/freeciv/nation/estonian.ruleset share/freeciv/nation/english.ruleset +share/freeciv/nation/estonian.ruleset share/freeciv/nation/filipino.ruleset share/freeciv/nation/finnish.ruleset share/freeciv/nation/french.ruleset @@ -103,7 +119,11 @@ share/freeciv/nation/portuguese.ruleset share/freeciv/nation/roman.ruleset share/freeciv/nation/russian.ruleset share/freeciv/nation/scottish.ruleset +share/freeciv/nation/serbian.ruleset +share/freeciv/nation/silesian.ruleset +share/freeciv/nation/singaporean.ruleset share/freeciv/nation/sioux.ruleset +share/freeciv/nation/slovenian.ruleset share/freeciv/nation/spanish.ruleset share/freeciv/nation/swedish.ruleset share/freeciv/nation/thai.ruleset @@ -113,12 +133,14 @@ share/freeciv/nation/vietnamese.ruleset 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/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/trident.tilespec share/freeciv/trident/auto_ll.spec share/freeciv/trident/cities.spec share/freeciv/trident/cities.xpm @@ -132,24 +154,30 @@ share/freeciv/trident/tiles.spec share/freeciv/trident/tiles.xpm share/freeciv/trident/units.spec share/freeciv/trident/units.xpm +share/freeciv/trident_shields.tilespec share/locale/de/LC_MESSAGES/freeciv.mo share/locale/en_GB/LC_MESSAGES/freeciv.mo share/locale/es/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 share/locale/ja/LC_MESSAGES/freeciv.mo share/locale/nl/LC_MESSAGES/freeciv.mo share/locale/no/LC_MESSAGES/freeciv.mo share/locale/pl/LC_MESSAGES/freeciv.mo share/locale/pt/LC_MESSAGES/freeciv.mo share/locale/pt_BR/LC_MESSAGES/freeciv.mo +share/locale/ro/LC_MESSAGES/freeciv.mo share/locale/ru/LC_MESSAGES/freeciv.mo +share/locale/sv/LC_MESSAGES/freeciv.mo @dirrm share/freeciv/trident @dirrm share/freeciv/scenario @dirrm share/freeciv/nation @dirrm share/freeciv/misc +@dirrm share/freeciv/hires @dirrm share/freeciv/engels @dirrm share/freeciv/default +@dirrm share/freeciv/classic @dirrm share/freeciv/civ2 @dirrm share/freeciv/civ1 @dirrm share/freeciv