Hi ports@, Here is a patch to update games/love to 0.10.1 and take maintainership.
This update allows to drop most patches, and to also remove the now redundant CONFIGURE_ENV tweaks and the post-extract directive. Some dependencies are no longer necessary so this has been cleaned up as well. The port is now using the gcc4 module as recent love versions require a C++ compiler with C++11 support. Lastly, I removed the docs license marker as they are not included in the package. Index: Makefile =================================================================== RCS file: /cvs/ports/games/love/Makefile,v retrieving revision 1.17 diff -u -p -u -p -r1.17 Makefile --- Makefile 18 Jan 2016 14:01:36 -0000 1.17 +++ Makefile 19 May 2016 07:42:17 -0000 @@ -1,57 +1,52 @@ # $OpenBSD: Makefile,v 1.17 2016/01/18 14:01:36 sthen Exp $ -COMMENT= 2D games framework for use with Lua +COMMENT = 2D games framework for use with Lua -V= 0.8.0 -DISTNAME= love-$V-linux-src -PKGNAME= love-$V -REVISION= 7 +V = 0.10.1 +DISTNAME = love-$V-linux-src +PKGNAME = love-$V -HOMEPAGE= http://love2d.org/ +SHARED_LIBS += love 0.0 # 0.0 -CATEGORIES= games lang/lua +CATEGORIES = games lang/lua -# code: zlib license -# docs: freebsd license +MAINTAINER = Frederic Cambus <f...@statdns.com> + +HOMEPAGE = http://love2d.org/ + +# zlib license PERMIT_PACKAGE_CDROM= Yes +WANTLIB += SDL2 c freetype m modplug mpg123 ogg openal physfs +WANTLIB += pthread sndio theoradec usbhid vorbis vorbisfile z WANTLIB += ${MODLUA_WANTLIB} -WANTLIB += GL Half IL Iex IexMath IlmImf IlmThread Imath SDL X11 -WANTLIB += X11-xcb Xdamage Xext Xfixes Xxf86vm c drm -WANTLIB += freetype glapi jasper jpeg lcms m mng modplug mpg123 -WANTLIB += ogg openal physfs png pthread sndio stdc++ -WANTLIB += tiff usbhid vorbis vorbisfile xcb xcb-dri2 xcb-glx -WANTLIB += z expat - -MASTER_SITES= https://bitbucket.org/rude/love/downloads/ - -MODULES= converters/libiconv \ - lang/lua - -LIB_DEPENDS= audio/libmodplug \ - audio/mpg123 \ - audio/openal \ - audio/libvorbis \ - devel/physfs \ - devel/sdl \ - graphics/DevIL \ - graphics/ilmbase \ - graphics/openexr \ - ${MODLUA_LIB_DEPENDS} - -CONFIGURE_STYLE= gnu -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL/ \ - -I${X11BASE}/include/ -I${X11BASE}/include/freetype2 \ - `pkg-config --cflags ${MODLUA_DEP}`" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -pthread" - -WRKDIST= ${WRKDIR}/love-$V/ - -post-extract: -# Add missing newlines - cd ${WRKSRC} && \ - for i in `find . -type f`; \ - do [ "$(tail -c1 $i)" == "$(printf '\n')" ] || ls -l $i; \ - done + +MASTER_SITES= https://bitbucket.org/rude/love/downloads/ + +MODULES= lang/lua \ + gcc4 + +MODGCC4_LANGS = c++ +MODGCC4_ARCHS = * + +LIB_DEPENDS = audio/libmodplug \ + audio/mpg123 \ + audio/openal \ + audio/libvorbis \ + devel/physfs \ + devel/sdl2 \ + multimedia/libtheora \ + ${MODLUA_LIB_DEPENDS} + +RUN_DEPENDS = devel/desktop-file-utils \ + misc/shared-mime-info \ + x11/gtk+3,-guic + +CONFIGURE_STYLE = gnu + +CONFIGURE_ARGS += --with-lua=lua \ + --with-luaversion=${MODLUA_DEP_VERSION} + +WRKDIST = ${WRKDIR}/love-$V/ .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/games/love/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo 18 Jan 2015 03:14:00 -0000 1.3 +++ distinfo 19 May 2016 07:42:17 -0000 @@ -1,2 +1,2 @@ -SHA256 (love-0.8.0-linux-src.tar.gz) = kWfKHMeJP/H9zztvx+Koi+ENiZB1pROUJCD+j5Rmjsw= -SIZE (love-0.8.0-linux-src.tar.gz) = 1027356 +SHA256 (love-0.10.1-linux-src.tar.gz) = orDJoQlqBkxA+fS6/X7pLAqmT3AUb3V0mSQlwk5FQfs= +SIZE (love-0.10.1-linux-src.tar.gz) = 1686004 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/games/love/patches/patch-configure,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-configure --- patches/patch-configure 11 May 2012 21:38:29 -0000 1.2 +++ patches/patch-configure 19 May 2016 07:42:17 -0000 @@ -1,21 +1,21 @@ $OpenBSD: patch-configure,v 1.2 2012/05/11 21:38:29 jasper Exp $ ---- configure.orig Fri Apr 6 20:17:02 2012 -+++ configure Fri May 11 11:55:53 2012 -@@ -16443,7 +16443,7 @@ for ac_lib in '' vorbisfile; do +--- configure.orig Tue Mar 1 22:48:24 2016 ++++ configure Wed May 18 23:52:37 2016 +@@ -19732,7 +19732,7 @@ for ac_lib in '' m; do ac_res="none required" else ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" + LIBS="-l$ac_lib -lvorbis -lm -logg $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_ov_open=$ac_res -@@ -16460,7 +16460,7 @@ else - ac_cv_search_ov_open=no + if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_search_sqrt=$ac_res +@@ -19749,7 +19749,7 @@ else + ac_cv_search_sqrt=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS="$ac_func_search_save_LIBS -lvorbis -lm -logg" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ov_open" >&5 - $as_echo "$ac_cv_search_ov_open" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5 + $as_echo "$ac_cv_search_sqrt" >&6; } Index: patches/patch-src_modules_font_freetype_Font_h =================================================================== RCS file: patches/patch-src_modules_font_freetype_Font_h diff -N patches/patch-src_modules_font_freetype_Font_h --- patches/patch-src_modules_font_freetype_Font_h 9 Jan 2014 16:48:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_modules_font_freetype_Font_h,v 1.1 2014/01/09 16:48:47 naddy Exp $ ---- src/modules/font/freetype/Font.h.orig Fri Apr 6 20:15:01 2012 -+++ src/modules/font/freetype/Font.h Thu Jan 9 17:09:36 2014 -@@ -30,10 +30,8 @@ - #else - #include <ft2build.h> - #endif --#include <freetype/freetype.h> --#include <freetype/ftglyph.h> --#include <freetype/ftoutln.h> --#include <freetype/fttrigon.h> -+#include FT_FREETYPE_H -+#include FT_GLYPH_H - - namespace love - { Index: patches/patch-src_modules_font_freetype_TrueTypeRasterizer_h =================================================================== RCS file: patches/patch-src_modules_font_freetype_TrueTypeRasterizer_h diff -N patches/patch-src_modules_font_freetype_TrueTypeRasterizer_h --- patches/patch-src_modules_font_freetype_TrueTypeRasterizer_h 9 Jan 2014 16:48:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_modules_font_freetype_TrueTypeRasterizer_h,v 1.1 2014/01/09 16:48:47 naddy Exp $ ---- src/modules/font/freetype/TrueTypeRasterizer.h.orig Fri Apr 6 20:15:01 2012 -+++ src/modules/font/freetype/TrueTypeRasterizer.h Thu Jan 9 17:14:48 2014 -@@ -27,10 +27,8 @@ - - // TrueType2 - #include <ft2build.h> --#include <freetype/freetype.h> --#include <freetype/ftglyph.h> --#include <freetype/ftoutln.h> --#include <freetype/fttrigon.h> -+#include FT_FREETYPE_H -+#include FT_GLYPH_H - - namespace love - { Index: patches/patch-src_modules_graphics_opengl_GLee_h =================================================================== RCS file: patches/patch-src_modules_graphics_opengl_GLee_h diff -N patches/patch-src_modules_graphics_opengl_GLee_h --- patches/patch-src_modules_graphics_opengl_GLee_h 2 Jul 2011 09:54:39 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_modules_graphics_opengl_GLee_h,v 1.1.1.1 2011/07/02 09:54:39 jasper Exp $ - -Prevent redefining __GLXextFuncPtr. - ---- src/modules/graphics/opengl/GLee.h.orig Wed May 4 18:00:10 2011 -+++ src/modules/graphics/opengl/GLee.h Wed Jun 29 21:57:38 2011 -@@ -799,8 +799,6 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture_range; - - /* GLX */ - -- typedef void (*__GLXextFuncPtr)(void); -- - #ifndef GLX_ARB_get_proc_address - #define GLX_ARB_get_proc_address 1 - extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/love/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- pkg/PLIST 2 Jul 2011 09:54:39 -0000 1.1.1.1 +++ pkg/PLIST 19 May 2016 07:42:17 -0000 @@ -1,2 +1,24 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2011/07/02 09:54:39 jasper Exp $ @bin bin/love +lib/liblove.a +lib/liblove.la +@lib lib/liblove.so.${LIBlove_VERSION} +@man man/man1/love.1 +share/applications/ +share/applications/love.desktop +share/icons/ +share/icons/hicolor/ +share/icons/hicolor/scalable/ +share/icons/hicolor/scalable/mimetypes/ +share/icons/hicolor/scalable/mimetypes/application-x-love-game.svg +share/mime/ +share/mime/packages/ +share/mime/packages/love.xml +share/pixmaps/ +share/pixmaps/love.svg +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database +@exec %D/bin/update-mime-database %D/share/mime +@unexec-delete %D/bin/update-mime-database %D/share/mime +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
