Page MenuHomeFreeBSD
Files F163328761

D6910.id18481.diff
No OneTemporary
Actions

D6910.id18481.diff
View Options

Index: head/devel/staf/Makefile
===================================================================
--- head/devel/staf/Makefile
+++ head/devel/staf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= staf
PORTVERSION= 3.4.23
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V${PORTVERSION}
DISTNAME= STAF${PORTVERSION:S/.//g}-src
@@ -31,7 +31,7 @@
BUILD_TYPE=${STAF_BUILD_TYPE} \
PROJECTS="${STAF_PROJECTS}"
-OPTIONS_DEFINE= DEBUG IPV6 OPENSSL PYTHON
+OPTIONS_DEFINE= DEBUG DOCS EXAMPLES IPV6 JAVA OPENSSL PERL PYTHON
OPTIONS_DEFAULT=OPENSSL
OPTIONS_SUB= yes
@@ -41,14 +41,40 @@
IPV6_VARS= staf_use_ipv6=1
IPV6_VARS_OFF= staf_use_ipv6=""
-OPENSSL_VARS= staf_use_ssl=1 use_openssl=yes
+JAVA_VARS= staf_projects+=java \
+ staf_projects+=event \
+ staf_projects+=ftp \
+ staf_projects+=fsext \
+ staf_projects+=namedcounter \
+ staf_projects+=sxe \
+ staf_projects+=timer \
+ use_java=yes
+JAVA_MAKE_ARGS= JAVA_V12_ROOT=${JAVA_HOME} \
+ JAVAC_V12=${JAVAC} \
+ JAVAH_V12=${JAVAH} \
+ JAVA_V12=${JAVA} \
+ JAR_V12=${JAR} \
+ JAVA_BUILD_V12=1
+
+OPENSSL_VARS= staf_use_ssl=1
+OPENSSL_USES= ssl
OPENSSL_MAKE_ARGS= OPENSSL_ROOT=${OPENSSLBASE} \
OPENSSL_LIBDIRS="${OPENSSLLIB}" \
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:-3.4
-PYTHON_VARS= staf_projects+=python use_python=py3kplist
+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} \
@@ -67,13 +93,32 @@
libSTAFEXECPROXY.so libSTAFLIPC.so libSTAFLog.so \
libSTAFMon.so libSTAFPool.so libSTAFReg.so libSTAFTCP.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}
+.if ${PERL_LEVEL} >= 502200
+BROKEN= Perl >= 5.22 is not supported
+.endif
+
+.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
@@ -106,19 +151,36 @@
${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/${bin} ${STAGEDIR}${PREFIX}/bin/
.endfor
${LN} -s ${PREFIX}/bin/STAF ${STAGEDIR}${PREFIX}/bin/staf
+ ${LN} -s ${PREFIX}/bin/FmtLog ${STAGEDIR}${PREFIX}/bin/fmtlog
.for lib in ${STAF_LIB_FILES}
${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/${lib} ${STAGEDIR}${PREFIX}/lib/
.endfor
${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/STAF.cfg \
${STAGEDIR}${PREFIX}/etc/STAF.cfg.sample
- cd ${INSTALL_WRKSRC}/include && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include
+ (cd ${INSTALL_WRKSRC}/include && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include)
${MKDIR} ${STAGEDIR}${DATADIR}/codepage
- cd ${INSTALL_WRKSRC}/codepage && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/codepage
+ (cd ${INSTALL_WRKSRC}/codepage && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/codepage)
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- cd ${INSTALL_WRKSRC}/samples && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+ (cd ${INSTALL_WRKSRC}/samples && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+
+do-install-DOCS-on:
+ [ -d ${INSTALL_WRKSRC}/docs/staf ] && \
+ ${MKDIR} ${STAGEDIR}${DOCSDIR} && \
+ (cd ${INSTALL_WRKSRC}/docs/staf && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) || true
+
+do-install-JAVA-on:
+.for javalib in ${STAF_JAVA_LIBS}
+ ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/${javalib} \
+ ${STAGEDIR}${PREFIX}/lib
+.endfor
+.for jar in ${STAF_JAVA_JARS}
+ ${INSTALL_DATA} ${INSTALL_WRKSRC}/lib/${jar} \
+ ${STAGEDIR}${JAVAJARDIR}
+.endfor
do-install-OPENSSL-on:
${MKDIR} ${STAGEDIR}${DATADIR}
@@ -126,6 +188,21 @@
${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}
@@ -139,9 +216,6 @@
${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/python${PYTHON_SUFFIX}/PYSTAF.so \
${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
${ECHO} ${PORTNAME} > ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}.pth
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- cd ${INSTALL_WRKSRC}/docs && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
post-install:
${MKDIR} ${STAGEDIR}${STAF_VAR_DIR}
Index: head/devel/staf/pkg-plist
===================================================================
--- head/devel/staf/pkg-plist
+++ head/devel/staf/pkg-plist
@@ -1,9 +1,12 @@
bin/FmtLog
bin/STAF
+%%PERL%%bin/STAF.pl
+%%PERL%%bin/STAF2.pl
bin/STAFExecProxy
bin/STAFLoop
bin/STAFProc
bin/STAFReg
+bin/fmtlog
bin/staf
@sample etc/STAF.cfg.sample
include/DeviceService.h
@@ -48,6 +51,9 @@
include/STAF_fstream.h
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
@@ -59,6 +65,11 @@
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
@@ -73,7 +84,9 @@
%%PYTHON%%%%PYTHON_3%%%%PYTHON_SITELIBDIR%%/staf/PySTAFv3.py
%%PYTHON%%%%PYTHON_3%%%%PYTHON_SITELIBDIR%%/staf/PySTAFv3.pyc
%%PYTHON%%%%PYTHON_3%%%%PYTHON_SITELIBDIR%%/staf/PySTAFv3.pyo
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/staf/STAFPython.htm
+%%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
@@ -85,6 +98,8 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rexx/Sample2.cmd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rexx/Sample3.cmd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rexx/Sample4.cmd
+%%JAVA%%%%JAVAJARDIR%%/JSTAF.jar
+%%JAVA%%%%JAVAJARDIR%%/STAFHTTPSLS.jar
%%OPENSSL%%%%DATADIR%%/CAList.crt
%%OPENSSL%%%%DATADIR%%/STAFDefault.crt
%%OPENSSL%%%%DATADIR%%/STAFDefault.key

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 4:09 AM (2 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35391497
Default Alt Text
D6910.id18481.diff (7 KB)

Event Timeline