diff options
author | joerg <joerg> | 2015-01-04 12:02:21 +0000 |
---|---|---|
committer | joerg <joerg> | 2015-01-04 12:02:21 +0000 |
commit | abb970c875eaa62e8b37c3e1028f14e8689f513a (patch) | |
tree | 5138f82e6a67d81b22ee7d4b8c377a08b26486d2 /chat | |
parent | 32068e50e7488e7570f7c77c13ea09b2018fe4c3 (diff) | |
download | pkgsrc-abb970c875eaa62e8b37c3e1028f14e8689f513a.tar.gz |
Retire tzc, zephy and zephyr-mode, the last krb4 users in pkgsrc.
Can be revived as krb5 versions later.
Diffstat (limited to 'chat')
34 files changed, 1 insertions, 867 deletions
diff --git a/chat/Makefile b/chat/Makefile index ebbb20be0b0..5573e11afc8 100644 --- a/chat/Makefile +++ b/chat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.176 2014/12/03 22:50:15 rodent Exp $ +# $NetBSD: Makefile,v 1.177 2015/01/04 12:02:21 joerg Exp $ # COMMENT= Communication programs @@ -123,7 +123,6 @@ SUBDIR+= tkabber SUBDIR+= tkicb SUBDIR+= tkirc SUBDIR+= tkirc2 -SUBDIR+= tzc SUBDIR+= unrealircd SUBDIR+= vicq SUBDIR+= weechat @@ -135,8 +134,6 @@ SUBDIR+= xchat-systray-integration SUBDIR+= ysm SUBDIR+= zenicb SUBDIR+= zenirc -SUBDIR+= zephyr -SUBDIR+= zephyr-mode SUBDIR+= zircon .include "../mk/misc/category.mk" diff --git a/chat/tzc/DESCR b/chat/tzc/DESCR deleted file mode 100644 index 4ddeee166cd..00000000000 --- a/chat/tzc/DESCR +++ /dev/null @@ -1 +0,0 @@ -Backend program for CMU zephyr-mode diff --git a/chat/tzc/Makefile b/chat/tzc/Makefile deleted file mode 100644 index 545f402667b..00000000000 --- a/chat/tzc/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile,v 1.16 2013/02/18 20:13:56 dholland Exp $ -# - -DISTNAME= tzc-2.6.15 -PKGREVISION= 3 -CATEGORIES= chat net -MASTER_SITES= http://www.cs.cmu.edu/People/dkindred/zephyr-mode/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.cs.cmu.edu/People/dkindred/zephyr/zephyr.html -COMMENT= Back-end program for zephyr-mode - -CPPFLAGS+= -I${BUILDLINK_PREFIX.kth-krb4}/include/kerberosIV -CPPFLAGS+= -I/usr/include/krb5 -LDFLAGS+= -lroken -lcrypto -lcom_err - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" -LDFLAGS+= -lcrypt -SUBST_CLASSES+= FreeFly -SUBST_STAGE.FreeFly= post-patch -SUBST_MESSAGE.FreeFly= Removing unwanted libdes -SUBST_FILES.FreeFly= Makefile -SUBST_SED.FreeFly= -e 's,-lkrb -ldes,-lkrb,g' -.endif - -INSTALLATION_DIRS+= bin - -.include "../../chat/zephyr/buildlink3.mk" -.include "../../security/kth-krb4/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/chat/tzc/PLIST b/chat/tzc/PLIST deleted file mode 100644 index 3eb76aeb92e..00000000000 --- a/chat/tzc/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/30 17:41:04 sommerfeld Exp $ -bin/tzc diff --git a/chat/tzc/distinfo b/chat/tzc/distinfo deleted file mode 100644 index 53cd4f2c8e5..00000000000 --- a/chat/tzc/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.5 2011/03/28 13:13:33 obache Exp $ - -SHA1 (tzc-2.6.15.tar.gz) = 13385b849f6e5142c94393da253eca70f6ec4bf6 -RMD160 (tzc-2.6.15.tar.gz) = ce5be93fc31b57f41e433446f4ebfe06b9a7eb14 -Size (tzc-2.6.15.tar.gz) = 22726 bytes -SHA1 (patch-aa) = f7cd47493f8b3a51bb6fd71581c7912cd49ccd0f -SHA1 (patch-ab) = 8996eb2c93d5605d57dbb32093f62baaa0af1111 diff --git a/chat/tzc/patches/patch-aa b/chat/tzc/patches/patch-aa deleted file mode 100644 index 7d1659de06e..00000000000 --- a/chat/tzc/patches/patch-aa +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2011/03/28 13:13:34 obache Exp $ - ---- Makefile.orig Tue Jul 10 22:17:31 2001 -+++ Makefile -@@ -1,11 +1,11 @@ - # Configure as appropriate. - --KERB_INCLUDES = -I/usr/local/include --KERB_LIBDIR = /usr/local/lib -+KERB_INCLUDES = -I${LOCALBASE}/include -+KERB_LIBDIR = ${LOCALBASE}/lib - KERB_LIBS = -L$(KERB_LIBDIR) -lkrb -ldes -lcom_err - --ZEPHYR_INCLUDES = -I/usr/local/include --ZEPHYR_LIBDIR = /usr/local/lib -+ZEPHYR_INCLUDES = -I${LOCALBASE}/include -+ZEPHYR_LIBDIR = ${LOCALBASE}/lib - ZEPHYR_LIBS = -L$(ZEPHYR_LIBDIR) -lzephyr - - # You may need to use these to pick up some BSD'ish functions like flock(). -@@ -29,6 +29,8 @@ CFLAGS = -g -O -Wall $(DEFINES) $(INCLUD - - LIBS = $(ZEPHYR_LIBS) $(KERB_LIBS) $(MISC_LIBS) - -+all: tzc -+ - tzc: tzc.o lread.o $(EXTRA_OBJS) - $(LD) $(LDFLAGS) -o tzc.new tzc.o lread.o $(EXTRA_OBJS) $(LIBS) - /bin/mv tzc.new tzc -@@ -38,3 +40,6 @@ tzc.o: lread.h - - clean: - /bin/rm -f *.o tzc tzc.new core -+ -+install: -+ ${INSTALL} tzc ${DESTDIR}${PREFIX}/bin/tzc diff --git a/chat/tzc/patches/patch-ab b/chat/tzc/patches/patch-ab deleted file mode 100644 index 7540fa94ebe..00000000000 --- a/chat/tzc/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2006/06/18 19:36:53 joerg Exp $ - ---- tzc.c.orig 2006-06-18 19:27:56.000000000 +0000 -+++ tzc.c -@@ -1164,6 +1164,7 @@ handle_set_location(Value *setloc_cmd) - report_location(); - - fail: -+ ; - /* nothing to do */ - } - diff --git a/chat/zephyr-mode/DESCR b/chat/zephyr-mode/DESCR deleted file mode 100644 index 7e348ee9c74..00000000000 --- a/chat/zephyr-mode/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -CMU zephyr-mode; a zephyr client which runs inside emacs. -Very extensible and tweakable; poorly documented. diff --git a/chat/zephyr-mode/Makefile b/chat/zephyr-mode/Makefile deleted file mode 100644 index 01d81e48abf..00000000000 --- a/chat/zephyr-mode/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: Makefile,v 1.19 2013/02/17 19:17:57 dholland Exp $ -# - -DISTNAME= zephyr-mode-2.5.20 -PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} -PKGREVISION= 4 -CATEGORIES= chat net -MASTER_SITES= http://www.cs.cmu.edu/People/dkindred/zephyr-mode/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.cs.cmu.edu/People/dkindred/zephyr/zephyr.html -COMMENT= CMU Emacs-based Zephyr client - -DEPENDS+= tzc>=2.6.15:../../chat/tzc - -NO_BUILD= yes - -.include "../../editors/emacs/modules.mk" - -do-install: - @${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/zephyr-mode - @for f in ${WRKSRC}/elisp/*.el; do \ - j="${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/zephyr-mode"; \ - ${ECHO} $$j; $$j; \ - done - -.include "../../mk/bsd.pkg.mk" diff --git a/chat/zephyr-mode/PLIST b/chat/zephyr-mode/PLIST deleted file mode 100644 index 58cab44a037..00000000000 --- a/chat/zephyr-mode/PLIST +++ /dev/null @@ -1,14 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:37:52 joerg Exp $ -share/emacs/site-lisp/zephyr-mode/gnus-url.el -share/emacs/site-lisp/zephyr-mode/hot-link.el -share/emacs/site-lisp/zephyr-mode/hot-url.el -share/emacs/site-lisp/zephyr-mode/mh-e-url.el -share/emacs/site-lisp/zephyr-mode/mosaic-fetch-url.el -share/emacs/site-lisp/zephyr-mode/netscape-fetch-url.el -share/emacs/site-lisp/zephyr-mode/telnet-conn.el -share/emacs/site-lisp/zephyr-mode/vm-url.el -share/emacs/site-lisp/zephyr-mode/w3-fetch-url.el -share/emacs/site-lisp/zephyr-mode/zephyr-remote.el -share/emacs/site-lisp/zephyr-mode/zephyr-url.el -share/emacs/site-lisp/zephyr-mode/zephyr.el -share/emacs/site-lisp/zephyr-mode/zlocate-finger.el diff --git a/chat/zephyr-mode/distinfo b/chat/zephyr-mode/distinfo deleted file mode 100644 index 1fa76113739..00000000000 --- a/chat/zephyr-mode/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 15:59:14 agc Exp $ - -SHA1 (zephyr-mode-2.5.20.tar.gz) = f638af7f1d3e8d0d2569c9c9a17c5258b4094df2 -RMD160 (zephyr-mode-2.5.20.tar.gz) = a46008cbd3a274f1dc2efc0e203826b52a049a23 -Size (zephyr-mode-2.5.20.tar.gz) = 87238 bytes diff --git a/chat/zephyr/DESCR b/chat/zephyr/DESCR deleted file mode 100644 index b7edb9574a3..00000000000 --- a/chat/zephyr/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -This is the Project Athena Zephyr notification system 2001/05/28 -snapshot. - -Zephyr allows users to send messages to other users or to groups of -users. Users can view incoming Zephyr messages as windowgrams -(transient X windows) or as text on a terminal. diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile deleted file mode 100644 index 36bb9c56256..00000000000 --- a/chat/zephyr/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# $NetBSD: Makefile,v 1.22 2013/07/15 02:02:18 ryoon Exp $ -# - -DISTNAME= zephyr-20010518 -PKGREVISION= 7 -CATEGORIES= chat net -MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://web.mit.edu/olh/Zephyr/index.html -COMMENT= Project Athena's original Instant Messaging system - -WRKSRC= ${WRKDIR}/zephyr -GNU_CONFIGURE= YES - -.include "../../mk/bsd.prefs.mk" - -CPPFLAGS+= -I${BUILDLINK_PREFIX.kth-krb4}/include/kerberosIV -CPPFLAGS.NetBSD+= -I${BUILDLINK_PREFIX.kth-krb4}/include/kerberosIV/ss -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --with-krb4 -CONFIGURE_ARGS+= --with-ares - -ZEPHYR_DOCDIR= ${PREFIX}/share/doc/zephyr -ZEPHYR_DOCS= INSTALL NOTES OPERATING README USING - -PKG_SYSCONFSUBDIR= zephyr -OWN_DIRS= ${PKG_SYSCONFDIR}/acl -EGDIR= ${PREFIX}/share/examples/zephyr -CONF_FILES= ${EGDIR}/default.subscriptions \ - ${PKG_SYSCONFDIR}/default.subscriptions - -RCD_SCRIPTS= zhm - -SUBST_CLASSES+= mandir -SUBST_STAGE.mandir= pre-configure -SUBST_MESSAGE.mandir= Fixing mandir in Makefile.in -SUBST_FILES.mandir= */*/Makefile.in */Makefile.in Makefile.in -SUBST_SED.mandir= -e 's,$${prefix}/man,@mandir@,g' - -.if ${OPSYS} == "NetBSD" -BUILDLINK_TRANSFORM+= l:ss:ss:roken:crypt -.endif - -.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" -CFLAGS+= -DHAVE_STRERROR -SUBST_CLASSES+= FreeFly -SUBST_STAGE.FreeFly= post-patch -SUBST_MESSAGE.FreeFly= Replacing libdes with libcrypt + libcrypto -SUBST_FILES.FreeFly= aclocal.m4 configure -SUBST_SED.FreeFly= -e 's,-lkrb -ldes,-lkrb -lcrypt -lcrypto,g' -.else -CONFIGURE_ARGS+= --with-hesiod -.endif - -pre-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} - ${INSTALL_DATA_DIR} ${DESTDIR}${ZEPHYR_DOCDIR} -.for f in ${ZEPHYR_DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${ZEPHYR_DOCDIR} -.endfor - -.include "../../mk/readline.buildlink3.mk" -.include "../../net/hesiod/buildlink3.mk" -.include "../../net/libares/buildlink3.mk" -.include "../../security/kth-krb4/buildlink3.mk" -.include "../../x11/libXaw/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/chat/zephyr/PLIST b/chat/zephyr/PLIST deleted file mode 100644 index d6e7fd885b5..00000000000 --- a/chat/zephyr/PLIST +++ /dev/null @@ -1,44 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:04:59 jperkin Exp $ -bin/xzwrite -bin/zaway -bin/zctl -bin/zleave -bin/zlocate -bin/zmailnotify -bin/znol -bin/zstat -bin/zwgc -bin/zwrite -include/zephyr/mit-copyright.h -include/zephyr/zephyr.h -include/zephyr/zephyr_err.h -lib/libzephyr.a -man/man1/xzwrite.1 -man/man1/zaway.1 -man/man1/zctl.1 -man/man1/zephyr.1 -man/man1/zleave.1 -man/man1/zlocate.1 -man/man1/zmailnotify.1 -man/man1/znol.1 -man/man1/zwgc.1 -man/man1/zwrite.1 -man/man8/zephyrd.8 -man/man8/zhm.8 -man/man8/zpopnotify.8 -man/man8/zshutdown_notify.8 -man/man8/zstat.8 -sbin/zephyrd -sbin/zhm -sbin/zpopnotify -sbin/zshutdown_notify -share/doc/zephyr/INSTALL -share/doc/zephyr/NOTES -share/doc/zephyr/OPERATING -share/doc/zephyr/README -share/doc/zephyr/USING -share/examples/zephyr/default.subscriptions -share/zephyr/XZwrite -share/zephyr/xzwrite.bitmap -share/zephyr/zwgc.desc -share/zephyr/zwgc_resources diff --git a/chat/zephyr/buildlink3.mk b/chat/zephyr/buildlink3.mk deleted file mode 100644 index a6fa6a61866..00000000000 --- a/chat/zephyr/buildlink3.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.9 2012/05/07 01:53:17 dholland Exp $ - -BUILDLINK_TREE+= zephyr - -.if !defined(ZEPHYR_BUILDLINK3_MK) -ZEPHYR_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.zephyr+= zephyr>=20010518nb1 -BUILDLINK_ABI_DEPENDS.zephyr+= zephyr>=20010518nb4 -BUILDLINK_PKGSRCDIR.zephyr?= ../../chat/zephyr -BUILDLINK_DEPMETHOD.zephyr?= build -.endif # ZEPHYR_BUILDLINK3_MK - -BUILDLINK_TREE+= -zephyr diff --git a/chat/zephyr/distinfo b/chat/zephyr/distinfo deleted file mode 100644 index 55aba491c2a..00000000000 --- a/chat/zephyr/distinfo +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: distinfo,v 1.9 2011/11/28 19:42:39 marino Exp $ - -SHA1 (zephyr-20010518.tar.gz) = cd2fca9c2f0bfaa8e69c94813bedc87d66d3ac1c -RMD160 (zephyr-20010518.tar.gz) = 1082db0df40e4ac1007e4b2b4f8adc15cf8a8ab0 -Size (zephyr-20010518.tar.gz) = 342259 bytes -SHA1 (patch-aa) = f4338f0da9085e1780c52c9b2be2366b7a0f22c2 -SHA1 (patch-ab) = 61cbadf511806c1c16e489ac6d14de347b09277a -SHA1 (patch-acconfig_h) = 7cbee0e8cd977fcb714b58bb0e9fb99b52cc5637 -SHA1 (patch-aclocal_m4) = 5414d637ec7de322cbf27c211345df241a914df1 -SHA1 (patch-ad) = b0f8c408afc2e7fe9a673a5f2ec562a3e34e225c -SHA1 (patch-ae) = e0d0776b891db5b8542285899e22c886337cc6c7 -SHA1 (patch-af) = 4ebb22fa3c1b2ed351ee267be737d34d8292129c -SHA1 (patch-ag) = 2c756da1e62613333cca2b68ca9b5f6c96e0f147 -SHA1 (patch-ah) = 8282d416d24eafcb40ead93d4c376f1e8e80b207 -SHA1 (patch-ai) = bfa2d01d20884d31e58bd12a171938504d929e28 -SHA1 (patch-aj) = 3ec4b1624e2eecefe129ac53e870ce2fb2bce236 -SHA1 (patch-ak) = 7c2084aac1e4b30124c380fbc369cb6a6b41eb17 -SHA1 (patch-al) = d61151a84bb9a55c21b2d757650064390127f8c8 -SHA1 (patch-am) = 40fc00c67f78485b0d45a86ab97aa8ae662dda40 -SHA1 (patch-an) = 72782e62a6b942b8aa537fd1d350505e11a2f87e -SHA1 (patch-configure) = 92bd3d15eda54a0eea48af347acabf32bbb92564 -SHA1 (patch-configure_in) = 7080333e26de0ce0d7cf3fb802b0a42ffeece118 diff --git a/chat/zephyr/files/zhm.sh b/chat/zephyr/files/zhm.sh deleted file mode 100644 index 614ca4dd850..00000000000 --- a/chat/zephyr/files/zhm.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: zhm.sh,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ -# -# PROVIDE: zhm -# REQUIRE: DAEMON - -. /etc/rc.subr - -name="zhm" -rcvar="$name" -command="@PREFIX@/sbin/${name}" -pidfile="/var/run/${name}.pid" -required_files="@PKG_SYSCONFDIR@/server.list" -start_precmd="zhm_precmd" - -zhm_precmd() -{ - rc_flags="`cat @PKG_SYSCONFDIR@/server.list`" -} -load_rc_config "$name" -run_rc_command "$1" diff --git a/chat/zephyr/patches/patch-aa b/chat/zephyr/patches/patch-aa deleted file mode 100644 index dc7dcb82d82..00000000000 --- a/chat/zephyr/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ - ---- lib/Makefile.in.orig Sat Jan 31 18:55:07 1998 -+++ lib/Makefile.in -@@ -42,7 +42,7 @@ libzephyr.a: ${OBJS} - - zephyr_err.c ${BUILDTOP}/h/zephyr/zephyr_err.h: zephyr_err.et - compile_et ${srcdir}/zephyr_err.et -- mv zephyr_err.h ${BUILDTOP}/h/zephyr -+ cp zephyr_err.h ${BUILDTOP}/h/zephyr - - .c.o: - ${CC} -c ${ALL_CFLAGS} $< diff --git a/chat/zephyr/patches/patch-ab b/chat/zephyr/patches/patch-ab deleted file mode 100644 index 41f46a35aa1..00000000000 --- a/chat/zephyr/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ - ---- lib/ZMkAuth.c.orig Fri Jan 22 18:19:16 1999 -+++ lib/ZMkAuth.c -@@ -42,7 +42,9 @@ Code_t ZMakeAuthentication(notice, buffe - char *cstart, *cend; - ZChecksum_t checksum; - CREDENTIALS cred; -- extern unsigned long des_quad_cksum(); -+#ifdef ERROR_TABLE_BASE_krb -+#define krb_err_base ERROR_TABLE_BASE_krb -+#endif - - now = time(0); - if (last_authent_time == 0 || (now - last_authent_time > 120)) { diff --git a/chat/zephyr/patches/patch-acconfig_h b/chat/zephyr/patches/patch-acconfig_h deleted file mode 100644 index 5b213851999..00000000000 --- a/chat/zephyr/patches/patch-acconfig_h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-acconfig_h,v 1.1 2011/10/08 06:17:40 dholland Exp $ - -Check for HES_GETMAILHOST before using it. - ---- acconfig.h~ 1998-12-01 16:48:27.000000000 +0000 -+++ acconfig.h -@@ -1,6 +1,9 @@ - /* Define to compile with Hesiod support. */ - #undef HAVE_HESIOD - -+/* Define if Hesiod has hes_getmailhost. */ -+#undef HAVE_HES_GETMAILHOST -+ - /* Define to compile with Kerberos support. */ - #undef HAVE_KRB4 - diff --git a/chat/zephyr/patches/patch-aclocal_m4 b/chat/zephyr/patches/patch-aclocal_m4 deleted file mode 100644 index 4a826be9343..00000000000 --- a/chat/zephyr/patches/patch-aclocal_m4 +++ /dev/null @@ -1,27 +0,0 @@ -$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)]) diff --git a/chat/zephyr/patches/patch-ad b/chat/zephyr/patches/patch-ad deleted file mode 100644 index 559c1f4268c..00000000000 --- a/chat/zephyr/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ - ---- server/zserver.h.orig Mon Feb 26 23:58:14 2001 -+++ server/zserver.h -@@ -268,9 +268,9 @@ void sweep_ticket_hash_table __P((void * - #ifndef NOENCRYPTION - Sched *check_key_sched_cache __P((des_cblock key)); - void add_to_key_sched_cache __P((des_cblock key, Sched *sched)); --int krb_set_key __P((char *key, int cvt)); -+int krb_set_key __P((void *key, int cvt)); - int krb_rd_req __P((KTEXT authent, char *service, char *instance, -- unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn)); -+ KRB_INT32 from_addr, AUTH_DAT *ad, char *fn)); - int krb_find_ticket __P((KTEXT authent, KTEXT ticket)); - int krb_get_lrealm __P((char *r, int n)); - #endif diff --git a/chat/zephyr/patches/patch-ae b/chat/zephyr/patches/patch-ae deleted file mode 100644 index 20d59bfc4ba..00000000000 --- a/chat/zephyr/patches/patch-ae +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2007/03/17 14:37:47 rillig Exp $ - -gcc4 complains: -kopt.c:34: error: static declaration of 'krbONE' follows non-static declaration -.../.buildlink/include/kerberosIV/krb.h:64: error: previous declaration of 'krbONE' was here - ---- server/kopt.c.orig 2001-02-27 05:48:01.000000000 +0100 -+++ server/kopt.c 2007-03-17 15:34:42.000000000 +0100 -@@ -31,8 +31,8 @@ static const char *rcsid_rd_req_c = - - /* Byte ordering */ - #undef HOST_BYTE_ORDER --static int krbONE = 1; --#define HOST_BYTE_ORDER (* (char *) &krbONE) -+static int my_krbONE = 1; -+#define HOST_BYTE_ORDER (* (char *) &my_krbONE) - - #define KRB_PROT_VERSION 4 - -@@ -161,7 +161,7 @@ void add_to_key_sched_cache(key, sched) - - int - krb_set_key(key,cvt) -- char *key; -+ void *key; - int cvt; - { - #ifdef NOENCRYPTION -@@ -172,7 +172,7 @@ krb_set_key(key,cvt) - int ret; - - if (cvt) -- string_to_key(key,serv_key); -+ string_to_key((char *)key,serv_key); - else - memcpy((char *)serv_key,key,8); - -@@ -187,6 +187,14 @@ krb_set_key(key,cvt) - #endif /* NOENCRYPTION */ - } - -+static u_long -+swap_u_long(u_long x) -+{ -+ return ((x & 0xff000000) >> 24) | -+ ((x & 0x00ff0000) >> 8) | -+ ((x & 0x0000ff00) << 8) | -+ ((x & 0x000000ff) << 24); -+} - - /* - * krb_rd_req() takes an AUTH_MSG_APPL_REQUEST or -@@ -234,7 +242,7 @@ krb_rd_req(authent,service,instance,from - KTEXT authent; /* The received message */ - char *service; /* Service name */ - char *instance; /* Service instance */ -- unsigned KRB_INT32 from_addr; /* Net address of originating host */ -+ KRB_INT32 from_addr; /* Net address of originating host */ - AUTH_DAT *ad; /* Structure to be filled in */ - char *fn; /* Filename to get keys from */ - { diff --git a/chat/zephyr/patches/patch-af b/chat/zephyr/patches/patch-af deleted file mode 100644 index 150330b8fa9..00000000000 --- a/chat/zephyr/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ - ---- server/kstuff.c.orig Tue Apr 10 19:28:20 2001 -+++ server/kstuff.c -@@ -124,6 +124,9 @@ SendKerberosData(fd, ticket, service, ho - char p[32]; - int written; - int size_to_write; -+#ifdef ERROR_TABLE_BASE_krb -+#define krb_err_base ERROR_TABLE_BASE_krb -+#endif - - rem = krb_mk_req(ticket, service, host, ZGetRealm(), (u_long) 0); - if (rem != KSUCCESS) diff --git a/chat/zephyr/patches/patch-ag b/chat/zephyr/patches/patch-ag deleted file mode 100644 index e51390446c6..00000000000 --- a/chat/zephyr/patches/patch-ag +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ - ---- server/realm.c.orig 2001-02-27 05:51:07.000000000 +0100 -+++ server/realm.c -@@ -498,7 +498,7 @@ realm_init() - char list_file[128]; - char rlmprinc[ANAME_SZ+INST_SZ+REALM_SZ+3]; - -- sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, REALM_LIST_FILE); -+ sprintf(list_file, "%s/%s", SYSCONFDIR, REALM_LIST_FILE); - rlmnames = get_realm_lists(list_file); - if (!rlmnames) { - zdbug((LOG_DEBUG, "No other realms")); -@@ -1096,6 +1096,10 @@ realm_dump_realms(fp) - } - - #ifdef HAVE_KRB4 -+#ifdef ERROR_TABLE_BASE_krb -+#define krb_err_base ERROR_TABLE_BASE_krb -+#endif -+ - static void - realm_sendit_auth(notice, who, auth, realm, ack_to_sender) - ZNotice_t *notice; diff --git a/chat/zephyr/patches/patch-ah b/chat/zephyr/patches/patch-ah deleted file mode 100644 index 1293113b8de..00000000000 --- a/chat/zephyr/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ - ---- zhm/zhm.c.orig Fri May 19 19:19:21 2000 -+++ zhm/zhm.c -@@ -22,7 +22,9 @@ int use_hesiod = 0; - #define srandom srand48 - #endif - --#define PIDDIR "/var/athena/" -+#ifndef PIDDIR -+#define PIDDIR "/var/run/" -+#endif - - int hmdebug, rebootflag, noflushflag, errflg, dieflag, inetd, oldpid, nofork; - int no_server = 1, nservchang, nserv, nclt; diff --git a/chat/zephyr/patches/patch-ai b/chat/zephyr/patches/patch-ai deleted file mode 100644 index 9bdd167d542..00000000000 --- a/chat/zephyr/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2009/10/29 21:53:10 tnn Exp $ - ---- Makefile.in.orig 1998-06-11 21:10:02.000000000 +0200 -+++ Makefile.in -@@ -31,8 +31,6 @@ install: - ${ENSUREDIR} ${DESTDIR}${libdir} 755 - ${ENSUREDIR} ${DESTDIR}${datadir} 755 - ${ENSUREDIR} ${DESTDIR}${datadir}/zephyr 755 -- ${ENSUREDIR} ${DESTDIR}${sysconfdir} 755 -- ${ENSUREDIR} ${DESTDIR}${sysconfdir}/zephyr/acl 755 - ${ENSUREDIR} ${DESTDIR}${sbindir} 755 - ${ENSUREDIR} ${DESTDIR}${includedir} 755 - ${ENSUREDIR} ${DESTDIR}${includedir}/zephyr 755 diff --git a/chat/zephyr/patches/patch-aj b/chat/zephyr/patches/patch-aj deleted file mode 100644 index f77a0ec0867..00000000000 --- a/chat/zephyr/patches/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ - ---- server/main.c.orig 2001-02-27 05:50:08.000000000 +0100 -+++ server/main.c -@@ -140,14 +140,14 @@ main(argc, argv) - extern int optind; - - #ifndef HAVE_HESIOD -- sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, SERVER_LIST_FILE); -+ sprintf(list_file, "%s/%s", SYSCONFDIR, SERVER_LIST_FILE); - #endif - #ifdef HAVE_KRB4 -- sprintf(srvtab_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_SRVTAB); -- sprintf(tkt_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_TKFILE); -+ sprintf(srvtab_file, "%s/%s", SYSCONFDIR, ZEPHYR_SRVTAB); -+ sprintf(tkt_file, "%s/%s", SYSCONFDIR, ZEPHYR_TKFILE); - #endif -- sprintf(acl_dir, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_ACL_DIR); -- sprintf(subs_file, "%s/zephyr/%s", SYSCONFDIR, DEFAULT_SUBS_FILE); -+ sprintf(acl_dir, "%s/%s", SYSCONFDIR, ZEPHYR_ACL_DIR); -+ sprintf(subs_file, "%s/%s", SYSCONFDIR, DEFAULT_SUBS_FILE); - - /* set name */ - programname = strrchr(argv[0],'/'); diff --git a/chat/zephyr/patches/patch-ak b/chat/zephyr/patches/patch-ak deleted file mode 100644 index be78f393f96..00000000000 --- a/chat/zephyr/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $ - ---- server/Makefile.in.orig 2003-07-29 20:46:05.000000000 +0200 -+++ server/Makefile.in -@@ -52,7 +52,7 @@ install: - ${INSTALL} -m 755 -s zephyrd ${DESTDIR}${sbindir} - ${INSTALL} -m 644 ${srcdir}/zephyrd.8 ${DESTDIR}${mandir}/man8 - ${INSTALL} -m 644 ${srcdir}/default.subscriptions \ -- ${DESTDIR}${sysconfdir}/zephyr -+ ${DESTDIR}${datadir}/examples/zephyr - - clean: - rm -f ${OBJS} zephyrd zsrv_err.[ch] diff --git a/chat/zephyr/patches/patch-al b/chat/zephyr/patches/patch-al deleted file mode 100644 index f46735ba025..00000000000 --- a/chat/zephyr/patches/patch-al +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-al,v 1.1 2006/06/04 13:42:10 joerg Exp $ - ---- server/acl_files.c.orig 2006-04-25 15:28:36.000000000 +0000 -+++ server/acl_files.c -@@ -18,6 +18,7 @@ - * declared and not statically declared. - */ - -+#include <errno.h> - #include <zephyr/mit-copyright.h> - #include "zserver.h" - -@@ -48,8 +49,6 @@ static const char rcsid_acl_files_c[] = - - #define COR(a,b) ((a!=NULL)?(a):(b)) - --extern int errno; -- - extern time_t time(); - - /* Canonicalize a principal name */ diff --git a/chat/zephyr/patches/patch-am b/chat/zephyr/patches/patch-am deleted file mode 100644 index 32ce4298da7..00000000000 --- a/chat/zephyr/patches/patch-am +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-am,v 1.1 2006/06/04 13:42:10 joerg Exp $ - ---- zwgc/main.c.orig 2006-04-25 15:31:09.000000000 +0000 -+++ zwgc/main.c -@@ -21,4 +21,5 @@ static const char rcsid_main_c[] = "$Id: - #endif - -+#include <errno.h> - #include <netdb.h> - #include <sys/socket.h> -@@ -449,5 +450,4 @@ static RETSIGTYPE signal_child() - union wait status; - #endif -- extern int errno; - int pid, old_errno = errno; - diff --git a/chat/zephyr/patches/patch-an b/chat/zephyr/patches/patch-an deleted file mode 100644 index de08c2a9ec0..00000000000 --- a/chat/zephyr/patches/patch-an +++ /dev/null @@ -1,102 +0,0 @@ -$NetBSD: patch-an,v 1.3 2011/11/28 19:42:39 marino Exp $ - -- check for hes_getmailhost before using it -- avoid conflict with POSIX getline - ---- clients/zmailnotify/zmailnotify.c.orig 1997-10-25 21:47:11.000000000 +0000 -+++ clients/zmailnotify/zmailnotify.c -@@ -72,7 +72,7 @@ main(argc, argv) - int i,nbytes,retval,uselock; - struct passwd *pwd; - struct _mail mymail; --#ifdef HAVE_HESIOD -+#ifdef HAVE_HES_GETMAILHOST - struct hes_postoffice *p; - #endif - -@@ -104,7 +104,7 @@ main(argc, argv) - (void) sprintf(lockfile,"%s/.maillock",dir); - - host = (char *)getenv("MAILHOST"); --#ifdef HAVE_HESIOD -+#ifdef HAVE_HES_GETMAILHOST - if (host == NULL) { - p = hes_getmailhost(user); - if (p != NULL && strcmp(p->po_type, "POP") == 0) -@@ -144,7 +144,7 @@ main(argc, argv) - exit(1); - } - -- if ((getline(response, sizeof response, sfi) != OK) || -+ if ((get_line(response, sizeof response, sfi) != OK) || - (*response != '+')) { - fprintf(stderr,"%s: %s\n",prog,response); - exit(1); -@@ -460,7 +460,12 @@ char *host; - strcpy(host_save, hp->h_name); - rem = krb_sendauth(authopts, s, ticket, "pop", host_save, (char *)0, - 0, (MSG_DAT *) 0, (CREDENTIALS *) 0, -- (bit_64 *) 0, (struct sockaddr_in *)0, -+#if defined(__DragonFly__) || defined (__FreeBSD__) -+ (DES_key_schedule) {0}, -+#else -+ (bit_64 *) 0, -+#endif -+ (struct sockaddr_in *)0, - (struct sockaddr_in *)0,"ZMAIL0.0"); - free(host_save); - free(ticket); -@@ -498,7 +503,7 @@ pop_command(fmt, va_alist) - - if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK); - -- if (getline(buf, sizeof buf, sfi) != OK) { -+ if (get_line(buf, sizeof buf, sfi) != OK) { - (void) strcpy(Errmsg, buf); - return(NOTOK); - } -@@ -519,7 +524,7 @@ int *nmsgs, *nbytes; - - if (putline("STAT", Errmsg, sfo) == NOTOK) return(NOTOK); - -- if (getline(buf, sizeof buf, sfi) != OK) { -+ if (get_line(buf, sizeof buf, sfi) != OK) { - (void) strcpy(Errmsg, buf); - return(NOTOK); - } -@@ -546,7 +551,7 @@ int (*action)(); - #endif - if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK); - -- if (getline(buf, sizeof buf, sfi) != OK) { -+ if (get_line(buf, sizeof buf, sfi) != OK) { - (void) strcpy(Errmsg, buf); - return(NOTOK); - } -@@ -565,7 +570,7 @@ int (*action)(); - } - } - --getline(buf, n, f) -+get_line(buf, n, f) - char *buf; - register int n; - FILE *f; -@@ -595,7 +600,7 @@ char *buf; - register int n; - FILE *f; - { -- if (getline(buf, n, f) != OK) return (NOTOK); -+ if (get_line(buf, n, f) != OK) return (NOTOK); - if (*buf == '.') { - if (*(buf+1) == '\0') { - return (DONE); -@@ -605,7 +610,7 @@ FILE *f; - } else if (*buf == '\0') { - /* suck up all future lines, since this is after all only for headers */ - while(! ((buf[0]=='.') && (buf[1] == '\0')) ) { -- if (getline(buf, n, f) != OK) return (NOTOK); -+ if (get_line(buf, n, f) != OK) return (NOTOK); - } - return DONE; - } diff --git a/chat/zephyr/patches/patch-configure b/chat/zephyr/patches/patch-configure deleted file mode 100644 index 96c2bdc43b7..00000000000 --- a/chat/zephyr/patches/patch-configure +++ /dev/null @@ -1,143 +0,0 @@ -$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" diff --git a/chat/zephyr/patches/patch-configure_in b/chat/zephyr/patches/patch-configure_in deleted file mode 100644 index 5b996f125ab..00000000000 --- a/chat/zephyr/patches/patch-configure_in +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-configure_in,v 1.1 2011/10/08 06:17:40 dholland Exp $ - -Check for hes_getmailhost before trying to use it. - ---- configure.in~ 2000-04-05 14:51:31.000000000 +0000 -+++ configure.in -@@ -85,6 +85,9 @@ AC_SUBST(SLIB) - - ATHENA_KRB4 - ATHENA_HESIOD -+if test "$hesiod" != "no"; then -+ AC_CHECK_FUNCS(hes_getmailhost) -+fi - ATHENA_REGEXP - ATHENA_ARES - ATHENA_UTIL_COM_ERR |