svn commit: r315988 - in head/devel/omake: . files
Brendan Fabeny
bf at FreeBSD.org
Wed Apr 17 16:59:57 UTC 2013
Author: bf
Date: Wed Apr 17 16:59:55 2013
New Revision: 315988
URL: http://svnweb.freebsd.org/changeset/ports/315988
Log:
update to 0.9.8.6-rc1; add a test target
Feature safe: yes
Deleted:
head/devel/omake/files/patch-src_exec_omake_exec.ml
Modified:
head/devel/omake/Makefile
head/devel/omake/distinfo (contents, props changed)
head/devel/omake/files/patch-OMakefile (contents, props changed)
head/devel/omake/pkg-plist (contents, props changed)
Modified: head/devel/omake/Makefile
==============================================================================
--- head/devel/omake/Makefile Wed Apr 17 16:56:04 2013 (r315987)
+++ head/devel/omake/Makefile Wed Apr 17 16:59:55 2013 (r315988)
@@ -2,16 +2,14 @@
# $FreeBSD$
PORTNAME= omake
-PORTVERSION= 0.9.8.5
-PORTREVISION= 1
+DISTVERSION= 0.9.8.6-0.rc1
CATEGORIES= devel
MASTER_SITES= http://main.metaprl.org/download/omake/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-3
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= bf at FreeBSD.org
COMMENT= A flexible build system
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C|-.*||}
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
USE_NCURSES= yes
@@ -24,8 +22,6 @@ INFO= omake-doc
.if ${ARCH} == "powerpc"
BROKEN= Does not build on powerpc
-.else
-BROKEN= fails to build
.endif
post-patch:
@@ -43,6 +39,20 @@ post-patch:
's|cp -f -m 444|$$(BSD_INSTALL_DATA)| ; \
s|cp -f -m 555|$$(BSD_INSTALL_PROGRAM)|' ${WRKSRC}/${f}
.endfor
+ @${REINPLACE_CMD} -e 's| -j2 | |' ${WRKSRC}/Makefile
+.if ${NCURSESBASE} == "/usr"
+.for f in lib/configure/ncurses.om src/libmojave-external/cutil/lm_terminfo.c
+ @${REINPLACE_CMD} -E -e 's|ncurses/(term\.h)|\1|' ${WRKSRC}/${f}
+.endfor
+.endif
+
+check regression-test test: build
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_ARGS} boot/omake check
+ @${FIND} -ds ${WRKSRC}/test -type f -name 'result.log' -print0 | \
+ ${XARGS} -0tI @ ${CAT} @
+
+bench: build
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_ARGS} boot/omake bench
post-install:
@(cd ${WRKSRC}/doc/info \
Modified: head/devel/omake/distinfo
==============================================================================
--- head/devel/omake/distinfo Wed Apr 17 16:56:04 2013 (r315987)
+++ head/devel/omake/distinfo Wed Apr 17 16:59:55 2013 (r315988)
@@ -1,2 +1,2 @@
-SHA256 (omake-0.9.8.5-3.tar.gz) = 5b675e09f49ff8249a775798f25ab127515cf2fed39527b202784757a35eddad
-SIZE (omake-0.9.8.5-3.tar.gz) = 3321245
+SHA256 (omake-0.9.8.6-0.rc1.tar.gz) = 23c498f071723621dd5e1e29c1abefd6937c73c67bb85d223fd514b9ae005ae9
+SIZE (omake-0.9.8.6-0.rc1.tar.gz) = 3254283
Modified: head/devel/omake/files/patch-OMakefile
==============================================================================
--- head/devel/omake/files/patch-OMakefile Wed Apr 17 16:56:04 2013 (r315987)
+++ head/devel/omake/files/patch-OMakefile Wed Apr 17 16:59:55 2013 (r315988)
@@ -1,5 +1,5 @@
---- OMakefile.orig 2007-06-22 12:03:37.000000000 -0700
-+++ OMakefile 2011-04-04 20:32:58.000000000 -0700
+--- OMakefile.orig 2010-10-26 20:42:37.000000000 -0400
++++ OMakefile 2013-04-03 16:50:13.000000000 -0400
@@ -33,7 +33,6 @@
#
# Extra options for the C compiler
@@ -17,17 +17,3 @@
if $(THREADS_ENABLED)
OCAMLFLAGS += -thread
export
-@@ -229,11 +228,11 @@
-
- install: $(DEFAULTFILES) $(INSTALLFILES)
- mkdir -p $(INSTALL_LIBDIR)/omake
-- cp -f -m 444 $(DEFAULTFILES) $(INSTALL_LIBDIR)/omake/
-+ $(BSD_INSTALL_DATA) $(DEFAULTFILES) $(INSTALL_LIBDIR)/omake/
- foreach(name, $(STDLIBNAMES))
- node = $(file $(INSTALL_LIBDIR)/omake/$(name).om)
- mkdir -p $(dirof $(node))
-- cp -f -m 444 lib/$(name).install $(node)
-+ $(BSD_INSTALL_DATA) lib/$(name).install $(node)
-
- ########################################################################
- # Testing
Modified: head/devel/omake/pkg-plist
==============================================================================
--- head/devel/omake/pkg-plist Wed Apr 17 16:56:04 2013 (r315987)
+++ head/devel/omake/pkg-plist Wed Apr 17 16:59:55 2013 (r315988)
@@ -1,5 +1,4 @@
bin/cvs_realclean
-bin/ocamldep-omake
bin/omake
bin/osh
lib/omake/OMakefile.default
@@ -20,21 +19,11 @@ lib/omake/configure/readline.om
lib/omake/configure/snprintf.om
lib/omake/parse/C/Lex.om
lib/omake/parse/C/Parse.om
-%%PORTDOCS%%%%DOCSDIR%%/announce.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/contents_motif.gif
-%%PORTDOCS%%%%DOCSDIR%%/download.html
-%%PORTDOCS%%%%DOCSDIR%%/images/announce.ps
-%%PORTDOCS%%%%DOCSDIR%%/images/announce.tex
-%%PORTDOCS%%%%DOCSDIR%%/images/grid.ai
-%%PORTDOCS%%%%DOCSDIR%%/images/omake-manual.ai
-%%PORTDOCS%%%%DOCSDIR%%/images/omake-manual.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/omake.ai
-%%PORTDOCS%%%%DOCSDIR%%/images/omake.eps
-%%PORTDOCS%%%%DOCSDIR%%/images/omake.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/omake.psd
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/next_motif.gif
+lib/omake/parse/LaTeX/Lex.om
+lib/omake/parse/LaTeX/Macros.om
+lib/omake/parse/LaTeX/Parse.om
+lib/omake/parse/LaTeX/Spell.om
+lib/omake/web/simple-xml.om
%%PORTDOCS%%%%DOCSDIR%%/omake-all-index.html
%%PORTDOCS%%%%DOCSDIR%%/omake-autoconf.html
%%PORTDOCS%%%%DOCSDIR%%/omake-base.html
@@ -62,13 +51,10 @@ lib/omake/parse/C/Parse.om
%%PORTDOCS%%%%DOCSDIR%%/omake-toc.html
%%PORTDOCS%%%%DOCSDIR%%/omake-var-index.html
%%PORTDOCS%%%%DOCSDIR%%/omake.html
-%%PORTDOCS%%%%DOCSDIR%%/omake_lists.html
-%%PORTDOCS%%%%DOCSDIR%%/omake_papers.html
-%%PORTDOCS%%%%DOCSDIR%%/omake_users.html
%%PORTDOCS%%%%DOCSDIR%%/osh.html
-%%PORTDOCS%%%%DOCSDIR%%/previous_motif.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm lib/omake/web
+ at dirrm lib/omake/parse/LaTeX
@dirrm lib/omake/parse/C
@dirrm lib/omake/parse
@dirrm lib/omake/configure
More information about the svn-ports-all
mailing list