Upgrade to 5.10

7 files changed, 41 insertions, 74 deletions

diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index 794d72762354..a717b96921a6 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -6,46 +6,49 @@
 #
 
 PORTNAME=	biew
-PORTVERSION=	5.04
+PORTVERSION=    5.10
 CATEGORIES=	editors
 MASTER_SITES=	ftp://biew.sourceforge.net/pub/biew/5.x/src/ \
 		http://download.sourceforge.net/biew/
-DISTNAME=	${PORTNAME}-504
+DISTNAME=       ${PORTNAME}-510
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_ARGS=	"USE_NCURSES_PSEUDO=y"
 
 .include <bsd.port.pre.mk>
 
+HOST_CFLAGS=    ${CFLAGS}
+HOST_LD=        ${CC}
+MAKEFILE=       makefile
+
 .if ${OSVERSION} < 400010
-LIB_DEPENDS=   ncurses.4:${PORTSDIR}/devel/ncurses
-MAKE_ARGS+=	"CSYSFLAGS=-D__FreeBSD_version=${OSVERSION} -I${LOCALBASE}/include"
-MAKE_ARGS+=	"OSLDEF=-L${LOCALBASE}/lib"
+LIB_DEPENDS=    ncurses.4:${PORTSDIR}/devel/ncurses
+HOST_CFLAGS+=   -D__FreeBSD_version=${OSVERSION} -I${LOCALBASE}/include
+HOST_LD+=       -L${LOCALBASE}/lib
 .endif
 
+MAKE_ARGS+=     HOST_CFLAGS="${HOST_CFLAGS}" LD="${HOST_LD}" \
+		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
 
-pre-build:
-	 ${LN} -sf ${WRKSRC}/makefile ${WRKSRC}/Makefile
-
 post-build:
