5 files changed, 29 insertions, 103 deletions

diff --git a/converters/tnef/Makefile b/converters/tnef/Makefile
index 6d9190f4695c..6d30f587183e 100644
--- a/converters/tnef/Makefile
+++ b/converters/tnef/Makefile
@@ -6,18 +6,31 @@
 #
 
 PORTNAME=	tnef
-PORTVERSION=	1.1
+PORTVERSION=	1.2.1
 CATEGORIES=	converters mail
-MASTER_SITES=	http://world.std.com/~damned/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	cr@jcmax.com
-COMMENT=	Unpack data encapsulated into Microsoft Outlook's application/ms-tnef format
+COMMENT=	Unpack data in MS Outlook TNEF format
 
 GNU_CONFIGURE=	yes
+USE_GETOPT_LONG=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-MAN1=	tnef.1
+MAN1=		tnef.1
+DOCS=		AUTHORS NEWS README THANKS TODO
 
-pre-configure:
-	${MV} ${WRKSRC}/doc/tnef.3 ${WRKSRC}/doc/tnef.1
+.if !defined(NOPORTDOCS)
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
+
+# This target is intended to be run by the port maintainer.
+x-test: build
+.for dir in cmdline files
+	@cd ${WRKSRC}/tests/${dir} && ${MAKE} check-TESTS
+.endfor
 
 .include <bsd.port.mk>
diff --git a/converters/tnef/distinfo b/converters/tnef/distinfo
index 06eb9e15177a..d390e25f61eb 100644
--- a/converters/tnef/distinfo
+++ b/converters/tnef/distinfo
@@ -1 +1 @@
-MD5 (tnef-1.1.tar.gz) = 56ab3407c4dedd433669942d6b0f3545
+MD5 (tnef-1.2.1.tar.gz) = 975e3dc0a592597b743af35934f6f1de
diff --git a/converters/tnef/files/patch-doc::Makefile.in b/converters/tnef/files/patch-doc::Makefile.in
deleted file mode 100644
index 5e62ea3a5f37..000000000000
--- a/converters/tnef/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,92 +0,0 @@
---- doc/Makefile.in.orig	Sun Oct 14 22:21:32 2001
-+++ doc/Makefile.in	Sun Oct 14 22:23:53 2001
-@@ -66,12 +66,12 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
- 
--man_MANS = tnef.3
-+man_MANS = tnef.1
- EXTRA_DIST = file-format.tex $(man_MANS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
--man3dir = $(mandir)/man3
-+man1dir = $(mandir)/man1
- MANS = $(man_MANS)
- 
- NROFF = nroff
-@@ -92,12 +92,12 @@
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- 
--install-man3:
--	$(mkinstalldirs) $(DESTDIR)$(man3dir)
--	@list='$(man3_MANS)'; \
-+install-man1:
-+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-+	@list='$(man1_MANS)'; \
- 	l2='$(man_MANS)'; for i in $$l2; do \
- 	  case "$$i" in \
--	    *.3*) list="$$list $$i" ;; \
-+	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
-@@ -106,30 +106,30 @@
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
-+	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-+	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
- 	done
- 
--uninstall-man3:
--	@list='$(man3_MANS)'; \
-+uninstall-man1:
-+	@list='$(man1_MANS)'; \
- 	l2='$(man_MANS)'; for i in $$l2; do \
- 	  case "$$i" in \
--	    *.3*) list="$$list $$i" ;; \
-+	    *.1*) list="$$list $$i" ;; \
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
--	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
-+	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-+	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
- 	done
- install-man: $(MANS)
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-man3
-+	$(MAKE) $(AM_MAKEFLAGS) install-man1
- uninstall-man:
- 	@$(NORMAL_UNINSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
-+	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
- tags: TAGS
- TAGS:
- 
-@@ -173,7 +173,7 @@
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man3
-+	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1
- 
- 
- mostlyclean-generic:
-@@ -203,7 +203,7 @@
- 
- maintainer-clean: maintainer-clean-am
- 
--.PHONY: install-man3 uninstall-man3 install-man uninstall-man tags \
-+.PHONY: install-man1 uninstall-man1 install-man uninstall-man tags \
- distdir info-am info dvi-am dvi check check-am installcheck-am \
- installcheck install-exec-am install-exec install-data-am install-data \
- install-am install uninstall-am uninstall all-redirect all-am all \
diff --git a/converters/tnef/pkg-descr b/converters/tnef/pkg-descr
index 1b33fb056f22..e93f47a49fb7 100644
--- a/converters/tnef/pkg-descr
+++ b/converters/tnef/pkg-descr
@@ -9,10 +9,8 @@ The TNEF program allows one to unpack the attachments which were encapsulated
 into the TNEF attachment.  Thus alleviating the need to use Microsoft Outlook
 to view them.
 
-Written by:		Mark Simpson <damned@world.std.com>
-Based upon work by:	Thomas Boll <tb@boll.ch>
-
-WWW: http://world.std.com/~damned/software.html
+Author:	Mark Simpson <verdammelt@users.sourceforge.net>
+WWW:	http://tnef.sourceforge.net/
 
 - Cyrus Rahman
 cr@jcmax.com
diff --git a/converters/tnef/pkg-plist b/converters/tnef/pkg-plist
index 1c7688e9dda5..e63b6b242629 100644
--- a/converters/tnef/pkg-plist
+++ b/converters/tnef/pkg-plist
@@ -1 +1,8 @@
+@comment $FreeBSD$
 bin/tnef
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%