From 151dc6cdc2ba009b1cfba588ad9e221a5f93db3e Mon Sep 17 00:00:00 2001 From: Greg Larkin Date: Fri, 5 Oct 2012 16:22:33 +0000 Subject: [PATCH] - Prevent installation of charset.alias by inlining its contents like other platforms do. This avoids a file installation conflict with gettext. - Bumped PORTREVISION Reported by: avg, ale, QAT --- devel/patch/Makefile | 4 +- devel/patch/files/patch-lib__Makefile.in | 11 +++ devel/patch/files/patch-lib__localcharset.c | 98 +++++++++++++++++++++ 3 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 devel/patch/files/patch-lib__Makefile.in create mode 100644 devel/patch/files/patch-lib__localcharset.c diff --git a/devel/patch/Makefile b/devel/patch/Makefile index b92d59a17ae2..55235cc4c6d3 100644 --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -7,6 +7,7 @@ PORTNAME= patch PORTVERSION= 2.7 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= patch @@ -22,7 +23,6 @@ USE_GMAKE= yes USE_XZ= yes MAN1= gpatch.1 -PLIST_FILES= bin/gpatch \ - lib/charset.alias +PLIST_FILES= bin/gpatch .include diff --git a/devel/patch/files/patch-lib__Makefile.in b/devel/patch/files/patch-lib__Makefile.in new file mode 100644 index 000000000000..d303471a6914 --- /dev/null +++ b/devel/patch/files/patch-lib__Makefile.in @@ -0,0 +1,11 @@ +--- ./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 @@ + 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: diff --git a/devel/patch/files/patch-lib__localcharset.c b/devel/patch/files/patch-lib__localcharset.c new file mode 100644 index 000000000000..84ad288e7178 --- /dev/null +++ b/devel/patch/files/patch-lib__localcharset.c @@ -0,0 +1,98 @@ +--- ./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 @@ + cp = charset_aliases; + if (cp == NULL) + { +-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__) ++#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined __FreeBSD__) + const char *dir; + const char *base = "charset.alias"; + char *file_name; +@@ -249,6 +249,86 @@ + + #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 --,