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 -0000 1.90
+++ Makefile 11 Dec 2017 02:49:44 -0000
@@ -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 <bcal...@openbsd.org>
# 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 -0000 1.78
+++ distinfo 11 Dec 2017 02:49:44 -0000
@@ -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 -0000 1.3
+++ patches/patch-src_Makefile_am 11 Dec 2017 02:49:44 -0000
@@ -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 -0000 1.35
+++ pkg/PLIST 11 Dec 2017 02:49:44 -0000
@@ -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
share/locale/cs/LC_MESSAGES/manaplus.mo
share/locale/de/LC_MESSAGES/manaplus.mo
+share/locale/eo/LC_MESSAGES/manaplus.mo
share/locale/es/LC_MESSAGES/manaplus.mo
share/locale/fi/LC_MESSAGES/manaplus.mo
share/locale/fr/LC_MESSAGES/manaplus.mo
@@ -50,6 +53,7 @@ share/manaplus/data/fonts/liberationsans
share/manaplus/data/fonts/liberationsansmono.ttf
share/manaplus/data/fonts/mplus-1p-bold.ttf
share/manaplus/data/fonts/mplus-1p-regular.ttf
+@comment share/manaplus/data/fonts/src/
share/manaplus/data/fonts/wqy-microhei.ttf
share/manaplus/data/graphics/
share/manaplus/data/graphics/badges/
@@ -73,6 +77,7 @@ share/manaplus/data/graphics/flags/cn.pn
share/manaplus/data/graphics/flags/cz.png
share/manaplus/data/graphics/flags/de.png
share/manaplus/data/graphics/flags/en.png
+share/manaplus/data/graphics/flags/eo.png
share/manaplus/data/graphics/flags/es.png
share/manaplus/data/graphics/flags/fi.png
share/manaplus/data/graphics/flags/fr.png
@@ -158,7 +163,9 @@ share/manaplus/data/graphics/gui/scrollb
share/manaplus/data/graphics/gui/scrollbuttons_pressed.xml
share/manaplus/data/graphics/gui/sell.xml
share/manaplus/data/graphics/gui/server.xml
+share/manaplus/data/graphics/gui/serverinfo.xml
share/manaplus/data/graphics/gui/shop.xml
+share/manaplus/data/graphics/gui/skillrectanglelistbox.xml
share/manaplus/data/graphics/gui/slider.xml
share/manaplus/data/graphics/gui/slider_highlighted.xml
share/manaplus/data/graphics/gui/speechbrowserbox.xml
@@ -265,6 +272,8 @@ share/manaplus/data/icons/manaplus.ico
share/manaplus/data/icons/manaplus.png
share/manaplus/data/icons/manaplus.svg
share/manaplus/data/icons/manaplus.xpm
+share/manaplus/data/music/
+share/manaplus/data/music/keprohm.ogg
share/manaplus/data/perserver/
share/manaplus/data/perserver/default/
share/manaplus/data/perserver/default/charcreation.xml
@@ -273,6 +282,7 @@ share/manaplus/data/perserver/default/de
share/manaplus/data/perserver/default/defaultcommands.xml
share/manaplus/data/perserver/default/features.xml
share/manaplus/data/perserver/default/gmcommands.txt
+share/manaplus/data/perserver/default/groups.xml
share/manaplus/data/perserver/default/weapons.xml
share/manaplus/data/sfx/
share/manaplus/data/sfx/system/
@@ -296,7 +306,33 @@ share/manaplus/data/sfx/system/send.ogg
share/manaplus/data/sfx/system/start.ogg
share/manaplus/data/sfx/system/watcher.ogg
share/manaplus/data/test/
+share/manaplus/data/test/arrow_up.png
+share/manaplus/data/test/arrow_up_A.png
+share/manaplus/data/test/arrow_up_B.png
+share/manaplus/data/test/arrow_up_S.png
+share/manaplus/data/test/dir1/
+share/manaplus/data/test/dir1/file1.txt
+share/manaplus/data/test/dir2/
+share/manaplus/data/test/dir2/file1.txt
+share/manaplus/data/test/dir2/file2.txt
+share/manaplus/data/test/dye.png
+share/manaplus/data/test/equipmentwindow.xml
+share/manaplus/data/test/hide.png
+share/manaplus/data/test/items.xml
share/manaplus/data/test/palette.gpl
+share/manaplus/data/test/paths.xml
+share/manaplus/data/test/quests.xml
+share/manaplus/data/test/serverlistplus.xml
+share/manaplus/data/test/simplefile.txt
+share/manaplus/data/test/test.txt
+share/manaplus/data/test/test.zip
+share/manaplus/data/test/test2.txt
+share/manaplus/data/test/test2.zip
+share/manaplus/data/test/test3.zip
+share/manaplus/data/test/test4.zip
+share/manaplus/data/test/test5.zip
+share/manaplus/data/test/testintmap.xml
+share/manaplus/data/test/units.xml
share/manaplus/data/themes/
share/manaplus/data/themes/blacknblack/
share/manaplus/data/themes/blacknblack/bubble.png
@@ -330,6 +366,7 @@ share/manaplus/data/themes/enchilado/pro
share/manaplus/data/themes/enchilado/quests.xml
share/manaplus/data/themes/enchilado/sell.xml
share/manaplus/data/themes/enchilado/server.xml
+share/manaplus/data/themes/enchilado/serverinfo.xml
share/manaplus/data/themes/enchilado/shop.xml
share/manaplus/data/themes/enchilado/window.png
share/manaplus/data/themes/enchilado/window.xml
@@ -430,11 +467,13 @@ share/manaplus/data/themes/golden-delici
share/manaplus/data/themes/golden-delicious/scrollbuttons_pressed.xml
share/manaplus/data/themes/golden-delicious/sell.xml
share/manaplus/data/themes/golden-delicious/server.xml
+share/manaplus/data/themes/golden-delicious/serverinfo.xml
share/manaplus/data/themes/golden-delicious/serverslistbox.xml
share/manaplus/data/themes/golden-delicious/shop.xml
share/manaplus/data/themes/golden-delicious/shoplistbox.xml
share/manaplus/data/themes/golden-delicious/skilllistbox.xml
share/manaplus/data/themes/golden-delicious/skillpopup.xml
+share/manaplus/data/themes/golden-delicious/skillrectanglelistbox.xml
share/manaplus/data/themes/golden-delicious/slider.xml
share/manaplus/data/themes/golden-delicious/slider_highlighted.xml
share/manaplus/data/themes/golden-delicious/social.xml
@@ -450,6 +489,122 @@ share/manaplus/data/themes/golden-delici
share/manaplus/data/themes/golden-delicious/windowmenu.xml
share/manaplus/data/themes/golden-delicious/world.xml
share/manaplus/data/themes/jewelry/
+share/manaplus/data/themes/jewelry-simple/
+share/manaplus/data/themes/jewelry-simple/CHANGELOG.txt
+share/manaplus/data/themes/jewelry-simple/LICENSE.txt
+share/manaplus/data/themes/jewelry-simple/avatarlistbox.xml
+share/manaplus/data/themes/jewelry-simple/beingpopup.xml
+share/manaplus/data/themes/jewelry-simple/browserbox.xml
+share/manaplus/data/themes/jewelry-simple/button.xml
+share/manaplus/data/themes/jewelry-simple/button_disabled.xml
+share/manaplus/data/themes/jewelry-simple/button_highlighted.xml
+share/manaplus/data/themes/jewelry-simple/button_pressed.xml
+share/manaplus/data/themes/jewelry-simple/buy.xml
+share/manaplus/data/themes/jewelry-simple/charcreate.xml
+share/manaplus/data/themes/jewelry-simple/chat.xml
+share/manaplus/data/themes/jewelry-simple/checkbox.xml
+share/manaplus/data/themes/jewelry-simple/circle-off.xml
+share/manaplus/data/themes/jewelry-simple/circle-on.xml
+share/manaplus/data/themes/jewelry-simple/colors.xml
+share/manaplus/data/themes/jewelry-simple/complete_icon.xml
+share/manaplus/data/themes/jewelry-simple/cutin.xml
+share/manaplus/data/themes/jewelry-simple/dbutton.xml
+share/manaplus/data/themes/jewelry-simple/didyouknow.xml
+share/manaplus/data/themes/jewelry-simple/dpad.xml
+share/manaplus/data/themes/jewelry-simple/dropdown.xml
+share/manaplus/data/themes/jewelry-simple/dropdown_background.xml
+share/manaplus/data/themes/jewelry-simple/dropdown_pressed.xml
+share/manaplus/data/themes/jewelry-simple/drops.xml
+share/manaplus/data/themes/jewelry-simple/edit.xml
+share/manaplus/data/themes/jewelry-simple/emotes.xml
+share/manaplus/data/themes/jewelry-simple/emotetabs.xml
+share/manaplus/data/themes/jewelry-simple/equipment.xml
+share/manaplus/data/themes/jewelry-simple/equipment_background.xml
+share/manaplus/data/themes/jewelry-simple/equipmentbox.png
+share/manaplus/data/themes/jewelry-simple/extendedlistbox.xml
+share/manaplus/data/themes/jewelry-simple/extendedlistbox_high.xml
+share/manaplus/data/themes/jewelry-simple/extendedlistbox_medium.xml
+share/manaplus/data/themes/jewelry-simple/extendedlistbox_xhigh.xml
+share/manaplus/data/themes/jewelry-simple/extendedlistbox_xxhigh.xml
+share/manaplus/data/themes/jewelry-simple/help.xml
+share/manaplus/data/themes/jewelry-simple/incomplete_icon.xml
+share/manaplus/data/themes/jewelry-simple/info.xml
+share/manaplus/data/themes/jewelry-simple/inventory.xml
+share/manaplus/data/themes/jewelry-simple/inventory_cell2.xml
+share/manaplus/data/themes/jewelry-simple/item_selection.xml
+share/manaplus/data/themes/jewelry-simple/itemcontainer.xml
+share/manaplus/data/themes/jewelry-simple/itempopup.xml
+share/manaplus/data/themes/jewelry-simple/items.xml
+share/manaplus/data/themes/jewelry-simple/keyboard_icon.xml
+share/manaplus/data/themes/jewelry-simple/keyboard_icon_high.xml
+share/manaplus/data/themes/jewelry-simple/keyboard_icon_medium.xml
+share/manaplus/data/themes/jewelry-simple/keyboard_icon_xhigh.xml
+share/manaplus/data/themes/jewelry-simple/keyboard_icon_xxhigh.xml
+share/manaplus/data/themes/jewelry-simple/listbox.xml
+share/manaplus/data/themes/jewelry-simple/listbox_high.xml
+share/manaplus/data/themes/jewelry-simple/listbox_medium.xml
+share/manaplus/data/themes/jewelry-simple/listbox_xhigh.xml
+share/manaplus/data/themes/jewelry-simple/listbox_xxhigh.xml
+share/manaplus/data/themes/jewelry-simple/login.xml
+share/manaplus/data/themes/jewelry-simple/mailedit.xml
+share/manaplus/data/themes/jewelry-simple/map.xml
+share/manaplus/data/themes/jewelry-simple/ministatus.xml
+share/manaplus/data/themes/jewelry-simple/mouse.png
+share/manaplus/data/themes/jewelry-simple/npc.xml
+share/manaplus/data/themes/jewelry-simple/ok.xml
+share/manaplus/data/themes/jewelry-simple/onlinebrowserbox.xml
+share/manaplus/data/themes/jewelry-simple/outfits.xml
+share/manaplus/data/themes/jewelry-simple/playerbox.xml
+share/manaplus/data/themes/jewelry-simple/playerboxselected.xml
+share/manaplus/data/themes/jewelry-simple/popup.xml
+share/manaplus/data/themes/jewelry-simple/popup_high.xml
+share/manaplus/data/themes/jewelry-simple/popup_xhigh.xml
+share/manaplus/data/themes/jewelry-simple/popup_xxhigh.xml
+share/manaplus/data/themes/jewelry-simple/popupbrowserbox.xml
+share/manaplus/data/themes/jewelry-simple/popupbrowserbox_high.xml
+share/manaplus/data/themes/jewelry-simple/popupbrowserbox_medium.xml
+share/manaplus/data/themes/jewelry-simple/popupbrowserbox_xhigh.xml
+share/manaplus/data/themes/jewelry-simple/popupbrowserbox_xxhigh.xml
+share/manaplus/data/themes/jewelry-simple/popuplist.xml
+share/manaplus/data/themes/jewelry-simple/popupmenu.xml
+share/manaplus/data/themes/jewelry-simple/popupmenu_high.xml
+share/manaplus/data/themes/jewelry-simple/popupmenu_medium.xml
+share/manaplus/data/themes/jewelry-simple/popupmenu_xhigh.xml
+share/manaplus/data/themes/jewelry-simple/popupmenu_xxhigh.xml
+share/manaplus/data/themes/jewelry-simple/progressbar.xml
+share/manaplus/data/themes/jewelry-simple/quests.xml
+share/manaplus/data/themes/jewelry-simple/radio.xml
+share/manaplus/data/themes/jewelry-simple/resize.xml
+share/manaplus/data/themes/jewelry-simple/scroll.xml
+share/manaplus/data/themes/jewelry-simple/scroll_background.xml
+share/manaplus/data/themes/jewelry-simple/scroll_hbackground.xml
+share/manaplus/data/themes/jewelry-simple/scroll_highlighted.xml
+share/manaplus/data/themes/jewelry-simple/scroll_vbackground.xml
+share/manaplus/data/themes/jewelry-simple/scrollbuttons.xml
+share/manaplus/data/themes/jewelry-simple/scrollbuttons_pressed.xml
+share/manaplus/data/themes/jewelry-simple/sell.xml
+share/manaplus/data/themes/jewelry-simple/server.xml
+share/manaplus/data/themes/jewelry-simple/serverinfo.xml
+share/manaplus/data/themes/jewelry-simple/serverslistbox.xml
+share/manaplus/data/themes/jewelry-simple/shop.xml
+share/manaplus/data/themes/jewelry-simple/shoplistbox.xml
+share/manaplus/data/themes/jewelry-simple/skilllistbox.xml
+share/manaplus/data/themes/jewelry-simple/skillpopup.xml
+share/manaplus/data/themes/jewelry-simple/skillrectanglelistbox.xml
+share/manaplus/data/themes/jewelry-simple/slider.xml
+share/manaplus/data/themes/jewelry-simple/slider_highlighted.xml
+share/manaplus/data/themes/jewelry-simple/social.xml
+share/manaplus/data/themes/jewelry-simple/spells.xml
+share/manaplus/data/themes/jewelry-simple/status.xml
+share/manaplus/data/themes/jewelry-simple/tab.xml
+share/manaplus/data/themes/jewelry-simple/tab_highlighted.xml
+share/manaplus/data/themes/jewelry-simple/tab_selected.xml
+share/manaplus/data/themes/jewelry-simple/tab_unused.xml
+share/manaplus/data/themes/jewelry-simple/textfield.xml
+share/manaplus/data/themes/jewelry-simple/window.png
+share/manaplus/data/themes/jewelry-simple/window.xml
+share/manaplus/data/themes/jewelry-simple/windowmenu.xml
+share/manaplus/data/themes/jewelry-simple/world.xml
share/manaplus/data/themes/jewelry/CHANGELOG.txt
share/manaplus/data/themes/jewelry/LICENSE.txt
share/manaplus/data/themes/jewelry/avatarlistbox.xml
@@ -544,11 +699,13 @@ share/manaplus/data/themes/jewelry/scrol
share/manaplus/data/themes/jewelry/scrollbuttons_pressed.xml
share/manaplus/data/themes/jewelry/sell.xml
share/manaplus/data/themes/jewelry/server.xml
+share/manaplus/data/themes/jewelry/serverinfo.xml
share/manaplus/data/themes/jewelry/serverslistbox.xml
share/manaplus/data/themes/jewelry/shop.xml
share/manaplus/data/themes/jewelry/shoplistbox.xml
share/manaplus/data/themes/jewelry/skilllistbox.xml
share/manaplus/data/themes/jewelry/skillpopup.xml
+share/manaplus/data/themes/jewelry/skillrectanglelistbox.xml
share/manaplus/data/themes/jewelry/slider.xml
share/manaplus/data/themes/jewelry/slider_highlighted.xml
share/manaplus/data/themes/jewelry/social.xml
@@ -601,6 +758,7 @@ share/manaplus/data/themes/pink/progress
share/manaplus/data/themes/pink/quests.xml
share/manaplus/data/themes/pink/sell.xml
share/manaplus/data/themes/pink/server.xml
+share/manaplus/data/themes/pink/serverinfo.xml
share/manaplus/data/themes/pink/shop.xml
share/manaplus/data/themes/pink/unknown-item.png
share/manaplus/data/themes/pink/window.png
@@ -623,6 +781,7 @@ share/manaplus/data/themes/unity/progres
share/manaplus/data/themes/unity/quests.xml
share/manaplus/data/themes/unity/sell.xml
share/manaplus/data/themes/unity/server.xml
+share/manaplus/data/themes/unity/serverinfo.xml
share/manaplus/data/themes/unity/shop.xml
share/manaplus/data/themes/unity/social.xml
share/manaplus/data/themes/unity/window.png
@@ -646,6 +805,7 @@ share/manaplus/data/themes/wood/progress
share/manaplus/data/themes/wood/quests.xml
share/manaplus/data/themes/wood/sell.xml
share/manaplus/data/themes/wood/server.xml
+share/manaplus/data/themes/wood/serverinfo.xml
share/manaplus/data/themes/wood/shop.xml
share/manaplus/data/themes/wood/window.png
share/manaplus/data/themes/wood/window.xml
