From 3e567218b60d7f885e769e1a2a07d84d38f11c13 Mon Sep 17 00:00:00 2001
From: Igor Pashev <igor.pashev@nexenta.com>
Date: Wed, 19 Dec 2012 13:02:54 +0400
Subject: Update examples

---
 examples/libtool/Makefile                      | 17 +++++++----------
 examples/libtool/libltdl.p5m                   | 15 ++++++++-------
 examples/libtool/libltdl7.p5m                  | 11 +++++++++++
 examples/libtool/patches/bootstrap-no-go.patch | 12 ++++++++++++
 4 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 examples/libtool/libltdl7.p5m
 create mode 100644 examples/libtool/patches/bootstrap-no-go.patch

(limited to 'examples/libtool')

diff --git a/examples/libtool/Makefile b/examples/libtool/Makefile
index 32f7cf0..db1a2ac 100644
--- a/examples/libtool/Makefile
+++ b/examples/libtool/Makefile
@@ -1,6 +1,7 @@
 include /usr/share/cibs/rules/ips.mk
 include /usr/share/cibs/rules/archive.mk
-#include /usr/share/cibs/rules/autoreconf.mk
+include /usr/share/cibs/rules/patch.mk
+include /usr/share/cibs/rules/autoreconf.mk
 include /usr/share/cibs/rules/autotools.mk
 include /usr/share/cibs/rules/32.mk
 include /usr/share/cibs/rules/64.mk
@@ -9,17 +10,13 @@ summary := Generic library support script
 license := GPL
 license-file := COPYING
 
-build-depends += \
-
-# build-conflicts +=
-
 home     := http://www.gnu.org/software/libtool/
 name     := libtool
-version  := 2.2.2
+version  := 2.4.2
 archive  := $(name)-$(version).tar.gz
 download := http://ftp.gnu.org/gnu/$(name)/$(archive)
 checksum := \
-     md5:9281a5f1976da110be872b1ba048d8ac \
-    sha1:41e0d829188083ab9f6bedf2b9eca89543dc0f8a \
-  sha256:c3963d969e13588fb142001d5a81c07962dc2ce7c03e2f4f551a29760e844a10 \
-    size:2223210
+     md5:d2f3b7d4627e69e13514a40e72a24d50 \
+    sha1:22b71a8b5ce3ad86e1094e7285981cae10e6ff88 \
+  sha256:b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918 \
+    size:2632347
diff --git a/examples/libtool/libltdl.p5m b/examples/libtool/libltdl.p5m
index 6f2d8d4..0688575 100644
--- a/examples/libtool/libltdl.p5m
+++ b/examples/libtool/libltdl.p5m
@@ -1,7 +1,10 @@
 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)"
+set name=info.source-url value="$(download)"
+
+depend fmri=pkg:/library/libtool/libltdl7@$(ips-version) type=require
+depend fmri=pkg:/library/libtool/libltdl7@$(ips-version) type=incorporate
 
 <transform dir file link path=.*/share/libtool/libltdl.* -> default facet.devel true>
 
@@ -49,9 +52,7 @@ file path=usr/share/libtool/libltdl/COPYING.LIB
 file path=usr/include/libltdl/lt_system.h
 file path=usr/include/libltdl/lt_dlloader.h
 file path=usr/include/libltdl/lt_error.h
-file path=usr/lib/libltdl.so.7.1.1
-link path=usr/lib/libltdl.so.7 target=libltdl.so.7.1.1
-link path=usr/lib/libltdl.so target=libltdl.so.7.1.1
-file path=usr/lib/$(MACH64)/libltdl.so.7.1.1
-link path=usr/lib/$(MACH64)/libltdl.so.7 target=libltdl.so.7.1.1
-link path=usr/lib/$(MACH64)/libltdl.so target=libltdl.so.7.1.1
+link path=usr/lib/libltdl.so target=libltdl.so.7.3.0
+link path=usr/lib/$(MACH64)/libltdl.so target=libltdl.so.7.3.0
+file path=usr/lib/libltdl.a
+file path=usr/lib/$(MACH64)/libltdl.a
diff --git a/examples/libtool/libltdl7.p5m b/examples/libtool/libltdl7.p5m
new file mode 100644
index 0000000..be0b360
--- /dev/null
+++ b/examples/libtool/libltdl7.p5m
@@ -0,0 +1,11 @@
+set name=pkg.fmri value=pkg:/library/libtool/libltdl7@$(ips-version)
+set name=pkg.summary value="A system independent dlopen wrapper for GNU libtool, shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license libltdl/COPYING.LIB license=LGPL
+
+file path=usr/lib/$(MACH64)/libltdl.so.7.3.0
+file path=usr/lib/libltdl.so.7.3.0
+link path=usr/lib/$(MACH64)/libltdl.so.7 target=libltdl.so.7.3.0
+link path=usr/lib/libltdl.so.7 target=libltdl.so.7.3.0
diff --git a/examples/libtool/patches/bootstrap-no-go.patch b/examples/libtool/patches/bootstrap-no-go.patch
new file mode 100644
index 0000000..1d8e98a
--- /dev/null
+++ b/examples/libtool/patches/bootstrap-no-go.patch
@@ -0,0 +1,12 @@
+Description: Go is not supported before LT 2.4
+diff -dubr source/configure.ac nogo/configure.ac
+--- source/configure.ac	2011-10-17 14:17:17.000000000 +0400
++++ nogo/configure.ac	2012-10-13 00:29:40.973202656 +0400
+@@ -196,7 +196,6 @@
+ LT_LANG(C++)
+ LT_LANG(Fortran 77)
+ LT_LANG(Fortran)
+-LT_LANG(Go)
+ LT_LANG(Java)
+ LT_LANG(Windows Resource)
+ 
-- 
cgit v1.2.3