From nobody Thu Nov 18 18:23:35 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 003C1189BEDF; Thu, 18 Nov 2021 18:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hw7Tg6DkRz3JZ2; Thu, 18 Nov 2021 18:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B629B19AFE; Thu, 18 Nov 2021 18:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AIINZ8H019170; Thu, 18 Nov 2021 18:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AIINZYT019169; Thu, 18 Nov 2021 18:23:35 GMT (envelope-from git) Date: Thu, 18 Nov 2021 18:23:35 GMT Message-Id: <202111181823.1AIINZYT019169@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: 3ab5b7da6564 - main - www/websh: unbreak after the recent upgrade of tcl86 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ab5b7da6564261344bbc0495c84b2a7b25dfee1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ab5b7da6564261344bbc0495c84b2a7b25dfee1 commit 3ab5b7da6564261344bbc0495c84b2a7b25dfee1 Author: Mikhail Teterin AuthorDate: 2021-11-18 18:20:34 +0000 Commit: Mikhail Teterin CommitDate: 2021-11-18 18:20:34 +0000 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. --- www/websh/Makefile | 32 ++++++++++++++------------------ 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