Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Sep 2018 15:44:56 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r480802 - in head: . lang lang/ocaml-camlidl
Message-ID:  <201809271544.w8RFiuPj086530@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Sep 27 15:44:56 2018
New Revision: 480802
URL: https://svnweb.freebsd.org/changeset/ports/480802

Log:
  - Resurrect and stagify `lang/ocaml-camlidl' port
  - Fix spelling in the COMMENT and add LICENSE knobs
  - Pass maintainership to the submitter
  
  PR:		231568
  Submitted by:	Greg Kennedy

Added:
  head/lang/ocaml-camlidl/
     - copied from r366902, head/lang/ocaml-camlidl/
Modified:
  head/MOVED
  head/lang/Makefile
  head/lang/ocaml-camlidl/Makefile
  head/lang/ocaml-camlidl/distinfo
  head/lang/ocaml-camlidl/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Sep 27 15:43:12 2018	(r480801)
+++ head/MOVED	Thu Sep 27 15:44:56 2018	(r480802)
@@ -6552,7 +6552,6 @@ lang/hiphop-php||2014-09-01|Not staged
 lang/lush||2014-09-01|Not staged
 lang/metaocaml||2014-09-01|Not staged
 lang/mpd||2014-09-01|Not staged
-lang/ocaml-camlidl||2014-09-01|Not staged
 lang/ocaml-mode.el||2014-09-01|Not staged
 lang/ocs||2014-09-01|Not staged
 lang/oorexx||2014-09-01|Not staged

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Thu Sep 27 15:43:12 2018	(r480801)
+++ head/lang/Makefile	Thu Sep 27 15:44:56 2018	(r480802)
@@ -218,6 +218,7 @@
     SUBDIR += nyan
     SUBDIR += ocaml
     SUBDIR += ocaml-autoconf
+    SUBDIR += ocaml-camlidl
     SUBDIR += ocaml-nox11
     SUBDIR += ohugs
     SUBDIR += onyx

Modified: head/lang/ocaml-camlidl/Makefile
==============================================================================
--- head/lang/ocaml-camlidl/Makefile	Mon Sep  1 17:06:47 2014	(r366902)
+++ head/lang/ocaml-camlidl/Makefile	Thu Sep 27 15:44:56 2018	(r480802)
@@ -11,21 +11,24 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-${PORTVERSION}.doc.html.tar.gz
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Stub code generator for using C/C++ libraries from ocaml
+MAINTAINER=	kennedy.greg@gmail.com
+COMMENT=	Stub code generator for using C/C++ libraries from OCaml
 
+LICENSE=	LGPL20 LGPL21
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_OCAML=	yes
 
 MAKE_JOBS_UNSAFE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${REINPLACE_CMD} -e "s,^\(OCAMLLIB=\).*,\1${PREFIX}/lib/ocaml,g" \
-		-e "s,^\(BINDIR=\).*,\1${PREFIX}/bin,g" \
+	@${REINPLACE_CMD} -e "s,^\(OCAMLLIB=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml,g" \
+		-e "s,^\(BINDIR=\).*,\1${STAGEDIR}${PREFIX}/bin,g" \
 		-e "s,^CFLAGS=.*,#\&,g" \
 		-e "s,^\(CPP=\).*,\1/usr/bin/cpp,g" \
 		${WRKSRC}/config/Makefile.unix
@@ -41,18 +44,14 @@ post-extract:
 	@${LN} -sf ${WRKSRC}/config/Makefile.unix ${WRKSRC}/config/Makefile
 
 pre-install:
-.if !exists(${PREFIX}/lib/ocaml/caml)
-	${MKDIR} ${PREFIX}/lib/ocaml/caml
-.endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/caml
 
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${GZCAT} ${_DISTDIR}/${PORTNAME}-${PORTVERSION}.doc.html.tar.gz \
-		| ${TAR} -C ${DOCSDIR} -xf -
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	${FIND} ${DOCSDIR}/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;
-.endif
+		| ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
+	${FIND} ${STAGEDIR}${DOCSDIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \;
 
 test:
 	@${ECHO_CMD} "Testing IDL library"
@@ -60,4 +59,4 @@ test:
 		${WRKSRC}/tests/Makefile
 	cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} all
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/lang/ocaml-camlidl/distinfo
==============================================================================
--- head/lang/ocaml-camlidl/distinfo	Mon Sep  1 17:06:47 2014	(r366902)
+++ head/lang/ocaml-camlidl/distinfo	Thu Sep 27 15:44:56 2018	(r480802)
@@ -1,3 +1,4 @@
+TIMESTAMP = 1089725420
 SHA256 (camlidl-1.05.tar.gz) = 857ed5bd3b2f99c62813070e1a5b4b6375e837c6815f4ad956baeb6f8c660311
 SIZE (camlidl-1.05.tar.gz) = 100640
 SHA256 (camlidl-1.05.doc.html.tar.gz) = 00ac7822ec73cb3cb5cb23b5d34879436366d979887eb3a312e1adcae8c1c32c

Modified: head/lang/ocaml-camlidl/pkg-plist
==============================================================================
--- head/lang/ocaml-camlidl/pkg-plist	Mon Sep  1 17:06:47 2014	(r366902)
+++ head/lang/ocaml-camlidl/pkg-plist	Thu Sep 27 15:44:56 2018	(r480802)
@@ -17,8 +17,3 @@ lib/ocaml/libcamlidl.a
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/main007.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/next_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/previous_motif.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htmlman
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrmtry share/doc/ocaml
-@dirrmtry lib/ocaml/caml
-@dirrmtry lib/ocaml



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