Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 May 2013 08:53:04 GMT
From:      "Ilya A. Arkhipov" <rum1cro@yandex.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/178444: [patch] net-mgmt/macroscope: moving to optionsng
Message-ID:  <201305090853.r498r4xW061282@oldred.FreeBSD.org>
Resent-Message-ID: <201305090900.r499002X093874@freefall.freebsd.org>

Next in thread | Raw E-Mail | Index | Archive | Help

>Number:         178444
>Category:       ports
>Synopsis:       [patch] net-mgmt/macroscope: moving to optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 09 09:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ilya A. Arkhipov
>Release:        10.0-CURRENT
>Organization:
Rambler
>Environment:
FreeBSD mhome 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Thu Mar 29 18:04:50 UTC 2012     root@mhome:/usr/obj/usr/src/sys/MICROKERNEL  amd64
>Description:
patch for net-mgmt/macroscope for moving to optionsng
>How-To-Repeat:
Install it ^_^
>Fix:
diff -Nru macroscope_old/Makefile macroscope/Makefile
--- macroscope_old/Makefile	2013-05-08 22:49:31.142706129 +0400
+++ macroscope/Makefile	2013-05-09 12:01:32.636066792 +0400
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	macroscope
-# Date created:		2007-05-14
-# Whom:			Dukashvili Guram <white_raven@users.berlios.de>
-#
-# $FreeBSD: net-mgmt/macroscope/Makefile 314960 2013-03-22 20:06:14Z makc $
-#
+# Created by: Dukashvili Guram <white_raven@users.berlios.de>
+# $FreeBSD$
 
 PORTNAME=		macroscope
 PORTVERSION=		1.0.3787
@@ -25,21 +21,23 @@
 USE_DOS2UNIX=		yes
 USES=			cmake
 
-OPTIONS=		MYSQL		"With MySQL support" on \
-			FIREBIRD	"With Firebird support" off
+OPTIONS_DEFINE=	MYSQL FIREBIRD DOCS
+MYSQL_DESC=	With MySQL support
+FIREBIRD_DESC=	With Firebird support
+OPTIONS_DEFAULT=	MYSQL
 
 .include <bsd.port.pre.mk>
 
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 CMAKE_ARGS+=		-DCMAKE_NOT_INSTALL_DOC:BOOL=ON
 .endif
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 WANT_MYSQL_VER=		50
 USE_MYSQL=		yes
 .endif
 
-.if !defined(WITHOUT_FIREBIRD)
+.if ${PORT_OPTIONS:MFIREBIRD}
 WITH_FIREBIRD_VER=	2
 USE_FIREBIRD=		yes
 .endif


Patch attached with submission follows:

diff -Nru macroscope_old/Makefile macroscope/Makefile
--- macroscope_old/Makefile	2013-05-08 22:49:31.142706129 +0400
+++ macroscope/Makefile	2013-05-09 12:01:32.636066792 +0400
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	macroscope
-# Date created:		2007-05-14
-# Whom:			Dukashvili Guram <white_raven@users.berlios.de>
-#
-# $FreeBSD: net-mgmt/macroscope/Makefile 314960 2013-03-22 20:06:14Z makc $
-#
+# Created by: Dukashvili Guram <white_raven@users.berlios.de>
+# $FreeBSD$
 
 PORTNAME=		macroscope
 PORTVERSION=		1.0.3787
@@ -25,21 +21,23 @@
 USE_DOS2UNIX=		yes
 USES=			cmake
 
-OPTIONS=		MYSQL		"With MySQL support" on \
-			FIREBIRD	"With Firebird support" off
+OPTIONS_DEFINE=	MYSQL FIREBIRD DOCS
+MYSQL_DESC=	With MySQL support
+FIREBIRD_DESC=	With Firebird support
+OPTIONS_DEFAULT=	MYSQL
 
 .include <bsd.port.pre.mk>
 
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 CMAKE_ARGS+=		-DCMAKE_NOT_INSTALL_DOC:BOOL=ON
 .endif
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 WANT_MYSQL_VER=		50
 USE_MYSQL=		yes
 .endif
 
-.if !defined(WITHOUT_FIREBIRD)
+.if ${PORT_OPTIONS:MFIREBIRD}
 WITH_FIREBIRD_VER=	2
 USE_FIREBIRD=		yes
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?201305090853.r498r4xW061282>