From c02ee4e45334244e33b27341afcb6218f3c5536f Mon Sep 17 00:00:00 2001
From: Koop Mast <kwm@FreeBSD.org>
Date: Tue, 22 Jul 2014 09:33:37 +0000
Subject: [PATCH] Don't attempt to define NULL if it is already set.

Approved by:	maintainer (via e-mail)
---
 graphics/libvisual04/Makefile                          |  2 +-
 .../libvisual04/files/patch-libvisual-lv_defines.h     | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index dbd83a0763d7..1aa005d06121 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -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
diff --git a/graphics/libvisual04/files/patch-libvisual-lv_defines.h b/graphics/libvisual04/files/patch-libvisual-lv_defines.h
index b2a526afbb82..e7017e0a441c 100644
--- a/graphics/libvisual04/files/patch-libvisual-lv_defines.h
+++ b/graphics/libvisual04/files/patch-libvisual-lv_defines.h
@@ -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