Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Jun 2016 09:05:19 +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: r417515 - head/devel/ocaml-sdl
Message-ID:  <201606260905.u5Q95J91087216@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
+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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606260905.u5Q95J91087216>