ports/78740: Update port: mail/renattach to 1.2.2

[KATO Tsuguru]

>Number:         78740
>Category:       ports
>Synopsis:       Update port: mail/renattach to 1.2.2
>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:   Sat Mar 12 16:10:06 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.2

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

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/mail/renattach/Makefile mail/renattach/Makefile
--- /usr/ports/mail/renattach/Makefile	Wed Jun 23 03:52:39 2004
+++ mail/renattach/Makefile	Sat Mar 12 00:19:07 2005
@@ -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 at 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 -urN /usr/ports/mail/renattach/distinfo mail/renattach/distinfo
--- /usr/ports/mail/renattach/distinfo	Wed Jun 23 03:52:39 2004
+++ mail/renattach/distinfo	Mon Mar  7 23:31:51 2005
@@ -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 -urN /usr/ports/mail/renattach/files/patch-src::Makefile.in mail/renattach/files/patch-src::Makefile.in
--- /usr/ports/mail/renattach/files/patch-src::Makefile.in	Thu Jan  1 09:00:00 1970
+++ mail/renattach/files/patch-src::Makefile.in	Mon Mar  7 23:35:39 2005
@@ -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
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
++ at 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
+ 
+- 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)/renattach.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/settings.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utility.Po at am__quote@
diff -urN /usr/ports/mail/renattach/files/patch-src::renattach.c mail/renattach/files/patch-src::renattach.c
--- /usr/ports/mail/renattach/files/patch-src::renattach.c	Thu Jan  1 09:00:00 1970
+++ mail/renattach/files/patch-src::renattach.c	Mon Mar  7 23:36:53 2005
@@ -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>
>Release-Note:
>Audit-Trail:
>Unformatted: