Convert to the bsd.pkg.install.mk infrastructure:

- Install configuration files under the examples hierarchy.
- Honour PKG_SYSCONFDIR.
- Use RCD_SCRIPTS to handle rc.d script.
As a result, bump PKGREVISION to 1.

8 files changed, 92 insertions, 25 deletions

diff --git a/chat/zephyr-current/Makefile b/chat/zephyr-current/Makefile
index f7b895aef78..060f4abd0e0 100644
--- a/chat/zephyr-current/Makefile
+++ b/chat/zephyr-current/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:26:32 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/29 18:55:56 jmmv Exp $
 #
 
 DISTNAME=	zephyr-20010518
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/zephyr
 CATEGORIES=	chat net
 MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/
@@ -11,28 +12,36 @@ HOMEPAGE=	http://web.mit.edu/olh/Zephyr/index.html
 COMMENT=	Project Athena's original Instant Messaging system
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 USE_X11=	YES
 
 # N.B. the following assume NetBSD-only. 
 CPPFLAGS+=      -I/usr/include/kerberosIV -I/usr/include/krb5
 LDFLAGS+=       -lroken -lcrypto -lcom_err -ledit -lcurses
+CONFIGURE_ARGS=	--sysconfdir="${PKG_SYSCONFDIR}"
 CONFIGURE_ARGS+="--with-krb4"
 CONFIGURE_ARGS+="--with-hesiod"
 CONFIGURE_ARGS+="--with-ares"
 
-ZEPHYR_RCDIR=	${PREFIX}/etc/rc.d
 ZEPHYR_DOCDIR=	${PREFIX}/share/doc/zephyr
 ZEPHYR_DOCS=	INSTALL NOTES OPERATING README USING
 
