libtinfo in a separate package, because it is used by wide and non-wide libraries

4 files changed, 46 insertions, 29 deletions

diff --git a/ncurses/ncurses.p5m b/ncurses/ncurses.p5m
index abaedad..c1eab3c 100644
--- a/ncurses/ncurses.p5m
+++ b/ncurses/ncurses.p5m
@@ -1,12 +1,18 @@
-set name=pkg.fmri value=pkg:/library/$(name)@$(ips-version)
+set name=pkg.fmri value=pkg:/library/ncurses@$(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)"
 
-depend fmri=pkg:/library/$(name)5@$(ips-version) type=require
-depend fmri=pkg:/library/$(name)5@$(ips-version) type=incorporate
+depend fmri=pkg:/library/ncurses5@$(ips-version) type=require
+depend fmri=pkg:/library/ncurses5@$(ips-version) type=incorporate
+
+depend fmri=pkg:/library/tinfo@$(ips-version) type=require
+depend fmri=pkg:/library/tinfo@$(ips-version) type=incorporate
+
+# Use progs from the same source package:
+depend fmri=pkg:/terminal/ncurses-bin@$(version) type=require
 
 file path=usr/bin/ncurses5-config facet.devel=true
 file path=usr/include/curses.h
@@ -28,31 +34,19 @@ file path=usr/include/term_entry.h
 file path=usr/include/termcap.h
 file path=usr/include/tic.h
 file path=usr/include/unctrl.h
-file path=usr/lib/$(MACH64)/pkgconfig/form.pc
-file path=usr/lib/$(MACH64)/pkgconfig/menu.pc
-file path=usr/lib/$(MACH64)/pkgconfig/ncurses.pc
-file path=usr/lib/$(MACH64)/pkgconfig/panel.pc
-file path=usr/lib/$(MACH64)/pkgconfig/tic.pc
-file path=usr/lib/$(MACH64)/pkgconfig/tinfo.pc
 file path=usr/lib/pkgconfig/form.pc
 file path=usr/lib/pkgconfig/menu.pc
 file path=usr/lib/pkgconfig/ncurses.pc
 file path=usr/lib/pkgconfig/panel.pc
-file path=usr/lib/pkgconfig/tic.pc
-file path=usr/lib/pkgconfig/tinfo.pc
 file path=usr/share/man/man1/ncurses5-config.1 facet.devel=true
 link path=usr/include/ncurses.h target=curses.h
-link path=usr/lib/$(MACH64)/libcurses.so target=libncurses.so.5.9
-link path=usr/lib/$(MACH64)/libform.so target=libform.so.5
-link path=usr/lib/$(MACH64)/libmenu.so target=libmenu.so.5
-link path=usr/lib/$(MACH64)/libncurses.so target=libncurses.so.5
-link path=usr/lib/$(MACH64)/libpanel.so target=libpanel.so.5
-link path=usr/lib/$(MACH64)/libtic.so target=libtic.so.5
-link path=usr/lib/$(MACH64)/libtinfo.so target=libtinfo.so.5
+link path=usr/lib/$(mach64)/libcurses.so target=libncurses.so.5.9
+link path=usr/lib/$(mach64)/libform.so target=libform.so.5
+link path=usr/lib/$(mach64)/libmenu.so target=libmenu.so.5
+link path=usr/lib/$(mach64)/libncurses.so target=libncurses.so.5
+link path=usr/lib/$(mach64)/libpanel.so target=libpanel.so.5
 link path=usr/lib/libcurses.so target=libncurses.so.5.9
 link path=usr/lib/libform.so target=libform.so.5
 link path=usr/lib/libmenu.so target=libmenu.so.5
 link path=usr/lib/libncurses.so target=libncurses.so.5
 link path=usr/lib/libpanel.so target=libpanel.so.5
-link path=usr/lib/libtic.so target=libtic.so.5
-link path=usr/lib/libtinfo.so target=libtinfo.so.5
diff --git a/ncurses/ncurses5.p5m b/ncurses/ncurses5.p5m
index a19ce20..f5009f7 100644
--- a/ncurses/ncurses5.p5m
+++ b/ncurses/ncurses5.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/library/$(name)5@$(ips-version)
+set name=pkg.fmri value=pkg:/library/ncurses5@$(ips-version)
 set name=pkg.summary value="$(summary), shared libraries"
 set name=info.upstream-url value="$(home)"
 set name=info.source-url value="$(download)"
