Date: Tue, 1 Aug 2006 14:14:58 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: stephane@FreeBSD.org Subject: ports/101161: [PATCH] devel/ocaml-findlib: update to 1.1.2 Message-ID: <20060801101458.B71871209D@fonon.realnet> Resent-Message-ID: <200608011020.k71AKGHO090906@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101161 >Category: ports >Synopsis: [PATCH] devel/ocaml-findlib: update to 1.1.2 >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 10:20:16 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: - Fully honour PREFIX - Install docs - Remove PLIST stuff from Makefile for it's begiining to become of plist analogue merely in Makefile. Also it isn't safe enough - Update to 1.1.2 The following files was added: - files/patch-src_findlib_Makefile - pkg-plist Copy of this message was sent to stephane@FreeBSD.org. >How-To-Repeat: >Fix: --- ocaml-findlib-1.1.2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/ocaml-findlib/Makefile /var/tmp/ocaml-findlib/Makefile --- /usr/ports/devel/ocaml-findlib/Makefile Sun Feb 26 03:14:56 2006 +++ /var/tmp/ocaml-findlib/Makefile Tue Aug 1 14:11:07 2006 @@ -7,10 +7,11 @@ # PORTNAME= findlib -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= devel MASTER_SITES= http://www.ocaml-programming.de/packages/ PKGNAMEPREFIX= ocaml- +DISTNAME= ${PORTNAME}-${PORTVERSION}pl1 MAINTAINER= stephane@FreeBSD.org COMMENT= OCaml package manager @@ -21,40 +22,44 @@ HAS_CONFIGURE= yes USE_GMAKE= yes ALL_TARGET= all opt - -PLIST_FILES= bin/ocamlfind etc/findlib.conf +CONFIGURE_ARGS= -bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \ + -sitelib "${PREFIX}/lib/ocaml/site-lib" \ + -config "${PREFIX}/etc" + +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +PORTDOCS= * + +PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] + +# XXX: exists untill it will be committed to bsd.port.mk +COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \ + ${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \ + ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- MAN1= ocamlfind.1 MAN5= META.5 findlib.conf.5 site-lib.5 -# this list comes from the findlib configure script -OCAML_DIRS= dbm dynlink graphics num num-top str threads unix stdlib bigarray camlp4 - .if !defined(WITHOUT_X11) OCAML_DIRS+= labltk .endif -post-install: - @${FIND} ${PREFIX}/lib/ocaml/site-lib/findlib -type f | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - -.for D in ${OCAML_DIRS} - @${FIND} ${PREFIX}/lib/ocaml/site-lib/$D -type f -name META | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} -.endfor - - ${ECHO_CMD} 'lib/ocaml/site-lib/num-top/num_top.cma' >> ${TMPPLIST} - ${ECHO_CMD} 'lib/ocaml/site-lib/num-top/num_top.cmi' >> ${TMPPLIST} - ${ECHO_CMD} 'lib/ocaml/site-lib/num-top/num_top_printers.cmi' >> ${TMPPLIST} - ${ECHO_CMD} 'lib/ocaml/topfind' >> ${TMPPLIST} - - @${FIND} ${PREFIX}/lib/ocaml/site-lib/findlib -type d | ${SORT} -r | \ - ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} - -.for D in ${OCAML_DIRS} - ${ECHO_CMD} "@dirrm lib/ocaml/site-lib/$D" >> ${TMPPLIST} -.endfor +post-patch: + @${REINPLACE_CMD} -E \ + -e 's,(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \ + -e 's,(${PATTERN}+.*FIND_BIN),\1\$${BSD_INSTALL_SCRIPT} \3,' \ + -e 's,(${PATTERN}+.*LIBBIN),\1\$${BSD_INSTALL_SCRIPT} \3,' \ + -e 's,(${PATTERN}+.*FIND_CONF),\1\$${BSD_INSTALL_DATA} \3,' \ + -e 's,(${PATTERN}+.*SITELIB),\1\$${BSD_INSTALL_DATA} \3,' \ + ${WRKSRC}/Makefile ${WRKSRC}/src/findlib/Makefile \ + ${WRKSRC}/src/findlib-toolbox/Makefile - ${ECHO_CMD} '@dirrm lib/ocaml/site-lib' >> ${TMPPLIST} +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR} \ + "! -regex .*ref-man.*") +.endif .include <bsd.port.mk> diff -ruN --exclude=CVS /usr/ports/devel/ocaml-findlib/distinfo /var/tmp/ocaml-findlib/distinfo --- /usr/ports/devel/ocaml-findlib/distinfo Sat Jan 7 10:46:44 2006 +++ /var/tmp/ocaml-findlib/distinfo Tue Aug 1 14:11:17 2006 @@ -1,3 +1,3 @@ -MD5 (findlib-1.1.1.tar.gz) = 5f5b1cea586d81d0e3d2d1eb84ebe28a -SHA256 (findlib-1.1.1.tar.gz) = d2e0d99209c7768fe0c7dfab328cd73fb019338b50afdf62c6de6d6be7519cd9 -SIZE (findlib-1.1.1.tar.gz) = 152557 +MD5 (findlib-1.1.2pl1.tar.gz) = df4c9176e9d5b8a6d37668d108fae923 +SHA256 (findlib-1.1.2pl1.tar.gz) = 091d8ddbf1dba0ae9fe35d1fac96211bdfafcc1ddc0d1c2981783e1bc3bf9c8f +SIZE (findlib-1.1.2pl1.tar.gz) = 153542 diff -ruN --exclude=CVS /usr/ports/devel/ocaml-findlib/files/patch-src_findlib_Makefile /var/tmp/ocaml-findlib/files/patch-src_findlib_Makefile --- /usr/ports/devel/ocaml-findlib/files/patch-src_findlib_Makefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/ocaml-findlib/files/patch-src_findlib_Makefile Tue Aug 1 13:43:58 2006 @@ -0,0 +1,19 @@ +--- src/findlib/Makefile.orig Tue Aug 1 13:41:14 2006 ++++ src/findlib/Makefile Tue Aug 1 13:43:04 2006 +@@ -16,6 +16,7 @@ + OCAMLDEP = ocamldep + OCAMLLEX = ocamllex + CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo -- ++OCAML_LIBBIN=${PREFIX}/lib/ocaml + #CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo -- + + +@@ -73,7 +74,7 @@ + install: all + mkdir -p $(prefix)$(OCAML_SITELIB)/$(NAME) + mkdir -p $(prefix)$(OCAMLFIND_BIN) +- test $(INSTALL_TOPFIND) -eq 0 || cp topfind $(prefix)$(OCAML_CORE_STDLIB) ++ test $(INSTALL_TOPFIND) -eq 0 || cp topfind $(prefix)$(OCAML_LIBBIN) + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi findlib_top.cma findlib.cmxa findlib.a META` && \ + cp $$files $(prefix)$(OCAML_SITELIB)/$(NAME) + f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ diff -ruN --exclude=CVS /usr/ports/devel/ocaml-findlib/pkg-plist /var/tmp/ocaml-findlib/pkg-plist --- /usr/ports/devel/ocaml-findlib/pkg-plist Thu Jan 1 03:00:00 1970 +++ /var/tmp/ocaml-findlib/pkg-plist Tue Aug 1 14:08:37 2006 @@ -0,0 +1,48 @@ +bin/ocamlfind +bin/safe_camlp4 +etc/findlib.conf +lib/ocaml/site-lib/bigarray/META +lib/ocaml/site-lib/camlp4/META +lib/ocaml/site-lib/dbm/META +lib/ocaml/site-lib/dynlink/META +lib/ocaml/site-lib/findlib/META +lib/ocaml/site-lib/findlib/Makefile.config +lib/ocaml/site-lib/findlib/findlib.a +lib/ocaml/site-lib/findlib/findlib.cma +lib/ocaml/site-lib/findlib/findlib.cmi +lib/ocaml/site-lib/findlib/findlib.cmxa +lib/ocaml/site-lib/findlib/findlib.mli +lib/ocaml/site-lib/findlib/findlib_top.cma +lib/ocaml/site-lib/findlib/fl_metascanner.cmi +lib/ocaml/site-lib/findlib/fl_metascanner.mli +lib/ocaml/site-lib/findlib/fl_package_base.cmi +lib/ocaml/site-lib/findlib/fl_package_base.mli +lib/ocaml/site-lib/findlib/topfind.cmi +lib/ocaml/site-lib/findlib/topfind.mli +lib/ocaml/site-lib/graphics/META +lib/ocaml/site-lib/labltk/META +lib/ocaml/site-lib/num-top/META +lib/ocaml/site-lib/num-top/num_top.cma +lib/ocaml/site-lib/num-top/num_top.cmi +lib/ocaml/site-lib/num-top/num_top_printers.cmi +lib/ocaml/site-lib/num/META +lib/ocaml/site-lib/stdlib/META +lib/ocaml/site-lib/str/META +lib/ocaml/site-lib/threads/META +lib/ocaml/site-lib/unix/META +lib/ocaml/topfind +@dirrmtry share/doc/ocaml +@dirrm lib/ocaml/site-lib/unix +@dirrm lib/ocaml/site-lib/threads +@dirrm lib/ocaml/site-lib/str +@dirrm lib/ocaml/site-lib/stdlib +@dirrm lib/ocaml/site-lib/num-top +@dirrm lib/ocaml/site-lib/num +@dirrm lib/ocaml/site-lib/labltk +@dirrm lib/ocaml/site-lib/graphics +@dirrm lib/ocaml/site-lib/findlib +@dirrm lib/ocaml/site-lib/dynlink +@dirrm lib/ocaml/site-lib/dbm +@dirrm lib/ocaml/site-lib/camlp4 +@dirrm lib/ocaml/site-lib/bigarray +@dirrmtry lib/ocaml/site-lib --- ocaml-findlib-1.1.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060801101458.B71871209D>