From 20f19675ac2d350098b495527c08a4b0832e3d0c Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Sun, 24 Jun 2007 19:36:45 +0000
Subject: EncapPackages: Update glib version, explictly don't use iconv

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3341 ce84e21b-d406-0410-9b95-82705330c041
---
 .../src/encap-profiles/server/bcfg2-gamin-0.1.8.ep |  4 +-
 .../encap-profiles/server/bcfg2-glib-2.12.12.ep    | 87 ++++++++++++++++++++++
 .../src/encap-profiles/server/bcfg2-glib-2.12.9.ep | 86 ---------------------
 3 files changed, 89 insertions(+), 88 deletions(-)
 create mode 100644 encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep
 delete mode 100644 encap/src/encap-profiles/server/bcfg2-glib-2.12.9.ep

(limited to 'encap/src/encap-profiles')

diff --git a/encap/src/encap-profiles/server/bcfg2-gamin-0.1.8.ep b/encap/src/encap-profiles/server/bcfg2-gamin-0.1.8.ep
index 5a8b60b2f..5dd204e8a 100644
--- a/encap/src/encap-profiles/server/bcfg2-gamin-0.1.8.ep
+++ b/encap/src/encap-profiles/server/bcfg2-gamin-0.1.8.ep
@@ -10,7 +10,7 @@
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-pkg-config-0.22" />
 <prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-glib-2.12.9" />
+<prereq package="bcfg2-glib-2.12.12" />
 <prereq package="bcfg2-setuptools-0.6c6" />
 
 <environment
@@ -79,7 +79,7 @@ touch var/encap/${ENCAP_PKGNAME}
 
 <encapinfo>
 description Gamin - The File Alteration Monitor
-prereq pkgspec >= bcfg2-glib-2.12.9
+prereq pkgspec >= bcfg2-glib-2.12.12
 </encapinfo>
 
 </encap_profile>
diff --git a/encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep b/encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep
new file mode 100644
index 000000000..4004346f9
--- /dev/null
+++ b/encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-glib-2.12.12"
+>
+
+<prereq package="m4-1.4.4" />
+<prereq package="bcfg2-zlib-1.2.3" />
+<prereq package="bcfg2-pkg-config-0.22" />
+<prereq package="bcfg2-python-2.4.4" />
+<prereq package="bcfg2-libxml2-2.6.29" />
+<prereq package="bcfg2-libxslt-1.1.21" />
+<prereq package="bcfg2-setuptools-0.6c6" />
+
+<environment
+        variable="CC"
+        value="gcc -static-libgcc"
+        type="set"
+/>
+
+<environment
+        variable="PATH"
+PLATFORM_IF_MATCH(solaris)
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
+PLATFORM_ELSE
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
+PLATFORM_ENDIF
+        type="prepend"
+/>
+
+PLATFORM_IF_MATCH(linux)
+PLATFORM_ELSE
+<environment
+        variable="MAKE"
+        value="gmake"
+        type="set"
+/>
+PLATFORM_ENDIF
+
+<environment
+        variable="LDFLAGS"
+PLATFORM_IF_MATCH(linux)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
+PLATFORM_ELSE_IF_MATCH(aix)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE_IF_MATCH(solaris)
+        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE
+PLATFORM_ENDIF
+        type="set"
+/>
+
+<environment
+        variable="CPPFLAGS"
+        value="-I/usr/local/lib/bcfg2/include"
+        type="set"
+/>
+
+<source
+url="http://encapsrcdist/mirror/glib/glib-2.12.12.tar.gz
+     http://mirror.opensysadmin.com/glib/glib-2.12.12.tar.gz
+     http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-2.12.12.tar.gz"
+>
+
+<configure>
+./configure \
+	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
+	--with-libiconv=no
+</configure>
+
+</source>
+
+<prepackage type="set">
+# Make "this encap is installed" sentinal file available in /usr/local/var/encap
+test -d var || mkdir var
+test -d var/encap || mkdir var/encap
+touch var/encap/${ENCAP_PKGNAME}
+</prepackage>
+
+<encapinfo>
+description glib - data structure handling, portability wrappers, and interfaces 
+</encapinfo>
+
+</encap_profile>
diff --git a/encap/src/encap-profiles/server/bcfg2-glib-2.12.9.ep b/encap/src/encap-profiles/server/bcfg2-glib-2.12.9.ep
deleted file mode 100644
index 1053504ea..000000000
--- a/encap/src/encap-profiles/server/bcfg2-glib-2.12.9.ep
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-glib-2.12.9"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-libxml2-2.6.29" />
-<prereq package="bcfg2-libxslt-1.1.21" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<environment
-        variable="CC"
-        value="gcc -static-libgcc"
-        type="set"
-/>
-
-<environment
-        variable="PATH"
-PLATFORM_IF_MATCH(solaris)
-        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
-PLATFORM_ELSE
-        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
-PLATFORM_ENDIF
-        type="prepend"
-/>
-
-PLATFORM_IF_MATCH(linux)
-PLATFORM_ELSE
-<environment
-        variable="MAKE"
-        value="gmake"
-        type="set"
-/>
-PLATFORM_ENDIF
-
-<environment
-        variable="LDFLAGS"
-PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
-PLATFORM_ELSE_IF_MATCH(aix)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE
-PLATFORM_ENDIF
-        type="set"
-/>
-
-<environment
-        variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include"
-        type="set"
-/>
-
-<source
-url="http://encapsrcdist/mirror/glib/glib-2.12.9.tar.gz
-     http://mirror.opensysadmin.com/glib/glib-2.12.9.tar.gz
-     http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-2.12.9.tar.gz"
->
-
-<configure>
-./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2"
-</configure>
-
-</source>
-
-<prepackage type="set">
-# Make "this encap is installed" sentinal file available in /usr/local/var/encap
-test -d var || mkdir var
-test -d var/encap || mkdir var/encap
-touch var/encap/${ENCAP_PKGNAME}
-</prepackage>
-
-<encapinfo>
-description glib - data structure handling, portability wrappers, and interfaces 
-</encapinfo>
-
-</encap_profile>
-- 
cgit v1.2.3-1-g7c22