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

- update to pioneers-0.12.1

Browse Source 
- use gnome module
This commit is contained in:
ajacoutot 2008-04-28 09:17:07 +00:00
parent 8dbb4d347e
commit eec90a8ed3
7 changed files with 33 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
games/pioneers/Makefile
View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.2 2008/03/03 08:47:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2008/04/28 09:17:07 ajacoutot Exp $
COMMENT= Settlers of Catan for GNOME/Gtk
DISTNAME= pioneers-0.11.3
PKGNAME= ${DISTNAME}p0
CATEGORIES= games x11/gnome
GNOME_PROJECT= pioneers
GNOME_VERSION= 0.12.1
PATCHFILES= pioneers_0_11_3.patch:0
CATEGORIES= games
EXTRACT_SUFX= .tar.gz
HOMEPAGE= http://pio.sourceforge.net/
@ -26,27 +27,26 @@ WANTLIB= ORBit-2 ORBitCosNaming-2 X11 Xau Xcomposite Xcursor \
pcre png popt pthread ssl util xml2 z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pio/}
MASTER_SITES0= http://www.bsdfrog.org/OpenBSD/distfiles/
MODULES= devel/gettext
MODULES= devel/gettext \
x11/gnome
BUILD_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \
::x11/gnome/librsvg,no_gnome
::x11/gnome/librsvg
RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \
:desktop-file-utils-*:devel/desktop-file-utils \
::x11/gnome/librsvg,no_gnome \
::x11/gnome/yelp
::x11/gnome/librsvg
LIB_DEPENDS= gnome-2.>=1900::x11/gnome/libgnome
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
DESKTOP_FILES= Yes
MODGNOME_HELP_FILES=Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_path_pngtopnm=""
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-protocol=IPv4
pre-configure:
@perl -pi -e 's,games/pioneers,pioneers,g;' \

15
games/pioneers/distinfo
View File

@ -1,10 +1,5 @@
MD5 (pioneers-0.11.3.tar.gz) = uRhPsw8/sE09AQYooqErUg==
MD5 (pioneers_0_11_3.patch) = aOvjwReUi7Yq1A3TczGrDg==
RMD160 (pioneers-0.11.3.tar.gz) = py5K4LRIm/lE3DCriQOaq+BPjXw=
RMD160 (pioneers_0_11_3.patch) = h6+U0IuKcKSLou6iACD9sshBOLo=
SHA1 (pioneers-0.11.3.tar.gz) = mhEx3SkeEjZ6hwM1oejHjaEB0a0=
SHA1 (pioneers_0_11_3.patch) = LJU47G2oygNTKR2AB1q7evZgKXk=
SHA256 (pioneers-0.11.3.tar.gz) = e2LEAVlLLr6jEMXGO9Y5gRKEzSx9u4fWBRhQ/LrkzDk=
SHA256 (pioneers_0_11_3.patch) = jh/z008edHj6m77CgD/8KnVkztGK65zUsNN+VOkO8ys=
SIZE (pioneers-0.11.3.tar.gz) = 2834584
SIZE (pioneers_0_11_3.patch) = 73278
MD5 (pioneers-0.12.1.tar.gz) = sOVoRyRFfesLSr51/FwhWA==
RMD160 (pioneers-0.12.1.tar.gz) = FALJ5DN8YkFZ+2Lc4uIIHXruw1s=
SHA1 (pioneers-0.12.1.tar.gz) = xblY10zlgKCQA3CUIa6HCxEpLUQ=
SHA256 (pioneers-0.12.1.tar.gz) = U2t29unvaDochLgCzpGf4suiHBT5nBy4LMaPv0LMrxw=
SIZE (pioneers-0.12.1.tar.gz) = 2762830

10
games/pioneers/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/02/02 09:40:58 ajacoutot Exp $
--- Makefile.in.orig Tue Jan 8 16:49:36 2008
+++ Makefile.in Tue Jan 8 16:49:51 2008
@@ -1004,7 +1004,7 @@ console_cflags = \
$OpenBSD: patch-Makefile_in,v 1.2 2008/04/28 09:17:07 ajacoutot Exp $
--- Makefile.in.orig Sun Apr 27 22:52:58 2008
+++ Makefile.in Mon Apr 28 10:33:46 2008
@@ -1034,7 +1034,7 @@ console_cflags = \
-DDATADIR=\""$(pioneers_datadir)"\" \
-DTHEMEDIR=\""$(pioneers_themedir_embed)"\" \
-DLOCALEDIR=\""$(pioneers_localedir)"\" \
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/02/02 09:40:58 ajacoutot Exp $
-DPIONEERS_SERVER_CONSOLE_PATH=\""$(bindir)/pioneers-server-console"\" \
-DPIONEERS_SERVER_GTK_PATH=\""$(bindir)/pioneers-server-gtk"\" \
-DPIONEERS_CLIENT_GTK_PATH=\""$(bindir)/pioneers"\" \
@@ -1030,7 +1030,7 @@ gtk_libs = \
@@ -1060,7 +1060,7 @@ gtk_libs = \
$(GNOME2_LIBS) \
$(GTK2_LIBS)

