7 files changed, 149 insertions, 48 deletions

diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 2b5be8424fa6..e6cd4444ef41 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	gale
-PORTVERSION=	0.99d
-PORTREVISION=	1
+PORTVERSION=	0.99e
 CATEGORIES=	net
-MASTER_SITES=	http://download.gale.org/
-DISTNAME=	${PORTNAME}-${PORTVERSION}anger
+MASTER_SITES=	http://download.ofb.net/gale/
+DISTNAME=	${PORTNAME}-${PORTVERSION}gg
 
 MAINTAINER=	peterh@sapros.com
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc \
+		automake:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww \
 		adns.1:${PORTSDIR}/net/adns
 
 USE_OPENSSL=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+INSTALLS_SHLIB=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib \
@@ -27,7 +28,10 @@ CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib \
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
+pre-configure:
+	cd ${WRKSRC} && aclocal
+
 post-install:
-	${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-im/gale/distinfo b/net-im/gale/distinfo
index 3c96238b45ea..8ba37eb5b36f 100644
--- a/net-im/gale/distinfo
+++ b/net-im/gale/distinfo
@@ -1 +1 @@
-MD5 (gale-0.99danger.tar.gz) = 4d29cc71a47c219aa4d1d90bf87fd975
+MD5 (gale-0.99egg.tar.gz) = 5240b10de2c7998887b3bc3dd7e8b30b
diff --git a/net-im/gale/files/patch-acinclude.m4 b/net-im/gale/files/patch-acinclude.m4
new file mode 100644
index 000000000000..3960395014b1
--- /dev/null
+++ b/net-im/gale/files/patch-acinclude.m4
@@ -0,0 +1,114 @@
+diff -u -N /tmp/gale-0.99egg/acinclude.m4 ./acinclude.m4
+--- /tmp/gale-0.99egg/acinclude.m4	Wed Dec 31 16:00:00 1969
++++ ./acinclude.m4	Tue Nov  6 13:55:13 2001
+@@ -0,0 +1,110 @@
++dnl This is a subroutine of AC_OUTPUT.
++dnl It is called after running config.status.
++dnl AC_OUTPUT_SUBDIRS(DIRECTORY...)
++define([AC_OUTPUT_SUBDIRS],
++[
++ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
++])dnl
++if test "$no_recursion" != yes; then
++
++  # Remove --cache-file and --srcdir arguments so they do not pile up.
++  ac_sub_configure_args=
++  ac_prev=
++  for ac_arg in $ac_configure_args; do
++    if test -n "$ac_prev"; then
++      ac_prev=
++      continue
++    fi
++    case "$ac_arg" in
++    -cache-file | --cache-file | --cache-fil | --cache-fi \
++    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
++      ac_prev=cache_file ;;
++    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
++    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
++      ;;
++    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
++      ac_prev=srcdir ;;
++    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
++      ;;
++    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
++    esac
++  done
++
++  for ac_config_dir in $1; do
++
++    # Do not complain, so a configure script can configure whichever
++    # parts of a large source tree are present.
++    if test ! -d $srcdir/$ac_config_dir; then
++      continue
++    fi
++
++    echo configuring in $ac_config_dir
++
++    case "$srcdir" in
++    .) ;;
++    *)
++      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
++      else
++        AC_MSG_ERROR(can not create `pwd`/$ac_config_dir)
++      fi
++      ;;
++    esac
++
++    ac_popdir=`pwd`
++    cd $ac_config_dir
++
++changequote(, )dnl
++      # A "../" for each directory in /$ac_config_dir.
++      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
++changequote([, ])dnl
++
++    case "$srcdir" in
++    .) # No --srcdir option.  We are building in place.
++      ac_sub_srcdir=$srcdir ;;
++    /*) # Absolute path.
++      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
++    *) # Relative path.
++      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
++    esac
++
++    # Check for guested configure; otherwise get Cygnus style configure.
++    if test -f $ac_sub_srcdir/configure; then
++      ac_sub_configure=$ac_sub_srcdir/configure
++    elif test -f $ac_sub_srcdir/configure.in; then
++      ac_sub_configure=$ac_configure
++    else
++      AC_MSG_WARN(no configuration information is in $ac_config_dir)
++      ac_sub_configure=
++    fi
++
++    # The recursion is here.
++    if test -n "$ac_sub_configure"; then
++
++      # Make the cache file name correct relative to the subdirectory.
++      case "$cache_file" in
++      /*) ac_sub_cache_file=$cache_file ;;
++      *) # Relative path.
++        ac_sub_cache_file="$ac_dots$cache_file" ;;
++      esac
++ifdef([AC_PROVIDE_AC_PROG_INSTALL],
++      [  case "$ac_given_INSTALL" in
++changequote(, )dnl
++        [/$]*) INSTALL="$ac_given_INSTALL" ;;
++changequote([, ])dnl
++        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++        esac
++])dnl
++
++      echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
++      # The eval makes quoting arguments work.
++      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
++      then :
++      else
++        AC_MSG_ERROR($ac_sub_configure failed for $ac_config_dir)
++      fi
++    fi
++
++    cd $ac_popdir
++  done
++fi
++])
diff --git a/net-im/gale/files/patch-configure b/net-im/gale/files/patch-configure
deleted file mode 100644
index 0ea0fc4319aa..000000000000
--- a/net-im/gale/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Mon Jul  2 18:23:09 2001
-+++ configure	Mon Jul  2 18:23:19 2001
-@@ -3475,10 +3475,6 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/net-im/gale/files/patch-crypto b/net-im/gale/files/patch-crypto
deleted file mode 100644
index a32964ccf76f..000000000000
--- a/net-im/gale/files/patch-crypto
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgale/crypto_i.c.orig	Mon Jul  2 17:33:39 2001
-+++ libgale/crypto_i.c	Mon Jul  2 17:38:27 2001
-@@ -3,7 +3,9 @@
- #include <openssl/rand.h>
- #include <openssl/err.h>
- 
-+#ifndef __FreeBSD__
- #include <sys/vfs.h>
-+#endif /* __FreeBSD__ */
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/net-im/gale/files/patch-wcwidth b/net-im/gale/files/patch-wcwidth
index df5b644e4610..1092dcd62c6c 100644
--- a/net-im/gale/files/patch-wcwidth
+++ b/net-im/gale/files/patch-wcwidth
@@ -1,14 +1,13 @@
---- libgale/wcwidth.c.orig	Mon Jul  2 17:35:54 2001
-+++ libgale/wcwidth.c	Mon Jul  2 17:37:48 2001
-@@ -6,7 +6,11 @@
-  * Markus Kuhn -- 2000-02-08 -- public domain
-  */
+--- libgale/wcwidth.c.orig	Fri Oct 12 13:45:37 2001
++++ libgale/wcwidth.c	Fri Oct 12 13:45:52 2001
+@@ -8,8 +8,9 @@
  
