From nobody Mon Jan 22 20:27:26 2024 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 4TJhbg3XvKz588vx; Mon, 22 Jan 2024 20:27:27 +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 4TJhbf6DMvz49q9; Mon, 22 Jan 2024 20:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705955246; 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=kp8uRRt4X9b6uTLFtJS3CAv7jCwVvEcxatgJ/JshBaQ=; b=bphTiPRjPp/E9+Nz4sFkGKYtlRfwQ9ShFbTv60RiIMepBBWaV5Pq0pCMiRvhy0qkzfJZtr 1k0q/Frs9ALcFhesopcPVyIk7hT5cvRCMNbduSMzrN4w2ZWL47n5ZkWtzYwwwshR+HsJGl CbDx66gxQpk5CsERZlrvd996HRUBHoC+pWCJY+jjbxY0q2b0hD4oOxdvL1a/ZtWZdQs8P0 uxYib/+hQlB4fwR0VUfIgnIYNdRu3EGd4wt/bDG/fI/YxHDazpQoRC5BIVOpxX478b0ngY 8h8tv9VwMfMiA58F3LMdd03grqK6kHiP2VWxBB8bgHPXysV46sGCEaINKFQEpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705955246; 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=kp8uRRt4X9b6uTLFtJS3CAv7jCwVvEcxatgJ/JshBaQ=; b=jNO+zz9E0IyO3sX0FbnFY7bKuDAax8OSBIGMZVKhUL0AUWRQ6v65rL9mstk4X6oBLm2F18 b6VPaF0dIvv7FPOfEdgmB/QLxkx+CyRYc2RbrZ/QjLQcvbr1INDFvL0Q83jOLSd1gW710Z w9NI8HSsrqljKTZU4TB6jWCJZbwPAoqX82mVcXtxhecMOX9nHRZ88uwzpreLhFwHFnfWRV Hn2d9TsGHvbng+ZklJAov9rZZvjQkV71Tq9WQIe3rVLJQjkS1l5HkktWdKPVlv2/of0rP3 pIL0dyR+F96X7RjePyI4l/K4HqpfT7JNlqp2KPtQGgS4p4rIZkDY7mAs4cP16w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705955246; a=rsa-sha256; cv=none; b=ZBa0Tub/X7fUbZMFDrkAAsnU35QBDmk5qg3DBfAu4bfPwH3XgGfBXyEMQk7Cc3QZ3cjME8 TUs55HaNFOZ8EruRa60yV5+dyb+59IJ6WyOizdROV4KxYVaZ6WoqXzVSzRLADztcX5Vsvx ddWDzCX0/RcMrbX9NqKeu8+iuZtR/5IHYkHZjpi4ubd/Emlv8DdxHkZ1MOHILOG0JTI1Uy FF5q8XVIjz3kBpLXU6eiqPrAOv+hag0e3CkeSTcicVoc1JIqZahRiptW6WHKgT88nZpdro mxc1P1FOI8hKahKsvDDFbDC0hX3gYNkNov8FXnPKwkBCmVb5DbEGWfVXCDU/Mw== 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 4TJhbf5KVFz1G8Z; Mon, 22 Jan 2024 20:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40MKRQ4k012638; Mon, 22 Jan 2024 20:27:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MKRQ55012635; Mon, 22 Jan 2024 20:27:26 GMT (envelope-from git) Date: Mon, 22 Jan 2024 20:27:26 GMT Message-Id: <202401222027.40MKRQ55012635@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: 923f262b8c23 - main - lang/expect: Sanitize MANPREFIX 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: 923f262b8c23f06d2d984136395c4a1e6a1c6bbb Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=923f262b8c23f06d2d984136395c4a1e6a1c6bbb commit 923f262b8c23f06d2d984136395c4a1e6a1c6bbb Author: Muhammad Moinur Rahman AuthorDate: 2024-01-22 19:15:21 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-22 20:26:41 +0000 lang/expect: Sanitize MANPREFIX Approved by: portmgr (blanket) --- lang/expect/Makefile | 3 +-- lang/expect/files/patch-Makefile.in | 22 +++++++++++++++++++--- lang/expect/files/pkg-message.in | 2 +- lang/expect/pkg-plist | 26 +++++++++++++------------- 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/lang/expect/Makefile b/lang/expect/Makefile index e6252722f3fb..dd6dbaf630e1 100644 --- a/lang/expect/Makefile +++ b/lang/expect/Makefile @@ -1,6 +1,6 @@ PORTNAME= expect PORTVERSION= 5.45.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= lang tcl tk MASTER_SITES= SF/${PORTNAME}/Expect/${PORTVERSION} @@ -19,7 +19,6 @@ USE_LDCONFIG= ${LOCALBASE}/lib/${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME} PLIST_SUB+= PORTVERSION=${PORTVERSION} SUB_FILES+= pkg-message -SUB_LIST+= MANPREFIX=${MANPREFIX} TEST_TARGET= test MAKE_ENV+= STRIPPROG=${STRIP_CMD} diff --git a/lang/expect/files/patch-Makefile.in b/lang/expect/files/patch-Makefile.in index fee7a43dda1c..ddf7408a8d6a 100644 --- a/lang/expect/files/patch-Makefile.in +++ b/lang/expect/files/patch-Makefile.in @@ -9,12 +9,28 @@ rm -f $$i ; \ else true; fi ; \ done -@@ -259,7 +259,7 @@ install-doc: doc - $(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3 +@@ -254,12 +254,12 @@ install-doc: doc + @mkdir -p $(DESTDIR)$(mandir)/man3 + @echo "Installing documentation in $(DESTDIR)$(mandir)" + # install Expect man page +- $(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1 ++ $(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(prefix)/share/man/man1/expect.1 + # install man page for Expect library +- $(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3 ++ $(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(prefix)/share/man/man3/libexpect.3 -for i in $(SCRIPT_MANPAGE_LIST) ; do \ if [ -f $(srcdir)/example/$$i.man ] ; then \ - $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \ -+ $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/expect_$$i.1 ; \ ++ $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(prefix)/share/man/man1/expect_$$i.1 ; \ else true; fi ; \ done +@@ -502,7 +502,7 @@ expect-$(VERSION).tar.gz: expect-$(VERSION).tar + # variable in configure.in + #======================================================================== + +-clean: ++clean: + -test -z "$(BINARIES)" || rm -f $(BINARIES) + -rm -f *.$(OBJEXT) core *.core + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) diff --git a/lang/expect/files/pkg-message.in b/lang/expect/files/pkg-message.in index d422ddaf1a67..bce62bf49b85 100644 --- a/lang/expect/files/pkg-message.in +++ b/lang/expect/files/pkg-message.in @@ -3,7 +3,7 @@ message: <