Make this package install its configuration file under the examples tree

and use bsd.pkg.install.mk to copy it to PKG_SYSCONFDIR.
Bump PKGREVISION to 2.

8 files changed, 127 insertions, 29 deletions

diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 3458f9730ae..45516cde508 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/09/11 23:45:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/12/25 13:18:24 jmmv Exp $
 
 DISTNAME=		efax-gtk-1.0.1b.src
 PKGNAME=		efax-gtk-1.0.1b
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		comms
 MASTER_SITES=		http://www.cvine.freeserve.co.uk/efax-gtk/
 EXTRACT_SUFX=		.tgz
@@ -20,12 +20,19 @@ USE_BUILDLINK2= 	YES
 CONFIGURE_ARGS+=	--with-spooldir=/var/spool/efax
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+EGDIR=			${PREFIX}/share/examples/efax-gtk
+CONF_FILES=		${EGDIR}/efax-gtkrc ${PKG_SYSCONFDIR}/efax-gtkrc
+
 ALL_TARGET=		efax-gtk
 
 post-extract:
 	${GZIP_CMD} -d ${WRKSRC}/efax-gtk.1.gz
 
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/efax-gtk
+
 .include "../../devel/libsigc++/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../x11/gtk--/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/efax-gtk/PLIST b/comms/efax-gtk/PLIST
index 0076042a5c2..a3ecb18782c 100644
--- a/comms/efax-gtk/PLIST
+++ b/comms/efax-gtk/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/04 02:03:26 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/25 13:18:24 jmmv Exp $
 bin/efax-gtk
 bin/efax-gtk-send
-etc/efax-gtkrc
 man/man1/efax-gtk.1
+share/examples/efax-gtk/efax-gtkrc
+@dirrm share/examples/efax-gtk
diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo
index b72cf57d7a4..57c4e78d5c5 100644
--- a/comms/efax-gtk/distinfo
+++ b/comms/efax-gtk/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2002/07/02 12:42:00 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/12/25 13:18:24 jmmv Exp $
 
 SHA1 (efax-gtk-1.0.1b.src.tgz) = 74b92928239ec810ae1691205c96dd179f059e87
 Size (efax-gtk-1.0.1b.src.tgz) = 110544 bytes
-SHA1 (patch-aa) = cf6c9b20ab2df8e4da2879cec0a8aa12f761b0d6
-SHA1 (patch-ab) = 232bac2963f19af5ffabcb49b563bddbc15817de
-SHA1 (patch-ac) = e07623eeb3ceb98856667d7778a8f8914cc7db60
+SHA1 (patch-aa) = 446961cf0c7eee287eb33a37d16cf3d1f2f9f7f9
+SHA1 (patch-ab) = d8bc963880c06a86f9562defed1185301cc84ad0
+SHA1 (patch-ac) = 00e80cf93f1122627f8b88bb6ebe49a3bbc6de51
+SHA1 (patch-ad) = 9fe7a1e26dae9653909f33b7f98324b9afa3ada9
+SHA1 (patch-ae) = ce594dbd2cbf67efca9109b0e3c38cbed7e48a21
diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa
index b687c5216ef..3cc111e30c1 100644
--- a/comms/efax-gtk/patches/patch-aa
+++ b/comms/efax-gtk/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/04 02:03:26 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2002/12/25 13:18:25 jmmv Exp $
 
---- Makefile.presets.orig	Sun Jan 13 22:11:27 2002
-+++ Makefile.presets	Thu Apr 25 16:16:16 2002
-@@ -40,18 +40,11 @@
+--- Makefile.presets.orig	Sat Apr  6 13:07:24 2002
++++ Makefile.presets
+@@ -5,7 +5,7 @@
+ # produced by using automake
+ 
+ OUTPUT_OPTION = -o $@
+-COMPILE_OPTION = -c $*.cpp
++COMPILE_OPTION = -DRCDIR=\"$(RCDIR)\" -c $*.cpp
+ FAX_TARGETS = main.o pipes.o mainwindow.o dialogs.o efax_controller.o fax_list.o addressbook.o settings.o settings_help.o
+ 
+ 
+@@ -40,18 +40,11 @@ settings_help.o: settings_help.cpp setti
  	$(CC) $(CXXFLAGS) $(COMPILE_OPTION) $(OUTPUT_OPTION)
  
  install: efax-gtk
