Honour PKG_SYSCONFDIR. Bump PKGREVISION to 1.

5 files changed, 32 insertions, 15 deletions

diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index d233fef3508..3fd51f92cc1 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/01/16 08:23:45 salo Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/30 19:43:48 jmmv Exp $
 #
 
 DISTNAME=	eggdrop1.6.13
 PKGNAME=	${DISTNAME:S/eggdrop/eggdrop-/}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
 
@@ -11,10 +12,16 @@ HOMEPAGE=	http://www.eggheads.org/
 COMMENT=	IRC robot with TCL scripting and multi-channel ability
 
 USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=	TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
 MAKE_ENV+=	_OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME}
 
+EGDIR=		${PREFIX}/share/examples/eggdrop
+CONF_FILES=	${EGDIR}/eggdrop.conf ${PKG_SYSCONFDIR}/eggdrop.conf
+
 post-patch:
 	cd ${WRKSRC} && ${SED} -e 's,modules/,${PREFIX}/lib/eggdrop/,' \
 		< eggdrop.conf > eggdrop.conf.dist.new
@@ -26,7 +33,8 @@ do-install: do-install-program
 do-install-program:
 	${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${PREFIX}/man/man1/
-	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.dist.new ${PREFIX}/etc/eggdrop.conf.dist
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.dist.new ${EGDIR}/eggdrop.conf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop \
 		${PREFIX}/share/eggdrop/help ${PREFIX}/share/eggdrop/language \
 		${PREFIX}/share/eggdrop/scripts ${PREFIX}/share/eggdrop/html \
diff --git a/chat/eggdrop/PLIST b/chat/eggdrop/PLIST
index 27128fc6d41..7edcf773f9b 100644
--- a/chat/eggdrop/PLIST
+++ b/chat/eggdrop/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/16 08:46:15 salo Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/04/30 19:43:48 jmmv Exp $
 bin/eggdrop
-etc/eggdrop.conf.dist
 lib/eggdrop/assoc.so
 lib/eggdrop/blowfish.so
 lib/eggdrop/channels.so
@@ -97,8 +96,10 @@ share/eggdrop/scripts/userinfo.tcl
 share/eggdrop/scripts/weed
 share/eggdrop/tcl-commands.doc
 share/eggdrop/tricks
+share/examples/eggdrop/eggdrop.conf
 @comment The directory does not exist for NOPIC, so don't issue an error.
 @unexec rmdir %D/lib/eggdrop 2>/dev/null || ${TRUE}
+@dirrm share/examples/eggdrop
 @dirrm share/eggdrop/help/set
 @dirrm share/eggdrop/help/msg
 @dirrm share/eggdrop/help
diff --git a/chat/eggdrop/distinfo b/chat/eggdrop/distinfo
index 7ed9b54d963..f62b36c4fb9 100644
--- a/chat/eggdrop/distinfo
+++ b/chat/eggdrop/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2003/01/16 08:23:45 salo Exp $
+$NetBSD: distinfo,v 1.4 2003/04/30 19:43:48 jmmv Exp $
 
 SHA1 (eggdrop1.6.13.tar.gz) = f20998dc46db0edcab9a28a20238a3dd0c390aa6
 Size (eggdrop1.6.13.tar.gz) = 935160 bytes
 SHA1 (patch-aa) = 25f5b1202a8eee7cd04c5830256f280eec6fbb1e
-SHA1 (patch-ab) = 4d27ee6281f85b20f4d171e9a9fdf680c5dce211
-SHA1 (patch-ac) = 8fa1a3f239f63f59095964d4753e63efd6fcbc4c
+SHA1 (patch-ab) = 64c28f71ceb364a572f22a78d2b3b6dedea4fb74
+SHA1 (patch-ac) = 7c93cbaed27ee26950005d04ea14eb2c1b19db7b
 SHA1 (patch-ad) = 8b9f740e82d44df7daeede770fce7f5add751407
 SHA1 (patch-ae) = 8676f61d7cee954a4c5446ace528f1e3292a8cc0
 SHA1 (patch-ag) = b8401e66d1e268a7e353b9be29cd49c862cb2d32
diff --git a/chat/eggdrop/patches/patch-ab b/chat/eggdrop/patches/patch-ab
index 8b9312f86c0..1d4636a5551 100644
--- a/chat/eggdrop/patches/patch-ab
+++ b/chat/eggdrop/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/26 03:48:13 kent Exp $
+$NetBSD: patch-ab,v 1.2 2003/04/30 19:43:49 jmmv Exp $
 
 --- src/main.c.orig	Sun Jul 15 09:15:14 2001
 +++ src/main.c	Thu Nov  1 12:55:48 2001
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/06/26 03:48:13 kent Exp $
  int	term_z = 0;		/* Foreground: use the terminal as a party
  				   line? */
 -char	configfile[121] = "eggdrop.conf"; /* Name of the config file */
-+char	configfile[121] = __PREFIX__ "/etc/eggdrop.conf";
++char	configfile[121] = __PKG_SYSCONFDIR__ "/eggdrop.conf";
  char	helpdir[121];		/* Directory of help files (if used) */
  char	textdir[121] = "";	/* Directory for text files that get dumped */
  int	keep_all_logs = 0;	/* Never erase logfiles, no matter how old
diff --git a/chat/eggdrop/patches/patch-ac b/chat/eggdrop/patches/patch-ac
index 7db7bd9e4c9..c3cd5eb5ccb 100644
--- a/chat/eggdrop/patches/patch-ac
+++ b/chat/eggdrop/patches/patch-ac
@@ -1,17 +1,25 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/26 03:48:14 kent Exp $
+$NetBSD: patch-ac,v 1.2 2003/04/30 19:43:49 jmmv Exp $
 
---- src/Makefile.in.orig	Thu Nov 23 06:56:40 2000
-+++ src/Makefile.in	Thu Nov  1 12:57:48 2001
-@@ -16,7 +16,7 @@
+--- src/Makefile.in.orig	2000-11-23 04:56:40.000000000 +0100
++++ src/Makefile.in
+@@ -4,6 +4,7 @@
+ SHELL = @SHELL@
+ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
++prefix = @prefix@
+ VPATH = @srcdir@
+ 
+ @SET_MAKE@
+@@ -16,7 +17,7 @@ CC = @CC@
  LD = @CC@
  STRIP = @STRIP@
  CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
 -CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"'
++CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"' '-D__PKG_SYSCONFDIR__="@sysconfdir@"'
  
  eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \
  dccutil.o dns.o flags.o language.o main.o mem.o misc.o misc_file.o \
-@@ -37,7 +37,7 @@
+@@ -37,7 +38,7 @@ doofus:
  	@echo "Linking eggdrop... $(EGGBUILD)"
  	@echo ""
  	@touch mod/mod.xlibs