Long-overdue cosmetic cleanups.

18 files changed, 4 insertions, 187 deletions

diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 235f284f55cf..377f5056bf31 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	ade@FreeBSD.org
 COMMENT=	Automatically configure source code on many Un*x platforms (legacy 2.13 version)
 
 DEPRECATED=	Please use devel/autoconf259 instead
-EXPIRATION_DATE=31st December 2004
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
@@ -33,16 +32,6 @@ CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 WRKSRC=		${WRKDIR}/autoconf
 
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
 post-patch:
 	@${RM} ${WRKSRC}/*.info* >/dev/null 2>&1 || true
 
diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile
index dd8682bda78c..99004bf717ad 100644
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	ade@FreeBSD.org
 COMMENT=	Automatically configure source code on many Un*x platforms (version 2.53)
 
 DEPRECATED=	Please use devel/autoconf259 instead
-EXPIRATION_DATE=31st December 2004
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
@@ -42,16 +41,6 @@ MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
 MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
 	@(cd ${WRKSRC}/man && \
diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile
index c0abfdc5c25a..a4d570063b67 100644
--- a/devel/autoconf259/Makefile
+++ b/devel/autoconf259/Makefile
@@ -41,16 +41,6 @@ MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
 MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
 	@(cd ${WRKSRC}/man && \
diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile
index c0abfdc5c25a..a4d570063b67 100644
--- a/devel/autoconf26/Makefile
+++ b/devel/autoconf26/Makefile
@@ -41,16 +41,6 @@ MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
 MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
 	@(cd ${WRKSRC}/man && \
diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile
index c0abfdc5c25a..a4d570063b67 100644
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@@ -41,16 +41,6 @@ MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
 MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
 	@(cd ${WRKSRC}/man && \
diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile
index c0abfdc5c25a..a4d570063b67 100644
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@@ -41,16 +41,6 @@ MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
 MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
 	@(cd ${WRKSRC}/man && \
diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile
index c0abfdc5c25a..a4d570063b67 100644
--- a/devel/autoconf267/Makefile
+++ b/devel/autoconf267/Makefile
@@ -41,16 +41,6 @@ MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
 MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
 	@(cd ${WRKSRC}/man && \
diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile
index c0abfdc5c25a..a4d570063b67 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@@ -41,16 +41,6 @@ MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
 MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
 	@(cd ${WRKSRC}/man && \
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 5cd9d41e31cc..f7e72ae75b79 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -29,16 +29,6 @@ CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
-.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-
 post-patch:
 	@(cd ${WRKSRC}/doc && \
 		${RM} -f *.info && \
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 4345b76831ce..c43427fc9bba 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -17,8 +17,9 @@ MAINTAINER=	ade@FreeBSD.org
 COMMENT=	GNU Standards-compliant Makefile generator (legacy version 1.4)
 
 DEPRECATED=	Please use devel/automake18 instead
-EXPIRATION_DATE=31st December 2004
 
+WANT_AUTOCONF_VER=213
+WANT_AUTOCONF_RUN=yes
 BUILD_VERSION=	14
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 LATEST_LINK=	automake${BUILD_VERSION}
@@ -30,16 +31,6 @@ USE_REINPLACE=	yes
 
 STRIP=		# none
 
-.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-
 post-patch:
 	@${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake${BUILD_VERSION}.texi
 	@${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi >/dev/null 2>&1 || true
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index 0797bca7bb21..531776cda3e3 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -17,10 +17,9 @@ MAINTAINER=	ade@FreeBSD.org
 COMMENT=	GNU Standards-compliant Makefile generator (version 1.5)
 
 DEPRECATED=	Please use devel/automake18 instead
-EXPIRATION_DATE=31st December 2004
 
-WANT_AUTOCONF_VER=yes
-WANT_AUTOCONF_RUN=253
+WANT_AUTOCONF_VER=253
+WANT_AUTOCONF_RUN=yes
 BUILD_VERSION=	15
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 LATEST_LINK=	automake${BUILD_VERSION}
@@ -31,16 +30,6 @@ CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
-.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-
 post-patch:
 	@(cd ${WRKSRC} && \
 		${RM} -f *.info && \
diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile
index 5cd9d41e31cc..f7e72ae75b79 100644
--- a/devel/automake18/Makefile
+++ b/devel/automake18/Makefile
@@ -29,16 +29,6 @@ CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
-.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-
 post-patch:
 	@(cd ${WRKSRC}/doc && \
 		${RM} -f *.info && \
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 5cd9d41e31cc..f7e72ae75b79 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -29,16 +29,6 @@ CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
-.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-
 post-patch:
 	@(cd ${WRKSRC}/doc && \
 		${RM} -f *.info && \
diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile
index c0abfdc5c25a..a4d570063b67 100644
--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@@ -41,16 +41,6 @@ MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
 		autoupdate config.guess config.sub ifnames
 MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
 
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
 	@(cd ${WRKSRC}/man && \
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 5cd9d41e31cc..f7e72ae75b79 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -29,16 +29,6 @@ CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
-.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-
 post-patch:
 	@(cd ${WRKSRC}/doc && \
 		${RM} -f *.info && \
diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index ebae39062f05..8ba2601a7d08 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -26,16 +26,6 @@ CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
-.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
-
 post-patch:
 	@(cd ${WRKSRC}/doc && \
 		${RM} -f *.info* && \
diff --git a/devel/libtool13/Makefile b/devel/libtool13/Makefile
index dc36a576717f..9049a0ea2266 100644
--- a/devel/libtool13/Makefile
+++ b/devel/libtool13/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	ade@FreeBSD.org
 COMMENT=	Generic shared library support script (version 1.3)
 
 DEPRECATED=	Please use devel/libtool15 instead
-EXPIRATION_DATE=31st December 2004
 
 BUILD_VERSION=	13
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
@@ -29,16 +28,6 @@ CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
-.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
-
 post-patch:
 	@(cd ${WRKSRC}/doc && \
 		${RM} -f *.info* && \
diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index ebae39062f05..8ba2601a7d08 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -26,16 +26,6 @@ CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
-.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
-
 post-patch:
 	@(cd ${WRKSRC}/doc && \
 		${RM} -f *.info* && \