From peterh@wartch.sapros.com  Tue Nov  6 14:22:47 2001
Return-Path: <peterh@wartch.sapros.com>
Received: from wartch.sapros.com (rularan.sapros.com [204.182.55.17])
	by hub.freebsd.org (Postfix) with ESMTP
	id 658E037B405; Tue,  6 Nov 2001 14:22:47 -0800 (PST)
Received: from wartch.sapros.com (localhost [127.0.0.1])
	by wartch.sapros.com (8.11.6/8.11.6) with ESMTP id fA6MMkW35635;
	Tue, 6 Nov 2001 14:22:46 -0800 (PST)
	(envelope-from peterh@wartch.sapros.com)
Message-Id: <200111062222.fA6MMkW35635@wartch.sapros.com>
Date: Tue, 06 Nov 2001 14:22:46 -0800
From: Peter Haight <peterh@sapros.com>
To: freebsd-gnats-submit@FreeBSD.org, peterh@sapros.com,
	petef@FreeBSD.org
Subject:

>Number:         31810
>Category:       ports
>Synopsis:       [something about the gale port]
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    petef
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 06 14:30:00 PST 2001
>Closed-Date:    Sat Nov 24 16:12:33 PST 2001
>Last-Modified:  Sat Nov 24 16:12:48 PST 2001
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 The problem is that there is a bug in autoconf when using the macro
 AC_CONFIG_SUBDIRS and INSTALL is defined in the environment. I had fixed
 this before by including a patch to configure, but I'm guessing that
 autoconf is getting run somehow which overrides my patch. So, since the
 problem is a bug in autoconf, I'm including a patch to include an
 acinclude.m4 which overrides AC_CONFIG_SUBDIRS with one that works.
 
 So, here's the new patch:
 
 
 diff -r -N -u gale/Makefile gale.new/Makefile
 --- gale/Makefile	Tue Jul  3 06:22:49 2001
 +++ gale.new/Makefile	Tue Nov  6 14:11:19 2001
 @@ -6,11 +6,10 @@
  #
  
  PORTNAME=	gale
 -PORTVERSION=	0.99d
 -PORTREVISION=	1
 +PORTVERSION=	0.99e
  CATEGORIES=	net
  MASTER_SITES=	http://download.gale.org/
 -DISTNAME=	${PORTNAME}-${PORTVERSION}anger
 +DISTNAME=	${PORTNAME}-${PORTVERSION}gg
  
  MAINTAINER=	peterh@sapros.com
  
 @@ -20,12 +19,18 @@
  
  USE_OPENSSL=	yes
  GNU_CONFIGURE=	yes
 +USE_AUTOMAKE=	yes
 +USE_AUTOCONF=	yes
 +USE_GMAKE=	yes
  
  CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
  CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib \
  		-I${LOCALBASE}/include/w3c-libwww
  LDFLAGS+=	-L${LOCALBASE}/lib
  CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 +
 +pre-configure:
 +	cd ${WRKSRC} && aclocal
  
  post-install:
  	${CAT} ${PKGMESSAGE}
 diff -r -N -u gale/distinfo gale.new/distinfo
 --- gale/distinfo	Tue Jul  3 06:22:49 2001
 +++ gale.new/distinfo	Fri Oct 12 13:41:26 2001
 @@ -1 +1 @@
 -MD5 (gale-0.99danger.tar.gz) = 4d29cc71a47c219aa4d1d90bf87fd975
 +MD5 (gale-0.99egg.tar.gz) = 5240b10de2c7998887b3bc3dd7e8b30b
 diff -r -N -u gale/files/patch-acinclude gale.new/files/patch-acinclude
 --- gale/files/patch-acinclude	Wed Dec 31 16:00:00 1969
 +++ gale.new/files/patch-acinclude	Tue Nov  6 14:10:05 2001
 @@ -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 -r -N -u gale/files/patch-configure gale.new/files/patch-configure
 --- gale/files/patch-configure	Tue Jul  3 06:22:51 2001
 +++ gale.new/files/patch-configure	Wed Dec 31 16:00:00 1969
 @@ -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 -r -N -u gale/files/patch-crypto gale.new/files/patch-crypto
 --- gale/files/patch-crypto	Tue Jul  3 06:22:51 2001
 +++ gale.new/files/patch-crypto	Wed Dec 31 16:00:00 1969
 @@ -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 -r -N -u gale/files/patch-wcwidth gale.new/files/patch-wcwidth
 --- gale/files/patch-wcwidth	Tue Jul  3 06:22:51 2001
 +++ gale.new/files/patch-wcwidth	Fri Oct 12 13:46:19 2001
 @@ -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 -r -N -u gale/pkg-plist gale.new/pkg-plist
 --- gale/pkg-plist	Tue Jul  3 06:22:49 2001
 +++ gale.new/pkg-plist	Thu Oct 25 15:12:50 2001
 @@ -10,7 +10,6 @@
  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/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.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.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 777 %D/etc/gale/auth/cache
 +@exec mkdir -m 777 %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
 
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: dd 
Responsible-Changed-When: Wed Nov 7 05:39:33 PST 2001 
Responsible-Changed-Why:  
ports-related 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31810 
State-Changed-From-To: open->closed 
State-Changed-By: petef 
State-Changed-When: Tue Nov 20 18:23:49 PST 2001 
State-Changed-Why:  
This port has already been updated to version 0.99e. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31810 
State-Changed-From-To: closed->open 
State-Changed-By: petef 
State-Changed-When: Wed Nov 21 04:32:09 PST 2001 
State-Changed-Why:  
My mistake -- this is not version 0.99e (always remember to 'cvs diff'!) 


Responsible-Changed-From-To: freebsd-ports->petef 
Responsible-Changed-By: petef 
Responsible-Changed-When: Wed Nov 21 04:32:09 PST 2001 
Responsible-Changed-Why:  
I'll take care of this update 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31810 
State-Changed-From-To: open->closed 
State-Changed-By: petef 
State-Changed-When: Sat Nov 24 16:12:33 PST 2001 
State-Changed-Why:  
Committed with a few changes, thanks!  Sorry for the mixup before. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31810 
>Unformatted:
