diff options
Diffstat (limited to 'comms/efax-gtk/patches')
| -rw-r--r-- | comms/efax-gtk/patches/patch-aa | 57 | ||||
| -rw-r--r-- | comms/efax-gtk/patches/patch-ab | 62 | ||||
| -rw-r--r-- | comms/efax-gtk/patches/patch-ac | 81 | ||||
| -rw-r--r-- | comms/efax-gtk/patches/patch-ad | 38 |
4 files changed, 110 insertions, 128 deletions
diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa index 8461715d2ee..b95276d618b 100644 --- a/comms/efax-gtk/patches/patch-aa +++ b/comms/efax-gtk/patches/patch-aa @@ -1,38 +1,29 @@ -$NetBSD: patch-aa,v 1.3 2003/11/14 11:18:57 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2005/03/30 13:49:28 adam Exp $ ---- Makefile.presets.orig Sat Apr 6 13:07:24 2002 -+++ Makefile.presets -@@ -5,7 +5,7 @@ - # produced by using automake +--- Makefile.in.orig 2005-02-26 14:41:26.000000000 +0000 ++++ Makefile.in +@@ -141,7 +141,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ - 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 +-SUBDIRS = src efax po efax-gtk-faxfilter ++SUBDIRS = src po efax-gtk-faxfilter + desktopdir = $(datadir)/applications -@@ -40,18 +40,12 @@ settings_help.o: settings_help.cpp setti - $(CC) $(CXXFLAGS) $(COMPILE_OPTION) $(OUTPUT_OPTION) +@@ -265,12 +265,12 @@ uninstall-desktopDATA: + sysconfDATA_INSTALL = $(INSTALL_DATA) + install-sysconfDATA: $(sysconf_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ++ $(mkinstalldirs) $(datadir)/examples + @list='$(sysconf_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \ +- $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \ ++ echo " $(sysconfDATA_INSTALL) $$d$$p $(datadir)/examples/$$f"; \ ++ $(sysconfDATA_INSTALL) $$d$$p $(datadir)/examples/$$f; \ + done - install: efax-gtk -- $(INSTALL) -d $(BINDIR) -- $(INSTALL) -d $(RCDIR) -- $(INSTALL) -d $(MANDIR)/man1 -- $(INSTALL) -m644 -oroot -groot efax-gtk efax-gtk-send $(BINDIR)/ -- chmod +x $(BINDIR)/efax-gtk -- chmod +x $(BINDIR)/efax-gtk-send -- $(INSTALL) -m644 -oroot -groot efax-gtkrc $(RCDIR)/ -- $(INSTALL) -m644 -oroot -groot efax-gtk.1.gz $(MANDIR)/man1/ -- $(INSTALL) -d $(SPOOLDIR) -- chgrp lp $(SPOOLDIR) -- $(INSTALL) -m644 -oroot -groot efax-gtk-faxfilter $(SPOOLDIR)/ -- chmod +x $(SPOOLDIR)/efax-gtk-faxfilter -+ $(BSD_INSTALL_PROGRAM) efax-gtk $(BINDIR)/ -+ $(BSD_INSTALL_SCRIPT) efax-gtk-send $(BINDIR)/ -+ $(BSD_INSTALL_DATA) efax-gtkrc $(DATADIR)/examples/efax-gtk/ -+ $(BSD_INSTALL_MAN) efax-gtk.1 $(MANDIR)/man1/ -+ $(BSD_INSTALL_DATA_DIR) $(SPOOLDIR) -+ $(BSD_INSTALL_SCRIPT) efax-gtk-faxfilter $(SPOOLDIR)/ - - clean: - rm -f *.o + uninstall-sysconfDATA: diff --git a/comms/efax-gtk/patches/patch-ab b/comms/efax-gtk/patches/patch-ab index ada89c68481..0bb6597da0e 100644 --- a/comms/efax-gtk/patches/patch-ab +++ b/comms/efax-gtk/patches/patch-ab @@ -1,32 +1,44 @@ -$NetBSD: patch-ab,v 1.2 2002/12/25 13:18:25 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2005/03/30 13:49:28 adam Exp $ ---- main.cpp.orig Sat Apr 6 13:07:24 2002 -+++ main.cpp -@@ -106,7 +106,7 @@ string configure_prog(bool reread) { +--- src/efax_controller.cpp.orig 2005-03-30 15:38:46.000000000 +0000 ++++ src/efax_controller.cpp +@@ -234,8 +234,8 @@ std::pair<const char*, char* const*> Efa - if (!prog_config.found_rcfile) { + *temp_pp = 0; -- rcfile = "/usr/local/etc/"; -+ rcfile = RCDIR "/"; - rcfile += RC_FILE; +- char* prog_name = new char[std::strlen("efax-0.9a") + 1]; +- std::strcpy(prog_name, "efax-0.9a"); ++ char* prog_name = new char[std::strlen("efax") + 1]; ++ std::strcpy(prog_name, "efax"); - #ifdef HAVE_IOS_NOCREATE -@@ -123,7 +123,7 @@ string configure_prog(bool reread) { + return std::pair<const char*, char* const*>(prog_name, exec_parms); + } +@@ -290,7 +290,7 @@ void EfaxController::sendfax_slot(void) - if (!prog_config.found_rcfile) { + // if we reached this point, then the execvp() call must have failed + // report error and exit - uses _exit() and not exit() +- write_error("Can't find the efax-0.9a program - please check your installation\n" ++ write_error("Can't find the efax program - please check your installation\n" + "and the PATH environmental variable\n"); + _exit(EXEC_ERROR); + } // end of child process +@@ -634,8 +634,8 @@ std::pair<const char*, char* const*> Efa + + *temp_pp = 0; -- rcfile = "/etc/"; -+ rcfile = RCDIR "/"; - rcfile += RC_FILE; +- char* prog_name = new char[std::strlen("efax-0.9a") + 1]; +- std::strcpy(prog_name, "efax-0.9a"); ++ char* prog_name = new char[std::strlen("efax") + 1]; ++ std::strcpy(prog_name, "efax"); + + return std::pair<const char*, char* const*>(prog_name, exec_parms); + } +@@ -742,7 +742,7 @@ void EfaxController::receive(State mode) - #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; -+ 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; + // if we reached this point, then the execvp() call must have failed + // report the error and end this process - use _exit() and not exit() +- write_error("Can't find the efax-0.9a program - please check your installation\n" ++ write_error("Can't find the efax program - please check your installation\n" + "and the PATH environmental variable\n"); + _exit(EXEC_ERROR); + } // end of child process diff --git a/comms/efax-gtk/patches/patch-ac b/comms/efax-gtk/patches/patch-ac index 267d7e15e16..7c57dcbce9f 100644 --- a/comms/efax-gtk/patches/patch-ac +++ b/comms/efax-gtk/patches/patch-ac @@ -1,49 +1,42 @@ -$NetBSD: patch-ac,v 1.2 2002/12/25 13:18:25 jmmv Exp $ +$NetBSD: patch-ac,v 1.3 2005/03/30 13:49:28 adam Exp $ ---- 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" -- "/usr/local/etc/" 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" -- "or /usr/local/etc/" 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 - } +--- src/fax_list.cpp.orig 2005-03-30 15:43:12.000000000 +0000 ++++ src/fax_list.cpp +@@ -533,7 +533,7 @@ std::pair<const char*, char* const*> Fax + std::vector<std::string> efix_parms; + std::string temp; + +- efix_parms.push_back("efix-0.9a"); ++ efix_parms.push_back("efix"); + // shut up efix (comment out next line and uncomment following one if errors to be reported) + efix_parms.push_back("-v"); + //efix_parms.push_back("-ve"); +@@ -679,8 +679,8 @@ std::pair<const char*, char* const*> Fax + + *temp_pp = 0; + +- char* prog_name = new char[std::strlen("efix-0.9a") + 1]; +- std::strcpy(prog_name, "efix-0.9a"); ++ char* prog_name = new char[std::strlen("efix") + 1]; ++ std::strcpy(prog_name, "efix"); - 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 + return std::pair<const char*, char* const*>(prog_name, exec_parms); + } +@@ -886,7 +886,7 @@ void FaxListDialog::print_fax_thread(voi - if (!found_rcfile) { + // if we reached this point, then the execvp() call must have failed + // report error and then end process - use _exit(), not exit() +- write_error("Can't find the efix-0.9a program - please check your installation\n" ++ write_error("Can't find the efix program - please check your installation\n" + "and the PATH environmental variable\n"); + _exit(0); + } +@@ -1004,7 +1004,7 @@ void FaxListDialog::view_fax_thread(void -- rcfile = "/usr/local/etc/"; -+ rcfile = RCDIR "/"; - rcfile += RC_FILE; - if (!access(rcfile.c_str(), F_OK)) found_rcfile = true; + // if we reached this point, then the execvp() call must have failed + // report error and then end process - use _exit(), not exit() +- write_error("Can't find the efix-0.9a program - please check your installation\n" ++ write_error("Can't find the efix program - please check your installation\n" + "and the PATH environmental variable\n"); + _exit(0); } - -- 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 index 97c0cd6dd2f..4f09fd33a04 100644 --- a/comms/efax-gtk/patches/patch-ad +++ b/comms/efax-gtk/patches/patch-ad @@ -1,27 +1,13 @@ -$NetBSD: patch-ad,v 1.1 2002/12/25 13:18:25 jmmv Exp $ +$NetBSD: patch-ad,v 1.2 2005/03/30 13:49:28 adam 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" +--- src/main.cpp.orig 2005-03-30 15:44:28.000000000 +0000 ++++ src/main.cpp +@@ -429,7 +429,7 @@ Glib::ustring configure_prog(bool reread + + // we have finished reading the configuration file + // now enter parameters common to send and receive of faxes +- prog_config.parms.push_back("efax-0.9a"); ++ prog_config.parms.push_back("efax"); + + prog_config.parms.push_back("-vew"); // stderr -- errors and warnings + |