sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to GNU patch 2.7.6

Browse source
This commit is contained in:
Johan van Selst 2018-02-15 10:24:18 +00:00
parent eee4b8d1a2
commit 79a6ecee9a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=461876
4 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/patch/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= patch PORTNAME= patch
PORTVERSION= 2.7.5 PORTVERSION= 2.7.6
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= GNU MASTER_SITES= GNU

5
devel/patch/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (patch-2.7.5.tar.xz) = fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299 TIMESTAMP = 1518689812
SIZE (patch-2.7.5.tar.xz) = 727704 SHA256 (patch-2.7.6.tar.xz) = ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd
SIZE (patch-2.7.6.tar.xz) = 783756

38
devel/patch/files/patch-lib__Makefile.in
View file

@ -1,6 +1,6 @@
--- ./lib/Makefile.in.orig 2012-10-05 10:51:11.000000000 -0400 --- lib/Makefile.in.orig 2018-02-03 13:33:56 UTC
+++ ./lib/Makefile.in 2012-10-05 10:51:34.000000000 -0400 +++ lib/Makefile.in
@@ -1372,7 +1372,7 @@ @@ -1603,7 +1603,7 @@ install-data: install-data-am
uninstall: uninstall-am uninstall: uninstall-am
install-am: all-am install-am: all-am
@ -9,3 +9,35 @@
installcheck: installcheck-am installcheck: installcheck-am
install-strip: 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 \

10
devel/patch/files/patch-lib__localcharset.c
View file

@ -1,15 +1,15 @@
--- ./lib/localcharset.c.orig 2012-10-05 10:28:29.000000000 -0400 --- lib/localcharset.c.orig 2018-02-03 12:42:20 UTC
+++ ./lib/localcharset.c 2012-10-05 10:38:42.000000000 -0400 +++ lib/localcharset.c
@@ -122,7 +122,7 @@ @@ -129,7 +129,7 @@ get_charset_aliases (void)
cp = charset_aliases; cp = charset_aliases;
if (cp == NULL) 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)
+#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2 || defined __FreeBSD__) +#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2 || defined __FreeBSD__)
char *malloc_dir = NULL;
const char *dir; const char *dir;
const char *base = "charset.alias"; const char *base = "charset.alias";
char *file_name; @@ -259,6 +259,86 @@ get_charset_aliases (void)
@@ -249,6 +249,86 @@
#else #else