Bug 281438 - editors/linux-bcompare: Update 4.3.7 → 4.4.7
Summary: editors/linux-bcompare: Update 4.3.7 → 4.4.7
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL: https://www.scootersoftware.com/downl...
Keywords:
Depends on:
Blocks:
 
Reported: 2024-09-11 12:59 UTC by Matías Pizarro
Modified: 2024-09-15 10:47 UTC (History)
2 users (show)

See Also:


Attachments
a patch that updates editors/linux-bcompareto its latest version, 4.4.7 (3.08 KB, patch)
2024-09-11 12:59 UTC, Matías Pizarro
no flags Details | Diff
A patxh that updates bcompare to v4.4.7 and applies Vladimir's feedback (4.92 KB, patch)
2024-09-15 02:49 UTC, Matías Pizarro
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Matías Pizarro 2024-09-11 12:59:37 UTC
Created attachment 253498 [details]
a patch that updates editors/linux-bcompareto its latest version, 4.4.7

The patched version successfully passes:
   * poudriere testport
   * portlint
   * portfmt Makefile
   * portclippy Makefile

I am working on the initial version of a separate port for BCompare5 but that will require a change of Linux base and will not remove the need for a BC4 port for people who do not have a BC5 license.
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-11 21:18:01 UTC
Is this correct:
-SHEBANG_FILES=	${BCLIB_SRC}/bcmount.sh ${BCLIB_SRC}/kde_context_menu
+# SHEBANG_FILES=	${BCLIB_SRC}/bcmount.sh ${BCLIB_SRC}/kde_context_menu
+SHEBANG_FILES=	${BCLIB_SRC}/kde_context_menu
?
Comment 2 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-11 22:37:04 UTC
1. Better use https in MASTER_SITES - it work (just tested).

2. Line:
	${LINUXBASE}/usr/bin/gcc --sysroot=${LINUXBASE} -Wall -fPIC -shared ${FILESDIR}/nosched.c -ldl -o ${BCLIB_SRC}/nosched.so
is too long.
I replaced it with:
        ${LINUXBASE}/usr/bin/gcc --sysroot=${LINUXBASE} -Wall -fPIC -shared \
                ${FILESDIR}/nosched.c -ldl -o ${BCLIB_SRC}/nosched.so
Comment 3 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-11 23:32:59 UTC
(In reply to Vladimir Druzenko from comment #1)
Shebang can't fix "#!/usr/bin/sh".
You add patch-usr_lib64_beyondcompare_bcmount.sh, but it work for amd64 only and fails on i386.

I suggest use this instead of new patch:
post-patch:
        ${REINPLACE_CMD} -e 's|^#!/usr/bin/sh$$|#!/bin/sh|' ${BCLIB_SRC}/bcmount.sh

3. Linux with ${LN} are too long too.

4. This work too and is shorter (without unnecessary "cd ${BCLIB_SRC}"):
${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/bcompare ${STAGEDIR}${PREFIX}/bin
.if ${ARCH} == amd64
        ${INSTALL_LIB} ${BCLIB_SRC}/qt4/*.so.4 ${BCLIB_STG}/qt4
.endif
        ${INSTALL_LIB} ${BCLIB_SRC}/ext/*.so   ${BCLIB_STG}/ext
Comment 4 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-11 23:34:10 UTC
5. Also options order for DISTNAME_*:
PKGNAMEPREFIX=  linux-
DISTNAME_amd64= ${DISTNAME}.x86_64
DISTNAME_i386=  ${DISTNAME}.i386
EXTRACT_SUFX=   .rpm
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-14 22:29:47 UTC
(In reply to Vladimir Druzenko from comment #3)
3. _Line_ with ${LN} are too long too. :-o
Comment 6 Matías Pizarro 2024-09-15 01:51:40 UTC
(In reply to Vladimir Druzenko from comment #5)
Hi Vladimir,
I will take care of this tomorrow and submit a new patch.

Thanks for the great feedback!
Comment 7 Matías Pizarro 2024-09-15 02:49:12 UTC
Created attachment 253577 [details]
A patxh that updates bcompare to v4.4.7 and applies Vladimir's feedback

Update bcompare to v4.4.7, incl. Vladimir Druzenko's feedback
Comment 8 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-15 10:39:21 UTC
Use portclippy from ports-mgmt/portfmt.
DISTNAME_amd64= ${DISTNAME}.x86_64
DISTNAME_i386=  ${DISTNAME}.i386
and
SHEBANG_FILES=  ${BCLIB_SRC}/kde_context_menu
have to be early.
I'll fix this too.
Comment 9 commit-hook freebsd_committer freebsd_triage 2024-09-15 10:46:25 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=885525e47373de75a9c9faeb31246b60fcdb6e83

commit 885525e47373de75a9c9faeb31246b60fcdb6e83
Author:     Matías Pizarro <matias@pizarro.net>
AuthorDate: 2024-09-15 10:36:43 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
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(-)
Comment 10 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-15 10:47:00 UTC
Thanks.