From 3f610faf42cdea1368850fdc35af91739883be73 Mon Sep 17 00:00:00 2001 From: Jean-Yves Lefort Date: Tue, 29 Nov 2005 15:02:17 +0000 Subject: [PATCH] - Update to 3.08.a27 [1] - Respect ${CC} - Remove -O from vendor CFLAGS - Use SUB_FILES=pkg-message [1]: PR: ports/89701 Submitted by: maintainer --- lang/metaocaml/Makefile | 25 ++++++++--------- lang/metaocaml/distinfo | 5 ++-- lang/metaocaml/files/patch-configure | 15 ++++++++--- .../{pkg-message => files/pkg-message.in} | 0 lang/metaocaml/pkg-plist | 27 ++++++++++++++----- 5 files changed, 48 insertions(+), 24 deletions(-) rename lang/metaocaml/{pkg-message => files/pkg-message.in} (100%) diff --git a/lang/metaocaml/Makefile b/lang/metaocaml/Makefile index 4d8434891b8b..c4371d1bfcb4 100644 --- a/lang/metaocaml/Makefile +++ b/lang/metaocaml/Makefile @@ -6,13 +6,10 @@ # PORTNAME= metaocaml -PORTVERSION= 3.08.a23 +PORTVERSION= 3.08.a27 CATEGORIES= lang -MASTER_SITES= http://www.metaocaml.org/dist/ \ - http://www.metaocaml.org/dist/old/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= jylefort -DISTNAME= MetaOCaml_308_alpha_023 +MASTER_SITES= http://www.metaocaml.org/dist/old/ +DISTNAME= MetaOCaml_308_alpha_027 MAINTAINER= mainland@apeiron.net COMMENT= The MetaOCaml compiler and programming environment @@ -32,7 +29,8 @@ USE_GMAKE= yes ALL_TARGET= world opt metaocamlopt opt.opt STRIP= -PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_FILES= pkg-message +SUB_LIST= PORTNAME="${PORTNAME}" MAN1= ocamlcp.1 ocamldep.1 ocamldebug.1 ocamldoc.1 ocamlopt.1 \ ocamlrun.1 ocamlyacc.1 ocamlmktop.1 ocaml.1 ocamlc.1 \ @@ -76,9 +74,12 @@ PLIST_SUB+= X11="" PLIST_SUB+= X11="@comment " .endif +# We would like to use bsd.tcl.mk here, but we can't USE_TCL after including +# bsd.port.pre.mk and we can't test WITH_LABLTK before including bsd.port.pre.mk .if defined(WITH_LABLTK) LIB_DEPENDS+= tk84.1:${PORTSDIR}/x11-toolkits/tk84 CONFIGURE_ARGS+=-tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" +CONFIGURE_ARGS+=-tklibs "-L${LOCALBASE}/lib" PLIST_SUB+= LABLTK="" .if defined(WITHOUT_X11) CONFIGURE_ARGS+=-tk-no-x11 @@ -90,8 +91,9 @@ PLIST_SUB+= LABLTK="@comment " post-patch: @${REINPLACE_CMD} -e \ - 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|; \ - s|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure + "s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|; \ + s|-pthread|${PTHREAD_LIBS}|; \ + s|aspp='gcc'|aspp='${CC}'|" ${WRKSRC}/configure @${FIND} ${WRKSRC} -type f -name Makefile -exec ${REINPLACE_CMD} -Ee \ 's,^([[:space:]]*(then)?[[:space:]]*)cp([[:space:]]+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \3,; \ s,^([[:space:]]*(then)?[[:space:]]*)cp([[:space:]]+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,; \ @@ -101,7 +103,8 @@ post-patch: s,^([[:space:]]*(then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,; \ s,([[:space:]]*then[[:space:]]*)cp([[:space:]]+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \2,; \ s,([[:space:]]*then[[:space:]]*)cp([[:space:]]+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \2,; \ - s,([[:space:]]*(do|then)[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,;' {} \; + s,([[:space:]]*(do|then)[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,; \ + s,-O,,' {} \; post-install: .if defined(WITH_LABLTK) @@ -121,8 +124,6 @@ post-install: ${STRIP_CMD} ${PREFIX}/lib/metaocaml/bin/${p} .endfor ${CHMOD} u+w ${PREFIX}/lib/metaocaml/lib/ld.conf - @${SED} "s|%%PORTNAME%%|${PORTNAME}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%DATADIR%%|${DATADIR}|g" \ - ${.CURDIR}/pkg-message > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} .include diff --git a/lang/metaocaml/distinfo b/lang/metaocaml/distinfo index b489d18d0f31..827f7204254d 100644 --- a/lang/metaocaml/distinfo +++ b/lang/metaocaml/distinfo @@ -1,2 +1,3 @@ -MD5 (MetaOCaml_308_alpha_023.tar.gz) = e24bf3a24bd10839f80d4b8a963c8dde -SIZE (MetaOCaml_308_alpha_023.tar.gz) = 2643391 +MD5 (MetaOCaml_308_alpha_027.tar.gz) = cbe2ed6f3465fdd2bab138babebf8087 +SHA256 (MetaOCaml_308_alpha_027.tar.gz) = 204b1458752062d2301542acf2ef8356a1cde23d0026f281f0fc04b11be4bf82 +SIZE (MetaOCaml_308_alpha_027.tar.gz) = 2673440 diff --git a/lang/metaocaml/files/patch-configure b/lang/metaocaml/files/patch-configure index b300cbf32078..117e2fc72154 100644 --- a/lang/metaocaml/files/patch-configure +++ b/lang/metaocaml/files/patch-configure @@ -1,6 +1,14 @@ ---- configure.orig Thu Jul 15 16:17:46 2004 -+++ configure Thu Jul 15 16:58:51 2004 -@@ -1113,116 +1113,14 @@ +--- configure.orig Mon Oct 17 10:20:41 2005 ++++ configure Sat Nov 5 22:40:41 2005 +@@ -653,6 +653,7 @@ + alpha,*,digital) profiling='prof';; + i386,*,linux_elf) profiling='prof';; + i386,*,bsd_elf) profiling='prof';; ++ *,*,freebsd) profiling='prof';; + sparc,*,solaris) + profiling='prof' + case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; +@@ -1123,117 +1124,14 @@ x11_include="not found" x11_link="not found" @@ -63,6 +71,7 @@ - $x11_lib_dir \ - $x11_try_lib_dir \ - \ +- /usr/X11R6/lib64 \ - /usr/X11R6/lib \ - /usr/lib/X11R6 \ - /usr/local/X11R6/lib \ diff --git a/lang/metaocaml/pkg-message b/lang/metaocaml/files/pkg-message.in similarity index 100% rename from lang/metaocaml/pkg-message rename to lang/metaocaml/files/pkg-message.in diff --git a/lang/metaocaml/pkg-plist b/lang/metaocaml/pkg-plist index 166e3bbce379..c1f4fed839ce 100644 --- a/lang/metaocaml/pkg-plist +++ b/lang/metaocaml/pkg-plist @@ -81,6 +81,7 @@ lib/metaocaml/lib/caml/intext.h lib/metaocaml/lib/caml/memory.h lib/metaocaml/lib/caml/misc.h lib/metaocaml/lib/caml/mlvalues.h +lib/metaocaml/lib/caml/printexc.h lib/metaocaml/lib/caml/signals.h lib/metaocaml/lib/camlheader lib/metaocaml/lib/camlheader_ur @@ -89,6 +90,10 @@ lib/metaocaml/lib/camlinternalOO.cmx lib/metaocaml/lib/camlinternalOO.ml lib/metaocaml/lib/camlinternalOO.mli lib/metaocaml/lib/camlinternalOO.p.cmx +lib/metaocaml/lib/camlp4/argl.cmi +lib/metaocaml/lib/camlp4/argl.cmo +lib/metaocaml/lib/camlp4/argl.cmx +lib/metaocaml/lib/camlp4/argl.o lib/metaocaml/lib/camlp4/ast2pt.cmi lib/metaocaml/lib/camlp4/ast2pt.mli lib/metaocaml/lib/camlp4/camlp4.a @@ -98,17 +103,22 @@ lib/metaocaml/lib/camlp4/camlp4_top.cma lib/metaocaml/lib/camlp4/camlp4o.cma lib/metaocaml/lib/camlp4/camlp4r.cma lib/metaocaml/lib/camlp4/extfold.cmi +lib/metaocaml/lib/camlp4/extfold.cmx lib/metaocaml/lib/camlp4/extfold.mli lib/metaocaml/lib/camlp4/extfun.cmi +lib/metaocaml/lib/camlp4/extfun.cmx lib/metaocaml/lib/camlp4/extfun.mli lib/metaocaml/lib/camlp4/fstream.cmi +lib/metaocaml/lib/camlp4/fstream.cmx lib/metaocaml/lib/camlp4/fstream.mli lib/metaocaml/lib/camlp4/gramext.cmi +lib/metaocaml/lib/camlp4/gramext.cmx lib/metaocaml/lib/camlp4/gramext.mli lib/metaocaml/lib/camlp4/gramlib.a lib/metaocaml/lib/camlp4/gramlib.cma lib/metaocaml/lib/camlp4/gramlib.cmxa lib/metaocaml/lib/camlp4/grammar.cmi +lib/metaocaml/lib/camlp4/grammar.cmx lib/metaocaml/lib/camlp4/grammar.mli lib/metaocaml/lib/camlp4/mLast.cmi lib/metaocaml/lib/camlp4/mLast.mli @@ -167,6 +177,7 @@ lib/metaocaml/lib/camlp4/pa_ru.o lib/metaocaml/lib/camlp4/pcaml.cmi lib/metaocaml/lib/camlp4/pcaml.mli lib/metaocaml/lib/camlp4/plexer.cmi +lib/metaocaml/lib/camlp4/plexer.cmx lib/metaocaml/lib/camlp4/plexer.mli lib/metaocaml/lib/camlp4/pr_depend.cmo lib/metaocaml/lib/camlp4/pr_depend.cmx @@ -206,8 +217,10 @@ lib/metaocaml/lib/camlp4/quotation.mli lib/metaocaml/lib/camlp4/spretty.cmi lib/metaocaml/lib/camlp4/spretty.mli lib/metaocaml/lib/camlp4/stdpp.cmi +lib/metaocaml/lib/camlp4/stdpp.cmx lib/metaocaml/lib/camlp4/stdpp.mli lib/metaocaml/lib/camlp4/token.cmi +lib/metaocaml/lib/camlp4/token.cmx lib/metaocaml/lib/camlp4/token.mli lib/metaocaml/lib/char.cmi lib/metaocaml/lib/char.cmx @@ -585,6 +598,12 @@ lib/metaocaml/lib/weak.p.cmx %%X11%%lib/metaocaml/lib/stublibs/dllgraphics.so %%LABLTK%%lib/metaocaml/bin/labltk %%LABLTK%%lib/metaocaml/bin/ocamlbrowser +%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmi +%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmx +%%LABLTK%%lib/metaocaml/lib/labltk/balloon.mli +%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmi +%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmx +%%LABLTK%%lib/metaocaml/lib/labltk/bell.mli %%LABLTK%%lib/metaocaml/lib/labltk/button.cmi %%LABLTK%%lib/metaocaml/lib/labltk/button.cmx %%LABLTK%%lib/metaocaml/lib/labltk/button.mli @@ -895,12 +914,6 @@ lib/metaocaml/lib/weak.p.cmx %%LABLTK%%lib/metaocaml/lib/labltk/wm.mli %%LABLTK%%lib/metaocaml/lib/stublibs/dlllabltk.so %%LABLTK%%lib/metaocaml/lib/stublibs/dlltkanim.so -%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmi -%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmx -%%LABLTK%%lib/metaocaml/lib/labltk/balloon.mli -%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmi -%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmx -%%LABLTK%%lib/metaocaml/lib/labltk/bell.mli %%LABLTK%%%%EXAMPLESDIR%%/camltk/Makefile %%LABLTK%%%%EXAMPLESDIR%%/camltk/Makefile.nt %%LABLTK%%%%EXAMPLESDIR%%/camltk/addition.ml @@ -938,12 +951,12 @@ lib/metaocaml/lib/weak.p.cmx @dirrm lib/metaocaml/bin @dirrm lib/metaocaml/lib/caml @dirrm lib/metaocaml/lib/camlp4 +%%LABLTK%%@dirrm lib/metaocaml/lib/labltk @dirrm lib/metaocaml/lib/ocamldoc/custom @dirrm lib/metaocaml/lib/ocamldoc @dirrm lib/metaocaml/lib/stublibs @dirrm lib/metaocaml/lib/threads @dirrm lib/metaocaml/lib/vmthreads -%%LABLTK%%@dirrm lib/metaocaml/lib/labltk @dirrm lib/metaocaml/lib @dirrm lib/metaocaml @dirrm %%DATADIR%%/man/man1