From owner-svn-ports-all@FreeBSD.ORG  Thu Dec  6 10:19:33 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 0D582397;
 Thu,  6 Dec 2012 10:19:33 +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 CBA758FC08;
 Thu,  6 Dec 2012 10:19:32 +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 qB6AJWLY017895;
 Thu, 6 Dec 2012 10:19:32 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB6AJWp8017894;
 Thu, 6 Dec 2012 10:19:32 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212061019.qB6AJWp8017894@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 6 Dec 2012 10:19:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308377 - head/x11/aterm
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:19:33 -0000

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

Log:
  - Convert to optionsNG
  - Strip library versions
  
  Feature safe:	yes

Modified:
  head/x11/aterm/Makefile   (contents, props changed)

Modified: head/x11/aterm/Makefile
==============================================================================
--- head/x11/aterm/Makefile	Thu Dec  6 10:02:39 2012	(r308376)
+++ head/x11/aterm/Makefile	Thu Dec  6 10:19:32 2012	(r308377)
@@ -1,5 +1,4 @@
 # Created by: Jim Mock <jim@FreeBSD.org>
-#
 # $FreeBSD$
 
 PORTNAME=	aterm
@@ -23,13 +22,14 @@ CONFIGURE_ARGS= --enable-wtmp \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	TRANS "Transparency support" on \
-		BSDEL "BSD-style backspace and delete" on \
-		MOUSE "Mousewheel support" on \
-		BGIMG "XPM, JPEG, PNG backgrounds" off \
-		KANJI "Kanji (EUC-JP or SJIS) support" off \
-		BIG5S "Chinese character support (BIG5)" off \
-		GREEK "Greek keyboard support" off
+OPTIONS_DEFINE=	TRANS BSDEL MOUSE BGIMG KANJI BIG5S GREEK
+OPTIONS_DEFAULT=	TRANS BSDEL MOUSE
+TRANS_DESC=	Transparency support
+BSDEL_DESC=	BSD-style backspace and delete
+BGIMG_DESC=	XPM, JPEG, PNG backgrounds
+KANJI_DESC=	Kanji (EUC-JP or SJIS) support
+BIG5S_DESC=	Chinese character (BIG5) support
+GREEK_DESC=	Greek keyboard support
 
 MAN1=		aterm.1
 
@@ -42,42 +42,44 @@ CONFIGURE_ARGS+=	--disable-utmp
 CONFIGURE_ARGS+=	--enable-utmp
 .endif
 
-.if !defined(WITHOUT_TRANS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTRANS}
 CONFIGURE_ARGS+=	--enable-transparency
 .else
 CONFIGURE_ARGS+=	--disable-transparency
 .endif
 
-.if !defined(WITHOUT_BSDEL)
+.if ${PORT_OPTIONS:MBSDEL}
 CONFIGURE_ARGS+=	--disable-backspace-key --disable-delete-key
 .else
 CONFIGURE_ARGS+=	--enable-backspace-key --enable-delete-key
 .endif
 
-.if !defined(WITHOUT_MOUSE)
+.if ${PORT_OPTIONS:MMOUSE}
 CONFIGURE_ARGS+=	--enable-mousewheel
 .else
 CONFIGURE_ARGS+=	--disable-mousewheel
 .endif
 
-.if defined(WITH_BGIMG)
-LIB_DEPENDS+=	AfterImage.0:${PORTSDIR}/graphics/libafterimage \
+.if ${PORT_OPTIONS:MBGIMG}
+LIB_DEPENDS+=	AfterImage:${PORTSDIR}/graphics/libafterimage \
 		png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
+		jpeg:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=	--with-afterimage-config --with-png --with-jpeg
 .else
 CONFIGURE_ARGS+=	--without-afterimage-config --with-png=no --with-jpeg=no
 .endif
 
-.if defined(WITH_KANJI)
+.if ${PORT_OPTIONS:MKANJI}
 CONFIGURE_ARGS+=	--enable-kanji
 .endif
 
-.if defined(WITH_BIG5S)
+.if ${PORT_OPTIONS:MBIG5S}
 CONFIGURE_ARGS+=	--enable-big5
 .endif
 
-.if defined(WITH_GREEK)
+.if ${PORT_OPTIONS:MGREEK}
 CONFIGURE_ARGS+=	--enable-greek
 .endif