graphics/xpaint: Update to 3.1.4

- Switch to DISTVERSION
- Define LICENSE_FILE
- Use autoreconf as workaround to fix build (not needed in <= 3.1.3)
- Put most SED commands in patches
- Comment patches about what they doing
- Port uses USES=jpeg and not openjpeg* (at the moment)
- Take maintainership

ChangeLog: https://sourceforge.net/projects/sf-xpaint/files/sf-xpaint/

graphics/xpaint/Makefile

@@ -1,45 +1,38 @@
 PORTNAME=	xpaint
-PORTVERSION=	2.9.10.3
-PORTREVISION=	3
+DISTVERSION=	3.1.4
 CATEGORIES=	graphics
-MASTER_SITES=	SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
+MASTER_SITES=	SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Simple paint program
 WWW=		http://sf-xpaint.sourceforge.net/
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:graphics/png \
-		libopenjpeg.so:graphics/openjpeg15 \
-		libtiff.so:graphics/tiff \
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libjbig.so:graphics/jbigkit \
-		libfontconfig.so:x11-fonts/fontconfig \
+		libnetpbm.so:graphics/netpbm \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
 		libXaw3dxft.so:x11-toolkits/libxaw3dxft
-RUN_DEPENDS=	psselect:print/psutils \
-		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash \
+		psselect:print/psutils
 
-GNU_CONFIGURE=	yes
-USES=		ghostscript:run jpeg libtool:build localbase:ldflags \
-		pkgconfig shebangfix tar:bzip2 xorg
+USES=		autoreconf desktop-file-utils gmake jpeg libtool:build \
+		localbase:ldflags pkgconfig shebangfix tar:bzip2 xorg
 USE_XORG=	ice sm x11 xext xft xmu xpm xt
+
 SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
+GNU_CONFIGURE=	yes
+
+# util/Makefile and vxp2ps/Makefile needs it
+BINARY_ALIAS=	make=${GMAKE}
 
-CPPFLAGS+=	-I${LOCALBASE}/include/openjpeg-1.5
-MAKE_ENV+=	RM="${RM}"
-
-post-patch:
-	@${RM} ${WRKSRC}/XPaint.ad
-	@${REINPLACE_CMD} -e 's/-ldl //' \
-		${WRKSRC}/configure ${WRKSRC}/rw/configure
-	@${REINPLACE_CMD} -e '/^LIBTOOL =/s|=.*|= ${LOCALBASE}/bin/libtool|' \
-		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \
-		${WRKSRC}/rw/Makefile.in
-	@${REINPLACE_CMD} -e '/if (!image)/s/return;/return -1;/' \
-		${WRKSRC}/rw/readWriteTGA.c
-
-post-configure:
-	${MAKE} -C ${WRKSRC} clean
+# Do not install libraries
+pre-build:
+	@${REINPLACE_CMD} -e '/^install-exec-am:/s/install-libLTLIBRARIES//' \
+		${WRKSRC}/xpaintrw/Makefile.in
 
 .include <bsd.port.mk>

graphics/xpaint/distinfo

@@ -1,2 +1,3 @@
-SHA256 (xpaint-2.9.10.3.tar.bz2) = 9de0cb99557ea8329391b5d45ad59be080972924258aeb1b3c0c748bab9586c7
-SIZE (xpaint-2.9.10.3.tar.bz2) = 1283725
+TIMESTAMP = 1689277150
+SHA256 (xpaint-3.1.4.tar.bz2) = 6edacc9b011e6ce356c3d989156fc62460e3bfd958856c8f133c5f3589d67851
+SIZE (xpaint-3.1.4.tar.bz2) = 1630009

graphics/xpaint/files/patch-Makefile.am

@@ -0,0 +1,23 @@
+Fix app-defaults install path.
+Fix link to libxaw3dxft path.
+
+--- Makefile.am.orig	2021-01-07 14:18:14 UTC
++++ Makefile.am
+@@ -3,7 +3,7 @@ SHAREDIR = $(prefix)/share/xpaint
+ ## Local Configuration arguments
+ BINDIR = $(prefix)/bin
+ SHAREDIR = $(prefix)/share/xpaint
+-XAPPLOADDIR = /etc/X11/app-defaults
++XAPPLOADDIR = $(prefix)/share/X11/app-defaults
+
+ ## Enable/disable PRINTCAP (for older BSD style printing configuration)
+ ## PRINTCAP = -DPRINTCAP
+@@ -85,7 +85,7 @@ version.h:
+ .PHONY:
+
+ version.h:
+-	rm -f xaw_incdir ; ln -s /usr/include/X11/Xaw3dxft xaw_incdir
++	rm -f xaw_incdir ; ln -s ${LOCALBASE}/include/X11/Xaw3dxft xaw_incdir
+ 	echo "#define XPAINT_VERSION \"$(PACKAGE_VERSION)\"" > version.h
+
+ substads: substads.c

graphics/xpaint/files/patch-configure.ac

