From nobody@FreeBSD.org  Mon Feb  4 18:21:54 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id B302A272
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  4 Feb 2013 18:21:54 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id A448A1AC
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  4 Feb 2013 18:21:54 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r14ILrkj095508
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 4 Feb 2013 18:21:53 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r14ILrNA095499;
	Mon, 4 Feb 2013 18:21:53 GMT
	(envelope-from nobody)
Message-Id: <201302041821.r14ILrNA095499@red.freebsd.org>
Date: Mon, 4 Feb 2013 18:21:53 GMT
From: Veniamin Gvozdikov <g.veniamin@googlemail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [update]: graphics/qiviewer update options to optionsng
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         175838
>Category:       ports
>Synopsis:       [update]: graphics/qiviewer update options to optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 04 18:30:00 UTC 2013
>Closed-Date:    Wed Feb 20 17:35:24 UTC 2013
>Last-Modified:  Wed Feb 20 17:40:02 UTC 2013
>Originator:     Veniamin Gvozdikov
>Release:        FreeBSD 8.3-RELEASE-p5
>Organization:
>Environment:
FreeBSD ololo 8.3-RELEASE-p5 FreeBSD 8.3-RELEASE-p5 #0: Thu Dec  6 16:25:28 MSK 2012     root@ololo:/usr/obj/usr/src/sys/OLOLO  amd64
>Description:
Update to optionsng
>How-To-Repeat:

>Fix:
diff -ruN qiviewer.orig/Makefile qiviewer/Makefile
--- qiviewer.orig/Makefile	2013-02-04 22:18:11.619923125 +0400
+++ qiviewer/Makefile	2013-02-04 22:20:43.588400962 +0400
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	qiviewer
-# Date created:		2011-04-02
-# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
-#
-# $FreeBSD: ports/graphics/qiviewer/Makefile,v 1.5 2012/11/17 05:58:21 svnexp Exp $
-#
+# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
+# $FreeBSD$
 
 PORTNAME=	qiviewer
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE
 
@@ -32,12 +28,16 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
-OPTIONS=	WEBP "Support for WebP image format (experimental)" off
+OPTIONS_DEFINE= WEBP
+WEBP_DESC=	 Support for WebP image format (experimental)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_WEBP)
+.if ${PORT_OPTIONS:MWEBP}
 QMAKEFLAGS+=	CONFIG+=enable-webp
+PLIST_SUB+=	WEBP=""
+.else
+PLIST_SUB+=	WEBP="@comment "
 .endif
 
 do-configure:
@@ -47,4 +47,4 @@
 	${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|g' \
 		${WRKSRC}/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Wed Feb 13 15:55:22 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175838 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Wed Feb 20 17:35:23 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175838 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175838: commit references a PR
Date: Wed, 20 Feb 2013 17:35:29 +0000 (UTC)

 Author: makc
 Date: Wed Feb 20 17:35:15 2013
 New Revision: 312633
 URL: http://svnweb.freebsd.org/changeset/ports/312633
 
 Log:
   Convert to new options framework
   
   PR:		ports/175838
   Submitted by:	Veniamin Gvozdikov (maintainer)
 
 Modified:
   head/graphics/qiviewer/Makefile   (contents, props changed)
 
 Modified: head/graphics/qiviewer/Makefile
 ==============================================================================
 --- head/graphics/qiviewer/Makefile	Wed Feb 20 17:31:31 2013	(r312632)
 +++ head/graphics/qiviewer/Makefile	Wed Feb 20 17:35:15 2013	(r312633)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	qiviewer
 -# Date created:		2011-04-02
 -# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
 -#
 +# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	qiviewer
  PORTVERSION=	0.5.0
 @@ -32,12 +28,16 @@ PLIST_DIRS=	share/qiviewer/locale \
  
  WRKSRC=		${WRKDIR}/${PORTNAME}/src
  
 -OPTIONS=	WEBP "Support for WebP image format (experimental)" off
 +OPTIONS_DEFINE=	WEBP
 +WEBP_DESC=	Support for WebP image format (experimental)
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.if !defined(WITHOUT_WEBP)
 +.if ${PORT_OPTIONS:MWEBP}
  QMAKEFLAGS+=	CONFIG+=enable-webp
 +PLIST_SUB+=	WEBP=""
 +.else
 +PLIST_SUB+=	WEBP="@comment "
  .endif
  
  do-configure:
 @@ -47,4 +47,4 @@ post-configure:
  	${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|g' \
  		${WRKSRC}/Makefile
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
