5 files changed, 11 insertions, 17 deletions

diff --git a/mail/stuphead/Makefile b/mail/stuphead/Makefile
index 07618483d490..d21ce55d6253 100644
--- a/mail/stuphead/Makefile
+++ b/mail/stuphead/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	stuphead
 PORTVERSION=	0.5.3
 PORTREVISION=	4
 CATEGORIES=	mail gnome
-MASTER_SITES=	http://stuphead.asplinux.ru/stuphead/
+MASTER_SITES=	# http://stuphead.asplinux.ru/stuphead/
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	${PORTNAME}-${PORTVERSION}-1.patch
@@ -17,6 +17,9 @@ PATCHFILES=	${PORTNAME}-${PORTVERSION}-1.patch
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight MUA for X11
 
+EXPIRATION_DATE=2005-08-01
+DEPRECATED=	Mastersite disappeared
+
 USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
@@ -35,18 +38,20 @@ CONFIGURE_ARGS+=	--disable-gdk-pixbuf \
 .endif
 
 .if defined (WITH_GNOME)
-USE_GNOME=	yes
-PLIST=		${PKGDIR}/pkg-plist.gnome
+PLIST_SUB+=	GNOME=""
 CONFIGURE_ARGS+=	--enable-gnome
 .else
+PLIST_SUB+=	GNOME="@comment "
 CONFIGURE_ARGS+=	--disable-imlib \
 			--disable-imlibtest
 .endif
 
 .if defined (WITH_MOZILLA)
-PLIST=		${PKGDIR}/pkg-plist.mozilla
+PLIST_SUB+=	MOZILLA=""
 CONFIGURE_ARGS+=	--enable-mozilla
 RUN_DEPENDS+=	${PREFIX}/bin/mozilla:${PORTSDIR}/www/mozilla
+.else
+PLIST_SUB+=	MOZILLA="@comment "
 .endif
 
 .if defined (WITH_ISPELL)
diff --git a/mail/stuphead/pkg-descr b/mail/stuphead/pkg-descr
index 1f8b7d9da49c..08fac1d9dfae 100644
--- a/mail/stuphead/pkg-descr
+++ b/mail/stuphead/pkg-descr
@@ -1,4 +1,2 @@
 Russian mailer stuphead based on Sylpheed 0.4.1
 Copyright(C) 1999,2000 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
-
-WWW: http://stuphead.antex.ru/
diff --git a/mail/stuphead/pkg-plist b/mail/stuphead/pkg-plist
index 772efb123add..bc657a49d7e2 100644
--- a/mail/stuphead/pkg-plist
+++ b/mail/stuphead/pkg-plist
@@ -1,4 +1,6 @@
 bin/stuphead
+%%MOZILLA%%bin/stupheadbin
 share/locale/fr/LC_MESSAGES/stuphead.mo
 share/locale/ru/LC_MESSAGES/stuphead.mo
 share/pixmaps/stuphead.xpm
+%%GNOME%%share/gnome/apps/Internet/stuphead.desktop
diff --git a/mail/stuphead/pkg-plist.gnome b/mail/stuphead/pkg-plist.gnome
deleted file mode 100644
index ffb1269992b5..000000000000
--- a/mail/stuphead/pkg-plist.gnome
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/stuphead
-bin/stupheadbin
-share/locale/fr/LC_MESSAGES/stuphead.mo
-share/locale/ru/LC_MESSAGES/stuphead.mo
-share/pixmaps/stuphead.xpm
-share/gnome/apps/Internet/stuphead.desktop
diff --git a/mail/stuphead/pkg-plist.mozilla b/mail/stuphead/pkg-plist.mozilla
deleted file mode 100644
index 49a8474aed34..000000000000
--- a/mail/stuphead/pkg-plist.mozilla
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/stuphead
-bin/stupheadbin
-share/locale/fr/LC_MESSAGES/stuphead.mo
-share/locale/ru/LC_MESSAGES/stuphead.mo
-share/pixmaps/stuphead.xpm