pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

xpaint: Update to 3.1.2

Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <triaxx%NetBSD.org@localhost>
Pushed By:	frederic
Date:		Wed Feb 10 13:34:43 2021 +0000
Changeset:	d0c8a2efbd1c8612ad4ee08911df8bb6b8aa3270

Modified Files:
	Makefile
Added Files:
	xpaint/DESCR
	xpaint/Makefile
	xpaint/PLIST
	xpaint/distinfo
	xpaint/patches/patch-configure
	xpaint/patches/patch-main.c
	xpaint/patches/patch-util_Makefile
	xpaint/patches/patch-vxp2ps_Makefile
	xpaint/patches/patch-xpaintrw_Makefile.in

Log Message:
xpaint: Update to 3.1.2

This package builds and installs successfully but:
  * Some glitches remains and the program is not fully usable
  * The build step implements an inelegant linking to libXaw3dXft

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

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

diffstat:
 Makefile                                  |   1 +
 xpaint/DESCR                              |   4 +
 xpaint/Makefile                           |  42 +++++++
 xpaint/PLIST                              | 189 ++++++++++++++++++++++++++++++
 xpaint/distinfo                           |  11 ++
 xpaint/patches/patch-configure            |  17 +++
 xpaint/patches/patch-main.c               |  25 ++++
 xpaint/patches/patch-util_Makefile        |  37 ++++++
 xpaint/patches/patch-vxp2ps_Makefile      |  19 +++
 xpaint/patches/patch-xpaintrw_Makefile.in |  15 +++
 10 files changed, 360 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index f6fdba3b1b..63897a3d5d 100644
--- a/Makefile
+++ b/Makefile
@@ -5774,6 +5774,7 @@ SUBDIR+=	xoreos-tools
 SUBDIR+=	xorgxrdp
 SUBDIR+=	xosview
 SUBDIR+=	xournalpp-git
+SUBDIR+=	xpaint
 SUBDIR+=	xpde
 SUBDIR+=	xpdq
 SUBDIR+=	xpi-quick_locale_switcher
