Date: Fri, 1 Dec 2017 13:44:11 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455292 - in head/devel/erlang-esdl: . files Message-ID: <201712011344.vB1DiB51068423@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Dec 1 13:44:11 2017 New Revision: 455292 URL: https://svnweb.freebsd.org/changeset/ports/455292 Log: - Add LICENSE_FILE - Pet portlint - Switch to options helpers - Simplify STAGEDIR handling Approved by: portmgr blanket Modified: head/devel/erlang-esdl/Makefile head/devel/erlang-esdl/files/patch-Makefile Modified: head/devel/erlang-esdl/Makefile ============================================================================== --- head/devel/erlang-esdl/Makefile Fri Dec 1 13:37:52 2017 (r455291) +++ head/devel/erlang-esdl/Makefile Fri Dec 1 13:44:11 2017 (r455292) @@ -4,14 +4,17 @@ PORTNAME= esdl PORTVERSION= 1.0.1 PORTREVISION= 13 CATEGORIES= devel -PKGNAMEPREFIX= erlang- MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} +PKGNAMEPREFIX= erlang- DISTNAME= ${PORTNAME}-${PORTVERSION}.src DIST_SUBDIR= erlang MAINTAINER= olgeni@FreeBSD.org COMMENT= Library for accessing SDL and OpenGL through Erlang +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/license.terms + BUILD_DEPENDS= erl:lang/erlang RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -23,39 +26,25 @@ USE_GL= gl glu USE_SDL= sdl ALL_TARGET= target PLIST_SUB= VERSION="${PORTVERSION}" -MAKE_ENV+= STAGEDIR="${STAGEDIR}" 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 -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MSDL_TTF} -USE_SDL+= ttf -PLIST_SUB+= SDL_TTF="" -.else -PLIST_SUB+= SDL_TTF="@comment " -.endif - -.if ${PORT_OPTIONS:MSDL_IMAGE} -USE_SDL+= image -PLIST_SUB+= SDL_IMAGE="" -.else -PLIST_SUB+= SDL_IMAGE="@comment " -.endif - post-patch: @${REINPLACE_CMD} -Ee 's|addons|lib|' ${WRKSRC}/Makefile -.if ${PORT_OPTIONS:MSDL_TTF} + +post-patch-SDL_TTF-on: @${REINPLACE_CMD} -e '/ENABLE_SDL_TTF = / s|no|yes|' ${WRKSRC}/Makefile -.endif -.if ${PORT_OPTIONS:MSDL_IMAGE} + +post-patch-SDL_IMAGE-on: @${REINPLACE_CMD} -e '/ENABLE_SDL_IMAGE = / s|no|yes|' ${WRKSRC}/Makefile -.endif post-install: @${LN} -sf ${PORTNAME}-${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/erlang-esdl/files/patch-Makefile ============================================================================== --- head/devel/erlang-esdl/files/patch-Makefile Fri Dec 1 13:37:52 2017 (r455291) +++ head/devel/erlang-esdl/files/patch-Makefile Fri Dec 1 13:44:11 2017 (r455292) @@ -5,10 +5,10 @@ ifeq ($(INSTALL_DIR), ) -INSTALLDIR = $(ERL_DIR)/addons/$(ESDL_VSN) -+INSTALLDIR = $(STAGEDIR)$(ERL_DIR)/addons/$(ESDL_VSN) ++INSTALLDIR = $(DESTDIR)$(ERL_DIR)/addons/$(ESDL_VSN) else -INSTALLDIR = $(INSTALL_DIR)/$(ESDL_VSN) -+INSTALLDIR = $(STAGEDIR)$(INSTALL_DIR)/$(ESDL_VSN) ++INSTALLDIR = $(DESTDIR)$(INSTALL_DIR)/$(ESDL_VSN) endif ## I assume that make install are only made on unixes... :-)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712011344.vB1DiB51068423>