From 49dff5c7ca69663a09b342b2ed9c4a2465663a07 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 29 Sep 2008 22:32:08 +0200
Subject: [PATCH] Add pcre-7.8 template and make glib use the installed pcre,
 rather than use the included one.

While here, fix a bug in dependency handling when A package depends
B and B depends on C, C was installed two times because it was in
the dependency chain two times.

--HG--
extra : convert_revision : 379e161560cebd650a4f7e9d0f1b99f504317bbe
---
 dependencies/glib-2.18.1-deps.db | Bin 8192 -> 8192 bytes
 dependencies/pcre-7.8-deps.db    | Bin 0 -> 8192 bytes
 pkgfs.sh                         |   8 +++++++-
 templates/glib-2.18.1.tmpl       |   3 +++
 templates/pcre-7.8.tmpl          |  15 +++++++++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 dependencies/pcre-7.8-deps.db
 create mode 100755 templates/pcre-7.8.tmpl

diff --git a/dependencies/glib-2.18.1-deps.db b/dependencies/glib-2.18.1-deps.db
index 7a31d6143b6aa8e8ed33963429e979e348e7f34b..859c4a392bbf24091cbc2fe0afbdf973a0e059e9 100644
GIT binary patch
delta 48
zcmZp0XmHpdB*3zPe*^zU#aaB~tPBhc_CU;#l3GyAP>@`ds%x%ip)mQBycsi46aX~d
B3!nf1

delta 35
pcmZp0XmHpdB*3zVe-Hmg#bx}HH^{SanK1xCN@_td!{p=gW&p*R3UvSg

diff --git a/dependencies/pcre-7.8-deps.db b/dependencies/pcre-7.8-deps.db
new file mode 100644
index 0000000000000000000000000000000000000000..4e4f044699664df1c84ef58f33440dae524a3df7
GIT binary patch
literal 8192
zcmeI#F$#b%429vSbgq-L7qDOl?_<$HC{)k`_b9fC&?AWa8Jb6@<lEv#C5@zN^Yc{y
z208)=Ab<b@2q1s}0tg_000Id7LZB+Ps8jAF>ZprPA_52?fB*srAb<b@2q1s}0tkFw
ZK&1)qbADO(L;U8>5d2_`HPf7jzW^x62>bv5

literal 0
HcmV?d00001

diff --git a/pkgfs.sh b/pkgfs.sh
index 63d95cca802..9e0033a08c2 100755
--- a/pkgfs.sh
+++ b/pkgfs.sh
@@ -362,7 +362,7 @@ extract_tmpl_sources()
 {
 	[ -z "$pkgname" ] && return 1
 
-	echo ">>> Extracting \`$pkgname' into $PKGFS_BUILDDIR."
+	echo ">>> Extracting $pkgname into $PKGFS_BUILDDIR."
 
 	$extract_cmd
 	if [ "$?" -ne 0 ]; then
@@ -425,6 +425,7 @@ build_tmpl_sources()
 	# For now, just set LDFLAGS.
 	#
 	export LDFLAGS="-L$PKGFS_MASTERDIR/lib -Wl,-R$PKGFS_MASTERDIR/lib"
+
 	#
 	# Packages using GNU autoconf
 	#
@@ -592,9 +593,14 @@ install_dependency_tmpl()
 	add_dependency_tolist $pkgdepf
 
 	for i in ${deps_list}; do
+		# skip dup deps
+		check_installed_tmpl $i
+		[ "$?" -eq 0 ] && continue
 		echo ">>> Installing dependency: $i"
 		install_tmpl "${PKGFS_TEMPLATESDIR}/${i%%-deps.db}.tmpl"
 	done
+
+	deps_list=
 }
 
 install_xstow_tmpl()
diff --git a/templates/glib-2.18.1.tmpl b/templates/glib-2.18.1.tmpl
index 3bfe7bafa94..6a86a9143ba 100755
--- a/templates/glib-2.18.1.tmpl
+++ b/templates/glib-2.18.1.tmpl
@@ -4,6 +4,9 @@ extract_sufx=".tar.bz2"
 patch_files="glib-2.18.1-fix-statfs-netbsd.diff"
 url=http://ftp.gnome.org/pub/gnome/sources/glib/2.18
 make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+# Disable FAM for now and use the installed pcre package instead
+# of the supplied one.
+configure_args="--disable-fam --with-pcre=system"
 configure_env="ac_cv_path_PKG_CONFIG=$PKGFS_MASTERDIR/bin/pkg-config
 ac_cv_func_statfs=no"
 build_style=gnu_configure
diff --git a/templates/pcre-7.8.tmpl b/templates/pcre-7.8.tmpl
new file mode 100755
index 00000000000..d21c7e1bd5f
--- /dev/null
+++ b/templates/pcre-7.8.tmpl
@@ -0,0 +1,15 @@
+# Template file for 'pcre-7.8'
+pkgname=pcre-7.8
+extract_sufx=".tar.bz2"
+url=http://kent.dl.sourceforge.net/sourceforge/pcre
+build_style=gnu_configure
+configure_args="--enable-utf8 --enable-unicode-properties"
+short_desc="Perl Compatible Regular Expressions"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=f8cc336f984bce9bfebaef27e6376d84845bce8f
+long_desc="
+ The PCRE library is a set of functions that implement regular expression
+ pattern matching using the same syntax and semantics as Perl 5. PCRE
+ has its own native API, as well as a set of wrapper functions that
+ correspond to the POSIX regular expression API. The PCRE library is free,
+ even for building commercial software."