Date: Thu, 15 Feb 2018 10:24:19 +0000 (UTC) From: Johan van Selst <johans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461876 - in head/devel/patch: . files Message-ID: <201802151024.w1FAOJXe029164@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: johans Date: Thu Feb 15 10:24:18 2018 New Revision: 461876 URL: https://svnweb.freebsd.org/changeset/ports/461876 Log: Update to GNU patch 2.7.6 Modified: head/devel/patch/Makefile head/devel/patch/distinfo head/devel/patch/files/patch-lib__Makefile.in head/devel/patch/files/patch-lib__localcharset.c Modified: head/devel/patch/Makefile ============================================================================== --- head/devel/patch/Makefile Thu Feb 15 10:15:46 2018 (r461875) +++ head/devel/patch/Makefile Thu Feb 15 10:24:18 2018 (r461876) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= patch -PORTVERSION= 2.7.5 +PORTVERSION= 2.7.6 CATEGORIES= devel MASTER_SITES= GNU Modified: head/devel/patch/distinfo ============================================================================== --- head/devel/patch/distinfo Thu Feb 15 10:15:46 2018 (r461875) +++ head/devel/patch/distinfo Thu Feb 15 10:24:18 2018 (r461876) @@ -1,2 +1,3 @@ -SHA256 (patch-2.7.5.tar.xz) = fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299 -SIZE (patch-2.7.5.tar.xz) = 727704 +TIMESTAMP = 1518689812 +SHA256 (patch-2.7.6.tar.xz) = ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd +SIZE (patch-2.7.6.tar.xz) = 783756 Modified: head/devel/patch/files/patch-lib__Makefile.in ============================================================================== --- head/devel/patch/files/patch-lib__Makefile.in Thu Feb 15 10:15:46 2018 (r461875) +++ head/devel/patch/files/patch-lib__Makefile.in Thu Feb 15 10:24:18 2018 (r461876) @@ -1,6 +1,6 @@ ---- ./lib/Makefile.in.orig 2012-10-05 10:51:11.000000000 -0400 -+++ ./lib/Makefile.in 2012-10-05 10:51:34.000000000 -0400 -@@ -1372,7 +1372,7 @@ +--- lib/Makefile.in.orig 2018-02-03 13:33:56 UTC ++++ lib/Makefile.in +@@ -1603,7 +1603,7 @@ install-data: install-data-am uninstall: uninstall-am install-am: all-am @@ -9,3 +9,35 @@ installcheck: installcheck-am install-strip: +@@ -1966,11 +1966,11 @@ install-exec-localcharset: all-local + if test $(GLIBC21) = no; then \ + case '$(host_os)' in \ + darwin[56]*) \ +- need_charset_alias=true ;; \ ++ need_charset_alias=false ;; \ + darwin* | cygwin* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ +- need_charset_alias=true ;; \ ++ need_charset_alias=false ;; \ + esac ; \ + else \ + need_charset_alias=false ; \ +@@ -1978,7 +1978,7 @@ install-exec-localcharset: all-local + if $$need_charset_alias; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ + fi ; \ +- if test -f $(charset_alias); then \ ++ if false; then \ + sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ + rm -f $(charset_tmp) ; \ +@@ -1992,7 +1992,7 @@ install-exec-localcharset: all-local + + uninstall-local: uninstall-localcharset + uninstall-localcharset: all-local +- if test -f $(charset_alias); then \ ++ if false; then \ + sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ + if grep '^# Packages using this file: $$' $(charset_tmp) \ + > /dev/null; then \ Modified: head/devel/patch/files/patch-lib__localcharset.c ============================================================================== --- head/devel/patch/files/patch-lib__localcharset.c Thu Feb 15 10:15:46 2018 (r461875) +++ head/devel/patch/files/patch-lib__localcharset.c Thu Feb 15 10:24:18 2018 (r461876) @@ -1,15 +1,15 @@ ---- ./lib/localcharset.c.orig 2012-10-05 10:28:29.000000000 -0400 -+++ ./lib/localcharset.c 2012-10-05 10:38:42.000000000 -0400 -@@ -122,7 +122,7 @@ +--- lib/localcharset.c.orig 2018-02-03 12:42:20 UTC ++++ lib/localcharset.c +@@ -129,7 +129,7 @@ get_charset_aliases (void) cp = charset_aliases; if (cp == NULL) { -#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2) +#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2 || defined __FreeBSD__) + char *malloc_dir = NULL; const char *dir; const char *base = "charset.alias"; - char *file_name; -@@ -249,6 +249,86 @@ +@@ -259,6 +259,86 @@ get_charset_aliases (void) #else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802151024.w1FAOJXe029164>