diff --git a/xpaint/DESCR b/xpaint/DESCR
new file mode 100644
index 0000000000..b0a48152c9
--- /dev/null
+++ b/xpaint/DESCR
@@ -0,0 +1,4 @@
+XPaint is a color image editing tool which features most standard
+paint program options.  It allows for the editing of multiple images
+simultaneously and supports various formats, including PPM, XBM, TIFF,
+etc.
diff --git a/xpaint/Makefile b/xpaint/Makefile
new file mode 100644
index 0000000000..de943dcd13
--- /dev/null
+++ b/xpaint/Makefile
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.80 2020/03/20 11:57:53 nia Exp $
+
+DISTNAME=	xpaint-3.1.2
+CATEGORIES=	graphics x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	adam%NetBSD.org@localhost
+HOMEPAGE=	http://sf-xpaint.sourceforge.net/
+COMMENT=	Simple paint program
+LICENSE=	gnu-gpl-v3
+
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c
+USE_LIBTOOL=	yes
+USE_TOOLS+=	bash gmake
+
+REPLACE_BASH=	share/bin/imgmerge share/bin/xpaint_ocr
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Linux"
+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|'
+
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/netpbm/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../wip/libXaw3dXft/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xpaint/PLIST b/xpaint/PLIST
new file mode 100644
index 0000000000..da1b873f1a
--- /dev/null
+++ b/xpaint/PLIST
@@ -0,0 +1,189 @@
+@comment $NetBSD$
+bin/imgmerge
+bin/vxp2dkw
+bin/vxp2ps
+bin/vxp2tex
+bin/xpaint
+bin/xpaint_generate_toolicons
+lib/libxpaintrw.la
+man/man1/imgmerge.1
+man/man1/xpaint.1
+share/applications/xpaint.desktop
+share/icons/hicolor/scalable/apps/xpaint.svg
+share/xpaint/XPaintIcon.xpm
+share/xpaint/bin/xpaint_ocr
+share/xpaint/bitmaps/brushbox.cfg
+share/xpaint/bitmaps/brushes/paint0.xpm
+share/xpaint/bitmaps/brushes/paint1.xpm
+share/xpaint/bitmaps/brushes/paint2.xpm
+share/xpaint/bitmaps/brushes/paint3.xpm
+share/xpaint/bitmaps/brushes/paint4.xpm
+share/xpaint/bitmaps/brushes/paint5.xpm
+share/xpaint/bitmaps/brushes/paint6.xpm
+share/xpaint/bitmaps/brushes/paintA.xpm
+share/xpaint/bitmaps/brushes/paintB.xpm
+share/xpaint/bitmaps/brushes/paintC.xpm
+share/xpaint/bitmaps/brushes/paintD.xpm
+share/xpaint/bitmaps/brushes/paintE.xpm
+share/xpaint/bitmaps/brushes/paintF.xpm
+share/xpaint/bitmaps/brushes/paintG.xpm
+share/xpaint/bitmaps/brushes/paintH.xpm
+share/xpaint/bitmaps/brushes/paintI.xpm
+share/xpaint/bitmaps/brushes/paintJ.xpm
+share/xpaint/bitmaps/brushes/paintK.xpm
+share/xpaint/bitmaps/brushes/paintL.xpm
+share/xpaint/bitmaps/brushes/paintM.xpm
+share/xpaint/bitmaps/brushes/paintN.xpm
+share/xpaint/bitmaps/brushes/paintO.xpm
+share/xpaint/bitmaps/brushes/paintP.xpm
+share/xpaint/bitmaps/brushes/paintQ.xpm
+share/xpaint/bitmaps/brushes/paintR.xpm
+share/xpaint/bitmaps/brushes/paintS.xpm
+share/xpaint/bitmaps/brushes/paintT.xpm
+share/xpaint/bitmaps/brushes/paintU.xpm
+share/xpaint/bitmaps/brushes/paintV.xpm
+share/xpaint/bitmaps/brushes/paintW.xpm
+share/xpaint/bitmaps/brushes/paintX.xpm
+share/xpaint/bitmaps/brushes/paintY.xpm
+share/xpaint/bitmaps/brushes/paintZ.xpm
+share/xpaint/bitmaps/elec/busH.xpm
+share/xpaint/bitmaps/elec/busV.xpm
+share/xpaint/bitmaps/elec/capH.xpm
+share/xpaint/bitmaps/elec/capV.xpm
+share/xpaint/bitmaps/elec/coilV.xpm
+share/xpaint/bitmaps/elec/dioV.xpm
+share/xpaint/bitmaps/elec/fetV.xpm
+share/xpaint/bitmaps/elec/grid.xpm
+share/xpaint/bitmaps/elec/op_amp.xpm
+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/svg/arc.svg
+share/xpaint/bitmaps/toolicons/svg/arrow.svg
+share/xpaint/bitmaps/toolicons/svg/box.svg
+share/xpaint/bitmaps/toolicons/svg/brokenline.svg
+share/xpaint/bitmaps/toolicons/svg/brush.svg
+share/xpaint/bitmaps/toolicons/svg/dotPen.svg
+share/xpaint/bitmaps/toolicons/svg/dynPen.svg
+share/xpaint/bitmaps/toolicons/svg/ellipse.svg
+share/xpaint/bitmaps/toolicons/svg/erase.svg
+share/xpaint/bitmaps/toolicons/svg/fill.svg
+share/xpaint/bitmaps/toolicons/svg/filledBox.svg
+share/xpaint/bitmaps/toolicons/svg/filledEllipse.svg
+share/xpaint/bitmaps/toolicons/svg/filledFreehand.svg
+share/xpaint/bitmaps/toolicons/svg/filledPolygon.svg
+share/xpaint/bitmaps/toolicons/svg/filledSpline.svg
+share/xpaint/bitmaps/toolicons/svg/fractalFill.svg
+share/xpaint/bitmaps/toolicons/svg/freehand.svg
+share/xpaint/bitmaps/toolicons/svg/gradientFill.svg
+share/xpaint/bitmaps/toolicons/svg/line.svg
+share/xpaint/bitmaps/toolicons/svg/pencil.svg
+share/xpaint/bitmaps/toolicons/svg/polygon.svg
+share/xpaint/bitmaps/toolicons/svg/selectBox.svg
+share/xpaint/bitmaps/toolicons/svg/selectEllipse.svg
+share/xpaint/bitmaps/toolicons/svg/selectFreehand.svg
+share/xpaint/bitmaps/toolicons/svg/selectPolygon.svg
+share/xpaint/bitmaps/toolicons/svg/selectSpline.svg
+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/c_scripts/3d_curves/helicoid.c
+share/xpaint/c_scripts/3d_curves/lissajous.c
+share/xpaint/c_scripts/3d_surfaces/ellipsoid.c
+share/xpaint/c_scripts/3d_surfaces/genre_g.c
+share/xpaint/c_scripts/3d_surfaces/heart.c
+share/xpaint/c_scripts/3d_surfaces/hyperboloid.c
+share/xpaint/c_scripts/3d_surfaces/polyhedra.c
+share/xpaint/c_scripts/3d_surfaces/torus.c
+share/xpaint/c_scripts/3d_surfaces/trefoil.c
+share/xpaint/c_scripts/3d_surfaces/waves.c
+share/xpaint/c_scripts/batch/batch.c
+share/xpaint/c_scripts/filters/clean.c
+share/xpaint/c_scripts/filters/leftright.c
+share/xpaint/c_scripts/filters/mapping.c
+share/xpaint/c_scripts/filters/merge.c
+share/xpaint/c_scripts/filters/permute.c
+share/xpaint/c_scripts/filters/projective.c
+share/xpaint/c_scripts/filters/rotleft.c
+share/xpaint/c_scripts/filters/rotright.c
+share/xpaint/c_scripts/filters/similarity.c
+share/xpaint/c_scripts/filters/updown.c
+share/xpaint/c_scripts/images/alpha_test.c
+share/xpaint/c_scripts/images/rgb_test.c
+share/xpaint/c_scripts/layers/combine.c
+share/xpaint/c_scripts/procedures/canvas+vxp.c
+share/xpaint/c_scripts/procedures/proc_with_params.c
+share/xpaint/c_scripts/procedures/setmemory.c
+share/xpaint/c_scripts/templates/bird.png
+share/xpaint/c_scripts/templates/cat.jpg
+share/xpaint/c_scripts/templates/script.c
+share/xpaint/help/Help
+share/xpaint/help/Help_es
+share/xpaint/help/Help_fr
+share/xpaint/include/Colormap.h
+share/xpaint/include/ColormapP.h
+share/xpaint/include/DefaultRC.txt.h
+share/xpaint/include/Paint.h
+share/xpaint/include/PaintP.h
+share/xpaint/include/XPaint.ad.h
+share/xpaint/include/Xpaint.h
+share/xpaint/include/Xpaint3d.h
+share/xpaint/include/bitmap.h
+share/xpaint/include/color.h
+share/xpaint/include/crc32.h
+share/xpaint/include/graphic.h
+share/xpaint/include/hash.h
+share/xpaint/include/image.h
+share/xpaint/include/menu.h
+share/xpaint/include/messages.h
+share/xpaint/include/misc.h
+share/xpaint/include/operation.h
+share/xpaint/include/ops.h
+share/xpaint/include/palette.h
+share/xpaint/include/patchlevel.h
+share/xpaint/include/print.h
+share/xpaint/include/protocol.h
+share/xpaint/include/rc.h
+share/xpaint/include/region.h
+share/xpaint/include/rwTable.h
+share/xpaint/include/text.h
+share/xpaint/include/version.h
+share/xpaint/include/xpaint.h
+share/xpaint/include/xpaintrw.h
+share/xpaint/messages/Messages
+share/xpaint/messages/Messages_es
+share/xpaint/messages/Messages_fr
diff --git a/xpaint/distinfo b/xpaint/distinfo
new file mode 100644
index 0000000000..c83f51c14e
--- /dev/null
+++ b/xpaint/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.26 2015/11/03 21:34:35 agc Exp $
+
+SHA1 (xpaint-3.1.2.tar.bz2) = 5b29f3ad5af6e7d66d83c4c9196d1691673c8788
+RMD160 (xpaint-3.1.2.tar.bz2) = 6de728460115268d94e56d15220a39979a4f3340
+SHA512 (xpaint-3.1.2.tar.bz2) = d2a5b15d27462d05f6a240b8ea78860ac83be4f6c3f4e75c11e124be6b50bca7930ca21b881ad7bb4563ebfc3b63191fa7a7cefd14fd8fe8815933ed6eb7c96e
+Size (xpaint-3.1.2.tar.bz2) = 1664785 bytes
+SHA1 (patch-configure) = bc83048e71d8c8e6f95643720d1480fcce4cbc07
+SHA1 (patch-main.c) = 5d764c282b2e8798e3690ff99bea7117a83df4a8
+SHA1 (patch-util_Makefile) = b885c20eaaff01f9a6ee15796f041d5a753c371a
+SHA1 (patch-vxp2ps_Makefile) = 30ef714b8541c551fd520956bda7aab7e90a6d77
+SHA1 (patch-xpaintrw_Makefile.in) = 743442e3acb114698a773c04502787c265a30982
diff --git a/xpaint/patches/patch-configure b/xpaint/patches/patch-configure
new file mode 100644
index 0000000000..08f1557794
--- /dev/null
+++ b/xpaint/patches/patch-configure
@@ -0,0 +1,17 @@
+$NetBSD$
+
+The freetype2 package contains a freetype include subdirectory
+instead of freetype2, at least on NetBSD, FreeBSD, Arch Linux,
+Debian GNU/LInux.
+
+--- configure.orig	2021-01-28 20:39:25.000000000 +0000
++++ configure
+@@ -5981,7 +5981,7 @@ rm -f core conftest.err conftest.$ac_obj
+ $as_echo_n "checking location of freetype2 headers... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <freetype2/config/ftheader.h>
++#include <freetype/config/ftheader.h>
+ int
+ main ()
+ {
diff --git a/xpaint/patches/patch-main.c b/xpaint/patches/patch-main.c
new file mode 100644
index 0000000000..1a0417272f
--- /dev/null
+++ b/xpaint/patches/patch-main.c
@@ -0,0 +1,25 @@
+$NetBSD$
+
+The XtGetApplicationResources() function uses the 'resources' array instead
+of the 'options' array to obtain resources.
+
+--- main.c.orig	2021-01-21 09:18:36.000000000 +0000
++++ main.c
+@@ -146,7 +146,7 @@ static XtResource resources[] =
+     {"winsize", "WinSize", XtRString, sizeof(String),
+      XtOffset(AppInfo *, winsize), XtRImmediate, (XtPointer) "0x0"},
+     {"shareDir", "ShareDir", XtRString, sizeof(String),
+-     XtOffset(AppInfo *, shareDir), XtRImmediate, (XtPointer) NULL},   
++     XtOffset(AppInfo *, shareDir), XtRImmediate, (XtPointer) SHAREDIR},   
+     {"rcFile", "RcFile", XtRString, sizeof(String),
+      XtOffset(AppInfo *, rcFile), XtRImmediate, (XtPointer) NULL},
+     {"help", "Help", XtRString, sizeof(String),
+@@ -206,7 +206,7 @@ static XrmOptionDescRec options[] =
+     {"-hilitcolor", ".hilitcolor", XrmoptionSepArg, (XtPointer) NULL},
+     {"-canvassize", ".canvassize", XrmoptionSepArg, (XtPointer) NULL},
+     {"-winsize", ".winsize", XrmoptionSepArg, (XtPointer) "0x0"},
+-    {"-sharedir", ".shareDir", XrmoptionSepArg, (XtPointer) SHAREDIR},   
++    {"-sharedir", ".shareDir", XrmoptionSepArg, (XtPointer) NULL},   
+     {"-rcfile", ".rcFile", XrmoptionSepArg, (XtPointer) NULL},
+     {"-helpfile", ".helpFile", XrmoptionSepArg, (XtPointer) NULL},
+     {"-msgfile", ".msgFile", XrmoptionSepArg, (XtPointer) NULL},
diff --git a/xpaint/patches/patch-util_Makefile b/xpaint/patches/patch-util_Makefile
new file mode 100644
index 0000000000..dcc08efde5
--- /dev/null
+++ b/xpaint/patches/patch-util_Makefile
@@ -0,0 +1,37 @@
+$NetBSD$
+
+Fix the invalid DESTDIR path containing '/usr' and use the
+pkgsrc macros.
+
+--- util/Makefile.orig	2020-08-09 17:20:37.000000000 +0000
++++ util/Makefile
+@@ -29,21 +29,18 @@ endif
+ install-common:
+ 	@if [ -x pdfconcat ] ; then \
+ 	mkdir -p "$(DESTDIR)"/usr/bin ; \
+-	install -c pdfconcat $(DESTDIR)/usr/bin ; \
+-	echo "install -c pdfconcat $(DESTDIR)/usr/bin" ; \
+-	mkdir -p "$(DESTDIR)"/usr/share/man/man1 ; \
+-	install -c -m 644 pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1 ; \
+-	echo "install -c pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1" ; fi
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin ; \
++	${BSD_INSTALL_PROGRAM} pdfconcat ${DESTDIR}${PREFIX}/bin ; \
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man1 ; \
++	${BSD_INSTALL_MAN} pdfconcat.1 ${DESTDIR}${MANDIR}/man1 ; fi
+ 	@if [ -x ppmtops ] ; then \
+-	mkdir -p "$(DESTDIR)"/usr/bin ; \
+-	install -c ppmtops "$(DESTDIR)"/usr/bin ; \
+-	echo "install -c ppmtops "$(DESTDIR)"/usr/bin" ; fi
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin ; \
++	${BSD_INSTALL_PROGRAM} ppmtops ${DESTDIR}${PREFIX}/bin ; fi
+ 
+ install-pgf:
+ 	@if [ -x pgf2pnm ] ; then \
+-	mkdir -p "$(DESTDIR)"/usr/bin ; \
+-	install -c pgf2pnm "$(DESTDIR)"/usr/bin ; \
+-	echo "install -c pgf2pnm "$(DESTDIR)"/usr/bin" ; fi
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin ; \
++	${BSD_INSTALL_PROGRAM} pgf2pnm ${DESTDIR}${PREFIX}/bin ; fi
+ 
+ ifneq ($(WITH_PGF),no)
+ install: install-common install-pgf
diff --git a/xpaint/patches/patch-vxp2ps_Makefile b/xpaint/patches/patch-vxp2ps_Makefile
new file mode 100644
index 0000000000..35235be61f
--- /dev/null
+++ b/xpaint/patches/patch-vxp2ps_Makefile
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Fix the invalid DESTDIR path containing '/usr' and use the
+pkgsrc macros.
+
+--- vxp2ps/Makefile.orig	2021-01-19 08:35:54.000000000 +0000
++++ vxp2ps/Makefile
+@@ -12,7 +12,10 @@ vxp2dkw: vxp2dkw.c
+ 	gcc vxp2dkw.c -o vxp2dkw -lm
+ 
+ install: all
+-	install -c -s vxp2ps vxp2tex vxp2dkw "$(DESTDIR)"/usr/bin
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} vxp2ps ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} vxp2tex ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} vxp2dkw ${DESTDIR}${PREFIX}/bin
+ 
+ clean:
+ 	rm -f core *~ vxp2ps vxp2tex vxp2dkw
diff --git a/xpaint/patches/patch-xpaintrw_Makefile.in b/xpaint/patches/patch-xpaintrw_Makefile.in
new file mode 100644
index 0000000000..610613b731
--- /dev/null
+++ b/xpaint/patches/patch-xpaintrw_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use libtool from wrappers.
+
+--- xpaintrw/Makefile.in.orig	2021-01-28 20:39:25.000000000 +0000
++++ xpaintrw/Makefile.in
+@@ -325,7 +325,7 @@ EXTRA_DEFINES = -DFEATURE_FRACTAL -DERRO
+ 
+ XAWLIB_DEFINES = -DXAW3D -DXAW3DG -DXAW3DXFT -DXAW_ARROW_SCROLLBARS -DXAW_INTERNATIONALIZATION -I..
+ xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES)
+-LIBTOOL = /usr/bin/libtool
++LIBTOOL = libtool
+ AM_CFLAGS = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
+ AM_YFLAGS = -d
+ CLEANFILES =
Home | Main Index | Thread Index | Old Index