Module Name: src
Committed By: tron
Date: Sun Jul 20 15:58:06 UTC 2014
Modified Files:
src/external/ibm-public/postfix/share/README_FILES: Makefile
src/external/ibm-public/postfix/share/html: Makefile
Added Files:
src/external/ibm-public/postfix/share: readme.mk
Log Message:
Rationalize README file handling:
1.) Install only README files that are relevant to the Postfix binaries
distributed with NetBSD.
2.) Create a single list of the above files that is used for both the
text versions and HTML versions.
Problem detected by wizd(8).
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/ibm-public/postfix/share/readme.mk
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/share/README_FILES/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/ibm-public/postfix/share/html/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.7 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.8
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.7 Sun Jul 6 21:04:10 2014
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile Sun Jul 20 15:58:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/07/06 21:04:10 tron Exp $
+# $NetBSD: Makefile,v 1.8 2014/07/20 15:58:06 tron Exp $
.include <bsd.own.mk>
@@ -9,26 +9,8 @@ BINDIR= ${PFIX_EXAMPLEDIR}
DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/README_FILES
.PATH: ${DIST}
-FILES= AAAREADME ADDRESS_CLASS_README ADDRESS_REWRITING_README \
- ADDRESS_VERIFICATION_README BACKSCATTER_README \
- BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
- CONNECTION_CACHE_README CONTENT_INSPECTION_README \
- DATABASE_README DB_README DEBUG_README DSN_README ETRN_README \
- FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
- LMDB_README LOCAL_RECIPIENT_README MAILDROP_README \
- MEMCACHE_README MILTER_README MULTI_INSTANCE_README MYSQL_README \
- NFS_README OVERVIEW PCRE_README PGSQL_README POSTSCREEN_README \
- QMQP_README QSHAPE_README ../RELEASE_NOTES RESTRICTION_CLASS_README \
- SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
- SMTPD_PROXY_README SOHO_README SQLITE_README \
- STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \
- TLS_README TUNING_README UUCP_README VERP_README \
- VIRTUAL_README XCLIENT_README XFORWARD_README
-
-# not installed:
-# CYRUS_README CDB_README INSTALL
-# LINUX_README PACKAGE_README ULTRIX_README
-
+.include "../readme.mk"
+FILES= ${PFIX_README_FILES}
.endif
.include <bsd.prog.mk>
Index: src/external/ibm-public/postfix/share/html/Makefile
diff -u src/external/ibm-public/postfix/share/html/Makefile:1.8 src/external/ibm-public/postfix/share/html/Makefile:1.9
--- src/external/ibm-public/postfix/share/html/Makefile:1.8 Sun Jul 6 21:14:43 2014
+++ src/external/ibm-public/postfix/share/html/Makefile Sun Jul 20 15:58:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/07/06 21:14:43 tron Exp $
+# $NetBSD: Makefile,v 1.9 2014/07/20 15:58:06 tron Exp $
.include <bsd.own.mk>
@@ -27,25 +27,11 @@ PFX_CONFIG= access.5.html aliases.5.html
regexp_table.5.html relocated.5.html sqlite_table.5.html \
transport.5.html virtual.5.html postfix-wrapper.5.html \
postfix-manuals.html memcache_table.5.html
-PFX_READMES= ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html \
- ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html \
- BASIC_CONFIGURATION_README.html BUILTIN_FILTER_README.html \
- CONNECTION_CACHE_README.html \
- CONTENT_INSPECTION_README.html DATABASE_README.html DB_README.html \
- DEBUG_README.html DSN_README.html ETRN_README.html FILTER_README.html \
- FORWARD_SECRECY_README.html IPV6_README.html \
- LDAP_README.html LMDB_README.html \
- LOCAL_RECIPIENT_README.html MAILDROP_README.html MEMCACHE_README.html \
- MILTER_README.html MULTI_INSTANCE_README.html MYSQL_README.html \
- NFS_README.html OVERVIEW.html PCRE_README.html \
- PGSQL_README.html POSTSCREEN_README.html QSHAPE_README.html \
- RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \
- SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \
- SMTPD_PROXY_README.html SOHO_README.html SQLITE_README.html \
- STANDARD_CONFIGURATION_README.html STRESS_README.html \
- TLS_LEGACY_README.html TLS_README.html TUNING_README.html \
- UUCP_README.html VERP_README.html VIRTUAL_README.html \
- XCLIENT_README.html XFORWARD_README.html
+
+.include "../readme.mk"
+.for PFX_README in ${PFIX_README_FILES}
+PFX_READMES+= ${PFX_README}.html
+.endfor
FILES= $(PFX_DAEMONS) $(PFX_COMMANDS) $(PFX_CONFIG) $(PFX_READMES) \
index.html postconf.5.html OVERVIEW.html postfix-logo.jpg
@@ -55,10 +41,6 @@ SYMLINKS+=bounce.8.html ${BINDIR}/trace.
SYMLINKS+=sendmail.1.html ${BINDIR}/mailq.1.html
SYMLINKS+=sendmail.1.html ${BINDIR}/newaliases.1.html
-# not installed:
-# CDB_README.html INSTALL.html LINUX_README.html PACKAGE_README.html
-# qmqpd.8.html qmqp-source.1.html qmqp-sink.1.html
-
.endif # }
.include <bsd.prog.mk>
Added files:
Index: src/external/ibm-public/postfix/share/readme.mk
diff -u /dev/null src/external/ibm-public/postfix/share/readme.mk:1.1
--- /dev/null Sun Jul 20 15:58:07 2014
+++ src/external/ibm-public/postfix/share/readme.mk Sun Jul 20 15:58:06 2014
@@ -0,0 +1,22 @@
+# $NetBSD: readme.mk,v 1.1 2014/07/20 15:58:06 tron Exp $
+
+PFIX_README_FILES= AAAREADME ADDRESS_CLASS_README \
+ ADDRESS_REWRITING_README ADDRESS_VERIFICATION_README \
+ BACKSCATTER_README BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
+ CONNECTION_CACHE_README CONTENT_INSPECTION_README \
+ DATABASE_README DB_README DEBUG_README DSN_README ETRN_README \
+ FILTER_README FORWARD_SECRECY_README IPV6_README LDAP_README \
+ LOCAL_RECIPIENT_README MAILDROP_README \
+ MEMCACHE_README MILTER_README MULTI_INSTANCE_README \
+ NFS_README OVERVIEW POSTSCREEN_README \
+ RELEASE_NOTES RESTRICTION_CLASS_README \
+ SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
+ SMTPD_PROXY_README SOHO_README SQLITE_README \
+ STANDARD_CONFIGURATION_README STRESS_README TLS_LEGACY_README \
+ TLS_README TUNING_README UUCP_README VERP_README \
+ VIRTUAL_README XCLIENT_README XFORWARD_README
+
+# Not installed:
+# CDB_README, CYRUS_README, INSTALL, LINUX_README, LMDB_README,
+# MYSQL_README, PACKAGE_README, PCRE_README, PGSQL_README, QMQP_README,
+# QSHAPE_README, ULTRIX_README
