ports/101173: [PATCH] devel/ocaml-sdl: update to 0.7.2, take maintainership

Stanislav Sedov ssedov at mbsd.msk.ru
Tue Aug 1 14:10:15 UTC 2006 

>Number:         101173
>Category:       ports
>Synopsis:       [PATCH] devel/ocaml-sdl: update to 0.7.2, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 01 14:10:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Stanislav Sedov
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006
>Description:
- Update to 0.7.2
- Use new ocaml framework (depepends on ports/101100)
- Install info as well
- Install docs with correct permissions
- Take maintainership

The following files was added:
- pkg-plist

I removed the following files:
- files/patch-configure.in
- files/patch-makefile.config.gcc.in
- pkg-install

>How-To-Repeat:
>Fix:

--- ocaml-sdl-0.7.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/ocaml-sdl/Makefile /var/tmp/ocaml-sdl/Makefile
--- /usr/ports/devel/ocaml-sdl/Makefile	Tue Jan 31 03:00:14 2006
+++ /var/tmp/ocaml-sdl/Makefile	Tue Aug  1 18:02:43 2006
@@ -7,45 +7,47 @@
 #
 
 PORTNAME=	sdl
-PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTVERSION=	0.7.2
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ocamlsdl
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	ocamlsdl-${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	ssedov at mbsd.msk.ru
 COMMENT=	An OCaml interface to the SDL
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
-		lablgl:${PORTSDIR}/graphics/ocaml-lablgl
+BUILD_DEPENDS=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
 
+USE_GMAKE=	yes
+USE_OCAML=	yes
+USE_OCAML_FINDLIB=yes
+USE_OCAML_LDCONFIG=yes
 USE_SDL=	sdl ttf image mixer
-USE_AUTOTOOLS=	autoconf:259
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	--with-findlib
-USE_GMAKE=	yes
 
-PKGDEINSTALL=	${PKGINSTALL}
+DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/{PORTNAME}
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
+MASTERPORT=	${PORTSDIR}/devel/ocaml-camlidl
 
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
+.if !defined(NOPORTDOCS)
+INFO=	ocamlsdl
 .endif
 
+.include <bsd.port.pre.mk>
+.include "${MASTERPORT}/bsd.ocaml.mk"
+
 post-install:
-	@${FIND} ${PREFIX}/lib/ocaml/site-lib/sdl ! -type d | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/${PORTNAME}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ocamlfind remove ${PORTNAME} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir lib/ocaml 2>/dev/null || true" >> ${TMPPLIST}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/html/ ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/html/* ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/ocamlsdl.info ${PREFIX}/${INFO_PATH}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/devel/ocaml-sdl/distinfo /var/tmp/ocaml-sdl/distinfo
--- /usr/ports/devel/ocaml-sdl/distinfo	Thu Nov 24 18:39:31 2005
+++ /var/tmp/ocaml-sdl/distinfo	Tue Aug  1 17:32:38 2006
@@ -1,3 +1,3 @@
-MD5 (ocamlsdl-0.7.1.tar.gz) = 3829b20bd975e3bef5195a54e2cd04cb
-SHA256 (ocamlsdl-0.7.1.tar.gz) = 63a3be8f7280256d8cc6af552e14a0550b1acd955b3147a24d9d515abe838c32
-SIZE (ocamlsdl-0.7.1.tar.gz) = 213802
+MD5 (ocamlsdl-0.7.2.tar.gz) = 0707a9cf80bd9cfe18ad660dc077bad6
+SHA256 (ocamlsdl-0.7.2.tar.gz) = e7eec23b7c7b873bdc7fe9b618808bbebf50949f4c19d5df0a16979b2582643d
+SIZE (ocamlsdl-0.7.2.tar.gz) = 215193
diff -ruN --exclude=CVS /usr/ports/devel/ocaml-sdl/files/patch-configure.in /var/tmp/ocaml-sdl/files/patch-configure.in
--- /usr/ports/devel/ocaml-sdl/files/patch-configure.in	Sun Jan  9 20:49:44 2005
+++ /var/tmp/ocaml-sdl/files/patch-configure.in	Thu Jan  1 03:00:00 1970
@@ -1,10 +0,0 @@
---- configure.in.orig	Sun Jan  9 10:44:49 2005
-+++ configure.in	Sun Jan  9 10:49:16 2005
-@@ -52,6 +52,7 @@
- )
- 
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
-+LIBS="$LIBS $SDL_LIBS"
- 
- # cmdline options 
- AC_ARG_ENABLE(sdl_ttf,
diff -ruN --exclude=CVS /usr/ports/devel/ocaml-sdl/files/patch-makefile.config.gcc.in /var/tmp/ocaml-sdl/files/patch-makefile.config.gcc.in
--- /usr/ports/devel/ocaml-sdl/files/patch-makefile.config.gcc.in	Wed Aug 18 12:04:36 2004
+++ /var/tmp/ocaml-sdl/files/patch-makefile.config.gcc.in	Thu Jan  1 03:00:00 1970
@@ -1,9 +0,0 @@
---- makefile.config.gcc.in.orig	Wed Aug 18 15:51:25 2004
-+++ makefile.config.gcc.in	Wed Aug 18 15:52:03 2004
-@@ -44,5 +44,5 @@
- 
- MKCMA  = $(OCAMLMKLIB) -v -o $(1) -oc $(2) $(3) $(4)
- MKCMXA = $(OCAMLMKLIB) -v -o $(1) -oc $(2) $(3) $(4)
--MKCLIB = $(OCAMLMKLIB) -v -o $(1) -oc $(2) $(3) $(4)
-+MKCLIB = $(OCAMLMKLIB) -v -o $(1) -L${LOCALBASE}/lib -oc $(2) $(3) $(4)
- endif
diff -ruN --exclude=CVS /usr/ports/devel/ocaml-sdl/pkg-install /var/tmp/ocaml-sdl/pkg-install
--- /usr/ports/devel/ocaml-sdl/pkg-install	Wed Aug 18 12:04:36 2004
+++ /var/tmp/ocaml-sdl/pkg-install	Thu Jan  1 03:00:00 1970
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-INSTALL" ]; then
-  echo "${PKG_PREFIX}/lib/ocaml/site-lib/sdl" >> ${PKG_PREFIX}/lib/ocaml/ld.conf
-elif [ "$2" = "DEINSTALL" ]; then
-  mv ${PKG_PREFIX}/lib/ocaml/ld.conf ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
-  grep -v sdl ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp > ${PKG_PREFIX}/lib/ocaml/ld.conf
-  rm -f ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
-fi
diff -ruN --exclude=CVS /usr/ports/devel/ocaml-sdl/pkg-plist /var/tmp/ocaml-sdl/pkg-plist
--- /usr/ports/devel/ocaml-sdl/pkg-plist	Thu Jan  1 03:00:00 1970
+++ /var/tmp/ocaml-sdl/pkg-plist	Tue Aug  1 18:04:45 2006
@@ -0,0 +1,60 @@
+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
--- ocaml-sdl-0.7.2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list