11 files changed, 22 insertions, 11 deletions

diff --git a/chinese/stardict/Makefile b/chinese/stardict/Makefile
index 99bc2d32b8e4..776772a0e58e 100644
--- a/chinese/stardict/Makefile
+++ b/chinese/stardict/Makefile
@@ -25,7 +25,8 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
 BROKEN=		"Incorrect distinfo"
-DEPRECATED=	"Will be removed after April 7 if still broken"
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2004-04-07
 
 port-install:
 	strip	$(PREFIX)/bin/${PORTNAME}
diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile
index da7c0fa9d2d5..2d34cf01920a 100644
--- a/databases/postgresql-plruby/Makefile
+++ b/databases/postgresql-plruby/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	pq.3:${PGSQL_PORTDIR}
 RUN_DEPENDS=	postgres:${PORTSDIR}/${POSTGRESQL_PORT}
 
 BROKEN=		"Does not compile"
-DEPRECATED=	"Will be removed after April 15"
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2004-04-15
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/lang/stackless_python/Makefile b/lang/stackless_python/Makefile
index 706d08004277..1da2729b8956 100644
--- a/lang/stackless_python/Makefile
+++ b/lang/stackless_python/Makefile
@@ -29,7 +29,8 @@ DESCR=		${.CURDIR}/pkg-descr
 MD5_FILE=	${.CURDIR}/distinfo
 PLIST=		${WRKDIR}/pkg-plist
 BROKEN=		"not ported to Python-2.2.3 yet"
-DEPRECATED=	"Will be removed after April 7 if still broken"
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2004-04-07
 
 #post-patch:
 #	@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
diff --git a/math/mupad/Makefile b/math/mupad/Makefile
index ae87fadab72e..25e4541aebd5 100644
--- a/math/mupad/Makefile
+++ b/math/mupad/Makefile
@@ -25,7 +25,8 @@ RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linu
 		${LINUXBASE}/usr/lib/libungif.so.4:${PORTSDIR}/graphics/linux-ungif
 
 BROKEN=		"Checksum mismatch"
-DEPRECATED=	"This port will be removed on April 16 if still broken at that time."
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2004-04-16
 NO_CDROM=	"unsure to sell for profit"
 
 USE_LINUX=		yes
diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile
index 64f759c57c6e..c090caa06f49 100644
--- a/multimedia/netshow/Makefile
+++ b/multimedia/netshow/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	dburr@FreeBSD.org
 COMMENT=	Microsoft NetShow video stream player
 
 BROKEN=		"Checksum mismatch"
-DEPRECATED=	"This port will be removed on April 16 if still broken at that time."
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2004-04-16
 
 RESTRICTED=	"Commercial software"
 
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index d38b4e4d8d39..1133926979d7 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -32,7 +32,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 BROKEN=		"Broken pkg-plist"
-DEPRECATED=     "Will be removed after April 7 if still broken"
+DEPRECATED=     ${BROKEN}
+EXPIRATION_DATE=2004-04-07
 
 pre-configure:
 	cd ${WRKSRC} && ${ACLOCAL} -I ${LIBTOOL_SHAREDIR}/libltdl
diff --git a/net/gale/Makefile b/net/gale/Makefile
index d38b4e4d8d39..1133926979d7 100644
--- a/net/gale/Makefile
+++ b/net/gale/Makefile
@@ -32,7 +32,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 BROKEN=		"Broken pkg-plist"
-DEPRECATED=     "Will be removed after April 7 if still broken"
+DEPRECATED=     ${BROKEN}
+EXPIRATION_DATE=2004-04-07
 
 pre-configure:
 	cd ${WRKSRC} && ${ACLOCAL} -I ${LIBTOOL_SHAREDIR}/libltdl
diff --git a/net/hawk/Makefile b/net/hawk/Makefile
index df067d1fd9ba..b3cd6a5b88d6 100644
--- a/net/hawk/Makefile
+++ b/net/hawk/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	php-config:${PORTSDIR}/www/mod_php4 \
 		${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net/p5-Net-Netmask
 
 BROKEN=		"Inconsistent dependencies (mysql-client 3.x and 4.x)"
-DEPRECATED=	"This port will be removed on April 15 if still broken."
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2004-04-15
 
 do-patch:
 	@${SED} -e 's#dirname.*"/hawk#"${PREFIX}/etc/hawk/daemon#' \
diff --git a/net/ruby-jabber4r/Makefile b/net/ruby-jabber4r/Makefile
index 3b5787d3ed62..dc0c29fb2d98 100644
--- a/net/ruby-jabber4r/Makefile
+++ b/net/ruby-jabber4r/Makefile
@@ -25,7 +25,8 @@ DOCS=		LICENSE.txt README doc
 EXAMPLES=	examples/*
 
 BROKEN=		"Broken pkg-plist"
-DEPRECATED=	"This port will be removed after April 15 if still broken at that time."
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2004-04-15
 
 .include <bsd.port.pre.mk>
 
diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index 103e895d3de5..7625ea70aa37 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -24,7 +24,8 @@ COMMENT=	Collection of tools supporting C and C++ programming for Palm OS
 BUILD_DEPENDS=	${LOCALBASE}/bin/autoheader:${PORTSDIR}/devel/autoconf
 
 BROKEN=		"Patch fails"
-DEPRECATED=	"Will be removed after April 15 if still broken."
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2004-04-15
 
 # it is unknown whether it could actually be made to work elsewhere,
 # but right now it does not.
diff --git a/www/scoop/Makefile b/www/scoop/Makefile
index ef3f3ae83341..bc17b0258360 100644
--- a/www/scoop/Makefile
+++ b/www/scoop/Makefile
@@ -42,7 +42,8 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql323-server \
 NO_BUILD=yes
 
 BROKEN=		"Inconsistent dependencies (mysql-client 3.x and 4.x)"
-DEPRECATED=	"Will be removed on April 16 if still broken at that time."
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2004-04-16
 
 do-install:
 	@${MKDIR} ${PREFIX}/www/scoop