Index: branches/2014Q3/vietnamese/vnless/pkg-plist
===================================================================
--- branches/2014Q3/vietnamese/vnless/pkg-plist	(revision 364307)
+++ branches/2014Q3/vietnamese/vnless/pkg-plist	(nonexistent)
@@ -1,3 +0,0 @@
-bin/vnless
-bin/vnlesskey
-share/misc/vnless.help

Property changes on: branches/2014Q3/vietnamese/vnless/pkg-plist
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/Makefile
===================================================================
--- branches/2014Q3/vietnamese/vnless/Makefile	(revision 364307)
+++ branches/2014Q3/vietnamese/vnless/Makefile	(revision 364308)
@@ -1,24 +1,23 @@
 # Created by: David O'Brien (obrien@cs.ucdavis.edu)
 # $FreeBSD$
 
 PORTNAME=	vnless
 PORTVERSION=	1.0
 CATEGORIES=	vietnamese
 MASTER_SITES=	ftp://ftp.monash.edu.au/pub/vietnam/unix/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	A pager utility that speaks Vietnamese
 
 ALL_TARGET=	clobber all
-MAN1=		vnless.1 vnlesskey.1
+CFLAGS+=	-Wno-return-type
 
-NO_STAGE=	yes
-post-install:
-	@strip ${PREFIX}/bin/vnless*
-	@${CHMOD} a+rx ${PREFIX}/bin/vnless*
-	@${CHMOD} a+r ${PREFIX}/share/misc/vnless.help
-	@${CHMOD} a+r ${PREFIX}/man/man1/vnless*.1*
+PLIST_FILES=	bin/vnless \
+		bin/vnlesskey \
+		man/man1/vnless.1.gz \
+		man/man1/vnlesskey.1.gz \
+		share/misc/vnless.help
 
 .include <bsd.port.mk>
