47 files changed, 47 insertions, 58 deletions

diff --git a/audio/fcplay/pkg-descr b/audio/fcplay/pkg-descr
index 0c77bd1c9543..43b925f90191 100644
--- a/audio/fcplay/pkg-descr
+++ b/audio/fcplay/pkg-descr
@@ -4,5 +4,4 @@ The author says it was implemented because hardly any FC player available on
 PC (and not even on AMIGA) manages to play back all modules without flaws --
 if at all.
 
-WWW: http://www.geocities.com/SiliconValley/Lakes/5147/mod/
 Tunes: http://exotica.fix.no/
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 493ebb2c5825..0a1d8cc1c6d9 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -14,6 +14,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sec@42.org
 COMMENT=	A Commodore SID-chip emulator library to play SID music files
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
diff --git a/audio/libsidplay/pkg-descr b/audio/libsidplay/pkg-descr
index e2604b8bdbf0..079f59165fc7 100644
--- a/audio/libsidplay/pkg-descr
+++ b/audio/libsidplay/pkg-descr
@@ -13,5 +13,3 @@ performance.
 
 This is just the library. To actually use it, you need one of the
 front-ends like 'sidplay' or 'xsidplay'.
-
-WWW: http://www.geocities.com/SiliconValley/Lakes/5147/index.html
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index 0fd2c8e7f64e..75fb7a1b3280 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -15,6 +15,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sec@42.org
 COMMENT=	A Commodore SID-chip emulator that plays SID music files
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay
 
 CONFIGURE_ARGS=	--with-sidplay-includes=${LOCALBASE}/include \
diff --git a/audio/sidplay/pkg-descr b/audio/sidplay/pkg-descr
index 3850e15fa6a3..fe4d5ff5c721 100644
--- a/audio/sidplay/pkg-descr
+++ b/audio/sidplay/pkg-descr
@@ -10,5 +10,3 @@ directly from the C64. All you need is a supported operating system and
 audio hardware with average PCM waveform playback capabilities. A
 fast CPU and a 16-bit sound card are recommended for better
 performance.
-
-WWW: http://www.geocities.com/SiliconValley/Lakes/5147/index.html
diff --git a/audio/ximp3/pkg-descr b/audio/ximp3/pkg-descr
index f901856f7fac..51129daa760c 100644
--- a/audio/ximp3/pkg-descr
+++ b/audio/ximp3/pkg-descr
@@ -1,4 +1,2 @@
 A simple console MP3 player. It is based on the GPL'ed Xing decoder also
 used in Zinf.
-
-WWW: http://www.geocities.com/matsp888/unix/index.html
diff --git a/audio/xmms-sndstretch/Makefile b/audio/xmms-sndstretch/Makefile
index f9bf409df805..85d51e7108fd 100644
--- a/audio/xmms-sndstretch/Makefile
+++ b/audio/xmms-sndstretch/Makefile
@@ -16,6 +16,9 @@ DISTNAME=	sndstretch_xmms-${PORTVERSION}
 MAINTAINER=	ports@edwinm.ik.nu
 COMMENT=	Plugin for xmms to change the pitch and/or speed
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 WRKSRC=		${WRKDIR}/sndstretch_xmms
diff --git a/comms/hcidump/Makefile b/comms/hcidump/Makefile
index b0edbec71933..e24e72ffa94a 100644
--- a/comms/hcidump/Makefile
+++ b/comms/hcidump/Makefile
@@ -13,6 +13,9 @@ MASTER_SITES=	http://www.geocities.com/m_evmenkin/
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Bluetooth traffic dumper, similar to tcpdump
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN1=		hcidump.1
diff --git a/converters/ruby-dump.rb/Makefile b/converters/ruby-dump.rb/Makefile
index 2854b43cd253..f57fdee04004 100644
--- a/converters/ruby-dump.rb/Makefile
+++ b/converters/ruby-dump.rb/Makefile
@@ -17,6 +17,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A binary data dumper module for Ruby
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 USE_RUBY=	yes
 RUBY_NO_BUILD_DEPENDS=	yes
 
