Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Aug 2014 16:56:46 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r364308 - in branches/2014Q3/vietnamese/vnless: . files
Message-ID:  <53e3afcf.249b.2d82a3c1@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Thu Aug  7 16:56:46 2014
New Revision: 364308
URL: http://svnweb.freebsd.org/changeset/ports/364308
QAT: https://qat.redports.org/buildarchive/r364308/

Log:
  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)

Added:
  branches/2014Q3/vietnamese/vnless/files/patch-Makefile
     - copied unchanged from r364302, head/vietnamese/vnless/files/patch-Makefile
  branches/2014Q3/vietnamese/vnless/files/patch-defines.h
     - copied unchanged from r364302, head/vietnamese/vnless/files/patch-defines.h
  branches/2014Q3/vietnamese/vnless/files/patch-less.h
     - copied unchanged from r364302, head/vietnamese/vnless/files/patch-less.h
  branches/2014Q3/vietnamese/vnless/files/patch-os.c
     - copied unchanged from r364302, head/vietnamese/vnless/files/patch-os.c
  branches/2014Q3/vietnamese/vnless/files/patch-regerror.c
     - copied unchanged from r364302, head/vietnamese/vnless/files/patch-regerror.c
Deleted:
  branches/2014Q3/vietnamese/vnless/files/patch-01
  branches/2014Q3/vietnamese/vnless/files/patch-02
  branches/2014Q3/vietnamese/vnless/files/patch-03
  branches/2014Q3/vietnamese/vnless/files/patch-04
  branches/2014Q3/vietnamese/vnless/files/patch-05
  branches/2014Q3/vietnamese/vnless/pkg-plist
Modified:
  branches/2014Q3/vietnamese/vnless/Makefile
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/vietnamese/vnless/Makefile
==============================================================================
--- branches/2014Q3/vietnamese/vnless/Makefile	Thu Aug  7 16:53:23 2014	(r364307)
+++ branches/2014Q3/vietnamese/vnless/Makefile	Thu Aug  7 16:56:46 2014	(r364308)
@@ -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>

Copied: branches/2014Q3/vietnamese/vnless/files/patch-Makefile (from r364302, head/vietnamese/vnless/files/patch-Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q3/vietnamese/vnless/files/patch-Makefile	Thu Aug  7 16:56:46 2014	(r364308, copy of r364302, head/vietnamese/vnless/files/patch-Makefile)
@@ -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

Copied: branches/2014Q3/vietnamese/vnless/files/patch-defines.h (from r364302, head/vietnamese/vnless/files/patch-defines.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q3/vietnamese/vnless/files/patch-defines.h	Thu Aug  7 16:56:46 2014	(r364308, copy of r364302, head/vietnamese/vnless/files/patch-defines.h)
@@ -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.

Copied: branches/2014Q3/vietnamese/vnless/files/patch-less.h (from r364302, head/vietnamese/vnless/files/patch-less.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q3/vietnamese/vnless/files/patch-less.h	Thu Aug  7 16:56:46 2014	(r364308, copy of r364302, head/vietnamese/vnless/files/patch-less.h)
@@ -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"

Copied: branches/2014Q3/vietnamese/vnless/files/patch-os.c (from r364302, head/vietnamese/vnless/files/patch-os.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q3/vietnamese/vnless/files/patch-os.c	Thu Aug  7 16:56:46 2014	(r364308, copy of r364302, head/vietnamese/vnless/files/patch-os.c)
@@ -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)

Copied: branches/2014Q3/vietnamese/vnless/files/patch-regerror.c (from r364302, head/vietnamese/vnless/files/patch-regerror.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q3/vietnamese/vnless/files/patch-regerror.c	Thu Aug  7 16:56:46 2014	(r364308, copy of r364302, head/vietnamese/vnless/files/patch-regerror.c)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e3afcf.249b.2d82a3c1>