diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile index 121483d6e57d..b2a15bd02923 100644 --- a/lang/seed7/Makefile +++ b/lang/seed7/Makefile @@ -1,89 +1,89 @@ PORTNAME= seed7 -DISTVERSION= 05_20230529 +DISTVERSION= 05_20230709 PORTREVISION= 0 CATEGORIES= lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/ DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= gahr@FreeBSD.org COMMENT= High-level, extensible programming language WWW= http://seed7.sourceforge.net/ # The interpreter and the example programs use the GPL license, while the # runtime library uses the LGPL license. LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi ONLY_FOR_ARCHS= amd64 armv7 i386 powerpc powerpc64 powerpc64le sparc64 LIB_DEPENDS= libodbc.so:databases/unixODBC USES= mysql:client ncurses pgsql sqlite tar:tgz xorg OPTIONS_DEFINE= DOCS EXAMPLES USE_XORG= x11 xrender WANT_PGSQL= client WRKSRC= ${WRKDIR}/${PORTNAME}/src MAKE_ENV+= S7_LIB_DIR=${S7_LIB_DIR} \ SEED7_LIBRARY=${SEED7_LIBRARY} \ C_COMPILER=${CC} \ CPLUSPLUS_COMPILER=${CPP} SEED7_LIBRARY= ${PREFIX}/lib/${PORTNAME}/lib S7_LIB_DIR= ${PREFIX}/lib/${PORTNAME}/bin S7_LIBS= s7_comp.a s7_con.a s7_draw.a s7_data.a seed7_05.a PORTEXAMPLES= * PORTDOCS= * MAKEFILE= mk_freebsd.mk post-patch: ${REINPLACE_CMD} \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g;' \ -e 's|^CFLAGS = |CFLAGS = -I${NCURSESINC} |' \ ${WRKSRC}/${MAKEFILE} ${REINPLACE_CMD} \ -e 's|/opt/X11/include|${LOCALBASE}/include|' \ ${WRKSRC}/chkccomp.c do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} depend do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} s7 s7c do-install: # install interpreter and compiler ${INSTALL_PROGRAM} ${WRKSRC}/../bin/s7 ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/../prg/s7c ${STAGEDIR}${PREFIX}/bin # install seed7 library ${INSTALL} -d ${STAGEDIR}${SEED7_LIBRARY}/comp cd ${WRKSRC}/../lib && ${COPYTREE_SHARE} '*.s7i' ${STAGEDIR}${SEED7_LIBRARY} cd ${WRKSRC}/../lib/comp && ${COPYTREE_SHARE} '*.s7i' ${STAGEDIR}${SEED7_LIBRARY}/comp # install static libraries ${INSTALL} -d ${STAGEDIR}${S7_LIB_DIR} # install vim and nano syntax files ${INSTALL} -d ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/seed7.vim ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/sd7.vim ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/seed7.nanorc ${STAGEDIR}${DATADIR} .for s7_lib in ${S7_LIBS} ${INSTALL_DATA} ${WRKSRC}/../bin/${s7_lib} ${STAGEDIR}${S7_LIB_DIR} .endfor # install PORTDOCS ${INSTALL} -d ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} # install PORTEXAMPLES ${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/../prg && ${COPYTREE_SHARE} '*.dna *.sd7 *.dat *.s7i' ${STAGEDIR}${EXAMPLESDIR} # insall man pages ${INSTALL_DATA} ${WRKSRC}/../doc/s7.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/../doc/s7c.1 ${STAGEDIR}${PREFIX}/man/man1 do-test: cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} test .include diff --git a/lang/seed7/distinfo b/lang/seed7/distinfo index f14e36baa1f5..9b0850e59bbb 100644 --- a/lang/seed7/distinfo +++ b/lang/seed7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685534550 -SHA256 (seed7_05_20230529.tgz) = 09ba3604bde9b1cbc06fbafa9917269fe1bcf927479f21ee789c26471a982ed1 -SIZE (seed7_05_20230529.tgz) = 3966570 +TIMESTAMP = 1693303174 +SHA256 (seed7_05_20230709.tgz) = 040b2a94dc9695959635c9ec3b1b8731c2f982b268a0bf8af9a65c2a315a2348 +SIZE (seed7_05_20230709.tgz) = 4037953 diff --git a/lang/seed7/files/patch-9654fd6 b/lang/seed7/files/patch-9654fd6 deleted file mode 100644 index 1138575a9cc1..000000000000 --- a/lang/seed7/files/patch-9654fd6 +++ /dev/null @@ -1,35 +0,0 @@ -From 9654fd670035297f239284013f38a3032e5a392c Mon Sep 17 00:00:00 2001 -From: Thomas Mertes -Date: Thu, 1 Jun 2023 12:46:17 +0200 -Subject: [PATCH] Fix issue with clang compiling chkarr - ---- - ../lib/comp/arr_act.s7i | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git ../lib/comp/arr_act.s7i.orig ../lib/comp/arr_act.s7i -index b393c9c2..206e4a0d 100644 ---- ../lib/comp/arr_act.s7i.orig -+++ ../lib/comp/arr_act.s7i -@@ -448,7 +448,9 @@ const proc: process_const_arr_idx (in reference: function, in reference: anArray - index_value := getValue(evaluatedParam, integer); - if index_value < arrayMinIdx(anArray) or index_value > arrayMaxIdx(anArray) then - warning(DOES_RAISE, "INDEX_ERROR", c_expr); -- c_expr.expr &:= intRaiseError("INDEX_ERROR"); -+ c_expr.expr &:= "("; -+ c_expr.expr &:= type_name(resultType(getType(function))); -+ c_expr.expr &:= ")(raiseError(INDEX_ERROR), 0)"; - else - c_expr.expr &:= "arr["; - c_expr.expr &:= str(const_table[anArray]); -@@ -462,7 +464,9 @@ const proc: process_const_arr_idx (in reference: function, in reference: anArray - if indexRange.maxValue < arrayMinIdx(anArray) or - indexRange.minValue > arrayMaxIdx(anArray) then - warning(DOES_RAISE, "INDEX_ERROR", c_expr); -- c_expr.expr &:= intRaiseError("INDEX_ERROR"); -+ c_expr.expr &:= "("; -+ c_expr.expr &:= type_name(resultType(getType(function))); -+ c_expr.expr &:= ")(raiseError(INDEX_ERROR), 0)"; - else - c_expr.expr &:= "arr["; - c_expr.expr &:= str(const_table[anArray]);