Received: by mail.netbsd.org (Postfix, from userid 605) id 55F8D84D84; Sat, 26 Jun 2021 21:21:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8E05A84C13 for ; Sat, 26 Jun 2021 21:21:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 2C-CUIXroJDF for ; Sat, 26 Jun 2021 21:21:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D06E784D0F for ; Sat, 26 Jun 2021 21:21:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C352AFA95; Sat, 26 Jun 2021 21:21:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1624742492209180" MIME-Version: 1.0 Date: Sat, 26 Jun 2021 21:21:32 +0000 From: "Olaf Seibert" Subject: CVS commit: pkgsrc/x11/XaoS To: pkgsrc-changes@NetBSD.org Reply-To: rhialto@netbsd.org X-Mailer: log_accum Message-Id: <20210626212132.C352AFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1624742492209180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rhialto Date: Sat Jun 26 21:21:32 UTC 2021 Modified Files: pkgsrc/x11/XaoS: Makefile PLIST distinfo Removed Files: pkgsrc/x11/XaoS/patches: patch-aa patch-src_engine_zoom.c Log Message: x11/XaoS: update to version 4.2.1. Lots of changes, the biggest of which is that it now uses Qt5 as GUI toolkit. 4.2 New Features Palette editor, save/load palettes, storing user palettes in the .xpf file. The option 'User formulas' maintains a history of recently used formulas. Fractal info in the Help menu. Batch rendering. Enabled panning in rotate mode. Unified Open and Open Image option. Save Image option moved to Save as. 4.1 New Features Added option to show Cartesian coordinate grid. Custom palette helps visualizing palette before applying changes through slider selectable values now. PNGs exported using 'Save Image' option can be imported back and users can continue zooming on it. 4.0 What's new in 4.0 The user interface is based on Qt, so XaoS has a modern look and feel. Works on macOS Catalina, which broke older versions. Animation rendering has been fixed. Menu entries are now standardized. TrueType text rendering so fonts look nicer and non-Latin alphabets are supported. Hindi, Icelandic, Russian, Serbian and Swedish translations. Several minor updates for the other languages. The language can be set in the View menu now. Lots of bug fixes. Zooming is possible also with the mouse wheel. Mouse cursor has been changed to cross. Iteration number N can be used in user formulas. Lots of source code cleanup and refactoring. It may not be obvious to end users but this will allow us to make better features and more frequent releases in the future. 3.7 There were quite a few bug fixes at this point since 3.6 was released. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 pkgsrc/x11/XaoS/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/XaoS/PLIST cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/XaoS/distinfo cvs rdiff -u -r1.5 -r0 pkgsrc/x11/XaoS/patches/patch-aa cvs rdiff -u -r1.2 -r0 pkgsrc/x11/XaoS/patches/patch-src_engine_zoom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1624742492209180 Content-Disposition: inline Content-Length: 6433 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/XaoS/Makefile diff -u pkgsrc/x11/XaoS/Makefile:1.40 pkgsrc/x11/XaoS/Makefile:1.41 --- pkgsrc/x11/XaoS/Makefile:1.40 Tue Jun 1 09:12:27 2021 +++ pkgsrc/x11/XaoS/Makefile Sat Jun 26 21:21:32 2021 @@ -1,37 +1,49 @@ -# $NetBSD: Makefile,v 1.40 2021/06/01 09:12:27 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2021/06/26 21:21:32 rhialto Exp $ -DISTNAME= xaos-3.6 -PKGREVISION= 2 +DISTNAME= xaos-4.2.1 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xaos/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=xaos-project/} +GITHUB_PROJECT= XaoS +GITHUB_TAG= refs/tags/release-${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://matek.hu/xaos/ COMMENT= Zoomable fractal rendering doodad LICENSE= gnu-gpl-v2 -USE_TOOLS+= gmake msgfmt -USE_PKGLOCALEDIR= YES -GNU_CONFIGURE= YES -INFO_FILES= yes - -SUBST_CLASSES+= paths -SUBST_MESSAGE.paths= Fixing hardcoded paths. -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= configure -SUBST_SED.paths= -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,g' - -INSTALLATION_DIRS= ${PKGINFODIR} - -CHECK_PORTABILITY_SKIP+= help/applehelpconv -CHECK_PORTABILITY_SKIP+= help/.svn/text-base/applehelpconv.svn-base - -LDFLAGS.SunOS+= -liconv - -.include "../../math/gsl/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXt= build -.include "../../x11/libXt/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" +USE_TOOLS+= gmake +USE_LANGUAGES+= c c++ + +SUBST_CLASSES+= strip +SUBST_MESSAGE.strip= Filling in missing path to strip +SUBST_STAGE.strip= post-configure +SUBST_FILES.strip= Makefile +SUBST_SED.strip= -e 's,^STRIP .*=.*,STRIP = ${TOOLS_PLATFORM.strip},' + +SUBST_CLASSES+= path +SUBST_MESSAGE.path= Fixing path to data files +SUBST_STAGE.path= post-configure +SUBST_FILES.path= src/include/config.h +SUBST_SED.path= -e '/^.define DATAPATH/s,".*","${PREFIX}/share/XaoS",' + +WRKSRC= ${WRKDIR}/XaoS-release-${PKGVERSION_NOREV} + +INSTALLATION_DIRS+= ${PREFIX}/bin +INSTALLATION_DIRS+= ${PREFIX}/share/XaoS + +do-configure: + cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake + +# The upstream package has no working install target any more. +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/bin/xaos ${DESTDIR}${PREFIX}/bin/ +.for dir in catalogs examples tutorial + cd ${WRKSRC} && pax -wr ${dir} ${DESTDIR}${PREFIX}/share/XaoS/ +.endfor + cd ${DESTDIR}${PREFIX}/share/XaoS/examples && \ + mv */* . && \ + rmdir 0rfelyus Hubicka Langston Malczak ZKovacs ZsKovacs + +.include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../x11/qt5-qttools/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/XaoS/PLIST diff -u pkgsrc/x11/XaoS/PLIST:1.13 pkgsrc/x11/XaoS/PLIST:1.14 --- pkgsrc/x11/XaoS/PLIST:1.13 Sun Jul 13 09:17:04 2014 +++ pkgsrc/x11/XaoS/PLIST Sat Jun 26 21:21:32 2021 @@ -1,24 +1,17 @@ -@comment $NetBSD: PLIST,v 1.13 2014/07/13 09:17:04 mbalmer Exp $ +@comment $NetBSD: PLIST,v 1.14 2021/06/26 21:21:32 rhialto Exp $ bin/xaos -info/xaos.info -man/man6/xaos.6 share/XaoS/catalogs/README -share/XaoS/catalogs/cesky.cat -share/XaoS/catalogs/deutsch.cat -share/XaoS/catalogs/english.cat -share/XaoS/catalogs/espanhol.cat -share/XaoS/catalogs/francais.cat -share/XaoS/catalogs/italiano.cat -share/XaoS/catalogs/magyar.cat -share/XaoS/catalogs/portuguese.cat -share/XaoS/catalogs/romanian.cat -share/XaoS/doc/AUTHORS -share/XaoS/doc/COPYING -share/XaoS/doc/ChangeLog -share/XaoS/doc/ChangeLog.old -share/XaoS/doc/INSTALL -share/XaoS/doc/NEWS -share/XaoS/doc/TODO +share/XaoS/catalogs/README.i18n +share/XaoS/catalogs/cs.cat +share/XaoS/catalogs/de.cat +share/XaoS/catalogs/en.cat +share/XaoS/catalogs/es.cat +share/XaoS/catalogs/fr.cat +share/XaoS/catalogs/hu.cat +share/XaoS/catalogs/it.cat +share/XaoS/catalogs/pt.cat +share/XaoS/catalogs/ro.cat +share/XaoS/catalogs/ru.cat share/XaoS/examples/0rfel1.xpf share/XaoS/examples/0rfel2.xpf share/XaoS/examples/2spirals.xpf @@ -190,7 +183,6 @@ share/XaoS/examples/ufo.xpf share/XaoS/examples/warriormask.xpf share/XaoS/examples/whisp.xpf share/XaoS/examples/zsigapro.xpf -share/XaoS/help/xaos.hlp share/XaoS/tutorial/3dtutor.xaf share/XaoS/tutorial/Bclosing.xaf share/XaoS/tutorial/Bintro.xaf @@ -218,6 +210,7 @@ share/XaoS/tutorial/head.xhf share/XaoS/tutorial/incolor.xaf share/XaoS/tutorial/innew.xhf share/XaoS/tutorial/intro.xaf +share/XaoS/tutorial/iter.xaf share/XaoS/tutorial/julia.xaf share/XaoS/tutorial/keys.xhf share/XaoS/tutorial/line1.xhf @@ -225,6 +218,7 @@ share/XaoS/tutorial/magnet.xaf share/XaoS/tutorial/mset.xaf share/XaoS/tutorial/msetren.xaf share/XaoS/tutorial/new30.xaf +share/XaoS/tutorial/new40.xaf share/XaoS/tutorial/newton.xaf share/XaoS/tutorial/octo.xaf share/XaoS/tutorial/other.xaf @@ -245,11 +239,3 @@ share/XaoS/tutorial/tree.xhf share/XaoS/tutorial/trice.xaf share/XaoS/tutorial/truecol.xaf share/XaoS/tutorial/truecol.xhf -share/locale/cs/LC_MESSAGES/xaos.mo -share/locale/de/LC_MESSAGES/xaos.mo -share/locale/es/LC_MESSAGES/xaos.mo -share/locale/fr/LC_MESSAGES/xaos.mo -share/locale/hu/LC_MESSAGES/xaos.mo -share/locale/it/LC_MESSAGES/xaos.mo -share/locale/pt/LC_MESSAGES/xaos.mo -share/locale/ro/LC_MESSAGES/xaos.mo Index: pkgsrc/x11/XaoS/distinfo diff -u pkgsrc/x11/XaoS/distinfo:1.19 pkgsrc/x11/XaoS/distinfo:1.20 --- pkgsrc/x11/XaoS/distinfo:1.19 Tue Dec 29 23:50:14 2015 +++ pkgsrc/x11/XaoS/distinfo Sat Jun 26 21:21:32 2021 @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.19 2015/12/29 23:50:14 dholland Exp $ +$NetBSD: distinfo,v 1.20 2021/06/26 21:21:32 rhialto Exp $ -SHA1 (xaos-3.6.tar.gz) = 0c68d25c4f9c8eaf557e37d9e4586a04ab56d7a0 -RMD160 (xaos-3.6.tar.gz) = 4cfe8e7f5b98d28cd320f9ab21a9c2d76d122133 -SHA512 (xaos-3.6.tar.gz) = 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 -Size (xaos-3.6.tar.gz) = 2040707 bytes -SHA1 (patch-aa) = b7f9bf3bf002cf43808e5cadf95c3418de0aec12 -SHA1 (patch-src_engine_zoom.c) = 50cc7d2ee805fcd5248f8696e53d9c97ddc689db +SHA1 (xaos-4.2.1.tar.gz) = eab7e4e6786ec0d8622c7b328223a8d1b786c8dc +RMD160 (xaos-4.2.1.tar.gz) = 8ddff5c13e22db46acba0ff04a0b0a8a7cb7edca +SHA512 (xaos-4.2.1.tar.gz) = 58aa2c41d1171d4c8fa684707f4fc7619ab5f23cc902358d8bc3303fdd48b26cefe7d54dbf68a4aba9345a0ca97b752b185db19b67caa8b5e9dba50a8b6ad918 +Size (xaos-4.2.1.tar.gz) = 10916985 bytes --_----------=_1624742492209180--