Hi Stuart,
yes, it will definitely work for me. Going ahead with it Tomorrow.
thanks,
Sebastian
On Wed, Feb 11, 2026 at 2:47 PM Stuart Henderson <stu@spacehopper.org> wrote:
On 2026/02/11 14:32, Sebastian Reitenbach wrote:
> Hi,
>
> as what the subject says, reworked the Makefile a bit, only pointing to GitHub,
> as well as most importantly the post-install: target.
> For some reason, the example config files were installed twice, so only install them once, and
> under share/examples/uncrustify, instead of share/doc/uncrustify/examples.
>
> Any comments, test reports etc. or even OK welcome.
>
> cheers,
> Sebastian
The distfile related changes are suboptimal, if there is a proper
uploaded release tarball, use that rather than autogenerated
git-archive.
(Also you can't change the contents of a distfile without renaming,
it breaks things for bulk builds, so you need to use the special
DISTFILES syntax to rename it).
How about this instead? Or drop the fallback SITES if you like,
but they both have the same files and it's nice not to rely on
only github if there's an alternative.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/uncrustify/Makefile,v
diff -u -p -r1.34 Makefile
--- Makefile 8 Feb 2026 15:45:58 -0000 1.34
+++ Makefile 11 Feb 2026 13:46:16 -0000
@@ -4,9 +4,13 @@ V = 0.82.0
DISTNAME = uncrustify-$V
WRKDIST = ${WRKDIR}/uncrustify-${DISTNAME}
+REVISION = 0
+
CATEGORIES = textproc devel
-HOMEPAGE = https://uncrustify.sourceforge.net/
+HOMEPAGE = https://github.com/uncrustify/uncrustify/
+
+MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
# GPLv2
PERMIT_PACKAGE = Yes
@@ -24,7 +28,7 @@ MODULES = devel/cmake \
MODPY_RUNDEP = No
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/uncrustify/
- ${INSTALL_DATA} ${WRKSRC}/etc/*.cfg ${PREFIX}/share/uncrustify/
+ mv ${PREFIX}/share/doc/uncrustify/examples \
+ ${PREFIX}/share/examples/uncrustify
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/uncrustify/pkg/PLIST,v
diff -u -p -r1.7 PLIST
--- pkg/PLIST 11 Mar 2022 20:03:34 -0000 1.7
+++ pkg/PLIST 11 Feb 2026 13:46:16 -0000
@@ -7,39 +7,21 @@ share/doc/uncrustify/COPYING
share/doc/uncrustify/ChangeLog
share/doc/uncrustify/HELP
share/doc/uncrustify/README.md
-share/doc/uncrustify/examples/
-share/doc/uncrustify/examples/MS-calling_conventions.cfg
-share/doc/uncrustify/examples/amxmodx.cfg
-share/doc/uncrustify/examples/ben.cfg
-share/doc/uncrustify/examples/ben2.cfg
-share/doc/uncrustify/examples/d.cfg
-share/doc/uncrustify/examples/defaults.cfg
-share/doc/uncrustify/examples/freebsd.cfg
-share/doc/uncrustify/examples/gnu-indent.cfg
-share/doc/uncrustify/examples/klaus.cfg
-share/doc/uncrustify/examples/kr-indent.cfg
-share/doc/uncrustify/examples/linux-indent.cfg
-share/doc/uncrustify/examples/linux.cfg
-share/doc/uncrustify/examples/mono.cfg
-share/doc/uncrustify/examples/msvc.cfg
-share/doc/uncrustify/examples/objc.cfg
-share/doc/uncrustify/examples/sun.cfg
-share/doc/uncrustify/examples/xsupplicant.cfg
-share/uncrustify/
-share/uncrustify/MS-calling_conventions.cfg
-share/uncrustify/amxmodx.cfg
-share/uncrustify/ben.cfg
-share/uncrustify/ben2.cfg
-share/uncrustify/d.cfg
-share/uncrustify/defaults.cfg
-share/uncrustify/freebsd.cfg
-share/uncrustify/gnu-indent.cfg
-share/uncrustify/klaus.cfg
-share/uncrustify/kr-indent.cfg
-share/uncrustify/linux-indent.cfg
-share/uncrustify/linux.cfg
-share/uncrustify/mono.cfg
-share/uncrustify/msvc.cfg
-share/uncrustify/objc.cfg
-share/uncrustify/sun.cfg
-share/uncrustify/xsupplicant.cfg
+share/examples/uncrustify/
+share/examples/uncrustify/MS-calling_conventions.cfg
+share/examples/uncrustify/amxmodx.cfg
+share/examples/uncrustify/ben.cfg
+share/examples/uncrustify/ben2.cfg
+share/examples/uncrustify/d.cfg
+share/examples/uncrustify/defaults.cfg
+share/examples/uncrustify/freebsd.cfg
+share/examples/uncrustify/gnu-indent.cfg
+share/examples/uncrustify/klaus.cfg
+share/examples/uncrustify/kr-indent.cfg
+share/examples/uncrustify/linux-indent.cfg
+share/examples/uncrustify/linux.cfg
+share/examples/uncrustify/mono.cfg
+share/examples/uncrustify/msvc.cfg
+share/examples/uncrustify/objc.cfg
+share/examples/uncrustify/sun.cfg
+share/examples/uncrustify/xsupplicant.cfg
No comments:
Post a Comment