Install the correct documentation and update the PLIST accordingly

Make sure mkpasswd is only installed once as ircd-hybrid-mkpasswd
Make .if defined statements a little more bulletbroof
Bump to nb1

5 files changed, 127 insertions, 34 deletions

diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index 2ea634c25bc..cca3ca15082 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2006/01/03 13:09:25 adrianp Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/10 22:26:32 adrianp Exp $
 
 DISTNAME=	ircd-hybrid-7.2.0
 EXTRACT_SUFX=	.tgz
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
 
@@ -69,11 +70,11 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/log/ircd-hybrid
 CONFIGURE_ARGS+=	--enable-clobber
 
-.if defined(IRCD_HYBRID_SYSLOG_EVENTS)
+.if defined(IRCD_HYBRID_SYSLOG_EVENTS) && !empty(IRCD_HYBRID_SYSLOG_EVENTS:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--enable-syslog-facility=${IRCD_HYBRID_SYSLOG_FACILITY:Q}
 .endif
 
-.if defined(IRCD_HYBRID_MAXCONN)
+.if defined(IRCD_HYBRID_MAXCONN) && !empty(IRCD_HYBRID_MAXCONN:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--with-maxconn=${IRCD_HYBRID_MAXCONN:Q}
 .endif
 
@@ -96,7 +97,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.FIRST ${HYBRID_DOC}
 	${INSTALL_DATA} ${WRKSRC}/README.PLATFORMS ${HYBRID_DOC}
 	${INSTALL_DATA} ${WRKSRC}/RELNOTES ${HYBRID_DOC}
-	${INSTALL_DATA} ${WRKSRC}/messages/README ${HYBRID_DOC}/README.messages
+	${INSTALL_DATA} ${WRKSRC}/messages/README \
+		${HYBRID_DOC}/README.messages
 	${INSTALL_DATA} ${WRKSRC}/tools/README.mkpasswd \
 		${HYBRID_DOC}/README.ircd-hybrid-mkpasswd
 
@@ -104,9 +106,6 @@ post-install:
 	@${RM} ${WRKSRC}/doc/Makefile.in
 	cd ${WRKSRC}/doc && ${PAX} -rwppm . ${HYBRID_DOC}/doc
 
-	cd ${WRKSRC}/contrib && \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install_help
-
 	cd ${WRKSRC}/messages && \
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install
 
diff --git a/chat/ircd-hybrid/PLIST b/chat/ircd-hybrid/PLIST
index 2e95461a399..52956eefc9e 100644
--- a/chat/ircd-hybrid/PLIST
+++ b/chat/ircd-hybrid/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/01/03 13:09:25 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/01/10 22:26:32 adrianp Exp $
 bin/encspeed
 bin/ircd
 bin/ircd-hybrid-mkpasswd
@@ -120,35 +120,104 @@ share/examples/ircd-hybrid/example.conf.quick
 share/examples/ircd-hybrid/example.efnet.conf
 share/examples/ircd-hybrid/simple.conf
 share/examples/rc.d/ircd-hybrid
-share/ircd-hybrid/help/opers/capture
-share/ircd-hybrid/help/opers/chghost
-share/ircd-hybrid/help/opers/chgident
-share/ircd-hybrid/help/opers/chgname
-share/ircd-hybrid/help/opers/classlist
-share/ircd-hybrid/help/opers/clearchan
-share/ircd-hybrid/help/opers/ctrace
-share/ircd-hybrid/help/opers/delspoof
-share/ircd-hybrid/help/opers/flags
-share/ircd-hybrid/help/opers/forcejoin
-share/ircd-hybrid/help/opers/forcepart
+share/ircd-hybrid/help/opers/accept
+share/ircd-hybrid/help/opers/admin
+share/ircd-hybrid/help/opers/away
+share/ircd-hybrid/help/opers/capab
+share/ircd-hybrid/help/opers/cburst
+share/ircd-hybrid/help/opers/challenge
+share/ircd-hybrid/help/opers/client
+share/ircd-hybrid/help/opers/close
+share/ircd-hybrid/help/opers/cmode
+share/ircd-hybrid/help/opers/connect
+share/ircd-hybrid/help/opers/cryptlink
+share/ircd-hybrid/help/opers/die
+share/ircd-hybrid/help/opers/dline
+share/ircd-hybrid/help/opers/drop
+share/ircd-hybrid/help/opers/eob
+share/ircd-hybrid/help/opers/error
+share/ircd-hybrid/help/opers/etrace
+share/ircd-hybrid/help/opers/gline
+share/ircd-hybrid/help/opers/hash
+share/ircd-hybrid/help/opers/help
 share/ircd-hybrid/help/opers/index
-share/ircd-hybrid/help/opers/jupe
-share/ircd-hybrid/help/opers/ltrace
-share/ircd-hybrid/help/opers/mkpasswd
-share/ircd-hybrid/help/opers/ojoin
-share/ircd-hybrid/help/opers/opme
-share/ircd-hybrid/help/opers/spoof
-share/ircd-hybrid/help/opers/svsnick
-share/ircd-hybrid/help/opers/uncapture
+share/ircd-hybrid/help/opers/info
+share/ircd-hybrid/help/opers/invite
+share/ircd-hybrid/help/opers/ison
+share/ircd-hybrid/help/opers/join
+share/ircd-hybrid/help/opers/kick
+share/ircd-hybrid/help/opers/kill
+share/ircd-hybrid/help/opers/kline
+share/ircd-hybrid/help/opers/knock
+share/ircd-hybrid/help/opers/knockll
+share/ircd-hybrid/help/opers/links
+share/ircd-hybrid/help/opers/list
+share/ircd-hybrid/help/opers/lljoin
+share/ircd-hybrid/help/opers/llnick
+share/ircd-hybrid/help/opers/locops
+share/ircd-hybrid/help/opers/lusers
+share/ircd-hybrid/help/opers/map
+share/ircd-hybrid/help/opers/modlist
+share/ircd-hybrid/help/opers/modload
+share/ircd-hybrid/help/opers/modrestart
+share/ircd-hybrid/help/opers/modunload
+share/ircd-hybrid/help/opers/motd
+share/ircd-hybrid/help/opers/names
+share/ircd-hybrid/help/opers/nburst
+share/ircd-hybrid/help/opers/nick
+share/ircd-hybrid/help/opers/notice
+share/ircd-hybrid/help/opers/omotd
+share/ircd-hybrid/help/opers/oper
+share/ircd-hybrid/help/opers/operwall
+share/ircd-hybrid/help/opers/part
+share/ircd-hybrid/help/opers/pass
+share/ircd-hybrid/help/opers/ping
+share/ircd-hybrid/help/opers/pong
+share/ircd-hybrid/help/opers/post
+share/ircd-hybrid/help/opers/privmsg
+share/ircd-hybrid/help/opers/quit
+share/ircd-hybrid/help/opers/rehash
+share/ircd-hybrid/help/opers/restart
+share/ircd-hybrid/help/opers/resv
+share/ircd-hybrid/help/opers/rkline
+share/ircd-hybrid/help/opers/rxline
+share/ircd-hybrid/help/opers/server
+share/ircd-hybrid/help/opers/set
+share/ircd-hybrid/help/opers/sjoin
+share/ircd-hybrid/help/opers/squit
+share/ircd-hybrid/help/opers/stats
+share/ircd-hybrid/help/opers/svinfo
+share/ircd-hybrid/help/opers/testgecos
+share/ircd-hybrid/help/opers/testline
+share/ircd-hybrid/help/opers/testmask
+share/ircd-hybrid/help/opers/time
+share/ircd-hybrid/help/opers/topic
+share/ircd-hybrid/help/opers/trace
+share/ircd-hybrid/help/opers/uhelp
+share/ircd-hybrid/help/opers/umode
+share/ircd-hybrid/help/opers/undline
+share/ircd-hybrid/help/opers/ungline
+share/ircd-hybrid/help/opers/unkline
+share/ircd-hybrid/help/opers/unresv
+share/ircd-hybrid/help/opers/unxline
+share/ircd-hybrid/help/opers/user
+share/ircd-hybrid/help/opers/userhost
+share/ircd-hybrid/help/opers/users
+share/ircd-hybrid/help/opers/version
+share/ircd-hybrid/help/opers/wallops
+share/ircd-hybrid/help/opers/who
+share/ircd-hybrid/help/opers/whois
+share/ircd-hybrid/help/opers/whowas
+share/ircd-hybrid/help/opers/xline
 share/ircd-hybrid/help/users/accept
 share/ircd-hybrid/help/users/admin
 share/ircd-hybrid/help/users/away
 share/ircd-hybrid/help/users/challenge
 share/ircd-hybrid/help/users/cmode
 share/ircd-hybrid/help/users/error
-share/ircd-hybrid/help/users/flags
 share/ircd-hybrid/help/users/help
 share/ircd-hybrid/help/users/index
+share/ircd-hybrid/help/users/info
 share/ircd-hybrid/help/users/invite
 share/ircd-hybrid/help/users/ison
 share/ircd-hybrid/help/users/join
@@ -157,17 +226,22 @@ share/ircd-hybrid/help/users/knock
 share/ircd-hybrid/help/users/links
 share/ircd-hybrid/help/users/list
 share/ircd-hybrid/help/users/lusers
+share/ircd-hybrid/help/users/map
 share/ircd-hybrid/help/users/motd
 share/ircd-hybrid/help/users/names
 share/ircd-hybrid/help/users/nick
+share/ircd-hybrid/help/users/notice
 share/ircd-hybrid/help/users/oper
 share/ircd-hybrid/help/users/part
 share/ircd-hybrid/help/users/pass
 share/ircd-hybrid/help/users/ping
 share/ircd-hybrid/help/users/pong
+share/ircd-hybrid/help/users/privmsg
 share/ircd-hybrid/help/users/quit
+share/ircd-hybrid/help/users/stats
 share/ircd-hybrid/help/users/time
 share/ircd-hybrid/help/users/topic
+share/ircd-hybrid/help/users/umode
 share/ircd-hybrid/help/users/user
 share/ircd-hybrid/help/users/userhost
 share/ircd-hybrid/help/users/users
diff --git a/chat/ircd-hybrid/distinfo b/chat/ircd-hybrid/distinfo
index d0d80d15c08..d28e9d8fbea 100644
--- a/chat/ircd-hybrid/distinfo
+++ b/chat/ircd-hybrid/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.5 2006/01/03 13:09:25 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2006/01/10 22:26:32 adrianp Exp $
 
 SHA1 (ircd-hybrid-7.2.0.tgz) = 55c727d92ed4416f72372cc47c3af39904172322
 RMD160 (ircd-hybrid-7.2.0.tgz) = 2d5ba31343a1ff844eaf68f523d430b840fe7ee0
 Size (ircd-hybrid-7.2.0.tgz) = 990320 bytes
 SHA1 (patch-aa) = 5ffdd9e30835e026ac900b1d83469c205b9d1bac
 SHA1 (patch-ab) = da98233fe21eb7054f6f9011f6dfbe2db04be0d5
-SHA1 (patch-ac) = 2c85c151d9d938d17cb1c50fce231a108dfcaa31
+SHA1 (patch-ac) = ae725440d32bcf24e09ef368ef5e0fc0f236bf8a
 SHA1 (patch-ad) = 7ed782cb6df7586223201847e2cbed56a882154c
+SHA1 (patch-ae) = 888cfb10f3637daac29f7e9a71865a5d2ed93024
diff --git a/chat/ircd-hybrid/patches/patch-ac b/chat/ircd-hybrid/patches/patch-ac
index 844333ad999..e448573f340 100644
--- a/chat/ircd-hybrid/patches/patch-ac
+++ b/chat/ircd-hybrid/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2006/01/03 13:09:25 adrianp Exp $
+$NetBSD: patch-ac,v 1.4 2006/01/10 22:26:32 adrianp Exp $
 
---- contrib/help/Makefile.in.orig	2005-12-09 05:52:54.000000000 +0000
-+++ contrib/help/Makefile.in
+--- help/Makefile.in.orig	2005-12-09 05:52:54.000000000 +0000
++++ help/Makefile.in
 @@ -7,8 +7,8 @@ RM=		@RM@
  
  prefix=		@prefix@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2006/01/03 13:09:25 adrianp Exp $
 +uhelpdir=	${prefix}/share/ircd-hybrid/help/users
 +ohelpdir=	${prefix}/share/ircd-hybrid/help/opers
  
- SYMLINKS=   topic accept cmode admin names links away whowas \
+ SYMLINKS=	topic accept cmode admin names links away whowas \
  		version kick who invite quit join list nick oper part \
 @@ -21,13 +21,13 @@ depend:
  
diff --git a/chat/ircd-hybrid/patches/patch-ae b/chat/ircd-hybrid/patches/patch-ae
new file mode 100644
index 00000000000..cb46545cdcf
--- /dev/null
+++ b/chat/ircd-hybrid/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.5 2006/01/10 22:26:32 adrianp Exp $
+
+--- tools/Makefile.in.orig	2005-12-09 05:52:55.000000000 +0000
++++ tools/Makefile.in
+@@ -45,14 +45,5 @@ distclean: clean
+ 	$(RM) -f Makefile
+ 
+ install: build
+-	mkdir -p $(bindir)
+-	@for i in $(PROGS); do \
+-		if test -f $(bindir)/$$i -a -z "$(CLOBBER)"; then \
+-			echo $(MV) $(bindir)/$$i $(bindir)/$$i.old; \
+-			$(MV) $(bindir)/$$i $(bindir)/$$i.old; \
+-		fi; \
+-		echo $(INSTALL_BIN) $$i $(bindir); \
+-		$(INSTALL_BIN) $$i $(bindir); \
+-	done
+ 
+ .PHONY: install distclean clean build