Hi ports --
Attached is an update to azpainter. The software works fine. My primary
question is that they moved from make to a configure script that
generates a ninja file, and I was wondering if there was a better way to
handle building with ninja outside of cmake/meson.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/azpainter/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 24 Apr 2023 11:40:43 -0000 1.6
+++ Makefile 30 Jul 2023 00:22:24 -0000
@@ -1,10 +1,9 @@
-V = 3.0.4
+V = 3.0.6
COMMENT = full color painting software for illustrations
DISTNAME = azpainter-v${V}
PKGNAME = azpainter-${V}
EXTRACT_SUFX = .tar.bz2
CATEGORIES = graphics multimedia x11
-REVISION = 0
HOMEPAGE = http://azsky2.html.xdomain.jp/
MAINTAINER = Brian Callahan <[email protected]>
@@ -13,7 +12,7 @@ MAINTAINER = Brian Callahan <bcallah@ope
PERMIT_PACKAGE = Yes
WANTLIB += X11 Xcursor Xext Xi c fontconfig freetype iconv jpeg
-WANTLIB += m png pthread tiff webp z
+WANTLIB += m png pthread sharpyuv tiff webp z
MASTER_SITES = https://gitlab.com/azelpg/azpainter/-/archive/v${V}/
@@ -21,6 +20,9 @@ MASTER_SITES = https://gitlab.com/azelpg
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
+# Uses ninja as of 3.0.6, see build and install targets
+BUILD_DEPENDS = devel/ninja
+
LIB_DEPENDS = converters/libiconv \
graphics/jpeg \
graphics/libwebp \
@@ -33,15 +35,19 @@ RUN_DEPENDS = devel/desktop-file-utils \
# CONFIGURE_ARGS is not a typo.
# The configure script is broken.
CONFIGURE_STYLE = simple
-CONFIGURE_ARGS = CC="${CC}"
+CONFIGURE_ARGS = CC="${CC}" CFLAGS="${CFLAGS}"
CFLAGS += -std=gnu11
-USE_GMAKE = Yes
-
NO_TEST = Yes
do-gen:
sed -i "s,%LOCALBASE%,${LOCALBASE},g" ${WRKSRC}/src/main.c
+
+do-build:
+ cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV} ninja -v
+
+do-install:
+ cd ${WRKSRC}/build && ninja install
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/azpainter/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 16 Mar 2022 01:44:05 -0000 1.3
+++ distinfo 30 Jul 2023 00:22:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (azpainter-v3.0.4.tar.bz2) = o8g4Kt87ZP4Mgl/VYHUoag5OJ+QXL+VhcWeVXxO+5qU=
-SIZE (azpainter-v3.0.4.tar.bz2) = 986326
+SHA256 (azpainter-v3.0.6.tar.bz2) = rJW6YtqQP+rrAHRr0Fg/pLMXKYfX4UhVFPVFa5MZYMQ=
+SIZE (azpainter-v3.0.6.tar.bz2) = 991153
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 16 Mar 2022 01:44:05 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Respect CFLAGS.
-
-Index: Makefile.in
---- Makefile.in.orig
-+++ Makefile.in
-@@ -15,7 +15,7 @@ inst_dir := install -m 755 -d
- inst_file := install -m 644
-
- CC := @CC@
--CFLAGS := @CFLAGS@ -pthread -Isrc/include -Imlk/include -I. -DHAVE_CONFIG_H
-+CFLAGS += @CFLAGS@ -pthread -Isrc/include -Imlk/include -I. -DHAVE_CONFIG_H
- LDFLAGS := @LDFLAGS@ -pthread
- LIBS := @LIBS@ -lm
-
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/azpainter/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure 20 Oct 2022 20:57:02 -0000 1.4
+++ patches/patch-configure 30 Jul 2023 00:22:24 -0000
@@ -1,36 +1,14 @@
-Don't hardcode optimization flags.
-Add OpenBSD to supported OS list.
+Remove hardcoded -O2
Index: configure
--- configure.orig
+++ configure
-@@ -274,7 +274,7 @@ if test -z "$CFLAGS";then
+@@ -158,8 +158,6 @@ done
+ if test -z "$CFLAGS";then
if test "$cf_debug" = yes;then
- CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-g -Wall"`
- else
-- CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-O2 -Wall"`
-+ CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-Wall"`
+ CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-g"`
+- else
+- CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-O2"`
fi
fi
-@@ -293,6 +293,11 @@ elif test "$tmp1" = FreeBSD;then
- cf_make=gmake
- CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
- LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
-+elif test "$tmp1" = OpenBSD;then
-+ cf_os=openbsd
-+ cf_make=gmake
-+ CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
-+ LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
- fi
-
- # dir
-@@ -349,7 +354,7 @@ fc_check_sharedlib "iconv"
- fc_check_funclink rt "clock_gettime"
-
- fc_check_lib libpng "libpng" "" "-lpng -lz" "png.h" "" "libpng-dev or libpng-devel or libpng or png"
--fc_check_lib zlib "zlib" "" "" "zlib.h" "" "zlib1g-dev or zlib-devel or zlib"
-+fc_check_lib zlib "zlib" "" "-lz" "zlib.h" "" "zlib1g-dev or zlib-devel or zlib"
- fc_check_lib libjpeg "libjpeg" "" "-ljpeg" "stdio.h jpeglib.h" "" "libjpeg-dev or libjpeg-devel or libjpeg-turbo or jpeg-turbo"
- fc_check_lib libtiff "libtiff-4" "" "-ltiff" "tiff.h" "" "libtiff-dev or libtiff-devel or libtiff or tiff"
- fc_check_lib libwebp "libwebp" "" "-lwebp" "webp/decode.h" "" "libwebp-dev or libwebp-devel or libwebp or webp"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/azpainter/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 16 Mar 2022 01:44:05 -0000 1.4
+++ pkg/PLIST 30 Jul 2023 00:22:24 -0000
@@ -113,10 +113,11 @@ share/azpainter3/tr/ja.mtr
share/azpainter3/tr/pt_BR.mtr
share/azpainter3/tr/zh_CN.mtr
share/doc/azpainter/
-share/doc/azpainter/ChangeLog
-share/doc/azpainter/GPL3
+share/doc/azpainter/COPYING
share/doc/azpainter/ReadMe_en
share/doc/azpainter/ReadMe_ja
+share/doc/azpainter/about_mlk_en.txt
+share/doc/azpainter/about_mlk_ja.txt
share/doc/azpainter/manual_ja.html
share/icons/hicolor/48x48/apps/application-x-azpainter-apd.png
share/icons/hicolor/48x48/apps/azpainter.png
