Index: head/devel/patch/Makefile =================================================================== --- head/devel/patch/Makefile (revision 516963) +++ head/devel/patch/Makefile (revision 516964) @@ -1,21 +1,36 @@ # Created by: ache # $FreeBSD$ PORTNAME= patch PORTVERSION= 2.7.6 +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= GNU +MASTER_SITES= GNU DEBIAN_POOL:dp +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${PORTNAME}_${PORTVERSION}-6.debian${EXTRACT_SUFX}:dp MAINTAINER= danfe@FreeBSD.org COMMENT= GNU patch utility -LICENSE= GPLv3 +LICENSE= GPLv3+ +EXTRA_PATCHES= ${WRKDIR}/debian/patches/[^0]*.patch \ + ${WRKDIR}/debian/patches/0*.patch +PATCH_STRIP= -p1 + +TEST_DEPENDS= bash:shells/bash + USES= cpe charsetfix gmake tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g CPE_VENDOR= gnu +TEST_TARGET= check + PLIST_FILES= bin/gpatch man/man1/gpatch.1.gz + +post-patch: + ${REINPLACE_CMD} -e '/^SHELL =/s,@SHELL@,bash,' \ + ${WRKSRC}/tests/Makefile.in .include Index: head/devel/patch/distinfo =================================================================== --- head/devel/patch/distinfo (revision 516963) +++ head/devel/patch/distinfo (revision 516964) @@ -1,3 +1,5 @@ TIMESTAMP = 1518689812 SHA256 (patch-2.7.6.tar.xz) = ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd SIZE (patch-2.7.6.tar.xz) = 783756 +SHA256 (patch_2.7.6-6.debian.tar.xz) = 75ea94b265763b65005381f1eceeaf3351a70ec5c3243bc161d702776414db02 +SIZE (patch_2.7.6-6.debian.tar.xz) = 14464 Index: head/devel/patch/files/patch-lib__Makefile.in =================================================================== --- head/devel/patch/files/patch-lib__Makefile.in (revision 516963) +++ head/devel/patch/files/patch-lib__Makefile.in (revision 516964) @@ -1,43 +1,43 @@ ---- lib/Makefile.in.orig 2018-02-03 13:33:56 UTC -+++ lib/Makefile.in +--- ./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 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + @$(MAKE) $(AM_MAKEFLAGS) install-data-am 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 \ Index: head/devel/patch/files/patch-lib__localcharset.c =================================================================== --- head/devel/patch/files/patch-lib__localcharset.c (revision 516963) +++ head/devel/patch/files/patch-lib__localcharset.c (revision 516964) @@ -1,98 +1,98 @@ ---- lib/localcharset.c.orig 2018-02-03 12:42:20 UTC -+++ lib/localcharset.c +--- ./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"; @@ -259,6 +259,86 @@ get_charset_aliases (void) #else +# if defined __FreeBSD__ + /* To avoid the trouble of installing a file that is shared by many + GNU packages -- many packaging systems have problems with this --, + simply inline the aliases here. */ + cp = "US-ASCII" "\0" "ASCII" "\0" + "la_LN.ASCII" "\0" "ASCII" "\0" + "lt_LN.ASCII" "\0" "ASCII" "\0" + "da_DK.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "da_DK.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "de_AT.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "de_AT.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "de_CH.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "de_CH.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "de_DE.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "de_DE.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "en_AU.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "en_AU.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "en_CA.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "en_CA.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "en_GB.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "en_GB.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "en_US.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "en_US.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "es_ES.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "es_ES.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "fi_FI.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "fi_FI.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "fr_BE.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "fr_BE.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "fr_CA.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "fr_CA.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "fr_CH.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "fr_CH.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "fr_FR.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "fr_FR.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "is_IS.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "is_IS.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "it_CH.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "it_CH.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "it_IT.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "it_IT.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "la_LN.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "la_LN.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "lt_LN.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "lt_LN.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "nl_BE.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "nl_BE.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "nl_NL.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "nl_NL.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "no_NO.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "no_NO.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "pt_PT.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "pt_PT.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "sv_SE.ISO_8859-1" "\0" "ISO-8859-1" "\0" + "sv_SE.DIS_8859-15" "\0" "ISO-8859-15" "\0" + "cs_CZ.ISO_8859-2" "\0" "ISO-8859-2" "\0" + "hr_HR.ISO_8859-2" "\0" "ISO-8859-2" "\0" + "hu_HU.ISO_8859-2" "\0" "ISO-8859-2" "\0" + "la_LN.ISO_8859-2" "\0" "ISO-8859-2" "\0" + "lt_LN.ISO_8859-2" "\0" "ISO-8859-2" "\0" + "pl_PL.ISO_8859-2" "\0" "ISO-8859-2" "\0" + "sl_SI.ISO_8859-2" "\0" "ISO-8859-2" "\0" + "la_LN.ISO_8859-4" "\0" "ISO-8859-4" "\0" + "lt_LT.ISO_8859-4" "\0" "ISO-8859-4" "\0" + "ru_RU.KOI8-R" "\0" "KOI8-R" "\0" + "ru_RU.ISO_8859-5" "\0" "ISO-8859-5" "\0" + "ru_RU.CP866" "\0" "CP866" "\0" + "ru_SU.KOI8-R" "\0" "KOI8-R" "\0" + "ru_SU.ISO_8859-5" "\0" "ISO-8859-5" "\0" + "ru_SU.CP866" "\0" "CP866" "\0" + "uk_UA.KOI8-U" "\0" "KOI8-U" "\0" + "zh_TW.BIG5" "\0" "BIG5" "\0" + "zh_TW.Big5" "\0" "BIG5" "\0" + "zh_CN.EUC" "\0" "GB2312" "\0" + "ja_JP.EUC" "\0" "EUC-JP" "\0" + "ja_JP.SJIS" "\0" "SHIFT_JIS" "\0" + "ja_JP.Shift_JIS" "\0" "SHIFT_JIS" "\0" + "ko_KR.EUC" "\0" "EUC-KR" "\0"; +# endif + # if defined DARWIN7 /* To avoid the trouble of installing a file that is shared by many GNU packages -- many packaging systems have problems with this --, Index: head/devel/patch/pkg-descr =================================================================== --- head/devel/patch/pkg-descr (revision 516963) +++ head/devel/patch/pkg-descr (revision 516964) @@ -1,6 +1,6 @@ The patch program takes a patch file containing a difference listing produced by the diff program and applies those differences to one or more original files, producing patched versions. -WWW: http://www.gnu.org/software/patch/patch.html +WWW: https://savannah.gnu.org/projects/patch/