From owner-svn-ports-branches@freebsd.org Tue Oct 9 12:13:48 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B6F210CCB30; Tue, 9 Oct 2018 12:13:48 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E3E9B85AB4; Tue, 9 Oct 2018 12:13:47 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D915F11F38; Tue, 9 Oct 2018 12:13:47 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w99CDlgC047894; Tue, 9 Oct 2018 12:13:47 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99CDklh047885; Tue, 9 Oct 2018 12:13:46 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810091213.w99CDklh047885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Tue, 9 Oct 2018 12:13:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r481627 - in branches/2018Q4/graphics/sam2p: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: des X-SVN-Commit-Paths: in branches/2018Q4/graphics/sam2p: . files X-SVN-Commit-Revision: 481627 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2018 12:13:48 -0000 Author: des Date: Tue Oct 9 12:13:46 2018 New Revision: 481627 URL: https://svnweb.freebsd.org/changeset/ports/481627 Log: MFH: r481157 r481158 r481168 r481224 r481276 Fix the build and upgrade to 0.49.4. Approved by: ports-secteam (miwi) Added: branches/2018Q4/graphics/sam2p/files/patch-ps__tiny.c - copied, changed from r481157, head/graphics/sam2p/files/patch-ps__tiny.c branches/2018Q4/graphics/sam2p/files/patch-pts__defl.c - copied, changed from r481157, head/graphics/sam2p/files/patch-pts__defl.c branches/2018Q4/graphics/sam2p/files/patch-pts__lzw.c - copied, changed from r481157, head/graphics/sam2p/files/patch-pts__lzw.c Deleted: branches/2018Q4/graphics/sam2p/files/patch-gensh.hpp branches/2018Q4/graphics/sam2p/files/patch-ps_tiny.c branches/2018Q4/graphics/sam2p/files/patch-pts_defl.c branches/2018Q4/graphics/sam2p/files/patch-pts_lzw.c Modified: branches/2018Q4/graphics/sam2p/Makefile branches/2018Q4/graphics/sam2p/distinfo branches/2018Q4/graphics/sam2p/files/patch-configure branches/2018Q4/graphics/sam2p/files/patch-gensio.cpp Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/graphics/sam2p/Makefile ============================================================================== --- branches/2018Q4/graphics/sam2p/Makefile Tue Oct 9 12:08:01 2018 (r481626) +++ branches/2018Q4/graphics/sam2p/Makefile Tue Oct 9 12:13:46 2018 (r481627) @@ -2,7 +2,7 @@ # $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}/ @@ -13,19 +13,19 @@ COMMENT= Converts raster (bitmap) image formats into P 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= * Modified: branches/2018Q4/graphics/sam2p/distinfo ============================================================================== --- branches/2018Q4/graphics/sam2p/distinfo Tue Oct 9 12:08:01 2018 (r481626) +++ branches/2018Q4/graphics/sam2p/distinfo Tue Oct 9 12:13:46 2018 (r481627) @@ -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 Modified: branches/2018Q4/graphics/sam2p/files/patch-configure ============================================================================== --- branches/2018Q4/graphics/sam2p/files/patch-configure Tue Oct 9 12:08:01 2018 (r481626) +++ branches/2018Q4/graphics/sam2p/files/patch-configure Tue Oct 9 12:13:46 2018 (r481627) @@ -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 Modified: branches/2018Q4/graphics/sam2p/files/patch-gensio.cpp ============================================================================== --- branches/2018Q4/graphics/sam2p/files/patch-gensio.cpp Tue Oct 9 12:08:01 2018 (r481626) +++ branches/2018Q4/graphics/sam2p/files/patch-gensio.cpp Tue Oct 9 12:13:46 2018 (r481627) @@ -1,6 +1,6 @@ ---- 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 /* --- */ Copied and modified: branches/2018Q4/graphics/sam2p/files/patch-ps__tiny.c (from r481157, head/graphics/sam2p/files/patch-ps__tiny.c) ============================================================================== --- head/graphics/sam2p/files/patch-ps__tiny.c Wed Oct 3 12:28:03 2018 (r481157, copy source) +++ branches/2018Q4/graphics/sam2p/files/patch-ps__tiny.c Tue Oct 9 12:13:46 2018 (r481627) @@ -1,5 +1,5 @@ ---- ps_tiny.c.orig 2005-02-22 08:22:22.000000000 +0900 -+++ ps_tiny.c 2010-03-19 05:54:19.000000000 +0900 +--- ps_tiny.c.orig 2014-09-16 08:52:28 UTC ++++ ps_tiny.c @@ -1,10 +1,3 @@ -#define DUMMY \ -set -ex; \ Copied and modified: branches/2018Q4/graphics/sam2p/files/patch-pts__defl.c (from r481157, head/graphics/sam2p/files/patch-pts__defl.c) ============================================================================== --- head/graphics/sam2p/files/patch-pts__defl.c Wed Oct 3 12:28:03 2018 (r481157, copy source) +++ branches/2018Q4/graphics/sam2p/files/patch-pts__defl.c Tue Oct 9 12:13:46 2018 (r481627) @@ -1,5 +1,5 @@ ---- pts_defl.c.orig 2008-08-29 05:16:47.000000000 +0900 -+++ pts_defl.c 2010-03-19 05:54:55.000000000 +0900 +--- pts_defl.c.orig 2014-09-16 08:52:28 UTC ++++ pts_defl.c @@ -1,10 +1,3 @@ -#define DUMMY \ -set -ex; \ Copied and modified: branches/2018Q4/graphics/sam2p/files/patch-pts__lzw.c (from r481157, head/graphics/sam2p/files/patch-pts__lzw.c) ============================================================================== --- head/graphics/sam2p/files/patch-pts__lzw.c Wed Oct 3 12:28:03 2018 (r481157, copy source) +++ branches/2018Q4/graphics/sam2p/files/patch-pts__lzw.c Tue Oct 9 12:13:46 2018 (r481627) @@ -1,5 +1,5 @@ ---- pts_lzw.c.orig 2002-12-12 01:43:08.000000000 +0900 -+++ pts_lzw.c 2010-03-19 05:56:24.000000000 +0900 +--- pts_lzw.c.orig 2014-09-16 08:52:28 UTC ++++ pts_lzw.c @@ -1,10 +1,3 @@ -#define DUMMY \ -set -ex; \