From owner-svn-ports-head@FreeBSD.ORG Wed Nov 28 14:18:13 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 452DD27E; Wed, 28 Nov 2012 14:18:13 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2A24E8FC0C; Wed, 28 Nov 2012 14:18:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qASEIDV9046947; Wed, 28 Nov 2012 14:18:13 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qASEICPv046943; Wed, 28 Nov 2012 14:18:12 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201211281418.qASEICPv046943@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 28 Nov 2012 14:18:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307906 - in head/lang/seed7: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2012 14:18:13 -0000 Author: gahr Date: Wed Nov 28 14:18:12 2012 New Revision: 307906 URL: http://svnweb.freebsd.org/changeset/ports/307906 Log: - Update to 05_20121125 20121125: - The makefiles and the file setpaths.c were improved to accept the macros S7_LIB_DIR (Directory with static Seed7 object libraries) and SEED7_LIBRARY (Directory with the Seed7 include libraries). Now the build process of a package can call make e.g. with: make S7_LIB_DIR=/abc/seed7/bin SEED7_LIBRARY=/abc/seed7/lib depend This way the two paths are defined in version.h. This defines them as default paths in the interpreter executable and in the compiler. - An explanation, what a binary Seed7 package should install, was added to the FAQ. This can be used as guideline for Seed7 packages. - The description of the times-operator in the manual and in array.s7i was improved. - A description of the function name(PROGRAM), file(PROGRAM) and 'environment' was added to the manual. - The new library environment.s7i was added. Most of the contents of this library was extracted from "seed7_05.sd7". The new library is included from "seed7_05.s7i", so no change in existing programs is necessary. - A documentation comment for getSearchPath was added to shell.s7i. - The functions ltrim and rtrim were added to the library string.s7i. - Testcases for ltrim and rtrim were added to chkstr.sd7. - The function getProgramName in arr_rtl.c was improved to do the comparison with EXECUTABLE_FILE_EXTENSION correctly. - The program tar7.sd7 was improved to accept also DOS paths for the file specified with -f. - The function homeDir was improved to work with DJGPP (either $HOME or C:\ is used). - The function prc_cpy in prclib.c was improved. - The files executl.c, hshlib.c, ref_data.c, reflib.c and sctlib.c were improved to copy the descriptor union with memcpy and to copy the posinfo flag with SET_ANY_FLAG, when necessary. 20121104: - The new function homeDir was added to the library osfiles.s7i. Interpreter and compiler were improved to support homeDir. - The libraries makedata.s7i and make.s7i were improved to support replacement macros. - A check for division by zero with /:= was added to chkflt.sd7. - The compiler (comp.sd7) was improved to use definitions of NOT_A_NUMBER, POSITIVE_INFINITY and NEGATIVE_INFINITY. - The program chkccomp.c was improved. Now it manages the macros likely, unlikely, UNISTD_H_PRESENT, POPEN_MISSING, os_utime_orig, os_utime, USE_ALTERNATE_UTIME, INCLUDE_SYS_UTIME, USE_LOCALTIME_R, USE_LOCALTIME_S, FLOAT_ZERO_DIV_ERROR, CHECK_FLOAT_DIV_BY_ZERO, ISNAN_WITH_UNDERLINE and HOME_DIR_ENV_VAR. Additionally chkccomp.c does not depend on the definitions of long_long_EXISTS, long_long_SUFFIX_LL, __int64_EXISTS, __int64_SUFFIX_LL and USE_BUILTIN_EXPECT in chkccomp.h. - The functions flt_div and flt_div_assign in fltlib.c were improved to work correctly when CHECK_FLOAT_DIV_BY_ZERO is defined. - Several #defines were ommitted from the makefiles. - Explanations of several version.h #defines were added to read_me.txt Feature safe: yes Modified: head/lang/seed7/Makefile head/lang/seed7/distinfo head/lang/seed7/files/patch-makefile head/lang/seed7/pkg-plist Modified: head/lang/seed7/Makefile ============================================================================== --- head/lang/seed7/Makefile Wed Nov 28 13:52:39 2012 (r307905) +++ head/lang/seed7/Makefile Wed Nov 28 14:18:12 2012 (r307906) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seed7 -DISTVERSION= 05_20121021 +DISTVERSION= 05_20121125 CATEGORIES= lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/ DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -20,7 +20,11 @@ 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 @@ -29,15 +33,8 @@ 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 - -do-configure: - (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} depend) + ${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-install: ${INSTALL_PROGRAM} ${WRKSRC}/../bin/hi ${PREFIX}/bin @@ -50,16 +47,22 @@ do-install: ${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) Modified: head/lang/seed7/distinfo ============================================================================== --- head/lang/seed7/distinfo Wed Nov 28 13:52:39 2012 (r307905) +++ head/lang/seed7/distinfo Wed Nov 28 14:18:12 2012 (r307906) @@ -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 Modified: head/lang/seed7/files/patch-makefile ============================================================================== --- head/lang/seed7/files/patch-makefile Wed Nov 28 13:52:39 2012 (r307905) +++ head/lang/seed7/files/patch-makefile Wed Nov 28 14:18:12 2012 (r307906) @@ -1,23 +1,23 @@ ---- 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++ @@ -26,7 +26,7 @@ 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) Modified: head/lang/seed7/pkg-plist ============================================================================== --- head/lang/seed7/pkg-plist Wed Nov 28 13:52:39 2012 (r307905) +++ head/lang/seed7/pkg-plist Wed Nov 28 14:18:12 2012 (r307906) @@ -1,4 +1,5 @@ bin/hi +bin/hi_comp lib/seed7/COPYING lib/seed7/LGPL lib/seed7/array.s7i @@ -32,6 +33,7 @@ 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