From nobody Sun Sep 15 10:45:22 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 4X64Sf3M4rz5W5kQ; Sun, 15 Sep 2024 10:45:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X64Sf2lnSz54pq; Sun, 15 Sep 2024 10:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726397122; 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=DUhWTwW8NbAZg0cdARygTizsMy+S3zHvULttrDt9Eag=; b=WoZehVrCBaD4sX8iVtTzdbOH6HmIgTwvxtTFi7Ds/FiTiLQsbXXSfdXIIbcIf1MRbkFvCt UsnteX6QbNiHcT5dQ2/Bp/D7nXB9Up/dX8jQRZfWx4pHjPF96A5VvyvR5duHy+/jR6J70M rrGOqkUZx1vGEagzr7Bve/MSXFCja6Lm4n8fEf42swNnmYtr76MFxML5nwPb5BpudJH45L hIRin6F5hWF4DWmn6TOO1gtKWtX/lv1J6NKmsLCtxpmB+i6wjoRbGrKiL/wPLYoLxHHcKZ E+iq5kRcLsgXnwKWpSYtAJZq5GJE5ORTHqWR5zeCyo25sWXnYsxzZweGsIN+jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726397122; a=rsa-sha256; cv=none; b=lZ6342EalaN4Hdq91KauD/nnTaxKY7TAiE1lV5moelHaebVfIG9TwA9LJWiJrzlY+h3sZi eotCI5l/akftvzsClWP2kYDv1z/FqkVd9r5WiW1HAap56CfYQUxpkwatxHPelS+LlqqA6H aH9/6l+3WqA6nRupQWSjCSm9kJPkN/XnQNoBYAluLcbcR/Y1uhMp79FCDhHkWBDEvySOJA M8aGVC1SxOc+C4npcOtypzou4MP01TUTe3P0L+bWNgdqLkueIhtvhVuGDD8s4xXe0L17gD sA0j2IegCEY0ZRBPyOgrKhpsD28eqFzcM60dWITTpNeAhvULoqQ6SqX/I5zwsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726397122; 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=DUhWTwW8NbAZg0cdARygTizsMy+S3zHvULttrDt9Eag=; b=G+HofzCxk1mHRz8KtwhSDzU6AnPPEKCOPIXOgPbHZ2IFlottQITaesVVIQsS+dOkd+3/ar hTkUPoCG5xs7YnR1/AOhkyxbieWz8gGRoEhPvgjIYIY+x3qvIV/01q4/8OdpZhnTWDzWLr aCL+qTuLbFfvPD0y8H4JujYCepdWy6HRJZe8GxSn3q91ut3gY+F0Ql2yyGR4o+ASjYA/Xj smmMoe5O2t9p5WjkiXNcqr0dHHvNCZO8tZ2D6N9h1BGRHv8WUfFfsPLNBOfbv7HGWscumw u1LC75qpxBq2kuviN/AeLCLUHxQmuyZmGyMEcIubraTNmvTPX4ejAJR9MichuQ== 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 4X64Sf2C46z16tc; Sun, 15 Sep 2024 10:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48FAjMtV006188; Sun, 15 Sep 2024 10:45:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48FAjMbH006185; Sun, 15 Sep 2024 10:45:22 GMT (envelope-from git) Date: Sun, 15 Sep 2024 10:45:22 GMT Message-Id: <202409151045.48FAjMbH006185@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 885525e47373 - main - editors/linux-bcompare: Update 4.3.7 =?utf-8?Q?=E2=86=92?= 4.4.7 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 885525e47373de75a9c9faeb31246b60fcdb6e83 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=885525e47373de75a9c9faeb31246b60fcdb6e83 commit 885525e47373de75a9c9faeb31246b60fcdb6e83 Author: Matías Pizarro AuthorDate: 2024-09-15 10:36:43 +0000 Commit: Vladimir Druzenko CommitDate: 2024-09-15 10:45:16 +0000 editors/linux-bcompare: Update 4.3.7 → 4.4.7 Changelogs: https://www.scootersoftware.com/download/v4changelog Port improvements: - remove unnecessary CDs in do-install - split long lines - pet portclippy PR: 281438 --- editors/linux-bcompare/Makefile | 41 ++++++++++++++++++++++++----------------- editors/linux-bcompare/distinfo | 10 +++++----- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/editors/linux-bcompare/Makefile b/editors/linux-bcompare/Makefile index 0a6b0f8b053f..469a0be1dde4 100644 --- a/editors/linux-bcompare/Makefile +++ b/editors/linux-bcompare/Makefile @@ -1,9 +1,11 @@ PORTNAME= bcompare -DISTVERSION= 4.3.7 -DISTVERSIONSUFFIX= .25118 +DISTVERSION= 4.4.7 +DISTVERSIONSUFFIX= .28397 CATEGORIES= editors devel linux -MASTER_SITES= http://scootersoftware.com/ +MASTER_SITES= https://scootersoftware.com/files/ PKGNAMEPREFIX= linux- +DISTNAME_amd64= ${DISTNAME}.x86_64 +DISTNAME_i386= ${DISTNAME}.i386 EXTRACT_SUFX= .rpm MAINTAINER= matias@pizarro.net @@ -21,6 +23,8 @@ ONLY_FOR_ARCHS_REASON= upstream only supports amd64 and i386 USES= desktop-file-utils gnome linux shared-mime-info shebangfix USE_LINUX= base:run devtools:build qt-x11:run xorglibs:run +SHEBANG_FILES= ${BCLIB_SRC}/kde_context_menu + NO_BUILD= yes NO_WRKSUBDIR= true @@ -31,8 +35,6 @@ DATA_FILTER= -type d -o -name *\.html -o -name *\.js -o -name *\.css -o \ BCompare.mad -o -name RPM-GPG-KEY-scootersoftware -o -name \ scootersoftware.repo -DISTNAME_amd64= ${DISTNAME}.x86_64 -DISTNAME_i386= ${DISTNAME}.i386 LIB_FILES= libQt4Pas.so.5 lib7z.so libunrar.so nosched.so PROGRAM_FILES= BCompare bcmount32 bcmount64 SCRIPT_FILES= bcmount.sh kde_context_menu @@ -52,31 +54,36 @@ PLIST_SUB+= QT4AMD64="" BCLIB_SRC= ${WRKSRC}/usr/${LIBDIR}/beyondcompare BCLIB_STG= ${STAGEDIR}${PREFIX}/lib/beyondcompare -SHEBANG_FILES= ${BCLIB_SRC}/bcmount.sh ${BCLIB_SRC}/kde_context_menu +post-patch: + ${REINPLACE_CMD} -e 's|^#!/usr/bin/sh$$|#!/bin/sh|' ${BCLIB_SRC}/bcmount.sh pre-install: - ${LINUXBASE}/usr/bin/gcc -Wall -fPIC -shared ${FILESDIR}/nosched.c -ldl -o ${BCLIB_SRC}/nosched.so + ${LINUXBASE}/usr/bin/gcc --sysroot=${LINUXBASE} -Wall -fPIC -shared \ + ${FILESDIR}/nosched.c -ldl -o ${BCLIB_SRC}/nosched.so do-install: # bin - (cd ${WRKSRC}/usr/bin && ${INSTALL_SCRIPT} bcompare ${STAGEDIR}${PREFIX}/bin) + ${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/bcompare ${STAGEDIR}${PREFIX}/bin # lib - (cd ${BCLIB_SRC} && ${COPYTREE_SHARE} . ${BCLIB_STG} "${DATA_FILTER}") - (cd ${BCLIB_SRC} && ${INSTALL_PROGRAM} ${PROGRAM_FILES} ${BCLIB_STG}) - (cd ${BCLIB_SRC} && ${INSTALL_SCRIPT} ${SCRIPT_FILES} ${BCLIB_STG}) - (cd ${BCLIB_SRC} && ${INSTALL_LIB} ${LIB_FILES} ${BCLIB_STG}) + (cd ${BCLIB_SRC} && ${COPYTREE_SHARE} . ${BCLIB_STG} "${DATA_FILTER}") + (cd ${BCLIB_SRC} && ${INSTALL_PROGRAM} ${PROGRAM_FILES} ${BCLIB_STG}) + (cd ${BCLIB_SRC} && ${INSTALL_SCRIPT} ${SCRIPT_FILES} ${BCLIB_STG}) + (cd ${BCLIB_SRC} && ${INSTALL_LIB} ${LIB_FILES} ${BCLIB_STG}) .if ${ARCH} == amd64 - (cd ${BCLIB_SRC}/qt4 && ${INSTALL_LIB} $$(ls *.so.4) ${BCLIB_STG}/qt4) + ${INSTALL_LIB} ${BCLIB_SRC}/qt4/*.so.4 ${BCLIB_STG}/qt4 .endif - (cd ${BCLIB_SRC}/ext && ${INSTALL_LIB} $$(ls *.so) ${BCLIB_STG}/ext) + ${INSTALL_LIB} ${BCLIB_SRC}/ext/*.so ${BCLIB_STG}/ext ${LN} -sf ${LINUXBASE}/usr/${LIBDIR}/libbz2.so.1.0.6 ${BCLIB_STG}/libbz2.so.1.0 # data (cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share) ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps - ${LN} -sf ../../../../pixmaps/bcompare.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/bcompare.png - ${LN} -sf ../../../../pixmaps/bcomparefull32.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/bcompare.png - ${LN} -sf ../../../../pixmaps/bcompare.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/bcompare.png + ${LN} -sf ../../../../pixmaps/bcompare.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/bcompare.png + ${LN} -sf ../../../../pixmaps/bcomparefull32.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/bcompare.png + ${LN} -sf ../../../../pixmaps/bcompare.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/bcompare.png .include diff --git a/editors/linux-bcompare/distinfo b/editors/linux-bcompare/distinfo index d3915c5a2073..bd699cbbe42c 100644 --- a/editors/linux-bcompare/distinfo +++ b/editors/linux-bcompare/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1601823220 -SHA256 (bcompare-4.3.7.25118.i386.rpm) = 71a72fa4318b7afedb03ec7147523d3aa47e26b090e1a170316990eb88268828 -SIZE (bcompare-4.3.7.25118.i386.rpm) = 12675958 -SHA256 (bcompare-4.3.7.25118.x86_64.rpm) = c913df4d0df858c4d1de62ee269b82a3e231b7408e36ee43ba672fd07e97dee0 -SIZE (bcompare-4.3.7.25118.x86_64.rpm) = 18808757 +TIMESTAMP = 1703173253 +SHA256 (bcompare-4.4.7.28397.i386.rpm) = 26401171e6235d125814eafa5653359ed9c7d8d34145f2ac6302331c2607147f +SIZE (bcompare-4.4.7.28397.i386.rpm) = 13054732 +SHA256 (bcompare-4.4.7.28397.x86_64.rpm) = aeea6fd6c0edc2043928861348d648acaeba5f93a8ff247cda3c3476437734b8 +SIZE (bcompare-4.4.7.28397.x86_64.rpm) = 19068518