- Remove emacs mode, -*- mode: ...; -*- [1]

- Comments for BUILD_ and RUN_DEPENDS fail to mention alternate means to specify dependencie [2]
- Fix make reinstall [3]
- Trivial comment change for PORTDATA [4]

PR:		151954 [1]
		161314 [2]
		167085 [3]
		167465 [4]
Submitted by:	Anonymous <swell.k@gmail.com> [1]
		dougb@ and Chris Rees <utisoft@gmail.com> [2]
		Garrett Cooper <yanegomi@gmail.com> [3]
		"Bryan Drewery" <bryan@shatow.net> [4]
Tested via:	phw

33 files changed, 48 insertions, 40 deletions

diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index eb116e07df36..500d91dd1da7 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk
index 3f110523ba1c..c6042274ab23 100644
--- a/Mk/bsd.autotools.mk
+++ b/Mk/bsd.autotools.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.cmake.mk b/Mk/bsd.cmake.mk
index ad4bf201847d..df0d330daac1 100644
--- a/Mk/bsd.cmake.mk
+++ b/Mk/bsd.cmake.mk
@@ -1,4 +1,4 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # USE_CMAKE		- If set, this port uses cmake.
diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk
index a8013b916492..57649017e919 100644
--- a/Mk/bsd.commands.mk
+++ b/Mk/bsd.commands.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.commands.mk - Common commands used within the ports infrastructure
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 272f7aecd1d1..30ed92fe041c 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -1,4 +1,4 @@
-# -*- mode: Makefile; tab-width: 4; -*-
+# -*- tab-width: 4; -*-
 # ex: ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.destdir.mk b/Mk/bsd.destdir.mk
index 8c3c00539f28..df930c33a4e2 100644
--- a/Mk/bsd.destdir.mk
+++ b/Mk/bsd.destdir.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.destdir.mk - Support for chrooted installation
diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
index 24ad2d28f4eb..9cb9bec5441c 100644
--- a/Mk/bsd.gcc.mk
+++ b/Mk/bsd.gcc.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.gcc.mk - Support for smarter USE_GCC usage.
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 051eebeb3006..3b4dab3c6f84 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # Date created:		12 Nov 2005
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index fec703e804c0..b9691150069e 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index 62bd745a2b77..49bb7842a13f 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.gstreamer.mk - Support for gstreamer-plugins-based ports.
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index f7a54591edb3..df066277b9fe 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.java.mk - Support for Java-based ports.
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index 5eb1cdeb9124..e681324c4294 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -1,4 +1,4 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 4c534c069c14..dfed4d49bb40 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -1,4 +1,4 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk
index 6c70aae308ac..ca978ebbd479 100644
--- a/Mk/bsd.ldap.mk
+++ b/Mk/bsd.ldap.mk
@@ -1,4 +1,4 @@
-# -*- mode: Makefile; tab-width: 4; -*-
+# -*- tab-width: 4; -*-
 # ex: ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.licenses.db.mk b/Mk/bsd.licenses.db.mk
index 967a7df6c378..8d2265f575e7 100644
--- a/Mk/bsd.licenses.db.mk
+++ b/Mk/bsd.licenses.db.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.licenses.mk b/Mk/bsd.licenses.mk
index c5983836fd9a..dd945baf9723 100644
--- a/Mk/bsd.licenses.mk
+++ b/Mk/bsd.licenses.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk
index e9e2b11e76d5..07731972779d 100644
--- a/Mk/bsd.linux-apps.mk
+++ b/Mk/bsd.linux-apps.mk
@@ -1,4 +1,4 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk
index 0c5e1efc7234..f04584eb4c39 100644
--- a/Mk/bsd.linux-rpm.mk
+++ b/Mk/bsd.linux-rpm.mk
@@ -1,7 +1,7 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.26 2011-04-18 13:07:21 netchild Exp $
+# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.27 2012-05-23 08:17:49 miwi Exp $
 #
 
 # Variables:
diff --git a/Mk/bsd.local.mk b/Mk/bsd.local.mk
index dcd510e2330b..4b3cb3c461ff 100644
--- a/Mk/bsd.local.mk
+++ b/Mk/bsd.local.mk
@@ -1,4 +1,4 @@
-# -*- mode: Makefile; tab-width: 4; -*-
+# -*- tab-width: 4; -*-
 # ex: ts=4
 #
 # bsd.local.mk - Sandbox for local modification to ports framework.
diff --git a/Mk/bsd.lua.mk b/Mk/bsd.lua.mk
index c0822648634b..981066bef179 100644
--- a/Mk/bsd.lua.mk
+++ b/Mk/bsd.lua.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.mail.mk b/Mk/bsd.mail.mk
index 052fb071b204..fe5460e50460 100644
--- a/Mk/bsd.mail.mk
+++ b/Mk/bsd.mail.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.octave.mk b/Mk/bsd.octave.mk
index 7c60fe9c8030..892c807bc88a 100644
--- a/Mk/bsd.octave.mk
+++ b/Mk/bsd.octave.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.perl.mk b/Mk/bsd.perl.mk
index 4f1a72c32b61..77248696865b 100644
--- a/Mk/bsd.perl.mk
+++ b/Mk/bsd.perl.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 5e81f05ed511..d9a9c80e41b1 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
@@ -234,7 +234,9 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  $PATH (if it is an executable) and go into "dir" to do
 #				  a "make all install" if it's not found.  If the third
 #				  field ("target") exists, it will be used instead of
