From nobody Mon Jun 05 14:23:57 2023 X-Original-To: dev-commits-ports-main@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 4QZbSs6QVTz4bGbZ; Mon, 5 Jun 2023 14:23:57 +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 4QZbSs5FsHz41Tk; Mon, 5 Jun 2023 14:23:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685975037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8rhtpUklLlKveyXldO84uIgtsjUEfV5hND0r/tPzdgU=; b=NK4D9A8WeouEJFEoYd3xifFRsDwgnxECpi2eWiDRziIg6gCFaF+amn4fexGUg1ghfnpC0m EbNQ+A8jp1r6gQvO2ZnyLp5Vzn9uIyJ/Kr04uIK+PrrfTaGSnF9HnWUGsaUKxKac2mp/78 y0AePB/Bl6SJZlJ9Uw1GivrLXaf9sVq/A5vLK70i7nzm9RRIwaylf9A4ZeoiERBI60BuTy p02D2Hyu3aO9IKtTXE02G7cnbf36Qi2699pD1K6A8mo+wVCCde5nG9vLw1wARkhoC84Fys SwMbdOOXIN9luSSC6LVnF98OG9q1na0sBD+Lf6r/ALXoS5FerVl6Of59sZ6sIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685975037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8rhtpUklLlKveyXldO84uIgtsjUEfV5hND0r/tPzdgU=; b=g4BsgpQItRWItYexb+teeJoqUSzO/Z9lriVqWj8bowOh2hyQOfAL4WZWUKIdrDPvmQqNB3 y85N5vzUts8CGEHVTX+C9CkNoHKE7sAlqgrC5ZrNARo53uHeVE4nFreygbSnr8SlxS9+qt lDpQAVo8DUx8ZXj8yy0vqPSg0IyBmbFl6urSbsIppDPpL/aZmE02VerHPSOPS0AZD94tKS B7l8cv5UtZ85Acfs7ftNcSZH/eHdOib3ar/wHp+ZnazYYOSUpsnvw1Pec91fexMZoOqFMe 9IU7eWujOBeC4D6ZfE+8V5xs/SS1tyy/WtsgM4DqrlHFql5jTTnV+vt3qWAGwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685975037; a=rsa-sha256; cv=none; b=RH6RyrTHyyAh6518feDK6Qv2IQJE3ZV/yN2yjAiqG7yRLBMFS1Rzn9nY6kkQV9eqSKQfDn WC+SIvcdxFb2RhntPWDb6iDDSsKOtZbEydg/1ec8hJGV6XCXZ8yYh4UlI/pug3OB5kdJ37 zsAzQ4y1hFk8qJYBz9ICagaSdNzLUmg7RLHyMzhv8dvGlqEvikUTgLkYlQ5igzSgdLhsKL siENGQeiheNt/jUtTY6Q/7mgyBZGFJRV3wQJoHtrMVtCIlh8TIeIi7d91FJ9mmrl5wAia0 7G4w6dTir9vJpPRtWhy+8ObWPTCrDLi93ZQsd6NP5KmcKUYttUBTzaqbSTwnPw== 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 4QZbSs4KRYzrHg; Mon, 5 Jun 2023 14:23:57 +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 355ENvkB000909; Mon, 5 Jun 2023 14:23:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355ENv0Y000908; Mon, 5 Jun 2023 14:23:57 GMT (envelope-from git) Date: Mon, 5 Jun 2023 14:23:57 GMT Message-Id: <202306051423.355ENv0Y000908@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: ef60db67c718 - main - www/websh: mark BROKEN on 14 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef60db67c7189bc0119122b5bb311290d5678b44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef60db67c7189bc0119122b5bb311290d5678b44 commit ef60db67c7189bc0119122b5bb311290d5678b44 Author: Muhammad Moinur Rahman AuthorDate: 2023-06-05 13:07:56 +0000 Commit: Muhammad Moinur Rahman 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