Remove expired ports:

2007-05-09 net-p2p/amule1: use net-p2p/amule2 if you are running OSVERSION > 500000
2007-04-28 games/marathon-evil: Installed by games/alephone-scenarios with wrapper script
2007-04-28 games/marathon2-data: Installed by games/alephone-data with wrapper script

18 files changed, 3 insertions, 312 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index fae9d540636f..9eb305bf9afe 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -376,7 +376,6 @@ amrcoder	ports/audio/amrcoder
 amrstat		ports/sysutils/amrstat
 amsn		ports/net-im/amsn
 amspsfnt	ports/print/amspsfnt
-amule1		ports/net-p2p/amule1
 amule2		ports/net-p2p/amule2
 amy		ports/games/amy
 an		ports/games/an
@@ -7195,8 +7194,6 @@ mapserver	ports/graphics/mapserver
 mapyrus		ports/graphics/mapyrus
 mar		ports/archivers/mar
 maradns		ports/dns/maradns
-marathon-evil	ports/games/marathon-evil
-marathon2-data	ports/games/marathon2-data
 markdown	ports/textproc/markdown
 mars		ports/cad/mars
 mars_nwe	ports/net/mars_nwe
diff --git a/MOVED b/MOVED
index 2fc47a35194b..1399a4ebedab 100644
--- a/MOVED
+++ b/MOVED
@@ -2965,3 +2965,6 @@ net-im/gaim-hotkeys|net-im/pidgin-hotkeys|2007-05-28|Project renamed
 
 devel/ruby-inline||2007-05-28|Has expired: New versions only available in rubygems. Use devel/rubygem-inline instead.
 devel/tkref||2007-05-28|Has expired: is seriously outdated, take a look at http://www.tcl.tk/doc/ for TCL/TK documentation
+net-p2p/amule1||2007-05-28|Has expired: use net-p2p/amule2 if you are running OSVERSION > 500000
+games/marathon-evil||2007-05-28|Has expired: Installed by games/alephone-scenarios with wrapper script
+games/marathon2-data||2007-05-28|Has expired: Installed by games/alephone-data with wrapper script
diff --git a/games/Makefile b/games/Makefile
index 3d99336b120a..75bf586d20e9 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -455,8 +455,6 @@
     SUBDIR += maitretarot
     SUBDIR += mangband
     SUBDIR += mangos
-    SUBDIR += marathon-evil
-    SUBDIR += marathon2-data
     SUBDIR += marsnomercy
     SUBDIR += masterserver
     SUBDIR += meqcc
