diff options
author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-01-09 15:15:50 +0000 |
---|---|---|
committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-01-09 15:15:50 +0000 |
commit | c67632ef4997c58dee6ce7a81c6c7b03afc8303d (patch) | |
tree | c79a7754ef80d3754c2b0c8362439936c3f7e352 | |
parent | Switch from hwloc to hwloc2 (diff) |
- Update AzPainter to version 2.1.7, rebase the patches against it
- Drop `post-patch-NLS-off' target, it's not really needed: we simply do
not grab translation files from the staging area in the NLS-less case
Notes
Notes:
svn path=/head/; revision=560870
-rw-r--r-- | graphics/azpainter/Makefile | 7 | ||||
-rw-r--r-- | graphics/azpainter/distinfo | 6 | ||||
-rw-r--r-- | graphics/azpainter/files/patch-Makefile.in | 31 | ||||
-rw-r--r-- | graphics/azpainter/files/patch-desktop_azpainter.desktop (renamed from graphics/azpainter/files/patch-desktop_applications_azpainter.desktop) | 4 |
4 files changed, 14 insertions, 34 deletions
diff --git a/graphics/azpainter/Makefile b/graphics/azpainter/Makefile index 8ad860dee821..e6a4036febdd 100644 --- a/graphics/azpainter/Makefile +++ b/graphics/azpainter/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= azpainter -DISTVERSION= 2.1.7b4 +PORTVERSION= 2.1.7 CATEGORIES= graphics MASTER_SITES= http://azsky2.html.xdomain.jp/arc/ @@ -21,7 +21,7 @@ USE_XORG= x11 xext xi HAS_CONFIGURE= yes CONFIGURE_ARGS= --docdir="${DOCSDIR}" CC="${CC}" -PORTDOCS= AUTHORS ChangeLog README README_ja manual_ja.html +PORTDOCS= AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes @@ -30,9 +30,6 @@ OPTIONS_SUB= yes CONFIGURE_ARGS+= --debug .endif -post-patch-NLS-off: - @${REINPLACE_CMD} -e '/\/tr/d' ${WRKSRC}/Makefile.in - pre-build-NLS-on: cd ${WRKSRC}/translation && ${CC} ${CFLAGS} -o mtrconv mtrconv.c .for lang in en ru uk diff --git a/graphics/azpainter/distinfo b/graphics/azpainter/distinfo index bac592175ff1..458f8782a8c0 100644 --- a/graphics/azpainter/distinfo +++ b/graphics/azpainter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1603578058 -SHA256 (azpainter-2.1.7b4.tar.xz) = ffbda1c348f8caad4c38f07aca7b5aaa79ded94602973be195e8ab90a51cecb7 -SIZE (azpainter-2.1.7b4.tar.xz) = 758652 +TIMESTAMP = 1607121900 +SHA256 (azpainter-2.1.7.tar.xz) = 62e0ce810ada061864c728dbb7dd8c3eb7398566657d758442e9fd33b3db5cb4 +SIZE (azpainter-2.1.7.tar.xz) = 758960 diff --git a/graphics/azpainter/files/patch-Makefile.in b/graphics/azpainter/files/patch-Makefile.in index 325b44b87b36..7ae62ef963f1 100644 --- a/graphics/azpainter/files/patch-Makefile.in +++ b/graphics/azpainter/files/patch-Makefile.in @@ -1,28 +1,11 @@ ---- Makefile.in.orig 2020-10-24 15:00:00 UTC +--- Makefile.in.orig 2020-12-04 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 +@@ -229,7 +229,7 @@ install: + $(inst_file) desktop/*.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps + $(inst_file) desktop/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) +- $(inst_file) GPL3 AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html $(DESTDIR)$(docdir) ++ $(inst_file) AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html $(DESTDIR)$(docdir) - $(instfile) data/*.dat data/*.png data/sckey-2.conf $(DESTDIR)$(datadir) + $(inst_file) data/*.dat data/*.png data/sckey-2.conf $(DESTDIR)$(datadir) diff --git a/graphics/azpainter/files/patch-desktop_applications_azpainter.desktop b/graphics/azpainter/files/patch-desktop_azpainter.desktop index c4c8787dcd12..12da524bfb03 100644 --- a/graphics/azpainter/files/patch-desktop_applications_azpainter.desktop +++ b/graphics/azpainter/files/patch-desktop_azpainter.desktop @@ -1,5 +1,5 @@ ---- desktop/applications/azpainter.desktop.orig 2020-10-24 15:00:00 UTC -+++ desktop/applications/azpainter.desktop +--- desktop/azpainter.desktop.orig 2020-12-04 15:00:00 UTC ++++ desktop/azpainter.desktop @@ -5,5 +5,10 @@ Exec=azpainter %f Icon=azpainter Terminal=false |