From owner-svn-ports-all@FreeBSD.ORG  Thu Dec  6 10:28:28 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F00EF724;
 Thu,  6 Dec 2012 10:28:28 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B8B9D8FC0C;
 Thu,  6 Dec 2012 10:28:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB6ASS35019690;
 Thu, 6 Dec 2012 10:28:28 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB6ASSZH019689;
 Thu, 6 Dec 2012 10:28:28 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212061028.qB6ASSZH019689@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 6 Dec 2012 10:28:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308378 - head/science/kst
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Dec 2012 10:28:29 -0000

Author: rene
Date: Thu Dec  6 10:28:28 2012
New Revision: 308378
URL: http://svnweb.freebsd.org/changeset/ports/308378

Log:
  - Convert to optionsNG
  - Strip library version numbers
  Feature safe:	yes

Modified:
  head/science/kst/Makefile   (contents, props changed)

Modified: head/science/kst/Makefile
==============================================================================
--- head/science/kst/Makefile	Thu Dec  6 10:19:32 2012	(r308377)
+++ head/science/kst/Makefile	Thu Dec  6 10:28:28 2012	(r308378)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	kst
-# Date created:			Fri Apr 30 17:28:56 CEST 2004
-# Whom:				Markus Brueffer <markus@FreeBSD.org>
-#
+# Created by:	Markus Brueffer <markus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kst
@@ -15,8 +12,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Data viewing program for KDE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
-LIB_DEPENDS=	cfitsio.0:${PORTSDIR}/astro/cfitsio \
-		gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	cfitsio:${PORTSDIR}/astro/cfitsio \
+		gsl:${PORTSDIR}/math/gsl
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
@@ -27,32 +24,32 @@ MAKE_JOBS_SAFE=	yes
 
 AUTOTOOLSFILES=	admin/cvs.sh
 
-OPTIONS=	NETCDF "Enable netcdf data support" off \
-		CDF "Enable cdf data support" off \
-		KDEBASE "Enable JavaScript console" off
+OPTIONS_DEFINE=	NETCDF CDF KDEBASE
+CDF_DESC=	CDF data support
+KDEBASE=	JavaScript console
 
 MAN1=		kst.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_NETCDF)
-LIB_DEPENDS+=	netcdf.4:${PORTSDIR}/science/netcdf
+.if ${PORT_OPTIONS:MNETCDF}
+LIB_DEPENDS+=	netcdf:${PORTSDIR}/science/netcdf
 PLIST_SUB+=	NETCDF=""
 .else
 CONFIGURE_ARGS+=	--without-netcdf
 PLIST_SUB+=	NETCDF="@comment "
 .endif
 
-.if defined(WITH_CDF)
+.if ${PORT_OPTIONS:MCDF}
 CONFIGURE_ARGS+=LDFLAGS="-lm"
-LIB_DEPENDS+=	cdf.0:${PORTSDIR}/science/cdf
+LIB_DEPENDS+=	cdf:${PORTSDIR}/science/cdf
 PLIST_SUB+=	CDF=""
 .else
 CONFIGURE_ARGS+=	--without-cdf
 PLIST_SUB+=	CDF="@comment "
 .endif
 
-.if defined(WITH_KDEBASE)
+.if ${PORT_OPTIONS:MKDEBASE}
 RUN_DEPENDS+=	${KDE_PREFIX}/lib/kde3/libkonsolepart.so:${PORTSDIR}/x11/kdebase3
 .endif
 
@@ -61,10 +58,10 @@ pre-configure:
 	@${REINPLACE_CMD} -e 's|@kde_widgetdir@|@prefix@/lib/kde3/plugins/designer|' \
 		${WRKSRC}/kst/src/widgets/Makefile.in
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|et||;/^SUBDIRS/s|pt||' ${WRKSRC}/doc/Makefile.in
-.if !defined(WITH_NETCDF)
+.if empty(PORT_OPTIONS:MNETCDF)
 	@${REINPLACE_CMD} -e 's| netcdf||g' ${WRKSRC}/kst/src/datasources/Makefile.in
 .endif
-.if !defined(WITH_CDF)
+.if empty(PORT_OPTIONS:MCDF)
 	@${REINPLACE_CMD} -e 's| cdf||g' ${WRKSRC}/kst/src/datasources/Makefile.in
 .endif