Index: branches/2014Q3/vietnamese/vnless/files/patch-01
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-01	(revision 364307)
+++ branches/2014Q3/vietnamese/vnless/files/patch-01	(nonexistent)
@@ -1,62 +0,0 @@
---- Makefile.orig	Mon Feb 24 15:15:42 1992
-+++ Makefile	Tue Apr 13 18:24:18 1999
-@@ -31,15 +31,15 @@
- # INSTALL_HELP is a list of the public version of the help file.
- # INSTALL_LESSMAN is a list of the public versions of the less manual page.
- # INSTALL_KEYMAN is a list of the public versions of the lesskey manual page.
--ROOT =  ../../VN 
-+ROOT =  ${PREFIX}
- INSTALL_LESS =		$(ROOT)/bin/vnless
--INSTALL_KEY =		$(ROOT)/bin/lesskey
--INSTALL_HELP =		$(ROOT)/man/less.help
--INSTALL_LESSMAN =	$(ROOT)/man/vnless.1
--INSTALL_KEYMAN =	$(ROOT)/man/lesskey.1
-+INSTALL_KEY =		$(ROOT)/bin/vnlesskey
-+INSTALL_HELP =		$(ROOT)/share/misc/vnless.help
-+INSTALL_LESSMAN =	$(ROOT)/man/man1/vnless.1
-+INSTALL_KEYMAN =	$(ROOT)/man/man1/vnlesskey.1
- LESS_MANUAL =		less.man
- KEY_MANUAL =		lesskey.man
--HELPFILE =		$(ROOT)/man/less.help
-+HELPFILE =		$(ROOT)/share/misc/vnless.help
- 
- 
- # OPTIM is passed to the compiler and the loader.
-@@ -49,6 +49,7 @@
- #CFLAGS = $(OPTIM)
- CFLAGS = -O
- LDFLAGS = 
-+LDLIBS = -lcompat
- 
- 
- ##########################################################################
-@@ -82,24 +83,19 @@
- 	$(CC) $(CFLAGS) -c -DHELPFILE=\"$(HELPFILE)\" help.c
- 
- install_less: vnless
--	for f in $(INSTALL_LESS); do  rm -f $$f; cp vnless $$f;  done
--	touch install_less
-+	@for f in $(INSTALL_LESS); do  rm -f $$f; cp vnless $$f;  done
- 
- install_key: lesskey
--	for f in $(INSTALL_KEY); do  rm -f $$f; cp lesskey $$f;  done
--	touch install_key
-+	@for f in $(INSTALL_KEY); do  rm -f $$f; cp lesskey $$f;  done
- 
- install_help: less.help
--	for f in $(INSTALL_HELP); do  rm -f $$f; cp less.help $$f;  done
--	touch install_help
-+	@for f in $(INSTALL_HELP); do  rm -f $$f; cp less.help $$f;  done
- 
- install_lman: $(LESS_MANUAL) 
--	for f in $(INSTALL_LESSMAN); do  rm -f $$f; cp $(LESS_MANUAL) $$f;  done
--	touch install_lman
-+	@for f in $(INSTALL_LESSMAN); do  rm -f $$f; cp $(LESS_MANUAL) $$f;  done
- 
- install_kman: $(KEY_MANUAL)
--	for f in $(INSTALL_KEYMAN); do  rm -f $$f; cp $(KEY_MANUAL) $$f;  done
--	touch install_kman
-+	@for f in $(INSTALL_KEYMAN); do  rm -f $$f; cp $(KEY_MANUAL) $$f;  done
- 
- ##########################################################################
- # Maintenance

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-01
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/files/patch-02
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-02	(revision 364307)
+++ branches/2014Q3/vietnamese/vnless/files/patch-02	(nonexistent)
@@ -1,29 +0,0 @@
---- less.h.orig	1992-02-24 12:45:38.000000000 -0800
-+++ less.h	2007-08-23 15:16:23.000000000 -0700
-@@ -31,7 +31,11 @@ typedef long		POSITION;
-  * The type of signal handler functions.
-  * Usually int, although it should be void.
-  */
-+#if VOID
-+typedef	void		HANDLER;
-+#else
- typedef	int		HANDLER;
-+#endif
- 
- 
- #define	FILENAME	128	/* Max size of a filename */
-@@ -74,7 +78,14 @@ typedef	int		HANDLER;
- #define	SIGNAL(sig,func)	signal(sig,func)
- 
- /* Library function declarations */
-+#ifdef NO_STD_HDRS
- offset_t lseek();
- char *calloc();
-+#else
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <string.h>
-+#endif
- 
- #include "funcs.h"

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-02
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/files/patch-03
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-03	(revision 364307)
+++ branches/2014Q3/vietnamese/vnless/files/patch-03	(nonexistent)
@@ -1,34 +0,0 @@
---- defines.h.orig	Mon Feb 24 12:45:37 1992
-+++ defines.h	Sat Feb  2 10:57:31 1996
-@@ -40,14 +40,21 @@
-  * If TERMIO is 0 your system must have /usr/include/sgtty.h.
-  * This is normally the case for BSD.
-  */
--/*#define	TERMIO		1*/
-+#include <sys/param.h>
-+#ifdef BSD4_4
-+#define	TERMIO		1
-+#endif
- 
- /*
-  * SIGSETMASK is 1 if your system has the sigsetmask() call.
-  * This is normally the case only for BSD 4.2,
-  * not for BSD 4.1 or System 5.
-  */
-+#ifdef BSD4_4
-+#define	SIGSETMASK	1
-+#else
- #define	SIGSETMASK	0
-+#endif
- 
- /*
-  * REGCMP is 1 if your system has the regcmp() function.
-@@ -73,7 +80,7 @@
-  * EDIT_PGM is the name of the (default) editor to be invoked.
-  */
- #define	EDITOR		1
--#define	EDIT_PGM	"/usr/local/bin/vi"
-+#define	EDIT_PGM	"/usr/bin/vi"
- 
- /*
-  * TAGS is 1 if you wish to support tag files.

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-03
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/files/patch-04
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-04	(revision 364307)
+++ branches/2014Q3/vietnamese/vnless/files/patch-04	(nonexistent)
@@ -1,33 +0,0 @@
---- os.c.orig	Mon Feb 24 12:45:40 1992
-+++ os.c	Wed Dec  4 02:36:59 1996
-@@ -13,6 +13,7 @@
- #include <stdio.h>
- #include <signal.h>
- #include <setjmp.h>
-+#include <time.h>
- #include "less.h"
- 
- char *getenv();
-@@ -153,7 +154,7 @@
- 	public long
- get_time()
- {
--	long t;
-+	time_t t;
- 
- 	time(&t);
- 	return (t);
-@@ -294,9 +295,13 @@
- 
- #if PERROR
- 
-+#ifdef USE_FBSD_STD_HDRS
- extern char *sys_errlist[];
- extern int sys_nerr;
- extern int errno;
-+#else
-+#include <errno.h>
-+#endif
- 
- 	public char *
- errno_message(filename, message, len)

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-04
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/files/patch-05
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-05	(revision 364307)
+++ branches/2014Q3/vietnamese/vnless/files/patch-05	(nonexistent)
@@ -1,13 +0,0 @@
---- regerror.c.orig	Mon Feb 24 12:45:41 1992
-+++ regerror.c	Wed Dec  4 02:42:23 1996
-@@ -1,7 +1,9 @@
- #include <stdio.h>
-+
-+#ifdef FBSD_HAS_THIS_IN_LIBCOMPAT
- regerror(str)
- char *str;
- {
- /*	fprintf(stderr,"%s\n",str); */
- }
--
-+#endif

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-05
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/files/patch-Makefile
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-Makefile	(nonexistent)
+++ branches/2014Q3/vietnamese/vnless/files/patch-Makefile	(revision 364308)
@@ -0,0 +1,66 @@
+--- Makefile.orig	1992-02-24 22:15:42.000000000 +0100
++++ Makefile	2014-08-07 18:09:42.383354763 +0200
+@@ -31,15 +31,15 @@
+ # INSTALL_HELP is a list of the public version of the help file.
+ # INSTALL_LESSMAN is a list of the public versions of the less manual page.
+ # INSTALL_KEYMAN is a list of the public versions of the lesskey manual page.
+-ROOT =  ../../VN 
++ROOT =  ${PREFIX}
+ INSTALL_LESS =		$(ROOT)/bin/vnless
+-INSTALL_KEY =		$(ROOT)/bin/lesskey
+-INSTALL_HELP =		$(ROOT)/man/less.help
+-INSTALL_LESSMAN =	$(ROOT)/man/vnless.1
+-INSTALL_KEYMAN =	$(ROOT)/man/lesskey.1
++INSTALL_KEY =		$(ROOT)/bin/vnlesskey
++INSTALL_HELP =		$(ROOT)/share/misc/vnless.help
++INSTALL_LESSMAN =	$(ROOT)/man/man1/vnless.1
++INSTALL_KEYMAN =	$(ROOT)/man/man1/vnlesskey.1
+ LESS_MANUAL =		less.man
+ KEY_MANUAL =		lesskey.man
+-HELPFILE =		$(ROOT)/man/less.help
++HELPFILE =		$(ROOT)/share/misc/vnless.help
+ 
+ 
+ # OPTIM is passed to the compiler and the loader.
+@@ -47,8 +47,9 @@
+ #OPTIM = -O
+ 
+ #CFLAGS = $(OPTIM)
+-CFLAGS = -O
+-LDFLAGS = 
++CFLAGS ?= -O
++LDFLAGS ?= 
++LDLIBS = -lcompat
+ 
+ 
+ ##########################################################################
+@@ -82,24 +83,19 @@
+ 	$(CC) $(CFLAGS) -c -DHELPFILE=\"$(HELPFILE)\" help.c
+ 
+ install_less: vnless
+-	for f in $(INSTALL_LESS); do  rm -f $$f; cp vnless $$f;  done
+-	touch install_less
++	$(BSD_INSTALL_PROGRAM) vnless $(DESTDIR)$(INSTALL_LESS)
+ 
+ install_key: lesskey
+-	for f in $(INSTALL_KEY); do  rm -f $$f; cp lesskey $$f;  done
+-	touch install_key
++	$(BSD_INSTALL_PROGRAM) lesskey $(DESTDIR)$(INSTALL_KEY)
+ 
+ install_help: less.help
+-	for f in $(INSTALL_HELP); do  rm -f $$f; cp less.help $$f;  done
+-	touch install_help
++	$(BSD_INSTALL_DATA) less.help $(DESTDIR)$(INSTALL_HELP)
+ 
+ install_lman: $(LESS_MANUAL) 
+-	for f in $(INSTALL_LESSMAN); do  rm -f $$f; cp $(LESS_MANUAL) $$f;  done
+-	touch install_lman
++	$(BSD_INSTALL_MAN) $(LESS_MANUAL) $(DESTDIR)$(INSTALL_LESSMAN)
+ 
+ install_kman: $(KEY_MANUAL)
+-	for f in $(INSTALL_KEYMAN); do  rm -f $$f; cp $(KEY_MANUAL) $$f;  done
+-	touch install_kman
++	$(BSD_INSTALL_MAN) $(KEY_MANUAL) $(DESTDIR)$(INSTALL_KEYMAN)
+ 
+ ##########################################################################
+ # Maintenance

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/files/patch-defines.h
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-defines.h	(nonexistent)
+++ branches/2014Q3/vietnamese/vnless/files/patch-defines.h	(revision 364308)
@@ -0,0 +1,34 @@
+--- defines.h.orig	Mon Feb 24 12:45:37 1992
++++ defines.h	Sat Feb  2 10:57:31 1996
+@@ -40,14 +40,21 @@
+  * If TERMIO is 0 your system must have /usr/include/sgtty.h.
+  * This is normally the case for BSD.
+  */
+-/*#define	TERMIO		1*/
++#include <sys/param.h>
++#ifdef BSD4_4
++#define	TERMIO		1
++#endif
+ 
+ /*
+  * SIGSETMASK is 1 if your system has the sigsetmask() call.
+  * This is normally the case only for BSD 4.2,
+  * not for BSD 4.1 or System 5.
+  */
++#ifdef BSD4_4
++#define	SIGSETMASK	1
++#else
+ #define	SIGSETMASK	0
++#endif
+ 
+ /*
+  * REGCMP is 1 if your system has the regcmp() function.
+@@ -73,7 +80,7 @@
+  * EDIT_PGM is the name of the (default) editor to be invoked.
+  */
+ #define	EDITOR		1
+-#define	EDIT_PGM	"/usr/local/bin/vi"
++#define	EDIT_PGM	"/usr/bin/vi"
+ 
+ /*
+  * TAGS is 1 if you wish to support tag files.

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-defines.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/files/patch-less.h
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-less.h	(nonexistent)
+++ branches/2014Q3/vietnamese/vnless/files/patch-less.h	(revision 364308)
@@ -0,0 +1,29 @@
+--- less.h.orig	1992-02-24 12:45:38.000000000 -0800
++++ less.h	2007-08-23 15:16:23.000000000 -0700
+@@ -31,7 +31,11 @@ typedef long		POSITION;
+  * The type of signal handler functions.
+  * Usually int, although it should be void.
+  */
++#if VOID
++typedef	void		HANDLER;
++#else
+ typedef	int		HANDLER;
++#endif
+ 
+ 
+ #define	FILENAME	128	/* Max size of a filename */
+@@ -74,7 +78,14 @@ typedef	int		HANDLER;
+ #define	SIGNAL(sig,func)	signal(sig,func)
+ 
+ /* Library function declarations */
++#ifdef NO_STD_HDRS
+ offset_t lseek();
+ char *calloc();
++#else
++#include <stdlib.h>
++#include <unistd.h>
++#include <stdio.h>
++#include <string.h>
++#endif
+ 
+ #include "funcs.h"

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-less.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/files/patch-os.c
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-os.c	(nonexistent)
+++ branches/2014Q3/vietnamese/vnless/files/patch-os.c	(revision 364308)
@@ -0,0 +1,33 @@
+--- os.c.orig	Mon Feb 24 12:45:40 1992
++++ os.c	Wed Dec  4 02:36:59 1996
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <signal.h>
+ #include <setjmp.h>
++#include <time.h>
+ #include "less.h"
+ 
+ char *getenv();
+@@ -153,7 +154,7 @@
+ 	public long
+ get_time()
+ {
+-	long t;
++	time_t t;
+ 
+ 	time(&t);
+ 	return (t);
+@@ -294,9 +295,13 @@
+ 
+ #if PERROR
+ 
++#ifdef USE_FBSD_STD_HDRS
+ extern char *sys_errlist[];
+ extern int sys_nerr;
+ extern int errno;
++#else
++#include <errno.h>
++#endif
+ 
+ 	public char *
+ errno_message(filename, message, len)

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-os.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2014Q3/vietnamese/vnless/files/patch-regerror.c
===================================================================
--- branches/2014Q3/vietnamese/vnless/files/patch-regerror.c	(nonexistent)
+++ branches/2014Q3/vietnamese/vnless/files/patch-regerror.c	(revision 364308)
@@ -0,0 +1,13 @@
+--- regerror.c.orig	Mon Feb 24 12:45:41 1992
++++ regerror.c	Wed Dec  4 02:42:23 1996
+@@ -1,7 +1,9 @@
+ #include <stdio.h>
++
++#ifdef FBSD_HAS_THIS_IN_LIBCOMPAT
+ regerror(str)
+ char *str;
+ {
+ /*	fprintf(stderr,"%s\n",str); */
+ }
+-
++#endif

Property changes on: branches/2014Q3/vietnamese/vnless/files/patch-regerror.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2014Q3
===================================================================
--- branches/2014Q3	(revision 364307)
+++ branches/2014Q3	(revision 364308)

Property changes on: branches/2014Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r364302