--- xvid/Makefile	2008-12-19 21:12:18.000000000 -0500
+++ xvid/Makefile	2008-12-19 21:26:56.000000000 -0500
@@ -6,8 +6,7 @@ 
 #
 
 PORTNAME=	xvid
-PORTVERSION=	1.1.3
-PORTEPOCH=	1
+PORTVERSION=	1.2.1
 PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xvid.org/downloads/
@@ -24,7 +23,7 @@ 
 		lib/libxvidcore.so \
 		lib/libxvidcore.so.4
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/build/generic
+WRKSRC=		${WRKDIR}/xvidcore/build/generic
 
 OPTIONS=	OPTIMIZED_CFLAGS "Use XviD's default optimizations" off
 
--- xvid/distinfo	2008-12-19 21:12:18.000000000 -0500
+++ xvid/distinfo	2008-12-19 21:12:57.000000000 -0500
@@ -1,3 +1,3 @@ 
-MD5 (xvidcore-1.1.3.tar.gz) = 9eaf362c2ba1265dab916b4a92bd2e27
-SHA256 (xvidcore-1.1.3.tar.gz) = 9ca2ef7df00c617efa4f8b0226b9f6d80dc608ff13492d8952a773721ff06b08
-SIZE (xvidcore-1.1.3.tar.gz) = 739591
+MD5 (xvidcore-1.2.1.tar.gz) = 3f57b3e153687fddefc9ccdf0dc737b7
+SHA256 (xvidcore-1.2.1.tar.gz) = 79456bcc039b0a1f871231c235f12ee80b299b558e309bb9e1a79e3e0556732a
+SIZE (xvidcore-1.2.1.tar.gz) = 742501
--- xvid/files/patch-src_quant_quant.h	2008-12-19 21:12:18.000000000 -0500
+++ xvid/files/patch-src_quant_quant.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@ 
---- ../../src/quant/quant.h.orig	Wed Jan 10 22:31:55 2007
-+++ ../../src/quant/quant.h	Wed Jan 10 22:33:43 2007
-@@ -91,7 +91,7 @@
- #endif
- 
- #ifdef ARCH_IS_IA64
--quant_intraFunc dequant_h263_intra_ia64
-+quant_intraFunc dequant_h263_intra_ia64;
- #endif
- 
- #ifdef ARCH_IS_PPC