diff options
| author | bapt <bapt@FreeBSD.org> | 2010-12-20 19:12:36 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2010-12-20 19:12:36 +0800 |
| commit | 1cfba75369b1e5b07ca38f83b0aee7694457297c (patch) | |
| tree | c85d188ad6934adcaf6bc2c65eb34ea7000721a8 | |
| parent | 5fad4f7511c26ff650c0fd270f1c6d4089a1f86b (diff) | |
| download | freebsd-ports-gnome-1cfba75369b1e5b07ca38f83b0aee7694457297c.tar.gz freebsd-ports-gnome-1cfba75369b1e5b07ca38f83b0aee7694457297c.tar.zst freebsd-ports-gnome-1cfba75369b1e5b07ca38f83b0aee7694457297c.zip | |
- fix a typo in patch-cc-flags[1]
- re-add CONFLICTS for a couple of month to prevent user from installing the new devel/icu while they still have an old version of devel/icu2 or devel/icu4 [2]
Submitted by: Ruslan Mahmatkhanov <cvs-src _at_ yandex.ru> (by mail) [1] and bsam@ (by mail) [2]
| -rw-r--r-- | devel/icu/Makefile | 2 | ||||
| -rw-r--r-- | devel/icu/files/patch-cc-flags | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/devel/icu/Makefile b/devel/icu/Makefile index 4965e24547c6..6dc27c5578af 100644 --- a/devel/icu/Makefile +++ b/devel/icu/Makefile @@ -27,6 +27,8 @@ LICENSE_NAME= ICU license LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} LICENSE_FILE= ${WRKSRC}/../unicode-license.txt +CONFLICTS= icu2-[0-9]* icu-4.4* + GNU_CONFIGURE= yes CONFIGURE_SCRIPT= runConfigureICU CONFIGURE_ARGS+= ${OPSYS} diff --git a/devel/icu/files/patch-cc-flags b/devel/icu/files/patch-cc-flags index 6ec0a470775d..75c601dd2b80 100644 --- a/devel/icu/files/patch-cc-flags +++ b/devel/icu/files/patch-cc-flags @@ -8,7 +8,7 @@ - THE_COMP="the GNU C++" - CC=gcc; export CC - CXX=g++; export CXX -+ THE_OS="$plateform" ++ THE_OS="$platform" + CC=${CC:=cc}; export CC + CXX=${CXX:=c++}; export CXX + THE_COMP="`$CC -v | fgrep -i ver`" |