diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2021-11-18 18:20:34 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2021-11-18 18:20:34 +0000 |
| commit | 3ab5b7da6564261344bbc0495c84b2a7b25dfee1 (patch) | |
| tree | 8cae732d93914255b46d172837660a7e42da4f00 | |
| parent | 9aa0c3ca74d10a93b844e76f29c2b612a43f3fcd (diff) | |
| download | ports-3ab5b7da6564261344bbc0495c84b2a7b25dfee1.tar.gz ports-3ab5b7da6564261344bbc0495c84b2a7b25dfee1.zip | |
www/websh: unbreak after the recent upgrade of tcl86
Despite being only a micro-version bump, the new TCL changes the
TCL_SHARED_LIB_SUFFIX from being set to "86" (the version of TCL)
to being derived from the extension's own version, which in our
case is 3.6.0b5).
While here, remove reference to the long-gone apache-2.2 and
a bogus deprecation.
| -rw-r--r-- | www/websh/Makefile | 32 | ||||
| -rw-r--r-- | www/websh/pkg-plist | 6 |
2 files changed, 17 insertions, 21 deletions
diff --git a/www/websh/Makefile b/www/websh/Makefile index 1bd573d42a91..769774928eb7 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -2,7 +2,7 @@ PORTNAME= websh PORTVERSION= 3.6.0b5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www tcl MASTER_SITES= https://archive.apache.org/dist/tcl/${PORTNAME}/source/ EXTRACT_SUFX= -src.tar.gz @@ -10,21 +10,17 @@ EXTRACT_SUFX= -src.tar.gz MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server -BROKEN= does not install: work/websh-3.6.0b5/src/unix/libwebsh86.so.1: No such file or directory -DEPRECATED= Abandoned upstream, last release in 2009 -EXPIRATION_DATE=2022-03-31 - MAKE_JOBS_UNSAFE= yes -TCL_DVER= ${TCL_VER:S/.//} +LIBSUF= ${PORTVERSION:S/.//g} -USES= apache:2.2+ autoreconf gmake tcl:tea +USES= apache autoreconf gmake tcl:tea WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix USE_LDCONFIG= yes SUB_FILES= httpd.conf pkgIndex.tcl pkg-message -SUB_LIST+= TCL_DVER=${TCL_DVER} WS_VER=${PORTVERSION} +SUB_LIST+= LIBSUF=${LIBSUF} WS_VER=${PORTVERSION} SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR} -PLIST_SUB+= TCL_DVER=${TCL_DVER} +PLIST_SUB+= LIBSUF=${LIBSUF} PLIST_SUB+= NOMINORVERSION=${TCL_VER:C/8.[345]//:C/^..*/"@comment "/} PORTDOCS= * @@ -71,18 +67,18 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/mod_websh${PORTVERSION}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_websh.so - if [ -f ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 ]; then \ - ${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 \ + if [ -f ${WRKSRC}/libwebsh${LIBSUF}.so.1.0 ]; then \ + ${INSTALL_LIB} ${WRKSRC}/libwebsh${LIBSUF}.so.1.0 \ ${STAGEDIR}${PREFIX}/lib; \ - ${LN} -sf libwebsh${TCL_DVER}.so.1.0 \ - ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so.1; \ - ${LN} -sf libwebsh${TCL_DVER}.so.1.0 \ - ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so; \ + ${LN} -sf libwebsh${LIBSUF}.so.1.0 \ + ${STAGEDIR}${PREFIX}/lib/libwebsh${LIBSUF}.so.1; \ + ${LN} -sf libwebsh${LIBSUF}.so.1.0 \ + ${STAGEDIR}${PREFIX}/lib/libwebsh${LIBSUF}.so; \ else \ - ${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1 \ + ${INSTALL_LIB} ${WRKSRC}/libwebsh${LIBSUF}.so.1 \ ${STAGEDIR}${PREFIX}/lib; \ - ${LN} -sf libwebsh${TCL_DVER}.so.1 \ - ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so; \ + ${LN} -sf libwebsh${LIBSUF}.so.1 \ + ${STAGEDIR}${PREFIX}/lib/libwebsh${LIBSUF}.so; \ fi ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 \ diff --git a/www/websh/pkg-plist b/www/websh/pkg-plist index 55916c920473..7c959b91abaa 100644 --- a/www/websh/pkg-plist +++ b/www/websh/pkg-plist @@ -1,6 +1,6 @@ -%%NOMINORVERSION%%lib/libwebsh%%TCL_DVER%%.so.1.0 -lib/libwebsh%%TCL_DVER%%.so.1 -lib/libwebsh%%TCL_DVER%%.so +%%NOMINORVERSION%%lib/libwebsh%%LIBSUF%%.so.1.0 +lib/libwebsh%%LIBSUF%%.so.1 +lib/libwebsh%%LIBSUF%%.so lib/websh/pkgIndex.tcl lib/websh/htmlhandler.ws3 lib/websh/otherhandler.ws3 |