Update port to 5.1.2

PR:		20150
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

8 files changed, 63 insertions, 36 deletions

diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index a2fcd616054b..a4a8bfc1e36a 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -6,22 +6,24 @@
 #
 
 PORTNAME=	biew
-PORTVERSION=    5.1.0
+PORTVERSION=	5.1.2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=       ${PORTNAME}-510
+DISTNAME=	${PORTNAME}-512
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
+PORTDOCS=	biew_en.txt biew_ru.txt develop.en develop.ru file_ini.en \
+		file_ini.ru licence.en licence.ru release.txt unix.txt
+
 .include <bsd.port.pre.mk>
 
-HOST_CFLAGS=    ${CFLAGS}
-HOST_LD=        ${CC}
-MAKEFILE=       makefile
+HOST_CFLAGS=	${CFLAGS} -DLIBDIR="\'\"${PREFIX}/share\"\'"
+MAKEFILE=	makefile
 
 .if ${OSVERSION} < 400010
 LIB_DEPENDS=    ncurses.4:${PORTSDIR}/devel/ncurses
@@ -29,18 +31,14 @@ HOST_CFLAGS+=   -D__FreeBSD_version=${OSVERSION} -I${LOCALBASE}/include
 HOST_LD+=       -L${LOCALBASE}/lib
 .endif
 
-MAKE_ARGS+=     HOST_CFLAGS="${HOST_CFLAGS}" LD="${HOST_LD}" \
+MAKE_ARGS+=	HOST_CFLAGS="${HOST_CFLAGS}" CC="${CC}" LD="${CC}" \
 		TARGET_OS=unix TARGET_SCREEN_LIB=curses \
 		USE_MOUSE=y
 
-post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" \
-		${WRKSRC}/lib/sysdep/generic/unix/os_dep.c
-
 post-build:
-	@ ${LN} -sf ../../lib ${WRKSRC}/tools/biewhlp/lib
+	@ ${LN} -sf ../../biewlib ${WRKSRC}/tools/biewhlp/biewlib
 	cd ${WRKSRC}/tools/biewhlp; ${GMAKE} ${MAKE_ARGS}
-	@ ${LN} -sf ../../lib ${WRKSRC}/tools/lzss/lib
+	@ ${LN} -sf ../../biewlib ${WRKSRC}/tools/lzss/biewlib
 	cd ${WRKSRC}/tools/lzss; ${GMAKE} ${MAKE_ARGS}
 	@ (cd ${WRKSRC}/hlp;${LN} -sf ../tools/biewhlp/biewhlp ./;\
 	${LN} -sf ../tools/lzss/lzss ./;./biewhlp biewhlp.prj)
