Replace references to pkg_add with pkg install

Replace links to pkg_add man page with links to pkg-install
Remove references to manually downloading packages, or specifying an ftp url
Remove link to pointyhat that no longer resolves
Update the svnweb link to point directly to the ports tree
use &base; entity everywhere
Use https where applicable

PR:		193370
Reviewed by:	gavin
Approved by:	bcr
Sponsored by:	ScaleEngine Inc.
CR:		D732

2 files changed, 14 insertions, 20 deletions

diff --git a/en_US.ISO8859-1/htdocs/ports/index.xml b/en_US.ISO8859-1/htdocs/ports/index.xml
index 94313e6735..9a5ef70f1b 100644
--- a/en_US.ISO8859-1/htdocs/ports/index.xml
+++ b/en_US.ISO8859-1/htdocs/ports/index.xml
@@ -43,7 +43,7 @@ be committed.
 contains any patches necessary to make the original application source
 code compile and run on FreeBSD.  Installing an application is as
 simple as typing
-<tt><a href="http://www.freebsd.org/cgi/man.cgi?query=make">make</a>
+<tt><a href="&base;/cgi/man.cgi?query=make">make</a>
 install</tt>
 in the port directory.  If you
 download the framework for the entire list of ports by installing the
@@ -56,20 +56,18 @@ thousands of applications right at your fingertips.
 <p>
 Each port's <tt>Makefile</tt> automatically fetches the
 application source code, either from a local disk, CD-ROM or via
-<a href="http://www.freebsd.org/cgi/man.cgi?query=ftp"><tt>ftp</tt></a>,
+<a href="&base;/cgi/man.cgi?query=ftp"><tt>ftp</tt></a>,
 unpacks it on your system, applies the patches, and compiles.  If
 all went well, a simple <tt>make install</tt> will install the
 application and register it with the package system.</p>
 
 <p>For most ports, a precompiled <tt>package</tt> also exists, saving
-the user the work of having to compile anything at all.  Each port
-contains a link to its corresponding package and you may either simply
-download that file and then run the
-<a href="http://www.freebsd.org/cgi/man.cgi?query=pkg_add"><tt>pkg_add</tt></a>
-command
-on it or you can simply grab the link location and hand it straight
-to <tt>pkg_add</tt> since it is capable of accepting FTP URLs as
-well as filenames.</p>
+the user the work and time of having to compile anything at all.  Use
+<a href="&base;/cgi/man.cgi?query=pkg-install"><tt>pkg
+install</tt></a> to securely download and install the precompiled
+version of a port.  For more information see <a
+href="&base;/doc/en_US.ISO8859-1/books/handbook/pkgng-intro.html">Using
+pkg for Binary Package Management</a></p>
 
 </body>
 </html>
diff --git a/en_US.ISO8859-1/htdocs/ports/references.xml b/en_US.ISO8859-1/htdocs/ports/references.xml
index 611ffd33e6..ecdee36703 100644
--- a/en_US.ISO8859-1/htdocs/ports/references.xml
+++ b/en_US.ISO8859-1/htdocs/ports/references.xml
@@ -39,7 +39,7 @@
 
 <ul>
   <li>The archives of the
-    <a href="http://docs.FreeBSD.org/mail/current/freebsd-ports.html">
+    <a href="https://docs.FreeBSD.org/mail/current/freebsd-ports.html">
     FreeBSD ports mailing list</a>.
   </li>
 
@@ -63,28 +63,24 @@
 
   <li>The manual pages for
     <a href="&base;/cgi/man.cgi?query=ftp"><tt>ftp</tt></a>,
-    <a href="&base;/cgi/man.cgi?query=pkg_add"><tt>pkg_add</tt></a>, and
+    <a href="&base;/cgi/man.cgi?query=pkg&sektion=8"><tt>pkg</tt></a>, and
     <a href="&base;/cgi/man.cgi?query=ports"><tt>ports</tt></a>.
   </li>
 
   <li>The
-    <a href="http://pointyhat.FreeBSD.org">ports and packages build cluster</a>.
-  </li>
-
-  <li>The
     <a href="&base;/portmgr/">Ports Management Team</a> (portmgr) pages.
   </li>
 
   <li>The
-    <a href="http://svnweb.FreeBSD.org">
+    <a href="https://svnweb.FreeBSD.org/ports">
     Web Interface to the Source Repository</a>
     allows you to browse the files in the source repository.  Changes
     that affect the entire port system are now documented in the
-    <a href="http://svnweb.FreeBSD.org/ports/head/CHANGES?view=markup">CHANGES</a> file.
+    <a href="https://svnweb.FreeBSD.org/ports/head/CHANGES?view=markup">CHANGES</a> file.
     Changes that affect individual ports are now documented in the
-    <a href="http://svnweb.FreeBSD.org/ports/head/UPDATING?view=markup">UPDATING</a> file.
+    <a href="https://svnweb.FreeBSD.org/ports/head/UPDATING?view=markup">UPDATING</a> file.
     However, the definitive answer to any question is undoubtedly to read
-    the source code of <a href="http://svnweb.FreeBSD.org/ports/head/Mk/bsd.port.mk?view=markup">
+    the source code of <a href="https://svnweb.FreeBSD.org/ports/head/Mk/bsd.port.mk?view=markup">
     bsd.port.mk</a>, and associated files.
   </li>
 </ul>