-	@ ${LN} -sf ${WRKSRC}/tools/biewhlp/makefile ${WRKSRC}/tools/biewhlp/Makefile
-	@ ${LN} -sf ${WRKSRC}/tools/lzss/makefile ${WRKSRC}/tools/lzss/Makefile
-	@ ${LN} -sf ${WRKSRC}/lib ${WRKSRC}/tools/biewhlp/lib
-	@ ${LN} -sf ${WRKSRC}/lib ${WRKSRC}/tools/lzss/lib
-	@ (cd ${WRKSRC}/tools/biewhlp;${GMAKE})
-	@ (cd ${WRKSRC}/tools/lzss;${GMAKE})
+	@ ${LN} -sf ../../lib ${WRKSRC}/tools/biewhlp/lib
+	cd ${WRKSRC}/tools/biewhlp; ${GMAKE} ${MAKE_ARGS}
+	@ ${LN} -sf ../../lib ${WRKSRC}/tools/lzss/lib
+	cd ${WRKSRC}/tools/lzss; ${GMAKE} ${MAKE_ARGS}
 	@ (cd ${WRKSRC}/hlp;${LN} -sf ../tools/biewhlp/biewhlp ./;\
 	${LN} -sf ../tools/lzss/lzss ./;./biewhlp biewhlp.prj)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/biew ${PREFIX}/bin
 	@ ${MKDIR} ${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/hlp/biew.hlp ${PREFIX}/share/biew
+	${INSTALL_DATA} ${WRKSRC}/hlp/biew.hlp ${WRKSRC}/bin_rc/standard.skn \
+		${PREFIX}/share/biew
 
 .include <bsd.port.post.mk>
diff --git a/editors/biew/distinfo b/editors/biew/distinfo
index 31beea94fef0..bfbdb653b073 100644
--- a/editors/biew/distinfo
+++ b/editors/biew/distinfo
@@ -1 +1 @@
-MD5 (biew-504.tar.bz2) = 0be88c8ec6182834c6a3e84ad4279bfe
+MD5 (biew-510.tar.bz2) = 600b76da24e37dc1e023daba23d4dcfb
diff --git a/editors/biew/files/patch-aa b/editors/biew/files/patch-aa
index f208be07b225..d97b28b91eaa 100644
--- a/editors/biew/files/patch-aa
+++ b/editors/biew/files/patch-aa
@@ -5,7 +5,7 @@
  #include <sys/stat.h>
  
 -#define LIBDIR "/usr/lib"
-+#define LIBDIR "%%PREFIX%%/share/biew"
++#define LIBDIR "%%PREFIX%%/share"
  
  static char _ini_name[FILENAME_MAX + 1];
  static char _rc_dir_name[FILENAME_MAX + 1];
diff --git a/editors/biew/files/patch-ab b/editors/biew/files/patch-ab
index 857ef674fa2b..c6d956d04ea6 100644
--- a/editors/biew/files/patch-ab
+++ b/editors/biew/files/patch-ab
@@ -1,11 +1,11 @@
---- tools/biewhlp/biewhlp.c.orig	Fri Mar  3 11:08:24 2000
-+++ tools/biewhlp/biewhlp.c	Sat Mar  4 15:00:57 2000
-@@ -29,7 +29,7 @@
+--- tools/biewhlp/biewhlp.c.orig	Fri Jun  2 21:01:18 2000
++++ tools/biewhlp/biewhlp.c	Fri Jun  9 08:01:32 2000
+@@ -32,7 +32,7 @@
  BGLOBAL bOutput;
  
  #define BBIO_CACHE_SIZE 0x1000
--#define ARCHIVER "lzss e"
-+#define ARCHIVER "./lzss e"
+-#define ARCHIVER  "lzss e"
++#define ARCHIVER  "./lzss e"
+ #define COMPNAME  "temp_fil.tmp"
  #define TEMPFNAME "temp_hlp.tmp"
  
- void MyCallBack(IniInfo *ini)
diff --git a/editors/biew/files/patch-ac b/editors/biew/files/patch-ac
index 566dcd91e9fa..1b602ec38c6a 100644
--- a/editors/biew/files/patch-ac
+++ b/editors/biew/files/patch-ac
@@ -1,48 +1,11 @@
---- makefile.inc.orig	Fri Apr 14 15:02:39 2000
-+++ makefile.inc	Tue Apr 18 00:26:11 2000
-@@ -78,14 +78,14 @@
- # screen library to use: SLANG/CURSES/VT100
- #
- 
--USE_SLANG = y
--#USE_CURSES = y
-+#USE_SLANG = y
-+USE_CURSES = y
- #USE_VT100 = y
- 
- #
- 
- USE_SELECT = y	# system has select() call?
--#USE_MOUSE = y	# try to use mouse (doesnot work yet)
-+USE_MOUSE = y	# try to use mouse (doesnot work yet)
- 
- 
- HOST=unix
-@@ -130,7 +130,7 @@
- ##############################################################################
- ifdef CONFIG_I386
- MACHINE=i386
--CDEFSYS=-D__BITNESS__=32 -D__PLATFORM__='"i386"' -D__BYTE_ORDER__=__LITTLE_ENDIAN__ -D__DEFAULT_DISASM=0 -m386
-+CDEFSYS=-D__BITNESS__=32 -D__PLATFORM__='"i386"' -D__BYTE_ORDER__=__LITTLE_ENDIAN__ -D__DEFAULT_DISASM=0
+--- makefile.inc.orig	Fri Jun  2 21:01:36 2000
++++ makefile.inc	Fri Jun  9 09:09:38 2000
+@@ -116,7 +116,7 @@
+  MACHINE=ia32
+  CDEFSYS=-D__BITNESS__=32 -D__MACHINE__=ia32 -D__CPU_NAME__='"i386"'\
+          -D__CPU__=386 -D__BYTE_ORDER__="__LITTLE_ENDIAN__"\
+-         -D__DEFAULT_DISASM=0 -m386 -fno-builtin
++	 -D__DEFAULT_DISASM=0
  endif
- ifdef CONFIG_I486
- MACHINE=i386
-@@ -160,14 +160,14 @@
- # If you do not have GNU development system, modify RM CC LD variables       #
- ##############################################################################
- RM=rm -f
--CC=gcc
--LD=gcc
-+CC?=gcc
-+LD=$(CC)
- ###########################################################################
- #  CFLAGS set it for optimization                                         #
- #  LDFLAGS set it for link method                                         #
- ###########################################################################
--CFLAGS = -Wall -O2 -fomit-frame-pointer -fcaller-saves\
-- -DNDEBUG=1 $(CDEFOS) $(CDEFSYS)
-+CFLAGS+= -Wall \
-+ -DNDEBUG=1 $(CDEFOS) $(CDEFSYS) $(CSYSFLAGS)
- #-ffunction-sections
- LDFLAGS = -s $(OSLDEF)
- 
+ ifeq ($(TARGET_PLATFORM),i486)
+  MACHINE=ia32
diff --git a/editors/biew/files/patch-af b/editors/biew/files/patch-af
index 14e13f189e65..332194df07cd 100644
--- a/editors/biew/files/patch-af
+++ b/editors/biew/files/patch-af
@@ -1,5 +1,5 @@
---- lib/sysdep/generic/unix/keyboard.c.orig	Fri Apr 14 15:02:21 2000
-+++ lib/sysdep/generic/unix/keyboard.c	Tue Apr 18 00:15:50 2000
+--- 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 @@
  #endif
  
@@ -9,6 +9,6 @@
 +#else
  #include <curses.h>
 +#endif
- #ifdef HAVE_MOUSE
  MEVENT me;
  #endif
+ 
diff --git a/editors/biew/pkg-plist b/editors/biew/pkg-plist
index e7ee9de87cee..33b11e95e298 100644
--- a/editors/biew/pkg-plist
+++ b/editors/biew/pkg-plist
@@ -1,3 +1,4 @@
 bin/biew
 share/biew/biew.hlp
+share/biew/standard.skn
 @dirrm share/biew