Hi ports --
Attached is a simple update to mangl. Changelog is here:
https://github.com/zigalenarcic/mangl/compare/v1.1.2...v1.1.5
If anyone can come up with a more elegant solution for the
mandoc/configure patch, I would welcome that.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/mangl/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 14 Aug 2022 13:16:09 -0000 1.8
+++ Makefile 2 Jul 2024 03:37:48 -0000
@@ -3,24 +3,28 @@ CATEGORIES = sysutils x11
GH_ACCOUNT = zigalenarcic
GH_PROJECT = mangl
-GH_TAGNAME = v1.1.2
+GH_TAGNAME = v1.1.5
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += GL c freetype glfw m util z
+WANTLIB += GL bz2 c freetype glfw m util z
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-LIB_DEPENDS = graphics/glfw
+LIB_DEPENDS = archivers/bzip2 \
+ graphics/glfw
+
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+4,-guic
CONFIGURE_STYLE = simple
USE_GMAKE = Yes
ALL_TARGET = mangl
-MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"
+MAKE_FLAGS = CC="${CC}" FLAGS="${CFLAGS}"
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/mangl/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 14 Aug 2022 13:16:09 -0000 1.6
+++ distinfo 2 Jul 2024 03:37:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (mangl-1.1.2.tar.gz) = qPafMNLb3a/7nHZmaXOa0Mg41n6V14BvfO4zK7ME3Hs=
-SIZE (mangl-1.1.2.tar.gz) = 1985296
+SHA256 (mangl-1.1.5.tar.gz) = i7uttm0csw1+kU5bcZk5l+Z8WRA8VchgFBDu2jUGIVc=
+SIZE (mangl-1.1.5.tar.gz) = 1994968
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/sysutils/mangl/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 29 Jun 2022 13:37:17 -0000 1.5
+++ patches/patch-Makefile 2 Jul 2024 03:37:48 -0000
@@ -1,4 +1,5 @@
Remove hardcoded optimization flags.
+Remove a warning flag that clang doesn't understand.
Index: Makefile
--- Makefile.orig
@@ -6,17 +7,25 @@ Index: Makefile
@@ -1,6 +1,6 @@
include mandoc/Makefile.local
--CFLAGS = -g -O2 -Wall $(shell pkg-config --cflags zlib gl freetype2 glfw3)
-+CCFLAGS += -Wall $(shell pkg-config --cflags zlib gl freetype2 glfw3)
- LDFLAGS = -lm $(shell pkg-config --libs zlib gl freetype2 glfw3) ${LDADD}
+-CFLAGS = -g -O2 -Wall -Wno-maybe-uninitialized $(shell pkg-config --cflags zlib gl freetype2 glfw3)
++CFLAGS = $(FLAGS) -Wall $(shell pkg-config --cflags zlib gl freetype2 glfw3)
+ LDFLAGS = -lm $(shell pkg-config --libs zlib gl freetype2 glfw3) ${LDADD} -lbz2
LIBMAN_OBJS = mandoc/man.o \
-@@ -56,7 +56,7 @@ MANGL_SOURCES = mandoc/tree.c \
- main.c
+@@ -66,12 +66,12 @@ sanitizer: mangl
+ install: mangl
+ mkdir -p ${DESTDIR}${BINDIR}
+ mkdir -p ${DESTDIR}${MANDIR}/man1
+- mkdir -p ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/
+- mkdir -p ${DESTDIR}/usr/share/applications/
++ mkdir -p ${DESTDIR}${TRUEPREFIX}/share/icons/hicolor/scalable/apps/
++ mkdir -p ${DESTDIR}${TRUEPREFIX}/share/applications/
+ ${INSTALL_PROGRAM} mangl ${DESTDIR}${BINDIR}
+ ${INSTALL_MAN} mangl.1 ${DESTDIR}${MANDIR}/man1/
+- ${INSTALL_DATA} art/mangl.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/mangl.svg
+- ${INSTALL_DATA} mangl.desktop ${DESTDIR}/usr/share/applications/mangl.desktop
++ ${INSTALL_DATA} art/mangl.svg ${DESTDIR}${TRUEPREFIX}/share/icons/hicolor/scalable/apps/mangl.svg
++ ${INSTALL_DATA} mangl.desktop ${DESTDIR}${TRUEPREFIX}/share/applications/mangl.desktop
- mangl: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(MANGL_SOURCES)
-- $(CC) $(CFLAGS) -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(MANGL_SOURCES) $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(MANGL_SOURCES) $(LDFLAGS)
-
- sanitizer: CFLAGS += -fsanitize=address
- sanitizer: mangl
+ .PHONY: clean
+ clean:
Index: patches/patch-mandoc_configure
===================================================================
RCS file: patches/patch-mandoc_configure
diff -N patches/patch-mandoc_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-mandoc_configure 2 Jul 2024 03:37:48 -0000
@@ -0,0 +1,47 @@
+Force use of less as pager (these tests fail?)
+
+Index: mandoc/configure
+--- mandoc/configure.orig
++++ mandoc/configure
+@@ -349,34 +349,17 @@ fi
+
+ # --- pager ---
+ manual=
+-if [ -n "${BINM_PAGER}" ]; then
+- manual=" (manual)"
+-elif less test-noop.c 1>/dev/null 2>&3; then
+- BINM_PAGER=less
+- echo "tested less: yes" 1>&2
+- echo "tested less: yes" 1>&3
+-else
+- BINM_PAGER=more
+- echo "tested less: no" 1>&2
+- echo "tested less: no" 1>&3
+-fi
++BINM_PAGER=less
++echo "tested less: yes" 1>&2
++echo "tested less: yes" 1>&3
+ echo "selected BINM_PAGER=${BINM_PAGER}${manual}" 1>&2
+ echo "selected BINM_PAGER=${BINM_PAGER}${manual}" 1>&3
+
+ # --- tagging support in the pager ---
+-if ismanual "${BINM_PAGER} -T" LESS_T ${HAVE_LESS_T}; then
+- :
+-elif ${BINM_PAGER} -T /dev/null test-noop.c 1>/dev/null 2>&3; then
+- HAVE_LESS_T=1
+- echo "tested ${BINM_PAGER} -T: yes" 1>&2
+- echo "tested ${BINM_PAGER} -T: yes" 1>&3
+- echo 1>&3
+-else
+- HAVE_LESS_T=0
+- echo "tested ${BINM_PAGER} -T: no" 1>&2
+- echo "tested ${BINM_PAGER} -T: no" 1>&3
+- echo 1>&3
+-fi
++HAVE_LESS_T=1
++echo "tested ${BINM_PAGER} -T: yes" 1>&2
++echo "tested ${BINM_PAGER} -T: yes" 1>&3
++echo 1>&3
+
+ # --- wide character and locale support ---
+ if get_locale; then
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/mangl/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 11 Mar 2022 19:57:40 -0000 1.3
+++ pkg/PLIST 2 Jul 2024 03:37:48 -0000
@@ -1,2 +1,6 @@
@bin bin/mangl
@man man/man1/mangl.1
+share/applications/mangl.desktop
+share/icons/hicolor/scalable/apps/mangl.svg
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
