diff --git a/en_US.ISO8859-1/articles/5-roadmap/Makefile b/en_US.ISO8859-1/articles/5-roadmap/Makefile
index 58a3145207..b3b8bbb0e0 100644
--- a/en_US.ISO8859-1/articles/5-roadmap/Makefile
+++ b/en_US.ISO8859-1/articles/5-roadmap/Makefile
@@ -6,17 +6,14 @@
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-# SGML content
-SRCS= article.sgml
+SRCS= article.sgml
CSS_SHEET_ADDITIONS= extra.css
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/checkpoint/Makefile b/en_US.ISO8859-1/articles/checkpoint/Makefile
index 8ed0801bd5..acf8dfbba0 100644
--- a/en_US.ISO8859-1/articles/checkpoint/Makefile
+++ b/en_US.ISO8859-1/articles/checkpoint/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: Integration of Check Point Firewall-1 and FreeBSD IPsec
DOC?= article
@@ -7,10 +10,8 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
-
+SRCS= article.sgml
IMAGES_EN= networks.pic
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/committers-guide/Makefile b/en_US.ISO8859-1/articles/committers-guide/Makefile
index c4ee489d0a..64ddf4e497 100644
--- a/en_US.ISO8859-1/articles/committers-guide/Makefile
+++ b/en_US.ISO8859-1/articles/committers-guide/Makefile
@@ -1,27 +1,19 @@
#
# $FreeBSD$
#
-# Build the FreeBSD New Committers Guide
-#
+# Article: The FreeBSD Committers Guide
MAINTAINER=jhb@FreeBSD.org
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-#
-# SRCS lists the individual SGML files that make up the document. Changes
-# to any of these files will force a rebuild
-#
-
-# SGML content
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/console-server/Makefile b/en_US.ISO8859-1/articles/console-server/Makefile
index 0158cf13c3..b3384825b1 100644
--- a/en_US.ISO8859-1/articles/console-server/Makefile
+++ b/en_US.ISO8859-1/articles/console-server/Makefile
@@ -1,17 +1,18 @@
+#
# $FreeBSD$
+#
+# Article: Console Server
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
IMAGES_EN= tk0231-9-1.png
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/contributing/Makefile b/en_US.ISO8859-1/articles/contributing/Makefile
index 7dda35ae7c..d90bb3da17 100644
--- a/en_US.ISO8859-1/articles/contributing/Makefile
+++ b/en_US.ISO8859-1/articles/contributing/Makefile
@@ -1,16 +1,17 @@
+#
# $FreeBSD$
+#
+# Article: Contributing to FreeBSD
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/contributors/Makefile b/en_US.ISO8859-1/articles/contributors/Makefile
index d249413d8c..0b24fd7f3b 100644
--- a/en_US.ISO8859-1/articles/contributors/Makefile
+++ b/en_US.ISO8859-1/articles/contributors/Makefile
@@ -1,23 +1,24 @@
+#
# $FreeBSD$
+#
+# Article: Contributors to FreeBSD
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
-SRCS+=contrib.ent
-SRCS+=contrib.386bsd.sgml
-SRCS+=contrib.additional.sgml
-SRCS+=contrib.committers.sgml
-SRCS+=contrib.core.sgml
-SRCS+=contrib.corealumni.sgml
-SRCS+=contrib.develalumni.sgml
+SRCS= article.sgml
+SRCS+= contrib.ent
+SRCS+= contrib.386bsd.sgml
+SRCS+= contrib.additional.sgml
+SRCS+= contrib.committers.sgml
+SRCS+= contrib.core.sgml
+SRCS+= contrib.corealumni.sgml
+SRCS+= contrib.develalumni.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/Makefile b/en_US.ISO8859-1/articles/cvs-freebsd/Makefile
index 058eadc0eb..a450bb703e 100644
--- a/en_US.ISO8859-1/articles/cvs-freebsd/Makefile
+++ b/en_US.ISO8859-1/articles/cvs-freebsd/Makefile
@@ -1,6 +1,6 @@
-#
# $FreeBSD$
#
+# Article: Setting up a CVS repository - the FreeBSD way
MAINTAINER= stijn@win.tue.nl
@@ -11,8 +11,7 @@ FORMATS?= html
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-# SGML content
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile b/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
index 7dda35ae7c..8683682652 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
@@ -1,16 +1,17 @@
+#
# $FreeBSD$
+#
+# Article: CVSup Advanced Points
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/dialup-firewall/Makefile b/en_US.ISO8859-1/articles/dialup-firewall/Makefile
index 886e21cc9d..37854b51ad 100644
--- a/en_US.ISO8859-1/articles/dialup-firewall/Makefile
+++ b/en_US.ISO8859-1/articles/dialup-firewall/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: Dialup firewalling with FreeBSD
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/diskless-x/Makefile b/en_US.ISO8859-1/articles/diskless-x/Makefile
index 886e21cc9d..77fd3e8065 100644
--- a/en_US.ISO8859-1/articles/diskless-x/Makefile
+++ b/en_US.ISO8859-1/articles/diskless-x/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: Diskless X Server: a how to guide
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/euro/Makefile b/en_US.ISO8859-1/articles/euro/Makefile
index 886e21cc9d..6efcc67d29 100644
--- a/en_US.ISO8859-1/articles/euro/Makefile
+++ b/en_US.ISO8859-1/articles/euro/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: The Euro symbol on FreeBSD
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/explaining-bsd/Makefile b/en_US.ISO8859-1/articles/explaining-bsd/Makefile
index d29c0de73d..42fe714c48 100644
--- a/en_US.ISO8859-1/articles/explaining-bsd/Makefile
+++ b/en_US.ISO8859-1/articles/explaining-bsd/Makefile
@@ -1,25 +1,19 @@
-#
+#
# $FreeBSD$
#
+# Article: Explaining BSD
MAINTAINER=grog@FreeBSD.org
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-#
-# SRCS lists the individual SGML files that make up the document. Changes
-# to any of these files will force a rebuild
-#
-
-# SGML content
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile b/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile
index 5e1743c4d7..980700e113 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile
@@ -12,15 +12,19 @@ MAINTAINER= schweikh@FreeBSD.org
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-# SGML content
-SRCS= article.sgml stage_1.conf.default stage_1.sh stage_2.conf.default \
- stage_2.sh stage_3.mk
+EXTRAS= stage_1.conf.default
+EXTRAS+= stage_1.sh
+EXTRAS+= stage_2.conf.default
+EXTRAS+= stage_2.sh
+EXTRAS+= stage_3.mk
-DOC_PREFIX?= ${.CURDIR}/../../..
+SRCS= article.sgml
+SRCS+= ${EXTRAS}
afterinstall:
- ${INSTALL_DOCS} ${.CURDIR}/stage_1.sh ${.CURDIR}/stage_1.conf.default \
- ${.CURDIR}/stage_2.sh ${.CURDIR}/stage_2.conf.default \
- ${.CURDIR}/stage_3.mk ${DESTDIR}
+.for entry in ${EXTRAS}
+ ${INSTALL_DOCS} ${.CURDIR}/${entry} ${DESTDIR}
+.endfor
+DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/Makefile b/en_US.ISO8859-1/articles/filtering-bridges/Makefile
index 886e21cc9d..6b6c1b3fae 100644
--- a/en_US.ISO8859-1/articles/filtering-bridges/Makefile
+++ b/en_US.ISO8859-1/articles/filtering-bridges/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: Filtering Bridges
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/fonts/Makefile b/en_US.ISO8859-1/articles/fonts/Makefile
index 886e21cc9d..d1da66dfde 100644
--- a/en_US.ISO8859-1/articles/fonts/Makefile
+++ b/en_US.ISO8859-1/articles/fonts/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: Fonts and FreeBSD
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/formatting-media/Makefile b/en_US.ISO8859-1/articles/formatting-media/Makefile
index 886e21cc9d..90e09b2607 100644
--- a/en_US.ISO8859-1/articles/formatting-media/Makefile
+++ b/en_US.ISO8859-1/articles/formatting-media/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: Formatting Media For Use With FreeBSD
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/Makefile b/en_US.ISO8859-1/articles/freebsd-questions/Makefile
index d29c0de73d..1ab662c7f5 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/Makefile
+++ b/en_US.ISO8859-1/articles/freebsd-questions/Makefile
@@ -1,25 +1,19 @@
-#
+#
# $FreeBSD$
#
+# Article: How to get best results from the FreeBSD-questions mailing list
MAINTAINER=grog@FreeBSD.org
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-#
-# SRCS lists the individual SGML files that make up the document. Changes
-# to any of these files will force a rebuild
-#
-
-# SGML content
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/hats/Makefile b/en_US.ISO8859-1/articles/hats/Makefile
index 886e21cc9d..070310e5a8 100644
--- a/en_US.ISO8859-1/articles/hats/Makefile
+++ b/en_US.ISO8859-1/articles/hats/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: Working with Hats
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/hubs/Makefile b/en_US.ISO8859-1/articles/hubs/Makefile
index 7dda35ae7c..cded48ba4b 100644
--- a/en_US.ISO8859-1/articles/hubs/Makefile
+++ b/en_US.ISO8859-1/articles/hubs/Makefile
@@ -1,16 +1,17 @@
+#
# $FreeBSD$
+#
+# Article: Mirroring FreeBSD
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/ipsec-must/Makefile b/en_US.ISO8859-1/articles/ipsec-must/Makefile
index 886e21cc9d..09c0c41f9f 100644
--- a/en_US.ISO8859-1/articles/ipsec-must/Makefile
+++ b/en_US.ISO8859-1/articles/ipsec-must/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: Independent Verification of IPsec Functionality in FreeBSD
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/java-tomcat/Makefile b/en_US.ISO8859-1/articles/java-tomcat/Makefile
index 2b95b0060b..2a8b598453 100644
--- a/en_US.ISO8859-1/articles/java-tomcat/Makefile
+++ b/en_US.ISO8859-1/articles/java-tomcat/Makefile
@@ -1,9 +1,8 @@
#
-# FreeBSD Documentation Project
# $FreeBSD$
#
-# Makefile for "Java and FreeBSD First Steps"
# Author: Victoria Chan, Hiten Pandya
+# Article: Java and Jakarta Tomcat on FreeBSD
MAINTAINER=vkchan@kendryl.net hiten@uk.FreeBSD.org
@@ -14,9 +13,7 @@ FORMATS?= html
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-# SGML content
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/laptop/Makefile b/en_US.ISO8859-1/articles/laptop/Makefile
index 483154c25e..554a79327f 100644
--- a/en_US.ISO8859-1/articles/laptop/Makefile
+++ b/en_US.ISO8859-1/articles/laptop/Makefile
@@ -1,7 +1,7 @@
#
# $FreeBSD$
#
-# Article about using FreeBSD on laptops
+# Article: FreeBSD on Laptops
#
DOC?= article
@@ -11,8 +11,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/mh/Makefile b/en_US.ISO8859-1/articles/mh/Makefile
index 886e21cc9d..45a8cf393a 100644
--- a/en_US.ISO8859-1/articles/mh/Makefile
+++ b/en_US.ISO8859-1/articles/mh/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: An MH Primer
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/multi-os/Makefile b/en_US.ISO8859-1/articles/multi-os/Makefile
index 7dda35ae7c..8becfa753e 100644
--- a/en_US.ISO8859-1/articles/multi-os/Makefile
+++ b/en_US.ISO8859-1/articles/multi-os/Makefile
@@ -1,16 +1,17 @@
+#
# $FreeBSD$
+#
+# Article: Installing and Using FreeBSD With Other Operating Systems
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/new-users/Makefile b/en_US.ISO8859-1/articles/new-users/Makefile
index 886e21cc9d..be470ca93f 100644
--- a/en_US.ISO8859-1/articles/new-users/Makefile
+++ b/en_US.ISO8859-1/articles/new-users/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: For People New to Both FreeBSD and Unix
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/pam/Makefile b/en_US.ISO8859-1/articles/pam/Makefile
index 4282f76b0f..c7252e978d 100644
--- a/en_US.ISO8859-1/articles/pam/Makefile
+++ b/en_US.ISO8859-1/articles/pam/Makefile
@@ -1,18 +1,24 @@
+#
# $FreeBSD$
+#
+# Article: Pluggable Authentication Modules
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
+WITH_INLINE_LEGALNOTICE?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-WITH_INLINE_LEGALNOTICE?=YES
+EXTRAS= pam_app.c
+EXTRAS+= pam_conv.c
+EXTRAS+= pam_module.c
+CLEANFILES+= ${EXTRAS}
-SRCS= article.sgml pam_app.c pam_conv.c pam_module.c
-
-CLEANFILES+= pam_app.c pam_conv.c pam_module.c
+SRCS= article.sgml
+SRCS+= ${EXTRAS}
pam_app.c: su.c
sed -e '/^[\/ ]\*/d' ${.ALLSRC} >${.TARGET}
@@ -24,5 +30,4 @@ pam_module.c: pam_unix.c
sed -e '/^[\/ ]\*/d' ${.ALLSRC} >${.TARGET}
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/Makefile b/en_US.ISO8859-1/articles/pr-guidelines/Makefile
index 99fb5b5e47..68ea714baa 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/Makefile
+++ b/en_US.ISO8859-1/articles/pr-guidelines/Makefile
@@ -1,16 +1,17 @@
+#
# $FreeBSD$
+#
+# Article: Problem Report Handling Guidelines
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/problem-reports/Makefile b/en_US.ISO8859-1/articles/problem-reports/Makefile
index 7dda35ae7c..bb5882f4ed 100644
--- a/en_US.ISO8859-1/articles/problem-reports/Makefile
+++ b/en_US.ISO8859-1/articles/problem-reports/Makefile
@@ -1,16 +1,17 @@
+#
# $FreeBSD$
+#
+# Article: Writing FreeBSD Problem Reports
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/pxe/Makefile b/en_US.ISO8859-1/articles/pxe/Makefile
index 6fb7f80435..6f545e20a8 100644
--- a/en_US.ISO8859-1/articles/pxe/Makefile
+++ b/en_US.ISO8859-1/articles/pxe/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: FreeBSD PXE Jumpstart Guide
DOC?= article
@@ -7,13 +10,19 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+EXTRAS= dhcpd.conf
+EXTRAS+= install.cfg
+EXTRAS+= loader.rc
+EXTRAS+= pkgmaker.sh
+EXTRAS+= post
+EXTRAS+= pre
-DOC_PREFIX?= ${.CURDIR}/../../..
+SRCS= article.sgml
afterinstall:
- ${INSTALL_DOCS} ${.CURDIR}/dhcpd.conf ${.CURDIR}/install.cfg \
- ${.CURDIR}/loader.rc ${.CURDIR}/pkgmaker.sh \
- ${.CURDIR}/post ${.CURDIR}/pre ${DESTDIR}
+.for entry in ${EXTRAS}
+ ${INSTALL_DOCS} ${.CURDIR}/${entry} ${DESTDIR}
+.endfor
+DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/releng-packages/Makefile b/en_US.ISO8859-1/articles/releng-packages/Makefile
index 00cedcd8e7..d47d0b2e9a 100644
--- a/en_US.ISO8859-1/articles/releng-packages/Makefile
+++ b/en_US.ISO8859-1/articles/releng-packages/Makefile
@@ -10,11 +10,9 @@ FORMATS?= html
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-# SGML content
-SRCS= article.sgml
+SRCS= article.sgml
CSS_SHEET_ADDITIONS= extra.css
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/releng/Makefile b/en_US.ISO8859-1/articles/releng/Makefile
index dcad39bbfe..61addbfee3 100644
--- a/en_US.ISO8859-1/articles/releng/Makefile
+++ b/en_US.ISO8859-1/articles/releng/Makefile
@@ -6,20 +6,16 @@
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-# SGML content
-SRCS= article.sgml branches.ascii
-
-# IMAGES
-IMAGES_EN= branches.pic
+SRCS= article.sgml
+SRCS+= branches.ascii
+IMAGES_EN= branches.pic
CSS_SHEET_ADDITIONS= extra.css
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/serial-uart/Makefile b/en_US.ISO8859-1/articles/serial-uart/Makefile
index 7dda35ae7c..123d2f0218 100644
--- a/en_US.ISO8859-1/articles/serial-uart/Makefile
+++ b/en_US.ISO8859-1/articles/serial-uart/Makefile
@@ -1,16 +1,17 @@
+#
# $FreeBSD$
+#
+# Article: Serial and UART Tutorial
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/solid-state/Makefile b/en_US.ISO8859-1/articles/solid-state/Makefile
index 2a936ffc9e..9dfb36fb9d 100644
--- a/en_US.ISO8859-1/articles/solid-state/Makefile
+++ b/en_US.ISO8859-1/articles/solid-state/Makefile
@@ -1,24 +1,17 @@
#
# $FreeBSD$
#
-#
+# Article: FreeBSD and Solid State Devices
DOC?= article
FORMATS?= html
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-#
-# SRCS lists the individual SGML files that make up the document. Changes
-# to any of these files will force a rebuild
-#
-
-# SGML content
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/storage-devices/Makefile b/en_US.ISO8859-1/articles/storage-devices/Makefile
index 886e21cc9d..0439a4f4a3 100644
--- a/en_US.ISO8859-1/articles/storage-devices/Makefile
+++ b/en_US.ISO8859-1/articles/storage-devices/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: Storage Devices
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/vinum/Makefile b/en_US.ISO8859-1/articles/vinum/Makefile
index a3888eb455..27dbbd7c65 100644
--- a/en_US.ISO8859-1/articles/vinum/Makefile
+++ b/en_US.ISO8859-1/articles/vinum/Makefile
@@ -1,18 +1,20 @@
+#
# $FreeBSD$
+#
+# Article: Bootstrapping Vinum
DOC?= article
FORMATS?= html
-
-IMAGES_EN= ad0b4aft.eps ad2b4aft.eps arch.eps
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
+IMAGES_EN= ad0b4aft.eps
+IMAGES_EN+= ad2b4aft.eps
+IMAGES_EN+= arch.eps
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/vm-design/Makefile b/en_US.ISO8859-1/articles/vm-design/Makefile
index 4e9e17d0fb..718d474191 100644
--- a/en_US.ISO8859-1/articles/vm-design/Makefile
+++ b/en_US.ISO8859-1/articles/vm-design/Makefile
@@ -1,18 +1,21 @@
+#
# $FreeBSD$
+#
+# Article: Design elements of the FreeBSD VM system
DOC?= article
FORMATS?= html
-
-IMAGES_EN= fig1.eps fig2.eps fig3.eps fig4.eps
+WITH_ARTICLE_TOC?= YES
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-WITH_ARTICLE_TOC?=YES
-
-SRCS= article.sgml
+SRCS= article.sgml
+IMAGES_EN= fig1.eps
+IMAGES_EN+= fig2.eps
+IMAGES_EN+= fig3.eps
+IMAGES_EN+= fig4.eps
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/zip-drive/Makefile b/en_US.ISO8859-1/articles/zip-drive/Makefile
index 886e21cc9d..b275408717 100644
--- a/en_US.ISO8859-1/articles/zip-drive/Makefile
+++ b/en_US.ISO8859-1/articles/zip-drive/Makefile
@@ -1,4 +1,7 @@
+#
# $FreeBSD$
+#
+# Article: IOmega ZIP Drives
DOC?= article
@@ -7,8 +10,7 @@ FORMATS?= html
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-SRCS= article.sgml
+SRCS= article.sgml
DOC_PREFIX?= ${.CURDIR}/../../..
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"