11 files changed, 24 insertions, 69 deletions

diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile
index edeb4d85b383..84ab6270eece 100644
--- a/graphics/fpc-cairo/Makefile
+++ b/graphics/fpc-cairo/Makefile
@@ -5,26 +5,16 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-cairo
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to cairo library
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		fpcmake:${PORTSDIR}/lang/fpc-utils \
-		${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
-		${UNITSDIR}/fcl-image/Package.fpc:${PORTSDIR}/devel/fpc-fcl-image \
-		${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash \
-		${UNITSDIR}/libasync/Package.fpc:${PORTSDIR}/net/fpc-libasync \
-		${UNITSDIR}/netdb/Package.fpc:${PORTSDIR}/net/fpc-netdb \
-		${UNITSDIR}/pasjpeg/Package.fpc:${PORTSDIR}/graphics/fpc-pasjpeg \
-		${UNITSDIR}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
-		${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads \
-		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11
+USE_FPC=	fcl-base fcl-image hash libasync netdb pasjpeg paszlib pthreads \
+		x11
 
-UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
diff --git a/graphics/fpc-fpgtk/Makefile b/graphics/fpc-fpgtk/Makefile
index 7d97ebea56a4..11c179efe0f7 100644
--- a/graphics/fpc-fpgtk/Makefile
+++ b/graphics/fpc-fpgtk/Makefile
@@ -5,36 +5,16 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-fpgtk
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Component Library for create programs with gtk
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		fpcmake:${PORTSDIR}/lang/fpc-utils \
-		${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
-		${UNITSDIR}/gdbint/Package.fpc:${PORTSDIR}/devel/fpc-gdbint \
-		${UNITSDIR}/graph/Package.fpc:${PORTSDIR}/graphics/fpc-graph \
-		${UNITSDIR}/ibase/Package.fpc:${PORTSDIR}/databases/fpc-ibase \
-		${UNITSDIR}/libasync/Package.fpc:${PORTSDIR}/net/fpc-libasync \
-		${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash \
-		${UNITSDIR}/mysql/Package.fpc:${PORTSDIR}/databases/fpc-mysql \
-		${UNITSDIR}/netdb/Package.fpc:${PORTSDIR}/net/fpc-netdb \
-		${UNITSDIR}/odbc/Package.fpc:${PORTSDIR}/databases/fpc-odbc \
-		${UNITSDIR}/oracle/Package.fpc:${PORTSDIR}/databases/fpc-oracle \
-		${UNITSDIR}/pasjpeg/Package.fpc:${PORTSDIR}/graphics/fpc-pasjpeg \
-		${UNITSDIR}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
-		${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads \
-		${UNITSDIR}/postgres/Package.fpc:${PORTSDIR}/databases/fpc-postgres \
-		${UNITSDIR}/regexpr/Package.fpc:${PORTSDIR}/devel/fpc-regexpr \
-		${UNITSDIR}/sqlite/Package.fpc:${PORTSDIR}/databases/fpc-sqlite \
-		${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk \
-		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
-		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
+USE_FPC=	fcl-base gdbint graph ibase libasync hash mysql netdb odbc oracle \
+		pasjpeg paszlib pthreads regexpr sqlite gtk x11 opengl
 
-UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
diff --git a/graphics/fpc-ggi/Makefile b/graphics/fpc-ggi/Makefile
index badedbe82551..d91dd9c1f68c 100644
--- a/graphics/fpc-ggi/Makefile
+++ b/graphics/fpc-ggi/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-ggi
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to libggi
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		fpcmake:${PORTSDIR}/lang/fpc-utils
+USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
diff --git a/graphics/fpc-graph/Makefile b/graphics/fpc-graph/Makefile
index 2919eb4ac389..7e6b1fd389fa 100644
--- a/graphics/fpc-graph/Makefile
+++ b/graphics/fpc-graph/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-graph
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to graphical applications
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/graphics/fpc-imlib/Makefile b/graphics/fpc-imlib/Makefile
index 8d9de11381e0..24389e1f3509 100644
--- a/graphics/fpc-imlib/Makefile
+++ b/graphics/fpc-imlib/Makefile
@@ -5,20 +5,15 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imlib
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to imlib library
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		fpcmake:${PORTSDIR}/lang/fpc-utils \
-		${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk \
-		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
-		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
+USE_FPC=	gtk x11 opengl
 
-UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile
index 7a0ba0a28d92..4f961da02f79 100644
--- a/graphics/fpc-libgd/Makefile
+++ b/graphics/fpc-libgd/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-libgd
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to libgd for producing graphics files
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		fpcmake:${PORTSDIR}/lang/fpc-utils
+USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile
index 24f93afe9151..cb0e6fae4c5e 100644
--- a/graphics/fpc-libpng/Makefile
+++ b/graphics/fpc-libpng/Makefile
@@ -5,18 +5,15 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-libpng
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to libpng, for reading PNG image files
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		fpcmake:${PORTSDIR}/lang/fpc-utils \
-		${UNITSDIR}/zlib/Package.fpc:${PORTSDIR}/devel/fpc-zlib
+USE_FPC=	zlib
 
-UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
diff --git a/graphics/fpc-ncurses/Makefile b/graphics/fpc-ncurses/Makefile
index 601993edd6cb..a29febdeb37e 100644
--- a/graphics/fpc-ncurses/Makefile
+++ b/graphics/fpc-ncurses/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-ncurses
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the ncurses library
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		fpcmake:${PORTSDIR}/lang/fpc-utils
+USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index cc5f1809eb74..e72779cd5f47 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -5,18 +5,15 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-opengl
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the OpenGL library
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		fpcmake:${PORTSDIR}/lang/fpc-utils \
-		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11
+USE_FPC=	x11
 
-UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
diff --git a/graphics/fpc-pasjpeg/Makefile b/graphics/fpc-pasjpeg/Makefile
index ff0963414d0c..4ea5dc872eed 100644
--- a/graphics/fpc-pasjpeg/Makefile
+++ b/graphics/fpc-pasjpeg/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-pasjpeg
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Handling JPEG files with Pascal
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile
index f3b7af342322..9adc819324c4 100644
--- a/graphics/fpc-svgalib/Makefile
+++ b/graphics/fpc-svgalib/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-svgalib
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the SVGA graphics library
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		fpcmake:${PORTSDIR}/lang/fpc-utils
+USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}