Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Nov 2020 09:49:17 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r554698 - in head/graphics/azpainter: . files
Message-ID:  <202011090949.0A99nH6C018994@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Mon Nov  9 09:49:17 2020
New Revision: 554698
URL: https://svnweb.freebsd.org/changeset/ports/554698

Log:
  - Update to version 2.1.7b4, no longer hosted by the ODSN
  - Now uses custom configure script instead of autotools-generated
  - GC obsolete and/or no longer relevant patch files

Added:
  head/graphics/azpainter/files/patch-Makefile.in   (contents, props changed)
  head/graphics/azpainter/files/patch-desktop_applications_azpainter.desktop
     - copied, changed from r554697, head/graphics/azpainter/files/patch-desktop_azpainter.desktop
Deleted:
  head/graphics/azpainter/files/git-2564ee5
  head/graphics/azpainter/files/patch-desktop_azpainter.desktop
  head/graphics/azpainter/files/patch-translation_be
  head/graphics/azpainter/files/patch-translation_zh__CN
Modified:
  head/graphics/azpainter/Makefile
  head/graphics/azpainter/distinfo
  head/graphics/azpainter/pkg-descr
  head/graphics/azpainter/pkg-plist

Modified: head/graphics/azpainter/Makefile
==============================================================================
--- head/graphics/azpainter/Makefile	Mon Nov  9 09:45:51 2020	(r554697)
+++ head/graphics/azpainter/Makefile	Mon Nov  9 09:49:17 2020	(r554698)
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	azpainter
-PORTVERSION=	2.1.5
+DISTVERSION=	2.1.7b4
 CATEGORIES=	graphics
-MASTER_SITES=	OSDN/${PORTNAME}
+MASTER_SITES=	http://azsky2.html.xdomain.jp/arc/
 
-EXTRA_PATCHES=	${FILESDIR}/git-2564ee5:-p1
-
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	16-bit RGB full color painting application
 
@@ -17,29 +15,28 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
-USES=		compiler:c11 desktop-file-utils jpeg localbase \
+USES=		compiler:c11 desktop-file-utils gmake jpeg pkgconfig \
 		shared-mime-info tar:xz xorg
 USE_XORG=	x11 xext xi
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-freetype-dir=${LOCALBASE}/include/freetype2
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--docdir="${DOCSDIR}" CC="${CC}"
 
-PORTDOCS=	AUTHORS ChangeLog NEWS README README_ja manual
+PORTDOCS=	AUTHORS ChangeLog README README_ja manual_ja.html
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--debug
+.endif
+
 post-patch-NLS-off:
-	@${REINPLACE_CMD} -e 's, install-dist_trdataDATA$$,,' \
-		${WRKSRC}/data/Makefile.in
+	@${REINPLACE_CMD} -e '/\/tr/d' ${WRKSRC}/Makefile.in
 
 pre-build-NLS-on:
 	cd ${WRKSRC}/translation && ${CC} ${CFLAGS} -o mtrconv mtrconv.c
-.for lang in be en ru uk zh_CN
+.for lang in en ru uk
 	cd ${WRKSRC}/translation && ./mtrconv ${lang} ../data/tr/${lang}.mtr
 .endfor
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${CP} -a ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/graphics/azpainter/distinfo
==============================================================================
--- head/graphics/azpainter/distinfo	Mon Nov  9 09:45:51 2020	(r554697)
+++ head/graphics/azpainter/distinfo	Mon Nov  9 09:49:17 2020	(r554698)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575067780
-SHA256 (azpainter-2.1.5.tar.xz) = de96d3f33c7de53ff2ad1cd13be98d4bd595c86d1b75e21f509afd56e5cd9dc7
-SIZE (azpainter-2.1.5.tar.xz) = 825892
+TIMESTAMP = 1603578058
+SHA256 (azpainter-2.1.7b4.tar.xz) = ffbda1c348f8caad4c38f07aca7b5aaa79ded94602973be195e8ab90a51cecb7
+SIZE (azpainter-2.1.7b4.tar.xz) = 758652

