diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile index 1d49c0a1e524..1b5b3961dd2e 100644 --- a/lang/seed7/Makefile +++ b/lang/seed7/Makefile @@ -1,90 +1,90 @@ # Created by: gahr PORTNAME= seed7 -DISTVERSION= 05_20220130 +DISTVERSION= 05_20220312 PORTREVISION= 0 CATEGORIES= lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/ DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= gahr@FreeBSD.org COMMENT= High-level, extensible programming language # The language libraries are licensed under the LGPL21 license. Starting from # version 05_20140601, the compiler libraries are also distributed. These are # licensed under the GPLv2 and can be found in ${PREFIX}/lib/seed7/lib/comp. 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 syntax files ${INSTALL} -d ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/seed7.vim ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/sd7.vim ${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 bd9b48620c95..6649070dbe99 100644 --- a/lang/seed7/distinfo +++ b/lang/seed7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646141399 -SHA256 (seed7_05_20220130.tgz) = 442dddbf979a5af8784bf8155cd70937f277f10949ce0dec9ebea4d5c1e7f10e -SIZE (seed7_05_20220130.tgz) = 3712052 +TIMESTAMP = 1648553811 +SHA256 (seed7_05_20220312.tgz) = c0f9507a11b5ae2b261d14c839f1d0289cb33672aea13735b944c94596830760 +SIZE (seed7_05_20220312.tgz) = 3726447 diff --git a/lang/seed7/files/patch-fwd__x11.c b/lang/seed7/files/patch-fwd__x11.c deleted file mode 100644 index da8e744abbfb..000000000000 --- a/lang/seed7/files/patch-fwd__x11.c +++ /dev/null @@ -1,23 +0,0 @@ ---- fwd_x11.c.orig 2022-03-01 13:41:18 UTC -+++ fwd_x11.c -@@ -398,7 +398,7 @@ static boolType setupX11Dll (const char *dllName) - (ptr_XSetClipOrigin = (tp_XSetClipOrigin) dllFunc(x11Dll, "XSetClipOrigin")) == NULL || - (ptr_XSetForeground = (tp_XSetForeground) dllFunc(x11Dll, "XSetForeground")) == NULL || - (ptr_XSetFunction = (tp_XSetFunction) dllFunc(x11Dll, "XSetFunction")) == NULL || -- (ptr_XSetLineAttributes = (tp_XSetLineAttributes dllFunc(x11Dll, "XSetLineAttributes")) == NULL || -+ (ptr_XSetLineAttributes = (tp_XSetLineAttributes) dllFunc(x11Dll, "XSetLineAttributes")) == NULL || - (ptr_XSetStandardProperties = (tp_XSetStandardProperties) dllFunc(x11Dll, "XSetStandardProperties")) == NULL || - (ptr_XSetWMHints = (tp_XSetWMHints) dllFunc(x11Dll, "XSetWMHints")) == NULL || - (ptr_XSetWMProtocols = (tp_XSetWMProtocols) dllFunc(x11Dll, "XSetWMProtocols")) == NULL || -@@ -1609,9 +1609,9 @@ int XSetLineAttributes (Display *display, GC gc, unsig - logFunction(printf("XSetLineAttributes(" FMT_U_MEM ", " FMT_U_MEM - ", %u, %d, &d, %d)\n", - (memSizeType) display, (memSizeType) gc, -- line_width, line_style, cap_stype, join_style);); -+ line_width, line_style, cap_style, join_style);); - funcResult = ptr_XSetLineAttributes(display, gc, line_width, -- line_style, cap_stype, join_style); -+ line_style, cap_style, join_style); - logFunction(printf("XSetLineAttributes --> %d\n", funcResult);); - return funcResult; - } /* XSetLineAttributes */