- Stage support

- Add missing OPTIONS_DEFINE
- Fix plist without EXAMPLES

2 files changed, 41 insertions, 40 deletions

diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index 8ff23aecf872..41bd8218e34c 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -27,37 +27,38 @@ LDFLAGS+=	-L${TK_LIBDIR}
 
 PLIST_SUB+=	TK_VER=${TK_VER}
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 .include <bsd.port.options.mk>
 
 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 <bsd.port.mk>
diff --git a/graphics/togl/pkg-plist b/graphics/togl/pkg-plist
index 1095ce1f5de3..0d12c8ff05ae 100644
--- a/graphics/togl/pkg-plist
+++ b/graphics/togl/pkg-plist
@@ -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