Date: Thu, 7 Aug 2014 16:29:57 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364302 - in head/vietnamese/vnless: . files Message-ID: <53e3a986.212d.63ae3a35@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Thu Aug 7 16:29:57 2014 New Revision: 364302 URL: http://svnweb.freebsd.org/changeset/ports/364302 QAT: https://qat.redports.org/buildarchive/r364302/ Log: - Fix build with clang (functions not returing value) - Respect CFLAGS during build - Add staging support - Switch to PLIST_FILES - Rename patches to current standards MFH: 2014Q3 Added: head/vietnamese/vnless/files/patch-Makefile - copied, changed from r364291, head/vietnamese/vnless/files/patch-01 head/vietnamese/vnless/files/patch-defines.h - copied unchanged from r364291, head/vietnamese/vnless/files/patch-03 head/vietnamese/vnless/files/patch-less.h - copied unchanged from r364291, head/vietnamese/vnless/files/patch-02 head/vietnamese/vnless/files/patch-os.c - copied unchanged from r364291, head/vietnamese/vnless/files/patch-04 head/vietnamese/vnless/files/patch-regerror.c - copied unchanged from r364291, head/vietnamese/vnless/files/patch-05 Deleted: head/vietnamese/vnless/files/patch-01 head/vietnamese/vnless/files/patch-02 head/vietnamese/vnless/files/patch-03 head/vietnamese/vnless/files/patch-04 head/vietnamese/vnless/files/patch-05 head/vietnamese/vnless/pkg-plist Modified: head/vietnamese/vnless/Makefile Modified: head/vietnamese/vnless/Makefile ============================================================================== --- head/vietnamese/vnless/Makefile Thu Aug 7 16:28:11 2014 (r364301) +++ head/vietnamese/vnless/Makefile Thu Aug 7 16:29:57 2014 (r364302) @@ -12,13 +12,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 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 and modified: head/vietnamese/vnless/files/patch-Makefile (from r364291, head/vietnamese/vnless/files/patch-01) ============================================================================== --- head/vietnamese/vnless/files/patch-01 Thu Aug 7 15:38:56 2014 (r364291, copy source) +++ head/vietnamese/vnless/files/patch-Makefile Thu Aug 7 16:29:57 2014 (r364302) @@ -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 Copied: head/vietnamese/vnless/files/patch-defines.h (from r364291, head/vietnamese/vnless/files/patch-03) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/vietnamese/vnless/files/patch-defines.h Thu Aug 7 16:29:57 2014 (r364302, copy of r364291, head/vietnamese/vnless/files/patch-03) @@ -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: head/vietnamese/vnless/files/patch-less.h (from r364291, head/vietnamese/vnless/files/patch-02) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/vietnamese/vnless/files/patch-less.h Thu Aug 7 16:29:57 2014 (r364302, copy of r364291, head/vietnamese/vnless/files/patch-02) @@ -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: head/vietnamese/vnless/files/patch-os.c (from r364291, head/vietnamese/vnless/files/patch-04) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/vietnamese/vnless/files/patch-os.c Thu Aug 7 16:29:57 2014 (r364302, copy of r364291, head/vietnamese/vnless/files/patch-04) @@ -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: head/vietnamese/vnless/files/patch-regerror.c (from r364291, head/vietnamese/vnless/files/patch-05) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/vietnamese/vnless/files/patch-regerror.c Thu Aug 7 16:29:57 2014 (r364302, copy of r364291, head/vietnamese/vnless/files/patch-05) @@ -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?53e3a986.212d.63ae3a35>