diff --git a/databases/mysql_last_value/Makefile b/databases/mysql_last_value/Makefile
index be16cb329024..6964d7d5360a 100644
--- a/databases/mysql_last_value/Makefile
+++ b/databases/mysql_last_value/Makefile
@@ -11,6 +11,9 @@ MASTER_SITES=   http://www.geocities.com/jahan.geo/
 MAINTAINER=	jahan@bol-online.com
 COMMENT=	Replaces NULL value of current column with value from top row
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 LIB_DEPENDS=	mysqlclient.14:${PORTSDIR}/databases/mysql41-client
 
 PLIST_FILES=	bin/mysql_last_value
diff --git a/databases/mysql_last_value/pkg-descr b/databases/mysql_last_value/pkg-descr
index 00ef11fa62bb..bfbc6ecf8fd1 100644
--- a/databases/mysql_last_value/pkg-descr
+++ b/databases/mysql_last_value/pkg-descr
@@ -1,7 +1,5 @@
 mysql_last_value() replace null value of column from row above the current row.
 Its like "same as above".
 
-WWW: http://www.geocities.com/jahan.geo
-
 -Aftab Jahan Subedar
 jahan@bol-online.com jahan@geocities.com
diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile
index 9dc2b89576f3..2f8d31f8e591 100644
--- a/devel/oniguruma/Makefile
+++ b/devel/oniguruma/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	oniguruma
 PORTVERSION=	2.5.8
 CATEGORIES=	devel textproc
-MASTER_SITES=	http://www.geocities.jp/kosako3/oniguruma/archive/:onig \
-		http://www.SpringDaemons.com/stas/:ruby
+MASTER_SITES=	http://www.SpringDaemons.com/stas/:ruby
 DISTFILES=	onigd${PORTVERSION:S/./_/g}${EXTRACT_SUFX}:onig \
 		ruby187p248-oniguruma.patch:ruby
 DIST_SUBDIR=	ruby
diff --git a/devel/oniguruma/pkg-descr b/devel/oniguruma/pkg-descr
index b8d235a43c20..65acd448c6e7 100644
--- a/devel/oniguruma/pkg-descr
+++ b/devel/oniguruma/pkg-descr
@@ -12,4 +12,3 @@ ASCII, UTF-8, EUC-JP and Shift_JIS.
 2.x supports Ruby1.6/1.8
 
 Author:	K.Kosako <kosako@sofnec.co.jp>
-WWW:	http://www.geocities.jp/kosako3/oniguruma/
diff --git a/devel/oniguruma4/Makefile b/devel/oniguruma4/Makefile
index c587476c753d..d7f957010ec9 100644
--- a/devel/oniguruma4/Makefile
+++ b/devel/oniguruma4/Makefile
@@ -15,6 +15,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A BSDL Regular Expressions library compatible with POSIX/GNU/Perl
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 NO_LATEST_LINK=	yes
 CONFLICTS=	oniguruma-2.*
 GNU_CONFIGURE=	yes
diff --git a/devel/oniguruma4/pkg-descr b/devel/oniguruma4/pkg-descr
index 35c25052b79d..fbd6aa8be901 100644
--- a/devel/oniguruma4/pkg-descr
+++ b/devel/oniguruma4/pkg-descr
@@ -12,4 +12,3 @@ ASCII, UTF-8, EUC-JP and Shift_JIS.
 4.x supports Ruby1.9.
 
 Author:	K.Kosako <kosako@sofnec.co.jp>
-WWW:	http://www.geocities.jp/kosako3/oniguruma/
diff --git a/devel/oniguruma5/Makefile b/devel/oniguruma5/Makefile
index 13547062fd4b..cfc940899457 100644
--- a/devel/oniguruma5/Makefile
+++ b/devel/oniguruma5/Makefile
@@ -15,6 +15,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A BSDL Regular Expressions library compatible with POSIX/GNU/Perl
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 CONFLICTS=	oniguruma-2.*
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/oniguruma5/pkg-descr b/devel/oniguruma5/pkg-descr
index 35c25052b79d..fbd6aa8be901 100644
--- a/devel/oniguruma5/pkg-descr
+++ b/devel/oniguruma5/pkg-descr
@@ -12,4 +12,3 @@ ASCII, UTF-8, EUC-JP and Shift_JIS.
 4.x supports Ruby1.9.
 
 Author:	K.Kosako <kosako@sofnec.co.jp>
