Attachment #44150 for bug #68417

View | Details | Raw Unified | Return to bug 68417
Collapse All | Expand All

Lines 8-16 Link Here

(-)efax-gtk/Makefile (-2 / +3 lines)
8	#	8	#
9		9
10	PORTNAME= efax-gtk	10	PORTNAME= efax-gtk
11	PORTVERSION= 2.2.5	11	PORTVERSION= 2.2.8
12	CATEGORIES= comms	12	CATEGORIES= comms
13	MASTER_SITES= http://www.cvine.freeserve.co.uk/efax-gtk/	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
		14	MASTER_SITE_SUBDIR= ${PORTNAME}
14	EXTRACT_SUFX= .src.tgz	15	EXTRACT_SUFX= .src.tgz
15		16
16	MAINTAINER= jb.quenot@caraldi.com	17	MAINTAINER= jb.quenot@caraldi.com

Lines 1-2 Link Here

(-)efax-gtk/distinfo (-2 / +2 lines)
1	MD5 (efax-gtk-2.2.5.src.tgz) = 8458a262740d86db11fabbf501e4c3d6	1	MD5 (efax-gtk-2.2.8.src.tgz) = a47cf133ccdb0a78c8cb9b6126ed208d
2	SIZE (efax-gtk-2.2.5.src.tgz) = 442037	2	SIZE (efax-gtk-2.2.8.src.tgz) = 582863

Lines 1-11 Link Here

(-)efax-gtk/files/patch-install (-11 lines)
1	--- efax-gtk-faxfilter/Makefile.in.orig Thu Feb 5 21:35:06 2004
2	+++ efax-gtk-faxfilter/Makefile.in Sun Feb 29 15:48:48 2004
3	@@ -441,8 +441,6 @@
4
5
6	install-data-hook:
7	- chown lp $(spooldir)
8	- chgrp lp $(spooldir)
9	# Tell versions [3.59,3.63) of GNU make to not export all variables.
10	# Otherwise a system limit (for SysV at least) may be exceeded.
11	.NOEXPORT:




--- src/efax_controller.cpp.orig	Sun Jun 27 13:22:08 2004
+++ src/efax_controller.cpp	Sun Jun 27 13:22:32 2004
@@ -14,9 +14,6 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <errno.h>
-#ifdef HAVE_PTHREAD_SIGMASK 
-#include <pthread.h>
-#endif
 
 #include <fstream>
 #include <iomanip>
@@ -30,6 +27,10 @@
 #include <glibmm/thread.h>
 
 #include "efax_controller.h"
+
+#ifdef HAVE_PTHREAD_SIGMASK 
+#include <pthread.h>
+#endif
 
 #ifdef HAVE_STRINGSTREAM
 #include <sstream>
--- src/fax_list.cpp.orig	Sun Jun 27 13:22:08 2004
+++ src/fax_list.cpp	Sun Jun 27 13:22:44 2004
@@ -24,9 +24,6 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
-#ifdef HAVE_PTHREAD_SIGMASK 
-#include <pthread.h>
-#endif
 
 #include <gdkmm/pixbuf.h>
 #include <gdk/gdkkeysyms.h> // the key codes are here
@@ -42,6 +39,10 @@
 #include "dialogs.h"
 #include "fax_list_icons.h"
 #include "pipes.h"
+
+#ifdef HAVE_PTHREAD_SIGMASK 
+#include <pthread.h>
+#endif
 
 #ifdef HAVE_STRINGSTREAM
 #include <sstream>
--- src/socket_server.cpp.orig	Sun Jun 27 13:22:08 2004
+++ src/socket_server.cpp	Sun Jun 27 13:22:54 2004
@@ -20,14 +20,14 @@
 #include <unistd.h>
 #include <netdb.h>
 #include <errno.h>
-#ifdef HAVE_PTHREAD_SIGMASK 
-#include <pthread.h>
-#endif
 
 #include <glibmm/convert.h>
 
 #include "socket_server.h"
 
+#ifdef HAVE_PTHREAD_SIGMASK 
+#include <pthread.h>
+#endif
 
 #ifdef ENABLE_NLS
 #include <libintl.h>




--- src/config.h.in.orig	Thu Feb  5 21:37:17 2004
+++ src/config.h.in	Mon May  3 11:09:39 2004
@@ -79,9 +79,3 @@
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef socklen_t
-
-/* Define to `signed int' if <sys/types.h> does not define. */
-#undef ssize_t

