Update to version 1.2.2

PR:		ports/78740
Submitted by:	Ports Fury

4 files changed, 61 insertions, 7 deletions

diff --git a/mail/renattach/Makefile b/mail/renattach/Makefile
index f9122698d764..0881b434fd47 100644
--- a/mail/renattach/Makefile
+++ b/mail/renattach/Makefile
@@ -6,26 +6,31 @@
 #
 
 PORTNAME=	renattach
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.pc-tools.net/files/unix/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rename or remove certain attachments or kill entire messages
 
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		renattach.1
-PLIST_FILES=	bin/renattach etc/renattach.conf.ex
 PORTDOCS=	INSTALL
+PLIST_FILES=	bin/renattach etc/renattach.conf.ex
+
+post-extract:
+	@${RM} -f ${WRKSRC}/src/getopt*
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/${PORTDOCS}  ${DOCSDIR}
-.endif
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
 	@${ECHO_MSG} "===================="
 	@${ECHO_MSG} "Check with ${DOCSDIR}/INSTALL"
 	@${ECHO_MSG} "After that you may need to adjust renattach.conf to your needs"
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/renattach/distinfo b/mail/renattach/distinfo
index e7b60d877b54..ad079be018a7 100644
--- a/mail/renattach/distinfo
+++ b/mail/renattach/distinfo
@@ -1,2 +1,2 @@
-MD5 (renattach-1.2.1.tar.gz) = bd6bbcb74d8a7f8a94655aa73c1ab5ce
-SIZE (renattach-1.2.1.tar.gz) = 117885
+MD5 (renattach-1.2.2.tar.gz) = 2a9c7c31ba618ea751fc0ba7a81836f8
+SIZE (renattach-1.2.2.tar.gz) = 123873
diff --git a/mail/renattach/files/patch-src::Makefile.in b/mail/renattach/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..6a642e05ea17
--- /dev/null
+++ b/mail/renattach/files/patch-src::Makefile.in
@@ -0,0 +1,38 @@
+--- src/Makefile.in.orig	Wed Oct  6 13:50:11 2004
++++ src/Makefile.in	Mon Mar  7 23:35:28 2005
+@@ -51,13 +51,13 @@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_renattach_OBJECTS = renattach.$(OBJEXT) settings.$(OBJEXT) \
+-	utility.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT)
++	utility.$(OBJEXT)
+ renattach_OBJECTS = $(am_renattach_OBJECTS)
+ renattach_LDADD = $(LDADD)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
++@AMDEP_TRUE@DEP_FILES = \
+ @AMDEP_TRUE@	./$(DEPDIR)/renattach.Po ./$(DEPDIR)/settings.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/utility.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -143,8 +143,8 @@
+ target_alias = @target_alias@
+ AM_CFLAGS = -pedantic -Wall -DCONF_DIR=\"$(sysconfdir)\"
+ dist_man_MANS = renattach.1
+-renattach_SOURCES = renattach.c settings.c utility.c getopt.c getopt1.c \
+-	renattach.h strings-en.h utility.h getopt.h
++renattach_SOURCES = renattach.c settings.c utility.c \
++	renattach.h strings-en.h utility.h
+ 
+ all: all-am
+ 
+@@ -212,8 +212,6 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-@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)/renattach.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settings.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utility.Po@am__quote@
diff --git a/mail/renattach/files/patch-src::renattach.c b/mail/renattach/files/patch-src::renattach.c
new file mode 100644
index 000000000000..c898945c2e0d
--- /dev/null
+++ b/mail/renattach/files/patch-src::renattach.c
@@ -0,0 +1,11 @@
+--- src/renattach.c.orig	Wed Oct  6 13:22:24 2004
++++ src/renattach.c	Mon Mar  7 23:36:42 2005
+@@ -26,7 +26,7 @@
+ #include "renattach.h"
+ #include "strings-en.h"
+ #include "utility.h"
+-#include "getopt.h"
++#include <getopt.h>
+ #include <memory.h>
+ #include <stdio.h>
+ #include <stdlib.h>