head	1.3;
access;
symbols
	pkgsrc-2014Q4:1.2.0.28
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.26
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.24
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.22
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.20
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.18
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.16
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.14
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.12
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.10
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.8
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.6
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.2;
locks; strict;
comment	@# @;


1.3
date	2015.01.04.12.02.21;	author joerg;	state dead;
branches;
next	1.2;
commitid	1pG9ZixND9xpAH4y;

1.2
date	2011.10.08.06.17.40;	author dholland;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2011.10.08.05.56.00;	author dholland;	state Exp;
branches;
next	;

1.2.2.1
date	2011.10.08.06.17.40;	author tron;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2011.10.08.20.32.17;	author tron;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Retire tzc, zephy and zephyr-mode, the last krb4 users in pkgsrc.
Can be revived as krb5 versions later.
@
text
@$NetBSD: patch-configure,v 1.2 2011/10/08 06:17:40 dholland Exp $

Regenerate after patching aclocal.m4 and configure.in.

--- configure.orig	2001-05-18 20:41:38.000000000 +0000
+++ configure
@@@@ -3354,8 +3354,54 @@@@ if test "$hesiod" != yes; then
 	CPPFLAGS="$CPPFLAGS -I$hesiod/include"
 	LDFLAGS="$LDFLAGS -L$hesiod/lib"
 fi
+echo $ac_n "checking for hes_resolve""... $ac_c" 1>&6
+echo "configure:3359: checking for hes_resolve" >&5
+if eval "test \"`echo '$''{'ac_cv_func_hes_resolve'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3364 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char hes_resolve(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char hes_resolve();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_hes_resolve) || defined (__stub___hes_resolve)
+choke me
+#else
+hes_resolve();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_hes_resolve=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_hes_resolve=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'hes_resolve`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  HESIOD_LIBS=
+else
+  echo "$ac_t""no" 1>&6
 echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6
