- Update to version 1.6

- Unbreak on -current

PR:		59006
Submitted by:	Ports Fury

5 files changed, 16 insertions, 21 deletions

diff --git a/editors/ved/Makefile b/editors/ved/Makefile
index 12cb82b04c17..f6eff33d66c5 100644
--- a/editors/ved/Makefile
+++ b/editors/ved/Makefile
@@ -6,34 +6,28 @@
 #
 
 PORTNAME=	ved
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/ved/
+MASTER_SITES=	ftp://ftp.berlios.de/pub/ved/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A small and fast screen-oriented editor.
+COMMENT=	A small and fast screen-oriented editor
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
 MAN1=		ved.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 post-patch:
-.for F in ved.h ved.1
-	${SED} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/ved/$F \
-		> ${WRKSRC}/ved/foo
-	${MV} ${WRKSRC}/ved/foo ${WRKSRC}/ved/$F
+.for file in ved.h ved.1
+	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/ved/${file}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ved/OBJ/${ARCH}-freebsd-cc/ved \
 		${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ved/ved.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/ved/ved.help ${PREFIX}/share
+	${INSTALL_MAN} ${WRKSRC}/ved/ved.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/ved/ved.help ${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/ved/distinfo b/editors/ved/distinfo
index a11c8f3fd5fc..06fb8c09c2fa 100644
--- a/editors/ved/distinfo
+++ b/editors/ved/distinfo
@@ -1 +1 @@
-MD5 (ved-1.5.tar.gz) = 20b6784188cfa2b6b0e436411e252515
+MD5 (ved-1.6.tar.gz) = e37113a29d0c832a0910acdf3cc5da75
diff --git a/editors/ved/files/patch-aa b/editors/ved/files/patch-aa
index ecd845e89867..fbd25576eacb 100644
--- a/editors/ved/files/patch-aa
+++ b/editors/ved/files/patch-aa
@@ -5,7 +5,7 @@
  #else
  #	define DEFSHELL	"/bin/sh"
 -#	define HELPFILE UC "/opt/schily/man/help/ved.help"
-+#	define HELPFILE UC "%%PREFIX%%/share/ved.help"
++#	define HELPFILE UC "%%DATADIR%%/ved.help"
  #endif
  
  /*
diff --git a/editors/ved/files/patch-ab b/editors/ved/files/patch-ab
index 4ad156a9caa7..0ec0b920fb57 100644
--- a/editors/ved/files/patch-ab
+++ b/editors/ved/files/patch-ab
@@ -13,8 +13,8 @@
 -.SH "SEE ALSO"
 -.BR change "(1),"
 -.BR match "(1)."
-+.B %%PREFIX%%/share/ved.help
-+The on-line help file is installed in %%PREFIX%%/share
++.B %%DATADIR%%/ved.help
++The on-line help file is installed in %%DATADIR%%
  .SH NOTES
  To edit files greater than 2 GB, you need to compile
  .B ved
diff --git a/editors/ved/pkg-plist b/editors/ved/pkg-plist
index 47edc6847035..b04b2a1b303e 100644
--- a/editors/ved/pkg-plist
+++ b/editors/ved/pkg-plist
@@ -1,2 +1,3 @@
 bin/ved
-share/ved.help
+%%DATADIR%%/ved.help
+@dirrm %%DATADIR%%