Ticket #12312: doc.patch

base/configure

@@ -11689 +11689 @@
 
 
 # Output
-ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
+ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf scripts/autovars.sed src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
 
 
 cat >confcache <<\_ACEOF
@@ -12252 +12252 @@
     "doc/prefix.mtree") CONFIG_FILES="$CONFIG_FILES doc/prefix.mtree" ;;
     "doc/macosx.mtree") CONFIG_FILES="$CONFIG_FILES doc/macosx.mtree" ;;
     "doc/macports.conf") CONFIG_FILES="$CONFIG_FILES doc/macports.conf" ;;
+    "scripts/autovars.sed") CONFIG_FILES="$CONFIG_FILES scripts/autovars.sed" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
     "src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;

base/configure.ac

@@ -274 +274 @@
         doc/prefix.mtree
         doc/macosx.mtree
         doc/macports.conf
+        scripts/autovars.sed
         src/Makefile
         src/macports1.0/macports_autoconf.tcl
         src/tclobjc1.0/Makefile

base/doc/Makefile

@@ +1 @@
+MAN1=           port.1
 MAN5=           macports.conf.5
 MAN7=           portfile.7 portstyle.7 porthier.7 portgroup.7
+SUBST_MAN=      port.1 macports.conf.5 porthier.7
 INSTALLDIR=     ${DESTDIR}${prefix}
 TOPSRCDIR=      ..
 
+edit = sed -f ${TOPSRCDIR}/scripts/autovars.sed
+
 ifneq ($(MAKECMDGOALS),distclean)
 include ../Mk/macports.autoconf.mk
 endif
 
-all:
+all: ${SUBST_MAN}
+
+port.1: port.1.in
+        ${edit} port.1.in > $@
+
+macports.conf.5: macports.conf.5.in
+        ${edit} macports.conf.5.in > $@
+
+porthier.7: porthier.7.in
+        ${edit} porthier.7.in > $@
 
 clean:
+        rm -f ${SUBST_MAN}
 
 test:
 

(a) a/base/doc/macports.conf.5 vs. (b) b/base/doc/macports.conf.5.in

@@ -54 +54 @@
 characters should be avoided, as this can broke some ports. This key is often referred to as '${prefix}'.
 .br
 .Ic Default:
-/opt/local
+@prefix_expanded@
 .It Va x11prefix
 Path containing an X11 installation on your system.
 .br
@@ -65 +65 @@
 and the main registry. Same path restrictions apply as for '${prefix}'.
 .br
 .Ic Default:
-${prefix}/var/macports
+@localstatedir_expanded@/macports
 .It Va portdbformat
 Storage type to use for the MacPorts registry. Currently the only supportted format is "flat".
 .br
@@ -94 +94 @@
 commnand) and any other local tree(s) you might have.
 .br
 .Ic Default:
-${prefix}/etc/macports/sources.conf
+@MPCONFIGDIR_EXPANDED@/sources.conf
 .It Va variants_conf
 Location of the optional global variants definition file, listing those that should be used in all installed
 ports if available.
 .br
 .Ic Default:
-${prefix}/etc/macports/variants.conf
+@MPCONFIGDIR_EXPANDED@/variants.conf
 .It Va portarchivemode
 Key governing the creation of binary archives of installed ports for installation/reinstallation ease.
 .br
@@ -129 +129 @@
 .It Va startupitem_type
 Set the default type of startupitems to be generated, overridable by Portfiles that explicitly state a
 startupitem.type key. If set to "default", then a type will be selected that's appropriate to the OS.
-Supported types are: SystemStarter, launchd, default, rcNG.
+Supported types are: SystemStarter, launchd, default, rcng.
 .br
 .Ic Default:
 default
@@ -167 +167 @@
 .El
 .Sh FILES
 .Bl -tag -width
-.It Va ${prefix}/etc/macports/macports.conf
+.It Va @MPCONFIGDIR_EXPANDED@/macports.conf
 Standard system-wide MacPorts configuration file.
 .It Va ~/.macports/macports.conf
 User-specific configuration override. This file, if found, will be used instead of the default file at
-${prefix}/etc/macports/macports.conf.
+@MPCONFIGDIR_EXPANDED@/macports.conf.
 .El
 .Sh SEE ALSO
 .Xr port 1 ,

(a) a/base/doc/port.1 vs. (b) b/base/doc/port.1.in

@@ -516 +516 @@
 .Pp
 .Sh FILES
 .Bl -tag -width
-.It Va ${prefix}/etc/macports/macports.conf
+.It Va @MPCONFIGDIR_EXPANDED@/macports.conf
 Global configuration file for the MacPorts system.
-.It Va ${prefix}/etc/macports/sources.conf
+.It Va @MPCONFIGDIR_EXPANDED@/sources.conf
 Global listing of the ports trees used by MacPorts. This file also enables rsync synchronization.
-.It Va ${prefix}/etc/macports/variants.conf
+.It Va @MPCONFIGDIR_EXPANDED@/variants.conf
 Global variants used when a port is installed.
 .It Va ~/.macports/macports.conf
 User configuration file for the MacPorts system. It overrides the global

(a) a/base/doc/porthier.7 vs. (b) b/base/doc/porthier.7.in

@@ -39 +39 @@
 .Sh DESCRIPTION
 A sketch of the filesystem hierarchy as it is applied on ports being distributed by MacPorts.
 .Bl -tag -width "/Applications/"
-.It Pa ${prefix}/
-The base of the MacPorts filesystem hierarchy. By default set to "/opt/local/"
+.It Pa @prefix@/
+The base of the MacPorts filesystem hierarchy. Often referred to as ${prefix}
 .Pp
 .Bl -tag -width "include/"
 .It Pa bin/
@@ -71 +71 @@
 localization files
 .It Pa man/
 manual pages
+.It Pa macports/
+various MacPorts scripts
 .It Pa misc/
 misc system-wide ASCII text files
 .El
@@ -94 +96 @@
 Holds the registry information and receipts for the installed ports
 .It Pa software/
 In Image-mode (which is default) Holds the installed files. These
-are linked to ${prefix}.
+are hard-linked into ${prefix}.
 .It Pa sources/
 Holds the sources of both the porttree (the Portfiles) and the
 sources for the base system
@@ -119 +121 @@
 .El
 .It Pa /Applications/MacPorts/
 Native Mac OS X applications
+.It Pa @TCL_PACKAGE_DIR@/macports1.0/
+macports Tcl package
 .It Pa /Library/Frameworks/
 Native Mac OS X Library Frameworks
 .Pp

new file ase/scripts/autovars.sed.in

@@ +1 @@
+s,@prefix\@,@prefix@,g
+s,@prefix_expanded\@,@prefix_expanded@,g
+s,@MPCONFIGDIR_EXPANDED\@,@MPCONFIGDIR_EXPANDED@,g
+s,@localstatedir_expanded\@,@localstatedir_expanded@,g
+s,@TCL_PACKAGE_DIR\@,@TCL_PACKAGE_DIR@,g