Attachment #51921 for bug #78738

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




#

PORTNAME=	filtermail
PORTVERSION=	0.7.1
CATEGORIES=	mail
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		http://home.in.tum.de/baueran/%SUBDIR%/

CPPFLAGS=	-I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib

.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=	--disable-nls
PLIST_SUB+=	NLS="@comment "
.else
USE_GETTEXT=	yes
PLIST_SUB+=	NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+=	NLS="@comment "
.endif

post-extract:

Lines 1-2 Link Here

(-)mail/filtermail/distinfo (-2 / +2 lines)
1	MD5 (mailfilter-0.7.tar.gz) = 015246adff2cf664398d6790cd50e8b7	1	MD5 (mailfilter-0.7.1.tar.gz) = be6d603081086c8780601cb0c8e19f67
2	SIZE (mailfilter-0.7.tar.gz) = 458864	2	SIZE (mailfilter-0.7.1.tar.gz) = 506799




--- src/Makefile.in.orig	Sat Nov 27 22:29:44 2004
+++ src/Makefile.in	Mon Mar  7 22:54:36 2005
@@ -198,7 +198,6 @@
 			i18n.hh                                 \
 			rcfile.ll rcfile.hh                     \

 			filtermail.hh filtermail.cc             \
 			header.hh header.cc                     \
 			weeder.hh weeder.cc                     \
@@ -232,7 +231,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 
 am_filtermail_OBJECTS = md5c.$(OBJEXT) rcfile.$(OBJEXT) rfc822.$(OBJEXT) \

 	header.$(OBJEXT) weeder.$(OBJEXT) preferences.$(OBJEXT) \
 	feedback.$(OBJEXT) filter.$(OBJEXT) score.$(OBJEXT) \
 	account.$(OBJEXT) protocol.$(OBJEXT) socket.$(OBJEXT) \
@@ -247,7 +246,6 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/account.Po ./$(DEPDIR)/apop.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/feedback.Po ./$(DEPDIR)/filter.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/header.Po ./$(DEPDIR)/imap.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/filtermail.Po ./$(DEPDIR)/md5c.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/pop3.Po ./$(DEPDIR)/preferences.Po \
@@ -317,8 +315,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/feedback.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filtermail.Po@am__quote@
@@ -571,8 +567,8 @@
@@ -568,8 +564,8 @@
 rcparser.hh: y.tab.c
 y.tab.c: rcfile.yy
 	   $(YACC) -p rc $(YFLAGS) -o$@ $^;   \

 	   $(CXXCOMPILE) -c rcparser.cc;      \
 	   touch y.tab.c
 
@@ -583,7 +579,7 @@
 rfc822parser.hh: rfc822parser.cc
 rfc822parser.cc: rfc822.yy
 		   $(YACC) $(YFLAGS) -p rfc -o$@ $^;  \
-		   mv --force y.tab.h rfc822parser.hh;\
+		   mv -f y.tab.h rfc822parser.hh;\
 		   $(CXXCOMPILE) -c rfc822parser.cc;  \
 		   touch y.tab.c
 




--- src/preferences.cc.orig	Sat Nov 20 23:39:15 2004
+++ src/preferences.cc	Mon Mar  7 22:58:20 2005
@@ -35,7 +35,7 @@
 
 extern "C"
 {
-#include <wordexp.h>

 #include <sys/types.h>
 #include <regex.h>
 }
@@ -233,15 +233,15 @@
 void Preferences :: set_headers_file (const char* name)
 {
   // Expand the given file name.
-  wordexp_t result;
-  if (wordexp (name, &result, 0) == 0)
-    headers_file_name = result.we_wordv[0];
+  glob_t result;
+  if (glob (name, 0, NULL, &result) == 0)
+    headers_file_name = result.gl_pathv[0];
   else
     {
       ERROR_MSG(_("Invalid file name: ") + (string)name + ".");
       exit (-1);
     }
-  wordfree (&result);
+  globfree (&result);
 }
 
 string Preferences :: headers_file (void)
@@ -259,15 +259,15 @@
   // command line.
   if (log_file_name.length () == 0)
     {
-      wordexp_t result;
-      if (wordexp (name, &result, 0) == 0)
-	log_file_name = result.we_wordv[0];
+      glob_t result;
+      if (glob (name, 0, NULL, &result) == 0)
+	log_file_name = result.gl_pathv[0];
       else
 	{
 	  ERROR_MSG(_("Invalid file name: ") + (string)name + ".");
 	  exit (-1);
 	}
-      wordfree (&result);
+      globfree (&result);
     }
 }

Return to bug 78738

Lines 9-15 Link Here

