From owner-svn-ports-all@freebsd.org Tue Nov 27 12:40:02 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6034B114A1EA; Tue, 27 Nov 2018 12:40:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 061677751E; Tue, 27 Nov 2018 12:40:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB4BD1B527; Tue, 27 Nov 2018 12:40:01 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wARCe1sq008457; Tue, 27 Nov 2018 12:40:01 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wARCe16u008454; Tue, 27 Nov 2018 12:40:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201811271240.wARCe16u008454@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 27 Nov 2018 12:40:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486003 - in head/devel: . love10 X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/devel: . love10 X-SVN-Commit-Revision: 486003 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 061677751E X-Spamd-Result: default: False [1.69 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.51)[0.511,0]; NEURAL_SPAM_SHORT(0.49)[0.488,0]; NEURAL_SPAM_MEDIUM(0.69)[0.687,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2018 12:40:02 -0000 Author: amdmi3 Date: Tue Nov 27 12:40:00 2018 New Revision: 486003 URL: https://svnweb.freebsd.org/changeset/ports/486003 Log: - Preserve love 0.10 as devel/love10 This is needed because love does not keep backwards compatibility, and love 0.10.x games won't run with love 11. - Modify the port so it can coexist with other love versions - Disable luajit as it segfaults Added: head/devel/love10/ - copied from r484821, head/devel/love/ Modified: head/devel/Makefile head/devel/love10/Makefile head/devel/love10/pkg-plist Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Tue Nov 27 12:23:38 2018 (r486002) +++ head/devel/Makefile Tue Nov 27 12:40:00 2018 (r486003) @@ -1715,6 +1715,7 @@ SUBDIR += love SUBDIR += love07 SUBDIR += love08 + SUBDIR += love10 SUBDIR += love5 SUBDIR += lpc21isp SUBDIR += lrmi Modified: head/devel/love10/Makefile ============================================================================== --- head/devel/love/Makefile Mon Nov 12 20:19:23 2018 (r484821) +++ head/devel/love10/Makefile Tue Nov 27 12:40:00 2018 (r486003) @@ -3,14 +3,14 @@ PORTNAME= love PORTVERSION= 0.10.2 -PORTREVISION= 4 CATEGORIES= devel games MASTER_SITES= https://bitbucket.org/rude/love/downloads/ \ http://mirror.amdmi3.ru/distfiles/ +PKGNAMESUFFIX= 10 DISTNAME= ${PORTNAME}-${PORTVERSION}-linux-src MAINTAINER= amdmi3@FreeBSD.org -COMMENT= Open-source 2D game engine +COMMENT= Open-source 2D game engine (legacy version 0.10) LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/license.txt @@ -23,31 +23,46 @@ LIB_DEPENDS= libmodplug.so:audio/libmodplug \ libtheora.so:multimedia/libtheora \ libogg.so:audio/libogg -USES= compiler:c++11-lib desktop-file-utils gmake libtool \ - localbase openal pkgconfig shared-mime-info +USES= autoreconf compiler:c++11-lib desktop-file-utils gl gmake \ + libtool localbase openal pkgconfig shared-mime-info USE_SDL= sdl2 USE_GL= gl glu GNU_CONFIGURE= yes +CONFIGURE_ARGS= --program-suffix=${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/love-${PORTVERSION} INSTALL_TARGET= install-strip PORTDOCS= * -OPTIONS_DEFINE= DOCS LUAJIT -OPTIONS_DEFAULT_i386= LUAJIT -OPTIONS_DEFAULT_amd64= LUAJIT +OPTIONS_DEFINE= DOCS LUAJIT -LUAJIT_DESC= Use luajit +LUAJIT_DESC= Use luajit (broken) +LUAJIT_BROKEN= love 0.10 segfaults when built with luajit, please disable LUAJIT option and retry LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_CONFIGURE_ON= --with-lua=luajit LUAJIT_USES_OFF= lua LUAJIT_CONFIGURE_OFF= --with-lua=lua \ - --with-luaversion="${LUA_VER}" + --with-luaversion="-${LUA_VER}" LUAJIT_CONFIGURE_ENV_OFF=LUA_EXECUTABLE="${LUA_CMD}" -post-patch-LUAJIT-off: - @${REINPLACE_CMD} -e 's|$${with_lua}$${with_luaversion}|$${with_lua}-$${with_luaversion}|g' \ - ${WRKSRC}/configure +post-patch: + @${REINPLACE_CMD} -e 's|\(liblove\)\(.la\)|\1${PKGNAMESUFFIX}\2|g' \ + ${WRKSRC}/src/Makefile.am + @${REINPLACE_CMD} -Ee \ + '/(Exec|Icon|MimeType)/ s|love|&${PKGNAMESUFFIX}|; s|LÖVE|& 0.10|; /^Comment/ s|$$| (legacy version 0.10)|' \ + ${WRKSRC}/platform/unix/love.desktop.in + @${REINPLACE_CMD} -e 's|x-love-game|x-love${PKGNAMESUFFIX}-game|; s|LÖVE|& 0.10|' \ + ${WRKSRC}/platform/unix/love.xml + +post-install: + @${MV} ${STAGEDIR}${PREFIX}/share/applications/love.desktop \ + ${STAGEDIR}${PREFIX}/share/applications/love${PKGNAMESUFFIX}.desktop + @${MV} ${STAGEDIR}${PREFIX}/share/pixmaps/love.svg \ + ${STAGEDIR}${PREFIX}/share/pixmaps/love${PKGNAMESUFFIX}.svg + @${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/mimetypes/application-x-love-game.svg \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/mimetypes/application-x-love${PKGNAMESUFFIX}-game.svg + @${MV} ${STAGEDIR}${PREFIX}/share/mime/packages/love.xml \ + ${STAGEDIR}${PREFIX}/share/mime/packages/love${PKGNAMESUFFIX}.xml post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/devel/love10/pkg-plist ============================================================================== --- head/devel/love/pkg-plist Mon Nov 12 20:19:23 2018 (r484821) +++ head/devel/love10/pkg-plist Tue Nov 27 12:40:00 2018 (r486003) @@ -1,9 +1,9 @@ -bin/love -lib/liblove.so -lib/liblove.so.0 -lib/liblove.so.0.0.0 -man/man1/love.1.gz -share/applications/love.desktop -share/icons/hicolor/scalable/mimetypes/application-x-love-game.svg -share/mime/packages/love.xml -share/pixmaps/love.svg +bin/love10 +lib/liblove10.so +lib/liblove10.so.0 +lib/liblove10.so.0.0.0 +man/man1/love10.1.gz +share/applications/love10.desktop +share/icons/hicolor/scalable/mimetypes/application-x-love10-game.svg +share/mime/packages/love10.xml +share/pixmaps/love10.svg