[Midnightbsd-cvs] src [10723] trunk/usr.sbin/lpr/filters: sync

[laffer1 at midnightbsd.org]

Revision: 10723
          http://svnweb.midnightbsd.org/src/?rev=10723
Author:   laffer1
Date:     2018-06-09 17:55:38 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/usr.sbin/lpr/filters/Makefile
    trunk/usr.sbin/lpr/filters/lpf.c

Modified: trunk/usr.sbin/lpr/filters/Makefile
===================================================================
--- trunk/usr.sbin/lpr/filters/Makefile	2018-06-09 21:55:16 UTC (rev 10722)
+++ trunk/usr.sbin/lpr/filters/Makefile	2018-06-09 21:55:38 UTC (rev 10723)
@@ -1,11 +1,12 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/lpr/filters/Makefile 321275 2017-07-20 01:07:02Z ngie $
 
-BINDIR=	/usr/libexec/lpr
+BINDIR=	${LIBEXECDIR}/lpr
 
 PROG=	lpf
-NO_MAN=
+MAN=
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 .include <bsd.prog.mk>

Modified: trunk/usr.sbin/lpr/filters/lpf.c
===================================================================
--- trunk/usr.sbin/lpr/filters/lpf.c	2018-06-09 21:55:16 UTC (rev 10722)
+++ trunk/usr.sbin/lpr/filters/lpf.c	2018-06-09 21:55:38 UTC (rev 10723)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -40,7 +41,7 @@
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/lpr/filters/lpf.c 242091 2012-10-25 20:16:38Z ed $");
 
 /*
  * 	filter which reads the output of nroff and converts lines
@@ -60,17 +61,17 @@
 #define MAXWIDTH  132
 #define MAXREP    10
 
-char	buf[MAXREP][MAXWIDTH];
-int	maxcol[MAXREP] = {-1};
-int	lineno;
-int	width = 132;	/* default line length */
-int	length = 66;	/* page length */
-int	indent;		/* indentation length */
-int	npages = 1;
-int	literal;	/* print control characters */
-char	*name;		/* user's login name */
-char	*host;		/* user's machine name */
-char	*acctfile;	/* accounting information file */
+static char	buf[MAXREP][MAXWIDTH];
+static int	maxcol[MAXREP] = {-1};
+static int	lineno;
+static int	width = 132;	/* default line length */
+static int	length = 66;	/* page length */
+static int	indent;		/* indentation length */
+static int	npages = 1;
+static int	literal;	/* print control characters */
+static char	*name;		/* user's login name */
+static char	*host;		/* user's machine name */
+static char	*acctfile;	/* accounting information file */
 
 int
 main(int argc, char *argv[])