Repo-move graphics/xmms-avi to multimedia/xmms-avi.

9 files changed, 4 insertions, 53 deletions

diff --git a/MOVED b/MOVED
index b0452344c1dd..bbf4289a0e63 100644
--- a/MOVED
+++ b/MOVED
@@ -56,3 +56,4 @@ sysutils/pkgview|sysutils/gnome-pkgview|2002-11-20|author has changed the binary
 japanese/tvi||2002-11-21|development discontinued and distfile unavailable
 textproc/pt-aspell|portuguese/aspell|2002-11-21|new category
 math/p5-Math-Financial|finance/p5-Math-Financial|2002-11-21|new category
+graphics/xmms-avi|multimedia/xmms-avi|2002-11-21|new category
diff --git a/graphics/Makefile b/graphics/Makefile
index f46af272feea..8ab8091ba342 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 #
-    SUBDIR += zphoto
 
     SUBDIR += 4va
     SUBDIR += Cgraph
@@ -428,7 +427,6 @@
     SUBDIR += xmandel
     SUBDIR += xmedcon
     SUBDIR += xmfract
-    SUBDIR += xmms-avi
     SUBDIR += xmms-blursk
     SUBDIR += xmms-finespectrum
     SUBDIR += xmms-fishmatic
@@ -462,5 +460,6 @@
     SUBDIR += xwpick
     SUBDIR += xzgv
     SUBDIR += zimg
+    SUBDIR += zphoto
 
 .include <bsd.port.subdir.mk>
diff --git a/graphics/xmms-avi/Makefile b/graphics/xmms-avi/Makefile
deleted file mode 100644
index 4f59f238b581..000000000000
--- a/graphics/xmms-avi/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Ports collection makefile for:  xmms-avi
-# Date created:			  Feb 6 2000
-# Whom:				  Roman Shterenzon <roman@xpert.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xmms-avi
-PORTVERSION=	1.2.2
-CATEGORIES=	graphics
-MASTER_SITES=	http://www.xmms.org/files/plugins/avi-xmms/ \
-		ftp://ftp.sunet.se/pub/multimedia/xmms/plugins/avi-xmms/ \
-		ftp://ftp.fu-berlin.de/unix/sound/xmms/plugins/avi-xmms/
-DISTNAME=	avi-xmms-${PORTVERSION}
-
-MAINTAINER=	roman@xpert.com
-
-BROKEN=		Maintainer is working on a fix
-
-BUILD_DEPENDS=	xmms-config:${PORTSDIR}/audio/xmms
-LIB_DEPENDS=	aviplay-0.7.0:${PORTSDIR}/graphics/avifile
-RUN_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
-
-SDL_CONFIG?=    ${LOCALBASE}/bin/sdl11-config
-
-ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
-
-pre-patch:
-	@${PERL} -pi.orig -e "s|SDL/SDL.h|SDL11/SDL.h|g" ${WRKSRC}/src/ctrackbar.cpp
-	@${PERL} -pi.orig -e "s|lc_r|pthread|g" ${WRKSRC}/configure
-
-# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/Input
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/libavixmms.so ${PREFIX}/lib/xmms/Input
-
-.include <bsd.port.mk>
diff --git a/graphics/xmms-avi/distinfo b/graphics/xmms-avi/distinfo
deleted file mode 100644
index 8d2256e3c845..000000000000
--- a/graphics/xmms-avi/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (avi-xmms-1.2.2.tar.gz) = 0532dce534cf6f7ba1d1563547128659
diff --git a/graphics/xmms-avi/pkg-comment b/graphics/xmms-avi/pkg-comment
deleted file mode 100644
index caa45901bf15..000000000000
--- a/graphics/xmms-avi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An avifile based .avi and .asf file playback plugin for XMMS
diff --git a/graphics/xmms-avi/pkg-descr b/graphics/xmms-avi/pkg-descr
deleted file mode 100644
index 9cd998442dde..000000000000
--- a/graphics/xmms-avi/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-An avifile and SDL based .avi and .asf file playback plugin for XMMS.
-
-WWW: http://www.xmms.org/
-
-Roman Shterenzon <roman@xpert.com>
diff --git a/graphics/xmms-avi/pkg-plist b/graphics/xmms-avi/pkg-plist
deleted file mode 100644
index 24cad51e2343..000000000000
--- a/graphics/xmms-avi/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-lib/xmms/Input/libavixmms.so
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 4c3738f7e9d7..62a938d14c88 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -2,6 +2,6 @@
 #
     SUBDIR += gtksubtitler
     SUBDIR += ksubeditor
-    SUBDIR += 
+    SUBDIR += xmms-avi
 
 .include <bsd.port.subdir.mk>
diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile
index 4f59f238b581..3a2ceff9c32d 100644
--- a/multimedia/xmms-avi/Makefile
+++ b/multimedia/xmms-avi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-avi
 PORTVERSION=	1.2.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.xmms.org/files/plugins/avi-xmms/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/plugins/avi-xmms/ \
 		ftp://ftp.fu-berlin.de/unix/sound/xmms/plugins/avi-xmms/