Date: Sat, 20 Mar 2004 01:30:29 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64471: Update port: mail/filtermail to 0.7 Message-ID: <20040320013029.4b9a5c44.tkato@prontomail.com> Resent-Message-ID: <200403191640.i2JGeG2I011375@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64471
>Category: ports
>Synopsis: Update port: mail/filtermail to 0.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 19 08:40:16 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 0.7
New file:
files/patch-src::filter.hh
files/patch-src::preferences.cc
files/patch-src::rcfile.ll
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/mail/filtermail/Makefile mail/filtermail/Makefile
--- /usr/ports/mail/filtermail/Makefile Thu Mar 18 01:10:03 2004
+++ mail/filtermail/Makefile Fri Mar 19 22:54:40 2004
@@ -9,8 +9,7 @@
#
PORTNAME= filtermail
-PORTVERSION= 0.6
-PORTREVISION= 1
+PORTVERSION= 0.7
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://home.in.tum.de/baueran/%SUBDIR%/
@@ -31,8 +30,8 @@
USE_GETOPT_LONG= yes
USE_GETTEXT= yes
-USE_GMAKE= yes
USE_BISON= yes
+USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -43,13 +42,7 @@
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502103
-BROKEN= "Build fails on FreeBSD >= 5.x"
-.endif
-
post-extract:
@${RM} -f ${WRKSRC}/src/getopt.h
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/mail/filtermail/distinfo mail/filtermail/distinfo
--- /usr/ports/mail/filtermail/distinfo Thu Jan 29 20:29:18 2004
+++ mail/filtermail/distinfo Fri Mar 19 22:55:26 2004
@@ -1,2 +1,2 @@
-MD5 (mailfilter-0.6.tar.gz) = 00066598d56cd2d9d3ac5c4b43cf1638
-SIZE (mailfilter-0.6.tar.gz) = 482738
+MD5 (mailfilter-0.7.tar.gz) = 015246adff2cf664398d6790cd50e8b7
+SIZE (mailfilter-0.7.tar.gz) = 458864
diff -urN /usr/ports/mail/filtermail/files/patch-src::Makefile.in mail/filtermail/files/patch-src::Makefile.in
--- /usr/ports/mail/filtermail/files/patch-src::Makefile.in Tue Nov 11 04:06:46 2003
+++ mail/filtermail/files/patch-src::Makefile.in Fri Mar 19 22:58:21 2004
@@ -1,38 +1,56 @@
---- src/Makefile.in.orig Mon Oct 27 01:22:52 2003
-+++ src/Makefile.in Sat Nov 8 00:53:16 2003
-@@ -203,7 +203,6 @@
- PopAccount.cc PopAccount.hh \
- RFC822.cc RFC822.hh \
- RegExp.cc RegExp.hh \
+--- src/Makefile.in.orig Sun Feb 15 02:36:23 2004
++++ src/Makefile.in Fri Mar 19 22:58:12 2004
+@@ -198,7 +198,6 @@
+ i18n.hh \
+ rcfile.ll rcfile.hh \
+ rfc822.ll \
- getopt.c getopt.h getopt1.c \
- filtermail.cc filtermail.hh
+ filtermail.hh filtermail.cc \
+ header.hh header.cc \
+ weeder.hh weeder.cc \
+@@ -231,7 +230,7 @@
+ PROGRAMS = $(bin_PROGRAMS)
-
-@@ -226,8 +225,8 @@
- Account.$(OBJEXT) Feedback.$(OBJEXT) rcfile.$(OBJEXT) \
- Preferences.$(OBJEXT) Checker.$(OBJEXT) Connection.$(OBJEXT) \
- SocketConnection.$(OBJEXT) PopAccount.$(OBJEXT) \
-- RFC822.$(OBJEXT) RegExp.$(OBJEXT) getopt.$(OBJEXT) \
-- getopt1.$(OBJEXT) filtermail.$(OBJEXT)
-+ RFC822.$(OBJEXT) RegExp.$(OBJEXT) \
-+ filtermail.$(OBJEXT)
- filtermail_OBJECTS = $(am_filtermail_OBJECTS) \
- $(nodist_filtermail_OBJECTS)
- filtermail_DEPENDENCIES = rcparser.o
-@@ -242,7 +241,6 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/Preferences.Po ./$(DEPDIR)/RFC822.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/RegExp.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/SocketConnection.Po \
+ am_filtermail_OBJECTS = md5c.$(OBJEXT) rcfile.$(OBJEXT) rfc822.$(OBJEXT) \
+- getopt.$(OBJEXT) getopt1.$(OBJEXT) filtermail.$(OBJEXT) \
++ filtermail.$(OBJEXT) \
+ header.$(OBJEXT) weeder.$(OBJEXT) preferences.$(OBJEXT) \
+ feedback.$(OBJEXT) filter.$(OBJEXT) score.$(OBJEXT) \
+ account.$(OBJEXT) protocol.$(OBJEXT) socket.$(OBJEXT) \
+@@ -246,7 +245,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)/filtermail.Po ./$(DEPDIR)/md5c.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/rcfile.Po ./$(DEPDIR)/y.tab.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -312,8 +310,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RFC822.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RegExp.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SocketConnection.Po@am__quote@
+ @AMDEP_TRUE@ ./$(DEPDIR)/header.Po ./$(DEPDIR)/filtermail.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/md5c.Po ./$(DEPDIR)/pop3.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/preferences.Po ./$(DEPDIR)/protocol.Po \
+@@ -315,8 +313,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)/filtermail.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5c.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rcfile.Po@am__quote@
+@@ -568,8 +564,8 @@
+ rcparser.hh: y.tab.c
+ y.tab.c: rcfile.yy
+ $(YACC) -p rc $(YFLAGS) -o$@ $^; \
+- mv --force y.tab.c rcparser.cc; \
+- mv --force y.tab.h rcparser.hh; \
++ mv -f y.tab.c rcparser.cc; \
++ mv -f y.tab.h rcparser.hh; \
+ $(CXXCOMPILE) -c rcparser.cc; \
+ touch y.tab.c
+
+@@ -580,7 +576,7 @@
+ rfc822parser.hh: rfc822parser.cc
+ rfc822parser.cc: rfc822.yy
+ $(YACC) $(YFLAGS) -p rfc -o$@ $^; \
+- mv --force y.tab.h rcparser.hh; \
++ mv -f y.tab.h rcparser.hh; \
+ $(CXXCOMPILE) -c rfc822parser.cc; \
+ touch y.tab.c
+
diff -urN /usr/ports/mail/filtermail/files/patch-src::filter.hh mail/filtermail/files/patch-src::filter.hh
--- /usr/ports/mail/filtermail/files/patch-src::filter.hh Thu Jan 1 09:00:00 1970
+++ mail/filtermail/files/patch-src::filter.hh Fri Mar 19 23:19:44 2004
@@ -0,0 +1,12 @@
+--- src/filter.hh.orig Sun Jan 25 21:56:42 2004
++++ src/filter.hh Fri Mar 19 23:19:33 2004
+@@ -21,8 +21,8 @@
+
+ #include <string>
+ extern "C" {
+-#include <regex.h>
+ #include <sys/types.h>
++#include <regex.h>
+ }
+
+ // Filter modes
diff -urN /usr/ports/mail/filtermail/files/patch-src::preferences.cc mail/filtermail/files/patch-src::preferences.cc
--- /usr/ports/mail/filtermail/files/patch-src::preferences.cc Thu Jan 1 09:00:00 1970
+++ mail/filtermail/files/patch-src::preferences.cc Fri Mar 19 23:16:40 2004
@@ -0,0 +1,51 @@
+--- src/preferences.cc.orig Sun Jan 25 21:56:46 2004
++++ src/preferences.cc Fri Mar 19 23:16:27 2004
+@@ -34,7 +34,7 @@
+ #include "rcfile.hh"
+ extern "C"
+ {
+-#include <wordexp.h>
++#include <glob.h>
+ #include <sys/types.h>
+ #include <regex.h>
+ }
+@@ -230,15 +230,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)
+@@ -256,15 +256,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);
+ }
+ }
+
diff -urN /usr/ports/mail/filtermail/files/patch-src::rcfile.ll mail/filtermail/files/patch-src::rcfile.ll
--- /usr/ports/mail/filtermail/files/patch-src::rcfile.ll Thu Jan 1 09:00:00 1970
+++ mail/filtermail/files/patch-src::rcfile.ll Fri Mar 19 23:18:22 2004
@@ -0,0 +1,34 @@
+--- src/rcfile.ll.orig Sun Jan 25 21:56:46 2004
++++ src/rcfile.ll Fri Mar 19 23:18:03 2004
+@@ -44,7 +44,7 @@
+
+ extern "C"
+ {
+-#include "wordexp.h"
++#include "glob.h"
+ }
+
+ using namespace std;
+@@ -125,7 +125,7 @@
+
+ <INCL>[^ \t\n]+ {
+ /* Include further rcfiles: */
+- wordexp_t result;
++ glob_t result;
+
+ if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
+ {
+@@ -136,10 +136,10 @@
+
+ try
+ {
+- if (wordexp (yytext, &result, 0) == 0)
++ if (glob (yytext, 0, NULL, &result) == 0)
+ {
+- sub_file = result.we_wordv[0];
+- wordfree (&result);
++ sub_file = result.gl_pathv[0];
++ globfree (&result);
+ }
+ else
+ {
diff -urN /usr/ports/mail/filtermail/pkg-plist mail/filtermail/pkg-plist
--- /usr/ports/mail/filtermail/pkg-plist Tue Nov 11 11:32:49 2003
+++ mail/filtermail/pkg-plist Fri Mar 19 23:25:55 2004
@@ -4,6 +4,5 @@
share/locale/es/LC_MESSAGES/filtermail.mo
share/locale/fr/LC_MESSAGES/filtermail.mo
share/locale/it/LC_MESSAGES/filtermail.mo
-share/locale/pl/LC_MESSAGES/filtermail.mo
share/locale/pt_BR/LC_MESSAGES/filtermail.mo
share/locale/ru/LC_MESSAGES/filtermail.mo
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040320013029.4b9a5c44.tkato>