27
games/pioneers/patches/patch-common_network_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-common_network_c,v 1.1.1.1 2008/02/02 09:40:58 ajacoutot Exp $
--- common/network.c.orig Fri Jan 11 10:29:49 2008
+++ common/network.c Fri Jan 11 10:30:42 2008
@@ -566,7 +566,11 @@ gboolean net_connect(Session * ses, const gchar * host
#ifdef HAVE_GETADDRINFO_ET_AL
memset(&hints, 0, sizeof(hints));
+#ifndef __OpenBSD__
hints.ai_family = PF_UNSPEC;
+#else
+ hints.ai_family = PF_INET;
+#endif
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
@@ -724,7 +728,11 @@ int net_open_listening_socket(const gchar * port, gcha
memset(&hints, 0, sizeof(hints));
+#ifndef __OpenBSD__
hints.ai_family = AF_UNSPEC;
+#else
+ hints.ai_family = AF_INET;
+#endif
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
hints.ai_flags = AI_PASSIVE;

48
games/pioneers/patches/patch-common_state_c
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-common_state_c,v 1.1.1.1 2008/02/02 09:40:58 ajacoutot Exp $
--- common/state.c.orig Sun Oct 7 19:56:39 2007
+++ common/state.c Fri Jan 11 10:38:05 2008
@@ -71,7 +71,11 @@ static void route_event(StateMachine * sm, gint event)
StateFunc curr_state;
gpointer user_data;
- curr_state = sm_current(sm);
+ if (sm->stack_ptr >= 0)
+ curr_state = sm_current(sm);
+ else
+ curr_state = NULL;
+
user_data = sm->user_data;
if (user_data == NULL)
user_data = sm;
@@ -89,16 +93,18 @@ static void route_event(StateMachine * sm, gint event)
switch (event) {
case SM_ENTER:
- curr_state(user_data, event);
+ if (curr_state != NULL)
+ curr_state(user_data, event);
break;
case SM_INIT:
- curr_state(user_data, event);
+ if (curr_state != NULL)
+ curr_state(user_data, event);
if (!sm->is_dead && sm->global !=NULL)
sm->global (user_data, event);
break;
case SM_RECV:
sm_cancel_prefix(sm);
- if (curr_state(user_data, event))
+ if (curr_state != NULL && curr_state(user_data, event))
break;
sm_cancel_prefix(sm);
if (!sm->is_dead
@@ -112,7 +118,8 @@ static void route_event(StateMachine * sm, gint event)
case SM_NET_CLOSE:
sm_close(sm);
default:
- curr_state(user_data, event);
+ if (curr_state != NULL)
+ curr_state(user_data, event);
if (!sm->is_dead && sm->global !=NULL)
sm->global (user_data, event);
break;

8
games/pioneers/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2008/02/02 09:40:58 ajacoutot Exp $
--- configure.orig Tue Jan 8 16:49:13 2008
+++ configure Tue Jan 8 16:49:25 2008
@@ -23458,7 +23458,7 @@ if test $pioneers_is_mingw_port = yes; then
$OpenBSD: patch-configure,v 1.2 2008/04/28 09:17:07 ajacoutot Exp $
--- configure.orig Sun Apr 27 22:52:55 2008
+++ configure Mon Apr 28 10:33:46 2008
@@ -24140,7 +24140,7 @@ if test $pioneers_is_mingw_port = yes; then
pioneers_localedir=locale
else
pioneers_datadir=$datadir

6
games/pioneers/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/02/02 09:40:58 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/04/28 09:17:07 ajacoutot Exp $
@conflict gnocatan-*
@pkgpath games/gnocatan
bin/pioneers
@ -58,6 +58,8 @@ share/gnome/help/pioneers/C/images/wool.png
share/gnome/help/pioneers/C/legal.xml
share/gnome/help/pioneers/C/pioneers.xml
share/locale/af/LC_MESSAGES/pioneers.mo
share/locale/cs/LC_MESSAGES/pioneers.mo
share/locale/da/LC_MESSAGES/pioneers.mo
share/locale/de/LC_MESSAGES/pioneers.mo
share/locale/es/LC_MESSAGES/pioneers.mo
share/locale/fr/LC_MESSAGES/pioneers.mo
@ -65,6 +67,7 @@ share/locale/hu/LC_MESSAGES/pioneers.mo
share/locale/it/LC_MESSAGES/pioneers.mo
share/locale/ja/LC_MESSAGES/pioneers.mo
share/locale/nl/LC_MESSAGES/pioneers.mo
share/locale/pt/LC_MESSAGES/pioneers.mo
share/locale/sv/LC_MESSAGES/pioneers.mo
share/omf/pioneers/
share/omf/pioneers/pioneers-C.omf
@ -92,6 +95,7 @@ share/pioneers/pond.game
share/pioneers/seafarers-gold.game
share/pioneers/seafarers.game
share/pioneers/small.game
share/pioneers/south_africa.game
share/pioneers/square.game
share/pioneers/star.game
share/pioneers/themes/