7 files changed, 27 insertions, 68 deletions

diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index df4da22f8c83..aab409b202de 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	biew
-PORTVERSION=	5.2.0
+PORTVERSION=	5.3.0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -22,7 +22,7 @@ PORTDOCS=	biew_en.txt biew_ru.txt develop.en develop.ru file_ini.en \
 
 .include <bsd.port.pre.mk>
 
-HOST_CFLAGS=	${CFLAGS} -DLIBDIR="\'\"${PREFIX}/share\"\'"
+HOST_CFLAGS=	${CFLAGS} -DPREFIX="\'\"${PREFIX}\"\'"
 MAKEFILE=	makefile
 
 .if ${OSVERSION} < 400010
@@ -45,14 +45,13 @@ post-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/biew ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/biew
-.for file in bin_rc/assembly.skn bin_rc/standard.skn hlp/biew.hlp
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/biew
-.endfor
+	@ ${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/*.skn ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/hlp/biew.hlp ${DATADIR}
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/biew
+	@ ${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/biew
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/editors/biew/distinfo b/editors/biew/distinfo
index 20d90edba3a8..78082bd26a2a 100644
--- a/editors/biew/distinfo
+++ b/editors/biew/distinfo
@@ -1 +1 @@
-MD5 (biew-520.tar.bz2) = fa1a992ce9abd7538e7fc4ac23023c4d
+MD5 (biew530.tar.bz2) = 902e1af264c93032ec40fa22d04f936a
diff --git a/editors/biew/files/patch-aa b/editors/biew/files/patch-aa
deleted file mode 100644
index f108e6b474a7..000000000000
--- a/editors/biew/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- biewlib/sysdep/generic/unix/os_dep.c.orig	Thu Jul  6 14:31:08 2000
-+++ biewlib/sysdep/generic/unix/os_dep.c	Mon Jul 24 23:00:55 2000
-@@ -26,7 +26,9 @@
- #include "biewlib/biewlib.h"
- #include "console.h"
- 
-+#ifndef LIBDIR
- #define LIBDIR "/usr/lib"
-+#endif
- 
- static char _ini_name[FILENAME_MAX + 1];
- static char _rc_dir_name[FILENAME_MAX + 1];
diff --git a/editors/biew/files/patch-af b/editors/biew/files/patch-af
index 6dabfa4854d7..5f23f4c15924 100644
--- a/editors/biew/files/patch-af
+++ b/editors/biew/files/patch-af
@@ -1,6 +1,6 @@
---- biewlib/sysdep/generic/unix/keyboard.c.orig	Thu Jul  6 14:31:08 2000
-+++ biewlib/sysdep/generic/unix/keyboard.c	Mon Jul 24 23:06:19 2000
-@@ -27,7 +27,11 @@
+--- biewlib/sysdep/generic/unix/keyboard.c.orig	Thu Mar  1 09:19:32 2001
++++ biewlib/sysdep/generic/unix/keyboard.c	Fri Nov  9 00:00:37 2001
+@@ -41,7 +41,11 @@
  #endif
  
  #ifdef	_CURSES_
@@ -9,6 +9,6 @@
 +#else
  #include <curses.h>
 +#endif
- MEVENT me;
+ #ifdef	NCURSES_MOUSE_VERSION
+ #define	HAVE_MOUSE
  #endif
- 
diff --git a/editors/biew/files/patch-ai b/editors/biew/files/patch-ai
deleted file mode 100644
index 709c76e9759d..000000000000
--- a/editors/biew/files/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
---- tools/biewhlp/makefile.orig	Mon Sep 25 00:35:56 2000
-+++ tools/biewhlp/makefile	Fri Nov 10 21:37:47 2000
-@@ -62,7 +62,11 @@
- biewlib/biewlib.o\
- biewlib/file_ini.o\
- biewlib/pmalloc.o\
--biewlib/sysdep/$(MACHINE)/$(HOST)/fileio.o
-+biewlib/sysdep/$(MACHINE)/$(HOST)/fileio.o\
-+biewlib/sysdep/$(MACHINE)/$(HOST)/keyboard.o\
-+biewlib/sysdep/$(MACHINE)/$(HOST)/nls.o\
-+biewlib/sysdep/$(MACHINE)/$(HOST)/os_dep.o\
-+biewlib/sysdep/$(MACHINE)/$(HOST)/vio.o
- all: $(TARGET)
- 
- clean:
diff --git a/editors/biew/files/patch-aj b/editors/biew/files/patch-aj
deleted file mode 100644
index 37e19ac7131f..000000000000
--- a/editors/biew/files/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
---- tools/lzss/makefile.orig	Mon Sep 25 00:35:58 2000
-+++ tools/lzss/makefile	Fri Nov 10 21:39:13 2000
-@@ -60,7 +60,11 @@
- biewlib/pmalloc.o\
- biewlib/bbio.o\
- biewlib/biewlib.o\
--biewlib/sysdep/$(MACHINE)/$(HOST)/fileio.o
-+biewlib/sysdep/$(MACHINE)/$(HOST)/fileio.o\
-+biewlib/sysdep/$(MACHINE)/$(HOST)/keyboard.o\
-+biewlib/sysdep/$(MACHINE)/$(HOST)/nls.o\
-+biewlib/sysdep/$(MACHINE)/$(HOST)/os_dep.o\
-+biewlib/sysdep/$(MACHINE)/$(HOST)/vio.o
- all: $(TARGET)
- 
- clean:
diff --git a/editors/biew/pkg-plist b/editors/biew/pkg-plist
index c9375ed81b48..3ff2d144d52f 100644
--- a/editors/biew/pkg-plist
+++ b/editors/biew/pkg-plist
@@ -1,16 +1,18 @@
 bin/biew
 share/biew/biew.hlp
 share/biew/assembly.skn
+share/biew/golded.skn
+share/biew/insight.skn
 share/biew/standard.skn
-share/doc/biew/biew_en.txt
-share/doc/biew/biew_ru.txt
-share/doc/biew/develop.en
-share/doc/biew/develop.ru
-share/doc/biew/file_ini.en
-share/doc/biew/file_ini.ru
-share/doc/biew/licence.en
-share/doc/biew/licence.ru
-share/doc/biew/release.txt
-share/doc/biew/unix.txt
-@dirrm share/doc/biew
+%%PORTDOCS%%share/doc/biew/biew_en.txt
+%%PORTDOCS%%share/doc/biew/biew_ru.txt
+%%PORTDOCS%%share/doc/biew/develop.en
+%%PORTDOCS%%share/doc/biew/develop.ru
+%%PORTDOCS%%share/doc/biew/file_ini.en
+%%PORTDOCS%%share/doc/biew/file_ini.ru
+%%PORTDOCS%%share/doc/biew/licence.en
+%%PORTDOCS%%share/doc/biew/licence.ru
+%%PORTDOCS%%share/doc/biew/release.txt
+%%PORTDOCS%%share/doc/biew/unix.txt
+%%PORTDOCS%%@dirrm share/doc/biew
 @dirrm share/biew