xpaint: Uncompress xpm files

[Frédéric Fauberteau <triaxx%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <triaxx%NetBSD.org@localhost>
Pushed By:	frederic
Date:		Wed Feb 10 17:04:42 2021 +0000
Changeset:	6030af5f3df36358ca1c0f5ed7b72ba887a4b91f

Modified Files:
	xpaint/Makefile
	xpaint/PLIST

Log Message:
xpaint: Uncompress xpm files

It seems that the icons are produced by the xpaint_generate_toolicons
script which compresses the resulting XPM files. But the Makefile
installs the compressed (.xpm.gz) files while xpaint wants to open .xpm
files.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6030af5f3df36358ca1c0f5ed7b72ba887a4b91f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xpaint/Makefile |  9 +++++---
 xpaint/PLIST    | 64 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 38 insertions(+), 35 deletions(-)

diffs:
diff --git a/xpaint/Makefile b/xpaint/Makefile
index de943dcd13..98d000a15a 100644
--- a/xpaint/Makefile
+++ b/xpaint/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v3
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c
 USE_LIBTOOL=	yes
-USE_TOOLS+=	bash gmake
+USE_TOOLS+=	bash gmake gunzip
 
 REPLACE_BASH=	share/bin/imgmerge share/bin/xpaint_ocr
 
@@ -23,14 +23,17 @@ REPLACE_BASH=	share/bin/imgmerge share/bin/xpaint_ocr
 BUILDLINK_TRANSFORM+=	rm:-ldl
 .endif
 
-# XXX This substitution is inelegant but respects the logic implemented
-# XXX upstream.
 SUBST_CLASSES+=		ln
 SUBST_STAGE.ln=		pre-configure
 SUBST_MESSAGE.ln=	Linking to libXaw3dXft include directory.
 SUBST_FILES.ln=		Makefile.in
 SUBST_SED.ln=		-e 's|/usr/include/X11/Xaw3dxft|${WRKDIR}/.buildlink/include/X11/Xaw3dxft|'
 
+pre-install:
+	for file in ${WRKSRC}/bitmaps/toolicons/*.xpm.gz ; do \
+		${TOOLS_PLATFORM.gunzip} $$file ; \
+	done
+
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/xpaint/PLIST b/xpaint/PLIST
index da1b873f1a..19478b807d 100644
--- a/xpaint/PLIST
+++ b/xpaint/PLIST
@@ -59,37 +59,37 @@ share/xpaint/bitmaps/elec/resH.xpm
 share/xpaint/bitmaps/elec/resV.xpm
 share/xpaint/bitmaps/elec/tfxV.xpm
 share/xpaint/bitmaps/elec/traV.xpm
-share/xpaint/bitmaps/toolicons/arcOp.xpm.gz
-share/xpaint/bitmaps/toolicons/arrowOp.xpm.gz
-share/xpaint/bitmaps/toolicons/boxOp.xpm.gz
-share/xpaint/bitmaps/toolicons/brokenlineOp.xpm.gz
-share/xpaint/bitmaps/toolicons/brushOp.xpm.gz
-share/xpaint/bitmaps/toolicons/dotPenOp.xpm.gz
-share/xpaint/bitmaps/toolicons/dynPenOp.xpm.gz
-share/xpaint/bitmaps/toolicons/ellipseOp.xpm.gz
-share/xpaint/bitmaps/toolicons/eraseOp.xpm.gz
-share/xpaint/bitmaps/toolicons/fillOp.xpm.gz
-share/xpaint/bitmaps/toolicons/filledBoxOp.xpm.gz
-share/xpaint/bitmaps/toolicons/filledEllipseOp.xpm.gz
-share/xpaint/bitmaps/toolicons/filledFreehandOp.xpm.gz
-share/xpaint/bitmaps/toolicons/filledPolygonOp.xpm.gz
-share/xpaint/bitmaps/toolicons/filledSplineOp.xpm.gz
-share/xpaint/bitmaps/toolicons/fractalFillOp.xpm.gz
-share/xpaint/bitmaps/toolicons/freehandOp.xpm.gz
-share/xpaint/bitmaps/toolicons/gradientFillOp.xpm.gz
-share/xpaint/bitmaps/toolicons/lineOp.xpm.gz
-share/xpaint/bitmaps/toolicons/pencil.xpm.gz
-share/xpaint/bitmaps/toolicons/pencilOp.xpm.gz
-share/xpaint/bitmaps/toolicons/polygonOp.xpm.gz
-share/xpaint/bitmaps/toolicons/selectBoxOp.xpm.gz
-share/xpaint/bitmaps/toolicons/selectEllipseOp.xpm.gz
-share/xpaint/bitmaps/toolicons/selectFreeHandOp.xpm.gz
-share/xpaint/bitmaps/toolicons/selectFreehandOp.xpm.gz
-share/xpaint/bitmaps/toolicons/selectPolygonOp.xpm.gz
-share/xpaint/bitmaps/toolicons/selectSplineOp.xpm.gz
-share/xpaint/bitmaps/toolicons/smearOp.xpm.gz
-share/xpaint/bitmaps/toolicons/splineOp.xpm.gz
-share/xpaint/bitmaps/toolicons/sprayOp.xpm.gz
+share/xpaint/bitmaps/toolicons/arcOp.xpm
+share/xpaint/bitmaps/toolicons/arrowOp.xpm
+share/xpaint/bitmaps/toolicons/boxOp.xpm
+share/xpaint/bitmaps/toolicons/brokenlineOp.xpm
+share/xpaint/bitmaps/toolicons/brushOp.xpm
+share/xpaint/bitmaps/toolicons/dotPenOp.xpm
+share/xpaint/bitmaps/toolicons/dynPenOp.xpm
+share/xpaint/bitmaps/toolicons/ellipseOp.xpm
+share/xpaint/bitmaps/toolicons/eraseOp.xpm
+share/xpaint/bitmaps/toolicons/fillOp.xpm
+share/xpaint/bitmaps/toolicons/filledBoxOp.xpm
+share/xpaint/bitmaps/toolicons/filledEllipseOp.xpm
+share/xpaint/bitmaps/toolicons/filledFreehandOp.xpm
+share/xpaint/bitmaps/toolicons/filledPolygonOp.xpm
+share/xpaint/bitmaps/toolicons/filledSplineOp.xpm
+share/xpaint/bitmaps/toolicons/fractalFillOp.xpm
+share/xpaint/bitmaps/toolicons/freehandOp.xpm
+share/xpaint/bitmaps/toolicons/gradientFillOp.xpm
+share/xpaint/bitmaps/toolicons/lineOp.xpm
+share/xpaint/bitmaps/toolicons/pencil.xpm
+share/xpaint/bitmaps/toolicons/pencilOp.xpm
+share/xpaint/bitmaps/toolicons/polygonOp.xpm
+share/xpaint/bitmaps/toolicons/selectBoxOp.xpm
+share/xpaint/bitmaps/toolicons/selectEllipseOp.xpm
+share/xpaint/bitmaps/toolicons/selectFreeHandOp.xpm
+share/xpaint/bitmaps/toolicons/selectFreehandOp.xpm
+share/xpaint/bitmaps/toolicons/selectPolygonOp.xpm
+share/xpaint/bitmaps/toolicons/selectSplineOp.xpm
+share/xpaint/bitmaps/toolicons/smearOp.xpm
+share/xpaint/bitmaps/toolicons/splineOp.xpm
+share/xpaint/bitmaps/toolicons/sprayOp.xpm
 share/xpaint/bitmaps/toolicons/svg/arc.svg
 share/xpaint/bitmaps/toolicons/svg/arrow.svg
 share/xpaint/bitmaps/toolicons/svg/box.svg
@@ -120,7 +120,7 @@ share/xpaint/bitmaps/toolicons/svg/smear.svg
 share/xpaint/bitmaps/toolicons/svg/spline.svg
 share/xpaint/bitmaps/toolicons/svg/spray.svg
 share/xpaint/bitmaps/toolicons/svg/text.svg
-share/xpaint/bitmaps/toolicons/textOp.xpm.gz
+share/xpaint/bitmaps/toolicons/textOp.xpm
 share/xpaint/c_scripts/3d_curves/helicoid.c
 share/xpaint/c_scripts/3d_curves/lissajous.c
 share/xpaint/c_scripts/3d_surfaces/ellipsoid.c