From owner-p4-projects@FreeBSD.ORG  Thu Jul 29 22:29:16 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C8397106567A; Thu, 29 Jul 2010 22:29:16 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C4AE106566C
	for <perforce@FreeBSD.org>; Thu, 29 Jul 2010 22:29:16 +0000 (UTC)
	(envelope-from bfiedler@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F1F48FC13
	for <perforce@FreeBSD.org>; Thu, 29 Jul 2010 22:29:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6TMTGOr045681
	for <perforce@FreeBSD.org>; Thu, 29 Jul 2010 22:29:16 GMT
	(envelope-from bfiedler@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6TMTGwd045679
	for perforce@freebsd.org; Thu, 29 Jul 2010 22:29:16 GMT
	(envelope-from bfiedler@FreeBSD.org)
Date: Thu, 29 Jul 2010 22:29:16 GMT
Message-Id: <201007292229.o6TMTGwd045679@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bfiedler@FreeBSD.org using -f
From: Benjamin Fiedler <bfiedler@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181583 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jul 2010 22:29:17 -0000

http://p4web.freebsd.org/@@181583?ac=10

Change 181583 by bfiedler@freebsd-7803 on 2010/07/29 22:28:55

	Copy from original to usr.bin makefile

Affected files ...

.. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc.h#2 edit
.. //depot/projects/soc2010/bsdtextproc/src/usr.bin/mandoc/Makefile#2 edit

Differences ...

==== //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc.h#2 (text+ko) ====

@@ -17,6 +17,8 @@
 #ifndef MDOC_H
 #define MDOC_H
 
+#include <time.h>
+
 /*
  * This library implements a validating scanner/parser for ``mdoc'' roff
  * macro documents, a.k.a. BSD manual page documents.  The mdoc.c file

==== //depot/projects/soc2010/bsdtextproc/src/usr.bin/mandoc/Makefile#2 (text+ko) ====

@@ -3,6 +3,37 @@
 MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
 .PATH: ${MDOCMLDIR}
 
+
+PREFIX          = 
+BINDIR          = $(PREFIX)/bin
+INCLUDEDIR      = $(PREFIX)/include
+#LIBDIR          = $(PREFIX)/lib
+MANDIR          = /usr/share/man
+EXAMPLEDIR      = /usr/share/examples/mandoc
+INSTALL         = install
+INSTALL_PROGRAM = $(INSTALL) -m 0755
+INSTALL_DATA    = $(INSTALL) -m 0444
+INSTALL_LIB     = $(INSTALL) -m 0644
+INSTALL_MAN     = $(INSTALL_DATA)
+
+VERSION    = 1.10.1
+VDATE      = 07 June 2010
+
+VFLAGS     = -DVERSION="\"$(VERSION)\""
+WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS    += $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H -DUGLY
+
+install:
+      ( mkdir -p $(DESTDIR)$(BINDIR) ; \
+        mkdir -p $(DESTDIR)$(EXAMPLEDIR) ; \
+        mkdir -p $(DESTDIR)$(MANDIR)/man1 ; \
+        mkdir -p $(DESTDIR)$(MANDIR)/man7 ; \
+        $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR) ; \
+        $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1 ; \
+        $(INSTALL_MAN) man.7 mdoc.7 roff.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 ; \
+        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) \
+      ) 
+
 PROG=	mandoc
 LINKS=	mdocml
 MAN=	mandoc.1 man.7 mandoc_char.7 mdoc.7 roff.7
@@ -13,7 +44,14 @@
 	mdoc_html.c mdoc_macro.c mdoc_strings.c mdoc_term.c mdoc_validate.c \
 	msec.c out.c roff.c st.c term.c tree.c vol.c
 
+config.h: config.h.pre config.h.post
+        ( cat ${.ALLSRCS} 
+        ) > ${.TARGET}
+
+GENSRCS+=       config.h
+CLEANFILES=     config.h config.log
+
+
 WARNS?=	3
-CFLAGS+= -DVERSION=\"1.10.1\" -DHAVE_CONFIG_H -DUGLY
 
 .include <bsd.prog.mk>