Make this package install its sample configuration file under the examples

tree. Bump PKGREVISION to 1.

4 files changed, 36 insertions, 10 deletions

diff --git a/comms/binkd/Makefile b/comms/binkd/Makefile
index 899da006ddd..dcbff351065 100644
--- a/comms/binkd/Makefile
+++ b/comms/binkd/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2002/11/14 23:50:45 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/12/24 18:10:52 jmmv Exp $
 #
 
 DISTNAME=		binkd094
 PKGNAME=		binkd-0.9.4
-WRKSRC=			${WRKDIR}/${PKGNAME}
+PKGREVISION=		1
+WRKSRC=			${WRKDIR}/binkd-0.9.4
 CATEGORIES=		comms
 MASTER_SITES=		http://www.corbina.net/~maloff/binkd/ \
 			ftp://happy.kiev.ua/pub/fidosoft/mailer/binkd/
@@ -16,6 +17,8 @@ COMMENT=		FidoNet-over-IP transport program utilizing BINKP protocol
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
 NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64
 
 post-extract:
diff --git a/comms/binkd/PLIST b/comms/binkd/PLIST
index c22039c1dbf..f44c96583a0 100644
--- a/comms/binkd/PLIST
+++ b/comms/binkd/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:43:56 zuntum Exp $
-etc/binkd.conf-dist
+@comment $NetBSD: PLIST,v 1.2 2002/12/24 18:10:53 jmmv Exp $
 man/man8/binkd.8
 sbin/binkd
 sbin/binkd-0.9.4
+share/examples/binkd/binkd.conf
diff --git a/comms/binkd/distinfo b/comms/binkd/distinfo
index 7ef73482c82..3897ae3df56 100644
--- a/comms/binkd/distinfo
+++ b/comms/binkd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 09:04:17 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/12/24 18:10:53 jmmv Exp $
 
 SHA1 (binkd094.zip) = 189c460fc53eec7cd865da0d9c4b8287acf9e2d4
 Size (binkd094.zip) = 175478 bytes
-SHA1 (patch-aa) = 3f0e80158142d166ac628a70046e5c84a3de42d6
+SHA1 (patch-aa) = cd824b00b303b39ef8af7a4e6bc82867a3782892
diff --git a/comms/binkd/patches/patch-aa b/comms/binkd/patches/patch-aa
index f5c12f95953..ac8d2f4bfaf 100644
--- a/comms/binkd/patches/patch-aa
+++ b/comms/binkd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/02/18 20:30:51 tv Exp $
+$NetBSD: patch-aa,v 1.3 2002/12/24 18:10:53 jmmv Exp $
 
---- Makefile.in.orig	Sun Feb 18 12:42:19 2001
-+++ Makefile.in	Sun Feb 18 12:43:04 2001
-@@ -13,7 +13,7 @@
+--- Makefile.in.orig	Tue Dec 24 19:03:56 2002
++++ Makefile.in
+@@ -13,7 +13,7 @@ OBJS=${SRCS:.c=.o} 
  AUTODEFS=@DEFS@
  AUTOLIBS=@LIBS@
  DEFINES=$(AUTODEFS) -DHTTPS -DHAVE_FORK -DUNIX -DOS="\"UNIX\""
@@ -11,3 +11,26 @@ $NetBSD: patch-aa,v 1.2 2001/02/18 20:30:51 tv Exp $
  LIBS=$(AUTOLIBS)
  
  all: compile banner
+@@ -33,9 +33,8 @@ banner:
+ 	@echo "        do not something criminal during the installation;   "
+ 	@echo "     2. \`su' to root;                                       "
+ 	@echo "     3. Run \`make install' to install Binkd.                "
+-	@echo "     4. Edit $(PREFIX)/etc/$(APPL).conf-dist and RENAME it or"
+-	@echo "        MOVE it somewhere (so another \`make install' will   "
+-	@echo "        not overwrite it during your next Binkd upgrade)     "
++	@echo "     4. Create @sysconfdir@/$(APPL).conf, using the files in "
++	@echo "        $(PREFIX)/share/examples/$(APPL)."
+ 	@echo
+ 	@echo " If you want to put the files into some other directory just "
+ 	@echo " run \`configure --prefix=/another/path' and go to step 1.   "
+@@ -52,8 +51,8 @@ install: compile .version
+ 	ln -s $(PREFIX)/sbin/$(APPL)-`cat .version` $(PREFIX)/sbin/$(APPL)
+ 	./mkinstalldirs $(PREFIX)/man/man8
+ 	$(INSTALL) -m 644 $(APPL).8 $(PREFIX)/man/man8/$(APPL).8
+-	./mkinstalldirs $(PREFIX)/etc
+-	$(INSTALL) -m 644 $(APPL).cfg $(PREFIX)/etc/$(APPL).conf-dist
++	./mkinstalldirs $(PREFIX)/share/examples/$(APPL)
++	$(INSTALL) -m 644 $(APPL).cfg $(PREFIX)/share/examples/$(APPL)/$(APPL).conf
+ 
+ clean:
+ 	rm -f *.[bo] unix/*.[bo] *.BAK *.core *.obj *.err