Module Name: src
Committed By: christos
Date: Thu Jan 14 02:30:19 UTC 2016
Modified Files:
src/external/gpl2/groff: Makefile Makefile.inc
src/external/gpl2/groff/bin/eqn: Makefile
src/external/gpl2/groff/bin/grn: Makefile
src/external/gpl2/groff/bin/groff: Makefile
src/external/gpl2/groff/bin/hpftodit: Makefile
src/external/gpl2/groff/bin/html: Makefile
src/external/gpl2/groff/bin/pic: Makefile
src/external/gpl2/groff/bin/refer: Makefile
src/external/gpl2/groff/bin/soelim: Makefile
src/external/gpl2/groff/bin/tbl: Makefile
src/external/gpl2/groff/bin/troff: Makefile
Removed Files:
src/external/gpl2/groff/dist/src/preproc/pic: pic.cpp
src/external/gpl2/groff/dist/src/preproc/refer: label.cpp
Log Message:
- remove generated files
- remove libdriver dependencies where they are not needed
- add bin to Makefile
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/Makefile \
src/external/gpl2/groff/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/eqn/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/grn/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/groff/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/hpftodit/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/html/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/pic/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/refer/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/soelim/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/tbl/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/troff/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl2/groff/dist/src/preproc/pic/pic.cpp
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl2/groff/dist/src/preproc/refer/label.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/groff/Makefile
diff -u src/external/gpl2/groff/Makefile:1.1 src/external/gpl2/groff/Makefile:1.2
--- src/external/gpl2/groff/Makefile:1.1 Wed Jan 13 14:01:55 2016
+++ src/external/gpl2/groff/Makefile Wed Jan 13 21:30:18 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:55 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/Makefile,v 2.11 2003/05/02 00:55:52 ru Exp $
-SUBDIR= lib .WAIT doc font man tmac devices
+SUBDIR= lib .WAIT bin doc font man tmac devices
.include <bsd.subdir.mk>
Index: src/external/gpl2/groff/Makefile.inc
diff -u src/external/gpl2/groff/Makefile.inc:1.1 src/external/gpl2/groff/Makefile.inc:1.2
--- src/external/gpl2/groff/Makefile.inc:1.1 Wed Jan 13 14:01:55 2016
+++ src/external/gpl2/groff/Makefile.inc Wed Jan 13 21:30:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2016/01/13 19:01:55 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $
@@ -79,7 +79,9 @@ DIST= ${NETBSDSRCDIR}/external/gpl2/gro
GROFF_DIST= ${DIST}/dist
PROGDPLIBS+= bib ${DIST}/lib/libbib
+.if !defined(NOLIBDRIVER)
PROGDPLIBS+= driver ${DIST}/lib/libdriver
+.endif
PROGDPLIBS+= groff ${DIST}/lib/libgroff
CPPFLAGS+= -DHAVE_CONFIG_H
Index: src/external/gpl2/groff/bin/eqn/Makefile
diff -u src/external/gpl2/groff/bin/eqn/Makefile:1.1 src/external/gpl2/groff/bin/eqn/Makefile:1.2
--- src/external/gpl2/groff/bin/eqn/Makefile:1.1 Wed Jan 13 14:01:56 2016
+++ src/external/gpl2/groff/bin/eqn/Makefile Wed Jan 13 21:30:18 2016
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/preproc/eqn
GROFFYSRCS= eqn.y
+NOLIBDRIVER=
.include <bsd.init.mk>
Index: src/external/gpl2/groff/bin/grn/Makefile
diff -u src/external/gpl2/groff/bin/grn/Makefile:1.1 src/external/gpl2/groff/bin/grn/Makefile:1.2
--- src/external/gpl2/groff/bin/grn/Makefile:1.1 Wed Jan 13 14:01:56 2016
+++ src/external/gpl2/groff/bin/grn/Makefile Wed Jan 13 21:30:18 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/preproc/grn
+NOLIBDRIVER=
.include <bsd.init.mk>
Index: src/external/gpl2/groff/bin/groff/Makefile
diff -u src/external/gpl2/groff/bin/groff/Makefile:1.1 src/external/gpl2/groff/bin/groff/Makefile:1.2
--- src/external/gpl2/groff/bin/groff/Makefile:1.1 Wed Jan 13 14:01:56 2016
+++ src/external/gpl2/groff/bin/groff/Makefile Wed Jan 13 21:30:18 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.7 2003/05/01 13:22:20 ru Exp $
DIST_SUBDIR= src/roff/groff
+NOLIBDRIVER=
.include <bsd.init.mk>
Index: src/external/gpl2/groff/bin/hpftodit/Makefile
diff -u src/external/gpl2/groff/bin/hpftodit/Makefile:1.1 src/external/gpl2/groff/bin/hpftodit/Makefile:1.2
--- src/external/gpl2/groff/bin/hpftodit/Makefile:1.1 Wed Jan 13 14:01:56 2016
+++ src/external/gpl2/groff/bin/hpftodit/Makefile Wed Jan 13 21:30:18 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
DIST_SUBDIR= src/utils/hpftodit
+NOLIBDRIVER=
.include <bsd.init.mk>
Index: src/external/gpl2/groff/bin/html/Makefile
diff -u src/external/gpl2/groff/bin/html/Makefile:1.1 src/external/gpl2/groff/bin/html/Makefile:1.2
--- src/external/gpl2/groff/bin/html/Makefile:1.1 Wed Jan 13 14:01:56 2016
+++ src/external/gpl2/groff/bin/html/Makefile Wed Jan 13 21:30:18 2016
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.5 2003/05/01 13:22:20 ru Exp $
NOMAN= YES
DIST_SUBDIR= src/preproc/html
+NOLIBDRIVER=
.include <bsd.init.mk>
Index: src/external/gpl2/groff/bin/pic/Makefile
diff -u src/external/gpl2/groff/bin/pic/Makefile:1.1 src/external/gpl2/groff/bin/pic/Makefile:1.2
--- src/external/gpl2/groff/bin/pic/Makefile:1.1 Wed Jan 13 14:01:57 2016
+++ src/external/gpl2/groff/bin/pic/Makefile Wed Jan 13 21:30:18 2016
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:57 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
GROFFYSRCS= pic.y
DIST_SUBDIR= src/preproc/pic
+NOLIBDRIVER=
.include <bsd.init.mk>
Index: src/external/gpl2/groff/bin/refer/Makefile
diff -u src/external/gpl2/groff/bin/refer/Makefile:1.1 src/external/gpl2/groff/bin/refer/Makefile:1.2
--- src/external/gpl2/groff/bin/refer/Makefile:1.1 Wed Jan 13 14:01:57 2016
+++ src/external/gpl2/groff/bin/refer/Makefile Wed Jan 13 21:30:18 2016
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:57 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
GROFFYSRCS= label.y
DIST_SUBDIR= src/preproc/refer
+NOLIBDRIVER=
.include <bsd.init.mk>
Index: src/external/gpl2/groff/bin/soelim/Makefile
diff -u src/external/gpl2/groff/bin/soelim/Makefile:1.1 src/external/gpl2/groff/bin/soelim/Makefile:1.2
--- src/external/gpl2/groff/bin/soelim/Makefile:1.1 Wed Jan 13 14:01:57 2016
+++ src/external/gpl2/groff/bin/soelim/Makefile Wed Jan 13 21:30:18 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:57 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile,v 1.3 2003/05/01 13:22:20 ru Exp $
DIST_SUBDIR= src/preproc/soelim
+NOLIBDRIVER=
.include <bsd.init.mk>
Index: src/external/gpl2/groff/bin/tbl/Makefile
diff -u src/external/gpl2/groff/bin/tbl/Makefile:1.1 src/external/gpl2/groff/bin/tbl/Makefile:1.2
--- src/external/gpl2/groff/bin/tbl/Makefile:1.1 Wed Jan 13 14:01:57 2016
+++ src/external/gpl2/groff/bin/tbl/Makefile Wed Jan 13 21:30:18 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:57 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
DIST_SUBDIR= src/preproc/tbl
+NOLIBDRIVER=
.include <bsd.init.mk>
Index: src/external/gpl2/groff/bin/troff/Makefile
diff -u src/external/gpl2/groff/bin/troff/Makefile:1.1 src/external/gpl2/groff/bin/troff/Makefile:1.2
--- src/external/gpl2/groff/bin/troff/Makefile:1.1 Wed Jan 13 14:01:57 2016
+++ src/external/gpl2/groff/bin/troff/Makefile Wed Jan 13 21:30:18 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:57 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
DIST_SUBDIR= src/roff/troff
+NOLIBDRIVER=
.include <bsd.init.mk>