Added: head/graphics/azpainter/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/azpainter/files/patch-Makefile.in	Mon Nov  9 09:49:17 2020	(r554698)
@@ -0,0 +1,28 @@
+--- Makefile.in.orig	2020-10-24 15:00:00 UTC
++++ Makefile.in
+@@ -4,6 +4,7 @@ prefix := @PREFIX@
+ bindir := @BINDIR@
+ datarootdir := @DATAROOTDIR@
+ datadir := @DATADIR@/@PACKAGE_NAME@
++docdir := @DOCDIR@
+ package_name := @PACKAGE_NAME@
+ package_version := @PACKAGE_VERSION@
+ package_full := $(package_name)-$(package_version)
+@@ -209,7 +210,7 @@ install:
+ 	 $(DESTDIR)$(datarootdir)/icons/hicolor/48x48/apps \
+ 	 $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps \
+ 	 $(DESTDIR)$(datarootdir)/mime/packages \
+-	 $(DESTDIR)$(datadir)/doc \
++	 $(DESTDIR)$(docdir) \
+ 	 $(DESTDIR)$(datadir)/13x13 \
+ 	 $(DESTDIR)$(datadir)/16x16 \
+ 	 $(DESTDIR)$(datadir)/20x20 \
+@@ -227,7 +228,7 @@ install:
+ 	$(instfile) desktop/icons/hicolor/scalable/apps/*.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps
+ 	$(instfile) desktop/mime/packages/azpainter.xml $(DESTDIR)$(datarootdir)/mime/packages
+ 
+-	$(instfile) GPL3 AUTHORS ChangeLog README README_ja manual_ja.html $(DESTDIR)$(datadir)/doc
++	$(instfile) AUTHORS ChangeLog README README_ja manual_ja.html $(DESTDIR)$(docdir)
+ 
+ 	$(instfile) data/*.dat data/*.png data/sckey-2.conf $(DESTDIR)$(datadir)
+ 

Copied and modified: head/graphics/azpainter/files/patch-desktop_applications_azpainter.desktop (from r554697, head/graphics/azpainter/files/patch-desktop_azpainter.desktop)
==============================================================================
--- head/graphics/azpainter/files/patch-desktop_azpainter.desktop	Mon Nov  9 09:45:51 2020	(r554697, copy source)
+++ head/graphics/azpainter/files/patch-desktop_applications_azpainter.desktop	Mon Nov  9 09:49:17 2020	(r554698)
@@ -1,5 +1,5 @@
---- desktop/azpainter.desktop.orig	2017-03-04 23:46:17 UTC
-+++ desktop/azpainter.desktop
+--- desktop/applications/azpainter.desktop.orig	2020-10-24 15:00:00 UTC
++++ desktop/applications/azpainter.desktop
 @@ -5,5 +5,10 @@ Exec=azpainter %f
  Icon=azpainter
  Terminal=false
@@ -9,5 +9,5 @@
 +Comment[pt_BR]=16-bit RGB full color painting application
 +Comment[ru]=16-bit RGB full color painting application
 +Comment[uk]=16-bit RGB full color painting application
- MimeType=application/x-azpainter-apd
- StartupNotify=false
+ MimeType=application/x-azpainter-apd;
+ StartupNotify=true

Modified: head/graphics/azpainter/pkg-descr
==============================================================================
--- head/graphics/azpainter/pkg-descr	Mon Nov  9 09:45:51 2020	(r554697)
+++ head/graphics/azpainter/pkg-descr	Mon Nov  9 09:49:17 2020	(r554698)
@@ -7,4 +7,4 @@ It provides considerable subset of functionality offer
 Adobe Photoshop (particularly, has one of the best support for its native
 PSD format among FOSS) while being very lightweight and blazingly fast.
 
-WWW: http://azsky2.html.xdomain.jp/linux/azpainter.html
+WWW: http://azsky2.html.xdomain.jp/soft/azpainter.html

Modified: head/graphics/azpainter/pkg-plist
==============================================================================
--- head/graphics/azpainter/pkg-plist	Mon Nov  9 09:45:51 2020	(r554697)
+++ head/graphics/azpainter/pkg-plist	Mon Nov  9 09:49:17 2020	(r554698)
@@ -168,7 +168,9 @@ bin/azpainter
 %%DATADIR%%/texture/various/white_circle.png
 %%DATADIR%%/texture/various/x-mark.png
 %%DATADIR%%/theme/black.theme
+%%DATADIR%%/theme/sai.theme
 %%NLS%%%%DATADIR%%/tr/be.mtr
+%%NLS%%%%DATADIR%%/tr/de_DE.mtr
 %%NLS%%%%DATADIR%%/tr/en.mtr
 %%NLS%%%%DATADIR%%/tr/es_ES.mtr
 %%NLS%%%%DATADIR%%/tr/fr.mtr



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011090949.0A99nH6C018994>