Index: head/games/doomsday/files/patch-doomsday-dep__zlib.pri =================================================================== --- head/games/doomsday/files/patch-doomsday-dep__zlib.pri (revision 404070) +++ head/games/doomsday/files/patch-doomsday-dep__zlib.pri (nonexistent) @@ -1,13 +0,0 @@ ---- doomsday/dep_zlib.pri.orig 2013-11-02 07:38:18.000000000 -0700 -+++ doomsday/dep_zlib.pri 2013-12-24 04:55:18.000000000 -0700 -@@ -12,6 +12,10 @@ - # Mac OS X. - LIBS += -lz - } -+else:freebsd-* { -+ # FreeBSD -+ LIBS += -lz -+} - else { - # Generic Unix. - QMAKE_CFLAGS += $$system(pkg-config zlib --cflags) Property changes on: head/games/doomsday/files/patch-doomsday-dep__zlib.pri ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/doomsday/Makefile =================================================================== --- head/games/doomsday/Makefile (revision 404070) +++ head/games/doomsday/Makefile (revision 404071) @@ -1,51 +1,50 @@ # Created by: Igor Pokrovsky # $FreeBSD$ PORTNAME= doomsday -PORTVERSION= 1.14.5 -PORTREVISION= 4 +PORTVERSION= 1.15.6 CATEGORIES= games MASTER_SITES= SF/deng/Doomsday%20Engine/${PORTVERSION} +DISTNAME= ${PORTNAME}-stable-${PORTVERSION} MAINTAINER= danilo@FreeBSD.org COMMENT= Enhanced Doom, Heretic, and Hexen source port LICENSE= GPLv2 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libassimp.so:${PORTSDIR}/multimedia/assimp RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity USE_GL= gl glu USE_LDCONFIG= yes -USE_SDL= sdl mixer net +USE_SDL= sdl2 mixer2 net2 USE_XORG= x11 -USES= execinfo pkgconfig python:build qmake:outsource +USES= compiler:c++11-lib execinfo pkgconfig python:build qmake:outsource USE_QT4= corelib network opengl moc_build QMAKE_SOURCE_PATH= ${WRKSRC}/doomsday QMAKE_ARGS+= QMAKE_LFLAGS+="-Wl,--export-dynamic" \ CONFIG+="deng_notools deng_nosnowberry" \ SCRIPT_PYTHON=${PYTHON_CMD} LDFLAGS+= -lm OPTIONS_DEFINE= OPENAL OPTIONS_SUB= yes OPENAL_DESC= Build OpenAL sound plugin OPENAL_USES= openal:al OPENAL_QMAKE_ON= CONFIG+=deng_openal OPENAL_QMAKE_OFF= CONFIG+=deng_noopenal PORTSCOUT= limit:^\d+\.\d+\.\d+$$ post-patch: @${REINPLACE_CMD} 's,share/man,man,' \ - ${PATCH_WRKSRC}/doomsday/client/client.pro \ - ${PATCH_WRKSRC}/doomsday/server/server.pro - @${REINPLACE_CMD} 's,python,${PYTHON_CMD},' \ - ${PATCH_WRKSRC}/doomsday/config.pri \ - ${PATCH_WRKSRC}/doomsday/build/build.pro - # Removing three non ascii bytes - @${REINPLACE_CMD} '1s,^...,,' ${WRKSRC}/doomsday/client/src/client/cl_sound.cpp + ${WRKSRC}/doomsday/client/client.pro \ + ${WRKSRC}/doomsday/server/server.pro + # Removing (three) non-ascii bytes from the beginning of the file + @LANG=C ${REINPLACE_CMD} '1s,^...,,' \ + ${WRKSRC}/doomsday/client/src/client/cl_sound.cpp .include Index: head/games/doomsday/distinfo =================================================================== --- head/games/doomsday/distinfo (revision 404070) +++ head/games/doomsday/distinfo (revision 404071) @@ -1,2 +1,2 @@ -SHA256 (doomsday-1.14.5.tar.gz) = 019cd0cf89e69d80cd8f6fbbd3e3fd57b8ae4d0bcdf4285e8a71caad9f46417e -SIZE (doomsday-1.14.5.tar.gz) = 14081857 +SHA256 (doomsday-stable-1.15.6.tar.gz) = b02a6c5495191f6d9ab0ae18a1266049847592015797ab3b2975183afd5963c5 +SIZE (doomsday-stable-1.15.6.tar.gz) = 52053145 Index: head/games/doomsday/pkg-plist =================================================================== --- head/games/doomsday/pkg-plist (revision 404070) +++ head/games/doomsday/pkg-plist (revision 404071) @@ -1,88 +1,85 @@ bin/doomsday bin/doomsday-server %%OPENAL%%lib/doomsday/libaudio_openal.so %%OPENAL%%lib/doomsday/libaudio_openal.so.1 %%OPENAL%%lib/doomsday/libaudio_openal.so.1.2 %%OPENAL%%lib/doomsday/libaudio_openal.so.1.2.4 lib/doomsday/libdehread.so lib/doomsday/libdehread.so.2 lib/doomsday/libdehread.so.2.0 lib/doomsday/libdehread.so.2.0.0 lib/doomsday/libdoom.so lib/doomsday/libdoom.so.1 -lib/doomsday/libdoom.so.1.14 -lib/doomsday/libdoom.so.1.14.5 +lib/doomsday/libdoom.so.1.15 +lib/doomsday/libdoom.so.1.15.6 lib/doomsday/libdoom64.so lib/doomsday/libdoom64.so.1 -lib/doomsday/libdoom64.so.1.14 -lib/doomsday/libdoom64.so.1.14.5 +lib/doomsday/libdoom64.so.1.15 +lib/doomsday/libdoom64.so.1.15.6 lib/doomsday/libexample.so lib/doomsday/libexample.so.1 lib/doomsday/libexample.so.1.2 lib/doomsday/libexample.so.1.2.0 lib/doomsday/libheretic.so lib/doomsday/libheretic.so.1 -lib/doomsday/libheretic.so.1.14 -lib/doomsday/libheretic.so.1.14.5 +lib/doomsday/libheretic.so.1.15 +lib/doomsday/libheretic.so.1.15.6 lib/doomsday/libhexen.so lib/doomsday/libhexen.so.1 -lib/doomsday/libhexen.so.1.14 -lib/doomsday/libhexen.so.1.14.5 +lib/doomsday/libhexen.so.1.15 +lib/doomsday/libhexen.so.1.15.6 +lib/doomsday/libidtech1converter.so +lib/doomsday/libidtech1converter.so.1 +lib/doomsday/libidtech1converter.so.1.0 +lib/doomsday/libidtech1converter.so.1.0.0 lib/doomsday/libsavegameconverter.so lib/doomsday/libsavegameconverter.so.1 lib/doomsday/libsavegameconverter.so.1.0 lib/doomsday/libsavegameconverter.so.1.0.0 -lib/doomsday/libwadmapconverter.so -lib/doomsday/libwadmapconverter.so.1 -lib/doomsday/libwadmapconverter.so.1.1 -lib/doomsday/libwadmapconverter.so.1.1.1 -lib/libdeng1.so -lib/libdeng1.so.1 -lib/libdeng1.so.1.14 -lib/libdeng1.so.1.14.5 -lib/libdeng2.so -lib/libdeng2.so.2 -lib/libdeng2.so.2.0 -lib/libdeng2.so.2.0.0 lib/libdeng_appfw.so lib/libdeng_appfw.so.1 -lib/libdeng_appfw.so.1.14 -lib/libdeng_appfw.so.1.14.5 +lib/libdeng_appfw.so.1.15 +lib/libdeng_appfw.so.1.15.6 +lib/libdeng_core.so +lib/libdeng_core.so.2 +lib/libdeng_core.so.2.0 +lib/libdeng_core.so.2.0.0 +lib/libdeng_doomsday.so +lib/libdeng_doomsday.so.1 +lib/libdeng_doomsday.so.1.15 +lib/libdeng_doomsday.so.1.15.6 lib/libdeng_gui.so lib/libdeng_gui.so.1 -lib/libdeng_gui.so.1.14 -lib/libdeng_gui.so.1.14.5 +lib/libdeng_gui.so.1.15 +lib/libdeng_gui.so.1.15.6 +lib/libdeng_legacy.so +lib/libdeng_legacy.so.1 +lib/libdeng_legacy.so.1.15 +lib/libdeng_legacy.so.1.15.6 lib/libdeng_shell.so -lib/libdeng_shell.so.0 -lib/libdeng_shell.so.0.1 -lib/libdeng_shell.so.0.1.0 +lib/libdeng_shell.so.1 +lib/libdeng_shell.so.1.15 +lib/libdeng_shell.so.1.15.6 man/man6/doomsday-server.6.gz man/man6/doomsday.6.gz %%DATADIR%%/data/doomsday.pk3 %%DATADIR%%/data/fonts/console11.dfn %%DATADIR%%/data/fonts/console14.dfn %%DATADIR%%/data/fonts/console18.dfn %%DATADIR%%/data/fonts/normal12.dfn %%DATADIR%%/data/fonts/normal18.dfn %%DATADIR%%/data/fonts/normal24.dfn %%DATADIR%%/data/fonts/normalbold12.dfn %%DATADIR%%/data/fonts/normalbold18.dfn %%DATADIR%%/data/fonts/normalbold24.dfn %%DATADIR%%/data/fonts/normallight12.dfn %%DATADIR%%/data/fonts/normallight18.dfn %%DATADIR%%/data/fonts/normallight24.dfn -%%DATADIR%%/data/graphics/background.pcx -%%DATADIR%%/data/graphics/loading1.png -%%DATADIR%%/data/graphics/loading2.png -%%DATADIR%%/data/graphics/logo.png %%DATADIR%%/data/jdoom/libdoom.pk3 %%DATADIR%%/data/jdoom64/libdoom64.pk3 %%DATADIR%%/data/jheretic/libheretic.pk3 %%DATADIR%%/data/jhexen/libhexen.pk3 -%%DATADIR%%/modules/Config.de -%%DATADIR%%/modules/Log.de -%%DATADIR%%/modules/Updater.de -%%DATADIR%%/modules/appconfig.de -%%DATADIR%%/modules/bootstrap.de -%%DATADIR%%/modules/gui.de -%%DATADIR%%/modules/recutil.de +%%DATADIR%%/data/net.dengine.base.pack +%%DATADIR%%/data/net.dengine.client.pack +%%DATADIR%%/data/net.dengine.stdlib.gui.pack +%%DATADIR%%/data/net.dengine.stdlib.pack