Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Jan 2013 20:49:05 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r310204 - head/misc/sword
Message-ID:  <201301102049.r0AKn5D7025239@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Thu Jan 10 20:49:04 2013
New Revision: 310204
URL: http://svnweb.freebsd.org/changeset/ports/310204

Log:
  Stop hard coding ICU version and fix plist (missed by r310086).

Modified:
  head/misc/sword/Makefile
  head/misc/sword/pkg-plist

Modified: head/misc/sword/Makefile
==============================================================================
--- head/misc/sword/Makefile	Thu Jan 10 20:48:36 2013	(r310203)
+++ head/misc/sword/Makefile	Thu Jan 10 20:49:04 2013	(r310204)
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--without-curl
 LIB_DEPENDS+=	clucene:${PORTSDIR}/textproc/clucene \
 		icudata:${PORTSDIR}/devel/icu
 CONFIGURE_ARGS+=	--with-clucene --with-icu
-PLIST_SUB+=		ICU=""
+PLIST_SUB+=		ICU="" ICUVER="`${LOCALBASE}/bin/icu-config --version`"
 .else
 CONFIGURE_ARGS+=	--without-clucene --without-icu
 PLIST_SUB+=		ICU="@comment "

Modified: head/misc/sword/pkg-plist
==============================================================================
--- head/misc/sword/pkg-plist	Thu Jan 10 20:48:36 2013	(r310203)
+++ head/misc/sword/pkg-plist	Thu Jan 10 20:49:04 2013	(r310204)
@@ -182,16 +182,16 @@ lib/libsword-%%PORTVERSION%%.so
 lib/libsword.a
 lib/libsword.la
 lib/libsword.so
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_Any_Latex.res
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_Any_Latin1.res
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_BETA_Greek.res
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_BGreek_Greek.res
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_CCAT_Hebrew.res
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_CCAT_Syriac.res
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_Latin_Coptic.res
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_Latin_Gothic.res
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_Latin_Ugaritic.res
-%%ICU%%lib/sword/%%PORTVERSION%%_icu_50.1/translit_swordindex.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Any_Latex.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Any_Latin1.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_BETA_Greek.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_BGreek_Greek.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_CCAT_Hebrew.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_CCAT_Syriac.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Latin_Coptic.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Latin_Gothic.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Latin_Ugaritic.res
+%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_swordindex.res
 libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/locales.conf
 %%DATADIR%%/locales.d/abbr.conf
@@ -279,6 +279,6 @@ libdata/pkgconfig/sword.pc
 @dirrm %%DATADIR%%/mods.d
 @dirrm %%DATADIR%%/locales.d
 @dirrm %%DATADIR%%
-%%ICU%%@dirrm lib/sword/%%PORTVERSION%%_icu_50.1
+%%ICU%%@dirrm lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%
 @dirrm lib/sword
 @dirrm include/sword



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301102049.r0AKn5D7025239>