mirror of
https://git.freebsd.org/ports.git
synced 2025-06-03 03:46:30 -04:00
- Update to 0.8.1
- Remove NLS since port doesn't install NLS files anymore - Put only installed file in PLIST_FILES Approved by: miwi (mentor)
This commit is contained in:
parent
296e915760
commit
1318c2cf76
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=210872
5 changed files with 16 additions and 88 deletions
|
@ -9,8 +9,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= filtermail
|
||||
PORTVERSION= 0.7.2
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.8.1
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
|
||||
http://home.in.tum.de/baueran/%SUBDIR%/
|
||||
|
@ -41,13 +40,7 @@ MAN5= filtermailex.5 filtermailrc.5
|
|||
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=""
|
||||
.endif
|
||||
PLIST_FILES= bin/filtermail
|
||||
|
||||
post-extract:
|
||||
@${RM} -f ${WRKSRC}/src/getopt.h
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
MD5 (mailfilter-0.7.2.tar.gz) = 972aa6c6413fa22a62a8d402a24ba014
|
||||
SHA256 (mailfilter-0.7.2.tar.gz) = a54ec851787edf5100a5b61824b5035331a165a01c022f1e96eea286b43143e0
|
||||
SIZE (mailfilter-0.7.2.tar.gz) = 531872
|
||||
MD5 (mailfilter-0.8.1.tar.gz) = 2046aadb8b54b9cea33360e738855144
|
||||
SHA256 (mailfilter-0.8.1.tar.gz) = 991623af5f6c3f0e2d8d14886c90d6d32e796dc5d4989615d673ed747f583f51
|
||||
SIZE (mailfilter-0.8.1.tar.gz) = 372496
|
||||
|
|
|
@ -1,30 +1,5 @@
|
|||
--- 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 \
|
||||
rfc822.ll \
|
||||
- getopt.c getopt.h getopt1.c \
|
||||
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) \
|
||||
- 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) \
|
||||
@@ -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@
|
||||
|
|
|
@ -1,6 +1,14 @@
|
|||
--- 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 @@
|
||||
--- src/preferences.cc.orig 2007-01-22 23:36:04.000000000 +0100
|
||||
+++ src/preferences.cc 2008-04-08 17:00:17.000000000 +0200
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <vector>
|
||||
#include <stdexcept>
|
||||
#include <cstdio>
|
||||
+#include <wordexp.h>
|
||||
#include "preferences.hh"
|
||||
#include "filter.hh"
|
||||
#include "filtermail.hh"
|
||||
@@ -34,7 +35,7 @@
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
@ -9,43 +17,3 @@
|
|||
#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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
bin/filtermail
|
||||
%%NLS%%share/locale/de/LC_MESSAGES/filtermail.mo
|
||||
%%NLS%%share/locale/el/LC_MESSAGES/filtermail.mo
|
||||
%%NLS%%share/locale/es/LC_MESSAGES/filtermail.mo
|
||||
%%NLS%%share/locale/fr/LC_MESSAGES/filtermail.mo
|
||||
%%NLS%%share/locale/it/LC_MESSAGES/filtermail.mo
|
||||
%%NLS%%share/locale/pt_BR/LC_MESSAGES/filtermail.mo
|
||||
%%NLS%%share/locale/ru/LC_MESSAGES/filtermail.mo
|
Loading…
Add table
Reference in a new issue