Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Dec 2012 05:50:31 +0000 (UTC)
From:      Marcelo Araujo <araujo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r309293 - head/devel/ocaml-sdl
Message-ID:  <201212200550.qBK5oV09081945@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: araujo
Date: Thu Dec 20 05:50:30 2012
New Revision: 309293
URL: http://svnweb.freebsd.org/changeset/ports/309293

Log:
  - Update to 0.9.1.
  - Add LICENSE.
  - Add MAKE_JOBS_SAFE.
  - Trim header.
  
  PR:		ports/172233
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Deleted:
  head/devel/ocaml-sdl/pkg-plist
Modified:
  head/devel/ocaml-sdl/Makefile   (contents, props changed)
  head/devel/ocaml-sdl/distinfo   (contents, props changed)

Modified: head/devel/ocaml-sdl/Makefile
==============================================================================
--- head/devel/ocaml-sdl/Makefile	Thu Dec 20 05:49:32 2012	(r309292)
+++ head/devel/ocaml-sdl/Makefile	Thu Dec 20 05:50:30 2012	(r309293)
@@ -1,14 +1,8 @@
-# ex:ts=8
-# Ports collection makefile for:	ocaml-sdl
-# Date created:			Jun 1, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	sdl
-PORTVERSION=	0.7.2
-PORTREVISION=	11
+PORTVERSION=	0.9.1
 CATEGORIES=	devel
 MASTER_SITES=	SF/ocaml${PORTNAME}/OCamlSDL/ocaml${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	ocaml-
@@ -17,34 +11,70 @@ DISTNAME=	ocamlsdl-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An OCaml interface to the SDL
 
-BUILD_DEPENDS=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
+LICENSE=	LGPL21
+
+BUILD_DEPENDS=	ocaml-lablgl>0:${PORTSDIR}/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_GMAKE=	yes
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=yes
+USE_OCAMLFIND_PLIST=yes
 USE_OCAML_LDCONFIG=yes
-USE_SDL=	sdl ttf image mixer
+
+USE_SDL=	sdl
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--with-findlib
+CONFIGURE_ARGS=	--with-lablgldir=${LOCALBASE} \
+		--with-sdl-prefix=${LOCALBASE} \
+		--with-installdir=${PREFIX}
+MAKE_JOBS_SAFE=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/{PORTNAME}
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 
+INFO=		ocamlsdl
 PORTDOCS=	*
 
-.if !defined(NOPORTDOCS)
-INFO=	ocamlsdl
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSDL_GFX}
+USE_SDL+=	gfx
+.else
+CONFIGURE_ARGS+=--disable-sdl-gfx
 .endif
 
-.include <bsd.port.pre.mk>
+.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
+
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_DIRSTRY+=	${OCAML_DOCSDIR:S,^${PREFIX}/,,}
+.endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+	${INSTALL_DATA} ${WRKSRC}/doc/ocamlsdl.info ${PREFIX}/${INFO_PATH}
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/html/* ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/ocamlsdl.info ${PREFIX}/${INFO_PATH}
+	(cd ${WRKSRC}/doc/html && ${INSTALL_DATA} * ${DOCSDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/ocaml-sdl/distinfo
==============================================================================
--- head/devel/ocaml-sdl/distinfo	Thu Dec 20 05:49:32 2012	(r309292)
+++ head/devel/ocaml-sdl/distinfo	Thu Dec 20 05:50:30 2012	(r309293)
@@ -1,2 +1,2 @@
-SHA256 (ocamlsdl-0.7.2.tar.gz) = e7eec23b7c7b873bdc7fe9b618808bbebf50949f4c19d5df0a16979b2582643d
-SIZE (ocamlsdl-0.7.2.tar.gz) = 215193
+SHA256 (ocamlsdl-0.9.1.tar.gz) = abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f
+SIZE (ocamlsdl-0.9.1.tar.gz) = 226085



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