diff --git a/games/marathon-evil/Makefile b/games/marathon-evil/Makefile
deleted file mode 100644
index da3c6ea0e430..000000000000
--- a/games/marathon-evil/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# New ports collection makefile for:	marathon-evil
-# Date created:		01 April 2001
-# Whom:			Bruce A. Mah <bmah@freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	marathon-evil
-PORTVERSION=	3
-PORTREVISION=	2
-CATEGORIES=	games
-MASTER_SITES=	http://archives2.bungie.org/a1sdl/ \
-		ftp://ftp2.bungie.org/archives/a1sdl/
-DISTNAME=	MarathonEvil-3
-
-MAINTAINER=	bmah@freebsd.org
-COMMENT=	Marathon-Evil scenario for use with AlephOne
-
-DEPRECATED=	Installed by games/alephone-scenarios with wrapper script
-EXPIRATION_DATE=2007-04-28
-
-RUN_DEPENDS=	alephone:${PORTSDIR}/games/alephone
-
-NO_CDROM=	Bungie/Microsoft do not allow charging for Marathon data files.
-
-WRKSRC=		${WRKDIR}/MarathonEvil
-
-# For some inexplicable reason, there's a tarball inside the tarball.
-# We'll deal with the inner tarball as the build.
-do-build:
-	cd ${WRKSRC}; \
-	${GUNZIP_CMD} -c ${WRKSRC}/MarathonEvilData.tar.gz | ${TAR} -xf -
-
-do-install:
-	${MKDIR} ${PREFIX}/share/AlephOne
-	${INSTALL_DATA} ${WRKSRC}/Cursed.Data ${PREFIX}/share/AlephOne/Cursed.Data
-	${INSTALL_DATA} ${WRKSRC}/Cursed.Images ${PREFIX}/share/AlephOne/Cursed.Images
-	${INSTALL_DATA} ${WRKSRC}/Cursed.Map ${PREFIX}/share/AlephOne/Cursed.Map
-	${INSTALL_DATA} ${WRKSRC}/Cursed.Music ${PREFIX}/share/AlephOne/Cursed.Music
-	${INSTALL_DATA} ${WRKSRC}/Cursed.Net.Map ${PREFIX}/share/AlephOne/Cursed.Net.Map
-	${INSTALL_DATA} ${WRKSRC}/Cursed.Net.Physics ${PREFIX}/share/AlephOne/Cursed.Net.Physics
-	${INSTALL_DATA} ${WRKSRC}/Cursed.Physics ${PREFIX}/share/AlephOne/Cursed.Physics
-	${INSTALL_DATA} ${WRKSRC}/Cursed.Shapes ${PREFIX}/share/AlephOne/Cursed.Shapes
-	${INSTALL_DATA} ${WRKSRC}/Cursed.Sounds ${PREFIX}/share/AlephOne/Cursed.Sounds
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/AlephOne/README.Evil
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${CAT} ${PKGMESSAGE}
-.endif
-
-.include <bsd.port.mk>
diff --git a/games/marathon-evil/distinfo b/games/marathon-evil/distinfo
deleted file mode 100644
index 077d4dd29afe..000000000000
--- a/games/marathon-evil/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (MarathonEvil-3.tar.gz) = 42a5d07c956e4bb57c96cfb1299dd890
-SHA256 (MarathonEvil-3.tar.gz) = fb3d23f39e90f525f40d50543fdc45cb3f00662f490fc70a5980cd5602a8a0e7
-SIZE (MarathonEvil-3.tar.gz) = 33840859
diff --git a/games/marathon-evil/pkg-descr b/games/marathon-evil/pkg-descr
deleted file mode 100644
index eb547309a6ff..000000000000
--- a/games/marathon-evil/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-This port contains the Marathon: Evil files, converted to run on
-Aleph One.  The Aleph One application itself is in the `alephone' port.
-
-Marathon: Evil is a third-party scenario package with all-new monsters,
-maps, sounds, and so on.  This particular port is a conversion of
-the original Marathon: Evil to run on Aleph One/SDL.
-
-Bruce A. Mah
-bmah@freebsd.org
-
-WWW: http://bighouse.bungie.org/evil/
diff --git a/games/marathon-evil/pkg-message b/games/marathon-evil/pkg-message
deleted file mode 100644
index 919d0962cf9d..000000000000
--- a/games/marathon-evil/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-To play the Marathon: Evil scenario, start alephone, and
-select the Preferences screen, the Environment section.
-For each of the items listed in the environment, choose the
-"Cursed" data file (there will be one for each environment item
-except for Theme).
diff --git a/games/marathon-evil/pkg-plist b/games/marathon-evil/pkg-plist
deleted file mode 100644
index 2ef08ebc68d2..000000000000
--- a/games/marathon-evil/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-share/AlephOne/Cursed.Data
-share/AlephOne/Cursed.Images
-share/AlephOne/Cursed.Map
-share/AlephOne/Cursed.Music
-share/AlephOne/Cursed.Net.Map
-share/AlephOne/Cursed.Net.Physics
-share/AlephOne/Cursed.Physics
-share/AlephOne/Cursed.Shapes
-share/AlephOne/Cursed.Sounds
-share/AlephOne/README.Evil
-@dirrmtry share/AlephOne
diff --git a/games/marathon2-data/Makefile b/games/marathon2-data/Makefile
deleted file mode 100644
index 0c5c1145f01d..000000000000
--- a/games/marathon2-data/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:   marathon2-data
-# Date created:                19 March 2005
-# Whom:                        Evan T. Dower <evantd@yahoo.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	marathon2-data
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	games
-MASTER_SITES=	http://files3.bungie.org/trilogy/
-DISTNAME=	marathon2
-
-MAINTAINER=	evantd@yahoo.com
-COMMENT=	Data files for the alephone port from Marathon 2
-
-DEPRECATED=	Installed by games/alephone-data with wrapper script
-EXPIRATION_DATE=2007-04-28
-
-RUN_DEPENDS=	alephone:${PORTSDIR}/games/alephone
-
-USE_ZIP=	yes
-NO_BUILD=	yes
-NO_CDROM=	Bungie/Microsoft do not allow charging for Marathon data files.
-NO_WRKSUBDIR=	yes
-
-do-install:
-	@${MKDIR} ${PREFIX}/share/AlephOne
-	${INSTALL_DATA} ${WRKDIR}/Images ${PREFIX}/share/AlephOne/Durandal.Images
-	${INSTALL_DATA} ${WRKDIR}/Map ${PREFIX}/share/AlephOne/Durandal.Map
-	${INSTALL_DATA} ${WRKDIR}/Map.resources ${PREFIX}/share/AlephOne/Durandal.Map.resources
-	${INSTALL_DATA} ${WRKDIR}/Music ${PREFIX}/share/AlephOne/Durandal.Music
-	${INSTALL_DATA} ${WRKDIR}/Shapes ${PREFIX}/share/AlephOne/Durandal.Shapes
-	${INSTALL_DATA} ${WRKDIR}/Sounds ${PREFIX}/share/AlephOne/Durandal.Sounds
-
-.include <bsd.port.mk>
diff --git a/games/marathon2-data/distinfo b/games/marathon2-data/distinfo
deleted file mode 100644
index 8ede0dd65a37..000000000000
--- a/games/marathon2-data/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (marathon2.zip) = cca9e8f68e8acc6da886073e685f65f1
-SHA256 (marathon2.zip) = 8f01d4fe7f6794d7c8d55e8468c6f29f2e12357bb7f1f45b61dc5305b522b469
-SIZE (marathon2.zip) = 30316515
diff --git a/games/marathon2-data/pkg-descr b/games/marathon2-data/pkg-descr
deleted file mode 100644
index 2d8956c02dca..000000000000
--- a/games/marathon2-data/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This port contains the Marathon 2: Durandal data files, converted to
-run on Aleph One.  The Aleph One application itself is in the
-`alephone' port.
-
-Evan T. Dower
-evantd@yahoo.com
-
-WWW: http://bighouse.bungie.org/marathon2.html
diff --git a/games/marathon2-data/pkg-plist b/games/marathon2-data/pkg-plist
deleted file mode 100644
index 70322c9a3135..000000000000
--- a/games/marathon2-data/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-share/AlephOne/Durandal.Images
-share/AlephOne/Durandal.Map
-share/AlephOne/Durandal.Map.resources
-share/AlephOne/Durandal.Music
-share/AlephOne/Durandal.Shapes
-share/AlephOne/Durandal.Sounds
-@dirrmtry share/AlephOne
diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index aa4245c43f49..0234f3613350 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -3,7 +3,6 @@
 
     COMMENT = peer-to-peer network applications
 
