From owner-svn-ports-all@FreeBSD.ORG  Sun Dec  9 09:13:06 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 92B5CFD9;
 Sun,  9 Dec 2012 09:13:06 +0000 (UTC) (envelope-from mva@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 5D8EF8FC1A;
 Sun,  9 Dec 2012 09:13:06 +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 qB99D6PB021216;
 Sun, 9 Dec 2012 09:13:06 GMT (envelope-from mva@svn.freebsd.org)
Received: (from mva@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB99D6pF021214;
 Sun, 9 Dec 2012 09:13:06 GMT (envelope-from mva@svn.freebsd.org)
Message-Id: <201212090913.qB99D6pF021214@svn.freebsd.org>
From: Marcus von Appen <mva@FreeBSD.org>
Date: Sun, 9 Dec 2012 09:13:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308515 - head/editors/hte
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: Sun, 09 Dec 2012 09:13:06 -0000

Author: mva
Date: Sun Dec  9 09:13:05 2012
New Revision: 308515
URL: http://svnweb.freebsd.org/changeset/ports/308515

Log:
  - Update to 2.0.21
  - Trim Makefile headers
  - Switch to OptionsNG
  
  Feature safe:	yes

Modified:
  head/editors/hte/Makefile   (contents, props changed)
  head/editors/hte/distinfo   (contents, props changed)

Modified: head/editors/hte/Makefile
==============================================================================
--- head/editors/hte/Makefile	Sun Dec  9 08:34:01 2012	(r308514)
+++ head/editors/hte/Makefile	Sun Dec  9 09:13:05 2012	(r308515)
@@ -1,13 +1,8 @@
-# ex:ts=8
-# New ports collection makefile for:	HT Editor
-# Date created:			Jun 12, 2001
-# Whom:				ijliao
-#
+# Created By: Ying-Chieh Liao
 # $FreeBSD$
-#
 
 PORTNAME=	hte
-PORTVERSION=	2.0.20
+PORTVERSION=	2.0.21
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/ht-source
 DISTNAME=	ht-${PORTVERSION}
@@ -22,30 +17,33 @@ GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/ht
 
-OPTIONS=	LZO2	"Enable external lzo2 compresssion support"	off	\
-		X11	"Build X11 textmode support"			on
+OPTIONS_DEFINE=		DOCS LZO2 X11
+OPTIONS_DEFAULT=	X11
+
+LZO2_DESC=	External lzo2 compression support
+X11_DESC=	X11 textmode support
 
 NOT_FOR_ARCHS=	ia64
 NOT_FOR_ARCHS_REASON=	does not build on ia64
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_LZO2)
-LIB_DEPENDS+=	lzo2.2:${PORTSDIR}/archivers/lzo2
+.if ${PORT_OPTIONS:MLZO2}
+LIB_DEPENDS+=	lzo2:${PORTSDIR}/archivers/lzo2
 .else
 CONFIGURE_ARGS=	--with-included-lzo
 .endif
 
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-nox11
-CONFIGURE_ARGS+=--disable-x11-textmode
-.else
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+.else
+PKGNAMESUFFIX=	-nox11
+CONFIGURE_ARGS+=--disable-x11-textmode
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	README
 INFO=		ht
 .endif
@@ -58,7 +56,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ht ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/hthelp.info ${PREFIX}/${INFO_PATH}/ht.info

Modified: head/editors/hte/distinfo
==============================================================================
--- head/editors/hte/distinfo	Sun Dec  9 08:34:01 2012	(r308514)
+++ head/editors/hte/distinfo	Sun Dec  9 09:13:05 2012	(r308515)
@@ -1,2 +1,2 @@
-SHA256 (ht-2.0.20.tar.bz2) = 4aa162f10a13e60859bef1f04c6529f967fdfd660ae421ee25eab1fbabcd1ed0
-SIZE (ht-2.0.20.tar.bz2) = 900575
+SHA256 (ht-2.0.21.tar.bz2) = f9c04f2074d6a774bae0d7fdc3f8b2c579db39aad0761b33b4884949fc378934
+SIZE (ht-2.0.21.tar.bz2) = 897891