Lines 1-11 Link Here

(-)efax-gtk/files/patch-src::prog_defs.h (-11 lines)
1	--- src/prog_defs.h.orig Mon May 3 16:44:33 2004
2	+++ src/prog_defs.h Mon May 3 16:44:46 2004
3	@@ -9,6 +9,8 @@
4	#ifndef PROG_DEFS_H
5	#define PROG_DEFS_H
6
7	+#include <unistd.h>
8	+
9	#include "config.h"
10
11	// deal with any configuration issues arising from config.h

Lines 2-5 Link Here

(-)efax-gtk/pkg-plist (-1 / +1 lines)
2	bin/efax-0.9a	2	bin/efax-0.9a
3	bin/efix-0.9a	3	bin/efix-0.9a
4	etc/efax-gtkrc	4	etc/efax-gtkrc
5	share/gnome/apps/Applications/efax-gtk.desktop	5	share/applications/efax-gtk.desktop

Return to bug 68417

Line 0 Link Here

(-)efax-gtk/files/patch-pthread-include (+66 lines)
		1	--- src/efax_controller.cpp.orig Sun Jun 27 13:22:08 2004
		2	+++ src/efax_controller.cpp Sun Jun 27 13:22:32 2004
		3	@@ -14,9 +14,6 @@
		4	#include <sys/wait.h>
		5	#include <fcntl.h>
		6	#include <errno.h>
		7	-#ifdef HAVE_PTHREAD_SIGMASK
		8	-#include <pthread.h>
		9	-#endif
		10
		11	#include <fstream>
		12	#include <iomanip>
		13	@@ -30,6 +27,10 @@
		14	#include <glibmm/thread.h>
		15
		16	#include "efax_controller.h"
		17	+
		18	+#ifdef HAVE_PTHREAD_SIGMASK
		19	+#include <pthread.h>
		20	+#endif
		21
		22	#ifdef HAVE_STRINGSTREAM
		23	#include <sstream>
		24	--- src/fax_list.cpp.orig Sun Jun 27 13:22:08 2004
		25	+++ src/fax_list.cpp Sun Jun 27 13:22:44 2004
		26	@@ -24,9 +24,6 @@
		27	#include <stdlib.h>
		28	#include <signal.h>
		29	#include <errno.h>
		30	-#ifdef HAVE_PTHREAD_SIGMASK
		31	-#include <pthread.h>
		32	-#endif
		33
		34	#include <gdkmm/pixbuf.h>
		35	#include <gdk/gdkkeysyms.h> // the key codes are here
		36	@@ -42,6 +39,10 @@
		37	#include "dialogs.h"
		38	#include "fax_list_icons.h"
		39	#include "pipes.h"
		40	+
		41	+#ifdef HAVE_PTHREAD_SIGMASK
		42	+#include <pthread.h>
		43	+#endif
		44
		45	#ifdef HAVE_STRINGSTREAM
		46	#include <sstream>
		47	--- src/socket_server.cpp.orig Sun Jun 27 13:22:08 2004
		48	+++ src/socket_server.cpp Sun Jun 27 13:22:54 2004
		49	@@ -20,14 +20,14 @@
		50	#include <unistd.h>
		51	#include <netdb.h>
		52	#include <errno.h>
		53	-#ifdef HAVE_PTHREAD_SIGMASK
		54	-#include <pthread.h>
		55	-#endif
		56
		57	#include <glibmm/convert.h>
		58
		59	#include "socket_server.h"
		60
		61	+#ifdef HAVE_PTHREAD_SIGMASK
		62	+#include <pthread.h>
		63	+#endif
		64
65	#ifdef ENABLE_NLS
66	#include <libintl.h>

Lines 1-12 Link Here

(-)efax-gtk/files/patch-src::config.h.in (-12 lines)
1	--- src/config.h.in.orig Thu Feb 5 21:37:17 2004
2	+++ src/config.h.in Mon May 3 11:09:39 2004
3	@@ -79,9 +79,3 @@
4
5	/* Define to `unsigned' if <sys/types.h> does not define. */
6	#undef size_t
7	-
8	-/* Define to `unsigned int' if <sys/types.h> does not define. */
9	-#undef socklen_t
10	-
11	-/* Define to `signed int' if <sys/types.h> does not define. */
12	-#undef ssize_t