ports/59127: Update port: mail/filtermail to 0.6

[KATO Tsuguru]

>Number:         59127
>Category:       ports
>Synopsis:       Update port: mail/filtermail to 0.6
>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:   Mon Nov 10 07:10:19 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.6

New file:
files/patch-src::Makefile.in

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/mail/filtermail/Makefile mail/filtermail/Makefile
--- /usr/ports/mail/filtermail/Makefile	Sun Nov  2 19:34:45 2003
+++ mail/filtermail/Makefile	Sat Nov  8 00:48:26 2003
@@ -9,8 +9,7 @@
 #
 
 PORTNAME=	filtermail
-PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTVERSION=	0.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://home.in.tum.de/baueran/%SUBDIR%/
@@ -20,17 +19,7 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Filter mail on a pop3 server: saves downloading spam
 
-LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext \
-		iconv:${PORTSDIR}/converters/libiconv
-
-GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-USE_GMAKE=	yes
-
-MAN1=		filtermail.1
-MAN5=		filtermailrc.5 filtermailex.5
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
 
 # This port is filtermail, but the author called it mailfilter. To avoid a
 #  clash with another port called mailfilter, we change all files
@@ -38,12 +27,22 @@
 #  *filtermail*, and similarly the names in the man pages.
 #
 EXTRACT_AFTER_ARGS=	| ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filtermail/g' | ${TAR} -xf -
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+USE_GETOPT_LONG=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+MAN1=		filtermail.1
+MAN5=		filtermailex.5 filtermailrc.5
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile (bad C++ code)"
-.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	Wed Sep 18 23:09:50 2002
+++ mail/filtermail/distinfo	Sat Nov  8 00:40:22 2003
@@ -1 +1 @@
-MD5 (mailfilter-0.2.4.tar.gz) = 9589a66d003760eb25e2498e706488ac
+MD5 (mailfilter-0.6.tar.gz) = 00066598d56cd2d9d3ac5c4b43cf1638
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	Thu Jan  1 09:00:00 1970
+++ mail/filtermail/files/patch-src::Makefile.in	Sat Nov  8 00:53:29 2003
@@ -0,0 +1,38 @@
+--- 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                     \
+-			getopt.c getopt.h getopt1.c             \
+ 			filtermail.cc filtermail.hh
+ 
+ 
+@@ -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 \
+- at 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 at ./$(DEPDIR)/RFC822.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/RegExp.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SocketConnection.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getopt.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getopt1.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/filtermail.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5c.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rcfile.Po at am__quote@
diff -urN /usr/ports/mail/filtermail/pkg-plist mail/filtermail/pkg-plist
--- /usr/ports/mail/filtermail/pkg-plist	Wed Sep 18 23:09:50 2002
+++ mail/filtermail/pkg-plist	Sat Nov  8 00:40:22 2003
@@ -1,5 +1,9 @@
 bin/filtermail
 share/locale/de/LC_MESSAGES/filtermail.mo
+share/locale/el/LC_MESSAGES/filtermail.mo
+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: