head 1.2; access; symbols pkgsrc-2014Q4:1.1.0.28 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.26 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.24 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.22 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.20 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.18 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.16 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.14 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.12 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.10 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.8 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.6 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.4 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.2; locks; strict; comment @# @; 1.2 date 2015.01.04.12.02.21; author joerg; state dead; branches; next 1.1; commitid 1pG9ZixND9xpAH4y; 1.1 date 2011.10.08.05.56.00; author dholland; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2011.10.08.05.56.00; author tron; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2011.10.08.20.32.16; author tron; state Exp; branches; next ; desc @@ 1.2 log @Retire tzc, zephy and zephyr-mode, the last krb4 users in pkgsrc. Can be revived as krb5 versions later. @ text @$NetBSD: patch-aclocal_m4,v 1.1 2011/10/08 05:56:00 dholland Exp $ Cope with hesiod in libc as well as in -lhesiod. --- aclocal.m4.orig 2001-05-18 20:41:37.000000000 +0000 +++ aclocal.m4 @@@@ -273,8 +273,10 @@@@ if test "$hesiod" != yes; then CPPFLAGS="$CPPFLAGS -I$hesiod/include" LDFLAGS="$LDFLAGS -L$hesiod/lib" fi -AC_CHECK_LIB(hesiod, hes_resolve, :, - [AC_MSG_ERROR(Hesiod library not found)])]) +AC_CHECK_FUNC(hes_resolve, HESIOD_LIBS=, + AC_CHECK_LIB(hesiod, hes_resolve, HESIOD_LIBS="-lhesiod":, + [AC_MSG_ERROR(Hesiod library not found)])) +]) AC_DEFUN(ATHENA_HESIOD, [AC_ARG_WITH(hesiod, @@@@ -282,7 +284,6 @@@@ AC_DEFUN(ATHENA_HESIOD, [hesiod="$withval"], [hesiod=no]) if test "$hesiod" != no; then ATHENA_HESIOD_CHECK - HESIOD_LIBS="-lhesiod" AC_DEFINE(HAVE_HESIOD) fi AC_SUBST(HESIOD_LIBS)]) @ 1.1 log @Fix configure script to cope with hesiod in libc as well as in -lhesiod. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-aclocal_m4 was added on branch pkgsrc-2011Q3 on 2011-10-08 20:32:16 +0000 @ text @d1 27 @ 1.1.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 27 $NetBSD$ Cope with hesiod in libc as well as in -lhesiod. --- aclocal.m4.orig 2001-05-18 20:41:37.000000000 +0000 +++ aclocal.m4 @@@@ -273,8 +273,10 @@@@ if test "$hesiod" != yes; then CPPFLAGS="$CPPFLAGS -I$hesiod/include" LDFLAGS="$LDFLAGS -L$hesiod/lib" fi -AC_CHECK_LIB(hesiod, hes_resolve, :, - [AC_MSG_ERROR(Hesiod library not found)])]) +AC_CHECK_FUNC(hes_resolve, HESIOD_LIBS=, + AC_CHECK_LIB(hesiod, hes_resolve, HESIOD_LIBS="-lhesiod":, + [AC_MSG_ERROR(Hesiod library not found)])) +]) AC_DEFUN(ATHENA_HESIOD, [AC_ARG_WITH(hesiod, @@@@ -282,7 +284,6 @@@@ AC_DEFUN(ATHENA_HESIOD, [hesiod="$withval"], [hesiod=no]) if test "$hesiod" != no; then ATHENA_HESIOD_CHECK - HESIOD_LIBS="-lhesiod" AC_DEFINE(HAVE_HESIOD) fi AC_SUBST(HESIOD_LIBS)]) @