Index: branches/2018Q4/graphics/sam2p/Makefile
===================================================================
--- branches/2018Q4/graphics/sam2p/Makefile	(revision 481626)
+++ branches/2018Q4/graphics/sam2p/Makefile	(revision 481627)
@@ -1,48 +1,48 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	sam2p
-PORTVERSION=	0.49.3
+PORTVERSION=	0.49.4
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Converts raster (bitmap) image formats into PS or PDF files
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	zip:archivers/zip \
 		tif22pnm:graphics/tif22pnm
 
-BROKEN_FreeBSD_12=	running make Makedep... error; configure: error: cannot compute depends
-
 #USE_GITHUB=	yes
 GH_ACCOUNT=	pts
 
 USES=		ghostscript:run gmake jpeg:run perl5
+USE_GCC=	yes
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_path_pts_bash="${SH}"
 CONFIGURE_ARGS=	--enable-gif
+MAKE_ENV=	MAKE=gmake
 ALL_TARGET=	${PORTNAME}
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: branches/2018Q4/graphics/sam2p/distinfo
===================================================================
--- branches/2018Q4/graphics/sam2p/distinfo	(revision 481626)
+++ branches/2018Q4/graphics/sam2p/distinfo	(revision 481627)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476179820
-SHA256 (sam2p-0.49.3.tar.gz) = 33b1bf018a19b19c30d41defcb8b20c7cdcbc7ddd7703040c3a54d9cb1fcaaea
-SIZE (sam2p-0.49.3.tar.gz) = 564098
+TIMESTAMP = 1538584194
+SHA256 (sam2p-0.49.4.tar.gz) = 5bc5b5a526bc798315da23b02564d6a1bfea51b364b8b03f76695a833f6d2bed
+SIZE (sam2p-0.49.4.tar.gz) = 497193
Index: branches/2018Q4/graphics/sam2p/files/patch-ps_tiny.c
===================================================================
--- branches/2018Q4/graphics/sam2p/files/patch-ps_tiny.c	(revision 481626)
+++ branches/2018Q4/graphics/sam2p/files/patch-ps_tiny.c	(nonexistent)
@@ -1,13 +0,0 @@
---- ps_tiny.c.orig	2005-02-22 08:22:22.000000000 +0900
-+++ ps_tiny.c	2010-03-19 05:54:19.000000000 +0900
-@@ -1,10 +1,3 @@
--#define DUMMY \
--set -ex; \
--gcc -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused \
--  -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline \
--  -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
--  -Wmissing-declarations ps_tiny.c -o ps_tiny; \
--exit
- /* ps_tiny.c -- read .pin files, write short PostScript code
-  * by pts@fazekas.hu at Sat Aug 24 12:46:14 CEST 2002
-  * -- Sat Aug 24 18:23:08 CEST 2002

Property changes on: branches/2018Q4/graphics/sam2p/files/patch-ps_tiny.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q4/graphics/sam2p/files/patch-pts_lzw.c
===================================================================
--- branches/2018Q4/graphics/sam2p/files/patch-pts_lzw.c	(revision 481626)
+++ branches/2018Q4/graphics/sam2p/files/patch-pts_lzw.c	(nonexistent)
@@ -1,13 +0,0 @@
---- pts_lzw.c.orig	2002-12-12 01:43:08.000000000 +0900
-+++ pts_lzw.c	2010-03-19 05:56:24.000000000 +0900
-@@ -1,10 +1,3 @@
--#define DUMMY \
--set -ex; \
--g++ -DNDEBUG=1 -O3 -ansi -pedantic \
--  -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline \
--  -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
--  -Wmissing-declarations pts_lzw.c -c; \
--exit
- /* pts_lzw.c -- a real, effective implementation of PostScript
-  *   LanguageLevel2 and PDF /LZWEncode and /LZWDecode filters (same as the LZW
-  *   compression used in TIFF raster image files)

Property changes on: branches/2018Q4/graphics/sam2p/files/patch-pts_lzw.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q4/graphics/sam2p/files/patch-pts_defl.c
===================================================================
--- branches/2018Q4/graphics/sam2p/files/patch-pts_defl.c	(revision 481626)
+++ branches/2018Q4/graphics/sam2p/files/patch-pts_defl.c	(nonexistent)
@@ -1,13 +0,0 @@
---- pts_defl.c.orig	2008-08-29 05:16:47.000000000 +0900
-+++ pts_defl.c	2010-03-19 05:54:55.000000000 +0900
-@@ -1,10 +1,3 @@
--#define DUMMY \
--set -ex; \
--"${CC:-gcc}" -DNDEBUG=1 -DPTS_DEFL_MAIN -O3 -ansi \
--  -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline \
--  -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
--  -Wmissing-declarations pts_defl.c -o flateenc; \
--exit
- /*
-  * pts_defl.c -- C source file ZIP compression ripped from linux-2.6.8.1
-  * by pts@fazekas.hu at Tue Jan 18 15:19:06 CET 2005

Property changes on: branches/2018Q4/graphics/sam2p/files/patch-pts_defl.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q4/graphics/sam2p/files/patch-gensh.hpp
===================================================================
--- branches/2018Q4/graphics/sam2p/files/patch-gensh.hpp	(revision 481626)
+++ branches/2018Q4/graphics/sam2p/files/patch-gensh.hpp	(nonexistent)
@@ -1,11 +0,0 @@
---- gensi.hpp.orig	2008-05-27 03:58:43.000000000 +0900
-+++ gensi.hpp	2010-03-19 05:53:15.000000000 +0900
-@@ -252,7 +252,7 @@
-       if (len!=0) block(beg,len,data);
-       block(0,0,data);
-     }
--    inline virtual void first_sub(Sub &sub) const { sub.beg=beg; sub.len=len; };
-+    inline virtual void first_sub(Sub &sub) const { sub.beg=beg; sub.len=len; }
-     inline virtual void next_sub(Sub &sub) const { sub.len=0; }
-     inline char const*getCString() const { return beg; }
-     inline char const*operator()() const { return beg; }

Property changes on: branches/2018Q4/graphics/sam2p/files/patch-gensh.hpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q4/graphics/sam2p/files/patch-configure
===================================================================
--- branches/2018Q4/graphics/sam2p/files/patch-configure	(revision 481626)
+++ branches/2018Q4/graphics/sam2p/files/patch-configure	(revision 481627)
@@ -1,11 +1,15 @@
---- configure.orig	Wed Oct  1 19:19:53 2003
-+++ configure	Sun Jan 11 20:48:06 2004
-@@ -7502,7 +7502,7 @@
+--- configure.orig	2017-09-13 12:09:54 UTC
++++ configure
+@@ -7518,9 +7518,9 @@ fi
+ 
+ rm -f Makedep
  ac_n="${ac_n:-$ECHO_N}"
- echo $ac_n "running make Makedep""... $ac_c" 1>&6
- echo "configure:7504: running make Makedep" >&5
--if >&5 2>&5 make Makedep; then :
-+if >&5 2>&5 gmake Makedep; then :
+-echo $ac_n "running make Makedep.force""... $ac_c" 1>&6
+-echo "configure:7504: running make Makedep.force" >&5
+-if >&5 2>&5 make Makedep.force; then :
++echo $ac_n "running ${MAKE:-make} Makedep.force""... $ac_c" 1>&6
++echo "configure:7504: running ${MAKE:-make} Makedep.force" >&5
++if >&5 2>&5 ${MAKE:-make} Makedep.force; then :
    echo "$as_me:$LINENO: result: ok" >&5
  echo "${ECHO_T}ok" >&6
  
Index: branches/2018Q4/graphics/sam2p/files/patch-gensio.cpp
===================================================================
--- branches/2018Q4/graphics/sam2p/files/patch-gensio.cpp	(revision 481626)
+++ branches/2018Q4/graphics/sam2p/files/patch-gensio.cpp	(revision 481627)
@@ -1,14 +1,14 @@
---- gensio.cpp.orig	Fri Feb  7 02:24:56 2003
-+++ gensio.cpp	Fri Feb  7 02:25:11 2003
-@@ -491,11 +491,7 @@
+--- gensio.cpp.orig	2014-01-19 19:50:35 UTC
++++ gensio.cpp
+@@ -731,11 +731,7 @@ slen_t Filter::FlatD::vi_read(char *to_b
  /* --- */
  
  
 -#if HAVE_lstat_in_sys_stat
 -#  define PTS_lstat lstat
 -#else
  #  define PTS_lstat stat
 -#endif
  
  /** @param fname must start with '/' (dir separator)
   * @return true if file successfully created
Index: branches/2018Q4/graphics/sam2p/files/patch-ps__tiny.c
===================================================================
--- branches/2018Q4/graphics/sam2p/files/patch-ps__tiny.c	(nonexistent)
+++ branches/2018Q4/graphics/sam2p/files/patch-ps__tiny.c	(revision 481627)
@@ -0,0 +1,13 @@
+--- ps_tiny.c.orig	2014-09-16 08:52:28 UTC
++++ ps_tiny.c
+@@ -1,10 +1,3 @@
+-#define DUMMY \
+-set -ex; \
+-gcc -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused \
+-  -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline \
+-  -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
+-  -Wmissing-declarations ps_tiny.c -o ps_tiny; \
+-exit
+ /* ps_tiny.c -- read .pin files, write short PostScript code
+  * by pts@fazekas.hu at Sat Aug 24 12:46:14 CEST 2002
+  * -- Sat Aug 24 18:23:08 CEST 2002

Property changes on: branches/2018Q4/graphics/sam2p/files/patch-ps__tiny.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q4/graphics/sam2p/files/patch-pts__defl.c
===================================================================
--- branches/2018Q4/graphics/sam2p/files/patch-pts__defl.c	(nonexistent)
+++ branches/2018Q4/graphics/sam2p/files/patch-pts__defl.c	(revision 481627)
@@ -0,0 +1,13 @@
+--- pts_defl.c.orig	2014-09-16 08:52:28 UTC
++++ pts_defl.c
+@@ -1,10 +1,3 @@
+-#define DUMMY \
+-set -ex; \
+-"${CC:-gcc}" -DNDEBUG=1 -DPTS_DEFL_MAIN -O3 -ansi \
+-  -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline \
+-  -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
+-  -Wmissing-declarations pts_defl.c -o flateenc; \
+-exit
+ /*
+  * pts_defl.c -- C source file ZIP compression ripped from linux-2.6.8.1
+  * by pts@fazekas.hu at Tue Jan 18 15:19:06 CET 2005

Property changes on: branches/2018Q4/graphics/sam2p/files/patch-pts__defl.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q4/graphics/sam2p/files/patch-pts__lzw.c
===================================================================
--- branches/2018Q4/graphics/sam2p/files/patch-pts__lzw.c	(nonexistent)
+++ branches/2018Q4/graphics/sam2p/files/patch-pts__lzw.c	(revision 481627)
@@ -0,0 +1,13 @@
+--- pts_lzw.c.orig	2014-09-16 08:52:28 UTC
++++ pts_lzw.c
+@@ -1,10 +1,3 @@
+-#define DUMMY \
+-set -ex; \
+-g++ -DNDEBUG=1 -O3 -ansi -pedantic \
+-  -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline \
+-  -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
+-  -Wmissing-declarations pts_lzw.c -c; \
+-exit
+ /* pts_lzw.c -- a real, effective implementation of PostScript
+  *   LanguageLevel2 and PDF /LZWEncode and /LZWDecode filters (same as the LZW
+  *   compression used in TIFF raster image files)

Property changes on: branches/2018Q4/graphics/sam2p/files/patch-pts__lzw.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 481626)
+++ branches/2018Q4	(revision 481627)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r481157-481158,481168,481224,481276