32 files changed, 2 insertions, 764 deletions

diff --git a/MOVED b/MOVED
index 98aa9b57bce9..fd2df1f2b839 100644
--- a/MOVED
+++ b/MOVED
@@ -3547,3 +3547,5 @@ sysutils/rubygem-puppet-module||2012-07-07|Integrated in to sysutils/puppet sinc
 mail/sympa5|mail/sympa|2012-07-07|Has expired: Unsupported by upstream, Multiple vulnerabilities have been discovered in Sympa archive management that allow to skip the scenario-based authorization mechanisms.  http://www.sympa.org/security_advisories
 science/ics||2012-07-07|ICS is no more a part of Code_Saturne
 mail/postfix25||2012-07-07|Has expired: no further upstream development; please consider upgrading
+misc/alevt||2012-07-16|Has expired: No more upstream
+multimedia/moonlight||2012-07-16|Has expired: BROKEN for more than 6 month
diff --git a/misc/Makefile b/misc/Makefile
index ddc580188cd8..17b04d02799b 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -6,7 +6,6 @@
     SUBDIR += achievo
     SUBDIR += aclgen
     SUBDIR += airoflash
-    SUBDIR += alevt
     SUBDIR += amanda-client
     SUBDIR += amanda-perl-wrapper
     SUBDIR += amanda-server
diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile
deleted file mode 100644
index 5a142479a624..000000000000
--- a/misc/alevt/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:	AleVT
-# Date created:				Wed Aug 18 13:23:00 BST 1999
-# Whom:					Roger Hardiman <roger@freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	alevt
-PORTVERSION=	1.6.2
-PORTREVISION=	2
-CATEGORIES=	misc
-MASTER_SITES=	http://www.goron.de/~froese/alevt/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	X11 teletext decoding and display program
-
-DEPRECATED=	No more upstream
-EXPIRATION_DATE=	2012-07-13
-
-OPTIONS=	PNG		"Export pages as PNG image"	on \
-		SMALLFONT	"Use a smaller and thiner font"	off
-
-USE_XORG=	x11
-MAN1=		alevt.1x alevt-date.1 alevt-cap.1
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PNG)
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
-MAKE_ARGS+=	-DWITH_PNG
-.endif
-
-.if defined(WITH_SMALLFONT)
-MAKE_ARGS+=	-DWITH_SMALLFONT
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/alevt ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/alevt-date ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/alevt-cap ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/alevt.1x ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/alevt-date.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/alevt-cap.1 ${PREFIX}/man/man1
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/contrib/mini-alevt.xpm ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/contrib/icon-old.xbm ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/contrib/icon48x48.xpm ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/contrib/icon54x60.xpm ${DATADIR}
-
-.include <bsd.port.post.mk>
diff --git a/misc/alevt/distinfo b/misc/alevt/distinfo
deleted file mode 100644
index 6a555985828d..000000000000
--- a/misc/alevt/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (alevt-1.6.2.tar.gz) = 9347c2af4b528edec87df8a424ddccebcc252ca7a06f6b18310733cfa547e5f5
-SIZE (alevt-1.6.2.tar.gz) = 133234
diff --git a/misc/alevt/files/patch-aa b/misc/alevt/files/patch-aa
deleted file mode 100644
index 23bdb58d8a27..000000000000
--- a/misc/alevt/files/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.orig	2007-12-03 05:19:54.000000000 +0000
-+++ Makefile	2008-04-30 12:36:24.000000000 +0000
-@@ -1,37 +1,40 @@
- VER=1.6.2
--OPT=-O2 -s -w
--#OPT=-O -g
-+
-+.if defined(WITH_PNG)
- DEFS=-DWITH_PNG
-+PNG_LIBS=-L${LOCALBASE}/lib -lpng -lz -lm
-+.endif
-+
-+.if defined(WITH_SMALLFONT)
-+FONT=neep9
-+.else
- FONT=vtxt
--USR_X11R6=/usr/X11R6
-+.endif
-+
-+USR_X11R6=/usr/local
- #USR_X11R6=/usr
- MAN_DIR=man
- #MAN_DIR=share/man
- HOSTCC=$(CC)
--# a smaller and thinner font
--#FONT=neep9
- 
--CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
-+CFLAGS+=-DVERSION=\"$(VER)\" $(DEFS) -I${LOCALBASE}/include -W
-+X11_LIBS=-L${LOCALBASE}/lib -lX11
- 
- EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
- OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
- TOBJS=alevt-date.o vbi.o fdset.o misc.o hamm.o lang.o
- COBJS=alevt-cap.o vbi.o fdset.o misc.o hamm.o lang.o $(EXPOBJS)
- 
--ifneq ($(findstring WITH_PNG,$(DEFS)),)
--EXPLIBS=-lpng -lz -lm
--endif
--
- all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
- 
- alevt: $(OBJS)
--	$(CC) $(OPT) $(OBJS) -o alevt -L$(USR_X11R6)/lib -L$(USR_X11R6)/lib64 -lX11 $(EXPLIBS)
-+	$(CC) $(CFLAGS) $(OBJS) -o alevt $(PNG_LIBS) $(X11_LIBS)
- 
- alevt-date: $(TOBJS)
--	$(CC) $(OPT) $(TOBJS) -o alevt-date
-+	$(CC) $(CFLAGS) $(TOBJS) -o alevt-date
- 
- alevt-cap: $(COBJS)
--	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
-+	$(CC) $(CFLAGS) $(COBJS) -o alevt-cap $(PNG_LIBS)
- 
- font.o: font1.xbm font2.xbm
- fontsize.h: font1.xbm font2.xbm
diff --git a/misc/alevt/files/patch-ab b/misc/alevt/files/patch-ab
deleted file mode 100644
index b499e4a160a4..000000000000
--- a/misc/alevt/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- exp-html.c.orig	Tue Oct 17 21:28:30 2000
-+++ exp-html.c	Tue Aug 17 16:31:33 2004
-@@ -268,7 +268,12 @@
- 		  {
- 		    //if previous nbsp --> put semicolon!!!
- 		    if (nbsp) fputc(';',fp);
--		    fputc(pg->data[y][z].ch,fp);
-+
-+                    // Handle ascii characters which have HTML meanings
-+                    if (pg->data[y][z].ch == '<') fprintf(fp,"&lt;");
-+                    else if (pg->data[y][z].ch == '>') fprintf(fp,"&gt;");
-+                    else if (pg->data[y][z].ch == '&') fprintf(fp,"&amp;");
-+                    else fputc(pg->data[y][z].ch,fp);
- 		    last_space=0;
- 		    nbsp=0;
- 		  }
diff --git a/misc/alevt/files/patch-ac b/misc/alevt/files/patch-ac
deleted file mode 100644
index 9ecfa0504e21..000000000000
--- a/misc/alevt/files/patch-ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- lang.h.orig	Tue Aug 17 16:34:24 2004
-+++ lang.h	Tue Aug 17 16:34:36 2004
-@@ -19,4 +19,4 @@
- void add_enhance(struct enhance *eh, int dcode, u32 *data);
- void enhance(struct enhance *eh, struct vt_page *vtp);
- 
--#endif LANG_H
-+#endif /* LANG_H */
diff --git a/misc/alevt/files/patch-exp-gfx.c b/misc/alevt/files/patch-exp-gfx.c
deleted file mode 100644
index 5b042ea3dd74..000000000000
--- a/misc/alevt/files/patch-exp-gfx.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- exp-gfx.c.orig	2007-12-03 03:56:06.000000000 +0100
-+++ exp-gfx.c	2012-05-05 08:55:49.000000000 +0200
-@@ -6,6 +6,7 @@
- 
- #include "lang.h"
- #include "export.h"
-+#include "zlib.h"
- 
- #include "font.h"
- #define WW	(W*CW)			/* pixel width of window */
diff --git a/misc/alevt/files/patch-xio.c b/misc/alevt/files/patch-xio.c
deleted file mode 100644
index 9f8a5cd55ef6..000000000000
--- a/misc/alevt/files/patch-xio.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- xio.c.orig	2007-12-03 06:18:04.000000000 +0000
-+++ xio.c	2008-04-30 12:37:57.000000000 +0000
-@@ -156,6 +156,7 @@
- }
- 
- 
-+static void handle_event(); //forward ref
- 
- struct xio *
- xio_open_dpy(char *dpy, int argc, char **argv)
diff --git a/misc/alevt/pkg-descr b/misc/alevt/pkg-descr
deleted file mode 100644
index a87ac289fbb9..000000000000
--- a/misc/alevt/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-AleVT - By Edgar Toernig
-
-    This X11 program decodes and displays Videotext/Teletext read from
-    a /dev/vbi device (for example the Bt848/Bt878 frame grabber)
-
-    It features multiple windows, a page cache, regexp searching, built-in
-    manual, and more.
-    There's also a program to get the time from teletext.
-
-WWW: http://www.goron.de/~froese/
diff --git a/misc/alevt/pkg-plist b/misc/alevt/pkg-plist
deleted file mode 100644
index 03a374126bf9..000000000000
--- a/misc/alevt/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/alevt
-bin/alevt-date
-bin/alevt-cap
-%%DATADIR%%/icon-old.xbm
-%%DATADIR%%/icon48x48.xpm
-%%DATADIR%%/icon54x60.xpm
-%%DATADIR%%/mini-alevt.xpm
-@dirrm %%DATADIR%%
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 71a0d3e6aa6d..57eb70706086 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -203,7 +203,6 @@
     SUBDIR += mmpython
     SUBDIR += mmsclient
     SUBDIR += mmsrip
-    SUBDIR += moonlight
     SUBDIR += motion
     SUBDIR += mp3cd
     SUBDIR += mp4split
