Hi ports --

Attached is an update to azpainter.

Changelog is here: https://github.com/Symbian9/azpainter/releases/tag/v2.1.6

Big endian fixes by cwen@, who also upstreamed them (they'll go away next 
update).

OK?

~Brian

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/azpainter/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile	7 Dec 2019 02:06:45 -0000	1.1.1.1
+++ Makefile	20 May 2020 14:43:50 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2019/12/07 02:06:45 bcallah Exp $
 
 COMMENT =	full color painting software for illustrations
-DISTNAME =	azpainter-2.1.5
+DISTNAME =	azpainter-2.1.6
 EXTRACT_SUFX =	.tar.xz
 CATEGORIES =	graphics multimedia x11
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += X11 Xext Xi c fontconfig freetype jpeg m png pthread
 WANTLIB += z
 
-MASTER_SITES =	https://osdn.mirror.constant.com/azpainter/71988/
+MASTER_SITES =	https://osdn.mirror.constant.com/azpainter/72797/
 
 LIB_DEPENDS =	graphics/jpeg \
 		graphics/png
@@ -23,9 +23,13 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 		misc/shared-mime-info \
 		x11/gtk+3,-guic
 
-CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	--with-freetype-dir="${X11BASE}/include/freetype2"
-CONFIGURE_ENV =		CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-			LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
+# CONFIGURE_ARGS is not a typo.
+# The configure script is broken.
+CONFIGURE_STYLE =	simple
+CONFIGURE_ARGS =	CC="${CC}"
+
+USE_GMAKE =	Yes
+
+NO_TEST =	Yes
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/azpainter/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	7 Dec 2019 02:06:45 -0000	1.1.1.1
+++ distinfo	20 May 2020 14:43:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (azpainter-2.1.5.tar.xz) = 3pbT8zx95T/yrRzRO+mNS9WVyG0bdeIfUJr9VuXNncc=
-SIZE (azpainter-2.1.5.tar.xz) = 825892
+SHA256 (azpainter-2.1.6.tar.xz) = hj1zmBMBDmXpcSl6Qrw9VqppbWm51Ncapm+LMCx3azw=
+SIZE (azpainter-2.1.6.tar.xz) = 745624
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in	20 May 2020 14:43:50 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Respect CFLAGS.
+
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -11,7 +11,7 @@ package_full := $(package_name)-$(package_version)
+ instfile := install -m 644
+ 
+ CC := @CC@
+-CFLAGS := @CFLAGS@ -pthread -Isrc/include -Imlib/include -I. -DHAVE_CONFIG_H \
++CFLAGS += @CFLAGS@ -pthread -Isrc/include -Imlib/include -I. -DHAVE_CONFIG_H \
+  -DPACKAGE_DATA_DIR=\"$(datadir)\"
+ LDFLAGS := @LDFLAGS@ -pthread
+ LIBS := @LIBS@ -lm
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure	20 May 2020 14:43:50 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Don't hardcode optimization flags.
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -214,8 +214,6 @@ done
+ if test -z "$CFLAGS";then
+ 	if test "$cf_debug" = yes;then
+ 		CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-g"`
+-	else
+-		CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-O2"`
+ 	fi
+ fi
+ 
Index: patches/patch-mlib_Makefile_in
===================================================================
RCS file: patches/patch-mlib_Makefile_in
diff -N patches/patch-mlib_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-mlib_Makefile_in	20 May 2020 14:43:50 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Respect CFLAGS
+
+Index: mlib/Makefile.in
+--- mlib/Makefile.in.orig
++++ mlib/Makefile.in
+@@ -1,7 +1,7 @@
+ # mlib
+ 
+ CC := @CC@
+-CFLAGS := @CFLAGS@ -pthread -Iinclude -I.. -Isrc/private -DHAVE_CONFIG_H
++CFLAGS += @CFLAGS@ -pthread -Iinclude -I.. -Isrc/private -DHAVE_CONFIG_H
+ 
+ TARGET := libmlib.a
+ 
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in	7 Dec 2019 02:06:45 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2019/12/07 02:06:45 bcallah Exp $
-
-No -lrt.
-
-Index: src/Makefile.in
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -478,7 +478,7 @@ top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I../mlib/include -Iinclude -I@freetype_dir@ -DPACKAGE_DATA_DIR=\""$(datadir)/azpainter"\"
- AM_CFLAGS = -pthread
- azpainter_LDADD = ../mlib/libmlib.a \
--  -lX11 -lXext -lfontconfig -lfreetype -lpng -ljpeg -lz -lrt -lm
-+  -lX11 -lXext -lfontconfig -lfreetype -lpng -ljpeg -lz -lm
- 
- azpainter_SOURCES = \
- AppCursor.c \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/azpainter/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST	7 Dec 2019 02:06:45 -0000	1.1.1.1
+++ pkg/PLIST	20 May 2020 14:43:50 -0000
@@ -31,6 +31,13 @@ share/azpainter/brush-2.dat
 share/azpainter/brush/circle1.png
 share/azpainter/brush/ellipse.png
 share/azpainter/coltype.png
+share/azpainter/doc/
+share/azpainter/doc/AUTHORS
+share/azpainter/doc/ChangeLog
+share/azpainter/doc/GPL3
+share/azpainter/doc/README
+share/azpainter/doc/README_ja
+share/azpainter/doc/manual_ja.html
 share/azpainter/grad.dat
 share/azpainter/icon.png
 share/azpainter/palette-2.dat

Reply via email to