From owner-svn-ports-head@FreeBSD.ORG  Sat Jan  5 22:47:04 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E1D14DE2;
 Sat,  5 Jan 2013 22:47:04 +0000 (UTC)
 (envelope-from mandree@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 BCC57933;
 Sat,  5 Jan 2013 22:47:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r05Ml4EV092362;
 Sat, 5 Jan 2013 22:47:04 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r05Ml400092361;
 Sat, 5 Jan 2013 22:47:04 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201301052247.r05Ml400092361@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Sat, 5 Jan 2013 22:47:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309971 - head/lang/lua
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Jan 2013 22:47:05 -0000

Author: mandree
Date: Sat Jan  5 22:47:04 2013
New Revision: 309971
URL: http://svnweb.freebsd.org/changeset/ports/309971

Log:
  Bugfix:
  - Record liblua's dependency on libm.so explicitly. [1]
  
  Assorted lint removals:
  - Convert to Options NG
  - Reduce old-style Makefile header
  - USE_GNOME=pkgconfig -> USE_PKGCONFIG=yes
  
  PR:		ports/174964
  Submitted by:	Matthew X. Economou

Modified:
  head/lang/lua/Makefile

Modified: head/lang/lua/Makefile
==============================================================================
--- head/lang/lua/Makefile	Sat Jan  5 21:34:25 2013	(r309970)
+++ head/lang/lua/Makefile	Sat Jan  5 22:47:04 2013	(r309971)
@@ -1,13 +1,9 @@
-# New ports collection makefile for: 	lua
-# Date created:				27 June 1999
-# Whom:					Richard Kiss
-#
+# Created by: Richard Kiss
 # $FreeBSD$
-#
 
 PORTNAME=	lua
 PORTVERSION=	5.1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	http://www.lua.org/ftp/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
@@ -22,7 +18,7 @@ PATCH_WRKSRC=	${WRKSRC}/src
 USE_LUA=	5.1
 LUA_COMPS=	# only define variables
 ALL_TARGET=	freebsd
-USE_GNOME=	pkgconfig
+USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 MAKE_ENV=	LUA_SONAME="liblua-${LUA_VER}.so.${LUA_VER_SH}"
@@ -33,6 +29,9 @@ MAKE_ENV=	LUA_SONAME="liblua-${LUA_VER}.
 # have its settings when we get here.
 # See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
 MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
+# liblua.so requires libm, so make sure it has an explicit dependency
+# so that applications need not second-guess lua's dependencies.
+LDFLAGS+=	-lm
 
 MAN1=		lua-${LUA_VER}.1 luac-${LUA_VER}.1
 DOCSDIR=	${PREFIX}/share/doc/${LUA_SUBDIR}
@@ -108,7 +107,7 @@ do-install:
 		${PREFIX}/man/man1/${f:C/.1$//}-${LUA_VER}.1
 .endfor
 # Documentation.
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${DOCSDIR}/etc
 	${MKDIR} ${DOCSDIR}/test