From owner-svn-ports-all@FreeBSD.ORG Thu Jan 9 22:31:48 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B0966579; Thu, 9 Jan 2014 22:31:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 90F851665; Thu, 9 Jan 2014 22:31:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s09MVmPe070176; Thu, 9 Jan 2014 22:31:48 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s09MVmtl070173; Thu, 9 Jan 2014 22:31:48 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401092231.s09MVmtl070173@svn.freebsd.org> From: Antoine Brodin Date: Thu, 9 Jan 2014 22:31:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339294 - 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.17 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: Thu, 09 Jan 2014 22:31:48 -0000 Author: antoine Date: Thu Jan 9 22:31:47 2014 New Revision: 339294 URL: http://svnweb.freebsd.org/changeset/ports/339294 Log: - Stage support - Add missing OPTIONS_DEFINE - Fix plist without EXAMPLES Modified: head/graphics/togl/Makefile head/graphics/togl/pkg-plist Modified: head/graphics/togl/Makefile ============================================================================== --- head/graphics/togl/Makefile Thu Jan 9 22:14:14 2014 (r339293) +++ head/graphics/togl/Makefile Thu Jan 9 22:31:47 2014 (r339294) @@ -27,37 +27,38 @@ LDFLAGS+= -L${TK_LIBDIR} PLIST_SUB+= TK_VER=${TK_VER} -NO_STAGE= yes +OPTIONS_DEFINE= DOCS EXAMPLES + .include post-patch: @${REINPLACE_CMD} -e 's|wish |${WISH:T} |' ${WRKSRC}/*.tcl do-install: - @${MKDIR} ${TOGL_INSTDIR} + @${MKDIR} ${STAGEDIR}${TOGL_INSTDIR} .for i in togl.h togl_ws.h libTogl1.7.so pkgIndex.tcl - ${INSTALL_DATA} ${WRKSRC}/${i} ${TOGL_INSTDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${TOGL_INSTDIR} .endfor - ${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 + ${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} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Togl.html ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Togl.html ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/Makefile ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/ben.rgb ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/double.c ${WRKSRC}/double.tcl ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/gears.c ${WRKSRC}/gears.tcl ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/image.c ${WRKSRC}/image.h ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/index.c ${WRKSRC}/index.tcl ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/overlay.c ${WRKSRC}/overlay.tcl ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/stereo.c ${WRKSRC}/stereo.tcl ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/texture.c ${WRKSRC}/texture.tcl ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/togl.c ${WRKSRC}/togl.h ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/tree2.rgba ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/Makefile ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/ben.rgb ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/double.c ${WRKSRC}/double.tcl ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/gears.c ${WRKSRC}/gears.tcl ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/image.c ${WRKSRC}/image.h ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/index.c ${WRKSRC}/index.tcl ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/overlay.c ${WRKSRC}/overlay.tcl ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/stereo.c ${WRKSRC}/stereo.tcl ${STAGEDIR}${EXAMPLESDIR} + ${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 Modified: head/graphics/togl/pkg-plist ============================================================================== --- head/graphics/togl/pkg-plist Thu Jan 9 22:14:14 2014 (r339293) +++ head/graphics/togl/pkg-plist Thu Jan 9 22:31:47 2014 (r339294) @@ -6,25 +6,25 @@ lib/Togl-1.7/libTogl1.7.so lib/Togl-1.7/pkgIndex.tcl lib/Togl-1.7/libtogl.so.1 %%PORTDOCS%%%%DOCSDIR%%/Togl.html -%%EXAMPLESDIR%%/Makefile -%%EXAMPLESDIR%%/ben.rgb -%%EXAMPLESDIR%%/double.c -%%EXAMPLESDIR%%/double.tcl -%%EXAMPLESDIR%%/gears.c -%%EXAMPLESDIR%%/gears.tcl -%%EXAMPLESDIR%%/image.c -%%EXAMPLESDIR%%/image.h -%%EXAMPLESDIR%%/index.c -%%EXAMPLESDIR%%/index.tcl -%%EXAMPLESDIR%%/overlay.c -%%EXAMPLESDIR%%/overlay.tcl -%%EXAMPLESDIR%%/stereo.c -%%EXAMPLESDIR%%/stereo.tcl -%%EXAMPLESDIR%%/texture.c -%%EXAMPLESDIR%%/texture.tcl -%%EXAMPLESDIR%%/togl.c -%%EXAMPLESDIR%%/togl.h -%%EXAMPLESDIR%%/tree2.rgba -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ben.rgb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/double.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/double.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlay.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlay.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stereo.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stereo.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/texture.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/texture.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/togl.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/togl.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tree2.rgba +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/Togl-1.7