print/gv: Assign new maintainer

Fix libXaw3d update issue and housekeeping.

PR:		286231 286082

(cherry picked from commit 9e27b733cceebfed7266a6c753800e5a112871f3)

5 files changed, 35 insertions, 30 deletions

diff --git a/print/gv/Makefile b/print/gv/Makefile
index d6d0ddbc6272..573b5a10f0a3 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,41 +1,37 @@
 PORTNAME=	gv
 PORTVERSION=	3.7.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	print
 MASTER_SITES=	GNU
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mew14930xvi@inbox.lv
 COMMENT=	PostScript and PDF previewer
 WWW=		https://www.gnu.org/software/gv/
 
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libXaw3d.so:x11-toolkits/libXaw3d
 
-USES=		cpe ghostscript:x11 iconv gmake perl5 shebangfix xorg
+USES=		cpe ghostscript:x11 iconv gmake localbase perl5 pkgconfig \
+		shebangfix xorg
 USE_PERL5=	build
-USE_XORG=	xpm ice sm xext xmu x11
+USE_XORG=	ice sm x11 xext xinerama xmu xpm xt
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/X11 \
 			--enable-setenv-code \
-			--enable-SIGCHLD-fallback
+			--enable-SIGCHLD-fallback \
+			ac_cv_lib_iconv_iconv_open=no
 SHEBANG_FILES=	${WRKSRC}/src/gv-update-userconfig.in
 
 INFO=		gv
 CPE_VENDOR=	gnu
 PLIST_FILES=	bin/gv \
 		bin/gv-update-userconfig \
-		%%DATADIR%%/gv_system.ad \
+		${DATADIR}/gv_system.ad \
 		lib/X11/app-defaults/GV \
 		share/man/man1/gv.1.gz \
 		share/man/man1/gv-update-userconfig.1.gz
-PLIST_DIRS=	%%DATADIR%%/safe-gs-workdir
-
-.include <bsd.port.pre.mk>
-
-.if empty(ICONV_LIB)
-CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no
-.endif
+PLIST_DIRS=	${DATADIR}/safe-gs-workdir
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/gv/files/patch-configure b/print/gv/files/patch-configure
index 5ded983f8ee8..fc7be76720ec 100644
--- a/print/gv/files/patch-configure
+++ b/print/gv/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig      2010-05-03 22:02:20.000000000 -0400
-+++ configure   2010-05-03 22:03:40.000000000 -0400
-@@ -4694,7 +4694,7 @@
+--- configure.orig	2013-03-17 11:20:09 UTC
++++ configure
+@@ -11436,7 +11436,7 @@ fi
  
  
  
diff --git a/print/gv/files/patch-src-Makefile.in b/print/gv/files/patch-src-Makefile.in
index 431a8914c843..6086805b235e 100644
--- a/print/gv/files/patch-src-Makefile.in
+++ b/print/gv/files/patch-src-Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2011-11-28 13:19:14.000000000 -0500
-+++ src/Makefile.in	2011-12-06 07:38:23.000000000 -0500
-@@ -595,7 +595,7 @@
+--- src/Makefile.in.orig	2013-03-17 11:20:10 UTC
++++ src/Makefile.in
+@@ -598,7 +598,7 @@ pkgdata_DATA = gv_system.ad $(am__append_1)
  top_srcdir = @top_srcdir@
  bin_SCRIPTS = gv-update-userconfig
  pkgdata_DATA = gv_system.ad $(am__append_1)
@@ -9,3 +9,12 @@
  appdefaults_DATA = ../GV
  EXTRA_DIST = ad2c gv_font_res.dat gv_font_res-I18N_mb.dat gv_layout_res.dat gv-i18n.pl gv_misc_res.dat Aaa_bison.yacc \
             gv_current.xbm gv_doc.xbm gv_empty.xbm gv_even.xbm gv_icon.xbm gv_odd.xbm \
+@@ -1134,7 +1134,7 @@ gv_intern_res_unix.dat :
+ 	@echo ""							>> gv_intern_res_unix.dat
+ 	@echo "GV.gsInterpreter:	gs" >> gv_intern_res_unix.dat
+ 	@echo "GV.gsCmdScanPDF:	gs -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s %s pdf2dsc.ps -c quit" >> gv_intern_res_unix.dat
+-	@echo "GV.gsCmdConvPDF:	gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=pswrite -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat
++	@echo "GV.gsCmdConvPDF:	gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=ps2write -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat
+ 	@echo "GV.gsX11Device:		-sDEVICE=x11" >> gv_intern_res_unix.dat
+ 	@echo "GV.gsX11AlphaDevice:	-sDEVICE=x11 -dTextAlphaBits=4 -dGraphicsAlphaBits=2 -dMaxBitmap=10000000 -dNOPLATFONTS" >> gv_intern_res_unix.dat
+ 	@echo "GV.gsSafeDir:		True" >> gv_intern_res_unix.dat
diff --git a/print/gv/files/patch-src_FileSel.c b/print/gv/files/patch-src_FileSel.c
index 55319ccd4e94..a87b1ced4e99 100644
--- a/print/gv/files/patch-src_FileSel.c
+++ b/print/gv/files/patch-src_FileSel.c
@@ -1,6 +1,6 @@
---- src/FileSel.c.orig	2010-01-16 19:32:22.000000000 -0500
-+++ src/FileSel.c	2010-01-16 19:33:09.000000000 -0500
-@@ -1488,6 +1488,7 @@
+--- src/FileSel.c.orig	2012-04-01 14:43:24 UTC
++++ src/FileSel.c
+@@ -1414,6 +1414,7 @@ static void SetDirectoryView(FileSelectionWidget fs, c
       else          SetIncompleteDirectoryView(fs,cannotopenList);
       chdir(APP_DIR);
       ENDMESSAGE(SetDirectoryView)
diff --git a/print/gv/files/patch-src_callbacks.c b/print/gv/files/patch-src_callbacks.c
index af0f781c6036..aa07510a445c 100644
--- a/print/gv/files/patch-src_callbacks.c
+++ b/print/gv/files/patch-src_callbacks.c
@@ -1,7 +1,7 @@
---- src/callbacks.c.orig	2011-05-03 02:52:57.000000000 -0400
-+++ src/callbacks.c	2011-05-03 02:55:24.000000000 -0400
-@@ -1031,7 +1031,7 @@
-     XtPointer client_data, call_data;
+--- src/callbacks.c.orig	2012-03-29 16:03:49 UTC
++++ src/callbacks.c
+@@ -979,7 +979,7 @@ cb_presentation(Widget w _GL_UNUSED, XtPointer client_
+ cb_presentation(Widget w _GL_UNUSED, XtPointer client_data _GL_UNUSED, XtPointer call_data _GL_UNUSED)
  {
      int pid;
 -    sighandler_t sigold;