From nobody Fri Nov 10 20:13:28 2023 X-Original-To: dev-commits-ports-branches@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 4SRqlF1xpqz50DGw; Fri, 10 Nov 2023 20:13:29 +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 4SRqlF11vYz4ZKK; Fri, 10 Nov 2023 20:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699647209; 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=Tzwi8BozC/nk+UfABI8CDU/yHHyhPxnzOu9L1s3jAAA=; b=m/ghoH72VyADhg+ehr4w+yLWkY2QVy15MmPVC3ucKd41yI+9UPjFf1tMfaDI/k6tqSSX0u D/ytciRQLaKr17XbsPjsfgtjer6FMtfVW1d6+qSxscc1XRTLC6+uLpSZ4rBSnRM/P7kBny 9W41TMqABY1tpsY6KLWGiTqOTHtvgGmi5AZa7Qkh9kcbBdSg2bQ9S5mUH4EJ0UE/rU4kr9 FqPUgyiKca9ZDjW4Pkm3ddS4oeSFTrhmmv++6K9Gpx3aRNnsCzsPiEjx/rmr4M1gk0cabn WpuRUQpWPJf7/RynGO+pKoGxr2p2Af3BrmlrZTNAZK+AVEL8Hsm8NOocPQ6JHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699647209; 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=Tzwi8BozC/nk+UfABI8CDU/yHHyhPxnzOu9L1s3jAAA=; b=lpkFQOEov7qqtBPiq4aaJl8jtvpaRB/bckxkboArCmXqt7JDgASZjSa+XfPGIFhfzQKot+ 1x0u+GLno9IrB94+PbZHhyTLviZ3j1FlcXGayJYjEkDjiX3MoLAFwVJePmi/tH83BBHrbf R+HbrY6vwFavyHYggcrivxDYyPcO+UkTLTTf9nDjFDcVgWdkILNvIROil14EsVSE5pPpjq dhBK5C6SsUIeOXjJQrsPdundNkmcWk7r2du6gQcWvgzttqaMVnhvbztyzbZ/Z5J1OxyZs/ WN4cj+Gk7Kf7IjvxWZCji+FRIN6Q0/uqwCfO4c+S7l/vlvKDrBHAmB6BACnlqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699647209; a=rsa-sha256; cv=none; b=xZ6g+rTi/Wi2t4oAqw4M/xL0DTFrJ7i/j3v2hZclJFE2CCZO+roioF64g9apgrXVNbceOf Mme2oH83ulSbNNkaTaS+kBmhy7iB1H9uYB+VKcURNJc+z/BAcAAw1jJIPwRxFPPCTi8iI2 w/KHufK+ZIqO61jsbcYuzmYM3RlTu2/n1wypwkTHh0v6n7OLmvkEEEqcIxhycYmTL9zzPj J0olqGK+IPhsMdswpkavrg2pl3w4nPzBSo29pHhoTGY0MkeXbBxRr8AfVuQNQeIsFHg6Nb /bG7gEzigmCLVg5DIJOEN/fpjbXxOhoTZqEaqavlYKu5MJezP7qd/LFZZaJoEw== 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 4SRqlD6vKQz19j2; Fri, 10 Nov 2023 20:13:28 +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 3AAKDSKI035301; Fri, 10 Nov 2023 20:13:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAKDSHo035298; Fri, 10 Nov 2023 20:13:28 GMT (envelope-from git) Date: Fri, 10 Nov 2023 20:13:28 GMT Message-Id: <202311102013.3AAKDSHo035298@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 84584fcab510 - 2023Q4 - editors/lazarus-*: Update CONFLICTS List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 84584fcab510d17e7d30d71fd47942c40b6d536a Auto-Submitted: auto-generated The branch 2023Q4 has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=84584fcab510d17e7d30d71fd47942c40b6d536a commit 84584fcab510d17e7d30d71fd47942c40b6d536a Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-10-29 17:38:01 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-11-10 20:13:20 +0000 editors/lazarus-*: Update CONFLICTS - editors/lazarus-qt5: Bump PORTREVISION. qt5pas was updated - editors/lazarus-*: Add -p to ${INSTALL_DATA} to Add -p to ${INSTALL_DATA} to preserves the access and modification times. It avoid issues with checksum changes and it improves compile time when lazarus ide is rebuild by users. - Bump PORTREVISION (cherry picked from commit 8c962df69fb136431a541f4bbd64e24e8e3eff64) --- editors/lazarus-qt5/Makefile | 4 ++-- editors/lazarus/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/editors/lazarus-qt5/Makefile b/editors/lazarus-qt5/Makefile index c23c7c3a3856..1e0e96340327 100644 --- a/editors/lazarus-qt5/Makefile +++ b/editors/lazarus-qt5/Makefile @@ -1,10 +1,10 @@ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX?= -qt5 COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT5) -CONFLICTS= ${PORTNAME}-gtk2 +CONFLICTS= lazarus-gtk2 lazarus-gtk2-devel lazarus-qt5-devel lazarus-qt6-devel LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index d48af3565a26..6f80a1243386 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -2,7 +2,7 @@ PORTNAME= lazarus PORTVERSION= 2.2.6 DISTVERSIONSUFFIX= -0 PKGNAMESUFFIX?= -gtk2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ LOCAL/acm/freepascal @@ -12,7 +12,7 @@ MAINTAINER?= acm@FreeBSD.org COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2) WWW= https://www.lazarus-ide.org/ -CONFLICTS?= ${PORTNAME}-qt5 +CONFLICTS?= lazarus-gtk2-devel lazarus-qt5 lazarus-qt5-devel lazarusqt6-devel BUILD_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \ fpcres:lang/fpc-utils @@ -136,7 +136,7 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE} @cd ${WRKSRC}/${DIRE} && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; + ${FIND} * -type f -exec ${INSTALL_DATA} -p {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; .endfor @${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \ ${STAGEDIR}${DATADIR}/tools/updatepofiles