ips_version -> ips-version

19 files changed, 110 insertions, 22 deletions

diff --git a/examples/autoconf/autoconf.p5m b/examples/autoconf/autoconf.p5m
index 2fc0a92..0eddc29 100644
--- a/examples/autoconf/autoconf.p5m
+++ b/examples/autoconf/autoconf.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/developer/build/$(name)@$(ips_version)
+set name=pkg.fmri value=pkg:/developer/build/$(name)@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/automake1.11/automake.p5m b/examples/automake1.11/automake.p5m
index ee10839..9766816 100644
--- a/examples/automake1.11/automake.p5m
+++ b/examples/automake1.11/automake.p5m
@@ -22,7 +22,7 @@
 #
 
 
-set name=pkg.fmri value=pkg:/developer/build/$(name)@$(ips_version)
+set name=pkg.fmri value=pkg:/developer/build/$(name)@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/c-ares/c-ares.p5m b/examples/c-ares/c-ares.p5m
index cca0962..bc0efb9 100644
--- a/examples/c-ares/c-ares.p5m
+++ b/examples/c-ares/c-ares.p5m
@@ -22,7 +22,7 @@
 #
 
 
-set name=pkg.fmri value=pkg:/library/c-ares@$(ips_version)
+set name=pkg.fmri value=pkg:/library/c-ares@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/findutils/gnu-findutils.p5m b/examples/findutils/gnu-findutils.p5m
index e902e90..e4e6c32 100644
--- a/examples/findutils/gnu-findutils.p5m
+++ b/examples/findutils/gnu-findutils.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/file/gnu-$(name)@$(ips_version)
+set name=pkg.fmri value=pkg:/file/gnu-$(name)@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/findutils/locate.p5m b/examples/findutils/locate.p5m
index fee8de0..e798007 100644
--- a/examples/findutils/locate.p5m
+++ b/examples/findutils/locate.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/file/gnu-$(name)/locate@$(ips_version)
+set name=pkg.fmri value=pkg:/file/gnu-$(name)/locate@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/gm4/gm4.p5m b/examples/gm4/gm4.p5m
index b5843ed..72eb682 100644
--- a/examples/gm4/gm4.p5m
+++ b/examples/gm4/gm4.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/developer/macro/gnu-$(name)@$(ips_version)
+set name=pkg.fmri value=pkg:/developer/macro/gnu-$(name)@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/gmp/gmp.p5m b/examples/gmp/gmp.p5m
index 5af61cc..4b4c139 100644
--- a/examples/gmp/gmp.p5m
+++ b/examples/gmp/gmp.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/library/gmp@$(ips_version)
+set name=pkg.fmri value=pkg:/library/gmp@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/gmp/gmpxx.p5m b/examples/gmp/gmpxx.p5m
index 1785c90..d93a82b 100644
--- a/examples/gmp/gmpxx.p5m
+++ b/examples/gmp/gmpxx.p5m
@@ -1,11 +1,11 @@
-set name=pkg.fmri value=pkg:/library/gmpxx@$(ips_version)
+set name=pkg.fmri value=pkg:/library/gmpxx@$(ips-version)
 set name=pkg.summary value="$(summary), C++ library"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
 
 license $(license-file) license=$(license)
 
-depend fmri=pkg:/library/gmp@$(ips_version) type=incorporate
+depend fmri=pkg:/library/gmp@$(ips-version) type=incorporate
 
 dir path=usr
 dir path=usr/include
diff --git a/examples/grep/gnu-grep.p5m b/examples/grep/gnu-grep.p5m
index a1e10d5..86f02f9 100644
--- a/examples/grep/gnu-grep.p5m
+++ b/examples/grep/gnu-grep.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/text/gnu-$(name)@$(ips_version)
+set name=pkg.fmri value=pkg:/text/gnu-$(name)@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/libtool/libltdl.p5m b/examples/libtool/libltdl.p5m
index 2a00424..6f2d8d4 100644
--- a/examples/libtool/libltdl.p5m
+++ b/examples/libtool/libltdl.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/library/libtool/libltdl@$(ips_version)
+set name=pkg.fmri value=pkg:/library/libtool/libltdl@$(ips-version)
 set name=pkg.summary value="A system independent dlopen wrapper for GNU libtool"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/libtool/libtool.p5m b/examples/libtool/libtool.p5m