-+#ifdef __FreeBSD__
-+#include <rune.h>
-+#else /* __FreeBSD__ */
+ #ifdef __FreeBSD__ /* peterh@sapros.com */
+ #include <rune.h>
+-#endif
++#else
  #include <wchar.h>
-+#endif /* __FreeBSD__ */
++#endif
  
  /* These functions define the column width of an ISO 10646 character
   * as follows:
diff --git a/net-im/gale/pkg-plist b/net-im/gale/pkg-plist
index 2ccb07f71354..47ebfb5b0d18 100644
--- a/net-im/gale/pkg-plist
+++ b/net-im/gale/pkg-plist
@@ -10,7 +10,6 @@ bin/gsub
 etc/gale/COPYING
 etc/gale/auth/trusted/ROOT
 include/gale/all.h
-include/gale/auth.h
 include/gale/client.h
 include/gale/compat.h
 include/gale/config.h
@@ -23,12 +22,15 @@ include/gale/misc.h
 include/gale/types.h
 include/oop-adns.h
 include/oop-glib.h
+include/oop-read.h
+include/oop-rl.h
+include/oop-tcl.h
 include/oop-www.h
 include/oop.h
 lib/libgale.a
 lib/libgale.la
 lib/libgale.so
-lib/libgale.so.11
+lib/libgale.so.12
 lib/liboop-adns.a
 lib/liboop-adns.la
 lib/liboop-adns.so
@@ -41,6 +43,10 @@ lib/liboop-rl.a
 lib/liboop-rl.la
 lib/liboop-rl.so
 lib/liboop-rl.so.0
+lib/liboop-tcl.a
+lib/liboop-tcl.la
+lib/liboop-tcl.so
+lib/liboop-tcl.so.0
 lib/liboop-www.a
 lib/liboop-www.la
 lib/liboop-www.so
@@ -50,10 +56,13 @@ lib/liboop.la
 lib/liboop.so
 lib/liboop.so.3
 sbin/gksign
-@dirrm include/gale
-@dirrm etc/gale/auth/trusted
-@dirrm etc/gale/auth/private
-@dirrm etc/gale/auth/local
+@exec mkdir -m 1777 %D/etc/gale/auth/cache
+@exec mkdir -m 1777 %D/etc/gale/auth/local
+@exec mkdir -m 755 %D/etc/gale/auth/private
 @dirrm etc/gale/auth/cache
+@dirrm etc/gale/auth/local
+@dirrm etc/gale/auth/private
+@dirrm etc/gale/auth/trusted
 @dirrm etc/gale/auth
 @dirrm etc/gale
+@dirrm include/gale