ports/174806: [maintainer-update] [patch] devel/diffuse: Various cleanups

[Marco Bröder]

The following reply was made to PR ports/174806; it has been noted by GNATS.

From: =?UTF-8?B?TWFyY28gQnLDtmRlcg==?= <marco.broeder at gmx.eu>
To: bug-followup at FreeBSD.org, tota at FreeBSD.org
Cc: marco.broeder at gmx.eu
Subject: Re: ports/174806: [maintainer-update] [patch] devel/diffuse: Various
 cleanups
Date: Mon, 31 Dec 2012 11:33:44 +0100

 This is a multi-part message in MIME format.
 --------------080000030708050801090700
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 Thank you for committing!
 
 Could you restore the DATA / PORTDATA conditional setting part of my patch,
 please?
 
 It is broken now if the DATA option is unselected. Unlike PORTDOCS the
 PORTDATA definition needs to be defined conditionally. Otherwise it breaks
 pkg-plist.
 
 Unfortunately, PORTDATA will not be treated the same as PORTDOCS. I am not
 sure if this is an oversight, a bug or intentionally.
 
 Thanks!
 
 -- 
 Kind regards
 
 
 --------------080000030708050801090700
 Content-Type: text/x-patch;
  name="restore_PORTDATA.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="restore_PORTDATA.patch"
 
 diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
 index 67d1169..5dec5f4 100644
 --- a/devel/diffuse/Makefile
 +++ b/devel/diffuse/Makefile
 @@ -23,7 +23,6 @@ CONFLICTS=	tinker-[0-9]*
  
  MAN1=		diffuse.1
  PORTDOCS=	AUTHORS ChangeLog ChangeLog_ru README README_ru
 -PORTDATA=	syntax
  
  OPTIONS_DEFINE=	DATA DOCS MENU NLS
  DATA_DESC=	Enable syntax highlighting support
 @@ -33,6 +32,10 @@ OPTIONS_DEFAULT=	DATA MENU
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MDATA}
 +PORTDATA=	syntax
 +.endif
 +
  .if ${PORT_OPTIONS:MMENU}
  USE_GNOME+=	desktopfileutils
  PLIST_SUB+=	MENU=""
 
 
 
 
 --------------080000030708050801090700--