From owner-svn-ports-head@freebsd.org Sat Apr 23 03:11:20 2016 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 B258CB19BA0; Sat, 23 Apr 2016 03:11:20 +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 7D0AA10ED; Sat, 23 Apr 2016 03:11:20 +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 u3N3BJGN087366; Sat, 23 Apr 2016 03:11:19 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3N3BJWr087365; Sat, 23 Apr 2016 03:11:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201604230311.u3N3BJWr087365@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 23 Apr 2016 03:11:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413800 - head/devel/sdl_sge X-SVN-Group: ports-head 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.21 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: Sat, 23 Apr 2016 03:11:20 -0000 Author: amdmi3 Date: Sat Apr 23 03:11:19 2016 New Revision: 413800 URL: https://svnweb.freebsd.org/changeset/ports/413800 Log: - Fix LICENSE - Switch to options helpers Modified: head/devel/sdl_sge/Makefile Modified: head/devel/sdl_sge/Makefile ============================================================================== --- head/devel/sdl_sge/Makefile Sat Apr 23 00:19:32 2016 (r413799) +++ head/devel/sdl_sge/Makefile Sat Apr 23 03:11:19 2016 (r413800) @@ -11,8 +11,7 @@ DISTNAME= sge030809 MAINTAINER= ports@FreeBSD.org COMMENT= Graphic library for the Simple DirectMedia Layer (SDL) -LICENSE= LGPL21 LGPL3 -LICENSE_COMB= dual +LICENSE= LGPL20+ # LICENSE is LGPL21 USES= gmake USE_SDL= sdl @@ -23,23 +22,15 @@ PORTEXAMPLES= * OPTIONS_DEFINE= SDL FREETYPE DOCS EXAMPLES OPTIONS_DEFAULT=SDL FREETYPE -SDL_DESC= Enable support for SDL_image -.include +FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 +FREETYPE_MAKE_ARGS= USE_FT=y +FREETYPE_MAKE_ARGS_OFF= USE_FT=n -.if ${PORT_OPTIONS:MFREETYPE} -LIB_DEPENDS+= libfreetype.so:print/freetype2 -MAKE_ARGS+= USE_FT=y -.else -MAKE_ARGS+= USE_FT=n -.endif - -.if ${PORT_OPTIONS:MSDL} -USE_SDL+= image -MAKE_ARGS+= USE_IMG=y -.else -MAKE_ARGS+= USE_IMG=n -.endif +SDL_DESC= Enable support for SDL_image +SDL_USE= SDL=image +SDL_MAKE_ARGS= USE_IMG=y +SDL_MAKE_ARGS_OFF= USE_IMG=n post-patch: @${REINPLACE_CMD} -e \ @@ -48,9 +39,13 @@ post-patch: s|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSGE.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSGE.so + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}