- repocopy from x11-toolkits/fpc-forms to x11-toolkits/fpc-xforms

3 files changed, 67 insertions, 67 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index ae788a866fdd..a4f376c3a4ae 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -32,6 +32,7 @@
     SUBDIR += fpc-gnome
     SUBDIR += fpc-gtk
     SUBDIR += fpc-gtk2
+    SUBDIR += fpc-xforms
     SUBDIR += fpc-zvt
     SUBDIR += fxscintilla
     SUBDIR += fxscintilla-fox10
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index a6c06981b560..326a2c258cc4 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
-PKGNAMESUFFIX=	-forms
+PKGNAMESUFFIX=	-xforms
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	X-Forms interface for Free Pascal
@@ -15,7 +15,7 @@ COMMENT=	X-Forms interface for Free Pascal
 USE_FPC=	x11
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	XFORMS	"Install xforms graphical user interface toolkit"	on
diff --git a/x11-toolkits/fpc-xforms/pkg-plist b/x11-toolkits/fpc-xforms/pkg-plist
index 4e73106b281f..57e0c65679c9 100644
--- a/x11-toolkits/fpc-xforms/pkg-plist
+++ b/x11-toolkits/fpc-xforms/pkg-plist
@@ -1,70 +1,69 @@
 bin/fd2pascal
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/xforms.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/xforms.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/libpxforms.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/Makefile
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/xyplotover.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/touchbutton.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/srs.xbm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/sliderall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/secretinput.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/pushme.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/pushbutton.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/pup.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/positioner.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/porsche.xpm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/objreturn.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/objpos.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/objinactive.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/nomail.xbm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/newbutton.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/ndial.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/multilabel.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/minput.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/menu.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/longlabel.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/ll.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/ldial.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/lalign.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/invslider.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/inputall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/iconify.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/group.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/goodies.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/free1.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fonts.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/flclock.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fdial.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fbrowse1.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fbrowse.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/doc2p
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/cursor.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/crab45.xpm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/crab.xpm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/counter.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/colsel1.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/colsel.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/colbrowser.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/choice.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/chartstrip.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/chartall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/canvas.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/butttypes.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/buttonall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/browserop.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/browserall.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/boxtype.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/borderwidth.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/bm2.xbm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/bm1.xbm
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/arrowbutton.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/Makefile.fpc
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/yesno.pp
-@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms
+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
+@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%%/forms
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/xforms
 %%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%