@@ -9,23 +9,15 @@ file path=usr/lib/$(MACH64)/libform.so.5.9
 file path=usr/lib/$(MACH64)/libmenu.so.5.9
 file path=usr/lib/$(MACH64)/libncurses.so.5.9
 file path=usr/lib/$(MACH64)/libpanel.so.5.9
-file path=usr/lib/$(MACH64)/libtic.so.5.9
-file path=usr/lib/$(MACH64)/libtinfo.so.5.9
 file path=usr/lib/libform.so.5.9
 file path=usr/lib/libmenu.so.5.9
 file path=usr/lib/libncurses.so.5.9
 file path=usr/lib/libpanel.so.5.9
-file path=usr/lib/libtic.so.5.9
-file path=usr/lib/libtinfo.so.5.9
 link path=usr/lib/$(MACH64)/libform.so.5 target=libform.so.5.9
 link path=usr/lib/$(MACH64)/libmenu.so.5 target=libmenu.so.5.9
 link path=usr/lib/$(MACH64)/libncurses.so.5 target=libncurses.so.5.9
 link path=usr/lib/$(MACH64)/libpanel.so.5 target=libpanel.so.5.9
-link path=usr/lib/$(MACH64)/libtic.so.5 target=libtic.so.5.9
-link path=usr/lib/$(MACH64)/libtinfo.so.5 target=libtinfo.so.5.9
 link path=usr/lib/libform.so.5 target=libform.so.5.9
 link path=usr/lib/libmenu.so.5 target=libmenu.so.5.9
 link path=usr/lib/libncurses.so.5 target=libncurses.so.5.9
 link path=usr/lib/libpanel.so.5 target=libpanel.so.5.9
-link path=usr/lib/libtic.so.5 target=libtic.so.5.9
-link path=usr/lib/libtinfo.so.5 target=libtinfo.so.5.9
diff --git a/ncurses/tinfo.p5m b/ncurses/tinfo.p5m
new file mode 100644
index 0000000..9021c76
--- /dev/null
+++ b/ncurses/tinfo.p5m
@@ -0,0 +1,16 @@
+set name=pkg.fmri value=pkg:/library/tinfo@$(ips-version)
+set name=pkg.summary value="$(summary), library for the low-level terminfo library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+depend fmri=pkg:/library/tinfo5@$(ips-version) type=require
+depend fmri=pkg:/library/tinfo5@$(ips-version) type=incorporate
+
+file path=usr/lib/pkgconfig/tic.pc
+file path=usr/lib/pkgconfig/tinfo.pc
+link path=usr/lib/$(mach64)/libtic.so target=libtic.so.5
+link path=usr/lib/$(mach64)/libtinfo.so target=libtinfo.so.5
+link path=usr/lib/libtic.so target=libtic.so.5
+link path=usr/lib/libtinfo.so target=libtinfo.so.5
diff --git a/ncurses/tinfo5.p5m b/ncurses/tinfo5.p5m
new file mode 100644
index 0000000..5b2bc66
--- /dev/null
+++ b/ncurses/tinfo5.p5m
@@ -0,0 +1,15 @@
+set name=pkg.fmri value=pkg:/library/tinfo5@$(ips-version)
+set name=pkg.summary value="$(summary), shared low-level terminfo library for terminal handling"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+file path=usr/lib/$(mach64)/libtic.so.5.9
+file path=usr/lib/$(mach64)/libtinfo.so.5.9
+file path=usr/lib/libtic.so.5.9
+file path=usr/lib/libtinfo.so.5.9
+link path=usr/lib/$(mach64)/libtic.so.5 target=libtic.so.5.9
+link path=usr/lib/$(mach64)/libtinfo.so.5 target=libtinfo.so.5.9
+link path=usr/lib/libtic.so.5 target=libtic.so.5.9
+link path=usr/lib/libtinfo.so.5 target=libtinfo.so.5.9