-post-install:
-	${INSTALL_DATA_DIR} ${ZEPHYR_RCDIR}
-	${SED} -e 's|@prefix@|'${PREFIX}'|g' < ${FILESDIR}/zhm.sh > ${WRKDIR}/zhm.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/zhm.sh ${ZEPHYR_RCDIR}/zhm
+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
+
+pre-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${ZEPHYR_DOCDIR}
-	for f in ${ZEPHYR_DOCS} ; do \
-	    ${INSTALL_DATA} ${WRKSRC}/$$f ${ZEPHYR_DOCDIR} ; \
-	    done
+.for f in ${ZEPHYR_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/$f ${ZEPHYR_DOCDIR}
+.endfor
+.undef f
 
 .include "../../devel/readline/buildlink2.mk"
 .include "../../net/hesiod/buildlink2.mk"
diff --git a/chat/zephyr-current/PLIST b/chat/zephyr-current/PLIST
index 7d17aa1dfff..077fb82a71a 100644
--- a/chat/zephyr-current/PLIST
+++ b/chat/zephyr-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/30 17:39:26 sommerfeld Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/29 18:55:56 jmmv Exp $
 bin/xzwrite
 bin/zaway
 bin/zctl
@@ -10,7 +10,6 @@ bin/zstat
 bin/zwgc
 bin/zwrite
 etc/rc.d/zhm
-etc/zephyr/default.subscriptions
 include/zephyr/mit-copyright.h
 include/zephyr/zephyr.h
 include/zephyr/zephyr_err.h
@@ -39,13 +38,12 @@ 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
 @dirrm share/zephyr
+@dirrm share/examples/zephyr
 @dirrm share/doc/zephyr
 @dirrm include/zephyr
-@exec ${MKDIR} %D/etc/zephyr/acl
-@dirrm etc/zephyr/acl
-@dirrm etc/zephyr
diff --git a/chat/zephyr-current/distinfo b/chat/zephyr-current/distinfo
index 5cfc5185c5e..bb3eda05f14 100644
--- a/chat/zephyr-current/distinfo
+++ b/chat/zephyr-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/30 17:39:26 sommerfeld Exp $
+$NetBSD: distinfo,v 1.2 2003/07/29 18:55:56 jmmv Exp $
 
 SHA1 (zephyr-20010518.tar.gz) = cd2fca9c2f0bfaa8e69c94813bedc87d66d3ac1c
 Size (zephyr-20010518.tar.gz) = 342259 bytes
@@ -8,5 +8,8 @@ SHA1 (patch-ac) = db350fc16d88818d4cce287fad220a2c3e84dabe
 SHA1 (patch-ad) = b0f8c408afc2e7fe9a673a5f2ec562a3e34e225c
 SHA1 (patch-ae) = 76b4a43282f3d8d8d42d72f66c677a652ff33e22
 SHA1 (patch-af) = 4ebb22fa3c1b2ed351ee267be737d34d8292129c
-SHA1 (patch-ag) = 6aa65ab0183ddce7418802664ef4fd7f41662923
+SHA1 (patch-ag) = 2c756da1e62613333cca2b68ca9b5f6c96e0f147
 SHA1 (patch-ah) = 8282d416d24eafcb40ead93d4c376f1e8e80b207
+SHA1 (patch-ai) = bfa2d01d20884d31e58bd12a171938504d929e28
+SHA1 (patch-aj) = 3ec4b1624e2eecefe129ac53e870ce2fb2bce236
+SHA1 (patch-ak) = 7c2084aac1e4b30124c380fbc369cb6a6b41eb17
diff --git a/chat/zephyr-current/files/zhm.sh b/chat/zephyr-current/files/zhm.sh
index 0cbf643f534..3ed3bb1a7b8 100644
--- a/chat/zephyr-current/files/zhm.sh
+++ b/chat/zephyr-current/files/zhm.sh
@@ -1,24 +1,22 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: zhm.sh,v 1.1.1.1 2002/12/30 17:39:27 sommerfeld Exp $
+# $NetBSD: zhm.sh,v 1.2 2003/07/29 18:55:58 jmmv Exp $
 #
 # PROVIDE: zhm
 # REQUIRE: DAEMON
 
 . /etc/rc.subr
 
-PREFIX=${PREFIX-@prefix@}
-
 name="zhm"
 rcvar="$name"
-command="${PREFIX}/sbin/${name}"
+command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
-required_files="${PREFIX}/etc/zephyr/server.list"
+required_files="@PKG_SYSCONFDIR@/server.list"
 start_precmd="zhm_precmd"
 
 zhm_precmd()
 {
-	rc_flags="`cat ${PREFIX}/etc/zephyr/server.list`"
+	rc_flags="`cat @PKG_SYSCONFDIR@/server.list`"
 }
 load_rc_config "$name"
 run_rc_command "$1"
diff --git a/chat/zephyr-current/patches/patch-ag b/chat/zephyr-current/patches/patch-ag
index 61ab6518a9c..9a717600fc5 100644
--- a/chat/zephyr-current/patches/patch-ag
+++ b/chat/zephyr-current/patches/patch-ag
@@ -1,7 +1,16 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/12/30 17:39:27 sommerfeld Exp $
+$NetBSD: patch-ag,v 1.2 2003/07/29 18:55:59 jmmv Exp $
 
---- server/realm.c.orig	Mon Feb 26 23:51:07 2001
+--- 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)
  }
  
diff --git a/chat/zephyr-current/patches/patch-ai b/chat/zephyr-current/patches/patch-ai
new file mode 100644
index 00000000000..c032779c864
--- /dev/null
+++ b/chat/zephyr-current/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2003/07/29 18:55:59 jmmv 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-current/patches/patch-aj b/chat/zephyr-current/patches/patch-aj
new file mode 100644
index 00000000000..9dddefc8956
--- /dev/null
+++ b/chat/zephyr-current/patches/patch-aj
@@ -0,0 +1,24 @@
+$NetBSD: patch-aj,v 1.1 2003/07/29 18:56:00 jmmv 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-current/patches/patch-ak b/chat/zephyr-current/patches/patch-ak
new file mode 100644
index 00000000000..4ed4c002586
--- /dev/null
+++ b/chat/zephyr-current/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2003/07/29 18:56:01 jmmv 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]