From owner-svn-ports-all@FreeBSD.ORG  Tue Jul 22 09:33:38 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4281B312;
 Tue, 22 Jul 2014 09:33:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2E12A2079;
 Tue, 22 Jul 2014 09:33:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6M9XcVa084551;
 Tue, 22 Jul 2014 09:33:38 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6M9XbP3084546;
 Tue, 22 Jul 2014 09:33:37 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201407220933.s6M9XbP3084546@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Tue, 22 Jul 2014 09:33:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r362526 - in head/graphics/libvisual04: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jul 2014 09:33:38 -0000

Author: kwm
Date: Tue Jul 22 09:33:37 2014
New Revision: 362526
URL: http://svnweb.freebsd.org/changeset/ports/362526
QAT: https://qat.redports.org/buildarchive/r362526/

Log:
  Don't attempt to define NULL if it is already set.
  
  Approved by:	maintainer (via e-mail)

Modified:
  head/graphics/libvisual04/Makefile
  head/graphics/libvisual04/files/patch-libvisual-lv_defines.h

Modified: head/graphics/libvisual04/Makefile
==============================================================================
--- head/graphics/libvisual04/Makefile	Tue Jul 22 09:09:19 2014	(r362525)
+++ head/graphics/libvisual04/Makefile	Tue Jul 22 09:33:37 2014	(r362526)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libvisual
 PORTVERSION=	0.4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	04

Modified: head/graphics/libvisual04/files/patch-libvisual-lv_defines.h
==============================================================================
--- head/graphics/libvisual04/files/patch-libvisual-lv_defines.h	Tue Jul 22 09:09:19 2014	(r362525)
+++ head/graphics/libvisual04/files/patch-libvisual-lv_defines.h	Tue Jul 22 09:33:37 2014	(r362526)
@@ -1,10 +1,12 @@
---- lv_defines.h.orig	2006-01-22 13:23:37.000000000 +0000
-+++ libvisual/lv_defines.h	2014-06-24 19:56:46.961214708 +0100
-@@ -39,14 +39,13 @@
+--- libvisual/lv_defines.h.orig	2006-01-22 14:23:37.000000000 +0100
++++ libvisual/lv_defines.h	2014-07-21 15:18:07.000000000 +0200
+@@ -38,15 +38,14 @@
+ # define VISUAL_END_DECLS
  #endif /* __cplusplus */
  
- #ifdef NULL
+-#ifdef NULL
 -#undef NULL
++#ifndef NULL
 +# ifndef __cplusplus
 +#   define NULL ((void *) 0)
 +# else