svn commit: r504549 - in head/editors/libreoffice: . files

[Li-Wen Hsu]

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