From owner-svn-ports-all@freebsd.org Sun Jun 26 09:05:20 2016 Return-Path: Delivered-To: svn-ports-all@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 C9425B80394; Sun, 26 Jun 2016 09:05: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 8C00A14D1; Sun, 26 Jun 2016 09:05: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 u5Q95J57087217; Sun, 26 Jun 2016 09:05:19 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5Q95J91087216; Sun, 26 Jun 2016 09:05:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201606260905.u5Q95J91087216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 26 Jun 2016 09:05:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417515 - head/devel/ocaml-sdl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 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: Sun, 26 Jun 2016 09:05:20 -0000 Author: amdmi3 Date: Sun Jun 26 09:05:19 2016 New Revision: 417515 URL: https://svnweb.freebsd.org/changeset/ports/417515 Log: - Clarify LICENSE - Add LICENSE_FILE - Switch to options helpers Modified: head/devel/ocaml-sdl/Makefile Modified: head/devel/ocaml-sdl/Makefile ============================================================================== --- head/devel/ocaml-sdl/Makefile Sun Jun 26 08:43:26 2016 (r417514) +++ head/devel/ocaml-sdl/Makefile Sun Jun 26 09:05:19 2016 (r417515) @@ -12,17 +12,11 @@ DISTNAME= ocamlsdl-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= OCaml interface to the SDL -LICENSE= LGPL21 +LICENSE= LGPL20+ # source says LGPL20+, COPYING says LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ocaml-lablgl>0:graphics/ocaml-lablgl -OPTIONS_DEFINE= SDL_GFX SDL_IMAGE SDL_MIXER SDL_TTF DOCS -OPTIONS_DEFAULT=SDL_GFX SDL_IMAGE SDL_MIXER SDL_TTF -SDL_GFX_DESC= Enable SDL_gfx support -SDL_IMAGE_DESC= Enable SDL_image support -SDL_MIXER_DESC= Enable SDL_mixer support -SDL_TTF_DESC= Enable SDL_ttf support - USE_OCAML= yes USE_OCAML_FINDLIB=yes USE_OCAMLFIND_PLIST=yes @@ -40,40 +34,32 @@ DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} INFO= ocamlsdl PORTDOCS= * -.include +OPTIONS_DEFINE= SDL_GFX SDL_IMAGE SDL_MIXER SDL_TTF DOCS +OPTIONS_DEFAULT=SDL_GFX SDL_IMAGE SDL_MIXER SDL_TTF + +SDL_GFX_DESC= Enable SDL_gfx support +SDL_IMAGE_DESC= Enable SDL_image support +SDL_MIXER_DESC= Enable SDL_mixer support +SDL_TTF_DESC= Enable SDL_ttf support -.if ${PORT_OPTIONS:MSDL_GFX} -USE_SDL+= gfx -.else -CONFIGURE_ARGS+=--disable-sdl-gfx -.endif - -.if ${PORT_OPTIONS:MSDL_IMAGE} -USE_SDL+= image -.else -CONFIGURE_ARGS+=--disable-sdl-image -.endif - -.if ${PORT_OPTIONS:MSDL_MIXER} -USE_SDL+= mixer -.else -CONFIGURE_ARGS+=--disable-sdl-mixer -.endif - -.if ${PORT_OPTIONS:MSDL_TTF} -USE_SDL+= ttf -.else -CONFIGURE_ARGS+=--disable-sdl-ttf -.endif +SDL_GFX_USE= SDL=gfx +SDL_GFX_CONFIGURE_OFF= --disable-sdl-gfx + +SDL_IMAGE_USE= SDL=image +SDL_IMAGE_CONFIGURE_OFF=--disable-sdl-image + +SDL_MIXER_USE= SDL=mixer +SDL_MIXER_CONFIGURE_OFF=--disable-sdl-mixer + +SDL_TTF_USE= SDL=ttf +SDL_TTF_CONFIGURE_OFF= --disable-sdl-ttf post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/sdl/dllsdlloaderstub.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/sdl/dllsdlttfstub.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/sdl/dllsdlgfxstub.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/sdl/dllsdlmixerstub.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/sdl/dllsdlstub.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/sdl/*.so ${INSTALL_DATA} ${WRKSRC}/doc/ocamlsdl.info ${STAGEDIR}${PREFIX}/${INFO_PATH} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc/html && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/doc/html/* ${STAGEDIR}${DOCSDIR} .include