Date: Thu, 24 Sep 2020 22:32:23 +0000 (UTC) From: "Serhii (Sergey) Kozlov" <skozlov@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549968 - head/devel/staf Message-ID: <202009242232.08OMWNXg062964@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: skozlov Date: Thu Sep 24 22:32:22 2020 New Revision: 549968 URL: https://svnweb.freebsd.org/changeset/ports/549968 Log: devel/staf: Drop Python and Perl support There are no versions of Python or Perl left that STAF supports. PR: 249670 Reported by: swills Modified: head/devel/staf/Makefile head/devel/staf/pkg-plist Modified: head/devel/staf/Makefile ============================================================================== --- head/devel/staf/Makefile Thu Sep 24 22:20:29 2020 (r549967) +++ head/devel/staf/Makefile Thu Sep 24 22:32:22 2020 (r549968) @@ -31,7 +31,7 @@ MAKE_ARGS= OS_NAME="freebsd" \ BUILD_TYPE=${STAF_BUILD_TYPE} \ PROJECTS="${STAF_PROJECTS}" -OPTIONS_DEFINE= DEBUG DOCS EXAMPLES IPV6 JAVA OPENSSL PERL PYTHON +OPTIONS_DEFINE= DEBUG DOCS EXAMPLES IPV6 JAVA OPENSSL OPTIONS_DEFAULT=OPENSSL OPTIONS_SUB= yes @@ -63,23 +63,6 @@ OPENSSL_MAKE_ARGS= OPENSSL_ROOT=${OPENSSLBASE} \ OPENSSL_INCLUDEDIRS=${OPENSSLINC} OPENSSL_VARS_OFF= staf_use_ssl="" -PERL_USES= perl5 shebangfix -PERL_VARS= staf_projects+=perl \ - shebang_files+=lang/perl/*.pl \ - perl_v=${PERL_VER:S/.//g} -PERL_MAKE_ARGS= PERL_V${PERL_V}_ROOT=${LOCALBASE} \ - PERL_V${PERL_V}_LIBDIRS=${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE \ - PERL_V${PERL_V}_INCLUDEDIRS=${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE \ - PERL_BUILD_V${PERL_V}=1 - -PYTHON_USES= python:2.7 -PYTHON_VARS= staf_projects+=python \ - use_python=py3kplist -PYTHON_MAKE_ARGS= PYTHON_V${PYTHON_SUFFIX}_ROOT=${LOCALBASE} \ - PYTHON_V${PYTHON_SUFFIX}_INCLUDEDIRS=${PYTHON_INCLUDEDIR} \ - PYTHON_V${PYTHON_SUFFIX}_LIBS=${PYTHON_VERSION}${PYTHON_ABIVER} \ - PYTHON_BUILD_V${PYTHON_SUFFIX}=1 - MAKE_JOBS_UNSAFE= yes USES= gmake USE_LDCONFIG= yes @@ -96,46 +79,11 @@ STAF_LIB_FILES= libHello.so libSTAF.so libSTAFDSLS.so libSTAFZip.so STAF_JAVA_LIBS= libJSTAF.so libJSTAFSH.so STAF_JAVA_JARS= JSTAF.jar STAFHTTPSLS.jar -STAF_PERL_SCRIPTS= STAF.pl STAF2.pl -STAF_PERL_MODULES= DeviceService.pm PLSTAF.pm PLSTAFService.pm STAFLog.pm \ - STAFMon.pm -STAF_PERL_LIBS= libPLSTAF.so -STAF_PYLIB_FILES= PySTAFLog.py PySTAFMon.py STAF_SSL_FILES= CAList.crt STAFDefault.crt STAFDefault.key -STAF_PERL_VERSIONS= 50 56 58 510 512 514 516 518 520 -STAF_PYTHON_VERSIONS= 22 23 24 25 26 27 30 31 32 33 34 STAF_VAR_DIR?= /var/db/STAF .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MPERL} -BROKEN= Perl >= 5.22 is not supported - -.for i in ${STAF_PERL_VERSIONS} -.if ${PERL_V} != ${i} -PERL_MAKE_ARGS+= PERL_BUILD_V${i}=0 -.endif -.endfor -.endif - -.if ${PORT_OPTIONS:MPYTHON} -.if ${PYTHON_MAJOR_VER} == 2 -STAF_PYLIB_FILES+= PySTAF.py -PLIST_SUB+= PYTHON_2="" PYTHON_3="@comment " -MAKE_ARGS+= PYTHON_V${PYTHON_SUFFIX}_LIBDIRS=${PYTHON_LIBDIR}/config -.else -STAF_PYLIB_FILES+= PySTAFv3.py -PLIST_SUB+= PYTHON_3="" PYTHON_2="@comment " -MAKE_ARGS+= PYTHON_V${PYTHON_SUFFIX}_LIBDIRS=${PYTHON_LIBDIR}/config-${PYTHON_VER}${PYTHON_ABIVER} -.endif - -.for i in ${STAF_PYTHON_VERSIONS} -.if ${PYTHON_SUFFIX} != ${i} -PYTHON_MAKE_ARGS+= PYTHON_BUILD_V${i}=0 -.endif -.endfor -.endif - post-patch: ${REINPLACE_CMD} "s|%%DATADIR%%|${DATADIR}|" \ ${WRKSRC}/stafif/STAFConverter.cpp \ @@ -187,34 +135,5 @@ do-install-OPENSSL-on: .for sslfile in ${STAF_SSL_FILES} ${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/${sslfile} ${STAGEDIR}${DATADIR} .endfor - -do-install-PERL-on: -.for script in ${STAF_PERL_SCRIPTS} - ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/bin/${script} \ - ${STAGEDIR}${PREFIX}/bin/ -.endfor - ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} -.for module in ${STAF_PERL_MODULES} - ${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/${module} \ - ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} -.endfor -.for lib in ${STAF_PERL_LIBS} - ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/perl${PERL_V}/${lib} \ - ${STAGEDIR}${PREFIX}/lib -.endfor - -do-install-PYTHON-on: - ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -.for lib in ${STAF_PYLIB_FILES} - ${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/${lib} \ - ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -.endfor - ${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR}/${PORTNAME} \ - ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} - ${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR}/${PORTNAME} \ - ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} - ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/python${PYTHON_SUFFIX}/PYSTAF.so \ - ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} - ${ECHO} ${PORTNAME} > ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}.pth .include <bsd.port.post.mk> Modified: head/devel/staf/pkg-plist ============================================================================== --- head/devel/staf/pkg-plist Thu Sep 24 22:20:29 2020 (r549967) +++ head/devel/staf/pkg-plist Thu Sep 24 22:32:22 2020 (r549968) @@ -1,7 +1,5 @@ bin/FmtLog bin/STAF -%%PERL%%bin/STAF.pl -%%PERL%%bin/STAF2.pl bin/STAFExecProxy bin/STAFLoop bin/STAFProc @@ -53,7 +51,6 @@ include/STAF_iostream.h lib/libHello.so %%JAVA%%lib/libJSTAF.so %%JAVA%%lib/libJSTAFSH.so -%%PERL%%lib/libPLSTAF.so lib/libSTAF.so lib/libSTAFDSLS.so lib/libSTAFDeviceService.so @@ -65,28 +62,7 @@ lib/libSTAFPool.so lib/libSTAFReg.so lib/libSTAFTCP.so lib/libSTAFZip.so -%%PERL%%%%SITE_PERL%%/DeviceService.pm -%%PERL%%%%SITE_PERL%%/PLSTAF.pm -%%PERL%%%%SITE_PERL%%/PLSTAFService.pm -%%PERL%%%%SITE_PERL%%/STAFLog.pm -%%PERL%%%%SITE_PERL%%/STAFMon.pm -%%PYTHON%%%%PYTHON_SITELIBDIR%%/staf.pth -%%PYTHON%%%%PYTHON_SITELIBDIR%%/staf/PYSTAF.so -%%PYTHON%%%%PYTHON_2%%%%PYTHON_SITELIBDIR%%/staf/PySTAF.py -%%PYTHON%%%%PYTHON_2%%%%PYTHON_SITELIBDIR%%/staf/PySTAF.pyc -%%PYTHON%%%%PYTHON_2%%%%PYTHON_SITELIBDIR%%/staf/PySTAF.pyo -%%PYTHON%%%%PYTHON_SITELIBDIR%%/staf/PySTAFLog.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/staf/PySTAFLog.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/staf/PySTAFLog.pyo -%%PYTHON%%%%PYTHON_SITELIBDIR%%/staf/PySTAFMon.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/staf/PySTAFMon.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/staf/PySTAFMon.pyo -%%PYTHON%%%%PYTHON_3%%%%PYTHON_SITELIBDIR%%/staf/PySTAFv3.py -%%PYTHON%%%%PYTHON_3%%%%PYTHON_SITELIBDIR%%/staf/PySTAFv3.pyc -%%PYTHON%%%%PYTHON_3%%%%PYTHON_SITELIBDIR%%/staf/PySTAFv3.pyo %%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/STAFJava.htm -%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/STAFPerl.htm -%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/STAFPython.htm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/LogIt.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/LogIt.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/STAFDemoController.java
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009242232.08OMWNXg062964>