-echo "configure:3359: checking for hes_resolve in -lhesiod" >&5
+echo "configure:3405: checking for hes_resolve in -lhesiod" >&5
 ac_lib_var=`echo hesiod'_'hes_resolve | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@@@ -3389,19 +3435,78 @@@@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+  HESIOD_LIBS="-lhesiod":
 else
   echo "$ac_t""no" 1>&6
 { echo "configure: error: Hesiod library not found" 1>&2; exit 1; }
 fi
 
-	HESIOD_LIBS="-lhesiod"
+fi
+
+
 	cat >> confdefs.h <<\EOF
 #define HAVE_HESIOD 1
 EOF
 
 fi
 
+if test "$hesiod" != "no"; then
+	for ac_func in hes_getmailhost
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3458: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3463 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+fi
 # Check whether --with-regex or --without-regex was given.
 if test "${with_regex+set}" = set; then
   withval="$with_regex"
@


1.2
log
@Check for hes_getmailhost before trying to call it. It's not in the libc
hesiod, and it looks as if it's a deprecated feature.

This in turn will make the mail notify tool not understand Hesiod
mailserver records on NetBSD and probably anyone else with a builtin
hesiod. If anyone really really wants that functionality, set
PREFER.hesiod=pkgsrc and let it build and link to the pkgsrc hesiod
library...

Fixes the build of zephyr.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2.2.1
log
@file patch-configure was added on branch pkgsrc-2011Q3 on 2011-10-08 20:32:17 +0000
@
text
@d1 143
@


1.2.2.2
log
@Pullup ticket #3537 - requested by dholland
chat/zephyr: build fix

Revisions pulled up:
- chat/zephyr/distinfo                                          1.7-1.8
- chat/zephyr/patches/patch-acconfig_h                          1.1
- chat/zephyr/patches/patch-aclocal_m4                          1.1
- chat/zephyr/patches/patch-an                                  1.2
- chat/zephyr/patches/patch-configure                           1.1-1.2
- chat/zephyr/patches/patch-configure_in                        1.1
- net/hesiod/Makefile                                           1.12
- net/hesiod/builtin.mk                                         1.1

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Thu Oct  6 08:48:00 UTC 2011

   Modified Files:
   	pkgsrc/net/hesiod: Makefile
   Added Files:
   	pkgsrc/net/hesiod: builtin.mk

   Log Message:
   Add builtin handling for hesiod. Previously, this was setting
   PKG_SKIP_REASION if hesiod was builtin, which was causing dependent
   packages (all one of them, AFAICT) to fail in the bulk builds.

   Someone who knows more about builtin/buildlink stuff should probably
   review this, but to casual inspection at least it seems to work; plus
   it's not likely to make anything worse.

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sat Oct  8 05:56:00 UTC 2011

   Modified Files:
   	pkgsrc/chat/zephyr: distinfo
   Added Files:
   	pkgsrc/chat/zephyr/patches: patch-aclocal_m4 patch-configure

   Log Message:
   Fix configure script to cope with hesiod in libc as well as in -lhesiod.

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sat Oct  8 06:17:40 UTC 2011

   Modified Files:
   	pkgsrc/chat/zephyr: distinfo
   	pkgsrc/chat/zephyr/patches: patch-an patch-configure
   Added Files:
   	pkgsrc/chat/zephyr/patches: patch-acconfig_h patch-configure_in

   Log Message:
   Check for hes_getmailhost before trying to call it. It's not in the libc
   hesiod, and it looks as if it's a deprecated feature.

   This in turn will make the mail notify tool not understand Hesiod
   mailserver records on NetBSD and probably anyone else with a builtin
   hesiod. If anyone really really wants that functionality, set
   PREFER.hesiod=pkgsrc and let it build and link to the pkgsrc hesiod
   library...

   Fixes the build of zephyr.
@
text
@a0 143
$NetBSD$

Regenerate after patching aclocal.m4 and configure.in.

--- configure.orig	2001-05-18 20:41:38.000000000 +0000
+++ configure
@@@@ -3354,8 +3354,54 @@@@ if test "$hesiod" != yes; then
 	CPPFLAGS="$CPPFLAGS -I$hesiod/include"
 	LDFLAGS="$LDFLAGS -L$hesiod/lib"
 fi
+echo $ac_n "checking for hes_resolve""... $ac_c" 1>&6
+echo "configure:3359: checking for hes_resolve" >&5
+if eval "test \"`echo '$''{'ac_cv_func_hes_resolve'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3364 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char hes_resolve(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char hes_resolve();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_hes_resolve) || defined (__stub___hes_resolve)
+choke me
+#else
+hes_resolve();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_hes_resolve=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_hes_resolve=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'hes_resolve`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  HESIOD_LIBS=
+else
+  echo "$ac_t""no" 1>&6
 echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6
-echo "configure:3359: checking for hes_resolve in -lhesiod" >&5
+echo "configure:3405: checking for hes_resolve in -lhesiod" >&5
 ac_lib_var=`echo hesiod'_'hes_resolve | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@@@ -3389,19 +3435,78 @@@@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+  HESIOD_LIBS="-lhesiod":
 else
   echo "$ac_t""no" 1>&6
 { echo "configure: error: Hesiod library not found" 1>&2; exit 1; }
 fi
 
-	HESIOD_LIBS="-lhesiod"
+fi
+
+
 	cat >> confdefs.h <<\EOF
 #define HAVE_HESIOD 1
 EOF
 
 fi
 
+if test "$hesiod" != "no"; then
+	for ac_func in hes_getmailhost
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3458: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3463 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+fi
 # Check whether --with-regex or --without-regex was given.
 if test "${with_regex+set}" = set; then
   withval="$with_regex"
@


1.1
log
@Fix configure script to cope with hesiod in libc as well as in -lhesiod.
@
text
@d3 1
a3 1
Regenerate after patching aclocal.m4.
d63 1
a63 1
@@@@ -3389,13 +3435,15 @@@@ LIBS="$ac_save_LIBS"
d81 63
@