-WWW:	http://www.geocities.jp/kosako3/oniguruma/
diff --git a/devel/p5-Data-Table/pkg-descr b/devel/p5-Data-Table/pkg-descr
index 76e42940178d..fd44bf1d1118 100644
--- a/devel/p5-Data-Table/pkg-descr
+++ b/devel/p5-Data-Table/pkg-descr
@@ -12,9 +12,6 @@ record matching via keywords or patterns, table merging, and web
 publishing. Data::Table class also provides a straightforward interface to 
 other popular Perl modules such as DBI and GD::Graph.
 
-The current version of Table.pm is available at 
-http://www.geocities.com/easydatabase
-
 WWW: http://search.cpan.org/dist/Data-Table/
 Author: Yingyao Zhou & Guangzhou Zou <easydatabase@yahoo.com>
 
diff --git a/devel/ruby-rbtree/Makefile b/devel/ruby-rbtree/Makefile
index a24ac72691ba..04e698e76db0 100644
--- a/devel/ruby-rbtree/Makefile
+++ b/devel/ruby-rbtree/Makefile
@@ -15,6 +15,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ufo@februality.com
 COMMENT=	An implementation of Red-Black Tree for Ruby
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/devel/ruby-rbtree/pkg-descr b/devel/ruby-rbtree/pkg-descr
index 442e9b437341..49cf65d5b1e9 100644
--- a/devel/ruby-rbtree/pkg-descr
+++ b/devel/ruby-rbtree/pkg-descr
@@ -2,4 +2,3 @@ Ruby/RBTree is an implementation of Red-Black Tree for Ruby.  It's
 something like ordered Hash.
 
 Author:	takuma ozawa <hermione@24i.net>
-WWW:	http://www.geocities.co.jp/SiliconValley-PaloAlto/3388/rbtree/README.html
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index f5c386ecd642..449b5e87533a 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.51
 PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://files.ipherswipsite.com/snes9x/ \
-		http://www.geocities.co.jp/SiliconValley-PaloAlto/2560/release/ \
 		http://www.lysator.liu.se/snes9x/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/games/scare/Makefile b/games/scare/Makefile
index 7a264c5eb158..0656296b05ff 100644
--- a/games/scare/Makefile
+++ b/games/scare/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	scare
 PORTVERSION=	1.3.7
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/programming/adrift/ \
-		http://www.geocities.com/legion_if/
+MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/programming/adrift/
 
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	ADRIFT-compatible interactive games interpreter
diff --git a/games/scare/pkg-descr b/games/scare/pkg-descr
index 3623fd1dd586..9b92f98b2c36 100644
--- a/games/scare/pkg-descr
+++ b/games/scare/pkg-descr
@@ -1,3 +1 @@
 An ADRIFT-compatible interactive games interpreter.
-
-WWW:		http://www.geocities.com/legion_if/scare.html
diff --git a/graphics/claraocr/files/patch-pbm2cl b/graphics/claraocr/files/patch-pbm2cl
index 7f8677014944..cb6862da6b30 100644
--- a/graphics/claraocr/files/patch-pbm2cl
+++ b/graphics/claraocr/files/patch-pbm2cl
@@ -5,8 +5,6 @@ that the next free bitmap pointer is always initialized.
 
 -- John Wehle
 
-	http://www.geocities.com/claraocr/patch_20080429.html
-
 --- pbm2cl.c	2003-01-29 07:53:04.000000000 -0500
 +++ pbm2cl.c	2008-06-26 15:41:18.000000000 -0400
 @@ -1048,9 +1048,9 @@
