diff options
Diffstat (limited to 'comms')
-rw-r--r-- | comms/efax-gtk/Makefile | 8 | ||||
-rw-r--r-- | comms/efax-gtk/PLIST | 6 | ||||
-rw-r--r-- | comms/efax-gtk/distinfo | 19 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-aa | 31 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-ab | 55 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-ac | 49 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-ad | 13 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-af | 12 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-ag | 12 |
9 files changed, 62 insertions, 143 deletions
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index 83052e02fc8..694992e06eb 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2006/09/24 16:56:16 adam Exp $ +# $NetBSD: Makefile,v 1.35 2007/01/07 13:46:18 adam Exp $ -DISTNAME= efax-gtk-3.0.11.src -PKGNAME= efax-gtk-3.0.11 +DISTNAME= efax-gtk-3.0.12.src +PKGNAME= efax-gtk-3.0.12 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=efax-gtk/} EXTRACT_SUFX= .tgz @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://efax-gtk.sourceforge.net/ COMMENT= GTK frontend for efax -DEPENDS+= efax>=0.9:../../comms/efax - WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes diff --git a/comms/efax-gtk/PLIST b/comms/efax-gtk/PLIST index 8f6f2221561..c5a95597b00 100644 --- a/comms/efax-gtk/PLIST +++ b/comms/efax-gtk/PLIST @@ -1,6 +1,10 @@ -@comment $NetBSD: PLIST,v 1.9 2006/06/12 09:12:33 adam Exp $ +@comment $NetBSD: PLIST,v 1.10 2007/01/07 13:46:18 adam Exp $ +bin/efax-0.9a bin/efax-gtk +bin/efix-0.9a +man/man1/efax-0.9a.1 man/man1/efax-gtk.1 +man/man1/efix-0.9a.1 share/applications/efax-gtk.desktop share/examples/efax-gtkrc share/locale/bg/LC_MESSAGES/efax-gtk.mo diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo index f8544b0d885..96a8f0ff64a 100644 --- a/comms/efax-gtk/distinfo +++ b/comms/efax-gtk/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.14 2006/09/24 16:56:16 adam Exp $ +$NetBSD: distinfo,v 1.15 2007/01/07 13:46:18 adam Exp $ -SHA1 (efax-gtk-3.0.11.src.tgz) = 889bf4b5472f4793f436536c4770252debe75921 -RMD160 (efax-gtk-3.0.11.src.tgz) = 3ea44b04a6c7145a303d0f854802776a3f79db5b -Size (efax-gtk-3.0.11.src.tgz) = 1076781 bytes -SHA1 (patch-aa) = 0650232e162cac968c8a3920829fe17be38085aa -SHA1 (patch-ab) = d71cce206417ca9aa12abf687ce8ca2c1bcdc24f -SHA1 (patch-ac) = af6cfa319391caa6230ca69a776bdce8e7305710 -SHA1 (patch-ad) = d9212f4ded662871e3e0156dcd157a9e27dbf6f0 -SHA1 (patch-af) = 7965dfa6d497ee5886775a8bea6ceec5a4ddabe6 -SHA1 (patch-ag) = f5dbd0531e0f1e3a9f9b07603c1cde5bbf5fac33 +SHA1 (efax-gtk-3.0.12.src.tgz) = 1c235dee0da885eec22e519e522ed91c29b3ba30 +RMD160 (efax-gtk-3.0.12.src.tgz) = e44351d2f7a3cb4f9fb95d4d75bcd5c6af9e6952 +Size (efax-gtk-3.0.12.src.tgz) = 1102352 bytes +SHA1 (patch-aa) = 94cd524ea47542e69d4a13704c204522f7324cd8 +SHA1 (patch-ab) = cbada5659b3a9af6862a8941c2c85ab9dccdc475 +SHA1 (patch-ac) = 5d223f5a9cacf3b60e8e5affaf9e5be8511db9be +SHA1 (patch-af) = 2a9fd2b559e878252ba4f61a404910f0de24be25 +SHA1 (patch-ag) = 3554a457ec4e1839a442199133286a452f073d04 diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa index c6cb1623e5c..cf251746c1f 100644 --- a/comms/efax-gtk/patches/patch-aa +++ b/comms/efax-gtk/patches/patch-aa @@ -1,29 +1,20 @@ -$NetBSD: patch-aa,v 1.8 2006/09/24 16:56:16 adam Exp $ +$NetBSD: patch-aa,v 1.9 2007/01/07 13:46:19 adam Exp $ ---- Makefile.in.orig 2006-08-13 15:21:58.000000000 +0200 +--- Makefile.in.orig 2006-11-04 18:51:27.000000000 +0100 +++ Makefile.in -@@ -148,7 +148,7 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - --SUBDIRS = src efax po efax-gtk-faxfilter -+SUBDIRS = src po efax-gtk-faxfilter - - desktopdir = $(datadir)/applications - -@@ -290,12 +290,12 @@ uninstall-desktopDATA: - sysconfDATA_INSTALL = $(INSTALL_DATA) +@@ -338,12 +338,12 @@ uninstall-desktopDATA: + done install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -+ $(mkinstalldirs) $(datadir)/examples +- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" ++ test -z "$(datadir)" || $(mkdir_p) "$(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; \ + f=$(am__strip_dir) \ +- 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 uninstall-sysconfDATA: diff --git a/comms/efax-gtk/patches/patch-ab b/comms/efax-gtk/patches/patch-ab index 10c37b5fb68..bd5c7fc2302 100644 --- a/comms/efax-gtk/patches/patch-ab +++ b/comms/efax-gtk/patches/patch-ab @@ -1,44 +1,13 @@ -$NetBSD: patch-ab,v 1.9 2006/09/24 16:56:16 adam Exp $ +$NetBSD: patch-ab,v 1.10 2007/01/07 13:46:19 adam Exp $ ---- src/efax_controller.cpp.orig 2006-08-13 15:29:16.000000000 +0200 -+++ src/efax_controller.cpp -@@ -229,8 +229,8 @@ std::pair<const char*, char* const*> Efa - - *temp_pp = 0; - -- 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); - } -@@ -284,7 +284,7 @@ void EfaxController::sendfax_slot(void) - - // 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 -@@ -624,8 +624,8 @@ std::pair<const char*, char* const*> Efa - - *temp_pp = 0; - -- 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); - } -@@ -695,7 +695,7 @@ void EfaxController::receive(State mode) - - // 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 +--- efax/Makefile.in.orig 2007-01-07 13:49:13.000000000 +0100 ++++ efax/Makefile.in +@@ -315,7 +315,7 @@ install-man1: $(man1_MANS) $(man_MANS) + 1*) ;; \ + *) ext='1' ;; \ + esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ ++ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$/-0.9a/'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ diff --git a/comms/efax-gtk/patches/patch-ac b/comms/efax-gtk/patches/patch-ac index 9359da999a6..09a6d57052a 100644 --- a/comms/efax-gtk/patches/patch-ac +++ b/comms/efax-gtk/patches/patch-ac @@ -1,42 +1,13 @@ -$NetBSD: patch-ac,v 1.8 2006/09/24 16:56:16 adam Exp $ +$NetBSD: patch-ac,v 1.9 2007/01/07 13:46:19 adam Exp $ ---- src/fax_list.cpp.orig 2006-08-13 16:18:08.000000000 +0200 -+++ src/fax_list.cpp -@@ -633,7 +633,7 @@ std::pair<const char*, char* const*> Fax - // thread while we are accessing it here - Thread::Mutex::Lock lock(*prog_config.mutex_p); +--- po/Makefile.in.in.orig 2007-01-07 11:44:27.000000000 +0100 ++++ po/Makefile.in.in +@@ -30,7 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po -- 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"); -@@ -805,8 +805,8 @@ std::pair<const char*, char* const*> Fax - - *temp_pp = 0; + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-mkinstalldirs = $(SHELL) @install_sh@ -d ++mkinstalldirs = @install_sh@ -d + mkdir_p = @mkdir_p@ -- 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"); - - return std::pair<const char*, char* const*>(prog_name, exec_parms); - } -@@ -1010,7 +1010,7 @@ void FaxListDialog::print_fax_thread(voi - - // 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); - } -@@ -1212,7 +1212,7 @@ void FaxListDialog::view_fax_thread(void - - // 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); - } + GMSGFMT_ = @GMSGFMT@ diff --git a/comms/efax-gtk/patches/patch-ad b/comms/efax-gtk/patches/patch-ad deleted file mode 100644 index 7e381833e27..00000000000 --- a/comms/efax-gtk/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2006/09/24 16:56:16 adam Exp $ - ---- src/main.cpp.orig 2006-08-13 15:31:06.000000000 +0200 -+++ src/main.cpp -@@ -522,7 +522,7 @@ std::string 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 - diff --git a/comms/efax-gtk/patches/patch-af b/comms/efax-gtk/patches/patch-af index 167d4927d68..087c02876e8 100644 --- a/comms/efax-gtk/patches/patch-af +++ b/comms/efax-gtk/patches/patch-af @@ -1,13 +1,13 @@ -$NetBSD: patch-af,v 1.1 2006/09/24 16:56:17 adam Exp $ +$NetBSD: patch-af,v 1.2 2007/01/07 13:46:19 adam Exp $ ---- src/Makefile.in.orig 2006-09-24 11:20:56.000000000 +0200 +--- src/Makefile.in.orig 2006-11-04 18:51:26.000000000 +0100 +++ src/Makefile.in -@@ -174,7 +174,7 @@ noinst_HEADERS = mainwindow.h dialogs.h +@@ -229,7 +229,7 @@ noinst_HEADERS = mainwindow.h dialogs.h + fax_list_manager_icons.h libegg/eggtrayicon.h INCLUDES = -DDATADIR=\"$(datadir)\" -DRC_DIR=\"$(sysconfdir)\" -DSIGC_VERSION=@SIGC_VER@ - -AM_CXXFLAGS = -D_XOPEN_SOURCE=600 @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I./utils +AM_CXXFLAGS = @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I./utils - AM_CFLAGS = @GTK_CFLAGS@ -I./libegg - + efax_gtk_LDADD = utils/libutils.a @LIBINTL@ @SIGC_LIBS@ @GTK_LIBS@ @GTHREAD_LIBS@ @GTK_UNIX_PRINT_LIBS@ + EXTRA_DIST = libegg/CREDITS diff --git a/comms/efax-gtk/patches/patch-ag b/comms/efax-gtk/patches/patch-ag index 169d967abd9..194b969fa46 100644 --- a/comms/efax-gtk/patches/patch-ag +++ b/comms/efax-gtk/patches/patch-ag @@ -1,13 +1,13 @@ -$NetBSD: patch-ag,v 1.1 2006/09/24 16:56:17 adam Exp $ +$NetBSD: patch-ag,v 1.2 2007/01/07 13:46:19 adam Exp $ ---- src/utils/Makefile.in.orig 2006-09-24 11:21:21.000000000 +0200 +--- src/utils/Makefile.in.orig 2006-11-04 18:51:26.000000000 +0100 +++ src/utils/Makefile.in -@@ -169,7 +169,7 @@ noinst_HEADERS = fdstream.h fdstream.tcc +@@ -211,7 +211,7 @@ noinst_HEADERS = fdstream.h fdstream.tcc + window.h async_queue.h INCLUDES = -DDATADIR=\"$(datadir)\" -DRC_DIR=\"$(sysconfdir)\" -DSIGC_VERSION=@SIGC_VER@ - -AM_CXXFLAGS = -D_XOPEN_SOURCE=600 @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ -I.. +AM_CXXFLAGS = @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ -I.. - EXTRA_DIST = LGPL.TXT - subdir = src/utils + all: all-am + |