index 76545f1..6c9e397 100644
--- a/examples/libtool/libtool.p5m
+++ b/examples/libtool/libtool.p5m
@@ -22,7 +22,7 @@
 #
 
 
-set name=pkg.fmri value=pkg:/developer/build/$(name)@$(ips_version)
+set name=pkg.fmri value=pkg:/developer/build/$(name)@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/libunistring/libunistring.p5m b/examples/libunistring/libunistring.p5m
index ddc4ebf..e40114b 100644
--- a/examples/libunistring/libunistring.p5m
+++ b/examples/libunistring/libunistring.p5m
@@ -22,7 +22,7 @@
 #
 
 
-set name=pkg.fmri value=pkg:/library/libunistring@$(ips_version)
+set name=pkg.fmri value=pkg:/library/libunistring@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/mpfr/mpfr.p5m b/examples/mpfr/mpfr.p5m
index 6816c07..000630e 100644
--- a/examples/mpfr/mpfr.p5m
+++ b/examples/mpfr/mpfr.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/library/$(name)@$(ips_version)
+set name=pkg.fmri value=pkg:/library/$(name)@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source-url value="$(download)"
diff --git a/examples/openpgm/libpgm.p5m b/examples/openpgm/libpgm.p5m
index 881f3ab..573ec84 100644
--- a/examples/openpgm/libpgm.p5m
+++ b/examples/openpgm/libpgm.p5m
@@ -22,7 +22,7 @@
 #
 
 
-set name=pkg.fmri value=pkg:/library/libpgm@$(ips_version)
+set name=pkg.fmri value=pkg:/library/libpgm@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/pcre/pcre.p5m b/examples/pcre/pcre.p5m
index c327045..b016eff 100644
--- a/examples/pcre/pcre.p5m
+++ b/examples/pcre/pcre.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/library/pcre@$(ips_version)
+set name=pkg.fmri value=pkg:/library/pcre@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/examples/pcre/pcrecpp.p5m b/examples/pcre/pcrecpp.p5m
index f985873..e2eb275 100644
--- a/examples/pcre/pcrecpp.p5m
+++ b/examples/pcre/pcrecpp.p5m
@@ -1,11 +1,11 @@
 
-set name=pkg.fmri value=pkg:/library/pcrecpp@$(ips_version)
+set name=pkg.fmri value=pkg:/library/pcrecpp@$(ips-version)
 set name=pkg.summary value="$(summary), C++ library"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
 license $(license-file) license="$(license)"
 
-depend fmri=pkg:/library/pcre@$(ips_version) type=incorporate
+depend fmri=pkg:/library/pcre@$(ips-version) type=incorporate
 
 file path=usr/include/pcrecpp.h
 file path=usr/include/pcrecpparg.h
