Attachment 128363 Details for Bug 172233 – file.diff

[patch] file.diff

file.diff (text/plain), 5.57 KB, created by tkato432 on 2012-10-01 19:10:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-10-01 19:10:09 UTC

Size: 5.57 KB

patch

obsolete

>diff -urN /usr/ports/devel/ocaml-sdl/Makefile devel/ocaml-sdl/Makefile
>--- /usr/ports/devel/ocaml-sdl/Makefile	2012-06-01 14:17:42.000000000 +0900
>+++ devel/ocaml-sdl/Makefile	2012-09-28 18:57:23.000000000 +0900
>@@ -1,14 +1,8 @@
>-# ex:ts=8
>-# Ports collection makefile for:	ocaml-sdl
>-# Date created:			Jun 1, 2004
>-# Whom:				ijliao
>-#
>+# Created by: ijliao
> # $FreeBSD: ports/devel/ocaml-sdl/Makefile,v 1.29 2012/06/01 05:17:42 dinoex Exp $
>-#
> 
> 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 @@
> 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>
>diff -urN /usr/ports/devel/ocaml-sdl/distinfo devel/ocaml-sdl/distinfo
>--- /usr/ports/devel/ocaml-sdl/distinfo	2011-07-03 23:56:34.000000000 +0900
>+++ devel/ocaml-sdl/distinfo	2012-09-28 17:17:46.000000000 +0900
>@@ -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
>diff -urN /usr/ports/devel/ocaml-sdl/pkg-plist devel/ocaml-sdl/pkg-plist
>--- /usr/ports/devel/ocaml-sdl/pkg-plist	2006-08-05 00:45:22.000000000 +0900
>+++ devel/ocaml-sdl/pkg-plist	1970-01-01 09:00:00.000000000 +0900
>@@ -1,61 +0,0 @@
>-lib/ocaml/site-lib/sdl/META
>-lib/ocaml/site-lib/sdl/dllsdlloaderstub.so
>-lib/ocaml/site-lib/sdl/dllsdlmixerstub.so
>-lib/ocaml/site-lib/sdl/dllsdlstub.so
>-lib/ocaml/site-lib/sdl/dllsdlttfstub.so
>-lib/ocaml/site-lib/sdl/libsdlloaderstub.a
>-lib/ocaml/site-lib/sdl/libsdlmixerstub.a
>-lib/ocaml/site-lib/sdl/libsdlstub.a
>-lib/ocaml/site-lib/sdl/libsdlttfstub.a
>-lib/ocaml/site-lib/sdl/sdl.a
>-lib/ocaml/site-lib/sdl/sdl.cma
>-lib/ocaml/site-lib/sdl/sdl.cmi
>-lib/ocaml/site-lib/sdl/sdl.cmx
>-lib/ocaml/site-lib/sdl/sdl.cmxa
>-lib/ocaml/site-lib/sdl/sdl.mli
>-lib/ocaml/site-lib/sdl/sdlcdrom.cmi
>-lib/ocaml/site-lib/sdl/sdlcdrom.cmx
>-lib/ocaml/site-lib/sdl/sdlcdrom.mli
>-lib/ocaml/site-lib/sdl/sdlevent.cmi
>-lib/ocaml/site-lib/sdl/sdlevent.cmx
>-lib/ocaml/site-lib/sdl/sdlevent.mli
>-lib/ocaml/site-lib/sdl/sdlgl.cmi
>-lib/ocaml/site-lib/sdl/sdlgl.cmx
>-lib/ocaml/site-lib/sdl/sdlgl.mli
>-lib/ocaml/site-lib/sdl/sdljoystick.cmi
>-lib/ocaml/site-lib/sdl/sdljoystick.cmx
>-lib/ocaml/site-lib/sdl/sdljoystick.mli
>-lib/ocaml/site-lib/sdl/sdlkey.cmi
>-lib/ocaml/site-lib/sdl/sdlkey.cmx
>-lib/ocaml/site-lib/sdl/sdlkey.mli
>-lib/ocaml/site-lib/sdl/sdlloader.a
>-lib/ocaml/site-lib/sdl/sdlloader.cma
>-lib/ocaml/site-lib/sdl/sdlloader.cmi
>-lib/ocaml/site-lib/sdl/sdlloader.cmx
>-lib/ocaml/site-lib/sdl/sdlloader.cmxa
>-lib/ocaml/site-lib/sdl/sdlloader.mli
>-lib/ocaml/site-lib/sdl/sdlmixer.a
>-lib/ocaml/site-lib/sdl/sdlmixer.cma
>-lib/ocaml/site-lib/sdl/sdlmixer.cmi
>-lib/ocaml/site-lib/sdl/sdlmixer.cmx
>-lib/ocaml/site-lib/sdl/sdlmixer.cmxa
>-lib/ocaml/site-lib/sdl/sdlmixer.mli
>-lib/ocaml/site-lib/sdl/sdlmouse.cmi
>-lib/ocaml/site-lib/sdl/sdlmouse.cmx
>-lib/ocaml/site-lib/sdl/sdlmouse.mli
>-lib/ocaml/site-lib/sdl/sdltimer.cmi
>-lib/ocaml/site-lib/sdl/sdltimer.cmx
>-lib/ocaml/site-lib/sdl/sdltimer.mli
>-lib/ocaml/site-lib/sdl/sdlttf.a
>-lib/ocaml/site-lib/sdl/sdlttf.cma
>-lib/ocaml/site-lib/sdl/sdlttf.cmi
>-lib/ocaml/site-lib/sdl/sdlttf.cmx
>-lib/ocaml/site-lib/sdl/sdlttf.cmxa
>-lib/ocaml/site-lib/sdl/sdlttf.mli
>-lib/ocaml/site-lib/sdl/sdlvideo.cmi
>-lib/ocaml/site-lib/sdl/sdlvideo.cmx
>-lib/ocaml/site-lib/sdl/sdlvideo.mli
>-lib/ocaml/site-lib/sdl/sdlwm.cmi
>-lib/ocaml/site-lib/sdl/sdlwm.cmx
>-lib/ocaml/site-lib/sdl/sdlwm.mli
>-%%PORTDOCS%%@dirrmtry share/doc/ocaml

Actions: View | Diff

Attachments on bug 172233: 128363