From nobody@FreeBSD.org  Tue Jun  5 08:03:36 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7EDD6106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  5 Jun 2012 08:03:36 +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 50B528FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  5 Jun 2012 08:03:36 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q5583Zl3047674
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 5 Jun 2012 08:03:35 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q5583Zhh047673;
	Tue, 5 Jun 2012 08:03:35 GMT
	(envelope-from nobody)
Message-Id: <201206050803.q5583Zhh047673@red.freebsd.org>
Date: Tue, 5 Jun 2012 08:03:35 GMT
From: Rainer Hurling <rhurlin@gwdg.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer][patch] math/saga: Convert to the new options framework
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         168694
>Category:       ports
>Synopsis:       [maintainer][patch] math/saga: Convert to the new options framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sylvio
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 05 08:10:07 UTC 2012
>Closed-Date:    Wed Jun 06 20:56:48 UTC 2012
>Last-Modified:  Wed Jun  6 21:00:25 UTC 2012
>Originator:     Rainer Hurling
>Release:        FreeBSD 10.0-CURRENT (amd64)
>Organization:
>Environment:
FreeBSD xxx.xxx 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r236537: Mon Jun  4 09:21:33 CEST 2012     xxx@xxx.xxx:/usr/obj/usr/src/sys/XXX  amd64
>Description:
Convert to new options framework.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2012-06-01 07:21:54.000000000 +0200
+++ Makefile	2012-06-05 09:42:57.000000000 +0200
@@ -17,13 +17,13 @@
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	proj.7:${PORTSDIR}/graphics/proj \
-		gdal.17:${PORTSDIR}/graphics/gdal \
-		jasper.4:${PORTSDIR}/graphics/jasper \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		iodbc.3:${PORTSDIR}/databases/libiodbc \
-		las.1:${PORTSDIR}/devel/liblas \
-		opencv_legacy.2:${PORTSDIR}/graphics/opencv
+LIB_DEPENDS=	proj:${PORTSDIR}/graphics/proj \
+		gdal:${PORTSDIR}/graphics/gdal \
+		jasper:${PORTSDIR}/graphics/jasper \
+		tiff:${PORTSDIR}/graphics/tiff \
+		iodbc:${PORTSDIR}/databases/libiodbc \
+		las:${PORTSDIR}/devel/liblas \
+		opencv_legacy:${PORTSDIR}/graphics/opencv
 
 USE_WX=		2.8
 USE_LDCONFIG=	yes
@@ -38,24 +38,26 @@
 DESKTOP_ENTRIES=	"SAGA GIS" "${COMMENT}" "${DATADIR}/saga_icon_32.xpm" \
 			"saga_gui" "Application;Math;" true
 
-OPTIONS=	UNICODE "Enable Unicode Support" On \
-		PYTHON "Enable Python bindings" On \
-		HARU "Enable Haru Free PDF Library (optional)" Off \
-		VIGRA "Enable 'Vision with Generic Algorithms' Library" Off
+OPTIONS_DEFINE=	UNICODE PYTHON HARU VIGRA
+OPTIONS_DEFAULT=	UNICODE PYTHON
+NO_OPTIONS_SORT=	yes
+UNICODE_DESC=	Enable Unicode Support
+HARU_DESC=	Enable Haru Free PDF Library
+VIGRA_DESC=	Enable 'Vision with Generic Algorithms' Library
 
 .include <bsd.port.options.mk>
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
-.if defined(WITH_UNICODE)
+.if ${PORT_OPTIONS:MUNICODE}
 WITH_UNICODE=	yes
 CONFIGURE_ARGS+=	--enable-unicode
 .else
 CONFIGURE_ARGS+=	--disable-unicode
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=	--enable-python
 BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
 USE_PYTHON=	2.6-2.7
@@ -65,7 +67,7 @@
 PLIST_SUB+=	SAGA_PYTHON="@comment "
 .endif
 
-.if defined(WITH_HARU)
+.if ${PORT_OPTIONS:MHARU}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu
 RUN_DEPENDS+=	${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu
 PLIST_SUB+=	HARU=""
@@ -73,7 +75,7 @@
 PLIST_SUB+=	HARU="@comment "
 .endif
 
-.if defined(WITH_VIGRA)
+.if ${PORT_OPTIONS:MVIGRA}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra
 RUN_DEPENDS+=	${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra
 PLIST_SUB+=	VIGRA=""


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Tue Jun 5 13:11:28 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168694 
State-Changed-From-To: open->closed 
State-Changed-By: sylvio 
State-Changed-When: Wed Jun 6 20:56:47 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168694: commit references a PR
Date: Wed,  6 Jun 2012 20:56:38 +0000 (UTC)

 sylvio      2012-06-06 20:56:29 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/saga            Makefile 
   Log:
   - Convert to new optionsNG
   
   PR:             ports/168694
   Submitted by:   Rainer Hurling <rhurlin@gwdg.de> (maintainer)
   
   Revision  Changes    Path
   1.21      +17 -15    ports/math/saga/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