-    SUBDIR += amule1
     SUBDIR += amule2
     SUBDIR += apollon
     SUBDIR += azureus
diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile
deleted file mode 100644
index 051fa2a68021..000000000000
--- a/net-p2p/amule1/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# New ports collection makefile for:	amule
-# Date created:		Wed Nov 05 09:30:00 UTC 2003
-# Whom:			Ganael LAPLANCHE <ganael.laplanche@martymac.com>
-#
-# $FreeBSD$
-#    $MCom: ports/net-p2p/amule1/Makefile,v 1.1 2006/10/04 23:22:32 ahze Exp $
-
-PORTNAME=	aMule
-PORTVERSION=	1.2.8
-PORTREVISION=	7
-CATEGORIES=	net-p2p
-#MASTER_SITES=	http://download.berlios.de/amule/
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	amule
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The all-platform eMule p2p client
-
-DEPRECATED=	use net-p2p/amule2 if you are running OSVERSION > 500000
-EXPIRATION_DATE=	2007-05-09
-
-LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
-
-LATEST_LINK=	aMule1
-CONFLICTS=	aMule-2.* aMule-devel-[0-9]*
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehier gnomehack gnomeprefix
-USE_GMAKE=	yes
-USE_WX=		2.4
-WX_CONF_ARGS=	absolute
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-included-gettext \
-		--with-libintl-prefix=${LOCALBASE} \
-		--with-libiconv-prefix=${LOCALBASE} \
-		--with-wxbase-config=${WX_CONFIG} \
-		--with-curl-config=${CURL_CONFIG} \
-		--program-transform-name="s/ed2k/amule-ed2k-handler/"
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-OPTIONS=	OPTIMIZE "Build with optimization" on \
-		STATIC "Enable static linking" off
-
-CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
-# Configure options
-.if !defined(WITHOUT_OPTIMIZE)
-CONFIGURE_ARGS+=	--enable-optimise
-.endif
-
-.if defined(WITH_STATIC)
-CONFIGURE_ARGS+=	--enable-static
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net-p2p/amule1/distinfo b/net-p2p/amule1/distinfo
deleted file mode 100644
index 1a633e1e8092..000000000000
--- a/net-p2p/amule1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (aMule-1.2.8.tar.bz2) = a6fe7157000efdc5985dfc8774efbccd
-SHA256 (aMule-1.2.8.tar.bz2) = 95aa784a6458637b49f55f6c7705a2ef228ea42b81c465d44d280d146bc71d46
-SIZE (aMule-1.2.8.tar.bz2) = 2039251
diff --git a/net-p2p/amule1/files/patch-SysTray.cpp b/net-p2p/amule1/files/patch-SysTray.cpp
deleted file mode 100644
index a313e720d9ea..000000000000
--- a/net-p2p/amule1/files/patch-SysTray.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/SysTray.cpp.orig	Tue Jul  6 07:32:56 2004
-+++ src/SysTray.cpp	Tue Jul  6 07:33:44 2004
-@@ -23,8 +23,8 @@
- #include "sys.h"
- #include <libintl.h>
- #include <clocale>		// Needed for setlocale(3)
--#include <net/if.h>		// Needed for struct ifreq
- #include <sys/socket.h>		//
-+#include <net/if.h>		// Needed for struct ifreq
- #include <netinet/in.h>		// Needed for inet_ntoa
- #include <arpa/inet.h>		//
- #include <sys/ioctl.h>		// Needed for SIOCGIFADDR
diff --git a/net-p2p/amule1/pkg-descr b/net-p2p/amule1/pkg-descr
deleted file mode 100644
index 20b88a676021..000000000000
--- a/net-p2p/amule1/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-aMule, the all-platform eMule p2p client
-
-aMule is a multiplatform fork of xMule
-client using wxWindows class library.
-
-This is the last version of aMule-1. It
-is maintained for 4.x compatibility. If
-you would like to install aMule-2, see
-amule2 or amule-devel port.
-
-WWW: http://www.amule.org
diff --git a/net-p2p/amule1/pkg-plist b/net-p2p/amule1/pkg-plist
deleted file mode 100644
index 5d44b3119cbb..000000000000
--- a/net-p2p/amule1/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-bin/amule
-bin/amule-ed2k-handler
-bin/amulecmd
-bin/amulecmdDLG
-bin/amuleweb
-bin/amulewebDLG
-share/gnome/amuleweb/aMule.tmpl
-share/gnome/amuleweb/webserver/GraphCon.gif
-share/gnome/amuleweb/webserver/GraphDL.gif
-share/gnome/amuleweb/webserver/GraphUL.gif
-share/gnome/amuleweb/webserver/add_server.gif
-share/gnome/amuleweb/webserver/arrow_down.gif
-share/gnome/amuleweb/webserver/arrow_right.gif
-share/gnome/amuleweb/webserver/arrow_up.gif
-share/gnome/amuleweb/webserver/black.gif
-share/gnome/amuleweb/webserver/blue.gif
-share/gnome/amuleweb/webserver/blue1.gif
-share/gnome/amuleweb/webserver/blue2.gif
-share/gnome/amuleweb/webserver/blue3.gif
-share/gnome/amuleweb/webserver/blue4.gif
-share/gnome/amuleweb/webserver/blue5.gif
-share/gnome/amuleweb/webserver/blue6.gif
-share/gnome/amuleweb/webserver/cp_download.gif
-share/gnome/amuleweb/webserver/cp_kad.gif
-share/gnome/amuleweb/webserver/cp_search.gif
-share/gnome/amuleweb/webserver/cp_servers.gif
-share/gnome/amuleweb/webserver/cp_settings.gif
-share/gnome/amuleweb/webserver/cp_shared.gif
-share/gnome/amuleweb/webserver/cp_stats.gif
-share/gnome/amuleweb/webserver/emule.gif
-share/gnome/amuleweb/webserver/green.gif
-share/gnome/amuleweb/webserver/greenpercent.gif
-share/gnome/amuleweb/webserver/l_cancel.gif
-share/gnome/amuleweb/webserver/l_connect.gif
-share/gnome/amuleweb/webserver/l_down.gif
-share/gnome/amuleweb/webserver/l_ed2klink.gif
-share/gnome/amuleweb/webserver/l_info.gif
-share/gnome/amuleweb/webserver/l_pause.gif
-share/gnome/amuleweb/webserver/l_resume.gif
-share/gnome/amuleweb/webserver/l_up.gif
-share/gnome/amuleweb/webserver/log.gif
-share/gnome/amuleweb/webserver/main_bg.gif
-share/gnome/amuleweb/webserver/main_top_bg.gif
-share/gnome/amuleweb/webserver/red.gif
-share/gnome/amuleweb/webserver/top_bar_bg.gif
-share/gnome/amuleweb/webserver/top_bar_bg2.gif
-share/gnome/amuleweb/webserver/transparent.gif
-share/gnome/amuleweb/webserver/yellow.gif
-share/gnome/applications/amule.desktop
-share/gnome/doc/aMule-1.2.8/ABOUT-NLS
-share/gnome/doc/aMule-1.2.8/AUTHORS
-share/gnome/doc/aMule-1.2.8/Changelog
-share/gnome/doc/aMule-1.2.8/ED2K-Links.HOWTO
-share/gnome/doc/aMule-1.2.8/INSTALL
-share/gnome/doc/aMule-1.2.8/README
-share/gnome/doc/aMule-1.2.8/TODO
-share/gnome/doc/aMule-1.2.8/amulesig.txt
-share/gnome/doc/aMule-1.2.8/eMule-Imports-Status
-share/gnome/doc/aMule-1.2.8/license.txt
-share/gnome/pixmaps/amule.xpm
-share/locale/bg/LC_MESSAGES/amule.mo
-share/locale/de/LC_MESSAGES/amule.mo
-share/locale/ee/LC_MESSAGES/amule.mo
-share/locale/en/LC_MESSAGES/amule.mo
-share/locale/es/LC_MESSAGES/amule.mo
-share/locale/es_MX/LC_MESSAGES/amule.mo
-share/locale/eu/LC_MESSAGES/amule.mo
-share/locale/fr/LC_MESSAGES/amule.mo
-share/locale/gl/LC_MESSAGES/amule.mo
-share/locale/it/LC_MESSAGES/amule.mo
-share/locale/ko/LC_MESSAGES/amule.mo
-share/locale/nl/LC_MESSAGES/amule.mo
-share/locale/pl/LC_MESSAGES/amule.mo
-share/locale/pt_BR/LC_MESSAGES/amule.mo
-share/locale/ru/LC_MESSAGES/amule.mo
-@dirrm share/gnome/doc/aMule-1.2.8
-@dirrmtry share/gnome/doc
-@dirrm share/gnome/amuleweb/webserver
-@dirrm share/gnome/amuleweb