Created attachment 235899 [details]
Poudriere run for FreeBSD 12.3-RELEASE

Poudriere run for 12.3-RELEASE (latest patch level)

Created attachment 235900 [details]
Poudriere run for FreeBSD 13.1-RELEASE

Poudriere log on 13.1-RELEASE (latest patch level)

Patch file is too big to upload... welp.

I've posted it on github:
https://raw.githubusercontent.com/christian-moerz/nscde-port/main/nscde-2.2.patch

Do I somehow still need to set maintainer-feedback:+ ?
I can't set this without a patch file, it appears?

Comment 5 Nuno Teixeira 2022-08-15 12:21:14 UTC

(In reply to Chris Moerz from comment #4)

Hello Chris,

When reporter is maintainer you do have to put approved flag since it's implicit, but a lot of maintainers used it that way.

I will take a look.

Cheers

Comment 6 Nuno Teixeira 2022-08-15 12:23:51 UTC

(In reply to Nuno Teixeira from comment #5)

*** When reporter is maintainer you do *NOT* have to put approved flag since it's implicit, but a lot of maintainers used it that way.

Comment 7 Nuno Teixeira 2022-08-15 13:47:50 UTC

(In reply to Chris Moerz from comment #0)

Hi Chris,

You're using 2022Q3 branch and you should use main.
No reason to delete files/patch-* since git diff/apply take care of adding/removing files.

Comment 8 Nuno Teixeira 2022-08-15 19:09:18 UTC

Created attachment 235923 [details]
diff against main - v1

- switch to MASTER_SITES since upstream provides static tarball
- move some RUN/BUILD deps to USES
- use WRKSRC workaround instead of mv/rename wrksrc
- use ARCH var in some pkg-plist files that are generated with OPSYS-ARCH

I've comment out all removals and changes with "### DESCR" so you can take a look.

If possible, take a closer look at what this port needs as RUN/BUILD deps to see if a cleanup is possible.

Cheers

Comment 9 Nuno Teixeira 2022-08-15 19:15:56 UTC

I forgot to ask:

Did you get that upstream included all changes needed to patch, since there is almost none patches in files/?

Nice work :)

Cheers

Hi Nuno,

thanks for the feedback.

I guess I got lucky, because the upstream maintainer switched to a more platform agnostic build system.

I'll switch my poudriere runs against main line from now on.

And thanks for teaching me some new tricks of the ports system. I'll work through your suggestions and get back to you asap.

thanks!

Created attachment 236336 [details]
x11-wm/nscde update to 2.2

Hi Nuno,

finally got around to walking through the Makefile once more. 

I switched my ports tree to main before continuing my work.

I incorporated all of your suggestions and also resolved a dependency bug I seem to have introduced previously - ast-ksh and ksh2020 didn't correctly separate; the port always depended on ast-ksh, which does not appear to run on arm64.

portlint suggested adding USE_PYQT, so I added that as well.

I'll be attaching another poudriere run for 13.1-RELEASE (latest patch level) shortly.

Let me know If you have any questions or additional input.

Thanks!
Chris

Created attachment 236337 [details]
Poudriere run for FreeBSD 13.1-RELEASE

Comment 13 Nuno Teixeira 2022-09-03 20:17:58 UTC

I will commit with small changes:

1. pkg-message: pet portlint

 - replace "/usr/local" with ${PREFIX}
 - replace "/usr/local/share/examples/nscde/" with ${EXAMPLESDIR} that defaults
   to ${PREFIX}/share/examples/${PORTNAME}
 - remove implicit comment:
   "${PREFIX} usually is "/usr/local" unless you intentionally
   modified it for your system."

2. Makefile: BUILD_DEPENDS

Silent configure warnings (bellow):

 - [1] added "xrandr>0:x11/xrandr" to build and run dep list, excluded "xrandr" from USE_XORG
 - [2] use "USES= magick" instead of "magick:run" for builds too

---
[1] configure: WARNING: No xrandr(1) command was found. It is advised to have X11 Server Utils installed.
[2] configure: WARNING: No ImageMagick convert(1) utility found. NsCDE will not be able to take screenshots to file.
[2] configure: WARNING: No ImageMagick import(1) utility found. NsCDE will not be able to take screenshots to file.
---

3. portfmt reformat

Any future changes will be easier since it will no be needed compress diff file :)

Please open this PR again if any change is needed.

Cheers

Comment 14 Nuno Teixeira 2022-09-03 20:22:11 UTC

(...)

4. implement a NLS knob if possible or if program supports it:
https://docs.freebsd.org/en/books/porters-handbook/book/#using-gettext-optional

Doing poudriere testports and then commit.

Comment 15 Nuno Teixeira 2022-09-04 10:47:11 UTC

(...)

5. pkg-message moved to files/pkg-message.in for reprocess:
---
SUB_FILES=      pkg-message
SUB_LIST=       PREFIX=${PREFIX} \
                EXAMPLESDIR=${EXAMPLESDIR}
---

Comment 16 commit-hook 2022-09-04 11:04:05 UTC

A commit in branch main references this bug:

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

commit e37c1a24e09caa00192c86991093e01aa79d0957
Author:     Chris Moerz <freebsd@ny-central.org>
AuthorDate: 2022-09-04 11:01:40 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-09-04 11:02:57 +0000

    x11-wm/nscde: Update to 2.2

    ChangeLog:      https://github.com/NsCDE/NsCDE/releases
    PR:             265830

 x11-wm/nscde/Makefile                              |   350 +-
 x11-wm/nscde/distinfo                              |     6 +-
 .../patch-NsCDE_bin_get__fvwm__infostore (gone)    |    11 -
 x11-wm/nscde/files/patch-NsCDE_bin_getfont (gone)  |    41 -
 .../nscde/files/patch-NsCDE_bin_mkpagemenu (gone)  |    29 -
 x11-wm/nscde/files/patch-NsCDE_bin_nscde (gone)    |    30 -
 .../patch-NsCDE_bin_nscde__colorpicker (gone)      |    13 -
 .../nscde/files/patch-NsCDE_bin_xdowrapper (gone)  |    11 -
 ...patch-NsCDE_config_NsCDE-FrontPanel.conf (gone) |   182 -
 .../patch-NsCDE_config_NsCDE-Main.conf (gone)      |    32 -
 .../files/patch-NsCDE_libexec_Splash.sh (gone)     |    16 -
 .../files/patch-NsCDE_libexec_colormgr (gone)      |    11 -
 .../nscde/files/patch-NsCDE_libexec_fontmgr (gone) |    26 -
 ...patch-NsCDE_libexec_fp__manage__subpanel (gone) |    28 -
 ...ch-NsCDE_libexec_fvwm-modules_FvwmScript (gone) |    43 -
 .../patch-NsCDE_libexec_generate__subpanels (gone) |    13 -
 .../files/patch-NsCDE_libexec_nscde__setup (gone)  |   381 -
 .../patch-NsCDE_libexec_strip__icon__path (gone)   |    21 -
 ...atch-NsCDE_libexec_style__managers.shlib (gone) |    38 -
 ...-NsCDE_libexec_subpanel__menuitem__props (gone) |    21 -
 .../files/patch-NsCDE_libexec_themegen.py (gone)   |    45 -
 ..._config__templates_NsCDE-Functions.local (gone) |    19 -
 ...patch-NsCDE_share_doc_examples_doas.conf (gone) |     8 -
 ...mples_lxsession-integration_desktop.conf (gone) |    11 -
 ...s_mate-session-integration_nscde.desktop (gone) |    11 -
 ...hare_doc_examples_sudo_006__PowerManager (gone) |    19 -
 ...tch-NsCDE_share_doc_examples_sudo_README (gone) |     6 -
 ...mples_xsession-integration_nscde.desktop (gone) |    11 -
 x11-wm/nscde/files/patch-docbook_NsCDE.xml (gone)  |  1141 --
 x11-wm/nscde/files/patch-docbook_NsCDE.xsl (gone)  |    10 -
 .../patch-src_XOverrideFontCursor_Makefile (gone)  |     8 -
 .../files/patch-src_colorpicker_Makefile (gone)    |    10 -
 .../patch-src_pclock-0.13.1_src_Makefile (gone)    |    11 -
 x11-wm/nscde/files/pkg-message.in (new)            |    58 +
 x11-wm/nscde/pkg-message (gone)                    |    27 -
 x11-wm/nscde/pkg-plist                             | 20383 +++++++++----------
 36 files changed, 9817 insertions(+), 13264 deletions(-)

Comment 17 Nuno Teixeira 2022-09-04 11:04:50 UTC

Committed, thanks!