git: ef60db67c718 - main - www/websh: mark BROKEN on 14
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Jun 2023 14:23:57 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ef60db67c7189bc0119122b5bb311290d5678b44
commit ef60db67c7189bc0119122b5bb311290d5678b44
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-05 13:07:56 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-05 14:23:44 +0000
www/websh: mark BROKEN on 14
- Replace deprecated @exec/@unexec with @postexec/@preunexe
- Pet portclippy
Approved by: portmgr (blanket)
---
www/websh/Makefile | 26 +++++++++++++++-----------
www/websh/pkg-plist | 4 ++--
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/www/websh/Makefile b/www/websh/Makefile
index 7e71259fe02d..3823c26bce20 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -1,6 +1,6 @@
PORTNAME= websh
PORTVERSION= 3.6.0b5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www tcl
MASTER_SITES= https://archive.apache.org/dist/tcl/${PORTNAME}/source/
EXTRACT_SUFX= -src.tar.gz
@@ -9,30 +9,34 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Embeds a TCL8 interpreter in the Apache server
WWW= https://tcl.apache.org/websh/
-MAKE_JOBS_UNSAFE= yes
-
-LIBSUF= ${PORTVERSION:S/.//g}
+BROKEN_FreeBSD_14= Fails at post-build test stage
USES= apache autoreconf gmake tcl:tea
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix
USE_LDCONFIG= yes
+
+CONFIGURE_ARGS+=--with-httpdinclude=`apxs -q includedir`
+
+MAKE_JOBS_UNSAFE= yes
+
+CPPFLAGS+= -I ${LOCALBASE}/include/apr-1
+.if !defined(NO_WERROR) && ${CC} == "cc" || ${CC:T:Mgcc*} != ""
+CPPFLAGS+= -Wall -Werror
+.endif
+
SUB_FILES= httpd.conf pkgIndex.tcl pkg-message
SUB_LIST+= LIBSUF=${LIBSUF} WS_VER=${PORTVERSION}
SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR}
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix
PLIST_SUB+= LIBSUF=${LIBSUF}
PLIST_SUB+= NOMINORVERSION=${TCL_VER:C/8.[345]//:C/^..*/"@comment "/}
PORTDOCS= *
PORTEXAMPLES= *
-CONFIGURE_ARGS+=--with-httpdinclude=`apxs -q includedir`
-
OPTIONS_DEFINE= DOCS EXAMPLES
-CPPFLAGS+= -I ${LOCALBASE}/include/apr-1
-.if !defined(NO_WERROR) && ${CC} == "cc" || ${CC:T:Mgcc*} != ""
-CPPFLAGS+= -Wall -Werror
-.endif
+LIBSUF= ${PORTVERSION:S/.//g}
post-patch:
${REINPLACE_CMD} -e 's,/usr/local/websh,${PREFIX},' \
diff --git a/www/websh/pkg-plist b/www/websh/pkg-plist
index 7c959b91abaa..1125d9c5ace4 100644
--- a/www/websh/pkg-plist
+++ b/www/websh/pkg-plist
@@ -6,5 +6,5 @@ lib/websh/htmlhandler.ws3
lib/websh/otherhandler.ws3
etc/websh.conf.dist
%%APACHEMODDIR%%/mod_websh.so
-@exec %D/sbin/apxs -e -A -n websh %D/%F
-@unexec %D/sbin/apxs -e -A -n websh %D/%F
+@postexec %D/sbin/apxs -e -A -n websh %D/%F
+@preunexec %D/sbin/apxs -e -A -n websh %D/%F