UPDATE: games/manaplus 1.6.3.26 => 1.7.11.11
Hi ports --
Attached is a long overdue update to games/manaplus, bringing in over a
year and a half's worth of development.
It is also a complete reorganizing of the port. Most significantly, I'd
like to make the SDL2 FLAVOR the default and drop the SDL1.2 client.
Four years ago, when the SDL2 client was first introduced, it made sense
to have a FLAVOR for SDL2, since it was still experimental. It is no
longer experimental and I don't see any reason to not prefer SDL2
exclusively these days.
Also take MAINTAINER. I was MAINTAINER of this for many years, and I
guess it's time to be responsible for it once again.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.90
diff -u -p -u -p -r1.90 Makefile
--- Makefile 16 Nov 2017 18:39:25 - 1.90
+++ Makefile 11 Dec 2017 02:49:44 -
@@ -1,63 +1,47 @@
# $OpenBSD: Makefile,v 1.90 2017/11/16 18:39:25 naddy Exp $
+V = 1.7.11.11
COMMENT = client for The Mana World
-V = 1.6.3.26
-REVISION = 3
DISTNAME = manaplus-${V}
EXTRACT_SUFX = .tar.xz
CATEGORIES = games x11
HOMEPAGE = http://manaplus.org/
+MAINTAINER = Brian Callahan
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL X11 c crypto curl iconv intl m nghttp2 physfs png pthread
-WANTLIB += ssl ${COMPILER_LIBCXX} xml2 z
+WANTLIB += ${COMPILER_LIBCXX} GL SDL2 SDL2_gfx SDL2_image SDL2_mixer
+WANTLIB += SDL2_net SDL2_ttf X11 c crypto curl execinfo iconv
+WANTLIB += intl m nghttp2 png ssl xml2 z
MASTER_SITES = http://download.evolonline.org/manaplus/download/${V}/
-FLAVORS = sdl2
-FLAVOR ?=
+BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ devel/gettext-tools
-RUN_DEPENDS = devel/desktop-file-utils \
- devel/xdg-utils
LIB_DEPENDS = devel/gettext \
- devel/physfs \
- net/curl \
- textproc/libxml
-
-CONFIGURE_STYLE = gnu
-CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ARGS = --without-librt
-
-BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS} \
- devel/gettext-tools
-
-.if ${FLAVOR:Msdl2}
-WANTLIB += SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf
-
-LIB_DEPENDS += devel/sdl2-gfx \
+ devel/libexecinfo \
+ devel/sdl2-gfx \
devel/sdl2-image \
devel/sdl2-mixer \
devel/sdl2-net \
- devel/sdl2-ttf
+ devel/sdl2-ttf \
+ net/curl \
+ textproc/libxml
-CONFIGURE_ARGS += --with-sdl2 --without-internalsdlgfx
-.else
-WANTLIB += SDL SDL_gfx SDL_image SDL_mixer SDL_net SDL_ttf
-
-LIB_DEPENDS += devel/sdl-gfx \
- devel/sdl-image \
- devel/sdl-mixer \
- devel/sdl-net \
- devel/sdl-ttf
+RUN_DEPENDS = devel/desktop-file-utils \
+ devel/xdg-utils
-RUN_DEPENDS += x11/xsel
-.endif
+CONFIGURE_STYLE = gnu
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ARGS = --without-librt \
+ --with-sdl2 \
+ --without-internalsdlgfx
-FAKE_FLAGS += desktopdir=${PREFIX}/share/applications/
+FAKE_FLAGS += desktopdir=${PREFIX}/share/applications/
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.9
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.78
diff -u -p -u -p -r1.78 distinfo
--- distinfo 2 Apr 2016 20:58:58 - 1.78
+++ distinfo 11 Dec 2017 02:49:44 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.6.3.26.tar.xz) = h67k/a7Akzf+cR7oXlFUcDdOqTh+RWIsqnEqZBT1slM=
-SIZE (manaplus-1.6.3.26.tar.xz) = 9721160
+SHA256 (manaplus-1.7.11.11.tar.xz) = DF6zd79ICP9cfUAg0VVPKut+llh9zA0b4TmlujrGouY=
+SIZE (manaplus-1.7.11.11.tar.xz) = 14940736
Index: patches/patch-src_Makefile_am
===
RCS file: /cvs/ports/games/manaplus/patches/patch-src_Makefile_am,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_Makefile_am
--- patches/patch-src_Makefile_am 4 Nov 2016 14:33:26 - 1.3
+++ patches/patch-src_Makefile_am 11 Dec 2017 02:49:44 -
@@ -1,9 +1,11 @@
$OpenBSD: patch-src_Makefile_am,v 1.3 2016/11/04 14:33:26 naddy Exp $
src/Makefile.am.orig Thu Mar 24 19:09:25 2016
-+++ src/Makefile.am Fri Nov 4 15:05:37 2016
-@@ -1,5 +1,7 @@
- AUTOMAKE_OPTIONS = subdir-objects
+Index: src/Makefile.am
+--- src/Makefile.am.orig
src/Makefile.am
+@@ -8,6 +8,8 @@ AUTOMAKE_OPTIONS = subdir-objects
+ # ASAN_OPTIONS=detect_leaks=1
+ if ENABLE_MANAPLUSGAME
+LIBS += @LTLIBINTL@
+
if ENABLE_DYECMD
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/manaplus/pkg/PLIST,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 PLIST
--- pkg/PLIST 2 Apr 2016 20:58:58 - 1.35
+++ pkg/PLIST 11 Dec 2017 02:49:44 -
@@ -7,11 +7,14 @@
@bin bin/manaplus
@man man/man6/manaplus.6
@man man/man6/manaplustest.6
+share/appdata/
+share/appdata/manaplus.appdata.xml
share/applications/manaplus.desktop
share/applications/manaplustest.desktop
share/locale/ca/LC_MESSAGES/manaplus.mo
shar
Re: UPDATE: games/manaplus 1.3.10.27.2 => 1.3.11.10
On 11/14/13 01:03, Brian Callahan wrote: On 11/9/2013 4:38 PM, Brian Callahan wrote: Hi ports -- Here's a rather involved update for games/manaplus. Highlights: * Enable manaplus's internal guichan. Guichan as a project appears dead upstream, manaplus is the only port that uses it, and manaplus's internal guichan is well maintained and has many more features and bugfixes. I also want to remove devel/guichan after this goes in but will discuss it in another email. * Add an SDL2 flavor. While I've been using it for a while, the SDL2 client is now no longer considered experimental. Upstream supports both the SDL1.2 and the SDL2 clients for now but I think reality suggests that moving to solely SDL2 is the eventuality. I hesitate to move to solely the SDL2 client now because there seems to be a bug with the SDL2 client on loongson. * Some miscellaneous cleanups. OK? ~Brian Ping. Some notes: I've discovered that the sdl2 flavor doesn't work on i386 or loongson. I'm not sure yet if it's my i386 machine (since it seems a bit odd it doesn't work there) or if it's a bug. Still, the sdl2 flavor definitely works on amd64 so I want the option for sdl2 to be included. I'm going to commit this in the next few days if no one objects.
Re: UPDATE: games/manaplus 1.3.10.27.2 => 1.3.11.10
On 11/9/2013 4:38 PM, Brian Callahan wrote: Hi ports -- Here's a rather involved update for games/manaplus. Highlights: * Enable manaplus's internal guichan. Guichan as a project appears dead upstream, manaplus is the only port that uses it, and manaplus's internal guichan is well maintained and has many more features and bugfixes. I also want to remove devel/guichan after this goes in but will discuss it in another email. * Add an SDL2 flavor. While I've been using it for a while, the SDL2 client is now no longer considered experimental. Upstream supports both the SDL1.2 and the SDL2 clients for now but I think reality suggests that moving to solely SDL2 is the eventuality. I hesitate to move to solely the SDL2 client now because there seems to be a bug with the SDL2 client on loongson. * Some miscellaneous cleanups. OK? ~Brian Ping. Some notes: I've discovered that the sdl2 flavor doesn't work on i386 or loongson. I'm not sure yet if it's my i386 machine (since it seems a bit odd it doesn't work there) or if it's a bug. Still, the sdl2 flavor definitely works on amd64 so I want the option for sdl2 to be included.
UPDATE: games/manaplus 1.3.10.27.2 => 1.3.11.10
Hi ports --
Here's a rather involved update for games/manaplus. Highlights:
* Enable manaplus's internal guichan. Guichan as a project appears dead
upstream, manaplus is the only port that uses it, and manaplus's
internal guichan is well maintained and has many more features and
bugfixes. I also want to remove devel/guichan after this goes in but
will discuss it in another email.
* Add an SDL2 flavor. While I've been using it for a while, the SDL2
client is now no longer considered experimental. Upstream supports both
the SDL1.2 and the SDL2 clients for now but I think reality suggests
that moving to solely SDL2 is the eventuality. I hesitate to move to
solely the SDL2 client now because there seems to be a bug with the SDL2
client on loongson.
* Some miscellaneous cleanups.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile 28 Oct 2013 17:32:31 - 1.26
+++ Makefile 9 Nov 2013 20:41:40 -
@@ -2,8 +2,8 @@
COMMENT = extended client for The Mana World
-V = 1.3.10.27
-DISTNAME = manaplus-${V}.2
+V = 1.3.11.10
+DISTNAME = manaplus-${V}
EXTRACT_SUFX = .tar.xz
CATEGORIES = games x11
@@ -15,29 +15,45 @@ MAINTAINER = Brian Callahan http://download.evolonline.org/manaplus/download/${V}/
+FLAVORS = sdl2
+FLAVOR ?=
+
MODULES = devel/gettext
-RUN_DEPENDS= devel/desktop-file-utils
-LIB_DEPENDS = devel/sdl-image \
- devel/sdl-gfx \
- devel/sdl-mixer \
- devel/sdl-net \
- devel/sdl-ttf \
- devel/guichan \
- devel/physfs \
+RUN_DEPENDS = devel/desktop-file-utils
+LIB_DEPENDS = devel/physfs \
net/curl \
textproc/libxml
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS = --without-librt --without-internalguichan
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ARGS = --without-librt
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
+
+.if ${FLAVOR:Msdl2}
+WANTLIB += SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf
+
+LIB_DEPENDS += devel/sdl2-gfx \
+ devel/sdl2-image \
+ devel/sdl2-mixer \
+ devel/sdl2-net \
+ devel/sdl2-ttf
+
+CONFIGURE_ARGS += --with-sdl2 --without-internalsdlgfx
+.else
+WANTLIB += SDL SDL_gfx SDL_image SDL_mixer SDL_net SDL_ttf
+
+LIB_DEPENDS += devel/sdl-gfx \
+ devel/sdl-image \
+ devel/sdl-mixer \
+ devel/sdl-net \
+ devel/sdl-ttf
+.endif
FAKE_FLAGS += desktopdir=${PREFIX}/share/applications/
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 distinfo
--- distinfo 28 Oct 2013 17:32:31 - 1.22
+++ distinfo 9 Nov 2013 20:41:40 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.3.10.27.2.tar.xz) = VFAtMveDpWZQp9GLPndekUwPIm7p4HVUUgcF4Xrtya4=
-SIZE (manaplus-1.3.10.27.2.tar.xz) = 7352404
+SHA256 (manaplus-1.3.11.10.tar.xz) = 8mptCPAfDyN9YY1LcCuKTEkhUyBtTI7L0ZwFHmlALnY=
+SIZE (manaplus-1.3.11.10.tar.xz) = 7363924
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 9 Nov 2013 20:41:40 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Commmited upstream.
+
+--- configure.ac.orig Sat Nov 9 15:25:15 2013
configure.ac Sat Nov 9 15:25:29 2013
+@@ -138,7 +138,7 @@ if test "x$with_internalsdlgfx" == "xno"; then
+
+ AC_CHECK_LIB(SDL2_gfx, rotozoomSurfaceXY, ,
+ AC_MSG_ERROR([ *** Unable to find SDL2_gfx library (http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx)]))
+-AC_CHECK_HEADERS(SDL_rotozoom.h, ,)
++AC_CHECK_HEADERS(SDL2_rotozoom.h, ,)
+ else
+ with_internalsdlgfx=yes
+ AC_DEFINE(USE_INTERNALSDLGFX, 1, [Defines if ManaPlus should use internal sdlgfx2])
Index: patches/patch-src_Makefile_am
===
RCS file: patches/patch-src_Makefile_am
diff -N patches/patch-src_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Makefile_am 9 Nov 2013 20:41:40 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Committed upstream.
+
+--- src/Makefile.am.orig Sat Nov 9 15:23:28 2013
src/Makefile.am Sat Nov 9 15:24:56 2013
+@@ -155,6 +155,9 @@ manaplus_SOURCES += sdl2gfx/SDL2_framerate.c \
+ sdl2gfx/SDL2_framerate.h \
+ sdl2gfx/SDL2_rotozoom.c \
+ sdl2gfx/SDL2_rotozoom.h
++else
++dyecmd_CXXFLAGS += -DUSE_SDL2
++manaplus_CXXFLAGS += -DUSE_SDL2
+ endif
+ endif
+
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/manaplus/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST
--- pkg/PLIST 12 Oct 2013 19:15:01 - 1.14
+++ pkg/PLIST 9 Nov 2013 20:41:40 -
@@ -3,6 +3,7 @@
@conflict tmw-mu
Re: UPDATE: games/manaplus 1.3.5.26 => 1.3.6.9
On 06/08/13 21:02, Brian Callahan wrote:
Hi ports --
Attached you'll find the latest games/manaplus update.
Includes the shiny new manaplus.org HOMEPAGE. Also I chatted with
upstream and got the majority of our local patches committed.
Works for me on amd64, loongson & macppc.
OK?
~Brian
Whoops. Now includes the new homepage.
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 26 May 2013 15:57:13 - 1.15
+++ Makefile 9 Jun 2013 01:05:45 -
@@ -2,13 +2,13 @@
COMMENT = extended client for The Mana World
-V = 1.3.5.26
+V = 1.3.6.9
DISTNAME = manaplus-${V}
EXTRACT_SUFX = .tar.xz
CATEGORIES = games x11
-HOMEPAGE = http://manaplus.evolonline.org/
+HOMEPAGE = http://manaplus.org/
MAINTAINER = Brian Callahan
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 26 May 2013 15:57:13 - 1.11
+++ distinfo 9 Jun 2013 01:05:45 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.3.5.26.tar.xz) = lrFuNySRxytb0Xzfph9TiXl71Vkqhx/5U5u2UBXfrHk=
-SIZE (manaplus-1.3.5.26.tar.xz) = 6921164
+SHA256 (manaplus-1.3.6.9.tar.xz) = L06KhZvOyC/x7pQDoiW29x2yudAnqGQAm0GLBV5ghzA=
+SIZE (manaplus-1.3.6.9.tar.xz) = 6920400
Index: patches/patch-src_logger_h
===
RCS file: patches/patch-src_logger_h
diff -N patches/patch-src_logger_h
--- patches/patch-src_logger_h 4 Feb 2013 15:03:12 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_logger_h,v 1.1 2013/02/04 15:03:12 bcallah Exp $
src/logger.h.orig Thu Jan 31 23:37:09 2013
-+++ src/logger.h Thu Jan 31 23:37:20 2013
-@@ -76,7 +76,7 @@ class Logger final
- */
- void log(const char *const log_text, ...)
- #ifdef __GNUC__
--__attribute__((__format__(gnu_printf, 2, 3)))
-+__attribute__((__format__(printf, 2, 3)))
- #endif
- ;
-
Index: patches/patch-src_mumblemanager_cpp
===
RCS file: patches/patch-src_mumblemanager_cpp
diff -N patches/patch-src_mumblemanager_cpp
--- patches/patch-src_mumblemanager_cpp 4 Feb 2013 15:03:12 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_mumblemanager_cpp,v 1.2 2013/02/04 15:03:12 bcallah Exp $
src/mumblemanager.cpp.orig Thu Jan 31 23:28:58 2013
-+++ src/mumblemanager.cpp Thu Jan 31 23:29:48 2013
-@@ -16,6 +16,7 @@
-
- #include "utils/mathutils.h"
-
-+#include
- #include
- #include
- #include
Index: patches/patch-src_resources_imagewriter_cpp
===
RCS file: patches/patch-src_resources_imagewriter_cpp
diff -N patches/patch-src_resources_imagewriter_cpp
--- patches/patch-src_resources_imagewriter_cpp 3 Jun 2013 02:46:57 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_resources_imagewriter_cpp,v 1.3 2013/06/03 02:46:57 naddy Exp $
src/resources/imagewriter.cpp.orig Sat May 25 05:53:40 2013
-+++ src/resources/imagewriter.cpp Sun Jun 2 21:36:55 2013
-@@ -24,11 +24,10 @@
-
- #include "logger.h"
-
-+#include
- #if defined __OpenBSD__
--#include
- #include
- #else
--#include
- #include
- #endif
- #include
Index: patches/patch-src_utils_stringutils_h
===
RCS file: patches/patch-src_utils_stringutils_h
diff -N patches/patch-src_utils_stringutils_h
--- patches/patch-src_utils_stringutils_h 19 Apr 2013 16:50:02 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_utils_stringutils_h,v 1.2 2013/04/19 16:50:02 bcallah Exp $
src/utils/stringutils.h.orig Mon Apr 8 16:08:43 2013
-+++ src/utils/stringutils.h Tue Apr 16 11:36:31 2013
-@@ -99,7 +99,7 @@ std::string strprintf(const char *const format, ...) A
- #ifdef __GNUC__
- /* This attribute is nice: it even works through gettext invokation. For
-example, gcc will complain that strprintf(_("%s"), 42) is ill-formed. */
--__attribute__((__format__(gnu_printf, 1, 2)))
-+__attribute__((__format__(printf, 1, 2)))
- #endif
- ;
-
UPDATE: games/manaplus 1.3.5.26 => 1.3.6.9
Hi ports --
Attached you'll find the latest games/manaplus update.
Includes the shiny new manaplus.org HOMEPAGE. Also I chatted with
upstream and got the majority of our local patches committed.
Works for me on amd64, loongson & macppc.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 26 May 2013 15:57:13 - 1.15
+++ Makefile 9 Jun 2013 00:47:00 -
@@ -2,7 +2,7 @@
COMMENT = extended client for The Mana World
-V = 1.3.5.26
+V = 1.3.6.9
DISTNAME = manaplus-${V}
EXTRACT_SUFX = .tar.xz
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 26 May 2013 15:57:13 - 1.11
+++ distinfo 9 Jun 2013 00:47:00 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.3.5.26.tar.xz) = lrFuNySRxytb0Xzfph9TiXl71Vkqhx/5U5u2UBXfrHk=
-SIZE (manaplus-1.3.5.26.tar.xz) = 6921164
+SHA256 (manaplus-1.3.6.9.tar.xz) = L06KhZvOyC/x7pQDoiW29x2yudAnqGQAm0GLBV5ghzA=
+SIZE (manaplus-1.3.6.9.tar.xz) = 6920400
Index: patches/patch-src_logger_h
===
RCS file: patches/patch-src_logger_h
diff -N patches/patch-src_logger_h
--- patches/patch-src_logger_h 4 Feb 2013 15:03:12 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_logger_h,v 1.1 2013/02/04 15:03:12 bcallah Exp $
src/logger.h.orig Thu Jan 31 23:37:09 2013
-+++ src/logger.h Thu Jan 31 23:37:20 2013
-@@ -76,7 +76,7 @@ class Logger final
- */
- void log(const char *const log_text, ...)
- #ifdef __GNUC__
--__attribute__((__format__(gnu_printf, 2, 3)))
-+__attribute__((__format__(printf, 2, 3)))
- #endif
- ;
-
Index: patches/patch-src_mumblemanager_cpp
===
RCS file: patches/patch-src_mumblemanager_cpp
diff -N patches/patch-src_mumblemanager_cpp
--- patches/patch-src_mumblemanager_cpp 4 Feb 2013 15:03:12 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_mumblemanager_cpp,v 1.2 2013/02/04 15:03:12 bcallah Exp $
src/mumblemanager.cpp.orig Thu Jan 31 23:28:58 2013
-+++ src/mumblemanager.cpp Thu Jan 31 23:29:48 2013
-@@ -16,6 +16,7 @@
-
- #include "utils/mathutils.h"
-
-+#include
- #include
- #include
- #include
Index: patches/patch-src_resources_imagewriter_cpp
===
RCS file: patches/patch-src_resources_imagewriter_cpp
diff -N patches/patch-src_resources_imagewriter_cpp
--- patches/patch-src_resources_imagewriter_cpp 3 Jun 2013 02:46:57 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_resources_imagewriter_cpp,v 1.3 2013/06/03 02:46:57 naddy Exp $
src/resources/imagewriter.cpp.orig Sat May 25 05:53:40 2013
-+++ src/resources/imagewriter.cpp Sun Jun 2 21:36:55 2013
-@@ -24,11 +24,10 @@
-
- #include "logger.h"
-
-+#include
- #if defined __OpenBSD__
--#include
- #include
- #else
--#include
- #include
- #endif
- #include
Index: patches/patch-src_utils_stringutils_h
===
RCS file: patches/patch-src_utils_stringutils_h
diff -N patches/patch-src_utils_stringutils_h
--- patches/patch-src_utils_stringutils_h 19 Apr 2013 16:50:02 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_utils_stringutils_h,v 1.2 2013/04/19 16:50:02 bcallah Exp $
src/utils/stringutils.h.orig Mon Apr 8 16:08:43 2013
-+++ src/utils/stringutils.h Tue Apr 16 11:36:31 2013
-@@ -99,7 +99,7 @@ std::string strprintf(const char *const format, ...) A
- #ifdef __GNUC__
- /* This attribute is nice: it even works through gettext invokation. For
-example, gcc will complain that strprintf(_("%s"), 42) is ill-formed. */
--__attribute__((__format__(gnu_printf, 1, 2)))
-+__attribute__((__format__(printf, 1, 2)))
- #endif
- ;
-
UPDATE: games/manaplus 13.5.12 => 13.5.26
Hi ports -- The manaplus people were kind enough to release an update on my birthday :) Attached is a patch. Works for me on amd64, loongson, and macppc. OK? ~Brian PS - I'm sending this from my university email because devio.us has been down for days now and I don't feel like waiting for them to get it back up. manaplus13526.diff Description: manaplus13526.diff
UPDATE: games/manaplus 1.3.4.28 => 1.3.5.12
Hi ports --
Here's a minor update for games/manaplus to its latest version.
Works for me on amd64, loongson & macppc.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 28 Apr 2013 13:14:22 - 1.13
+++ Makefile 12 May 2013 17:51:07 -
@@ -2,7 +2,7 @@
COMMENT = extended client for The Mana World
-V = 1.3.4.28
+V = 1.3.5.12
DISTNAME = manaplus-${V}
EXTRACT_SUFX = .tar.xz
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 28 Apr 2013 13:14:22 - 1.9
+++ distinfo 12 May 2013 17:51:07 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.3.4.28.tar.xz) = 2fyDohm2V+zE6Ow/OvTs6sZSVW3jQqlumXxRdZby89Q=
-SIZE (manaplus-1.3.4.28.tar.xz) = 6899988
+SHA256 (manaplus-1.3.5.12.tar.xz) = x0c3X93E5/FJbFR8iWLdJH+crTVoHMrU+ck3PUQ2iOo=
+SIZE (manaplus-1.3.5.12.tar.xz) = 6911696
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/manaplus/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 19 Apr 2013 16:50:02 - 1.6
+++ pkg/PLIST 12 May 2013 17:51:07 -
@@ -98,7 +98,9 @@ share/manaplus/data/graphics/gui/listbox
share/manaplus/data/graphics/gui/ministatus.xml
share/manaplus/data/graphics/gui/mouse.png
share/manaplus/data/graphics/gui/ok.xml
+share/manaplus/data/graphics/gui/outfits.xml
share/manaplus/data/graphics/gui/playerbox.xml
+share/manaplus/data/graphics/gui/playerboxselected.xml
share/manaplus/data/graphics/gui/popup.xml
share/manaplus/data/graphics/gui/progress-indicator.png
share/manaplus/data/graphics/gui/progressbar.xml
@@ -194,6 +196,7 @@ share/manaplus/data/icons/manaplus.xpm
share/manaplus/data/perserver/
share/manaplus/data/perserver/default/
share/manaplus/data/perserver/default/charcreation.xml
+share/manaplus/data/perserver/default/chatcommands.txt
share/manaplus/data/perserver/default/gmcommands.txt
share/manaplus/data/sfx/
share/manaplus/data/sfx/system/
@@ -239,6 +242,7 @@ share/manaplus/data/themes/enchilado/equ
share/manaplus/data/themes/enchilado/info.xml
share/manaplus/data/themes/enchilado/inventory.xml
share/manaplus/data/themes/enchilado/ok.xml
+share/manaplus/data/themes/enchilado/outfits.xml
share/manaplus/data/themes/enchilado/popup.xml
share/manaplus/data/themes/enchilado/progressbar.xml
share/manaplus/data/themes/enchilado/quests.xml
@@ -286,6 +290,10 @@ share/manaplus/data/themes/jewelry/itemc
share/manaplus/data/themes/jewelry/itempopup.xml
share/manaplus/data/themes/jewelry/items.xml
share/manaplus/data/themes/jewelry/keyboard_icon.xml
+share/manaplus/data/themes/jewelry/keyboard_icon_high.xml
+share/manaplus/data/themes/jewelry/keyboard_icon_medium.xml
+share/manaplus/data/themes/jewelry/keyboard_icon_xhigh.xml
+share/manaplus/data/themes/jewelry/keyboard_icon_xxhigh.xml
share/manaplus/data/themes/jewelry/listbox.xml
share/manaplus/data/themes/jewelry/login.xml
share/manaplus/data/themes/jewelry/map.xml
@@ -293,9 +301,19 @@ share/manaplus/data/themes/jewelry/minis
share/manaplus/data/themes/jewelry/mouse.png
share/manaplus/data/themes/jewelry/npc.xml
share/manaplus/data/themes/jewelry/ok.xml
+share/manaplus/data/themes/jewelry/outfits.xml
share/manaplus/data/themes/jewelry/playerbox.xml
+share/manaplus/data/themes/jewelry/playerboxselected.xml
share/manaplus/data/themes/jewelry/popup.xml
+share/manaplus/data/themes/jewelry/popup_high.xml
+share/manaplus/data/themes/jewelry/popup_xhigh.xml
+share/manaplus/data/themes/jewelry/popup_xxhigh.xml
share/manaplus/data/themes/jewelry/popuplist.xml
+share/manaplus/data/themes/jewelry/popupmenu.xml
+share/manaplus/data/themes/jewelry/popupmenu_high.xml
+share/manaplus/data/themes/jewelry/popupmenu_medium.xml
+share/manaplus/data/themes/jewelry/popupmenu_xhigh.xml
+share/manaplus/data/themes/jewelry/popupmenu_xxhigh.xml
share/manaplus/data/themes/jewelry/progressbar.xml
share/manaplus/data/themes/jewelry/quests.xml
share/manaplus/data/themes/jewelry/radio.xml
@@ -342,6 +360,7 @@ share/manaplus/data/themes/pink/equipmen
share/manaplus/data/themes/pink/info.xml
share/manaplus/data/themes/pink/inventory.xml
share/manaplus/data/themes/pink/ok.xml
+share/manaplus/data/themes/pink/outfits.xml
share/manaplus/data/themes/pink/popup.xml
share/manaplus/data/themes/pink/progress-indicator.png
share/manaplus/data/themes/pink/progressbar.xml
@@ -362,6 +381,7 @@ share/manaplus/data/themes/unity/info.xm
share/manaplus/data/themes/unity/inventory.xml
share/manaplus/data/themes/unity/npc.xml
share/manaplus/data/themes/unity/ok.xml
+share/manaplus/data/themes/unity/outfits.xml
share/manaplus/data/themes/unity/popup.xml
share/manaplus/data/themes/unity/progressbar.xml
share/manaplus/data/themes/unity/quests.xml
@@ -381,6 +401,7 @@ sh
UPDATE: games/manaplus 1.3.4.14 => 1.3.4.28
Hi ports --
Here's a minor update for games/manaplus to 1.3.4.28
Works on amd64, loongson & powerpc
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 19 Apr 2013 16:50:02 - 1.12
+++ Makefile 28 Apr 2013 00:48:55 -
@@ -2,7 +2,7 @@
COMMENT = extended client for The Mana World
-V = 1.3.4.14
+V = 1.3.4.28
DISTNAME = manaplus-${V}
EXTRACT_SUFX = .tar.xz
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 19 Apr 2013 16:50:02 - 1.8
+++ distinfo 28 Apr 2013 00:48:55 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.3.4.14.tar.xz) = 4zHTGiA5sG5fmtouDuAhURnMeXjiFGvnO7Niclg+COc=
-SIZE (manaplus-1.3.4.14.tar.xz) = 6841308
+SHA256 (manaplus-1.3.4.28.tar.xz) = 2fyDohm2V+zE6Ow/OvTs6sZSVW3jQqlumXxRdZby89Q=
+SIZE (manaplus-1.3.4.28.tar.xz) = 6899988
Re: UPDATE: games/manaplus 1.3.3.31 => 1.3.4.14
On 4/16/2013 11:56 AM, Brian Callahan wrote: Hi ports -- Attached is an update for games/manaplus to its latest version. Works for me on amd64, loongson, and powerpc. OK? ~Brian Ping.
UPDATE: games/manaplus 1.3.3.31 => 1.3.4.14
Hi ports --
Attached is an update for games/manaplus to its latest version.
Works for me on amd64, loongson, and powerpc.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 7 Apr 2013 22:48:29 - 1.11
+++ Makefile 16 Apr 2013 15:55:05 -
@@ -2,7 +2,7 @@
COMMENT = extended client for The Mana World
-V = 1.3.3.31
+V = 1.3.4.14
DISTNAME = manaplus-${V}
EXTRACT_SUFX = .tar.xz
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 7 Apr 2013 22:48:29 - 1.7
+++ distinfo 16 Apr 2013 15:55:05 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.3.3.31.tar.xz) = ofZVUgkOZOAqui5RAr4TJbVpEF1BuinCTBBl5pc9jG4=
-SIZE (manaplus-1.3.3.31.tar.xz) = 6822460
+SHA256 (manaplus-1.3.4.14.tar.xz) = 4zHTGiA5sG5fmtouDuAhURnMeXjiFGvnO7Niclg+COc=
+SIZE (manaplus-1.3.4.14.tar.xz) = 6841308
Index: patches/patch-src_utils_stringutils_h
===
RCS file: /cvs/ports/games/manaplus/patches/patch-src_utils_stringutils_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_utils_stringutils_h
--- patches/patch-src_utils_stringutils_h 4 Feb 2013 15:03:12 - 1.1
+++ patches/patch-src_utils_stringutils_h 16 Apr 2013 15:55:05 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_utils_stringutils_h,v 1.1 2013/02/04 15:03:12 bcallah Exp $
src/utils/stringutils.h.orig Thu Jan 31 23:36:37 2013
-+++ src/utils/stringutils.h Thu Jan 31 23:36:58 2013
-@@ -97,7 +97,7 @@ std::string strprintf(const char *const format, ...) A
+--- src/utils/stringutils.h.orig Mon Apr 8 16:08:43 2013
src/utils/stringutils.h Tue Apr 16 11:36:31 2013
+@@ -99,7 +99,7 @@ std::string strprintf(const char *const format, ...) A
#ifdef __GNUC__
/* This attribute is nice: it even works through gettext invokation. For
example, gcc will complain that strprintf(_("%s"), 42) is ill-formed. */
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/manaplus/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 6 Mar 2013 18:25:13 - 1.5
+++ pkg/PLIST 16 Apr 2013 15:55:05 -
@@ -23,6 +23,7 @@ share/locale/pl/LC_MESSAGES/manaplus.mo
share/locale/pt/LC_MESSAGES/manaplus.mo
share/locale/pt_BR/LC_MESSAGES/manaplus.mo
share/locale/ru/LC_MESSAGES/manaplus.mo
+share/locale/tr/LC_MESSAGES/manaplus.mo
share/locale/zh_CN/LC_MESSAGES/manaplus.mo
share/manaplus/
share/manaplus/data/
@@ -56,7 +57,7 @@ share/manaplus/data/graphics/flags/pl.pn
share/manaplus/data/graphics/flags/pt.png
share/manaplus/data/graphics/flags/pt_BR.png
share/manaplus/data/graphics/flags/ru.png
-share/manaplus/data/graphics/flags/vls.png
+share/manaplus/data/graphics/flags/tr.png
share/manaplus/data/graphics/gui/
share/manaplus/data/graphics/gui/browserbox.xml
share/manaplus/data/graphics/gui/bubble.png
Re: UPDATE: games/manaplus
On 4/3/2013 1:50 PM, Brian Callahan wrote: On 03/31/13 11:29, Brian Callahan wrote: Hi ports -- Here's a patch to update games/manaplus to 1.3.3.31 While here, remove an extraneous declaration of EXTRACT_SUFX. Tested on all the usual platforms. OK? ~Brian Ping. Reattached. OK? Ping? ~Brian
Re: UPDATE: games/manaplus
On 03/31/13 11:29, Brian Callahan wrote:
Hi ports --
Here's a patch to update games/manaplus to 1.3.3.31
While here, remove an extraneous declaration of EXTRACT_SUFX.
Tested on all the usual platforms.
OK?
~Brian
Ping. Reattached. OK?
? manaplus13331.diff
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 21 Mar 2013 08:45:17 - 1.10
+++ Makefile 31 Mar 2013 15:27:30 -
@@ -2,7 +2,7 @@
COMMENT = extended client for The Mana World
-V = 1.3.3.17
+V = 1.3.3.31
DISTNAME = manaplus-${V}
EXTRACT_SUFX = .tar.xz
@@ -20,7 +20,6 @@ WANTLIB += X11 c crypto curl guichan gui
WANTLIB += png pthread ssl stdc++ xml2 z
MASTER_SITES = http://download.evolonline.org/manaplus/download/${V}/
-EXTRACT_SUFX = .tar.xz
MODULES = devel/gettext
RUN_DEPENDS= devel/desktop-file-utils
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 18 Mar 2013 14:45:14 - 1.6
+++ distinfo 31 Mar 2013 15:27:30 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.3.3.17.tar.xz) = tuZGwBQ8zGtY0XlNXly2CCFzz7w47nslG9n1pDvkam0=
-SIZE (manaplus-1.3.3.17.tar.xz) = 6822624
+SHA256 (manaplus-1.3.3.31.tar.xz) = ofZVUgkOZOAqui5RAr4TJbVpEF1BuinCTBBl5pc9jG4=
+SIZE (manaplus-1.3.3.31.tar.xz) = 6822460
UPDATE: games/manaplus
Hi ports --
Here's a patch to update games/manaplus to 1.3.3.31
While here, remove an extraneous declaration of EXTRACT_SUFX.
Tested on all the usual platforms.
OK?
~Brian
? manaplus13331.diff
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile21 Mar 2013 08:45:17 - 1.10
+++ Makefile31 Mar 2013 15:27:30 -
@@ -2,7 +2,7 @@
COMMENT = extended client for The Mana World
-V =1.3.3.17
+V =1.3.3.31
DISTNAME = manaplus-${V}
EXTRACT_SUFX = .tar.xz
@@ -20,7 +20,6 @@ WANTLIB += X11 c crypto curl guichan gui
WANTLIB += png pthread ssl stdc++ xml2 z
MASTER_SITES = http://download.evolonline.org/manaplus/download/${V}/
-EXTRACT_SUFX = .tar.xz
MODULES = devel/gettext
RUN_DEPENDS= devel/desktop-file-utils
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Mar 2013 14:45:14 - 1.6
+++ distinfo31 Mar 2013 15:27:30 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.3.3.17.tar.xz) =
tuZGwBQ8zGtY0XlNXly2CCFzz7w47nslG9n1pDvkam0=
-SIZE (manaplus-1.3.3.17.tar.xz) = 6822624
+SHA256 (manaplus-1.3.3.31.tar.xz) =
ofZVUgkOZOAqui5RAr4TJbVpEF1BuinCTBBl5pc9jG4=
+SIZE (manaplus-1.3.3.31.tar.xz) = 6822460
UPDATE: games/manaplus
Hi ports --
Here's an update to games/manaplus. Tested on my usual trio (amd64,
macppc, loongson)
OK?
~Brian
? manaplus13217.diff
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile6 Feb 2013 15:16:10 -1.5
+++ Makefile27 Feb 2013 16:44:47 -
@@ -2,7 +2,7 @@
COMMENT =extended client for The Mana World
-V =1.3.2.3
+V =1.3.2.17
DISTNAME =manaplus-${V}
CATEGORIES =games x11
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo6 Feb 2013 15:16:10 -1.3
+++ distinfo27 Feb 2013 16:44:47 -
@@ -1,2 +1,2 @@
-SHA256 (manaplus-1.3.2.3.tar.xz) =
jeahNgbNbgr36Xc6haU17RyGm8/x8IqfFFRpDy58W7k=
-SIZE (manaplus-1.3.2.3.tar.xz) = 5879180
+SHA256 (manaplus-1.3.2.17.tar.xz) =
lVmzaaThxve+R0lWABw6GTGv62XYUj5HLirdTKcqZ04=
+SIZE (manaplus-1.3.2.17.tar.xz) = 6818384
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/manaplus/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST6 Feb 2013 15:16:10 -1.3
+++ pkg/PLIST27 Feb 2013 16:44:47 -
@@ -301,6 +301,7 @@ share/manaplus/data/themes/jewelry/radio
share/manaplus/data/themes/jewelry/resize.xml
share/manaplus/data/themes/jewelry/scroll.xml
share/manaplus/data/themes/jewelry/scroll_background.xml
+share/manaplus/data/themes/jewelry/scroll_hbackground.xml
share/manaplus/data/themes/jewelry/scroll_highlighted.xml
share/manaplus/data/themes/jewelry/scroll_vbackground.xml
share/manaplus/data/themes/jewelry/scrollbuttons.xml
UPDATE: games/manaplus
Hi ports --
Attached is a diff to update games/manaplus to its latest version.
Also taking MAINTAINER, discussed with Jona Joachim (previous MAINTAINER).
This works for me on amd64, powerpc, and mips64el (and yes, it's
actually *playable* on my yeeloong!)
OK? I feel like this should go in before I kill games/tmw, since it's
such a significant update.
~Brian
? manaplus13120.diff
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 16 Sep 2011 09:48:10 - 1.3
+++ Makefile 3 Feb 2013 17:20:13 -
@@ -2,15 +2,14 @@
COMMENT = extended client for The Mana World
-V = 1.1.6.26
+V = 1.3.1.20
DISTNAME = manaplus-${V}
-REVISION = 1
CATEGORIES = games x11
HOMEPAGE = http://manaplus.evolonline.org/
-MAINTAINER = Jona Joachim
+MAINTAINER = Brian Callahan
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
@@ -23,7 +22,7 @@ WANTLIB += X11 c crypto curl guichan gui
WANTLIB += png pthread ssl stdc++ xml2 z
MASTER_SITES = http://download.evolonline.org/manaplus/download/${V}/
-EXTRACT_SUFX = .tar.bz2
+EXTRACT_SUFX = .tar.xz
MODULES = devel/gettext
RUN_DEPENDS= devel/desktop-file-utils
@@ -48,8 +47,6 @@ FAKE_FLAGS += desktopdir=${PREFIX}/shar
AUTOCONF_VERSION = 2.59
AUTOMAKE_VERSION = 1.9
-
-WRKDIST = ${WRKDIR}/manaplus
pre-configure:
cd ${WRKSRC} && \
Index: distinfo
===
RCS file: /cvs/ports/games/manaplus/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 10 Jul 2011 09:56:51 - 1.1.1.1
+++ distinfo 3 Feb 2013 17:20:13 -
@@ -1,5 +1,2 @@
-MD5 (manaplus-1.1.6.26.tar.bz2) = h98Pq2knsYKWg3jPVQWcSA==
-RMD160 (manaplus-1.1.6.26.tar.bz2) = 5Gq0sTs5hxDvzHKHNOkdL8uHL3Q=
-SHA1 (manaplus-1.1.6.26.tar.bz2) = AqiMWJVT5/VfmOEG9u1C8v/jeKQ=
-SHA256 (manaplus-1.1.6.26.tar.bz2) = MeJ2sC2VJtoHqfZRCEylO1KpJnzbmpdU6m0jVu4MBag=
-SIZE (manaplus-1.1.6.26.tar.bz2) = 4781738
+SHA256 (manaplus-1.3.1.20.tar.xz) = sY5d3DSVCdWYcz441MGFkzN8vFLXZS2Quw+hej648i4=
+SIZE (manaplus-1.3.1.20.tar.xz) = 5881004
Index: patches/patch-data_icons_Makefile_am
===
RCS file: /cvs/ports/games/manaplus/patches/patch-data_icons_Makefile_am,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-data_icons_Makefile_am
--- patches/patch-data_icons_Makefile_am 10 Jul 2011 09:56:51 - 1.1.1.1
+++ patches/patch-data_icons_Makefile_am 3 Feb 2013 17:20:14 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-data_icons_Makefile_am,v 1.1.1.1 2011/07/10 09:56:51 jasper Exp $
data/icons/Makefile.am.orig Sat Jun 25 18:12:08 2011
-+++ data/icons/Makefile.am Wed Jun 29 18:46:09 2011
+$OpenBSD$
+--- data/icons/Makefile.am.orig Thu Jan 31 23:27:40 2013
data/icons/Makefile.am Thu Jan 31 23:27:54 2013
@@ -9,8 +9,8 @@ icons_DATA = manaplus.png \
manaplus.xpm
Index: patches/patch-src_logger_h
===
RCS file: patches/patch-src_logger_h
diff -N patches/patch-src_logger_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_logger_h 3 Feb 2013 17:20:14 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/logger.h.orig Thu Jan 31 23:37:09 2013
src/logger.h Thu Jan 31 23:37:20 2013
+@@ -76,7 +76,7 @@ class Logger final
+ */
+ void log(const char *const log_text, ...)
+ #ifdef __GNUC__
+-__attribute__((__format__(gnu_printf, 2, 3)))
++__attribute__((__format__(printf, 2, 3)))
+ #endif
+ ;
+
Index: patches/patch-src_mumblemanager_cpp
===
RCS file: /cvs/ports/games/manaplus/patches/patch-src_mumblemanager_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_mumblemanager_cpp
--- patches/patch-src_mumblemanager_cpp 10 Jul 2011 09:56:51 - 1.1.1.1
+++ patches/patch-src_mumblemanager_cpp 3 Feb 2013 17:20:14 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_mumblemanager_cpp,v 1.1.1.1 2011/07/10 09:56:51 jasper Exp $
src/mumblemanager.cpp.orig Sun Jun 12 13:44:19 2011
-+++ src/mumblemanager.cpp Sun Jun 26 17:46:02 2011
-@@ -7,6 +7,7 @@
+$OpenBSD$
+--- src/mumblemanager.cpp.orig Thu Jan 31 23:28:58 2013
src/mumblemanager.cpp Thu Jan 31 23:29:48 2013
+@@ -16,6 +16,7 @@
#include "utils/mathutils.h"
@@ -9,30 +9,3 @@ $OpenBSD: patch-src_mumblemanager_cpp,v
#include
#include
#include
-@@ -39,7 +40,7 @@ MumbleManager::~MumbleManager()
- {
- #ifdef WIN32
- UnmapViewOfFile(mLinkedMem);
--#elif defined __FreeBSD__ || defined __DragonFly__ || defined __APPLE__
-+#elif defined BSD4_4
- #else
- munmap(mLinkedMem, sizeof(struct LinkedMem));
- #endif
-@@ -73,7 +74,7 @@ void MumbleManager::setMapBase(uint16_t mapid)
-
- void MumbleManager::init()
- {
--#if defined __FreeBSD__ || defined __DragonFly_
