From owner-svn-ports-head@FreeBSD.ORG  Sat May 25 11:06:00 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 5DAE91AC;
 Sat, 25 May 2013 11:06:00 +0000 (UTC)
 (envelope-from gahr@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 3660FB67;
 Sat, 25 May 2013 11:06:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4PB60UU082545;
 Sat, 25 May 2013 11:06:00 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4PB60W3082544;
 Sat, 25 May 2013 11:06:00 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201305251106.r4PB60W3082544@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Sat, 25 May 2013 11:06:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319044 - head/graphics/togl
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, 25 May 2013 11:06:00 -0000

Author: gahr
Date: Sat May 25 11:05:59 2013
New Revision: 319044
URL: http://svnweb.freebsd.org/changeset/ports/319044

Log:
  - Append to instead of overwrite CONFIGURE_ARGS
  - Fix build with Tk 8.6
  - While at it, trim Makefile header and switch to OPTIONSng
  
  Reported by:	miwi (Tcl/Tk 8.6 exp-run latecomers)
  Approved by:	portmgr

Modified:
  head/graphics/togl/Makefile   (contents, props changed)

Modified: head/graphics/togl/Makefile
==============================================================================
--- head/graphics/togl/Makefile	Sat May 25 10:51:57 2013	(r319043)
+++ head/graphics/togl/Makefile	Sat May 25 11:05:59 2013	(r319044)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Togl
-# Date created:		Wed Aug 18 18:49:17 EDT 1999
-# Whom:			Randall Hopper <aa8vb@ipass.net>
-#
+# Created by: Randall Hopper <aa8vb@ipass.net>
 # $FreeBSD$
-#
 
 PORTNAME=	togl
 PORTVERSION=	1.7
@@ -13,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/Togl/${PORT
 DISTNAME=	Togl-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Tk OpenGL widget
+COMMENT=	Tk OpenGL widget
 
 USE_XORG=	x11 xt xmu
 USE_GL=		gl
@@ -23,7 +19,7 @@ USE_TK_BUILD=	84+
 USE_TK=		84+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tk=${TK_LIBDIR} \
+CONFIGURE_ARGS+=--with-tk=${TK_LIBDIR} \
 		--with-tcl=${TCL_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR}
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
@@ -36,6 +32,8 @@ PLIST_SUB=	TOGL_INSTDIR="${TOGL_INSTDIR:
 CPPFLAGS+=	-I${TK_INCLUDEDIR}
 LDFLAGS+=	-L${TK_LIBDIR}
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|wish |${WISH:T} |' ${WRKSRC}/*.tcl
 
@@ -47,11 +45,11 @@ do-install:
 	${LN} -s ${TOGL_INSTDIR}/libTogl1.7.so  ${TOGL_INSTDIR}/libtogl.so.1
 	${LN} -s ${TOGL_INSTDIR}/libTogl1.7.so  ${PREFIX}/lib/libtogl.so
 	${LN} -s ${TOGL_INSTDIR}/libTogl1.7.so  ${PREFIX}/lib/libtogl.so.1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Togl.html ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Makefile ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/ben.rgb ${EXAMPLESDIR}