From owner-svn-ports-head@freebsd.org Fri Dec 1 13:44:13 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34E28E56731; Fri, 1 Dec 2017 13:44:13 +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 mx1.freebsd.org (Postfix) with ESMTPS id 06E002D7C; Fri, 1 Dec 2017 13:44:12 +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 vB1DiC7u068425; Fri, 1 Dec 2017 13:44:12 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB1DiB51068423; Fri, 1 Dec 2017 13:44:11 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712011344.vB1DiB51068423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 1 Dec 2017 13:44:11 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/devel/erlang-esdl: . files X-SVN-Commit-Revision: 455292 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2017 13:44:13 -0000 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 - -.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 +.include 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... :-)