On 08/22/15 04:50, Anthony J. Bentley wrote:
> Hi,
>
> Here is an update to pioneers-15.3.
>
> Release notes:
> http://sourceforge.net/p/pio/code/HEAD/tree/trunk/pioneers/NEWS
>
> Tested on amd64.
>
> ok?
>
In the port Makefile:
${WRKSRC}/docs/pioneers-meta-server.6
should be
${WRKSRC}/docs/pioneers-metaserver.6
yes?
I can't seem to connect to the debian server games, but I can connect to
the game-host server and localhost, so ok for me with above tweak.
~Brian
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/pioneers/Makefile,v
> retrieving revision 1.43
> diff -u -p -u -p -r1.43 Makefile
> --- Makefile 23 Apr 2015 07:38:01 -0000 1.43
> +++ Makefile 22 Aug 2015 08:41:48 -0000
> @@ -3,8 +3,7 @@
> COMMENT= Settlers of Catan for GNOME/Gtk
>
> GNOME_PROJECT= pioneers
> -GNOME_VERSION= 14.1
> -REVISION= 5
> +GNOME_VERSION= 15.3
>
> CATEGORIES= games
>
> @@ -12,11 +11,11 @@ EXTRACT_SUFX= .tar.gz
>
> HOMEPAGE= http://pio.sourceforge.net/
>
> -# GPLv2
> +# GPLv2+
> PERMIT_PACKAGE_CDROM= Yes
>
> -WANTLIB += c cairo gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 gnome-2
> -WANTLIB += gobject-2.0 gtk-x11-2.0 m notify pango-1.0 pangocairo-1.0
> +WANTLIB += c cairo gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnome-2
> +WANTLIB += gobject-2.0 gtk-3 m notify pango-1.0 pangocairo-1.0
> WANTLIB += pthread
>
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pio/}
> @@ -27,8 +26,7 @@ MODULES= devel/gettext \
> BUILD_DEPENDS= x11/gnome/librsvg
> RUN_DEPENDS= x11/gtk+3,-guic
> LIB_DEPENDS= devel/libnotify \
> - x11/gnome/libgnome \
> - x11/gtk+2
> + x11/gnome/libgnome
>
> MODGNOME_TOOLS= desktop-file-utils yelp
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/pioneers/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 distinfo
> --- distinfo 18 Jan 2015 03:14:01 -0000 1.7
> +++ distinfo 22 Aug 2015 08:41:48 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pioneers-14.1.tar.gz) = UZatL31LoSjyrhOOSvnQPWLDZvA0K4jYca8EKUOF94E=
> -SIZE (pioneers-14.1.tar.gz) = 3784239
> +SHA256 (pioneers-15.3.tar.gz) = aa+lG3FkZWVTa1cbD4l4bTp2FpZSZfGW/VFla1E4Gok=
> +SIZE (pioneers-15.3.tar.gz) = 4154470
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/games/pioneers/patches/patch-Makefile_in,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-Makefile_in
> --- patches/patch-Makefile_in 17 Nov 2010 19:23:05 -0000 1.4
> +++ patches/patch-Makefile_in 22 Aug 2015 08:41:48 -0000
> @@ -1,18 +1,18 @@
> -$OpenBSD: patch-Makefile_in,v 1.4 2010/11/17 19:23:05 jasper Exp $
> ---- Makefile.in.orig Sun Sep 26 11:18:08 2010
> -+++ Makefile.in Wed Nov 17 18:57:54 2010
> -@@ -1055,7 +1055,7 @@ console_cflags = \
> +$OpenBSD$
> +--- Makefile.in.orig Mon Jul 27 18:28:03 2015
> ++++ Makefile.in Mon Jul 27 18:28:04 2015
> +@@ -1288,7 +1288,7 @@ console_cflags = \
> -DDATADIR=\""$(pioneers_datadir)"\" \
> -DTHEMEDIR=\""$(pioneers_themedir_embed)"\" \
> -DLOCALEDIR=\""$(pioneers_localedir)"\" \
> - -DPIONEERS_DIR_DEFAULT=\""$(pioneers_datadir)/games/pioneers"\" \
> + -DPIONEERS_DIR_DEFAULT=\""$(pioneers_datadir)/pioneers"\" \
> - -DPIONEERS_SERVER_CONSOLE_PATH=\""$(bindir)/pioneers-server-console"\" \
> - -DPIONEERS_SERVER_GTK_PATH=\""$(bindir)/pioneers-server-gtk"\" \
> - -DPIONEERS_CLIENT_GTK_PATH=\""$(bindir)/pioneers"\" \
> -@@ -1081,7 +1081,7 @@ gtk_libs = \
> +
> -DPIONEERS_SERVER_CONSOLE_PROGRAM_NAME=\""pioneers-server-console$(EXEEXT)"\"
> \
> + -DPIONEERS_SERVER_GTK_PROGRAM_NAME=\""pioneers-server-gtk$(EXEEXT)"\" \
> + -DPIONEERS_CLIENT_GTK_PROGRAM_NAME=\""pioneers$(EXEEXT)"\" \
> +@@ -1323,7 +1323,7 @@ gtk_libs = \
> $(GNOME2_LIBS) \
> - $(GTK2_LIBS)
> + $(GTK_LIBS)
>
> -configdir = $(datadir)/games/pioneers
> +configdir = $(datadir)/pioneers
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/games/pioneers/patches/patch-configure,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-configure
> --- patches/patch-configure 17 Nov 2010 19:23:05 -0000 1.4
> +++ patches/patch-configure 22 Aug 2015 08:41:48 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure,v 1.4 2010/11/17 19:23:05 jasper Exp $
> ---- configure.orig Sun Sep 26 11:18:09 2010
> -+++ configure Wed Nov 17 18:57:54 2010
> -@@ -14435,7 +14435,7 @@ if test $pioneers_is_mingw_port = yes; then
> +--- configure.orig Mon Jul 7 11:08:41 2014
> ++++ configure Mon Jul 27 18:27:53 2015
> +@@ -16024,7 +16024,7 @@ if test $pioneers_is_mingw_port = yes; then
> DATADIRNAME=.
> else
> pioneers_datadir=$datadir
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/games/pioneers/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 PLIST
> --- pkg/PLIST 23 Apr 2015 07:38:01 -0000 1.10
> +++ pkg/PLIST 22 Aug 2015 08:41:48 -0000
> @@ -3,12 +3,12 @@
> @pkgpath games/gnocatan
> @bin bin/pioneers
> @bin bin/pioneers-editor
> -@bin bin/pioneers-meta-server
> +@bin bin/pioneers-metaserver
> @bin bin/pioneers-server-console
> @bin bin/pioneers-server-gtk
> @bin bin/pioneersai
> @man man/man6/pioneers-editor.6
> -@man man/man6/pioneers-meta-server.6
> +@man man/man6/pioneers-metaserver.6
> @man man/man6/pioneers-server-console.6
> @man man/man6/pioneers-server-gtk.6
> @man man/man6/pioneers.6
> @@ -67,6 +67,7 @@ share/icons/hicolor/scalable/apps/pionee
> share/icons/hicolor/scalable/apps/pioneers-server.svg
> share/icons/hicolor/scalable/apps/pioneers.svg
> share/locale/af/LC_MESSAGES/pioneers.mo
> +share/locale/ca/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
> @@ -80,6 +81,7 @@ 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/locale/zh_CN/LC_MESSAGES/pioneers.mo
> share/omf/
> share/omf/pioneers/
> share/omf/pioneers/pioneers-C.omf
> @@ -99,6 +101,7 @@ share/pioneers/conquest.game
> share/pioneers/crane_island.game
> share/pioneers/default.game
> share/pioneers/four-islands.game
> +share/pioneers/genetic_core.c
> share/pioneers/henjes.game
> share/pioneers/iles.game
> share/pioneers/lobby.game
> @@ -207,12 +210,14 @@ share/pixmaps/pioneers/finish.svg
> share/pixmaps/pioneers/grain.png
> share/pixmaps/pioneers/lumber.png
> share/pixmaps/pioneers/ore.png
> +share/pixmaps/pioneers/pioneers.ico
> +share/pixmaps/pioneers/pioneers.rc
> share/pixmaps/pioneers/road.svg
> share/pixmaps/pioneers/settlement.svg
> share/pixmaps/pioneers/ship.svg
> share/pixmaps/pioneers/ship_move.svg
> share/pixmaps/pioneers/splash.png
> -share/pixmaps/pioneers/style-ai.png
> +share/pixmaps/pioneers/style-ai.svg
> share/pixmaps/pioneers/style-human-1.png
> share/pixmaps/pioneers/style-human-2.png
> share/pixmaps/pioneers/style-human-3.png
>
