use PKG_SYSCONFDIR/bins for the global config directory instead of

hard coding /etc/bins.

install a default binsrc as an example which can be copied to
${PKG_SYSCONFDIR}/bins/binsrc and/or ~/.bins/binsrc

bump PKGREVISION to bins-1.1.10nb1

5 files changed, 30 insertions, 8 deletions

diff --git a/www/bins/MESSAGE b/www/bins/MESSAGE
index bd8f6472a75..2a8c4288907 100644
--- a/www/bins/MESSAGE
+++ b/www/bins/MESSAGE
@@ -1,10 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/07/04 19:37:38 wiz Exp $
+$NetBSD: MESSAGE,v 1.2 2002/07/30 09:46:32 dmcmahill Exp $
 
 	Before running bins, copy the example templates directory
 		${PREFIX}/share/examples/bins/templates.default
 	into your home directory as
 		~/.bins/templates.default
-	and modify.
+	and modify.  Also if you do not already have an installed
+		${PKG_SYSCONFDIR}/binsrc 
+	that you're happy with, copy
+		${PREFIX}/share/examples/bins/binsrc
+	to ${PKG_SYSCONFDIR}/bins/binsrc
 
 ===========================================================================
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 32c4e6e03a7..7e53bb37010 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/07/30 02:06:30 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2002/07/30 09:46:32 dmcmahill Exp $
 #
 
 DISTNAME=	bins-1.1.10
+PKGREVISION=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	http://jsautret.free.fr/BINS/
 EXTRACT_SUFX=	.tar.bz2
@@ -29,6 +30,11 @@ USE_PERL5=	YES
 # have previous versions in pkgsrc.
 REPLACE_PERL=	bins bins_edit bins-edit-gui bins_txt2xml
 
+post-patch:
+	${MV} ${WRKSRC}/bins ${WRKSRC}/bins.bak
+	${SED} 's;@pkgsysconfdir@;${PKG_SYSCONFDIR};g' \
+		${WRKSRC}/bins.bak > ${WRKSRC}/bins
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bins ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bins_edit ${PREFIX}/bin
@@ -40,6 +46,8 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.default
 	${INSTALL_DATA} ${WRKSRC}/templates/*.html \
 		${PREFIX}/share/examples/bins/templates.default
+	${INSTALL_DATA} ${WRKSRC}/binsrc \
+		${PREFIX}/share/examples/bins
 	for lang in de fr it pl; do \
 		${INSTALL_DATA} ${WRKSRC}/intl/$$lang.mo \
 		${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES/bins.mo; \
diff --git a/www/bins/PLIST b/www/bins/PLIST
index 2b33850e20d..8c6fd459678 100644
--- a/www/bins/PLIST
+++ b/www/bins/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/07 06:47:25 simonb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/30 09:46:32 dmcmahill Exp $
 bin/bins
 bin/bins_edit
 man/man1/bins.1
 man/man1/bins_edit.1
 share/doc/html/bins/index.html
 share/doc/html/bins/index_fr.html
+share/examples/bins/binsrc
 share/examples/bins/templates.default/details.html
 share/examples/bins/templates.default/footer.html
 share/examples/bins/templates.default/image.html
diff --git a/www/bins/distinfo b/www/bins/distinfo
index d1d7bd6eda1..8fa11134f18 100644
--- a/www/bins/distinfo
+++ b/www/bins/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/07/07 13:21:52 simonb Exp $
+$NetBSD: distinfo,v 1.3 2002/07/30 09:46:32 dmcmahill Exp $
 
 SHA1 (bins-1.1.10.tar.bz2) = 7ed3889654cefa264d22e3b136669701c5f3a9d3
 Size (bins-1.1.10.tar.bz2) = 98777 bytes
-SHA1 (patch-aa) = fa5bc26e8e134a3bbeb74f32ed1e5d967b945432
+SHA1 (patch-aa) = b524283550d5c29bbb1a7621951ea392faa0983c
 SHA1 (patch-ab) = 3109680a859da8499a6b14406aeddbb06536c0fa
diff --git a/www/bins/patches/patch-aa b/www/bins/patches/patch-aa
index 010ff8ba25e..7e55f0f6d89 100644
--- a/www/bins/patches/patch-aa
+++ b/www/bins/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2002/07/07 13:21:53 simonb Exp $
+$NetBSD: patch-aa,v 1.2 2002/07/30 09:46:33 dmcmahill Exp $
 
---- bins.orig	Mon Jun 10 05:54:12 2002
+--- bins.orig	Sun Jun  9 15:54:12 2002
 +++ bins
+@@ -218,7 +218,7 @@
+    # any new options need corresponding new documentation.
+ 
+    # The following parameters cannot be set in config files for now :
+-   globalConfigDir => "/etc/bins",     # System wide
++   globalConfigDir => "@pkgsysconfdir@/bins",     # System wide
+                                        # configuration directory.
+    userConfigDir    => "~/.bins",      # User configuration directory
+    configFileName   => "binsrc",       # Configuration file.
 @@ -237,13 +237,14 @@
  
  );