diff options
| author | tron <tron> | 2013-10-05 11:43:32 +0000 |
|---|---|---|
| committer | tron <tron> | 2013-10-05 11:43:32 +0000 |
| commit | aa50a650a8f9e0a186d85cebe084aa1f8b99a838 (patch) | |
| tree | 91484fcd999b4536b6ead7eec399b606a72a56c3 /textproc/icu | |
| parent | c9d28ee0ae995816cf46835007b6f8f5c96f0ee0 (diff) | |
| download | pkgsrc-aa50a650a8f9e0a186d85cebe084aa1f8b99a838.tar.gz | |
Fix remaining build problem under Mac OS X:
As "DSO_LIBDIR" is now always set (and must be always set because of all
the changes that refer to it) we cannot use it to check for the Cygwin
case anymore. Instead check whether "OPSYS" is (not) equal to "Cygwin".
Diffstat (limited to 'textproc/icu')
| -rw-r--r-- | textproc/icu/distinfo | 4 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-data_Makefile.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 7f67ed0447f..4b3508ec3b1 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2013/10/05 11:08:24 tron Exp $ +$NetBSD: distinfo,v 1.38 2013/10/05 11:43:32 tron Exp $ SHA1 (icu4c-51_2-src.tgz) = 074a28dfc96d37ce72c831f3e3e2d686f1f76a14 RMD160 (icu4c-51_2-src.tgz) = ef1256bb87b3dcec1cf40b32b11c5c3f1bd48af6 @@ -14,7 +14,7 @@ SHA1 (patch-common_unicode_platform.h) = 36cb68164fcf9b2858acabe95f0206e8088bfba SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a SHA1 (patch-config_mh-cygwin) = e3aa7a926244b448ce12ab2f89156348a02c0659 -SHA1 (patch-data_Makefile.in) = 15034bdaebdcf7152e429deda4df685dd3658594 +SHA1 (patch-data_Makefile.in) = a5dcfe848a0444f0a1c036b7f4e343468bf3b3d1 SHA1 (patch-i18n_Makefile.in) = 935965c0418994271d844a4c908cd9e1fe8279fd SHA1 (patch-io_Makefile.in) = f5f5eabb31ea7120130d13c397fab1feddd30447 SHA1 (patch-layout_Makefile.in) = 6914279785c618d4078d4595a9097df006043eed diff --git a/textproc/icu/patches/patch-data_Makefile.in b/textproc/icu/patches/patch-data_Makefile.in index 1704ecf65b5..d8b40c7bd91 100644 --- a/textproc/icu/patches/patch-data_Makefile.in +++ b/textproc/icu/patches/patch-data_Makefile.in @@ -1,4 +1,4 @@ -$NetBSD: patch-data_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $ +$NetBSD: patch-data_Makefile.in,v 1.2 2013/10/05 11:43:32 tron Exp $ --- data/Makefile.in.orig 2013-05-23 20:06:20.000000000 +0000 +++ data/Makefile.in @@ -6,7 +6,7 @@ $NetBSD: patch-data_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $ ifeq ($(PKGDATA_OPTS),) PKGDATA_OPTS = -O $(top_builddir)/data/icupkg.inc endif -+ifeq ($(DSO_LIBDIR),) ++ifneq ($(OPSYS),Cygwin) ifeq ($(PKGDATA_VERSIONING),) PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION) endif |