@@ -20,7 +29,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/04 02:03:26 jtb Exp $
 -	chmod +x $(SPOOLDIR)/efax-gtk-faxfilter
 +	$(BSD_INSTALL_PROGRAM) efax-gtk $(BINDIR)/
 +	$(BSD_INSTALL_SCRIPT) efax-gtk-send $(BINDIR)/
-+	$(BSD_INSTALL_DATA) efax-gtkrc $(RCDIR)/
++	$(BSD_INSTALL_DATA) efax-gtkrc $(DATADIR)/examples/efax-gtk/
 +	$(BSD_INSTALL_MAN) efax-gtk.1 $(MANDIR)/man1/
 +	$(BSD_INSTALL_SCRIPT) efax-gtk-faxfilter $(SPOOLDIR)/
  
diff --git a/comms/efax-gtk/patches/patch-ab b/comms/efax-gtk/patches/patch-ab
index 32920fcac27..ada89c68481 100644
--- a/comms/efax-gtk/patches/patch-ab
+++ b/comms/efax-gtk/patches/patch-ab
@@ -1,22 +1,32 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/04 02:03:26 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2002/12/25 13:18:25 jmmv Exp $
 
---- main.cpp.orig	Thu Apr 25 16:28:51 2002
-+++ main.cpp	Thu Apr 25 16:32:49 2002
-@@ -106,7 +106,7 @@
+--- main.cpp.orig	Sat Apr  6 13:07:24 2002
++++ main.cpp
+@@ -106,7 +106,7 @@ string configure_prog(bool reread) {
  
    if (!prog_config.found_rcfile) {
  
 -    rcfile = "/usr/local/etc/";
-+    rcfile = "@RCDIR@";
++    rcfile = RCDIR "/";
      rcfile += RC_FILE;
  
  #ifdef HAVE_IOS_NOCREATE
-@@ -140,7 +140,7 @@
+@@ -123,7 +123,7 @@ string configure_prog(bool reread) {
  
    if (!prog_config.found_rcfile) {
-     return_val = "Can't find or open file /etc/" RC_FILE ",\n"
+ 
+-    rcfile = "/etc/";
++    rcfile = RCDIR "/";
+     rcfile += RC_FILE;
+ 
+ #ifdef HAVE_IOS_NOCREATE
+@@ -139,8 +139,7 @@ string configure_prog(bool reread) {
+   }
+ 
+   if (!prog_config.found_rcfile) {
+-    return_val = "Can't find or open file /etc/" RC_FILE ",\n"
 -                 "/usr/local/etc/" RC_FILE;
-+                 "@RCDIR@/" RC_FILE;
++    return_val = "Can't find or open file " RCDIR "/" RC_FILE;
      if (!prog_config.homedir.empty()) {
        return_val +=  " or ";
        return_val += prog_config.homedir + "/." RC_FILE;
diff --git a/comms/efax-gtk/patches/patch-ac b/comms/efax-gtk/patches/patch-ac
index a2d74e24309..267d7e15e16 100644
--- a/comms/efax-gtk/patches/patch-ac
+++ b/comms/efax-gtk/patches/patch-ac
@@ -1,19 +1,49 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/04 02:03:26 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2002/12/25 13:18:25 jmmv Exp $
 
---- settings.cpp.orig	Thu Apr 25 16:28:58 2002
-+++ settings.cpp	Thu Apr 25 16:32:32 2002
-@@ -1041,12 +1041,12 @@
+--- settings.cpp.orig	Sat Apr  6 13:07:24 2002
++++ settings.cpp
+@@ -1040,13 +1040,11 @@ void SettingsDialog::read_config(bool se
+   if (!get_rcfile_path(search_localfile)) {
      string message;
      if (search_localfile) {
-       message = "Can't find or open file /etc/" RC_FILE ",\n"
+-      message = "Can't find or open file /etc/" RC_FILE ",\n"
 -	        "/usr/local/etc/" RC_FILE " or ";
-+	        "@RCDIR@/" RC_FILE " or ";
++      message = "Can't find or open file " RCDIR "/" RC_FILE " or ";
        message += prog_config.homedir + "/." RC_FILE "\n";
      }
      else {
-       message = "Can't find or open file /etc/" RC_FILE "\n"
+-      message = "Can't find or open file /etc/" RC_FILE "\n"
 -	        "or /usr/local/etc/" RC_FILE;
-+	        "or @RCDIR@/" RC_FILE;
++      message = "Can't find or open file " RCDIR "/" RC_FILE;
        message += prog_config.homedir + "/." RC_FILE "\n";
      }
      write_error(message.c_str());
+@@ -1172,8 +1170,7 @@ void SettingsDialog::read_config(bool se
+ }
+ 
+ void SettingsDialog::get_reset_settings_prompt(void) {
+-  PromptDialog* dialog_p = new PromptDialog("Enter settings from /etc/efax-gtkrc or\n"
+-					    "/usr/local/etc/efax-gtkrc?",
++  PromptDialog* dialog_p = new PromptDialog("Enter settings from " RCDIR "/efax-gtkrc?",
+ 					    "Reset settings", standard_size, *this);
+   if (!dialog_p) {
+     cerr << "Memory allocation error in SettingsDialog::get_reset_settings_prompt()" << endl;
+@@ -1248,17 +1245,11 @@ bool SettingsDialog::get_rcfile_path(boo
+ 
+   if (!found_rcfile) {
+ 
+-    rcfile = "/usr/local/etc/";
++    rcfile = RCDIR "/";
+     rcfile += RC_FILE;
+     if (!access(rcfile.c_str(), F_OK)) found_rcfile = true;
+   }
+ 
+-  if (!found_rcfile) {
+-
+-    rcfile = "/etc/";
+-    rcfile += RC_FILE;
+-    if (!access(rcfile.c_str(), F_OK)) found_rcfile = true;
+-  }
+   if (!found_rcfile) rcfile = "";
+   return found_rcfile;
+ }
diff --git a/comms/efax-gtk/patches/patch-ad b/comms/efax-gtk/patches/patch-ad
new file mode 100644
index 00000000000..97c0cd6dd2f
--- /dev/null
+++ b/comms/efax-gtk/patches/patch-ad
@@ -0,0 +1,27 @@
+$NetBSD: patch-ad,v 1.1 2002/12/25 13:18:25 jmmv Exp $
+
+--- helpfile.h.orig	Sat Apr  6 13:07:24 2002
++++ helpfile.h
+@@ -135,10 +135,10 @@ const char helpfile_msg[] = 
+ "--------\n"
+ "\n"
+ "The program settings can be changed by manually editing the efax-gtk\n"
+-"configuration file comprising $HOME/.efax-gtkrc,\n"
+-"/usr/local/etc/efax-gtkrc or /etc/efax-gtkrc.  The file is searched\n"
++"configuration file comprising $HOME/.efax-gtkrc or\n"
++RCDIR "/efax-gtkrc.  The file is searched\n"
+ "for in that order, so $HOME/.efax-gtkrc takes precedence over the\n"
+-"other two.\n"
++"other one.\n"
+ "\n"
+ "The configuration file can also be set by using the Settings dialog\n"
+ "launched from the `File/Settings' pull down menu item.  The settings\n"
+@@ -147,7 +147,7 @@ const char helpfile_msg[] = 
+ "revert to the global settings, this can be done either by deleting the\n"
+ "$HOME/.efax-gtkrc file, or by pressing the `Reset' button in the\n"
+ "Settings dialog, which will reload the Settings dialog from\n"
+-"/etc/efax-gtkrc or /usr/local/etc/efax-gtkrc.\n"
++RCDIR "/efax-gtkrc.\n"
+ "\n"
+ "Help can be obtained when filling out the Settings dialog by holding\n"
+ "the mouse over the relevant help (?) button, which will bring up a\n"
diff --git a/comms/efax-gtk/patches/patch-ae b/comms/efax-gtk/patches/patch-ae
new file mode 100644
index 00000000000..2a7ec1faa40
--- /dev/null
+++ b/comms/efax-gtk/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2002/12/25 13:18:25 jmmv Exp $
+
+--- Makefile.in.orig	Sat Apr  6 13:07:24 2002
++++ Makefile.in
+@@ -7,5 +7,7 @@ BINDIR=@BINDIR@
+ RCDIR=@RCDIR@
+ SPOOLDIR=@SPOOLDIR@
+ MANDIR=@MANDIR@
++prefix=@prefix@
++DATADIR=@datadir@
+ 
+ @make_presets@