-#				  ${DEPENDS_TARGET}.
+#				  ${DEPENDS_TARGET}.  The first field also supports a
+#				  package name with a version range, in the form package>=1.2
+#				  if a particular version is desired.
 # PATCH_DEPENDS	- A list of "path:dir[:target]" tuples of other ports this
 #				  package depends on in the "patch" stage.  "path" is the
 #				  name of a file if it starts with a slash (/), an
@@ -243,7 +245,9 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  $PATH (if it is an executable) and go into "dir" to do
 #				  a "make all install" if it's not found.  If the third
 #				  field ("target") exists, it will be used instead of
-#				  ${DEPENDS_TARGET}.
+#				  ${DEPENDS_TARGET}.  The first field also supports a
+#				  package name with a version range, in the form package>=1.2
+#				  if a particular version is desired.
 # FETCH_DEPENDS	- A list of "path:dir[:target]" tuples of other ports this
 #				  package depends in the "fetch" stage.  "path" is the
 #				  name of a file if it starts with a slash (/), an
@@ -252,7 +256,9 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  it in your $PATH (if it is an executable) and go
 #				  into "dir" to do a "make all install" if it's not
 #				  found.  If the third field ("target") exists, it will
-#				  be used instead of ${DEPENDS_TARGET}.
+#				  be used instead of ${DEPENDS_TARGET}.  The first field
+#				  also supports a package name with a version range, in
+#				  the form package>=1.2 if a particular version is desired.
 # BUILD_DEPENDS	- A list of "path:dir[:target]" tuples of other ports this
 #				  package depends to build (between the "extract" and
 #				  "build" stages, inclusive).  The test done to
@@ -266,7 +272,9 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  "install" stage and the name of the dependency will
 #				  be put into the package as well.  If the third field
 #				  ("target") exists, it will be used instead of
-#				  ${DEPENDS_TARGET}.
+#				  ${DEPENDS_TARGET}.  The first field also supports a
+#				  package name with a version range, in the form package>=1.2
+#				  if a particular version is desired.
 # LIB_DEPENDS	- A list of "lib:dir[:target]" tuples of other ports this
 #				  package depends on.  "lib" is the name of a shared library.
 #				  make will use "ldconfig -r" to search for the library.
@@ -679,7 +687,7 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  installed.
 #				  Useful for dynamically generated examples.
 #
-# Set the following to specify all documentation your port installs into
+# Set the following to specify all files and directories your port installs into
 # ${DATADIR}
 #
 # PORTDATA		- A list of files and directories relative to DATADIR.
@@ -4469,7 +4477,7 @@ checkpatch:
 .if !target(reinstall)
 reinstall:
 	@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
-	@cd ${.CURDIR} && DEPENDS_TARGET="${DEPENDS_TARGET}" ${MAKE} install
+	@cd ${.CURDIR} && DEPENDS_TARGET="${DEPENDS_TARGET}" ${MAKE} -DFORCE_PKG_REGISTER install
 .endif
 
 # Deinstall
diff --git a/Mk/bsd.port.options.mk b/Mk/bsd.port.options.mk
index c09a5a200523..65b1af905461 100644
--- a/Mk/bsd.port.options.mk
+++ b/Mk/bsd.port.options.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.port.options.mk - Allow OPTIONS to determine dependencies
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index 556e9e543fa0..56567fa4c23d 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/Mk/bsd.port.subdir.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index 83d31c38609f..b91934aabf97 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -1,4 +1,4 @@
-# -*- mode: Makefile; tab-width: 4; -*-
+# -*- tab-width: 4; -*-
 # ex: ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index 53890f61eeee..390e5ce07a4c 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -1,4 +1,4 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.scons.mk b/Mk/bsd.scons.mk
index 275b37b26bed..fbf77330d6fa 100644
--- a/Mk/bsd.scons.mk
+++ b/Mk/bsd.scons.mk
@@ -1,4 +1,4 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.sdl.mk b/Mk/bsd.sdl.mk
index d4bbefef4714..ba1077a65b80 100644
--- a/Mk/bsd.sdl.mk
+++ b/Mk/bsd.sdl.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.sdl.mk - Support for SDL-based ports.
diff --git a/Mk/bsd.tcl.mk b/Mk/bsd.tcl.mk
index 7166851ceaab..70477eba10dd 100644
--- a/Mk/bsd.tcl.mk
+++ b/Mk/bsd.tcl.mk
@@ -1,4 +1,4 @@
-# -*- mode: Makefile; tab-width: 4; -*-
+# -*- tab-width: 4; -*-
 # ex: ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk
index ff48883ee134..d6e243d301d6 100644
--- a/Mk/bsd.wx.mk
+++ b/Mk/bsd.wx.mk
@@ -1,4 +1,4 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index ca284fec0324..399eb1879032 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.xorg.mk - Support for X.Org ports and dependencies