MFH: r364302

- Fix build with clang (functions not returing value)
- Respect CFLAGS during build
- Add staging support
- Switch to PLIST_FILES
- Rename patches to current standards

Approved by:	portmgr (erwin)

7 files changed, 20 insertions, 20 deletions

diff --git a/vietnamese/vnless/Makefile b/vietnamese/vnless/Makefile
index 6fc97a925aea..19f4d816d1a5 100644
--- a/vietnamese/vnless/Makefile
+++ b/vietnamese/vnless/Makefile
@@ -12,13 +12,12 @@ 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>
diff --git a/vietnamese/vnless/files/patch-01 b/vietnamese/vnless/files/patch-Makefile
index c67ee12bb528..e0075f90a072 100644
--- a/vietnamese/vnless/files/patch-01
+++ b/vietnamese/vnless/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Feb 24 15:15:42 1992
-+++ Makefile	Tue Apr 13 18:24:18 1999
+--- 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.
@@ -22,10 +22,14 @@
  
  
  # OPTIM is passed to the compiler and the loader.
-@@ -49,6 +49,7 @@
+@@ -47,8 +47,9 @@
+ #OPTIM = -O
+ 
  #CFLAGS = $(OPTIM)
- CFLAGS = -O
- LDFLAGS = 
+-CFLAGS = -O
+-LDFLAGS = 
++CFLAGS ?= -O
++LDFLAGS ?= 
 +LDLIBS = -lcompat
  
  
@@ -36,27 +40,27 @@
  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
++	$(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
-+	@for f in $(INSTALL_KEY); do  rm -f $$f; cp lesskey $$f;  done
++	$(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
-+	@for f in $(INSTALL_HELP); do  rm -f $$f; cp less.help $$f;  done
++	$(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
-+	@for f in $(INSTALL_LESSMAN); do  rm -f $$f; cp $(LESS_MANUAL) $$f;  done
++	$(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
-+	@for f in $(INSTALL_KEYMAN); do  rm -f $$f; cp $(KEY_MANUAL) $$f;  done
++	$(BSD_INSTALL_MAN) $(KEY_MANUAL) $(DESTDIR)$(INSTALL_KEYMAN)
  
  ##########################################################################
  # Maintenance
diff --git a/vietnamese/vnless/files/patch-03 b/vietnamese/vnless/files/patch-defines.h
index 22495ae23e90..22495ae23e90 100644
--- a/vietnamese/vnless/files/patch-03
+++ b/vietnamese/vnless/files/patch-defines.h
diff --git a/vietnamese/vnless/files/patch-02 b/vietnamese/vnless/files/patch-less.h
index a7a90646055f..a7a90646055f 100644
--- a/vietnamese/vnless/files/patch-02
+++ b/vietnamese/vnless/files/patch-less.h
diff --git a/vietnamese/vnless/files/patch-04 b/vietnamese/vnless/files/patch-os.c
index 85f3794b9a34..85f3794b9a34 100644
--- a/vietnamese/vnless/files/patch-04
+++ b/vietnamese/vnless/files/patch-os.c
diff --git a/vietnamese/vnless/files/patch-05 b/vietnamese/vnless/files/patch-regerror.c
index 0a72b2dde54e..0a72b2dde54e 100644
--- a/vietnamese/vnless/files/patch-05
+++ b/vietnamese/vnless/files/patch-regerror.c
diff --git a/vietnamese/vnless/pkg-plist b/vietnamese/vnless/pkg-plist
deleted file mode 100644
index 11fae5bb6c7c..000000000000
--- a/vietnamese/vnless/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/vnless
-bin/vnlesskey
-share/misc/vnless.help