sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/websh: unbreak after the recent upgrade of tcl86

Browse source 
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.
This commit is contained in:
Mikhail Teterin 2021-11-18 13:20:34 -05:00
parent 9aa0c3ca74
commit 3ab5b7da65
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
www/websh/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= websh PORTNAME= websh
PORTVERSION= 3.6.0b5 PORTVERSION= 3.6.0b5
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= www tcl CATEGORIES= www tcl
MASTER_SITES= https://archive.apache.org/dist/tcl/${PORTNAME}/source/ MASTER_SITES= https://archive.apache.org/dist/tcl/${PORTNAME}/source/
EXTRACT_SUFX= -src.tar.gz EXTRACT_SUFX= -src.tar.gz
@ -10,21 +10,17 @@ EXTRACT_SUFX= -src.tar.gz
MAINTAINER= mi@aldan.algebra.com MAINTAINER= mi@aldan.algebra.com
COMMENT= Embeds a TCL8 interpreter in the Apache server 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 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 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix
USE_LDCONFIG= yes USE_LDCONFIG= yes
SUB_FILES= httpd.conf pkgIndex.tcl pkg-message 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} 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 "/} PLIST_SUB+= NOMINORVERSION=${TCL_VER:C/8.[345]//:C/^..*/"@comment "/}
PORTDOCS= * PORTDOCS= *
@ -71,18 +67,18 @@ do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
${INSTALL_LIB} ${WRKSRC}/mod_websh${PORTVERSION}.so \ ${INSTALL_LIB} ${WRKSRC}/mod_websh${PORTVERSION}.so \
${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_websh.so ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_websh.so
if [ -f ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 ]; then \ if [ -f ${WRKSRC}/libwebsh${LIBSUF}.so.1.0 ]; then \
${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 \ ${INSTALL_LIB} ${WRKSRC}/libwebsh${LIBSUF}.so.1.0 \
${STAGEDIR}${PREFIX}/lib; \ ${STAGEDIR}${PREFIX}/lib; \
${LN} -sf libwebsh${TCL_DVER}.so.1.0 \ ${LN} -sf libwebsh${LIBSUF}.so.1.0 \
${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so.1; \ ${STAGEDIR}${PREFIX}/lib/libwebsh${LIBSUF}.so.1; \
${LN} -sf libwebsh${TCL_DVER}.so.1.0 \ ${LN} -sf libwebsh${LIBSUF}.so.1.0 \
${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so; \ ${STAGEDIR}${PREFIX}/lib/libwebsh${LIBSUF}.so; \
else \ else \
${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1 \ ${INSTALL_LIB} ${WRKSRC}/libwebsh${LIBSUF}.so.1 \
${STAGEDIR}${PREFIX}/lib; \ ${STAGEDIR}${PREFIX}/lib; \
${LN} -sf libwebsh${TCL_DVER}.so.1 \ ${LN} -sf libwebsh${LIBSUF}.so.1 \
${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so; \ ${STAGEDIR}${PREFIX}/lib/libwebsh${LIBSUF}.so; \
fi fi
${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 \ ${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 \

6
www/websh/pkg-plist
View file

@ -1,6 +1,6 @@
%%NOMINORVERSION%%lib/libwebsh%%TCL_DVER%%.so.1.0 %%NOMINORVERSION%%lib/libwebsh%%LIBSUF%%.so.1.0
lib/libwebsh%%TCL_DVER%%.so.1 lib/libwebsh%%LIBSUF%%.so.1
lib/libwebsh%%TCL_DVER%%.so lib/libwebsh%%LIBSUF%%.so
lib/websh/pkgIndex.tcl lib/websh/pkgIndex.tcl
lib/websh/htmlhandler.ws3 lib/websh/htmlhandler.ws3
lib/websh/otherhandler.ws3 lib/websh/otherhandler.ws3