diff --git a/examples/xz/libunistring.p5m b/examples/xz/libunistring.p5m
new file mode 100644
index 0000000..e40114b
--- /dev/null
+++ b/examples/xz/libunistring.p5m
@@ -0,0 +1,87 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license
+# at http://www.opensource.org/licenses/CDDL-1.0
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each file.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright (C) 2012, Nexenta Systems, Inc. All rights reserved.
+#
+
+
+set name=pkg.fmri value=pkg:/library/libunistring@$(ips-version)
+set name=pkg.summary value="$(summary)"
+set name=info.upstream-url value="$(home)"
+set name=info.source_url value="$(download)"
+license $(license-file)  license="$(license)"
+
+
+dir path=usr
+dir path=usr/include
+dir path=usr/include/unistring
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/libunistring
+dir path=usr/share/info
+file path=usr/include/uniname.h
+file path=usr/include/unitypes.h
+file path=usr/include/unistr.h
+file path=usr/include/unistring/stdbool.h
+file path=usr/include/unistring/cdefs.h
+file path=usr/include/unistring/version.h
+file path=usr/include/unistring/stdint.h
+file path=usr/include/unistring/woe32dll.h
+file path=usr/include/unistring/iconveh.h
+file path=usr/include/unistring/localcharset.h
+file path=usr/include/unistring/inline.h
+file path=usr/include/unilbrk.h
+file path=usr/include/unistdio.h
+file path=usr/include/unictype.h
+file path=usr/include/uninorm.h
+file path=usr/include/unicase.h
+file path=usr/include/uniwidth.h
+file path=usr/include/uniwbrk.h
+file path=usr/include/uniconv.h
+file path=usr/lib/libunistring.so.0.1.2
+file path=usr/lib/$(MACH64)/libunistring.so.0.1.2
+file path=usr/share/doc/libunistring/libunistring_3.html
+file path=usr/share/doc/libunistring/libunistring_10.html
+file path=usr/share/doc/libunistring/libunistring_7.html
+file path=usr/share/doc/libunistring/libunistring_14.html
+file path=usr/share/doc/libunistring/libunistring_18.html
+file path=usr/share/doc/libunistring/libunistring_19.html
+file path=usr/share/doc/libunistring/libunistring_2.html
+file path=usr/share/doc/libunistring/libunistring_abt.html
+file path=usr/share/doc/libunistring/libunistring_11.html
+file path=usr/share/doc/libunistring/libunistring_6.html
+file path=usr/share/doc/libunistring/libunistring_15.html
+file path=usr/share/doc/libunistring/libunistring_8.html
+file path=usr/share/doc/libunistring/libunistring_toc.html
+file path=usr/share/doc/libunistring/libunistring_13.html
+file path=usr/share/doc/libunistring/libunistring_4.html
+file path=usr/share/doc/libunistring/libunistring_17.html
+file path=usr/share/doc/libunistring/libunistring_1.html
+file path=usr/share/doc/libunistring/libunistring_12.html
+file path=usr/share/doc/libunistring/libunistring_5.html
+file path=usr/share/doc/libunistring/libunistring_16.html
+file path=usr/share/doc/libunistring/libunistring_9.html
+file path=usr/share/info/libunistring.info
+link path=usr/lib/libunistring.so target=libunistring.so.0.1.2
+link path=usr/lib/libunistring.so.0 target=libunistring.so.0.1.2
+link path=usr/lib/$(MACH64)/libunistring.so target=libunistring.so.0.1.2
+link path=usr/lib/$(MACH64)/libunistring.so.0 target=libunistring.so.0.1.2
diff --git a/examples/zeromq/zeromq.p5m b/examples/zeromq/zeromq.p5m
index d860cbe..aa78982 100644
--- a/examples/zeromq/zeromq.p5m
+++ b/examples/zeromq/zeromq.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/library/zeromq@$(ips_version)
+set name=pkg.fmri value=pkg:/library/zeromq@$(ips-version)
 set name=pkg.summary value="$(summary)"
 set name=info.upstream-url value="$(home)"
 set name=info.source_url value="$(download)"
diff --git a/rules/ips.mk b/rules/ips.mk
index f59ddd0..d215af5 100644
--- a/rules/ips.mk
+++ b/rules/ips.mk
@@ -29,8 +29,9 @@ include /usr/share/cibs/rules/common.mk
 manifestdir := $(workdir)/manifest
 transdir := /usr/share/cibs/trans
 
-ifeq (,$(ips_version))
-ips_version = $(version)
+# TODO: rewrite
+ifeq (,$(ips-version))
+ips-version = $(version)
 endif
 
 # Substitutions in IPS manifest:
@@ -42,7 +43,7 @@ pkg-define = \
 -Dhome="$(home)" \
 -Dname="$(name)" \
 -Dversion="$(version)" \
--Dips_version="$(ips_version)" \
+-Dips-version="$(ips-version)" \
 -Darchive="$(archive)" \
 -Ddownload="$(download)" \
 -Dchecksum="$(checksum)" \