svn commit: r310108 - head/devel/icu

[Jung-uk Kim]

Author: jkim
Date: Tue Jan  8 20:03:48 2013
New Revision: 310108
URL: http://svnweb.freebsd.org/changeset/ports/310108

Log:
  Derive the major version number from PORTVERSION as we did before r309203.

Modified:
  head/devel/icu/Makefile
  head/devel/icu/pkg-plist

Modified: head/devel/icu/Makefile
==============================================================================
--- head/devel/icu/Makefile	Tue Jan  8 19:31:30 2013	(r310107)
+++ head/devel/icu/Makefile	Tue Jan  8 20:03:48 2013	(r310108)
@@ -53,12 +53,8 @@ MAN8+=	genccode.8
 MAN8+=	gencmn.8
 MAN8+=	gensprep.8
 
-ICUMAJOR=	50
-ICUMINOR=	1.1
-.if ${ICUMINOR} == ""
-ICUMINOR=	0
-.endif
-PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUMINOR=${ICUMINOR} ICUVER=${PORTVERSION}
+ICUMAJOR=	${PORTVERSION:C/\..*//}
+PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 

Modified: head/devel/icu/pkg-plist
==============================================================================
--- head/devel/icu/pkg-plist	Tue Jan  8 19:31:30 2013	(r310107)
+++ head/devel/icu/pkg-plist	Tue Jan  8 20:03:48 2013	(r310108)
@@ -11,28 +11,28 @@ lib/libsicule.a
 lib/libsicuio.a
 lib/libsicui18n.a
 lib/libsicudata.a
-lib/libicuuc.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicuuc.so.%%ICUVER%%
 lib/libicuuc.so.%%ICUMAJOR%%
 lib/libicuuc.so
-lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicutu.so.%%ICUVER%%
 lib/libicutu.so.%%ICUMAJOR%%
 lib/libicutu.so
-lib/libicutest.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicutest.so.%%ICUVER%%
 lib/libicutest.so.%%ICUMAJOR%%
 lib/libicutest.so
-lib/libiculx.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libiculx.so.%%ICUVER%%
 lib/libiculx.so.%%ICUMAJOR%%
 lib/libiculx.so
-lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicule.so.%%ICUVER%%
 lib/libicule.so.%%ICUMAJOR%%
 lib/libicule.so
-lib/libicuio.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicuio.so.%%ICUVER%%
 lib/libicuio.so.%%ICUMAJOR%%
 lib/libicuio.so
-lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicui18n.so.%%ICUVER%%
 lib/libicui18n.so.%%ICUMAJOR%%
 lib/libicui18n.so
-lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicudata.so.%%ICUVER%%
 lib/libicudata.so.%%ICUMAJOR%%
 lib/libicudata.so
 lib/icu/pkgdata.inc