@@ -48,7 +46,14 @@ post-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/biew ${PREFIX}/bin
 	@ ${MKDIR} ${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/hlp/biew.hlp ${WRKSRC}/bin_rc/standard.skn \
-		${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
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${PREFIX}/share/doc/biew
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/biew
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/biew/distinfo b/editors/biew/distinfo
index bfbdb653b073..d106ae21fc4a 100644
--- a/editors/biew/distinfo
+++ b/editors/biew/distinfo
@@ -1 +1 @@
-MD5 (biew-510.tar.bz2) = 600b76da24e37dc1e023daba23d4dcfb
+MD5 (biew-512.tar.bz2) = 1106c6bde9e4348f3572cb87cf6d4572
diff --git a/editors/biew/files/patch-aa b/editors/biew/files/patch-aa
index d97b28b91eaa..f108e6b474a7 100644
--- a/editors/biew/files/patch-aa
+++ b/editors/biew/files/patch-aa
@@ -1,11 +1,12 @@
---- lib/sysdep/generic/unix/os_dep.c.orig	Fri Apr 14 15:02:21 2000
-+++ lib/sysdep/generic/unix/os_dep.c	Mon Apr 17 23:40:15 2000
-@@ -29,7 +29,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
+--- 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"
  
--#define LIBDIR "/usr/lib"
-+#define LIBDIR "%%PREFIX%%/share"
++#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-ac b/editors/biew/files/patch-ac
index 1b602ec38c6a..30712c061c11 100644
--- a/editors/biew/files/patch-ac
+++ b/editors/biew/files/patch-ac
@@ -1,11 +1,20 @@
---- makefile.inc.orig	Fri Jun  2 21:01:36 2000
-+++ makefile.inc	Fri Jun  9 09:09:38 2000
-@@ -116,7 +116,7 @@
+--- makefile.inc.orig	Thu Jul  6 14:27:58 2000
++++ makefile.inc	Mon Jul 24 23:15:43 2000
+@@ -115,7 +115,7 @@
+ ifeq ($(TARGET_PLATFORM),i386)
   MACHINE=ia32
-  CDEFSYS=-D__BITNESS__=32 -D__MACHINE__=ia32 -D__CPU_NAME__='"i386"'\
-          -D__CPU__=386 -D__BYTE_ORDER__="__LITTLE_ENDIAN__"\
+  CDEFSYS=-D__MACHINE__=ia32 -D__CPU_NAME__='"i386"' -D__CPU__=386\
 -         -D__DEFAULT_DISASM=0 -m386 -fno-builtin
-+	 -D__DEFAULT_DISASM=0
++         -D__DEFAULT_DISASM=0
  endif
  ifeq ($(TARGET_PLATFORM),i486)
   MACHINE=ia32
+@@ -216,7 +216,7 @@
+ ifeq ($(compilation),debug)
+ CFLAGS += -g3 -p -ax -fcheck-memory-usage -fstack-check
+ else
+-CFLAGS += -O2 -fomit-frame-pointer -DNDEBUG=1
++CFLAGS += -fomit-frame-pointer -DNDEBUG=1
+ endif
+ adv_warn = -W -Winline -Wuninitialized -Wcast-align\
+  -Wswitch -Wshadow -Wbad-function-cast -Wmissing-noreturn -Wcast-qual\
diff --git a/editors/biew/files/patch-ad b/editors/biew/files/patch-ad
index dd42656fdf73..9826637cff75 100644
--- a/editors/biew/files/patch-ad
+++ b/editors/biew/files/patch-ad
@@ -1,6 +1,6 @@
---- lib/sysdep/generic/unix/vio.c.orig	Fri Apr 14 15:02:21 2000
-+++ lib/sysdep/generic/unix/vio.c	Mon Apr 17 23:49:05 2000
-@@ -71,7 +71,11 @@
+--- biewlib/sysdep/generic/unix/vio.c.orig	Thu Jul  6 14:31:08 2000
++++ biewlib/sysdep/generic/unix/vio.c	Mon Jul 24 23:04:47 2000
+@@ -84,7 +84,11 @@
  #endif
  
  #ifdef	_CURSES_
diff --git a/editors/biew/files/patch-ae b/editors/biew/files/patch-ae
index 9914bf2a19d1..14c4df4bc7df 100644
--- a/editors/biew/files/patch-ae
+++ b/editors/biew/files/patch-ae
@@ -1,5 +1,5 @@
---- lib/sysdep/generic/unix/kbd_code.h.orig	Fri Apr 14 15:02:31 2000
-+++ lib/sysdep/generic/unix/kbd_code.h	Mon Apr 17 23:48:22 2000
+--- biewlib/sysdep/generic/unix/kbd_code.h.orig	Thu Jul  6 14:31:08 2000
++++ biewlib/sysdep/generic/unix/kbd_code.h	Mon Jul 24 23:05:25 2000
 @@ -78,7 +78,11 @@
  
  
diff --git a/editors/biew/files/patch-af b/editors/biew/files/patch-af
index 332194df07cd..6dabfa4854d7 100644
--- a/editors/biew/files/patch-af
+++ b/editors/biew/files/patch-af
@@ -1,6 +1,6 @@
---- lib/sysdep/generic/unix/keyboard.c.orig	Fri Jun  2 21:01:12 2000
-+++ lib/sysdep/generic/unix/keyboard.c	Fri Jun  9 08:08:46 2000
-@@ -30,7 +30,11 @@
+--- 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 @@
  #endif
  
  #ifdef	_CURSES_
diff --git a/editors/biew/pkg-plist b/editors/biew/pkg-plist
index 33b11e95e298..c9375ed81b48 100644
--- a/editors/biew/pkg-plist
+++ b/editors/biew/pkg-plist
@@ -1,4 +1,16 @@
 bin/biew
 share/biew/biew.hlp
+share/biew/assembly.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
 @dirrm share/biew