$NetBSD: patch-aa,v 1.1 2005/11/06 11:25:57 leonardschmidt Exp $

--- src/Makefile.in.orig	2004-11-27 13:29:44.000000000 +0000
+++ src/Makefile.in
@@ -198,7 +198,6 @@ mailfilter_SOURCES = md5c.c md5.h       
 			i18n.hh                                 \
 			rcfile.ll rcfile.hh                     \
 			rfc822.ll                               \
-			getopt.c getopt.h getopt1.c             \
 			mailfilter.hh mailfilter.cc             \
 			header.hh header.cc                     \
 			weeder.hh weeder.cc                     \
@@ -232,7 +231,7 @@ bin_PROGRAMS = mailfilter$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
 am_mailfilter_OBJECTS = md5c.$(OBJEXT) rcfile.$(OBJEXT) rfc822.$(OBJEXT) \
-	getopt.$(OBJEXT) getopt1.$(OBJEXT) mailfilter.$(OBJEXT) \
+	mailfilter.$(OBJEXT) \
 	header.$(OBJEXT) weeder.$(OBJEXT) preferences.$(OBJEXT) \
 	feedback.$(OBJEXT) filter.$(OBJEXT) score.$(OBJEXT) \
 	account.$(OBJEXT) protocol.$(OBJEXT) socket.$(OBJEXT) \
@@ -247,7 +246,6 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 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)/mailfilter.Po ./$(DEPDIR)/md5c.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/pop3.Po ./$(DEPDIR)/preferences.Po \
@@ -317,8 +315,6 @@ distclean-compile:
 @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)/mailfilter.Po@am__quote@
@@ -571,8 +567,8 @@ rcfile.cc: rcfile.ll rcparser.hh
 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
 
@@ -583,7 +579,7 @@ rfc822.cc: rfc822.ll rfc822parser.hh
 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