4 files changed, 31 insertions, 24 deletions

diff --git a/math/numdiff/Makefile b/math/numdiff/Makefile
index 70d7bdfb7003..7619b8219f06 100644
--- a/math/numdiff/Makefile
+++ b/math/numdiff/Makefile
@@ -6,28 +6,30 @@
 #
 
 PORTNAME=	numdiff
-PORTVERSION=	4.2.0
+PORTVERSION=	5.2.1
 CATEGORIES=	math textproc
-MASTER_SITES=	http://download.savannah.gnu.org/releases/numdiff/
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Compare putatively similar files, ignoring small numeric differences
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --exec-prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} LIBS=-lm
-WRKSRC=	${WRKDIR}/${PORTNAME}
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --exec-prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} LIBS=-lm --disable-nls
+USE_GMAKE=	yes
 
 INFO=	numdiff
 
-pre-install:
-.if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e 's,$$[(]MKDIR[)] $$[(]DOCDIR[)],,' \
-		-e 's,$$[(]INSTALL[)] $$[(]DOCS[)] $$[(]DOCDIR[)],,' \
-		${WRKSRC}/Makefile
-.endif
+.include <bsd.port.pre.mk>
 
-post-configure:
-	${REINPLACE_CMD} -e 's,$$[(]prefix[)]/doc/$$[(]PACKAGE[)],${DOCSDIR},' \
-		${WRKSRC}/Makefile
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/numdiff.txt ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/numdiff.html ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/numdiff.pdf ${DOCSDIR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/numdiff/distinfo b/math/numdiff/distinfo
index 77c2bfbac2d6..61d54b6fd2f9 100644
--- a/math/numdiff/distinfo
+++ b/math/numdiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (numdiff-4.2.0.tar.gz) = 76970345a6ab1f30e48b1930d53d7013
-SHA256 (numdiff-4.2.0.tar.gz) = 48b4dd0bda70aa9a3fb76394a2066f6693d4319110868d7c89aa585cb6e7b752
-SIZE (numdiff-4.2.0.tar.gz) = 808989
+MD5 (numdiff-5.2.1.tar.gz) = a8f4c3347a20b4effd8a38511729dd55
+SHA256 (numdiff-5.2.1.tar.gz) = 9cf598a873f01246f8fa8c58963863ca945c500dff2a49e72108bb3016f16e86
+SIZE (numdiff-5.2.1.tar.gz) = 685761
diff --git a/math/numdiff/pkg-descr b/math/numdiff/pkg-descr
index ced494b47f06..9565ecff4b8a 100644
--- a/math/numdiff/pkg-descr
+++ b/math/numdiff/pkg-descr
@@ -1,9 +1,9 @@
-Numdiff is a little program that can be used to compare putatively similar 
-files line by line and field by field, ignoring small numeric differences 
-or/and different numeric formats. 
+Numdiff is a little program that can be used to compare putatively similar files
+line by line and field by field, ignoring small numeric differences or/and
+different numeric formats. 
 
-Equivalently, Numdiff is a program with the capability to appropriately 
-compare files containing numerical fields (and not only).
+Equivalently, Numdiff is a program with the capability to appropriately compare
+files containing numerical fields (and not only).
 
 % numdiff file1 file2
 
diff --git a/math/numdiff/pkg-plist b/math/numdiff/pkg-plist
index a8664d149427..9404af8bdfba 100644
--- a/math/numdiff/pkg-plist
+++ b/math/numdiff/pkg-plist
@@ -1,14 +1,19 @@
-bin/ndfilter
 bin/ndselect
 bin/numdiff
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/numdiff.html
 %%PORTDOCS%%%%DOCSDIR%%/numdiff.pdf
 %%PORTDOCS%%%%DOCSDIR%%/numdiff.txt
+share/licenses/numdiff-5.2.1/COPYING
+share/licenses/numdiff-5.2.1/LICENSE
+share/licenses/numdiff-5.2.1/catalog.mk
+@dirrm share/licenses/numdiff-5.2.1
+@dirrm share/licenses
 %%PORTDOCS%%@dirrm %%DOCSDIR%%