diff --git a/multimedia/moonlight/Makefile b/multimedia/moonlight/Makefile
deleted file mode 100644
index b98536304613..000000000000
--- a/multimedia/moonlight/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-# New ports collection makefile for:	moonlight
-# Date created:				Feb 13 2009
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	moonlight
-PORTVERSION=	2.2
-PORTREVISION=	4
-CATEGORIES=	multimedia www
-MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/moon/${PORTVERSION}/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		mono-${MONO_VERSION}${EXTRACT_SUFX} \
-		mono-basic-${MONO_BASIC_VERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	mono@FreeBSD.org
-COMMENT=	OpenSource Implementation of Silverlight
-
-DEPRECATED=	BROKEN for more than 6 month
-EXPIRATION_DATE=	2012-05-10
-
-BROKEN=		Basically does not work
-
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		execinfo.1:${PORTSDIR}/devel/libexecinfo
-
-USE_BISON=	build
-USE_GECKO=	libxul
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomedesktopsharp20
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-cairo=system \
-		--with-debug=yes \
-		--with-ff2=no \
-		--with-ff3=no \
-		--with-ff36=yes \
-		--with-mcspath=${MONODIR}/mcs/ \
-		--with-mono-basic-path=${MONOBASICDIR}/
-
-# LC_ALL is set in order to work around issues people are having when using
-# other languages.  This has shown itself in build fails and possibly other
-# strange crashes.
-MAKE_ENV+=	LC_ALL=C
-
-MONO_VERSION=	2.6.1
-MONO_BASIC_VERSION=2.6
-
-MONODIR=	${WRKDIR}/mono-${MONO_VERSION}
-MONOBASICDIR=	${WRKDIR}/mono-basic-${MONO_BASIC_VERSION}
-
-USE_WEBPLUGINS=		gecko19
-WEBPLUGINS_DIR=		${PREFIX}/lib/moonlight/plugin
-WEBPLUGINS_FILES=	libmoonloader.so \
-			libmoonplugin.so \
-			libmoonplugin-ff36bridge.so
-
-OPTIONS=	PULSEAUDIO "Build with PA (needed for sound support)" on
-
-MAN1=	mopen.1 mxap.1 respack.1 sockpol.1 svg2xaml.1 xamlg.1
-
-# Restrict to stable (even) versions, indicated by the second component.
-PORTSCOUT=	limitw:1,even
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
-
-.if ${ARCH} == "sparc64"
-IGNORE=		does not build: not yet ported to sparc64
-.endif
-
-.if ${OSVERSION} < 700000
-IGNORE=		does not build: requires posix_memalign(3)
-.endif
-
-.if !defined(WITHOUT_PULSEAUDIO)
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=--with-pulseaudio=yes
-.else
-CONFIGURE_ARGS+=--with-pulseaudio=no
-.endif
-
-# Building the .xpi doesn't actually require embedded cairo, but it's a safer option
-# as there's no way for firefox to detect if cairo is already installed apparently.
-.if defined(WITH_XPI_PLUGIN_ONLY)
-CONFIGURE_ARGS+=--enable-user-plugin --with-cairo=embedded
-PLIST=		${NONEXISTENT}
-PLIST_FILES=	${WEBPLUGINS_DIR}/${PKGNAME}-freebsd-${OSREL}.xpi
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/usr/bin/env bash|' \
-			${MONODIR}/mcs/class/Mono.WebBrowser/build-csproj2k5
-	@${REINPLACE_CMD} -e '/<malloc.h>/d' \
-			${WRKSRC}/src/runtime.cpp \
-			${WRKSRC}/src/xaml.cpp
-	@${REINPLACE_CMD} -e 's|\(^LIBS\) =|\1 = -lexecinfo|' \
-			${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|-ldl||' \
-			${WRKSRC}/plugin/Makefile.in
-
-pre-configure:
-	@( cd ${MONODIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} --with-profile2=no --with-moonlight=yes --with-profile4=no --with-monotouch=no --with-mcs-docs=no && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})
-
-.if defined(WITH_XPI_PLUGIN_ONLY)
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/plugin/install/novell-moonlight.xpi \
-		${WEBPLUGINS_DIR}/${PKGNAME}-freebsd-${OSREL}.xpi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/multimedia/moonlight/distinfo b/multimedia/moonlight/distinfo
deleted file mode 100644
index dcb97f7842aa..000000000000
--- a/multimedia/moonlight/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (moonlight-2.2.tar.bz2) = 599619b00b242f4dd3c678309e8461fc10c8dfce5d2594613052233bd90f3a98
-SIZE (moonlight-2.2.tar.bz2) = 8157240
-SHA256 (mono-2.6.1.tar.bz2) = 545661bf4573330247c7db533fe124484fcc8ddf14dcd95232f2af61d6229442
-SIZE (mono-2.6.1.tar.bz2) = 27618610
-SHA256 (mono-basic-2.6.tar.bz2) = 1491256de6bc793e0d4e2f5cf382cdd3b431edf34e9c56cd79b0771278f114c6
-SIZE (mono-basic-2.6.tar.bz2) = 1211592
diff --git a/multimedia/moonlight/files/patch-class_System.Windows_Mono_NativeDependencyObjectHelper.cs b/multimedia/moonlight/files/patch-class_System.Windows_Mono_NativeDependencyObjectHelper.cs
deleted file mode 100644
index 5d782e4e47f5..000000000000
--- a/multimedia/moonlight/files/patch-class_System.Windows_Mono_NativeDependencyObjectHelper.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- class/System.Windows/Mono/NativeDependencyObjectHelper.cs.orig
-+++ class/System.Windows/Mono/NativeDependencyObjectHelper.cs
-@@ -177,7 +177,6 @@
- 					throw new ExecutionEngineException ("multiple mappings registered for the same unmanaged peer");
- 	#endif
- 					Console.WriteLine ("multiple mappings registered for the same unmanaged peer 0x{0:x}, type = {1}", native, wrapper.GetType());
--					Console.WriteLine (Environment.StackTrace);
- 					return false;
- 				}
- 				
-@@ -229,7 +228,6 @@
- 			INativeEventObjectWrapper wrapper = CreateObject (k, ptr) as INativeEventObjectWrapper;
- 			if (wrapper == null){
- 				Report.Warning ("System.Windows: Returning a null object, did not know how to construct {0}", k);
--				Report.Warning (Environment.StackTrace);
- 			}
- 
- 			return wrapper;
diff --git a/multimedia/moonlight/files/patch-configure b/multimedia/moonlight/files/patch-configure
deleted file mode 100644
index 7eb717b40229..000000000000
--- a/multimedia/moonlight/files/patch-configure
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -17940,6 +17940,10 @@
- 			MOONLIGHT_CODEC_OSTYPE=linux
- 			CODECS_OS_SUPPORTED="yes"
- 			;;
-+		*-*-*freebsd*)
-+			MOONLIGHT_CODEC_OSTYPE=freebsd
-+			CODECS_OS_SUPPORTED="yes"
-+			;;
- 	esac
- 
- 	if test ${MOONLIGHT_CODEC_ARCH} = unknown; then
-@@ -20603,6 +20607,9 @@
- 		*linux*)
- 			TARGET_PLATFORM="Linux"
- 			;;
-+		*freebsd*)
-+			TARGET_PLATFORM="FreeBSD"
-+			;;
- 		*)
- 			{ { $as_echo "$as_me:$LINENO: error: Target os $target_os is unknown.
- 				Please add the appropriate string to configure.ac.
-@@ -20619,7 +20626,7 @@
- 			TARGET_PLATFORM="$TARGET_PLATFORM"_x86-gcc3
- 			INSTALL_ARCH=i586
- 			;;
--		x86_64)
-+		x86_64|amd64)
- 				TARGET_PLATFORM="$TARGET_PLATFORM"_x86_64-gcc3
- 			INSTALL_ARCH=x86_64
- 			;;
diff --git a/multimedia/moonlight/files/patch-m4_codecs.m4 b/multimedia/moonlight/files/patch-m4_codecs.m4
deleted file mode 100644
index 43814be520a1..000000000000
--- a/multimedia/moonlight/files/patch-m4_codecs.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- m4/codecs.m4.orig
-+++ m4/codecs.m4
-@@ -25,6 +25,10 @@
- 			MOONLIGHT_CODEC_OSTYPE=linux
- 			CODECS_OS_SUPPORTED="yes"
- 			;;
-+		*-*-*freebsd*)
-+			MOONLIGHT_CODEC_OSTYPE=freebsd
-+			CODECS_OS_SUPPORTED="yes"
-+			;;
- 	esac
- 
- 	if test ${MOONLIGHT_CODEC_ARCH} = unknown; then
diff --git a/multimedia/moonlight/files/patch-m4_firefox-xpi.m4 b/multimedia/moonlight/files/patch-m4_firefox-xpi.m4
deleted file mode 100644
index 688d3404d69f..000000000000
--- a/multimedia/moonlight/files/patch-m4_firefox-xpi.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD$
-
---- m4/firefox-xpi.m4.orig
-+++ m4/firefox-xpi.m4
-@@ -16,6 +16,9 @@
- 		*linux*)
- 			TARGET_PLATFORM="Linux"
- 			;;
-+		*freebsd*)
-+			TARGET_PLATFORM="FreeBSD"
-+			;;
- 		*)
- 			AC_MSG_ERROR([Target os $target_os is unknown.
- 				Please add the appropriate string to configure.ac.
-@@ -28,7 +31,7 @@
- 			TARGET_PLATFORM="$TARGET_PLATFORM"_x86-gcc3
- 			INSTALL_ARCH=i586
- 			;;
--		x86_64)
-+		x86_64|amd64)
- 				TARGET_PLATFORM="$TARGET_PLATFORM"_x86_64-gcc3
- 			INSTALL_ARCH=x86_64
- 			;;
diff --git a/multimedia/moonlight/files/patch-mono261-mono_mini_Makefile.in b/multimedia/moonlight/files/patch-mono261-mono_mini_Makefile.in
deleted file mode 100644
index 6ed6f535997e..000000000000
--- a/multimedia/moonlight/files/patch-mono261-mono_mini_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../mono-2.6.1/mono/mini/Makefile.in.orig	2010-03-03 02:13:10.000000000 +0900
-+++ ../mono-2.6.1/mono/mini/Makefile.in	2010-09-06 00:34:32.785545984 +0900
-@@ -258,7 +258,7 @@
- am__depfiles_maybe = depfiles
- am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
diff --git a/multimedia/moonlight/files/patch-plugin_plugin.cpp b/multimedia/moonlight/files/patch-plugin_plugin.cpp
deleted file mode 100644
index bfde8c1b7c9a..000000000000
--- a/multimedia/moonlight/files/patch-plugin_plugin.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- plugin/plugin.cpp.orig
-+++ plugin/plugin.cpp
-@@ -17,6 +17,7 @@
- #include <fcntl.h>
- #include <stdlib.h>
- #include <dlfcn.h>
-+#include <unistd.h>
- 
- #include "plugin.h"
- #include "plugin-spinner.h"
diff --git a/multimedia/moonlight/files/patch-src_application.cpp b/multimedia/moonlight/files/patch-src_application.cpp
deleted file mode 100644
index 33e57fa6525a..000000000000
--- a/multimedia/moonlight/files/patch-src_application.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/application.cpp.orig
-+++ src/application.cpp
-@@ -17,6 +17,10 @@
- #include <fcntl.h>
- #include <errno.h>
- 
-+#ifdef __FreeBSD__
-+#include <unistd.h>
-+#endif
-+
- #include "application.h"
- #include "runtime.h"
- #include "deployment.h"
-@@ -369,4 +373,4 @@
- 		Deployment::GetCurrent()->TrackPath (resource_root);
- 	}
- 	return resource_root;
--}
-\ No newline at end of file
-+}
diff --git a/multimedia/moonlight/files/patch-src_bitmapimage.cpp b/multimedia/moonlight/files/patch-src_bitmapimage.cpp
deleted file mode 100644
index 9bc492336d76..000000000000
--- a/multimedia/moonlight/files/patch-src_bitmapimage.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- src/bitmapimage.cpp.orig
-+++ src/bitmapimage.cpp
-@@ -16,6 +16,9 @@
- #include <glib/gstdio.h>
- #include <fcntl.h>
- #include <errno.h>
-+#ifdef __FreeBSD__
-+#include <unistd.h>
-+#endif
- 
- #include "application.h"
- #include "bitmapimage.h"
diff --git a/multimedia/moonlight/files/patch-src_debug.cpp b/multimedia/moonlight/files/patch-src_debug.cpp
deleted file mode 100644
index d8c584f0512f..000000000000
--- a/multimedia/moonlight/files/patch-src_debug.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/debug.cpp.orig	2009-01-13 19:41:33.000000000 +0000
-+++ src/debug.cpp	2009-02-12 17:50:56.000000000 +0000
-@@ -120,6 +120,19 @@
- 
- static Addr2LineData *addr2line_pipes = NULL;
- 
-+#ifndef getline
-+gint64
-+getline(char **buffer, size_t *len, FILE *stream)
-+{
-+	*buffer = (char *)calloc(1, 512); /* Should be plenty */
-+
-+	if (fgets(*buffer, 512, stream) == NULL)
-+		return -1;
-+	*len = strlen(*buffer);
-+	return *len;
-+}
-+#endif
-+
- static char*
- library_of_ip (gpointer ip, gpointer* base_address)
- {
diff --git a/multimedia/moonlight/files/patch-src_deployment.cpp b/multimedia/moonlight/files/patch-src_deployment.cpp
deleted file mode 100644
index ebd10a84bbb1..000000000000
--- a/multimedia/moonlight/files/patch-src_deployment.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- src/deployment.cpp.orig
-+++ src/deployment.cpp
-@@ -237,8 +237,8 @@
- 		}			
- 		
- 		if (mismatch) {
--			LOG_DEPLOYMENT ("Deployment::GetCurrent (): Domain mismatch, thread %u, (tls) deployment: %p, deployment->domain: %p, (mono_domain_get) current_domain: %p, root_domain: %p, hash deployment: %p\n",
--				(int) pthread_self (), deployment, deployment->domain, current_domain, root_domain, g_hash_table_lookup (current_hash, current_domain));
-+			LOG_DEPLOYMENT ("Deployment::GetCurrent (): Domain mismatch, thread %li, (tls) deployment: %p, deployment->domain: %p, (mono_domain_get) current_domain: %p, root_domain: %p, hash deployment: %p\n",
-+			(long)	pthread_self (), deployment, deployment->domain, current_domain, root_domain, g_hash_table_lookup (current_hash, current_domain));
- 			pthread_mutex_lock (&hash_mutex);
- 			deployment = (Deployment *) g_hash_table_lookup (current_hash, current_domain);
- 			pthread_mutex_unlock (&hash_mutex);
-@@ -270,9 +270,9 @@
- {
- #if DEBUG
- 	if (deployment && mono_domain_get () != deployment->domain) {
--		LOG_DEPLOYMENT ("Deployment::SetCurrent (%p), thread: %i domain mismatch, is: %p\n", deployment, (int) pthread_self (), mono_domain_get ());
-+		LOG_DEPLOYMENT ("Deployment::SetCurrent (%p), thread: %li domain mismatch, is: %p\n", deployment, (long) pthread_self (), mono_domain_get ());
- 	} else if (pthread_getspecific (tls_key) != deployment) {
--		LOG_DEPLOYMENT ("Deployment::SetCurrent (%p), thread: %i deployment mismatch, is: %p\n", deployment, (int) pthread_self (), pthread_getspecific (tls_key));
-+		LOG_DEPLOYMENT ("Deployment::SetCurrent (%p), thread: %li deployment mismatch, is: %p\n", deployment, (long) pthread_self (), pthread_getspecific (tls_key));
- 	}
- #endif
- 	
diff --git a/multimedia/moonlight/files/patch-src_easing.cpp b/multimedia/moonlight/files/patch-src_easing.cpp
deleted file mode 100644
index 49974c3cac5c..000000000000
--- a/multimedia/moonlight/files/patch-src_easing.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- src/easing.cpp.orig
-+++ src/easing.cpp
-@@ -16,7 +16,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __FreeBSD__
- #include <malloc.h>
-+#endif
- #include <math.h>
- 
- #include <runtime.h>
diff --git a/multimedia/moonlight/files/patch-src_file-downloader.cpp b/multimedia/moonlight/files/patch-src_file-downloader.cpp
deleted file mode 100644
index 2420a5b21c5f..000000000000
--- a/multimedia/moonlight/files/patch-src_file-downloader.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- src/file-downloader.cpp.orig
-+++ src/file-downloader.cpp
-@@ -17,6 +17,9 @@
- #include <glib/gstdio.h>
- #include <fcntl.h>
- #include <errno.h>
-+#ifdef __FreeBSD__
-+#include <unistd.h>
-+#endif
- 
- #include "file-downloader.h"
- #include "zip/unzip.h"
diff --git a/multimedia/moonlight/files/patch-src_pipeline-ui.cpp b/multimedia/moonlight/files/patch-src_pipeline-ui.cpp
deleted file mode 100644
index 79fc0b72705c..000000000000
--- a/multimedia/moonlight/files/patch-src_pipeline-ui.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/pipeline-ui.cpp.orig
-+++ src/pipeline-ui.cpp
-@@ -310,7 +310,7 @@
- 		if (env_url != NULL)
- 			dl->Open ("GET", env_url, NoPolicy);
- 		else
--			dl->Open ("GET", CODEC_URL, NoPolicy);
-+			dl->Open ("GET", "", NoPolicy);
- 		
- 		dl->Send ();
- 
diff --git a/multimedia/moonlight/files/patch-src_pipeline.cpp b/multimedia/moonlight/files/patch-src_pipeline.cpp
deleted file mode 100644
index 205ce11f56e7..000000000000
--- a/multimedia/moonlight/files/patch-src_pipeline.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-
-$FreeBSD$
-
---- src/pipeline.cpp.orig
-+++ src/pipeline.cpp
-@@ -40,6 +40,23 @@
- #include "deployment.h"
- #include "timesource.h"
- 
-+#ifdef __FreeBSD__
-+int
-+sigisemptyset(sigset_t *set)
-+{
-+	sigset_t empty;
-+	int ret = sigemptyset (&empty);
-+	if (ret == 0) {
-+		if (0 == memcmp (&empty, set, sizeof (sigset_t)))
-+			ret = 1;
-+		else
-+			ret = 0;
-+	}
-+
-+	return ret;
-+}
-+#endif
-+
- /*
-  * Media
-  */
-@@ -2260,7 +2277,7 @@
- 	}
- 	pthread_mutex_unlock (&mutex);
- 	
--	LOG_PIPELINE ("MediaThreadPool::WorkerLoop () %u: Started thread with index %i.\n", (int) pthread_self (), self_index);
-+	LOG_PIPELINE ("MediaThreadPool::WorkerLoop () %lu: Started thread with index %i.\n", (long) pthread_self (), self_index);
- 	
- 	g_return_val_if_fail (self_index >= 0, NULL);
- 	
-@@ -2316,11 +2333,11 @@
- 		
- 		media->SetCurrentDeployment (true, true);
- 
--		LOG_FRAMEREADERLOOP ("MediaThreadLoop::WorkerLoop () %u: got %s %p for media %p on deployment %p, there are %d nodes left.\n", (int) pthread_self (), node->closure->GetDescription (), node, media, media->GetDeployment (), queue ? queue->Length () : -1);
-+		LOG_FRAMEREADERLOOP ("MediaThreadLoop::WorkerLoop () %lu: got %s %p for media %p on deployment %p, there are %d nodes left.\n", (long) pthread_self (), node->closure->GetDescription (), node, media, media->GetDeployment (), queue ? queue->Length () : -1);
- 		
- 		node->closure->Call ();
- 		
--		LOG_FRAMEREADERLOOP ("MediaThreadLoop::WorkerLoop () %u: processed node %p\n", (int) pthread_self (), node);
-+		LOG_FRAMEREADERLOOP ("MediaThreadLoop::WorkerLoop () %lu: processed node %p\n", (long) pthread_self (), node);
- 		
- 		delete node;
- 	}
-@@ -2333,7 +2350,7 @@
- 		pthread_cond_signal (&completed_condition);
- 	pthread_mutex_unlock (&mutex);
- 	
--	LOG_PIPELINE ("MediaThreadPool::WorkerLoop () %u: Exited (index: %i).\n", (int) pthread_self (), self_index);
-+	LOG_PIPELINE ("MediaThreadPool::WorkerLoop () %lu: Exited (index: %i).\n", (long) pthread_self (), self_index);
- 	
- 	return NULL;
- }
diff --git a/multimedia/moonlight/files/patch-src_utils.cpp b/multimedia/moonlight/files/patch-src_utils.cpp
deleted file mode 100644
index d363fd459082..000000000000
--- a/multimedia/moonlight/files/patch-src_utils.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- src/utils.cpp.orig
-+++ src/utils.cpp
-@@ -16,6 +16,9 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <stdlib.h>
-+#ifdef __FreeBSD__
-+#include <unistd.h>
-+#endif
- 
- #include "utils.h"
- #include "application.h"
diff --git a/multimedia/moonlight/files/patch-src_utils.h b/multimedia/moonlight/files/patch-src_utils.h
deleted file mode 100644
index b2fbf6214854..000000000000
--- a/multimedia/moonlight/files/patch-src_utils.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils.h.orig	2009-02-12 20:41:44.000000000 +0000
-+++ src/utils.h	2009-02-12 20:42:46.000000000 +0000
-@@ -14,6 +14,8 @@
- #ifndef __MOON_GARRAY_EXT_H__
- #define __MOON_GARRAY_EXT_H__
- 
-+#include <sys/types.h>
-+
- #include <glib.h>
- #include <cairo.h>
- 
diff --git a/multimedia/moonlight/pkg-descr b/multimedia/moonlight/pkg-descr
deleted file mode 100644
index 980989e499c8..000000000000
--- a/multimedia/moonlight/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Moonlight is a free and open-source implementation of the Silverlight
-web application framework which was originally developed by Microsoft.
-Moonlight is currently being developed by the Mono Project
-
-WWW: http://www.mono-project.com/Moonlight
diff --git a/multimedia/moonlight/pkg-plist b/multimedia/moonlight/pkg-plist
deleted file mode 100644
index 59195dda2cff..000000000000
--- a/multimedia/moonlight/pkg-plist
+++ /dev/null
@@ -1,127 +0,0 @@
-bin/mopen
-bin/munxap
-bin/mxap
-bin/respack
-bin/smcs
-bin/sockpol
-bin/unrespack
-bin/xaml2html
-bin/xamlg
-lib/libmoon.la
-lib/libmoon.so
-lib/libmoon.so.0
-lib/mono/gac/Moon.Windows.Desktop/3.0.0.0__0738eb9f132ed756/Moon.Windows.Desktop.dll
-lib/mono/gac/Moon.Windows.Desktop/3.0.0.0__0738eb9f132ed756/Moon.Windows.Desktop.dll.mdb
-lib/mono/gac/Moonlight.Gtk/3.0.0.0__976ad8f3443f9a4d/Moonlight.Gtk.dll
-lib/mono/gac/Moonlight.Gtk/3.0.0.0__976ad8f3443f9a4d/Moonlight.Gtk.dll.mdb
-lib/mono/gac/System.Windows.Browser/3.0.0.0__0738eb9f132ed756/System.Windows.Browser.dll
-lib/mono/gac/System.Windows.Browser/3.0.0.0__0738eb9f132ed756/System.Windows.Browser.dll.mdb
-lib/mono/gac/System.Windows.Controls.Data/2.0.5.0__0738eb9f132ed756/System.Windows.Controls.Data.dll
-lib/mono/gac/System.Windows.Controls.Data/2.0.5.0__0738eb9f132ed756/System.Windows.Controls.Data.dll.mdb
-lib/mono/gac/System.Windows.Controls/2.0.5.0__0738eb9f132ed756/System.Windows.Controls.dll
-lib/mono/gac/System.Windows.Controls/2.0.5.0__0738eb9f132ed756/System.Windows.Controls.dll.mdb
-lib/mono/gac/System.Windows/3.0.0.0__0738eb9f132ed756/System.Windows.dll
-lib/mono/gac/System.Windows/3.0.0.0__0738eb9f132ed756/System.Windows.dll.config
-lib/mono/gac/System.Windows/3.0.0.0__0738eb9f132ed756/System.Windows.dll.mdb
-lib/mono/moonlight/Moon.Windows.Desktop.dll
-lib/mono/moonlight/Moonlight.Gtk.dll
-lib/mono/moonlight/System.Windows.Browser.dll
-lib/mono/moonlight/System.Windows.Controls.Data.dll
-lib/mono/moonlight/System.Windows.Controls.dll
-lib/mono/moonlight/System.Windows.dll
-lib/monodoc/sources/moonlight-gtk.source
-lib/monodoc/sources/moonlight-gtk.tree
-lib/monodoc/sources/moonlight-gtk.zip
-lib/moonlight/2.0-redist/System.Windows.Controls.Data.dll
-lib/moonlight/2.0-redist/System.Windows.Controls.Data.dll.mdb
-lib/moonlight/2.0-redist/System.Windows.Controls.dll
-lib/moonlight/2.0-redist/System.Windows.Controls.dll.mdb
-lib/moonlight/2.0-redist/System.Xml.Linq.dll
-lib/moonlight/2.0-redist/System.Xml.Linq.dll.mdb
-lib/moonlight/2.0/Microsoft.VisualBasic.dll
-lib/moonlight/2.0/Mono.CompilerServices.SymbolWriter.dll
-lib/moonlight/2.0/Mono.CompilerServices.SymbolWriter.dll.mdb
-lib/moonlight/2.0/System.Core.dll
-lib/moonlight/2.0/System.Core.dll.mdb
-lib/moonlight/2.0/System.Net.dll
-lib/moonlight/2.0/System.Net.dll.mdb
-lib/moonlight/2.0/System.Runtime.Serialization.dll
-lib/moonlight/2.0/System.Runtime.Serialization.dll.mdb
-lib/moonlight/2.0/System.ServiceModel.Web.dll
-lib/moonlight/2.0/System.ServiceModel.Web.dll.mdb
-lib/moonlight/2.0/System.ServiceModel.dll
-lib/moonlight/2.0/System.ServiceModel.dll.mdb
-lib/moonlight/2.0/System.Windows.Browser.dll
-lib/moonlight/2.0/System.Windows.Browser.dll.mdb
-lib/moonlight/2.0/System.Windows.dll
-lib/moonlight/2.0/System.Windows.dll.mdb
-lib/moonlight/2.0/System.Xml.dll
-lib/moonlight/2.0/System.Xml.dll.mdb
-lib/moonlight/2.0/System.dll
-lib/moonlight/2.0/System.dll.mdb
-lib/moonlight/2.0/buildversion
-lib/moonlight/2.0/mscorlib.dll
-lib/moonlight/2.0/mscorlib.dll.mdb
-lib/moonlight/2.0/respack.exe
-lib/moonlight/2.0/respack.exe.mdb
-lib/moonlight/2.0/smcs
-lib/moonlight/2.0/smcs.exe
-lib/moonlight/2.0/smcs.exe.mdb
-lib/moonlight/mopen.exe
-lib/moonlight/mopen.exe.config
-lib/moonlight/mopen.exe.mdb
-lib/moonlight/munxap.exe
-lib/moonlight/mxap.exe
-lib/moonlight/plugin/Microsoft.VisualBasic.dll
-lib/moonlight/plugin/System.Core.dll
-lib/moonlight/plugin/System.Core.dll.mdb
-lib/moonlight/plugin/System.Net.dll
-lib/moonlight/plugin/System.Net.dll.mdb
-lib/moonlight/plugin/System.Runtime.Serialization.dll
-lib/moonlight/plugin/System.Runtime.Serialization.dll.mdb
-lib/moonlight/plugin/System.ServiceModel.Web.dll
-lib/moonlight/plugin/System.ServiceModel.Web.dll.mdb
-lib/moonlight/plugin/System.ServiceModel.dll
-lib/moonlight/plugin/System.ServiceModel.dll.mdb
-lib/moonlight/plugin/System.Windows.Browser.dll
-lib/moonlight/plugin/System.Windows.Browser.dll.mdb
-lib/moonlight/plugin/System.Windows.dll
-lib/moonlight/plugin/System.Windows.dll.config
-lib/moonlight/plugin/System.Windows.dll.mdb
-lib/moonlight/plugin/System.Xml.dll
-lib/moonlight/plugin/System.Xml.dll.mdb
-lib/moonlight/plugin/System.dll
-lib/moonlight/plugin/System.dll.mdb
-lib/moonlight/plugin/libmoonloader.la
-lib/moonlight/plugin/libmoonloader.so
-lib/moonlight/plugin/libmoonplugin-ff36bridge.la
-lib/moonlight/plugin/libmoonplugin-ff36bridge.so
-lib/moonlight/plugin/libmoonplugin.la
-lib/moonlight/plugin/libmoonplugin.so
-lib/moonlight/plugin/mscorlib.dll
-lib/moonlight/plugin/mscorlib.dll.mdb
-lib/moonlight/respack.exe
-lib/moonlight/sockpol.exe
-lib/moonlight/xaml2html.exe
-lib/moonlight/xamlg.exe
-share/pkgconfig/moonlight-desktop-2.0.pc
-share/pkgconfig/moonlight-gtk-2.0.pc
-share/pkgconfig/moonlight-web-2.0.pc
-@dirrm share/pkgconfig
-@dirrm lib/moonlight/plugin
-@dirrm lib/moonlight/2.0-redist
-@dirrm lib/moonlight/2.0
-@dirrm lib/moonlight
-@dirrm lib/mono/moonlight
-@dirrm lib/mono/gac/System.Windows/3.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/System.Windows.Controls/2.0.5.0__0738eb9f132ed756
-@dirrm lib/mono/gac/System.Windows.Controls.Data/2.0.5.0__0738eb9f132ed756
-@dirrm lib/mono/gac/System.Windows.Controls.Data
-@dirrm lib/mono/gac/System.Windows.Controls
-@dirrm lib/mono/gac/System.Windows.Browser/3.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/System.Windows.Browser
-@dirrm lib/mono/gac/System.Windows
-@dirrm lib/mono/gac/Moonlight.Gtk/3.0.0.0__976ad8f3443f9a4d
-@dirrm lib/mono/gac/Moonlight.Gtk
-@dirrm lib/mono/gac/Moon.Windows.Desktop/3.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Moon.Windows.Desktop