19 files changed, 18 insertions, 22 deletions

diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 0a1d8cc1c6d9..3a65c3322f58 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sec@42.org
 COMMENT=	A Commodore SID-chip emulator library to play SID music files
 
-BROKEN=	No Master Site
+DEPRECATED=	No Master Site
 EXPIRATION_DATE=	2011-09-01
 
 USE_AUTOTOOLS=	libtool
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index 75fb7a1b3280..e43f29ce65f2 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sec@42.org
 COMMENT=	A Commodore SID-chip emulator that plays SID music files
 
-BROKEN=	No Master Site
+DEPRECATED=	No Master Site
 EXPIRATION_DATE=	2011-09-01
 
 LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay
diff --git a/audio/xmms-sndstretch/Makefile b/audio/xmms-sndstretch/Makefile
index 85d51e7108fd..7c1075484745 100644
--- a/audio/xmms-sndstretch/Makefile
+++ b/audio/xmms-sndstretch/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	sndstretch_xmms-${PORTVERSION}
 MAINTAINER=	ports@edwinm.ik.nu
 COMMENT=	Plugin for xmms to change the pitch and/or speed
 
-BROKEN=	No Master Site
+DEPRECATED=	No Master Site
 EXPIRATION_DATE=	2011-09-01
 
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
diff --git a/comms/hcidump/Makefile b/comms/hcidump/Makefile
index e24e72ffa94a..742339097a47 100644
--- a/comms/hcidump/Makefile
+++ b/comms/hcidump/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.geocities.com/m_evmenkin/
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Bluetooth traffic dumper, similar to tcpdump
 
-BROKEN=	No Master Site
+DEPRECATED=	No Master Site
 EXPIRATION_DATE=	2011-09-01
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/converters/ruby-dump.rb/Makefile b/converters/ruby-dump.rb/Makefile
index f57fdee04004..2854b43cd253 100644
--- a/converters/ruby-dump.rb/Makefile
+++ b/converters/ruby-dump.rb/Makefile
@@ -17,9 +17,6 @@ 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 6964d7d5360a..c2f32446a942 100644
--- a/databases/mysql_last_value/Makefile
+++ b/databases/mysql_last_value/Makefile
@@ -11,7 +11,7 @@ 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
+DEPRECATED=	No Master Site
 EXPIRATION_DATE=	2011-09-01
 
 LIB_DEPENDS=	mysqlclient.14:${PORTSDIR}/databases/mysql41-client
diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile
index 2f8d31f8e591..9dc2b89576f3 100644
--- a/devel/oniguruma/Makefile
+++ b/devel/oniguruma/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	oniguruma
 PORTVERSION=	2.5.8
 CATEGORIES=	devel textproc
-MASTER_SITES=	http://www.SpringDaemons.com/stas/:ruby
+MASTER_SITES=	http://www.geocities.jp/kosako3/oniguruma/archive/:onig \
+		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 65acd448c6e7..09e8cd66ed1d 100644
--- a/devel/oniguruma/pkg-descr
+++ b/devel/oniguruma/pkg-descr
@@ -12,3 +12,4 @@ 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 d7f957010ec9..c587476c753d 100644
--- a/devel/oniguruma4/Makefile
+++ b/devel/oniguruma4/Makefile
@@ -15,9 +15,6 @@ 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 fbd6aa8be901..c9668cf05dc4 100644
--- a/devel/oniguruma4/pkg-descr
+++ b/devel/oniguruma4/pkg-descr
@@ -12,3 +12,4 @@ 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 cfc940899457..13547062fd4b 100644
--- a/devel/oniguruma5/Makefile
+++ b/devel/oniguruma5/Makefile
@@ -15,9 +15,6 @@ 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 fbd6aa8be901..c9668cf05dc4 100644
--- a/devel/oniguruma5/pkg-descr
+++ b/devel/oniguruma5/pkg-descr
@@ -12,3 +12,4 @@ 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/ruby-rbtree/Makefile b/devel/ruby-rbtree/Makefile
index 04e698e76db0..b0d58a3c72fb 100644
--- a/devel/ruby-rbtree/Makefile
+++ b/devel/ruby-rbtree/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ufo@februality.com
 COMMENT=	An implementation of Red-Black Tree for Ruby
 
-BROKEN=	No Master Site
+DEPRECATED=	No Master Site
 EXPIRATION_DATE=	2011-09-01
 
 USE_RUBY=	yes
diff --git a/japanese/font-mona-ipa/Makefile b/japanese/font-mona-ipa/Makefile
index bdd7a6cd5ed7..9abb37180109 100644
--- a/japanese/font-mona-ipa/Makefile
+++ b/japanese/font-mona-ipa/Makefile
@@ -15,9 +15,6 @@ 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 117f1346a9b7..d24639b1a2b0 100644
--- a/japanese/font-mona-ipa/pkg-descr
+++ b/japanese/font-mona-ipa/pkg-descr
@@ -1,3 +1,5 @@
 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 348e893bd0e7..db5df0412ed2 100644
--- a/japanese/zangband/pkg-descr
+++ b/japanese/zangband/pkg-descr
@@ -1,2 +1,4 @@
 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/net/uproxy/Makefile b/net/uproxy/Makefile
index 6fde8eec2b78..7578a8feed4d 100644
--- a/net/uproxy/Makefile
+++ b/net/uproxy/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Proxy for UDP protocols
 
-BROKEN=	No Master Site
+DEPRECATED=	No Master Site
 EXPIRATION_DATE=	2011-09-01
 
 USE_ZIP=	yes
diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index 59294d1e14f0..c8af337ccfbb 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	uhoaiw21
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	Unicode TrueType Font with UHoai Vietnamese encoding
 
-BROKEN=	No Master Site
+DEPRECATED=	No Master Site
 EXPIRATION_DATE=	2011-09-01
 
 USE_ZIP=	yes
diff --git a/vietnamese/vis2u/Makefile b/vietnamese/vis2u/Makefile
index 4ba4bfc1984c..af6c62e568a7 100644
--- a/vietnamese/vis2u/Makefile
+++ b/vietnamese/vis2u/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	VISCII->Unicode conversion
 
-BROKEN=	No Master Site
+DEPRECATED=	No Master Site
 EXPIRATION_DATE=	2011-09-01
 
 USE_ZIP=	yes