(-)mail/filtermail/Makefile (-5 / +5 lines)
9	#	9	#
10		10
11	PORTNAME= filtermail	11	PORTNAME= filtermail
12	PORTVERSION= 0.7	12	PORTVERSION= 0.7.1
13	CATEGORIES= mail	13	CATEGORIES= mail
14	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	14	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
15	http://home.in.tum.de/baueran/%SUBDIR%/	15	http://home.in.tum.de/baueran/%SUBDIR%/
Lines 41-52 Link Here
41	CPPFLAGS= -I${LOCALBASE}/include	41	CPPFLAGS= -I${LOCALBASE}/include
42	LDFLAGS= -L${LOCALBASE}/lib	42	LDFLAGS= -L${LOCALBASE}/lib
43		43
44	.if !defined(WITHOUT_NLS)	44	.if defined(WITHOUT_NLS)
		45	CONFIGURE_ARGS+= --disable-nls
		46	PLIST_SUB+= NLS="@comment "
		47	.else
45	USE_GETTEXT= yes	48	USE_GETTEXT= yes
46	PLIST_SUB+= NLS=""	49	PLIST_SUB+= NLS=""
47	.else
48	CONFIGURE_ARGS+=--disable-nls
49	PLIST_SUB+= NLS="@comment "
50	.endif	50	.endif
51		51
52	post-extract:	52	post-extract:

Lines 1-5 Link Here

(-)mail/filtermail/files/patch-src::Makefile.in (-15 / +15 lines)
1	--- src/Makefile.in.orig Sun Feb 15 02:36:23 2004	1	--- src/Makefile.in.orig Sat Nov 27 22:29:44 2004
2	+++ src/Makefile.in Fri Mar 19 22:58:12 2004	2	+++ src/Makefile.in Mon Mar 7 22:54:36 2005
3	@@ -198,7 +198,6 @@	3	@@ -198,7 +198,6 @@
4	i18n.hh \	4	i18n.hh \
5	rcfile.ll rcfile.hh \	5	rcfile.ll rcfile.hh \
Lines 8-14 Link Here
8	filtermail.hh filtermail.cc \	8	filtermail.hh filtermail.cc \
9	header.hh header.cc \	9	header.hh header.cc \
10	weeder.hh weeder.cc \	10	weeder.hh weeder.cc \
11	@@ -231,7 +230,7 @@	11	@@ -232,7 +231,7 @@
12	PROGRAMS = $(bin_PROGRAMS)	12	PROGRAMS = $(bin_PROGRAMS)
13		13
14	am_filtermail_OBJECTS = md5c.$(OBJEXT) rcfile.$(OBJEXT) rfc822.$(OBJEXT) \	14	am_filtermail_OBJECTS = md5c.$(OBJEXT) rcfile.$(OBJEXT) rfc822.$(OBJEXT) \
Lines 17-40 Link Here
17	header.$(OBJEXT) weeder.$(OBJEXT) preferences.$(OBJEXT) \	17	header.$(OBJEXT) weeder.$(OBJEXT) preferences.$(OBJEXT) \
18	feedback.$(OBJEXT) filter.$(OBJEXT) score.$(OBJEXT) \	18	feedback.$(OBJEXT) filter.$(OBJEXT) score.$(OBJEXT) \
19	account.$(OBJEXT) protocol.$(OBJEXT) socket.$(OBJEXT) \	19	account.$(OBJEXT) protocol.$(OBJEXT) socket.$(OBJEXT) \
20	@@ -246,7 +245,6 @@	20	@@ -247,7 +246,6 @@
21	am__depfiles_maybe = depfiles	21	am__depfiles_maybe = depfiles
22	@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/account.Po ./$(DEPDIR)/apop.Po \	22	@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/account.Po ./$(DEPDIR)/apop.Po \
23	@AMDEP_TRUE@ ./$(DEPDIR)/feedback.Po ./$(DEPDIR)/filter.Po \	23	@AMDEP_TRUE@ ./$(DEPDIR)/feedback.Po ./$(DEPDIR)/filter.Po \
24	-@AMDEP_TRUE@ ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \	24	-@AMDEP_TRUE@ ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
25	@AMDEP_TRUE@ ./$(DEPDIR)/header.Po ./$(DEPDIR)/filtermail.Po \	25	@AMDEP_TRUE@ ./$(DEPDIR)/header.Po ./$(DEPDIR)/imap.Po \
26	@AMDEP_TRUE@ ./$(DEPDIR)/md5c.Po ./$(DEPDIR)/pop3.Po \	26	@AMDEP_TRUE@ ./$(DEPDIR)/filtermail.Po ./$(DEPDIR)/md5c.Po \
27	@AMDEP_TRUE@ ./$(DEPDIR)/preferences.Po ./$(DEPDIR)/protocol.Po \	27	@AMDEP_TRUE@ ./$(DEPDIR)/pop3.Po ./$(DEPDIR)/preferences.Po \
28	@@ -315,8 +313,6 @@	28	@@ -317,8 +315,6 @@
29	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apop.Po@am__quote@	29	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apop.Po@am__quote@
30	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/feedback.Po@am__quote@	30	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/feedback.Po@am__quote@
31	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Po@am__quote@	31	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Po@am__quote@
32	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@	32	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
33	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@	33	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
34	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header.Po@am__quote@	34	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header.Po@am__quote@
		35	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap.Po@am__quote@
