Bring these up to date with what is currently being tested on the cluster.

3 files changed, 10 insertions, 77 deletions

diff --git a/devel/portmk/Mk/bsd.autotools.mk b/devel/portmk/Mk/bsd.autotools.mk
index 92674991da58..8dbe0c9475c8 100644
--- a/devel/portmk/Mk/bsd.autotools.mk
+++ b/devel/portmk/Mk/bsd.autotools.mk
@@ -26,73 +26,6 @@ Autotools_Include_MAINTAINER=	ade@FreeBSD.org
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
-# Compatibility shims for the old method of using autotools.  These are
-# slated for removal on January 1st 2006
-#---------------------------------------------------------------------------
-
-USE_AUTOTOOLS_COMPAT=
-
-.if defined(USE_AUTOMAKE_VER)
-USE_AUTOTOOLS_COMPAT+=	automake:${USE_AUTOMAKE_VER}
-.endif
-
-.if defined(WANT_AUTOMAKE_VER)
-USE_AUTOTOOLS_COMPAT+=	automake:${WANT_AUTOMAKE_VER}:env
-.endif
-
-.if defined(USE_ACLOCAL_VER)
-USE_AUTOTOOLS_COMPAT+=	aclocal:${USE_ACLOCAL_VER}
-.endif
-
-.if defined(USE_AUTOHEADER_VER)
-USE_AUTOTOOLS_COMPAT+=	autoheader:${USE_AUTOHEADER_VER}
-.endif
-
-.if defined(USE_AUTOCONF_VER)
-USE_AUTOTOOLS_COMPAT+=	autoconf:${USE_AUTOCONF_VER}
-.endif
-
-.if defined(WANT_AUTOCONF_VER)
-USE_AUTOTOOLS_COMPAT+=	autoconf:${WANT_AUTOCONF_VER}:env
-.endif
-
-.if defined(USE_LIBLTDL)
-USE_AUTOTOOLS_COMPAT+=	libltdl:15
-.endif
-
-.if defined(USE_LIBTOOL_VER)
-USE_AUTOTOOLS_COMPAT+=	libtool:${USE_LIBTOOL_VER}
-.endif
-
-.if defined(USE_INC_LIBTOOL_VER)
-USE_AUTOTOOLS_COMPAT+=	libtool:${USE_INC_LIBTOOL_VER}:inc
-.endif
-
-.if defined(WANT_LIBTOOL_VER)
-USE_AUTOTOOLS_COMPAT+=	libtool:${WANT_LIBTOOL_VER}:env
-.endif
-
-# Ensure that we're not mixing and matching old and new systems
-#
-.if ${USE_AUTOTOOLS_COMPAT}!=""
-. if defined(USE_AUTOTOOLS)
-BROKEN+=	Mix and match of old and new autotools system prohibited
-. else
-USE_AUTOTOOLS=	${USE_AUTOTOOLS_COMPAT}
-_AUTOTOOLS_PN=	${.CURDIR:C/${PORTSDIR}\///}
-pre-everything::
-	@${ECHO} "*** AUTOTOOLS WARNING for ${_AUTOTOOLS_PN}"
-	@${ECHO} "This port is using old autotools constructs which will be"
-	@${ECHO} "disappearing on 1st January 2006"
-	@${ECHO} ""
-	@${ECHO} "In most cases, this warning can be fixed by removing"
-	@${ECHO} "all the old constructs and replacing them with:"
-	@${ECHO} "  USE_AUTOTOOLS= ${USE_AUTOTOOLS_COMPAT}"
-	@${ECHO} ""
-. endif
-.endif
-
-#---------------------------------------------------------------------------
 # Entry point into the autotools system
 #---------------------------------------------------------------------------
 #
@@ -338,8 +271,8 @@ ${item:U}_ENV+=	${AUTOTOOLS_VARS}
 # the order of autotools running.
 
 .if !target(run-autotools)
-run-autotools:: run-autotools-aclocal patch-autotools run-autotools-automake \
-		run-autotools-autoconf run-autotools-autoheader
+run-autotools:: run-autotools-aclocal patch-autotools run-autotools-autoheader \
+		run-autotools-autoconf run-autotools-automake
 .endif
 
 .if !target(run-autotools-aclocal)
diff --git a/devel/portmk/Mk/bsd.gnome.mk b/devel/portmk/Mk/bsd.gnome.mk
index 9ce224b85ad4..5985dbac4dee 100644
--- a/devel/portmk/Mk/bsd.gnome.mk
+++ b/devel/portmk/Mk/bsd.gnome.mk
@@ -702,7 +702,7 @@ PLIST_SUB+=	GNOMEDESKTOP:="@comment " NOGNOMEDESKTOP:=""
 .endif
 
 .if ${MAINTAINER}=="gnome@FreeBSD.org"
-CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http://www.freebsd.org/gnome/gnomelogalyzer.sh\", which will diagnose the problem and suggest a solution. If - and only if - the gnomelogalyzer cannot solve the problem, report the build failure to the FreeBSD GNOME team at ${MAINTAINER}, and attach (a) \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\", (b) the output of the failure of the make command, and (c) the gnomelogalyzer output. Also, it might be a good idea to provide an overview of all packages installed on your system (i.e. an \`ls ${PKG_DBDIR}\`)."
+CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http://www.freebsd.org/gnome/gnomelogalyzer.sh\", which will diagnose the problem and suggest a solution. If - and only if - the gnomelogalyzer cannot solve the problem, report the build failure to the FreeBSD GNOME team at ${MAINTAINER}, and attach (a) \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\", (b) the output of the failed make command, and (c) the gnomelogalyzer output. Also, it might be a good idea to provide an overview of all packages installed on your system (i.e. an \`ls ${PKG_DBDIR}\`). Make sure to put your attachment in either website, copy-n-paste in http://freebsd-gnome.pastebin.com, or send-pr with attachment. Try to avoid send any attachment to the mailing list (${MAINTAINER}), attachments sent to FreeBSD mailing lists are usually discarded by the mailing list software."
 .endif
 
 
diff --git a/devel/portmk/Mk/bsd.port.mk b/devel/portmk/Mk/bsd.port.mk
index c1c676097299..cdb65fe66683 100644
--- a/devel/portmk/Mk/bsd.port.mk
+++ b/devel/portmk/Mk/bsd.port.mk
@@ -466,7 +466,7 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # 				  ${PREFIX}/etc/rc.d and added to the packing list.
 # 				  pairs will be added to ${SUB_LIST}. These files will be
 # 				  installed in ${PREFIX}/etc/rc.d and added to the packing list.
-# USE_RCORDER		- List of rcNG startup scripts to be called early in the boot
+# USE_RCORDER	- List of rc.d startup scripts to be called early in the boot
 # 				  process. This acts exactly like USE_RC_SUBR except that
 # 				  scripts are installed in /etc/rc.d.
 # RC_SUBR		- Set to path of rc.subr.
@@ -3355,6 +3355,7 @@ patch-dos2unix:
 	@${ECHO_MSG} "===>   Converting DOS text file to UNIX text file: ${f}"
 	@${REINPLACE_CMD} -i"" -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/${f}
 .endfor
+.endif
 .else
 	${DO_NADA}
 .endif
@@ -3363,7 +3364,6 @@ patch-dos2unix:
 .if !target(do-patch)
 do-patch:
 .if defined(PATCHFILES)
-.endif
 	@${ECHO_MSG} "===>  Applying distribution patches for ${PKGNAME}"
 	@(cd ${_DISTDIR}; \
 	  for i in ${_PATCHFILES}; do \
@@ -3837,9 +3837,9 @@ security-check:
 			${ECHO_MSG}; \
 		fi; \
 		${ECHO_MSG} "      If there are vulnerabilities in these programs there may be a security"; \
-		${ECHO_MSG} "      risk to the system. FreeBSD makes no guarantee about the security of"; \
-		${ECHO_MSG} "      ports included in the Ports Collection. Please type 'make deinstall'"; \
-		${ECHO_MSG} "      to deinstall the port if this is a concern."; \
+		${ECHO_MSG} "      risk to the system. The FreeBSD Project makes no guarantee about the"; \
+		${ECHO_MSG} "      security of ports included in the Ports Collection."; \
+		${ECHO_MSG} "      Please type 'make deinstall' to deinstall the port if this is a concern."; \
 		www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \
 	    if [ ! -z "$${www_site}" ]; then \
 			${ECHO_MSG}; \
@@ -5192,7 +5192,7 @@ add-plist-post:
 install-rc-script:
 .if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
 .if defined(USE_RCORDER)
-	@${ECHO_CMD} "===> Installing early rcNG startup script(s)"
+	@${ECHO_CMD} "===> Installing early rc.d startup script(s)"
 	@${ECHO_CMD} "@cwd /" >> ${TMPPLIST}
 	@for i in ${USE_RCORDER}; do \
 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \
@@ -5201,7 +5201,7 @@ install-rc-script:
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
 .endif
 .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
-	@${ECHO_CMD} "===> Installing rcNG startup script(s)"
+	@${ECHO_CMD} "===> Installing rc.d startup script(s)"
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
 .if ${OSVERSION} >= 700007
 	@for i in ${USE_RC_SUBR}; do \