Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Jul 2014 09:33:37 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r362526 - in head/graphics/libvisual04: . files
Message-ID:  <201407220933.s6M9XbP3084546@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407220933.s6M9XbP3084546>