6 files changed, 12 insertions, 33 deletions

diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index d01b15dee7c5..d8fbec5b5fee 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	manedit
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8.1
 CATEGORIES=	editors
 MASTER_SITES=	http://wolfpack.twu.net/users/wolfpack/
 
@@ -22,6 +22,11 @@ MAKEFILE=	Makefile.FreeBSD
 MAN1=		manedit.1
 
 pre-configure:
-	${CP} ${FILESDIR}/mntent* ${WRKSRC}
+	@${CP} ${FILESDIR}/mntent* ${WRKSRC}
+
+post-patch:
+	@${REINPLACE_CMD} -E 's,(viewerfio.c),\1 mntent_compat.c,; \
+			      s,(viewerfio.h),\1 mntent.h,' \
+		${WRKSRC}/Makefile.srclist
 
 .include <bsd.port.mk>
diff --git a/editors/manedit/distinfo b/editors/manedit/distinfo
index ea26917ace8e..48719e79d3e9 100644
--- a/editors/manedit/distinfo
+++ b/editors/manedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (manedit-0.7.1.tar.bz2) = 229586101245eb61018ff031c2efb247
-SHA256 (manedit-0.7.1.tar.bz2) = 1d54476dbf15bf410e43aeaba69edb7cd7c7d1b03a6f56f73287e60757d6ec3a
-SIZE (manedit-0.7.1.tar.bz2) = 524427
+MD5 (manedit-0.8.1.tar.bz2) = 8eb21d77aaffe14534e7aee754547b74
+SHA256 (manedit-0.8.1.tar.bz2) = 06aaae640b94da545bef2ea96b839e9aaeab1806b9421ddfc99b46c30985db6d
+SIZE (manedit-0.8.1.tar.bz2) = 514226
diff --git a/editors/manedit/files/patch-Makefile.FreeBSD b/editors/manedit/files/patch-Makefile.FreeBSD
index cd6882f5b18a..5312227bcb71 100644
--- a/editors/manedit/files/patch-Makefile.FreeBSD
+++ b/editors/manedit/files/patch-Makefile.FreeBSD
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- Makefile.FreeBSD.orig	Wed Mar 13 00:02:34 2002
 +++ Makefile.FreeBSD	Tue Jul  2 14:48:15 2002
 @@ -52,7 +52,7 @@
diff --git a/editors/manedit/files/patch-Makefile.srclist b/editors/manedit/files/patch-Makefile.srclist
deleted file mode 100644
index f35d4e097026..000000000000
--- a/editors/manedit/files/patch-Makefile.srclist
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.srclist.orig	Wed Apr 30 08:51:49 2003
-+++ Makefile.srclist	Tue Aug 26 04:12:30 2003
-@@ -4,12 +4,12 @@
-         fb.h fprompt.h fsd.h guiutils.h manedit.h maneditcb.h	\
-         maneditop.h messages.h mpfio.h pdialog.h pref.h		\
-         prefcb.h preffio.h prefop.h pulist.h viewer.h		\
--        viewercb.h viewerdnd.h viewerfio.h
-+        viewercb.h viewerdnd.h viewerfio.h mntent.h
- SRC_C = aboutdialog.c cdialog.c clipboard.c csd.c editor.c	\
-         editorcb.c editordnd.c editorop.c editorfio.c		\
-         editorfip.c editorfipcb.c editorfipop.c editorundo.c	\
-         fb.c fprompt.c fsd.c guiutils.c main.c maneditcb.c	\
-         maneditop.c mpfio.c pdialog.c pref.c prefcb.c preffio.c	\
-         prefop.c pulist.c viewer.c viewercb.c viewerdnd.c	\
--        viewerfio.c
-+        viewerfio.c mntent_compat.c
- SRC_CPP = disk.cpp fio.cpp prochandle.cpp strexp.cpp string.cpp
diff --git a/editors/manedit/files/patch-manedit.1 b/editors/manedit/files/patch-manedit.1
index 893e8bef0db8..96769cf77123 100644
--- a/editors/manedit/files/patch-manedit.1
+++ b/editors/manedit/files/patch-manedit.1
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- manedit.1.orig	Sun Feb 25 01:10:48 2001
 +++ manedit.1	Tue Mar 20 18:49:02 2001
 @@ -67,12 +67,8 @@
diff --git a/editors/manedit/files/patch-maneditop.c b/editors/manedit/files/patch-maneditop.c
index dae3728a672c..78b52d3b221a 100644
--- a/editors/manedit/files/patch-maneditop.c
+++ b/editors/manedit/files/patch-maneditop.c
@@ -1,12 +1,9 @@
-
-$FreeBSD$
-
 --- maneditop.c.orig	Tue Nov 16 13:09:17 2004
 +++ maneditop.c	Tue Nov 16 19:27:06 2004
-@@ -236,9 +236,7 @@
+@@ -238,9 +238,7 @@
  		/* Not exist, so need to create a new one */
  		rmkdir(
- 		    tmp_dir_rtn,
+ 		    (const char *)tmp_dir_rtn,
 -		    S_IRUSR | S_IWUSR | S_IXUSR |
 -		    S_IRGRP | S_IXGRP |
 -		    S_IROTH | S_IXOTH