cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.13.0.

Browse Source 
Submitted by Aleksander Piotrowski <aleksander.piotrowski@piestrak.waw.pl>.
This commit is contained in:
naddy 2002-07-17 21:08:09 +00:00
parent 178e14a045
commit 31eea7d635
8 changed files with 66 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
games/freeciv/Makefile
View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.31 2001/10/25 02:19:12 brad Exp $
# $OpenBSD: Makefile,v 1.32 2002/07/17 21:08:09 naddy Exp $
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.piotrowski@piestrak.waw.pl>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -14,8 +15,9 @@ PERMIT_DISTFILES_CDROM= Yes
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 +28,22 @@ LIB_DEPENDS+= Imlib.19,gdk_imlib::graphics/imlib
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${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
.include <bsd.port.mk>

6
games/freeciv/distinfo
View File

@ -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

72
games/freeciv/patches/patch-configure
View File

@ -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: patch-configure,v 1.5 2002/07/17 21:08:09 naddy Exp $
--- 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

24
games/freeciv/patches/patch-configure_in
View File

@ -1,24 +0,0 @@
$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

46
games/freeciv/patches/patch-server_stdinhand_c
View File

@ -1,46 +0,0 @@
$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;

12
games/freeciv/patches/patch-server_stdinhand_h
View File

@ -1,12 +0,0 @@
$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 */

5
games/freeciv/pkg/DESCR
View File

@ -4,4 +4,9 @@ the extinction of all other civilizations. Freeciv aims to be
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}

62
games/freeciv/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2001/08/24 01:59:19 naddy Exp $
@comment $OpenBSD: PLIST,v 1.8 2002/07/17 21:08:09 naddy Exp $
bin/civclient
bin/civserver
share/freeciv/Freeciv
@ -17,7 +17,6 @@ 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
@ -26,36 +25,26 @@ 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
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/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/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/tiles.xpm
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 @@ share/locale/sv/LC_MESSAGES/freeciv.mo
@dirrm share/freeciv/scenario
@dirrm share/freeciv/nation
@dirrm share/freeciv/misc
@dirrm share/freeciv/hires
@dirrm share/freeciv/engels
@dirrm share/freeciv/isotrident
@dirrm share/freeciv/default
@dirrm share/freeciv/classic
@dirrm share/freeciv/civ2
@dirrm share/freeciv/civ1
@dirrm share/freeciv