diff --git a/japanese/font-mona-ipa/Makefile b/japanese/font-mona-ipa/Makefile
index 9abb37180109..bdd7a6cd5ed7 100644
--- a/japanese/font-mona-ipa/Makefile
+++ b/japanese/font-mona-ipa/Makefile
@@ -15,6 +15,9 @@ DISTNAME=	opfc-ModuleHP-1.1.1_withIPAMonaFonts-${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IPA Japanese TrueType fonts with Mona font
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
diff --git a/japanese/font-mona-ipa/pkg-descr b/japanese/font-mona-ipa/pkg-descr
index d24639b1a2b0..117f1346a9b7 100644
--- a/japanese/font-mona-ipa/pkg-descr
+++ b/japanese/font-mona-ipa/pkg-descr
@@ -1,5 +1,3 @@
 Japanese TrueType fonts distributed by Infomation-technology Promotion
 Agency (IPA) Japan.  Included Mona font is for rendering ASCII arts
 which assume character width in MS Mincho/Gothic font series.
-
-WWW: http://www.geocities.jp/ipa_mona/
diff --git a/japanese/zangband/pkg-descr b/japanese/zangband/pkg-descr
index db5df0412ed2..348e893bd0e7 100644
--- a/japanese/zangband/pkg-descr
+++ b/japanese/zangband/pkg-descr
@@ -1,4 +1,2 @@
 ZAngband is one of the many variants of the freeware rogue-like computer
 roleplaying game Angband. This version has been translated into Japanese.
-
-WWW: http://www.geocities.co.jp/SiliconValley-SanJose/9606/zg/
diff --git a/multimedia/mmsclient/Makefile b/multimedia/mmsclient/Makefile
index 4bd54bf0bcc1..f7556a311684 100644
--- a/multimedia/mmsclient/Makefile
+++ b/multimedia/mmsclient/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mmsclient
 PORTVERSION=	0.0.3
 CATEGORIES=	multimedia audio net
-MASTER_SITES=	http://www.geocities.com/majormms/ \
-		http://freebsd.nsu.ru/distfiles/
+MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
 DISTNAME=	mms_client-${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/multimedia/mmsclient/files/mmsclient.1 b/multimedia/mmsclient/files/mmsclient.1
index 89aca0fbb422..4c12ba8e98f2 100644
--- a/multimedia/mmsclient/files/mmsclient.1
+++ b/multimedia/mmsclient/files/mmsclient.1
@@ -43,6 +43,6 @@ This will attempt to download Microsoft Media stream and save it as
 Lacks some useful command line options, not to mention probable bugs.
 
 .SH AUTHORS
-mmsclient was written by "Major MMS" (http://www.geocities.com/majormms/).
+mmsclient was written by "Major MMS"
 
 The manual page was written by Alexey Dokuchaev (danfe@regency.nsu.ru).
diff --git a/multimedia/mmsclient/pkg-descr b/multimedia/mmsclient/pkg-descr
index 9dba2109f6b7..15633a9d8f75 100644
--- a/multimedia/mmsclient/pkg-descr
+++ b/multimedia/mmsclient/pkg-descr
@@ -2,5 +2,3 @@ mmsclient allows you to download Internet streams using Microsoft's
 MMS protocol, e.g. CNN video and similar.  Downloaded stream can
 be watched/listened with any software that understands Microsoft
 Media format, like xine with mms-plugin.
-
-WWW: http://www.geocities.com/majormms/
diff --git a/net-mgmt/nagios-geom/pkg-descr b/net-mgmt/nagios-geom/pkg-descr
index 359b9cb3508f..e7da91530191 100644
--- a/net-mgmt/nagios-geom/pkg-descr
+++ b/net-mgmt/nagios-geom/pkg-descr
@@ -1,5 +1,3 @@
 This is a small Nagios plugin written in PERL and designed to monitor
 the state of FreeBSD GEOM devices (specifically mirrors and striped
 volumes) from Nagios.
-
-WWW: http://www.geocities.com/ntb4real/proj/geom.htm
diff --git a/net-mgmt/nagios-portaudit/pkg-descr b/net-mgmt/nagios-portaudit/pkg-descr
index 7e77401b8305..33d007cf0881 100644
--- a/net-mgmt/nagios-portaudit/pkg-descr
+++ b/net-mgmt/nagios-portaudit/pkg-descr
@@ -6,5 +6,3 @@ appropriate warnings to Nagios.
 
 Portaudit can also be successfully run remotely from nrpe, and does
 not require superuser privileges to operate.
-
-WWW: http://www.geocities.com/ntb4real/proj/portaudit.htm
diff --git a/net/c3270/pkg-descr b/net/c3270/pkg-descr
index 8ee4d2bbed06..3995481ec3b0 100644
--- a/net/c3270/pkg-descr
+++ b/net/c3270/pkg-descr
@@ -19,4 +19,3 @@
  Some extended highlighting not (yet) supported.
 
 WWW: http://x3270.bgp.nu/
- or  http://www.geocities.com/SiliconValley/Peaks/7814
diff --git a/net/pppload/files/patch-af b/net/pppload/files/patch-af
index 3eb62e541a18..87e67c84d3f4 100644
--- a/net/pppload/files/patch-af
+++ b/net/pppload/files/patch-af
@@ -8,7 +8,7 @@ diff -u --new-file pppload-1.0/README.freebsd ./README.freebsd
 +This is a FreeBSD port of the linux program called pppload, available at
 +http://sunsite.unc.edu/pub/Linux/system/network/serial/ppp/pppload-1.0.tar.gz
 +
-+Original program homepage at:
++Original program homepage formerly at:
 +http://www.geocities.com/SiliconValley/Pines/1029/pppload.html
 +
 +I have modified the FreeBSD port to be able to show the throughput of
diff --git a/net/pppload/files/patch-ag b/net/pppload/files/patch-ag
index 944bd4f81556..12417d899410 100644
--- a/net/pppload/files/patch-ag
+++ b/net/pppload/files/patch-ag
@@ -24,7 +24,7 @@ diff -u --new-file pppload-1.0/pppload.1 ./pppload.1
  The name of the color to draw transmit rates in (default: red).
  .SH AUTHOR
  Sean Vyain <svyain@mail.tds.net, smvyain@softart.com>
-+www.geocities.com/SiliconValley/Pines/1029/pppload.html
++
 +
 +.SH FREEBSD PORT
 +Examples of usage for the FreeBSD port:
diff --git a/net/uproxy/Makefile b/net/uproxy/Makefile
index 6a735ab4968f..6fde8eec2b78 100644
--- a/net/uproxy/Makefile
+++ b/net/uproxy/Makefile
@@ -15,6 +15,9 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Proxy for UDP protocols
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 USE_RC_SUBR=	${PORTNAME}
diff --git a/net/uproxy/pkg-descr b/net/uproxy/pkg-descr
index 4327194167ac..6bdcd50070f8 100644
--- a/net/uproxy/pkg-descr
+++ b/net/uproxy/pkg-descr
@@ -4,5 +4,3 @@ connected by a LAN sharing a dial up connection, but
 it could be used to play other games (such as Quake)
 and by every program using a UDP protocol where clients
 don't have to bind a fixed port (not only games!).
-
-WWW: http://www.geocities.com/SiliconValley/Vista/8155/uproxy/
diff --git a/sysutils/915resolution/Makefile b/sysutils/915resolution/Makefile
index a7b791e4cf21..8112ecd3aa9c 100644
--- a/sysutils/915resolution/Makefile
+++ b/sysutils/915resolution/Makefile
@@ -9,8 +9,7 @@ PORTVERSION=	0.5.3
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.geocities.com/stomljen/ \
-		${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ehaupt
 
 MAINTAINER=	bahamasfranks@gmail.com
diff --git a/sysutils/915resolution/pkg-descr b/sysutils/915resolution/pkg-descr
index e4f67ade978d..051f8b0b8d8c 100644
--- a/sysutils/915resolution/pkg-descr
+++ b/sysutils/915resolution/pkg-descr
@@ -1,4 +1,2 @@
 This is a resolution hack for Intel 915 based video cards. Based on code
 written by Alain Poirer for Linux, modified by Steve Tomljenovic.
-
-WWW: http://www.geocities.com/stomljen/
diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index 0ac4b7ed574b..59294d1e14f0 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -16,6 +16,9 @@ DISTNAME=	uhoaiw21
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	Unicode TrueType Font with UHoai Vietnamese encoding
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	taken care of in do-install target
diff --git a/vietnamese/unicode-uhoai/pkg-descr b/vietnamese/unicode-uhoai/pkg-descr
index d433ea0e97e9..f33db73a57f2 100644
--- a/vietnamese/unicode-uhoai/pkg-descr
+++ b/vietnamese/unicode-uhoai/pkg-descr
@@ -1,4 +1,2 @@
 Experimental Unicode TrueType Font with UHoai Vietnamese encoding
 for use with Netscape 4.0+.
-
-WWW: http://www.geocities.com/~starkville/mozilla/vn.htm
diff --git a/vietnamese/vis2u/Makefile b/vietnamese/vis2u/Makefile
index 931ce418e48d..4ba4bfc1984c 100644
--- a/vietnamese/vis2u/Makefile
+++ b/vietnamese/vis2u/Makefile
@@ -15,6 +15,9 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	VISCII->Unicode conversion
 
+BROKEN=	No Master Site
+EXPIRATION_DATE=	2011-09-01
+
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/vietnamese/vis2u/pkg-descr b/vietnamese/vis2u/pkg-descr
index 184fe7dbf614..7f75a2b567d7 100644
--- a/vietnamese/vis2u/pkg-descr
+++ b/vietnamese/vis2u/pkg-descr
@@ -1,3 +1 @@
 VISCII->Unicode conversion
-
-WWW: http://www.geocities.com/~starkville/mozilla/vn.htm
diff --git a/www/cgi-lib/pkg-descr b/www/cgi-lib/pkg-descr
index 1bc6ed0bc3b3..4dc88e654e2b 100644
--- a/www/cgi-lib/pkg-descr
+++ b/www/cgi-lib/pkg-descr
@@ -4,5 +4,3 @@ facilitate the creation of CGI programs.
 The library is written entirely in C using ANSI
 C functions. The functions are easy to use and
 the source code is included.
-
-WWW: http://www.geocities.com/SiliconValley/Vista/6493/projects/cgi-lib.html
diff --git a/www/ump/Makefile b/www/ump/Makefile
index 5175b81bf0ea..e6aef9cdd330 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.10
 PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${TIMIDITY_VERSION}:timidity \
-		http://www.geocities.com/SiliconValley/Lab/2826/1-10/:ump \
 		http://pubweb.bnl.gov/people/hoff/midi/1.10/:ump \
 		ftp://ftp.fu-berlin.de/unix/network/www/netscape/sdk/plugin/unix/:plugin \
 		ftp://ftp.fh-wolfenbuettel.de/pub/www/netscape/sdk/plugin/unix/:plugin
diff --git a/www/ump/pkg-descr b/www/ump/pkg-descr
index 8bed2e6f6387..564a2cd2e751 100644
--- a/www/ump/pkg-descr
+++ b/www/ump/pkg-descr
@@ -2,8 +2,7 @@ UMP is a UNIX Midi plug-in for Netscape Navigator (and mozilla). It
 enables you to play MIDI files in the browser via TiMidity++, a
 software MIDI player.
 
-WWW:	http://www.geocities.com/SiliconValley/Lab/2826/
- 	http://www.goice.co.jp/member/mo/timidity/doc/ump-inst.html
+WWW:	http://www.goice.co.jp/member/mo/timidity/doc/ump-inst.html
 
 Author:	Lawrence Hoff <lawrencehoff@yahoo.com>
 	Masanao Izumo <mo@goice.co.jp>
diff --git a/x11-fonts/tolkien-ttf/pkg-descr b/x11-fonts/tolkien-ttf/pkg-descr
index 083e959abc35..2c2f5d3ce2b7 100644
--- a/x11-fonts/tolkien-ttf/pkg-descr
+++ b/x11-fonts/tolkien-ttf/pkg-descr
@@ -8,5 +8,3 @@ Daniel Steven Smith encoding system.  The package contains:
 - Tengwar Gandalf by Michael S. Elliott
 - Cirth Erebor font pack (release 1.1b)
 - Angerthas by Bruce Kvam
-
-WWW: http://www.geocities.com/fontmaster.geo/index.html