Update to xvidcore 1.3.3.

ok zhuk@

multimedia/xvidcore/Makefile

@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.17 2013/03/11 11:35:45 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2014/09/19 01:44:46 brad Exp $
 
 COMMENT=	ISO MPEG-4 compliant video codec
 
-DISTNAME=	xvidcore-1.3.2
-REVISION=	2
+DISTNAME=	xvidcore-1.3.3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xvid.org/downloads/
+EXTRACT_SUFX=	.tar.bz2
 
-SHARED_LIBS=	xvidcore	4.3
+SHARED_LIBS=	xvidcore	4.4
 
 HOMEPAGE=	http://www.xvid.org/
 

multimedia/xvidcore/distinfo

@@ -1,5 +1,2 @@
-MD5 (xvidcore-1.3.2.tar.gz) = h8jPe2nr7ZPC2C6lcJ0Jig==
-RMD160 (xvidcore-1.3.2.tar.gz) = nGhhPan1orKZiPXgvty1y1mVdDg=
-SHA1 (xvidcore-1.3.2.tar.gz) = VuBl0zFUWt4ExjyRFTuWJLUdbhs=
-SHA256 (xvidcore-1.3.2.tar.gz) = hFMnJMR/RS0RZ5YuZKfPNPwiwm9tO3r6cwSjdl6XaJo=
-SIZE (xvidcore-1.3.2.tar.gz) = 817743
+SHA256 (xvidcore-1.3.3.tar.bz2) = sOG6gFp3b3keRQQLmqoNfKbQyx5Imcf97SdftXE5r1Q=
+SIZE (xvidcore-1.3.3.tar.bz2) = 695279

multimedia/xvidcore/patches/patch-build_generic_Makefile

@@ -1,6 +1,6 @@
-$OpenBSD: patch-build_generic_Makefile,v 1.4 2011/08/30 18:53:24 jasper Exp $
---- build/generic/Makefile.orig	Thu May 19 04:27:26 2011
-+++ build/generic/Makefile	Wed Jun 15 14:46:05 2011
+$OpenBSD: patch-build_generic_Makefile,v 1.5 2014/09/19 01:44:46 brad Exp $
+--- build/generic/Makefile.orig	Tue Apr  8 16:41:05 2014
++++ build/generic/Makefile	Tue Sep  2 16:44:15 2014
 @@ -46,6 +46,7 @@ include platform.inc
  endif
  
@@ -36,3 +36,12 @@ $OpenBSD: patch-build_generic_Makefile,v 1.4 2011/08/30 18:53:24 jasper Exp $
  
  #-----------------------------------------------------------------------------
  # Shared Library
+@@ -134,7 +135,7 @@ $(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)
+ 	@echo "  L: $(@F)"
+ 	@$(INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
+ 	@$(INSTALL) -m 644 libxvidcore.ld $(BUILD_DIR)/libxvidcore.ld
+-	@cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
++	cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
+ 
+ #-----------------------------------------------------------------------------
+ # Installation

multimedia/xvidcore/patches/patch-build_generic_configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-build_generic_configure,v 1.8 2012/08/27 09:34:43 jasper Exp $
---- build/generic/configure.orig	Mon May 23 06:22:01 2011
-+++ build/generic/configure	Thu Aug 16 20:29:44 2012
-@@ -2243,8 +2243,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+$OpenBSD: patch-build_generic_configure,v 1.9 2014/09/19 01:44:46 brad Exp $
+--- build/generic/configure.orig	Tue Apr  8 16:41:05 2014
++++ build/generic/configure	Tue Sep  2 16:41:41 2014
+@@ -2269,8 +2269,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
@@ -10,16 +10,16 @@ $OpenBSD: patch-build_generic_configure,v 1.8 2012/08/27 09:34:43 jasper Exp $
  
  minimum_yasm_major_version=1
  minimum_nasm_minor_version=0
-@@ -4333,7 +4331,7 @@ $as_echo "ok" >&6; }
- $as_echo "ok" >&6; }
- 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+@@ -4379,7 +4377,7 @@ $as_echo "ok" >&6; }
  	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
+ 	SO_API_MAJOR_LINK="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
+ 	SO_LINK="libxvidcore.\$(SHARED_EXTENSION)"
 -	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
 +	SPECIFIC_LDFLAGS="-shared -fPIC -lm"
  	SPECIFIC_CFLAGS="-fPIC"
  	;;
       [cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)
-@@ -4597,7 +4595,7 @@ $as_echo "macho32" >&6; }
+@@ -4651,7 +4649,7 @@ $as_echo "macho32" >&6; }
  
         AS="$chosen_asm_prog"
         ASSEMBLY_EXTENSION="asm"

multimedia/xvidcore/patches/patch-src_global_h

@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_global_h,v 1.2 2011/03/20 23:49:33 edd Exp $
---- src/global.h.orig	Sun Nov 28 10:18:21 2010
-+++ src/global.h	Sat Mar  5 16:34:26 2011
-@@ -251,8 +251,12 @@ get_dc_scaler(uint32_t quant,
- 
- /* useful macros */
- 
-+#ifndef MIN
- #define MIN(X, Y) ((X)<(Y)?(X):(Y))
-+#endif
-+#ifndef MAX
- #define MAX(X, Y) ((X)>(Y)?(X):(Y))
-+#endif
- /* #define ABS(X)    (((X)>0)?(X):-(X)) */
- #define SIGN(X)   (((X)>0)?1:-1)
- #define CLIP(X,AMIN,AMAX)   (((X)<(AMIN)) ? (AMIN) : ((X)>(AMAX)) ? (AMAX) : (X))

multimedia/xvidcore/pkg/PFRAG.shared

@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2006/01/08 22:12:38 jakemsr Exp $
-@lib lib/libxvidcore.so.${LIBxvidcore_VERSION}

multimedia/xvidcore/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/08/30 18:53:24 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2014/09/19 01:44:47 brad Exp $
 include/xvid.h
 lib/libxvidcore.a
-%%SHARED%%
+@lib lib/libxvidcore.so.${LIBxvidcore_VERSION}