From owner-svn-ports-all@freebsd.org Sat Feb 6 23:17:28 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38277A9F1E1; Sat, 6 Feb 2016 23:17:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E59461061; Sat, 6 Feb 2016 23:17:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u16NHQXr019754; Sat, 6 Feb 2016 23:17:26 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u16NHQ96019753; Sat, 6 Feb 2016 23:17:26 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602062317.u16NHQ96019753@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 6 Feb 2016 23:17:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408323 - 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Feb 2016 23:17:28 -0000 Author: amdmi3 Date: Sat Feb 6 23:17:26 2016 New Revision: 408323 URL: https://svnweb.freebsd.org/changeset/ports/408323 Log: - Switch to options helpers Modified: head/graphics/togl/Makefile Modified: head/graphics/togl/Makefile ============================================================================== --- head/graphics/togl/Makefile Sat Feb 6 23:17:10 2016 (r408322) +++ head/graphics/togl/Makefile Sat Feb 6 23:17:26 2016 (r408323) @@ -14,11 +14,11 @@ COMMENT= Tk OpenGL widget LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES+= gmake tk +USES= gmake tk USE_XORG= x11 xt xmu USE_GL= gl GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tk=${TK_LIBDIR} \ +CONFIGURE_ARGS= --with-tk=${TK_LIBDIR} \ --with-tcl=${TCL_LIBDIR} \ --with-tclinclude=${TCL_INCLUDEDIR} USE_LDCONFIG= yes @@ -28,12 +28,10 @@ TOGL_INSTDIR= ${PREFIX}/lib/${DISTNAME} CPPFLAGS+= -I${TK_INCLUDEDIR} LDFLAGS+= -L${TK_LIBDIR} -PLIST_SUB+= TK_VER=${TK_VER} +PLIST_SUB= TK_VER=${TK_VER} OPTIONS_DEFINE= DOCS EXAMPLES -.include - post-patch: @${REINPLACE_CMD} -e 's|wish |${WISH:T} |' ${WRKSRC}/*.tcl @${REINPLACE_CMD} -e 's/FreeBSD-\*/FreeBSD-*|DragonFly-*/g' \ @@ -48,11 +46,12 @@ do-install: ${LN} -s libTogl1.7.so ${STAGEDIR}${TOGL_INSTDIR}/libtogl.so.1 ${LN} -s ${TOGL_INSTDIR}/libTogl1.7.so ${STAGEDIR}${PREFIX}/lib/libtogl.so ${LN} -s ${TOGL_INSTDIR}/libTogl1.7.so ${STAGEDIR}${PREFIX}/lib/libtogl.so.1 -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Togl.html ${STAGEDIR}${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/Makefile ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/ben.rgb ${STAGEDIR}${EXAMPLESDIR} @@ -65,6 +64,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/texture.c ${WRKSRC}/texture.tcl ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/togl.c ${WRKSRC}/togl.h ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/tree2.rgba ${STAGEDIR}${EXAMPLESDIR} -.endif .include