Stage support

2 files changed, 64 insertions, 62 deletions

diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index aff788c28fcc..eee5bd67e919 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -12,11 +12,13 @@ USE_FPC=	x11
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR+=	${WRKUNITDIR}
+EXTRACTUNITDIR=	${WRKUNITDIR}
 
-OPTIONS_DEFINE=	XFORMS
+OPTIONS_DEFINE=	EXAMPLES XFORMS
 XFORMS_DESC=	Install xforms graphical user interface toolkit
 OPTIONS_DEFAULT=	XFORMS
 
-NO_STAGE=	yes
+XFORMS_LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
+HAVE_EXAMPLES=	yes
+
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-xforms/pkg-plist b/x11-toolkits/fpc-xforms/pkg-plist
index 57e0c65679c9..521feb353368 100644
--- a/x11-toolkits/fpc-xforms/pkg-plist
+++ b/x11-toolkits/fpc-xforms/pkg-plist
@@ -3,67 +3,67 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/libpxforms.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/xyplotover.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/touchbutton.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/srs.xbm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/sliderall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/secretinput.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/pushme.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/pushbutton.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/pup.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/positioner.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/porsche.xpm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/objreturn.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/objpos.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/objinactive.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/nomail.xbm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/newbutton.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/ndial.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/multilabel.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/minput.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/menu.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/longlabel.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/ll.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/ldial.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/lalign.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/invslider.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/inputall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/iconify.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/group.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/goodies.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/free1.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/fonts.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/flclock.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/fdial.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse1.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/cursor.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/crab45.xpm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/crab.xpm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/counter.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel1.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/colbrowser.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/choice.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/chartstrip.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/chartall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/canvas.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/butttypes.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/buttonall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/browserop.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/browserall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/boxtype.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/borderwidth.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/bm2.xbm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/bm1.xbm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/arrowbutton.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile.fpc
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/yesno.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/xyplotover.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/touchbutton.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/srs.xbm
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/sliderall.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/secretinput.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pushme.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pushbutton.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pup.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/positioner.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/porsche.xpm
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objreturn.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objpos.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objinactive.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/nomail.xbm
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/newbutton.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ndial.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/multilabel.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/minput.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/menu.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/longlabel.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ll.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ldial.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/lalign.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/invslider.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/inputall.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/iconify.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/group.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/goodies.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/free1.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fonts.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/flclock.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fdial.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse1.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/cursor.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/crab45.xpm
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/crab.xpm
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/counter.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel1.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colbrowser.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/choice.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/chartstrip.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/chartall.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/canvas.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/butttypes.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/buttonall.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/browserop.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/browserall.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/boxtype.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/borderwidth.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/bm2.xbm
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/bm1.xbm
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/arrowbutton.pp
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile.fpc
+%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/yesno.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/xforms
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
+%%PORTEXAMPLES%%@dirrm share/examples/fpc-%%PORTVERSION%%/xforms
+%%PORTEXAMPLES%%@dirrmtry share/examples/fpc-%%PORTVERSION%%