svn commit: r399011 - in head/multimedia/xvid: . files

[Thomas Zander]

Author: riggs
Date: Sat Oct 10 18:49:44 2015
New Revision: 399011
URL: https://svnweb.freebsd.org/changeset/ports/399011

Log:
  Update to upstream version 1.3.4 [1], take maintainership [2]
  
  While on it:
  - Handle CFLAGS with xvid's build system [2]
  - Remove superfluous ln -sf in post-patch (now handled by
    xvid's build system) [2]
  - Pet portlint [2]
  
  PR:		203626
  Submitted by:	w.litter at aon.at [1]
  Reviewed by:	riggs [2]

Added:
  head/multimedia/xvid/files/extra-patch-cflags   (contents, props changed)
Deleted:
  head/multimedia/xvid/files/patch-configure
Modified:
  head/multimedia/xvid/Makefile
  head/multimedia/xvid/distinfo

Modified: head/multimedia/xvid/Makefile
==============================================================================
--- head/multimedia/xvid/Makefile	Sat Oct 10 17:46:45 2015	(r399010)
+++ head/multimedia/xvid/Makefile	Sat Oct 10 18:49:44 2015	(r399011)
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	xvid
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xvid.org/downloads/
 DISTNAME=	${PORTNAME}core-${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	riggs at FreeBSD.org
 COMMENT=	Opensource MPEG-4 codec, based on OpenDivx
 
 LICENSE=	GPLv2 # or later
@@ -25,7 +24,8 @@ CONFIGURE_ENV+=	ac_cv_prog_ac_yasm=no
 PLIST_FILES=	include/xvid.h \
 		lib/libxvidcore.a \
 		lib/libxvidcore.so \
-		lib/libxvidcore.so.4
+		lib/libxvidcore.so.4 \
+		lib/libxvidcore.so.4.3
 
 WRKSRC=		${WRKDIR}/xvidcore/build/generic
 
@@ -41,11 +41,11 @@ BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/n
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS=		# let xvid's build system decide about those
+# let xvid's build system override CFLAGS
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cflags
 .endif
 
 post-install:
-	@${LN} -sf libxvidcore.so.4 ${STAGEDIR}${PREFIX}/lib/libxvidcore.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxvidcore.so
 
 .include <bsd.port.post.mk>

Modified: head/multimedia/xvid/distinfo
==============================================================================
--- head/multimedia/xvid/distinfo	Sat Oct 10 17:46:45 2015	(r399010)
+++ head/multimedia/xvid/distinfo	Sat Oct 10 18:49:44 2015	(r399011)
@@ -1,2 +1,2 @@
-SHA256 (xvidcore-1.3.2.tar.gz) = 84532724c47f452d1167962e64a7cf34fc22c26f6d3b7afa7304a3765e97689a
-SIZE (xvidcore-1.3.2.tar.gz) = 817743
+SHA256 (xvidcore-1.3.4.tar.gz) = 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f
+SIZE (xvidcore-1.3.4.tar.gz) = 818067

Added: head/multimedia/xvid/files/extra-patch-cflags
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/xvid/files/extra-patch-cflags	Sat Oct 10 18:49:44 2015	(r399011)
@@ -0,0 +1,15 @@
+--- configure.orig	2015-06-21 14:21:32 UTC
++++ configure
+@@ -2503,9 +2503,9 @@ if test  x"$CFLAGS" = x"" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+-   force_default_cc_options="no"
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++   force_default_cc_options="yes"
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
+ 
+ ac_ext=c