Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Feb 2016 23:17:26 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r408323 - head/graphics/togl
Message-ID:  <201602062317.u16NHQ96019753@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
 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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602062317.u16NHQ96019753>