@@ -0,0 +1,24 @@
+Do not build with -ldl.
+Fix path to freetype2.
+
+
+--- configure.ac.orig	2021-08-16 08:58:14 UTC
++++ configure.ac
+@@ -36,7 +36,7 @@ if test x"$have_x11" = xyes; then
+ dnl check X11
+ AC_CHECK_LIB([X11], [XOpenDisplay], have_x11="yes")
+ if test x"$have_x11" = xyes; then
+-  AC_SUBST([X_LIBS], ["-lXmu -lXt -lSM -lICE -lXext -lX11 -lXpm -ldl -rdynamic"])
++  AC_SUBST([X_LIBS], ["-lXmu -lXt -lSM -lICE -lXext -lX11 -lXpm -rdynamic"])
+   AC_SUBST([X_CFLAGS], ["-I/usr/include/X11"])
+ else
+   echo "X11 libraries not installed !"
+@@ -317,7 +317,7 @@ AC_PREPROC_IFELSE(
+
+ AC_MSG_CHECKING([location of freetype2 headers])
+ AC_PREPROC_IFELSE(
+-  [AC_LANG_PROGRAM([[#include <freetype2/config/ftheader.h>]])],
++  [AC_LANG_PROGRAM([[#include <freetype2/freetype/config/ftheader.h>]])],
+   [AC_MSG_RESULT([already in path])],
+   [AC_PREPROC_IFELSE(
+     [AC_LANG_PROGRAM([[#include </usr/include/freetype2/freetype/config/ftheader.h>]])],

graphics/xpaint/files/patch-fileBrowser.c

@@ -1,26 +1,22 @@
---- fileBrowser.c.orig	2014-05-08 13:50:48 UTC
+Suppport dirent(3) if defined.
+
+--- fileBrowser.c.orig	2020-09-02 07:24:21 UTC
 +++ fileBrowser.c
-@@ -47,11 +47,7 @@ extern Xaw3dXftData *xaw3dxft_data;
+@@ -48,7 +48,7 @@ extern Xaw3dXftData *xaw3dxft_data;
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
 -#if defined(SYSV) || defined(SVR4) || defined(__CYGWIN__) || defined(__VMS )
++#if HAVE_DIRENT_H
  #include <dirent.h>
--#else
--#include <sys/dir.h>
--#endif
- #include <pwd.h>
-
- #include "rw/rwTable.h"
-@@ -562,11 +558,7 @@ static void 
+ #else
+ #include <sys/dir.h>
+@@ -563,7 +563,7 @@ setCWD(arg_t * arg, char *dir)
  setCWD(arg_t * arg, char *dir)
  {
      DIR *dirp;
 -#if defined(SYSV) || defined(SVR4) || defined(__alpha) || defined(__CYGWIN__)
++#if HAVE_DIRENT_H
      struct dirent *e;
--#else
--    struct direct *e;
--#endif
-     int count = 0, i = 0;
-     int dirCount = 0, fileCount = 0;
-     String *list;
+ #else
+     struct direct *e;

graphics/xpaint/files/patch-main.c

@@ -0,0 +1,23 @@
+The XtGetApplicationResources() function uses the 'resources' array instead
+of the 'options' array to obtain resources.
+
+--- main.c.orig	2020-09-03 07:06:19 UTC
++++ 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},

graphics/xpaint/files/patch-vxp2ps_Makefile

@@ -0,0 +1,25 @@
+Respect compiler and fix DESTDIR path.
+
+--- vxp2ps/Makefile.orig	2021-01-19 08:35:54 UTC
++++ vxp2ps/Makefile
+@@ -3,16 +3,16 @@ vxp2ps: vxp2ps.c
+ all: vxp2ps vxp2tex vxp2dkw
+
+ vxp2ps: vxp2ps.c
+-	gcc vxp2ps.c -o vxp2ps -lm $(CFLAGSEXTRA)
++	$(CC) $(CFLAGS) vxp2ps.c -o vxp2ps -lm $(CFLAGSEXTRA)
+
+ vxp2tex: vxp2tex.c
+-	gcc vxp2tex.c -o vxp2tex -lm
++	$(CC) $(CFLAGS) vxp2tex.c -o vxp2tex -lm
+
+ vxp2dkw: vxp2dkw.c
+-	gcc vxp2dkw.c -o vxp2dkw -lm
++	$(CC) $(CFLAGS) vxp2dkw.c -o vxp2dkw -lm
+
+ install: all
+-	install -c -s vxp2ps vxp2tex vxp2dkw "$(DESTDIR)"/usr/bin
++	install -c -s vxp2ps vxp2tex vxp2dkw $(DESTDIR)$(PREFIX)/bin
+
+ clean:
+ 	rm -f core *~ vxp2ps vxp2tex vxp2dkw

graphics/xpaint/files/patch-xpaintrw_Makefile.am

@@ -0,0 +1,13 @@
+Fix libtool path.
+
+--- xpaintrw/Makefile.am.orig	2023-07-13 21:19:11 UTC
++++ xpaintrw/Makefile.am
+@@ -28,7 +28,7 @@ xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XA
+
+ xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES)
+
+-LIBTOOL = /usr/bin/libtool
++LIBTOOL = ${LOCALBASE}/bin/libtool
+ AM_CFLAGS   = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
+ AM_YFLAGS     = -d
+ CLEANFILES    = 

graphics/xpaint/files/patch-rw_rwTable.c → graphics/xpaint/files/patch-xpaintrw_rwTable.c

@@ -1,6 +1,8 @@
---- rw/rwTable.c.orig	2012-02-08 09:08:02.000000000 +0100
-+++ rw/rwTable.c	2013-09-16 13:27:46.000000000 +0200
-@@ -339,7 +339,7 @@ RWtableGetWriterList()
+Extend support to FreeBSD and OpenBSD.
+
+--- xpaintrw/rwTable.c.orig	2021-01-23 08:03:16 UTC
++++ xpaintrw/rwTable.c
+@@ -294,7 +294,7 @@ RWGetMsg()
  char *
  RWGetMsg()
  {