35	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filtermail.Po@am__quote@	36	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filtermail.Po@am__quote@
36	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5c.Po@am__quote@	37	@@ -571,8 +567,8 @@
37	@@ -568,8 +564,8 @@
38	rcparser.hh: y.tab.c	38	rcparser.hh: y.tab.c
39	y.tab.c: rcfile.yy	39	y.tab.c: rcfile.yy
40	$(YACC) -p rc $(YFLAGS) -o$@ $^; \	40	$(YACC) -p rc $(YFLAGS) -o$@ $^; \
Lines 45-56 Link Here
45	$(CXXCOMPILE) -c rcparser.cc; \	45	$(CXXCOMPILE) -c rcparser.cc; \
46	touch y.tab.c	46	touch y.tab.c
47		47
48	@@ -580,7 +576,7 @@	48	@@ -583,7 +579,7 @@
49	rfc822parser.hh: rfc822parser.cc	49	rfc822parser.hh: rfc822parser.cc
50	rfc822parser.cc: rfc822.yy	50	rfc822parser.cc: rfc822.yy
51	$(YACC) $(YFLAGS) -p rfc -o$@ $^; \	51	$(YACC) $(YFLAGS) -p rfc -o$@ $^; \
52	- mv --force y.tab.h rcparser.hh; \	52	- mv --force y.tab.h rfc822parser.hh;\
53	+ mv -f y.tab.h rcparser.hh; \	53	+ mv -f y.tab.h rfc822parser.hh;\
54	$(CXXCOMPILE) -c rfc822parser.cc; \	54	$(CXXCOMPILE) -c rfc822parser.cc; \
55	touch y.tab.c	55	touch y.tab.c
56		56

Lines 1-7 Link Here

(-)mail/filtermail/files/patch-src::preferences.cc (-42 / +42 lines)
1	--- src/preferences.cc.orig Sun Jan 25 21:56:46 2004	1	--- src/preferences.cc.orig Sat Nov 20 23:39:15 2004
2	+++ src/preferences.cc Fri Mar 19 23:16:27 2004	2	+++ src/preferences.cc Mon Mar 7 22:58:20 2005
3	@@ -34,7 +34,7 @@	3	@@ -35,7 +35,7 @@
4	#include "rcfile.hh"	4
5	extern "C"	5	extern "C"
6	{	6	{
7	-#include <wordexp.h>	7	-#include <wordexp.h>
Lines 9-51 Link Here
9	#include <sys/types.h>	9	#include <sys/types.h>
10	#include <regex.h>	10	#include <regex.h>
11	}	11	}
12	@@ -230,15 +230,15 @@	12	@@ -233,15 +233,15 @@
13	void Preferences :: set_headers_file (const char* name)	13	void Preferences :: set_headers_file (const char* name)
14	{	14	{
15	// Expand the given file name.	15	// Expand the given file name.
16	- wordexp_t result;	16	- wordexp_t result;
17	- if (wordexp (name, &result, 0) == 0)	17	- if (wordexp (name, &result, 0) == 0)
18	- headers_file_name = result.we_wordv[0];	18	- headers_file_name = result.we_wordv[0];
19	+ glob_t result;	19	+ glob_t result;
20	+ if (glob (name, 0, NULL, &result) == 0)	20	+ if (glob (name, 0, NULL, &result) == 0)
21	+ headers_file_name = result.gl_pathv[0];	21	+ headers_file_name = result.gl_pathv[0];
22	else	22	else
23	{	23	{
24	ERROR_MSG(_("Invalid file name: ") + (string)name + ".");	24	ERROR_MSG(_("Invalid file name: ") + (string)name + ".");
25	exit (-1);	25	exit (-1);
26	}	26	}
27	- wordfree (&result);	27	- wordfree (&result);
28	+ globfree (&result);	28	+ globfree (&result);
29	}	29	}
30		30
31	string Preferences :: headers_file (void)	31	string Preferences :: headers_file (void)
32	@@ -256,15 +256,15 @@	32	@@ -259,15 +259,15 @@
33	// command line.	33	// command line.
34	if (log_file_name.length () == 0)	34	if (log_file_name.length () == 0)
35	{	35	{
36	- wordexp_t result;	36	- wordexp_t result;
37	- if (wordexp (name, &result, 0) == 0)	37	- if (wordexp (name, &result, 0) == 0)
38	- log_file_name = result.we_wordv[0];	38	- log_file_name = result.we_wordv[0];
39	+ glob_t result;	39	+ glob_t result;
40	+ if (glob (name, 0, NULL, &result) == 0)	40	+ if (glob (name, 0, NULL, &result) == 0)
41	+ log_file_name = result.gl_pathv[0];	41	+ log_file_name = result.gl_pathv[0];
42	else	42	else
43	{	43	{
44	ERROR_MSG(_("Invalid file name: ") + (string)name + ".");	44	ERROR_MSG(_("Invalid file name: ") + (string)name + ".");
45	exit (-1);	45	exit (-1);
46	}	46	}
47	- wordfree (&result);	47	- wordfree (&result);
48	+ globfree (&result);	48	+ globfree (&result);
49	}	49	}
50	}	50	}