Index: head/lang/seed7/Makefile =================================================================== --- head/lang/seed7/Makefile (revision 307905) +++ head/lang/seed7/Makefile (revision 307906) @@ -1,67 +1,70 @@ # Created by: gahr # $FreeBSD$ PORTNAME= seed7 -DISTVERSION= 05_20121021 +DISTVERSION= 05_20121125 CATEGORIES= lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/ DISTNAME= ${PORTNAME}_${DISTVERSION} EXTRACT_SUFX= .tgz MAINTAINER= gahr@FreeBSD.org COMMENT= A high-level, extensible programming language LICENSE= LGPL21 USE_GMAKE= yes USE_XORG= x11 ONLY_FOR_ARCHS= i386 amd64 sparc64 WRKSRC= ${WRKDIR}/${PORTNAME}/src MAKEFILE= makefile -ALL_TARGET= hi +MAKE_ENV+= S7_LIB_DIR=${PREFIX}/lib/seed7 \ + SEED7_LIBRARY=${PREFIX}/lib/seed7 \ + C_COMPILER=${CC} \ + CPLUSPLUS_COMPILER=${CPP} +ALL_TARGET= depend hi .include .if ${OSVERSION} < 800000 BROKEN= does not compile .endif post-patch: - ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g;\ - s|`pwd`|${PREFIX}/lib/${PORTNAME}|g;\ - s|-lX11|$${LFLAGS} -lX11|g' \ - ${WRKSRC}/makefile - ${REINPLACE_CMD} -i '' -e 's|./hi|${PREFIX}/bin/hi|g' \ - ${WRKSRC}/../prg/chk_all.sd7 + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g;' ${WRKSRC}/makefile + ${REINPLACE_CMD} -i '' -e 's|./hi|${PREFIX}/bin/hi|g' ${WRKSRC}/../prg/chk_all.sd7 -do-configure: - (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} depend) - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../bin/hi ${PREFIX}/bin ${INSTALL} -d ${PREFIX}/lib/${PORTNAME} (cd ${WRKSRC}/../lib && ${COPYTREE_SHARE} \* ${PREFIX}/lib/${PORTNAME}) ${INSTALL_DATA} ${WRKSRC}/../bin/s7_comp.a ${PREFIX}/lib/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/../bin/s7_con.a ${PREFIX}/lib/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/../bin/s7_draw.a ${PREFIX}/lib/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/../bin/s7_data.a ${PREFIX}/lib/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/../bin/seed7_05.a ${PREFIX}/lib/${PORTNAME} post-install: +# compile the seed7 compiler (needs the libraries to be installed) + cd ${WRKSRC}/../prg && ./hi comp -O2 comp + ${INSTALL_PROGRAM} ${WRKSRC}/../prg/comp ${PREFIX}/bin/hi_comp + ${RM} ${WRKSRC}/../prg/tmp_comp.c ${WRKSRC}/../prg/comp +# install PORTDOCS .if !defined(NOPORTDOCS) ${INSTALL} -d ${DOCSDIR} (cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} \* ${DOCSDIR}) .endif +# install PORTEXAMPLES .if !defined(NOPORTEXAMPLES) ${INSTALL} -d ${EXAMPLESDIR} (cd ${WRKSRC}/../prg && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) .endif -test: install +test: ${INSTALL_TARGET} @echo "" @echo "Testing the ${PORTNAME} installation" @(cd ${WRKSRC}/../prg && ${PREFIX}/bin/hi chk_all) .include Index: head/lang/seed7/distinfo =================================================================== --- head/lang/seed7/distinfo (revision 307905) +++ head/lang/seed7/distinfo (revision 307906) @@ -1,2 +1,2 @@ -SHA256 (seed7_05_20121021.tgz) = 698f11a31d820c678ee54c1f013cb8538d37339898fc000d5ae4b8d4c2487d6b -SIZE (seed7_05_20121021.tgz) = 1795775 +SHA256 (seed7_05_20121125.tgz) = 6d0d0e52e4f1150deefc036d782c5421ed00c20db00309bd4977c664435ba193 +SIZE (seed7_05_20121125.tgz) = 1800530 Index: head/lang/seed7/files/patch-makefile =================================================================== --- head/lang/seed7/files/patch-makefile (revision 307905) +++ head/lang/seed7/files/patch-makefile (revision 307906) @@ -1,36 +1,36 @@ ---- makefile.orig 2012-10-18 14:42:29.000000000 +0200 -+++ makefile 2012-10-18 14:43:37.000000000 +0200 -@@ -12,14 +12,14 @@ +--- makefile.orig 2012-11-27 13:49:47.000000000 +0100 ++++ makefile 2012-11-27 13:50:36.000000000 +0100 +@@ -12,7 +12,7 @@ # CFLAGS = -O2 -fomit-frame-pointer -Wall -Wextra -Wswitch-default -Wcast-qual -Waggregate-return -Wwrite-strings -Winline -Wconversion -Wshadow -Wpointer-arith -Wmissing-noreturn -Wno-multichar # CFLAGS = -O2 -g -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -ftrapv # CFLAGS = -O2 -g -x c++ -Wall -Winline -Wconversion -Wshadow -Wpointer-arith -CFLAGS = -O2 -g -ffunction-sections -fdata-sections -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -+CFLAGS += -ffunction-sections -fdata-sections -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -I%%LOCALBASE%%/include ++CFLAGS = -ffunction-sections -fdata-sections -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith -I%%LOCALBASE%%/include + # CFLAGS = -O2 -g -ffunction-sections -fdata-sections -Wall -Winline -Wconversion -Wshadow -Wpointer-arith # CFLAGS = -O2 -g -std=c99 -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith # CFLAGS = -O2 -g -Wall -Winline -Wconversion -Wshadow -Wpointer-arith - # CFLAGS = -O2 -g -Wall - # CFLAGS = -O2 -g -pg -Wall -Wstrict-prototypes -Winline -Wconversion -Wshadow -Wpointer-arith +@@ -21,6 +21,7 @@ # CFLAGS = -O2 -fomit-frame-pointer -funroll-loops -Wall # CFLAGS = -O2 -funroll-loops -Wall -pg --LDFLAGS = -Wl,--gc-sections -+LDFLAGS += -L%%LOCALBASE%%/lib + LDFLAGS = -Wl,--gc-sections ++LDFLAGS = -Wl,--gc-sections -L%%LOCALBASE%%/lib # LDFLAGS = -pg # LDFLAGS = -pg -lc_p SYSTEM_LIBS = -lm -@@ -38,7 +38,7 @@ +@@ -39,7 +40,7 @@ COMPILER_LIB = s7_comp.a ALL_S7_LIBS = ../bin/$(COMPILER_LIB) ../bin/$(COMP_DATA_LIB) ../bin/$(DRAW_LIB) ../bin/$(CONSOLE_LIB) ../bin/$(SEED7_LIB) # CC = g++ -CC = gcc +CC ?= gcc GET_CC_VERSION_INFO = $(CC) --version > BIGINT_LIB_DEFINE = USE_BIG_RTL_LIBRARY -@@ -112,6 +112,7 @@ +@@ -113,6 +114,7 @@ COMP_DATA_LIB_SRC = typ_data.c rfl_data.c ref_data.c listutl.c flistutl.c typeutl.c datautl.c COMPILER_LIB_SRC = $(PSRC1) $(LSRC1) $(LSRC2) $(LSRC3) $(ESRC1) $(ASRC1) $(ASRC2) $(ASRC3) $(GSRC1) $(GSRC2) +.PHONY: hi hi: ../bin/hi ../prg/hi ../bin/hi level Index: head/lang/seed7/pkg-plist =================================================================== --- head/lang/seed7/pkg-plist (revision 307905) +++ head/lang/seed7/pkg-plist (revision 307906) @@ -1,238 +1,240 @@ bin/hi +bin/hi_comp lib/seed7/COPYING lib/seed7/LGPL lib/seed7/array.s7i lib/seed7/bigfile.s7i lib/seed7/bigint.s7i lib/seed7/bigrat.s7i lib/seed7/binary.s7i lib/seed7/bitmapfont.s7i lib/seed7/bitset.s7i lib/seed7/bitsetof.s7i lib/seed7/boolean.s7i lib/seed7/bstring.s7i lib/seed7/cards.s7i lib/seed7/category.s7i lib/seed7/cgi.s7i lib/seed7/char.s7i lib/seed7/charsets.s7i lib/seed7/chartype.s7i lib/seed7/clib_file.s7i lib/seed7/color.s7i lib/seed7/complex.s7i lib/seed7/console.s7i lib/seed7/cronos16.s7i lib/seed7/cronos27.s7i lib/seed7/dialog.s7i lib/seed7/dir.s7i lib/seed7/draw.s7i lib/seed7/duration.s7i lib/seed7/echo.s7i lib/seed7/enable_input.s7i lib/seed7/enable_io.s7i lib/seed7/enable_output.s7i lib/seed7/encoding.s7i +lib/seed7/environment.s7i lib/seed7/external_file.s7i lib/seed7/field.s7i lib/seed7/file.s7i lib/seed7/float.s7i lib/seed7/font.s7i lib/seed7/forloop.s7i lib/seed7/ftp.s7i lib/seed7/getf.s7i lib/seed7/gethttp.s7i lib/seed7/graph.s7i lib/seed7/graph_file.s7i lib/seed7/gtkserver.s7i lib/seed7/gzip.s7i lib/seed7/hash.s7i lib/seed7/hashsetof.s7i lib/seed7/html.s7i lib/seed7/html_ent.s7i lib/seed7/idxarray.s7i lib/seed7/image.s7i lib/seed7/inifile.s7i lib/seed7/integer.s7i lib/seed7/keybd.s7i lib/seed7/line.s7i lib/seed7/listener.s7i lib/seed7/lower.s7i lib/seed7/mahjng32.s7i lib/seed7/make.s7i lib/seed7/makedata.s7i lib/seed7/math.s7i lib/seed7/modern27.s7i lib/seed7/more.s7i lib/seed7/multiscr.s7i lib/seed7/null_file.s7i lib/seed7/osfiles.s7i lib/seed7/pic16.s7i lib/seed7/pic32.s7i lib/seed7/pixmap_file.s7i lib/seed7/pixmapfont.s7i lib/seed7/poll.s7i lib/seed7/progs.s7i lib/seed7/rational.s7i lib/seed7/ref_list.s7i lib/seed7/reference.s7i lib/seed7/reverse.s7i lib/seed7/s7_comp.a lib/seed7/s7_con.a lib/seed7/s7_data.a lib/seed7/s7_draw.a lib/seed7/scanfile.s7i lib/seed7/scanstri.s7i lib/seed7/seed7_05.a lib/seed7/seed7_05.s7i lib/seed7/set.s7i lib/seed7/shell.s7i lib/seed7/sockbase.s7i lib/seed7/socket.s7i lib/seed7/sokoban1.s7i lib/seed7/stars.s7i lib/seed7/stdfont10.s7i lib/seed7/stdfont12.s7i lib/seed7/stdfont14.s7i lib/seed7/stdfont16.s7i lib/seed7/stdfont18.s7i lib/seed7/stdfont20.s7i lib/seed7/stdfont24.s7i lib/seed7/stdio.s7i lib/seed7/strifile.s7i lib/seed7/string.s7i lib/seed7/stritext.s7i lib/seed7/struct.s7i lib/seed7/subrange.s7i lib/seed7/syntax.s7i lib/seed7/tar.s7i lib/seed7/tee.s7i lib/seed7/text.s7i lib/seed7/time.s7i lib/seed7/upper.s7i lib/seed7/utf16.s7i lib/seed7/utf8.s7i lib/seed7/vecfont10.s7i lib/seed7/vecfont18.s7i lib/seed7/vectorfont.s7i lib/seed7/window.s7i lib/seed7/wrinum.s7i lib/seed7/xml_ent.s7i lib/seed7/xmldom.s7i lib/seed7/zip.s7i %%PORTDOCS%%%%DOCSDIR%%/chlog.txt %%PORTDOCS%%%%DOCSDIR%%/contact.txt %%PORTDOCS%%%%DOCSDIR%%/faq.htm %%PORTDOCS%%%%DOCSDIR%%/faq.txt %%PORTDOCS%%%%DOCSDIR%%/gtksvdoc.css %%PORTDOCS%%%%DOCSDIR%%/gtksvdoc.htm %%PORTDOCS%%%%DOCSDIR%%/gtksvdoc.txt %%PORTDOCS%%%%DOCSDIR%%/install.txt %%PORTDOCS%%%%DOCSDIR%%/inter.txt %%PORTDOCS%%%%DOCSDIR%%/manual.htm %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/problems.txt %%PORTDOCS%%%%DOCSDIR%%/robodoc.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/COPYING %%PORTEXAMPLES%%%%EXAMPLESDIR%%/LGPL %%PORTEXAMPLES%%%%EXAMPLESDIR%%/addup.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bas7.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bifurk.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blue.dna %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/carddemo.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/castle.dat %%PORTEXAMPLES%%%%EXAMPLESDIR%%/castle.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cellauto.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/celsius.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chk_all.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkbig.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkbool.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkexc.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkflt.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkhent.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkhsh.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkint.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkprc.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkscan.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkset.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkstr.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clock.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clock2.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clock3.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cmpfil.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/comanche.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/comp.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dirtst.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dirx.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dna_base.s7i %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnafight.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragon.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eliza.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/err.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fannkuch.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fib.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/files.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fractree.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftp7.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpserv.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gcd.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gkbd.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/green.dna %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtksvtst.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hal.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hamu.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hanoi.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hi %%PORTEXAMPLES%%%%EXAMPLESDIR%%/indigo.dna %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kbd.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lander.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mahjong.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/make7.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mandelbr.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mind.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ms.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nicoma.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orange.dna %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pac.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pairs.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/panic.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/planets.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/prime.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/printpi1.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/printpi2.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/printpi3.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rand.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/red.dna %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rever.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/roman.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/savehd7.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/self.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shisen.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sl.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/snake.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sokoban.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/startrek.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudoku7.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sydir7.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tak.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tan.dna %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tar7.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tch.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testfont.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tet.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tetg.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/toutf8.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tst_cli.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tst_srv.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/violet.dna %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wator.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/white.dna %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wiz.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wordcnt.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrinum.sd7 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wumpus.sd7 @dirrm lib/seed7 %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%