Date: Sun, 28 Jul 2019 22:21:24 +0000 (UTC) From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507539 - in head/devel/erlang-esdl: . files Message-ID: <201907282221.x6SMLO0T006989@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cmt Date: Sun Jul 28 22:21:24 2019 New Revision: 507539 URL: https://svnweb.freebsd.org/changeset/ports/507539 Log: update erlang-esdl to 1.3.1 This is required for updating and unbreaking graphics/wings, erlang-esdl's only consumer. (The current port's version is 1.0.1 is 10 years old, 1.3.1 is only 6 years old, and the whole thing has been declared "legacy", but wings still requires it, so here we go). The upstream maintainer has switched the build system from Makefiles to rebar (rebar 2, rebar3 doesn't cut it) and made the former optional dependencies on SDL-image and SDL-ttf mandatory. esdl's former home at SourceForge has disappeared, the most current version (even if it's not really current) is now available at Github, WWW has been updated to reflect that change. PR: 239173 Approved by: maintainer-timeout (erlang@) Added: head/devel/erlang-esdl/files/patch-rebar.config (contents, props changed) Deleted: head/devel/erlang-esdl/files/patch-Makefile head/devel/erlang-esdl/files/patch-c__src_Makefile head/devel/erlang-esdl/files/patch-c__src_esdl__driver.c Modified: head/devel/erlang-esdl/Makefile head/devel/erlang-esdl/distinfo head/devel/erlang-esdl/pkg-descr head/devel/erlang-esdl/pkg-plist Modified: head/devel/erlang-esdl/Makefile ============================================================================== --- head/devel/erlang-esdl/Makefile Sun Jul 28 21:57:42 2019 (r507538) +++ head/devel/erlang-esdl/Makefile Sun Jul 28 22:21:24 2019 (r507539) @@ -1,13 +1,10 @@ # $FreeBSD$ PORTNAME= esdl -PORTVERSION= 1.0.1 -PORTREVISION= 13 +DISTVERSIONPREFIX= esdl- +DISTVERSION= 1.3.1 CATEGORIES= devel -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= erlang- -DISTNAME= ${PORTNAME}-${PORTVERSION}.src -DIST_SUBDIR= erlang MAINTAINER= erlang@FreeBSD.org COMMENT= Library for accessing SDL and OpenGL through Erlang @@ -18,31 +15,17 @@ LICENSE_FILE= ${WRKSRC}/license.terms BUILD_DEPENDS= erl:lang/erlang RUN_DEPENDS:= ${BUILD_DEPENDS} -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USES= erlang:rebar gl sdl +USE_GITHUB= yes +GH_ACCOUNT= dgud -USES= dos2unix gmake -DOS2UNIX_GLOB= Makefile USE_GL= gl glu -USE_SDL= sdl -ALL_TARGET= target +USE_SDL= sdl image ttf + PLIST_SUB= VERSION="${PORTVERSION}" -OPTIONS_DEFINE= SDL_TTF SDL_IMAGE -OPTIONS_DEFAULT=SDL_TTF SDL_IMAGE -OPTIONS_SUB= yes -SDL_TTF_DESC= SDL_ttf support -SDL_TTF_USE= SDL=ttf -SDL_IMAGE_DESC= SDL_image support -SDL_IMAGE_USE= SDL=image - post-patch: - @${REINPLACE_CMD} -Ee 's|addons|lib|' ${WRKSRC}/Makefile - -post-patch-SDL_TTF-on: - @${REINPLACE_CMD} -e '/ENABLE_SDL_TTF = / s|no|yes|' ${WRKSRC}/Makefile - -post-patch-SDL_IMAGE-on: - @${REINPLACE_CMD} -e '/ENABLE_SDL_IMAGE = / s|no|yes|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} "s/\(vsn,\) git/\1 \"${DISTVERSION}\"/" "${WRKSRC}/src/sdl.app.src" post-install: @${LN} -sf ${PORTNAME}-${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME} Modified: head/devel/erlang-esdl/distinfo ============================================================================== --- head/devel/erlang-esdl/distinfo Sun Jul 28 21:57:42 2019 (r507538) +++ head/devel/erlang-esdl/distinfo Sun Jul 28 22:21:24 2019 (r507539) @@ -1,2 +1,3 @@ -SHA256 (erlang/esdl-1.0.1.src.tar.gz) = 16fcf29656e6a54c9e10d0a73faa3e5b305c6aab3ab691cad2206c427265877d -SIZE (erlang/esdl-1.0.1.src.tar.gz) = 428917 +TIMESTAMP = 1562963418 +SHA256 (dgud-esdl-esdl-1.3.1_GH0.tar.gz) = 54723f487c384f04de404309454825361fa6eac8cb3c62bfadc2a559dfa928b4 +SIZE (dgud-esdl-esdl-1.3.1_GH0.tar.gz) = 323534 Added: head/devel/erlang-esdl/files/patch-rebar.config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/erlang-esdl/files/patch-rebar.config Sun Jul 28 22:21:24 2019 (r507539) @@ -0,0 +1,12 @@ +--- rebar.config.orig 2019-07-12 20:04:39 UTC ++++ rebar.config +@@ -11,6 +11,9 @@ + {"darwin", "CFLAGS", "$CFLAGS -ObjC -D_OSX_COCOA -I/opt/X11/include"}, + {"darwin", "LDFLAGS", "$LDFLAGS -framework SDL -rpath @executable_path/../Frameworks"}, + ++ {"freebsd", "CFLAGS", "$CFLAGS $SDL_CFLAGS"}, ++ {"freebsd", "LDFLAGS", "$LDFLAGS $SDL_LIBDIR"}, ++ + {"win32", "CFLAGS", "$CFLAGS -DWIN32 -D_WIN32 -D__WIN32__ $SDL_INCDIR"}, + {"win32", "DRV_CFLAGS", "/Zi /W3 $ERL_CFLAGS"}, + {"win32", "ERL_LDFLAGS", " /debug /LIBPATH:$SDL_LIBDIR SDL.lib user32.lib"} Modified: head/devel/erlang-esdl/pkg-descr ============================================================================== --- head/devel/erlang-esdl/pkg-descr Sun Jul 28 21:57:42 2019 (r507538) +++ head/devel/erlang-esdl/pkg-descr Sun Jul 28 22:21:24 2019 (r507539) @@ -1,3 +1,3 @@ Esdl is library for accessing SDL and OpenGL through Erlang. -WWW: http://esdl.sourceforge.net/ +WWW: https://github.com/dgud/esdl Modified: head/devel/erlang-esdl/pkg-plist ============================================================================== --- head/devel/erlang-esdl/pkg-plist Sun Jul 28 21:57:42 2019 (r507538) +++ head/devel/erlang-esdl/pkg-plist Sun Jul 28 22:21:24 2019 (r507539) @@ -1,65 +1,16 @@ -lib/erlang/lib/esdl-%%VERSION%%/Readme -lib/erlang/lib/esdl-%%VERSION%%/Readme.MacOSX-Cocoa -lib/erlang/lib/esdl-%%VERSION%%/Readme.win32 -lib/erlang/lib/esdl-%%VERSION%%/c_src/CPS.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/SDLMain.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_audio.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_audio.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_conv.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_driver.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_events.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_events.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gen.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl_fp.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext_fp.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu_fp.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_sdl_fp.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_spec.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_ttf.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_ttf.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_img.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_img.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.c -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.h -lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_wrapper.c -lib/erlang/lib/esdl-%%VERSION%%/doc/gl.html -lib/erlang/lib/esdl-%%VERSION%%/doc/glu.html -lib/erlang/lib/esdl-%%VERSION%%/doc/index.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_active.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_audio.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_events.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_img.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_joystick.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_keyboard.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_mouse.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_ttf.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_util.html -lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_video.html -lib/erlang/lib/esdl-%%VERSION%%/ebin/gl.beam -lib/erlang/lib/esdl-%%VERSION%%/ebin/glu.beam +lib/erlang/lib/esdl +lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl.app lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_active.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_audio.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_events.beam -%%SDL_IMAGE%%lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_img.beam +lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_img.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_joystick.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_keyboard.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_mouse.beam -%%SDL_TTF%%lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_ttf.beam +lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_ttf.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_util.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_video.beam -lib/erlang/lib/esdl-%%VERSION%%/include/gl.hrl -lib/erlang/lib/esdl-%%VERSION%%/include/glu.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl_active.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl_audio.hrl @@ -69,14 +20,9 @@ lib/erlang/lib/esdl-%%VERSION%%/include/sdl_keyboard.h lib/erlang/lib/esdl-%%VERSION%%/include/sdl_mouse.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl_ttf.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl_video.hrl -lib/erlang/lib/esdl-%%VERSION%%/license.terms lib/erlang/lib/esdl-%%VERSION%%/priv/sdl_driver.so lib/erlang/lib/esdl-%%VERSION%%/src/esdl.hrl -lib/erlang/lib/esdl-%%VERSION%%/src/gl.erl -lib/erlang/lib/esdl-%%VERSION%%/src/gl_funcs.hrl -lib/erlang/lib/esdl-%%VERSION%%/src/glext_funcs.hrl -lib/erlang/lib/esdl-%%VERSION%%/src/glu.erl -lib/erlang/lib/esdl-%%VERSION%%/src/glu_funcs.hrl +lib/erlang/lib/esdl-%%VERSION%%/src/sdl.app.src lib/erlang/lib/esdl-%%VERSION%%/src/sdl.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_active.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_audio.erl @@ -92,5 +38,3 @@ lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.hrl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video_funcs.hrl -lib/erlang/lib/esdl-%%VERSION%%/vsn.mk -lib/erlang/lib/esdl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907282221.x6SMLO0T006989>