Added GnuTLS for WeeChat.

git-svn-id: http://svn.telesphoreo.org/trunk@424 514c082c-b64e-11dc-b46d-3d985efe055d

20 files changed, 60 insertions, 2 deletions

diff --git a/data/gnutls/_metadata/description b/data/gnutls/_metadata/description
new file mode 100644
index 000000000..100430ef3
--- /dev/null
+++ b/data/gnutls/_metadata/description
@@ -0,0 +1 @@
+free sofware alternative to OpenSSL
diff --git a/data/gnutls/_metadata/gcrypt.dep b/data/gnutls/_metadata/gcrypt.dep
new file mode 120000
index 000000000..0a21c7b07
--- /dev/null
+++ b/data/gnutls/_metadata/gcrypt.dep
@@ -0,0 +1 @@
+../../gcrypt
\ No newline at end of file
diff --git a/data/gnutls/_metadata/gettext.dep b/data/gnutls/_metadata/gettext.dep
new file mode 120000
index 000000000..e8dbd8996
--- /dev/null
+++ b/data/gnutls/_metadata/gettext.dep
@@ -0,0 +1 @@
+../../gettext
\ No newline at end of file
diff --git a/data/gnutls/_metadata/homepage b/data/gnutls/_metadata/homepage
new file mode 100644
index 000000000..d2c324478
--- /dev/null
+++ b/data/gnutls/_metadata/homepage
@@ -0,0 +1 @@
+http://www.gnu.org/software/gnutls/
diff --git a/data/gnutls/_metadata/license b/data/gnutls/_metadata/license
new file mode 120000
index 000000000..af4224931
--- /dev/null
+++ b/data/gnutls/_metadata/license
@@ -0,0 +1 @@
+../../../licenses/gpl-3
\ No newline at end of file
diff --git a/data/gnutls/_metadata/maintainer b/data/gnutls/_metadata/maintainer
new file mode 120000
index 000000000..0fa66e077
--- /dev/null
+++ b/data/gnutls/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/saurik
\ No newline at end of file
diff --git a/data/gnutls/_metadata/name b/data/gnutls/_metadata/name
new file mode 100644
index 000000000..63a1d7785
--- /dev/null
+++ b/data/gnutls/_metadata/name
@@ -0,0 +1 @@
+GnuTLS
diff --git a/data/gnutls/_metadata/priority b/data/gnutls/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/gnutls/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/gnutls/_metadata/readline.dep b/data/gnutls/_metadata/readline.dep
new file mode 120000
index 000000000..f35c9185b
--- /dev/null
+++ b/data/gnutls/_metadata/readline.dep
@@ -0,0 +1 @@
+../../readline
\ No newline at end of file
diff --git a/data/gnutls/_metadata/role b/data/gnutls/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/gnutls/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/gnutls/_metadata/section b/data/gnutls/_metadata/section
new file mode 100644
index 000000000..4b487b7d5
--- /dev/null
+++ b/data/gnutls/_metadata/section
@@ -0,0 +1 @@
+Security
diff --git a/data/gnutls/_metadata/tags b/data/gnutls/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/gnutls/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/gnutls/_metadata/version b/data/gnutls/_metadata/version
new file mode 100644
index 000000000..005119baa
--- /dev/null
+++ b/data/gnutls/_metadata/version
@@ -0,0 +1 @@
+2.4.1
diff --git a/data/gnutls/cflags.diff b/data/gnutls/cflags.diff
new file mode 100644
index 000000000..50dbf5f08
--- /dev/null
+++ b/data/gnutls/cflags.diff
@@ -0,0 +1,25 @@
+diff -ru gnutls-2.4.1/lib/libgnutls-config.in gnutls-2.4.1+iPhone/lib/libgnutls-config.in
+--- gnutls-2.4.1/lib/libgnutls-config.in	2008-06-19 10:00:10.000000000 +0000
++++ gnutls-2.4.1+iPhone/lib/libgnutls-config.in	2008-08-18 17:48:32.000000000 +0000
+@@ -4,10 +4,6 @@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ 
+-gnutls_libs="@LIBGNUTLS_LIBS@"
+-gnutls_cflags="@LIBGNUTLS_CFLAGS@"
+-gnutls_la_file="@libdir@/libgnutls.la"
+-
+ usage()
+ {
+ 	cat <<EOF
+@@ -72,6 +68,10 @@
+   shift
+ done
+ 
++gnutls_libs="@LIBGNUTLS_LIBS@"
++gnutls_cflags="@LIBGNUTLS_CFLAGS@"
++gnutls_la_file="@libdir@/libgnutls.la"
++
+ if test "$echo_prefix" = "yes"; then
+     echo $prefix
+ fi
diff --git a/data/gnutls/gnutls-2.4.1.tar.bz2 b/data/gnutls/gnutls-2.4.1.tar.bz2
new file mode 100644
index 000000000..38c8c55bb
--- /dev/null
+++ b/data/gnutls/gnutls-2.4.1.tar.bz2
diff --git a/data/gnutls/make.sh b/data/gnutls/make.sh
new file mode 100644
index 000000000..e02dc72bc
--- /dev/null
+++ b/data/gnutls/make.sh
@@ -0,0 +1,4 @@
+pkg:setup
+pkg:configure --with-libgcrypt-prefix="$(PKG_DEST_ gcrypt)/usr" --with-included-libtasn1
+make
+pkg:install
diff --git a/data/weechat/_metadata/gnutls.dep b/data/weechat/_metadata/gnutls.dep
new file mode 120000
index 000000000..2dbb733a2
--- /dev/null
+++ b/data/weechat/_metadata/gnutls.dep
@@ -0,0 +1 @@
+../../gnutls
\ No newline at end of file
diff --git a/data/weechat/_metadata/python.dep b/data/weechat/_metadata/python.dep
deleted file mode 120000
index 62afec14c..000000000
--- a/data/weechat/_metadata/python.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../python
\ No newline at end of file
diff --git a/data/weechat/gnutls.diff b/data/weechat/gnutls.diff
new file mode 100644
index 000000000..0de4a39da
--- /dev/null
+++ b/data/weechat/gnutls.diff
@@ -0,0 +1,14 @@
+diff -ru weechat-0.2.6/configure.in weechat-0.2.6+iPhone/configure.in
+--- weechat-0.2.6/configure.in	2007-09-05 14:14:00.000000000 +0000
++++ weechat-0.2.6+iPhone/configure.in	2008-08-18 18:02:35.000000000 +0000
+@@ -605,8 +597,8 @@
+ *** libgnutls was not found. You may want to get it from ftp://ftp.gnutls.org/pub/gnutls/
+ *** WeeChat will be built without GnuTLS support.]]))
+     if test "x$found_gnutls" = "xyes" ; then
+-        GNUTLS_CFLAGS=`libgnutls-config --cflags`
+-        GNUTLS_LFLAGS=`libgnutls-config --libs`
++        GNUTLS_CFLAGS=$LIBGNUTLS_CFLAGS
++        GNUTLS_LFLAGS=$LIBGNUTLS_LIBS
+         AC_SUBST(GNUTLS_CFLAGS)
+         AC_SUBST(GNUTLS_LFLAGS)
+         AC_DEFINE(HAVE_GNUTLS)
diff --git a/data/weechat/make.sh b/data/weechat/make.sh
index 0ac03a457..89cd34e97 100644
--- a/data/weechat/make.sh
+++ b/data/weechat/make.sh
@@ -1,5 +1,7 @@
 pkg:setup
+touch aclocal.m4
 autoconf
-pkg:configure --with-libiconv-prefix="${PKG_ROOT}" --disable-gnutls --disable-python --disable-ruby
+# XXX: fix libgnutls-config call to add --prefix
+libgnutls_config_args="--prefix=$(PKG_DEST_ gnutls)/usr" pkg:configure --with-libiconv-prefix="${PKG_ROOT}" --with-libgnutls-prefix="$(PKG_DEST_ gnutls)/usr" --disable-python --disable-ruby
 make
 pkg:install