Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Dec 2012 05:48:37 +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: r309291 - head/devel/ocaml-res
Message-ID:  <201212200548.qBK5mbGQ081526@svn.freebsd.org>

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

Log:
  - Update to 4.0.2.
  - Add LICENSE.
  - Add MAKE_JOBS_UNSAFE.
  
  PR:		ports/172231
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/devel/ocaml-res/Makefile   (contents, props changed)
  head/devel/ocaml-res/distinfo   (contents, props changed)
  head/devel/ocaml-res/pkg-descr   (contents, props changed)

Modified: head/devel/ocaml-res/Makefile
==============================================================================
--- head/devel/ocaml-res/Makefile	Thu Dec 20 05:48:05 2012	(r309290)
+++ head/devel/ocaml-res/Makefile	Thu Dec 20 05:48:36 2012	(r309291)
@@ -2,60 +2,53 @@
 # $FreeBSD$
 
 PORTNAME=	res
-PORTVERSION=	3.2.0
-PORTREVISION=	1
+PORTVERSION=	4.0.2
 CATEGORIES=	devel
-MASTER_SITES=	http://hg.ocaml.info/release/res/archive/
+MASTER_SITES=	http://cdn.bitbucket.org/mmottl/res/downloads/
 PKGNAMEPREFIX=	ocaml-
-DISTNAME=	release-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically Resizing Contiguous Memory for OCaml
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-11-26
+LICENSE=	LGPL21
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=yes
+USE_OCAMLFIND_PLIST=yes
 USE_OCAML_WASH=	yes
-MAKE_JOBS_UNSAFE=	yes
 
-DOCS=		README.txt
-DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
-WRKSRC=		${WRKDIR}/${PORTNAME}-release-${PORTVERSION}
-
-.include <bsd.port.pre.mk>
-
-post-extract:
-# For nonstandard prefixes
-.if !exists(${OCAMLFIND_DESTDIR})
-	${MKDIR} ${OCAMLFIND_DESTDIR}
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix ${PREFIX} --disable-docs --disable-examples
+MAKE_JOBS_UNSAFE=yes
+
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_DIRSTRY+=	${OCAML_DOCSDIR:S,^${PREFIX}/,,}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+PLIST_DIRSTRY+=	${OCAML_EXAMPLESDIR:S,^${PREFIX}/,,}
 .endif
 
 post-install:
-	@${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+.for i in AUTHORS.txt CHANGES.txt README.md TODO.md
+	cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR}
+.endfor
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
-	@${FIND} ${EXAMPLESDIR}/ ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-	@${FIND} ${DOCSDIR}/ ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-# XXX: temporary workaround for non-standard PREFIX
-	@${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \
-		>> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/share/examples/ocaml 2>/dev/null||true" \
-		>> ${TMPPLIST}
+	cd ${WRKSRC}/examples && ${INSTALL_DATA} *.ml ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/ocaml-res/distinfo
==============================================================================
--- head/devel/ocaml-res/distinfo	Thu Dec 20 05:48:05 2012	(r309290)
+++ head/devel/ocaml-res/distinfo	Thu Dec 20 05:48:36 2012	(r309291)
@@ -1,2 +1,2 @@
-SHA256 (release-3.2.0.tar.bz2) = 945c1dfa6d29ec7443dc9707df41f89a8a58274f7e2257f8d7ac5e407a971765
-SIZE (release-3.2.0.tar.bz2) = 35294
+SHA256 (res-4.0.2.tar.gz) = 4f3e0a62c57ac1293ec119e94ecff2f404cd9196e71c276bd6c3855731af0d7e
+SIZE (res-4.0.2.tar.gz) = 69538

Modified: head/devel/ocaml-res/pkg-descr
==============================================================================
--- head/devel/ocaml-res/pkg-descr	Thu Dec 20 05:48:05 2012	(r309290)
+++ head/devel/ocaml-res/pkg-descr	Thu Dec 20 05:48:36 2012	(r309291)
@@ -9,4 +9,4 @@ There are also functors that allow the g
 which use different reallocation strategies.
 
 Author:	Markus Mottl <markus.mottl@gmail.com>
-WWW:	http://www.ocaml.info/home/ocaml_sources.html
+WWW:	https://bitbucket.org/mmottl/res



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