From owner-svn-ports-all@freebsd.org Wed Jun 19 13:52:33 2019 Return-Path: Delivered-To: svn-ports-all@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 52B8915B982A; Wed, 19 Jun 2019 13:52:33 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED5C68E1C0; Wed, 19 Jun 2019 13:52:32 +0000 (UTC) (envelope-from lwhsu@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 C7F7F25534; Wed, 19 Jun 2019 13:52:32 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5JDqWCm037636; Wed, 19 Jun 2019 13:52:32 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5JDqWKL037634; Wed, 19 Jun 2019 13:52:32 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201906191352.x5JDqWKL037634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Wed, 19 Jun 2019 13:52:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504549 - in head/editors/libreoffice: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/editors/libreoffice: . files X-SVN-Commit-Revision: 504549 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ED5C68E1C0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2019 13:52:33 -0000 Author: lwhsu Date: Wed Jun 19 13:52:32 2019 New Revision: 504549 URL: https://svnweb.freebsd.org/changeset/ports/504549 Log: - Remove dependence on devel/patch PR: 238629 Submitted by: mi Modified: head/editors/libreoffice/Makefile head/editors/libreoffice/files/patch-configure Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Wed Jun 19 13:50:41 2019 (r504548) +++ head/editors/libreoffice/Makefile Wed Jun 19 13:52:32 2019 (r504549) @@ -20,7 +20,6 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive- dmake:devel/dmake \ ${LOCALBASE}/bin/gperf:devel/gperf \ mdds>=1.4:devel/mdds \ - gpatch:devel/patch \ ucpp:devel/ucpp \ ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ vigra-config:graphics/vigra \ @@ -253,7 +252,6 @@ CONFIGURE_ARGS= --disable-dependency-tracking \ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ --with-external-tar=${DISTDIR}/${DIST_SUBDIR} \ --with-external-thes-dir=${LOCALBASE}/share/mythes \ - --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --with-os-version=${OSVERSION} \ --with-parallelism=${MAKE_JOBS_NUMBER} \ --with-system-cppunit \ Modified: head/editors/libreoffice/files/patch-configure ============================================================================== --- head/editors/libreoffice/files/patch-configure Wed Jun 19 13:50:41 2019 (r504548) +++ head/editors/libreoffice/files/patch-configure Wed Jun 19 13:52:32 2019 (r504549) @@ -1,4 +1,4 @@ ---- configure.orig 2018-08-03 03:58:40.000000000 +0800 +--- configure 2018-08-03 03:58:40.000000000 +0800 +++ configure 2018-08-10 05:28:52.021925000 +0800 @@ -31735,7 +31735,7 @@ @@ -9,3 +9,10 @@ && test "$with_system_openssl" != "no"; then with_system_openssl=yes SYSTEM_OPENSSL=TRUE +@@ -34402,5 +34412,5 @@ + fi + +-if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then ++if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then + if test -z "$with_gnu_patch"; then + GNUPATCH=$PATCH