On Wed, Jul 13, 2005 at 10:56:35PM +0100, Rui Reis wrote:
> Attached is an update for freeciv, works for me on i386.
>
> please test and comment.
> Rui Reis
I think you forgot to remove the two patches. The diff below does it.
Apart from that, Freeciv 2.0.3 seems to install and work okay.
-p.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/freeciv/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile 9 Jul 2005 10:36:18 -0000 1.43
+++ Makefile 14 Jul 2005 09:41:22 -0000
@@ -4,7 +4,7 @@
COMMENT-client= "Freeciv client"
COMMENT-share= "shared data files for Freeciv"
-VERSION= 2.0.2
+VERSION= 2.0.3
DISTNAME= freeciv-${VERSION}
PKGNAME= freeciv-server-${VERSION}
PKGNAME-client= freeciv-client-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/freeciv/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 9 Jul 2005 10:36:18 -0000 1.5
+++ distinfo 14 Jul 2005 09:41:22 -0000
@@ -1,4 +1,4 @@
-MD5 (freeciv-2.0.2.tar.bz2) = dadd040a767dd5e1a7f1e18c7dfa756f
-RMD160 (freeciv-2.0.2.tar.bz2) = 68eff4838530b4f4a1c20127ccdea06c7a77e580
-SHA1 (freeciv-2.0.2.tar.bz2) = 622d30417061c5a18ef3ace1df50691d729ce14d
-SIZE (freeciv-2.0.2.tar.bz2) = 8456328
+MD5 (freeciv-2.0.3.tar.bz2) = 3a8fbcedc15ded1c1c48c78161cac0c9
+RMD160 (freeciv-2.0.3.tar.bz2) = e48ee19507c7fdc9018183eb8b833ad3b28573ad
+SHA1 (freeciv-2.0.3.tar.bz2) = 8019458d54b1ea917745b30605c1f9f42d356cc8
+SIZE (freeciv-2.0.3.tar.bz2) = 8463169
Index: patches/patch-common_dataio_c
===================================================================
RCS file: patches/patch-common_dataio_c
diff -N patches/patch-common_dataio_c
--- patches/patch-common_dataio_c 2 Jun 2004 12:40:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-common_dataio_c,v 1.1 2004/06/02 12:40:42 sturm Exp $
---- common/dataio.c.orig 2003-12-02 19:56:58.000000000 +0100
-+++ common/dataio.c 2004-05-06 12:27:37.000000000 +0200
-@@ -225,7 +225,7 @@ void dio_put_uint16(struct data_out *dou
- void dio_put_uint32(struct data_out *dout, int value)
- {
- if (enough_space(dout, 4)) {
-- unsigned long x = htonl(value);
-+ unsigned int x = htonl(value);
-
- memcpy(ADD_TO_POINTER(dout->dest, dout->current), &x, 4);
- dout->current += 4;
-@@ -461,7 +461,7 @@ void dio_get_uint32(struct data_in *din,
- {
- if (enough_data(din, 4)) {
- if (dest) {
-- unsigned long x;
-+ unsigned int x;
-
- memcpy(&x, ADD_TO_POINTER(din->src, din->current), 4);
- *dest = ntohl(x);
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 9 Jul 2005 10:36:18 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.8 2005/07/09 10:36:18 alek Exp $
---- configure.orig 2004-05-31 13:55:42.000000000 +0200
-+++ configure 2004-05-31 13:57:44.000000000 +0200
-@@ -6855,7 +6860,7 @@ if test "${ac_cv_lib_intl_ngettext+set}"
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lintl $LIBS"
-+LIBS="-lintl ${LIBICONV} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -6908,7 +6913,7 @@ if test $ac_cv_lib_intl_ngettext = yes;
- echo $ECHO_N "checking whether libintl's ngettext works at runtime...
$ECHO_C" >&6
-
- templibs="$LIBS"
--LIBS=""-lintl" $LIBS"
-+LIBS=""-lintl" ${LIBICONV} $LIBS"
- templang="$LANG"
- LANG="de_DE"
- if test "$cross_compiling" = yes; then
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/freeciv/pkg/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- pkg/PLIST 9 Jul 2005 10:36:18 -0000 1.11
+++ pkg/PLIST 14 Jul 2005 09:41:22 -0000
@@ -1,3 +1,57 @@
@comment $OpenBSD: PLIST,v 1.11 2005/07/09 10:36:18 alek Exp $
bin/civserver
@man man/man6/civserver.6
+share/freeciv/
+share/freeciv/civ1/
+share/freeciv/civ2/
+share/freeciv/default/
+share/freeciv/history/
+share/freeciv/nation/
+share/freeciv/scenario/
+share/locale/
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
+share/locale/da/
+share/locale/da/LC_MESSAGES/
+share/locale/de/
+share/locale/de/LC_MESSAGES/
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
+share/locale/es/
+share/locale/es/LC_MESSAGES/
+share/locale/et/
+share/locale/et/LC_MESSAGES/
+share/locale/fi/
+share/locale/fi/LC_MESSAGES/
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
+share/locale/he_IL/
+share/locale/he_IL/LC_MESSAGES/
+share/locale/hu/
+share/locale/hu/LC_MESSAGES/
+share/locale/it/
+share/locale/it/LC_MESSAGES/
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
+share/locale/nb/
+share/locale/nb/LC_MESSAGES/
+share/locale/nl/
+share/locale/nl/LC_MESSAGES/
+share/locale/no/
+share/locale/no/LC_MESSAGES/
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
+share/locale/pt/
+share/locale/pt/LC_MESSAGES/
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
+share/locale/ro/
+share/locale/ro/LC_MESSAGES/
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
+share/locale/uk/
+share/locale/uk/LC_MESSAGES/
