aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/fpc-paszlib/Makefile6
-rw-r--r--archivers/fpc-unzip/Makefile5
-rw-r--r--databases/fpc-gdbm/Makefile5
-rw-r--r--databases/fpc-ibase/Makefile4
-rw-r--r--databases/fpc-mysql/Makefile4
-rw-r--r--databases/fpc-odbc/Makefile4
-rw-r--r--databases/fpc-oracle/Makefile4
-rw-r--r--databases/fpc-postgres/Makefile4
-rw-r--r--databases/fpc-sqlite/Makefile4
-rw-r--r--devel/fpc-bfd/Makefile5
-rw-r--r--devel/fpc-fcl-async/Makefile4
-rw-r--r--devel/fpc-fcl-base/Makefile10
-rw-r--r--devel/fpc-fcl-db/Makefile18
-rw-r--r--devel/fpc-fcl-fpcunit/Makefile12
-rw-r--r--devel/fpc-fcl-image/Makefile13
-rw-r--r--devel/fpc-fcl-net/Makefile13
-rw-r--r--devel/fpc-fcl-passrc/Makefile5
-rw-r--r--devel/fpc-fcl-registry/Makefile12
-rw-r--r--devel/fpc-fcl-web/Makefile20
-rw-r--r--devel/fpc-fcl-xml/Makefile11
-rw-r--r--devel/fpc-fpmkunit/Makefile4
-rw-r--r--devel/fpc-fv/Makefile5
-rw-r--r--devel/fpc-gconf/Makefile9
-rw-r--r--devel/fpc-gdbint/Makefile4
-rw-r--r--devel/fpc-pthreads/Makefile4
-rw-r--r--devel/fpc-regexpr/Makefile4
-rw-r--r--devel/fpc-zlib/Makefile5
-rw-r--r--editors/fpc-ide/Makefile24
-rw-r--r--ftp/fpc-libcurl/Makefile5
-rw-r--r--graphics/fpc-cairo/Makefile16
-rw-r--r--graphics/fpc-fpgtk/Makefile26
-rw-r--r--graphics/fpc-ggi/Makefile5
-rw-r--r--graphics/fpc-graph/Makefile4
-rw-r--r--graphics/fpc-imlib/Makefile9
-rw-r--r--graphics/fpc-libgd/Makefile5
-rw-r--r--graphics/fpc-libpng/Makefile7
-rw-r--r--graphics/fpc-ncurses/Makefile5
-rw-r--r--graphics/fpc-opengl/Makefile7
-rw-r--r--graphics/fpc-pasjpeg/Makefile4
-rw-r--r--graphics/fpc-svgalib/Makefile5
-rw-r--r--lang/fpc-base/Makefile22
-rw-r--r--lang/fpc-tcl/Makefile23
-rw-r--r--lang/fpc-units/Makefile57
-rw-r--r--lang/fpc-utils/Makefile26
-rw-r--r--lang/fpc-utils/pkg-plist1
-rw-r--r--lang/fpc/Makefile28
-rw-r--r--lang/fpc/Makefile.units40
-rw-r--r--lang/fpc/pkg-plist3
-rw-r--r--math/fpc-fftw/Makefile4
-rw-r--r--net/fpc-libasync/Makefile4
-rw-r--r--net/fpc-netdb/Makefile4
-rw-r--r--net/fpc-pcap/Makefile4
-rw-r--r--security/fpc-hash/Makefile4
-rw-r--r--security/fpc-openssl/Makefile4
-rw-r--r--sysutils/fpc-syslog/Makefile5
-rw-r--r--sysutils/fpc-utmp/Makefile5
-rw-r--r--www/fpc-httpd/Makefile4
-rw-r--r--www/fpc-httpd13/Makefile4
-rw-r--r--www/fpc-httpd20/Makefile4
-rw-r--r--www/fpc-httpd22/Makefile4
-rw-r--r--x11-toolkits/fpc-forms/Makefile7
-rw-r--r--x11-toolkits/fpc-gnome/Makefile10
-rw-r--r--x11-toolkits/fpc-gnome1/Makefile10
-rw-r--r--x11-toolkits/fpc-gtk/Makefile9
-rw-r--r--x11-toolkits/fpc-gtk1/Makefile9
-rw-r--r--x11-toolkits/fpc-gtk2/Makefile7
-rw-r--r--x11-toolkits/fpc-xforms/Makefile7
-rw-r--r--x11-toolkits/fpc-zvt/Makefile10
-rw-r--r--x11/fpc-x11/Makefile5
69 files changed, 185 insertions, 459 deletions
diff --git a/archivers/fpc-paszlib/Makefile b/archivers/fpc-paszlib/Makefile
index 4ceee037d617..30e01aa23343 100644
--- a/archivers/fpc-paszlib/Makefile
+++ b/archivers/fpc-paszlib/Makefile
@@ -5,17 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= archivers devel
PKGNAMESUFFIX= -paszlib
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal unit for native compression IO
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash
+USE_FPC= hash
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/archivers/fpc-unzip/Makefile b/archivers/fpc-unzip/Makefile
index 8793e32dce9c..66b35c39bc7d 100644
--- a/archivers/fpc-unzip/Makefile
+++ b/archivers/fpc-unzip/Makefile
@@ -5,15 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= archivers lang
PKGNAMESUFFIX= -unzip
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal routines for unzipping zip 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/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
index e5289118944e..6013f13b4dfc 100644
--- a/databases/fpc-gdbm/Makefile
+++ b/databases/fpc-gdbm/Makefile
@@ -5,15 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -gdbm
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to the GNU database system
-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/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
index 508999cc355c..fd3a53e791d9 100644
--- a/databases/fpc-ibase/Makefile
+++ b/databases/fpc-ibase/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -ibase
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to interbase
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
index 336d5723eeb7..92677d8b23bd 100644
--- a/databases/fpc-mysql/Makefile
+++ b/databases/fpc-mysql/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -mysql
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to MySQL
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
index 29e5cb9ccf32..337434f9d54e 100644
--- a/databases/fpc-odbc/Makefile
+++ b/databases/fpc-odbc/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -odbc
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to ODBC
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
index e47ea815e0a5..00c3ae8daa36 100644
--- a/databases/fpc-oracle/Makefile
+++ b/databases/fpc-oracle/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -oracle
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to Oracle
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
index 35e772b7c4e0..31bda127609c 100644
--- a/databases/fpc-postgres/Makefile
+++ b/databases/fpc-postgres/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases lang
PKGNAMESUFFIX= -postgres
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to PostGreSQL
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
index d89597e0e4fc..9b3e243a93b9 100644
--- a/databases/fpc-sqlite/Makefile
+++ b/databases/fpc-sqlite/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases lang
PKGNAMESUFFIX= -sqlite
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to SQLite
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile
index 37544f36ac85..0d3649bd108d 100644
--- a/devel/fpc-bfd/Makefile
+++ b/devel/fpc-bfd/Makefile
@@ -5,15 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -bfd
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface for the GNU Binary Format description
-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/devel/fpc-fcl-async/Makefile b/devel/fpc-fcl-async/Makefile
index 6d8d7ca16421..3d5a0bcd5f8c 100644
--- a/devel/fpc-fcl-async/Makefile
+++ b/devel/fpc-fcl-async/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net lang
PKGNAMESUFFIX= -libasync
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to async library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-base/Makefile b/devel/fpc-fcl-base/Makefile
index 74d3f9cb9e0a..c79b6a27d90a 100644
--- a/devel/fpc-fcl-base/Makefile
+++ b/devel/fpc-fcl-base/Makefile
@@ -5,21 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-base
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/libasync/Package.fpc:${PORTSDIR}/net/fpc-libasync \
- ${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash \
- ${UNITSDIR}/netdb/Package.fpc:${PORTSDIR}/net/fpc-netdb \
- ${UNITSDIR}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
- ${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads
+USE_FPC= libasync hash netdb paszlib pthreads
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile
index c29a2442b509..68bcc33b6d7b 100644
--- a/devel/fpc-fcl-db/Makefile
+++ b/devel/fpc-fcl-db/Makefile
@@ -5,28 +5,16 @@
# $FreeBSD$
#
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-db
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
- ${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash \
- ${UNITSDIR}/ibase/Package.fpc:${PORTSDIR}/databases/fpc-ibase \
- ${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}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
- ${UNITSDIR}/postgres/Package.fpc:${PORTSDIR}/databases/fpc-postgres \
- ${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads \
- ${UNITSDIR}/libasync/Package.fpc:${PORTSDIR}/net/fpc-libasync \
- ${UNITSDIR}/sqlite/Package.fpc:${PORTSDIR}/databases/fpc-sqlite
+USE_FPC= fcl-base hash ibase mysql netdb odbc oracle paszlib postgres pthreads \
+ libasync sqlite
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-fcl-fpcunit/Makefile b/devel/fpc-fcl-fpcunit/Makefile
index a313e649edec..e4c4da4f20d3 100644
--- a/devel/fpc-fcl-fpcunit/Makefile
+++ b/devel/fpc-fcl-fpcunit/Makefile
@@ -5,23 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-fpcunit
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
- ${UNITSDIR}/fcl-xml/Package.fpc:${PORTSDIR}/devel/fpc-fcl-xml \
- ${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}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
- ${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads
+USE_FPC= fcl-base fcl-xml hash libasync netdb paszlib pthreads
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile
index 57ebe359e088..ed7ab28963fb 100644
--- a/devel/fpc-fcl-image/Makefile
+++ b/devel/fpc-fcl-image/Makefile
@@ -5,24 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-image
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
- ${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash \
- ${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}/libasync/Package.fpc:${PORTSDIR}/net/fpc-libasync \
- ${UNITSDIR}/libpng/Package.fpc:${PORTSDIR}/graphics/fpc-libpng
+USE_FPC= fcl-base hash netdb pasjpeg paszlib pthreads libasync libpng
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-fcl-net/Makefile b/devel/fpc-fcl-net/Makefile
index 5d110654cc71..588f9f3bb389 100644
--- a/devel/fpc-fcl-net/Makefile
+++ b/devel/fpc-fcl-net/Makefile
@@ -5,24 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-net
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
- ${UNITSDIR}/fcl-xml/Package.fpc:${PORTSDIR}/devel/fpc-fcl-xml \
- ${UNITSDIR}/fcl-passrc/Package.fpc:${PORTSDIR}/devel/fpc-fcl-passrc \
- ${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}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
- ${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads
+USE_FPC= fcl-base fcl-xml fcl-passrc hash libasync netdb paszlib pthreads
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile
index 69d14a09a993..db48ca88163b 100644
--- a/devel/fpc-fcl-passrc/Makefile
+++ b/devel/fpc-fcl-passrc/Makefile
@@ -5,16 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-passrc
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-fcl-registry/Makefile b/devel/fpc-fcl-registry/Makefile
index da0b91697d25..9afad6d8685b 100644
--- a/devel/fpc-fcl-registry/Makefile
+++ b/devel/fpc-fcl-registry/Makefile
@@ -5,23 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-registry
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
- ${UNITSDIR}/fcl-xml/Package.fpc:${PORTSDIR}/devel/fpc-fcl-xml \
- ${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}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
- ${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads
+USE_FPC= fcl-base fcl-xml hash libasync netdb paszlib pthreads
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile
index db42760e812b..2e585b6ce08d 100644
--- a/devel/fpc-fcl-web/Makefile
+++ b/devel/fpc-fcl-web/Makefile
@@ -5,30 +5,16 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-web
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
- ${UNITSDIR}/fcl-xml/Package.fpc:${PORTSDIR}/devel/fpc-fcl-xml \
- ${UNITSDIR}/fcl-db/Package.fpc:${PORTSDIR}/devel/fpc-fcl-db \
- ${UNITSDIR}/hash/Package.fpc:${PORTSDIR}/security/fpc-hash \
- ${UNITSDIR}/ibase/Package.fpc:${PORTSDIR}/databases/fpc-ibase \
- ${UNITSDIR}/libasync/Package.fpc:${PORTSDIR}/net/fpc-libasync \
- ${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}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
- ${UNITSDIR}/postgres/Package.fpc:${PORTSDIR}/databases/fpc-postgres \
- ${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads \
- ${UNITSDIR}/sqlite/Package.fpc:${PORTSDIR}/databases/fpc-sqlite
+USE_FPC= fcl-base fcl-xml fcl-db hash ibase libasync mysql netdb odbc oracle \
+ paszlib postgres pthreads sqlite
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-fcl-xml/Makefile b/devel/fpc-fcl-xml/Makefile
index 6cb14c86f21f..7bc5a0963583 100644
--- a/devel/fpc-fcl-xml/Makefile
+++ b/devel/fpc-fcl-xml/Makefile
@@ -5,22 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-xml
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Component Library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
- ${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}/paszlib/Package.fpc:${PORTSDIR}/archivers/fpc-paszlib \
- ${UNITSDIR}/pthreads/Package.fpc:${PORTSDIR}/devel/fpc-pthreads
+USE_FPC= fcl-base hash libasync netdb paszlib pthreads
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-fpmkunit/Makefile b/devel/fpc-fpmkunit/Makefile
index 1887f5f71d87..a76ff1b0aa75 100644
--- a/devel/fpc-fpmkunit/Makefile
+++ b/devel/fpc-fpmkunit/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fpmkunit
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal build system unit
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fv/Makefile b/devel/fpc-fv/Makefile
index 10a351dac40e..9284799e8b33 100644
--- a/devel/fpc-fv/Makefile
+++ b/devel/fpc-fv/Makefile
@@ -5,15 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fv
MAINTAINER= acm@FreeBSD.org
COMMENT= FreeVision is a Free Pascal unit for Delphi support
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- fpcmake:${PORTSDIR}/lang/fpc-utils
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-gconf/Makefile b/devel/fpc-gconf/Makefile
index f50aafdf028d..803a0a2949aa 100644
--- a/devel/fpc-gconf/Makefile
+++ b/devel/fpc-gconf/Makefile
@@ -5,20 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel lang
PKGNAMESUFFIX= -gconf
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to GConf
-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/gnome1/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/devel/fpc-gdbint/Makefile b/devel/fpc-gdbint/Makefile
index 60c9aeac651f..1ed0f18af876 100644
--- a/devel/fpc-gdbint/Makefile
+++ b/devel/fpc-gdbint/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMESUFFIX= -gdbint
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal unit providing interface to gdb
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-pthreads/Makefile b/devel/fpc-pthreads/Makefile
index bbc4dc4f1da5..aa3670f82b6a 100644
--- a/devel/fpc-pthreads/Makefile
+++ b/devel/fpc-pthreads/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -pthreads
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal wraper for the pthreads library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-regexpr/Makefile b/devel/fpc-regexpr/Makefile
index 790d67d0e155..495c2fc82634 100644
--- a/devel/fpc-regexpr/Makefile
+++ b/devel/fpc-regexpr/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -regexpr
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal regular expression routines
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-zlib/Makefile b/devel/fpc-zlib/Makefile
index d6ab2b8cfd3b..b015378b3ebc 100644
--- a/devel/fpc-zlib/Makefile
+++ b/devel/fpc-zlib/Makefile
@@ -5,15 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -zlib
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to the zlib compression 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/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile
index 920b67cd9200..25a34e42979d 100644
--- a/editors/fpc-ide/Makefile
+++ b/editors/fpc-ide/Makefile
@@ -5,34 +5,16 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= editors lang
PKGNAMESUFFIX= -ide
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal integrated IDE/compiler
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- fpcmake:${PORTSDIR}/lang/fpc-utils \
- ${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}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
- ${UNITSDIR}/fv/Package.fpc:${PORTSDIR}/devel/fpc-fv
+USE_FPC= gdbint graph ibase libasync hash mysql netdb odbc oracle pasjpeg \
+ paszlib pthreads postgres regexpr sqlite fcl-base fv
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
UNITPREFIX= # none
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile
index be241bf9026c..c77d94b0a96b 100644
--- a/ftp/fpc-libcurl/Makefile
+++ b/ftp/fpc-libcurl/Makefile
@@ -5,16 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= ftp lang
PKGNAMESUFFIX= -libcurl
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to libcurl
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
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/-//}
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index f7d5a4908f76..deede9691138 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= base
PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= # empty
PKGNAMEPREFIX= fpc-
@@ -17,25 +17,7 @@ EXTRACT_ONLY= # empty
MAINTAINER= acm@FreeBSD.org
COMMENT= Meta package to install all of the Free Pascal base
-RUN_DEPENDS= ${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}/httpd-1.3/Package.fpc:${PORTSDIR}/www/fpc-httpd
-
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
-BUILDNAME= ${ARCH}-freebsd
+WANT_FPC_BASE= yes
.if !defined(NOPORTDOCS)
RUN_DEPENDS+= ${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:${PORTSDIR}/lang/fpc-docs
diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile
index dd59645af282..d27703351f85 100644
--- a/lang/fpc-tcl/Makefile
+++ b/lang/fpc-tcl/Makefile
@@ -5,33 +5,16 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= lang
PKGNAMESUFFIX= -tcl
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to the tcl/tk interpreter
-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
+USE_FPC= fcl-base gdbint graph ibase libasync hash mysql netdb odbc \
+ oracle pasjpeg paszlib pthreads postgres regexpr sqlite
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 06ee1549a71c..54d4f4221a23 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -7,7 +7,7 @@
PORTNAME= units
PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= # none
PKGNAMEPREFIX= fpc-
@@ -62,61 +62,28 @@ OPTIONS= BFD "Interface to GNU Binary Format description" on \
ZLIB "Interface to the zlib compression library" on \
ZVT "Interface to Zed's Virtual Terminal" on
-.include <bsd.port.pre.mk>
+PORT_DBDIR?= /var/db/ports
+LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
+OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options
+
+.if exists(${OPTIONSFILE})
+.include "${OPTIONSFILE}"
+.endif
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
ALL_OPTIONS= BFD CAIRO FCL-BASE FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-NET FCL-PASSRC \
FCL-REGISTRY FCL-WEB FCL-XML FFTW FPMKUNIT FORMS FPGTK FV GCONF GDBM \
GGI GNOME GTK GTK2 HTTPD IMLIB LIBCURL LIBGD LIBPNG NCURSES OPENGL \
OPENSSL PCAP SVGALIB SYSLOG TCL UNZIP UTMP X11 ZLIB ZVT
-BFD_UNIT= devel/fpc-bfd
-CAIRO_UNIT= graphics/fpc-cairo
-FCL_BASE_UNIT= devel/fpc-fcl-base
-FCL_DB_UNIT= devel/fpc-fcl-db
-FCL_FPCUNIT_UNIT= devel/fpc-fcl-fpcunit
-FCL_IMAGE_UNIT= devel/fpc-fcl-image
-FCL_NET_UNIT= devel/fpc-fcl-net
-FCL_PASSRC_UNIT= devel/fpc-fcl-passrc
-FCL_REGISTRY_UNIT= devel/fpc-fcl-registry
-FCL_WEB_UNIT= devel/fpc-fcl-web
-FCL_XML_UNIT= devel/fpc-fcl-xml
-FFTW_UNIT= math/fpc-fftw
-FPMKUNIT_UNIT= devel/fpc-fpmkunit
-FORMS_UNIT= x11-toolkits/fpc-forms
-FPGTK_UNIT= graphics/fpc-fpgtk
-FV_UNIT= devel/fpc-fv
-GCONF_UNIT= devel/fpc-gconf
-GDBM_UNIT= databases/fpc-gdbm
-GGI_UNIT= graphics/fpc-ggi
-GNOME_UNIT= x11-toolkits/fpc-gnome
-GTK_UNIT= x11-toolkits/fpc-gtk
-GTK2_UNIT= x11-toolkits/fpc-gtk2
-HTTPD_UNIT= www/fpc-httpd
-IMLIB_UNIT= graphics/fpc-imlib
-LIBCURL_UNIT= ftp/fpc-libcurl
-LIBGD_UNIT= graphics/fpc-libgd
-LIBPNG_UNIT= graphics/fpc-libpng
-NCURSES_UNIT= graphics/fpc-ncurses
-OPENGL_UNIT= graphics/fpc-opengl
-OPENSSL_UNIT= security/fpc-openssl
-PCAP_UNIT= net/fpc-pcap
-SVGALIB_UNIT= graphics/fpc-svgalib
-SYSLOG_UNIT= sysutils/fpc-syslog
-TCL_UNIT= lang/fpc-tcl
-UNZIP_UNIT= archivers/fpc-unzip
-UTMP_UNIT= sysutils/fpc-utmp
-X11_UNIT= x11/fpc-x11
-ZLIB_UNIT= devel/fpc-zlib
-ZVT_UNIT= x11-toolkits/fpc-zvt
-
+UNITS_SELECTED= #
.for OPT in ${ALL_OPTIONS}
. if defined(WITH_${OPT}) && !defined(WITHOUT_${OPT})
-RUN_DEPENDS+= ${UNITSDIR}/${OPT:L:S/httpd/httpd-1.3/}/Package.fpc:${PORTSDIR}/${${OPT:S/-/_/}_UNIT}
+UNITS_SELECTED+= ${OPT:L}
. endif
.endfor
+USE_FPC= ${UNITS_SELECTED}
do-install: build
@${DO_NADA}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile
index 3c875fc12e91..66e22a3c3c2d 100644
--- a/lang/fpc-utils/Makefile
+++ b/lang/fpc-utils/Makefile
@@ -5,35 +5,17 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= lang
PKGNAMESUFFIX= -utils
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal Compiler utils
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- ${UNITSDIR}/fcl-base/Package.fpc:${PORTSDIR}/devel/fpc-fcl-base \
- ${UNITSDIR}/fcl-passrc/Package.fpc:${PORTSDIR}/devel/fpc-fcl-passrc \
- ${UNITSDIR}/fcl-xml/Package.fpc:${PORTSDIR}/devel/fpc-fcl-xml \
- ${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}/libcurl/Package.fpc:${PORTSDIR}/ftp/fpc-libcurl \
- ${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
+USE_FPC= fcl-base fcl-passrc fcl-xml gdbint graph ibase libasync libcurl \
+ hash mysql netdb odbc oracle pasjpeg paszlib pthreads postgres \
+ regexpr sqlite
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/fcl/inc
diff --git a/lang/fpc-utils/pkg-plist b/lang/fpc-utils/pkg-plist
index 7cd757577e45..7a71da6e60eb 100644
--- a/lang/fpc-utils/pkg-plist
+++ b/lang/fpc-utils/pkg-plist
@@ -1,7 +1,6 @@
bin/bin2obj
bin/data2inc
bin/delp
-bin/fpcmake
bin/fpcres
bin/fpdoc
bin/fppkg
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 312cf13e388f..a5ccf8007d0f 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fpc
PORTVERSION= 2.2.0
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
ftp://planetmirror.com/pub/fpc/dist/source-${PORTVERSION}/:source \
@@ -27,24 +27,26 @@ COMMENT?= Free Pascal compiler with Turbo and Delphi
USE_GMAKE= yes
ONLY_FOR_ARCHS= i386
-BUILDNAME= ${ARCH}-freebsd
-OPT?=-CX
-MAKE_ENV= PREFIX=${PREFIX} \
- FPCTARGET=${BUILDNAME} \
- OPT="${OPT}" \
- BSDHIER=1
+
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
-PLIST_SUB+= PORTVERSION=${PORTVERSION} \
- BUILDNAME=${BUILDNAME}
SUB_FILES= pkg-message
+
+OPT?=-CX
FPCSRCDIR= ${PORTNAME}-${PORTVERSION}
.include <bsd.port.pre.mk>
.if !defined(PKGNAMESUFFIX)
+BUILDNAME= ${ARCH}-freebsd
+PLIST_SUB= PORTVERSION=${PORTVERSION} \
+ BUILDNAME=${BUILDNAME}
DISTFILES+= ${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
MAKE_ENV+= PP=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/lib/${PORTNAME}/${PORTVERSION}/ppc386 \
- FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake
+ PREFIX=${PREFIX} \
+ FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake \
+ FPCTARGET=${BUILDNAME} \
+ OPT="${OPT}" \
+ BSDHIER=1
MAN1= bin2obj.1 \
data2inc.1 \
delp.1 \
@@ -88,17 +90,21 @@ do-extract:
# unpack source distribution
@cd ${WRKDIR} && \
${GZIP_CMD} -dc ${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} \
- | ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl
+ | ${TAR} xf - ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/utils/fpcm
do-build:
# build fpc compiler
@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} cycle ${MAKE_ENV}
+# build fpcmake
+ @cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} ${MAKE_ENV}
do-install:
# Installing fpc compiler
@cd ${WRKDIR}/${FPCSRCDIR}/rtl && ${GMAKE} install ${MAKE_ENV}
# Installing fpc runtime
@cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${GMAKE} install ${MAKE_ENV}
+ # Installng fpcmake
+ @@cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${GMAKE} install ${MAKE_ENV}
# Installing manpages
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/man/man1/* ${MAN1PREFIX}/man/man1
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/man/man5/* ${MAN1PREFIX}/man/man5
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 32f3c1f21b1b..f78fe7d68943 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -1,6 +1,9 @@
-PLIST= ${.CURDIR}/pkg-plist
-PATCHDIR= ${.CURDIR}/files
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PLIST_SUB= PORTVERSION=${PORTVERSION} \
+ BUILDNAME=${BUILDNAME}
+
+PLIST= ${.CURDIR}/pkg-plist
+PATCHDIR= ${.CURDIR}/files
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
UNITPREFIX= unit-
UNITEXTRACT_SUFX= .tar.gz
@@ -10,13 +13,12 @@ UNITDIR= lib/fpc/${PORTVERSION}/units/${BUILDNAME}
EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${EXTRACTUNITDIR}
OPT=-CX
-MAKE_ENV+= PP=${LOCALBASE}/bin/ppc386
-
-.if !exists(${LOCALBASE}/bin/fpcmake)
-EXTRACTUNITDIR+= ${PORTNAME}-${PORTVERSION:S/$/.bin/}
-DISTFILES+= ${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
-MAKE_ENV+= FPCMAKE=${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/.bin/}/bin/fpcmake
-.endif
+MAKE_ENV+= PP=${LOCALBASE}/bin/ppc386 \
+ PREFIX=${PREFIX} \
+ FPCMAKE=${LOCALBASE}/bin/fpcmake \
+ FPCTARGET=${BUILDNAME} \
+ OPT="${OPT}" \
+ BSDHIER=1
.if ${PKGNAMESUFFIX} == "-gdbint"
HAVE_EXAMPLES= true
@@ -282,6 +284,12 @@ post-extract:
@cd ${WRKDIR}/${WRKUNITDIR} && \
${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
+post-patch:
+.if ${PKGNAMESUFFIX} == "-utils"
+ @${REINPLACE_CMD} -e 's|fpcm||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \
+ ${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
+.endif
+
do-build:
@${ECHO_CMD} ${MAKE_ENV}
@${ECHO_CMD} ""
@@ -294,15 +302,3 @@ do-install:
@cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} fpc_exampleinstall
. endif
. endif
-
-security-check: fpc-check-install
-
-fpc-check-install:
-check-makevars::
- @${ECHO_CMD} "#################################################################"
- @${ECHO_CMD} ""
- @${ECHO_CMD} " The following freepascal unit will be installed in your system: "
- @${ECHO_CMD} ""
- @${ECHO_CMD} " * ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}"
- @${ECHO_CMD} ""
- @${ECHO_CMD} "#################################################################"
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index dff90d83c318..335c9e42cc38 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,9 +1,10 @@
-@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.9 2008-01-06 21:20:11 acm Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.10 2008-06-24 15:18:12 acm Exp $
@unexec if cmp -s %D/etc/fpc.cfg.sample %D/etc/fpc.cfg; then rm -f %D/etc/fpc.cfg; fi
etc/fpc.cfg.sample
@exec if [ ! -f %D/etc/fpc.cfg ] ; then cp -p %D/%F %B/fpc.cfg; fi
bin/fpc
+bin/fpcmake
bin/fpcmkcfg
bin/fpcsubst
bin/ppudump
diff --git a/math/fpc-fftw/Makefile b/math/fpc-fftw/Makefile
index 5284bae92331..b6bd46ad318c 100644
--- a/math/fpc-fftw/Makefile
+++ b/math/fpc-fftw/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= math lang
PKGNAMESUFFIX= -fftw
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to the FFTW3 library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
diff --git a/net/fpc-libasync/Makefile b/net/fpc-libasync/Makefile
index 6d8d7ca16421..3d5a0bcd5f8c 100644
--- a/net/fpc-libasync/Makefile
+++ b/net/fpc-libasync/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net lang
PKGNAMESUFFIX= -libasync
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to async library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/net/fpc-netdb/Makefile b/net/fpc-netdb/Makefile
index fd10d8b5077b..409a7494ea48 100644
--- a/net/fpc-netdb/Makefile
+++ b/net/fpc-netdb/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net lang
PKGNAMESUFFIX= -netdb
MAINTAINER= acm@FreeBSD.org
COMMENT= Pure-pascal netdb implementation
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/net/fpc-pcap/Makefile b/net/fpc-pcap/Makefile
index ef7ffe561256..b0784411d2f4 100644
--- a/net/fpc-pcap/Makefile
+++ b/net/fpc-pcap/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net lang
PKGNAMESUFFIX= -pcap
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal unit for libpcap library
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
diff --git a/security/fpc-hash/Makefile b/security/fpc-hash/Makefile
index 8279035ab1d4..fe519092cdba 100644
--- a/security/fpc-hash/Makefile
+++ b/security/fpc-hash/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= security lang
PKGNAMESUFFIX= -hash
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal unit for MD5 hash routines
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/security/fpc-openssl/Makefile b/security/fpc-openssl/Makefile
index 92bf661fb7ed..aab6a7ebebdd 100644
--- a/security/fpc-openssl/Makefile
+++ b/security/fpc-openssl/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= security lang
PKGNAMESUFFIX= -openssl
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal unit for OpenSSL
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
diff --git a/sysutils/fpc-syslog/Makefile b/sysutils/fpc-syslog/Makefile
index dfecd0747b45..6c836249664c 100644
--- a/sysutils/fpc-syslog/Makefile
+++ b/sysutils/fpc-syslog/Makefile
@@ -5,15 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= sysutils lang
PKGNAMESUFFIX= -syslog
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to the system logger
-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/sysutils/fpc-utmp/Makefile b/sysutils/fpc-utmp/Makefile
index 187fede243ad..55804417c0d2 100644
--- a/sysutils/fpc-utmp/Makefile
+++ b/sysutils/fpc-utmp/Makefile
@@ -5,15 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= sysutils lang
PKGNAMESUFFIX= -utmp
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal unit to gather information from the utmp file
-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/www/fpc-httpd/Makefile b/www/fpc-httpd/Makefile
index a742678a5337..05ae9cfb2406 100644
--- a/www/fpc-httpd/Makefile
+++ b/www/fpc-httpd/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= www lang
PKGNAMESUFFIX= -httpd
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal httpd unit
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/www/fpc-httpd13/Makefile b/www/fpc-httpd13/Makefile
index a742678a5337..05ae9cfb2406 100644
--- a/www/fpc-httpd13/Makefile
+++ b/www/fpc-httpd13/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= www lang
PKGNAMESUFFIX= -httpd
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal httpd unit
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/www/fpc-httpd20/Makefile b/www/fpc-httpd20/Makefile
index a742678a5337..05ae9cfb2406 100644
--- a/www/fpc-httpd20/Makefile
+++ b/www/fpc-httpd20/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= www lang
PKGNAMESUFFIX= -httpd
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal httpd unit
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/www/fpc-httpd22/Makefile b/www/fpc-httpd22/Makefile
index a742678a5337..05ae9cfb2406 100644
--- a/www/fpc-httpd22/Makefile
+++ b/www/fpc-httpd22/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= www lang
PKGNAMESUFFIX= -httpd
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal httpd unit
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
diff --git a/x11-toolkits/fpc-forms/Makefile b/x11-toolkits/fpc-forms/Makefile
index cd7aca94f268..a6c06981b560 100644
--- a/x11-toolkits/fpc-forms/Makefile
+++ b/x11-toolkits/fpc-forms/Makefile
@@ -5,18 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -forms
MAINTAINER= acm@FreeBSD.org
COMMENT= X-Forms interface for Free Pascal
-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/x11-toolkits/fpc-gnome/Makefile b/x11-toolkits/fpc-gnome/Makefile
index 1d8a72c3ede3..d26fe1c2fb97 100644
--- a/x11-toolkits/fpc-gnome/Makefile
+++ b/x11-toolkits/fpc-gnome/Makefile
@@ -5,21 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -gnome
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal unit to create programs for GNOME 1
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- fpcmake:${PORTSDIR}/lang/fpc-utils \
- ${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk \
- ${UNITSDIR}/imlib/Package.fpc:${PORTSDIR}/graphics/fpc-imlib \
- ${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl \
- ${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11
+USE_FPC= gtk imlib opengl x11
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/x11-toolkits/fpc-gnome1/Makefile b/x11-toolkits/fpc-gnome1/Makefile
index 1d8a72c3ede3..d26fe1c2fb97 100644
--- a/x11-toolkits/fpc-gnome1/Makefile
+++ b/x11-toolkits/fpc-gnome1/Makefile
@@ -5,21 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -gnome
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal unit to create programs for GNOME 1
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- fpcmake:${PORTSDIR}/lang/fpc-utils \
- ${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk \
- ${UNITSDIR}/imlib/Package.fpc:${PORTSDIR}/graphics/fpc-imlib \
- ${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl \
- ${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11
+USE_FPC= gtk imlib opengl x11
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/x11-toolkits/fpc-gtk/Makefile b/x11-toolkits/fpc-gtk/Makefile
index 0a1836442ee7..cff108f41f84 100644
--- a/x11-toolkits/fpc-gtk/Makefile
+++ b/x11-toolkits/fpc-gtk/Makefile
@@ -5,20 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -gtk
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to the GTK libraries
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- fpcmake:${PORTSDIR}/lang/fpc-utils \
- ${UNITSDIR}/gtk2/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk2 \
- ${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
- ${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
+USE_FPC= gtk2 x11 opengl
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/x11-toolkits/fpc-gtk1/Makefile b/x11-toolkits/fpc-gtk1/Makefile
index 0a1836442ee7..cff108f41f84 100644
--- a/x11-toolkits/fpc-gtk1/Makefile
+++ b/x11-toolkits/fpc-gtk1/Makefile
@@ -5,20 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -gtk
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to the GTK libraries
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- fpcmake:${PORTSDIR}/lang/fpc-utils \
- ${UNITSDIR}/gtk2/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk2 \
- ${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
- ${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
+USE_FPC= gtk2 x11 opengl
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index 780252232d5b..704243069d5f 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -5,18 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -gtk2
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to the GTK2 libraries
-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/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index cd7aca94f268..a6c06981b560 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -5,18 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -forms
MAINTAINER= acm@FreeBSD.org
COMMENT= X-Forms interface for Free Pascal
-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/x11-toolkits/fpc-zvt/Makefile b/x11-toolkits/fpc-zvt/Makefile
index 6c2b2214b0c1..f766a012e325 100644
--- a/x11-toolkits/fpc-zvt/Makefile
+++ b/x11-toolkits/fpc-zvt/Makefile
@@ -5,21 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -zvt
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to Zed's Virtual Terminal
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- fpcmake:${PORTSDIR}/lang/fpc-utils \
- ${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk \
- ${UNITSDIR}/imlib/Package.fpc:${PORTSDIR}/graphics/fpc-imlib \
- ${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
- ${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
+USE_FPC= gtk imlib x11 opengl
-UNITSDIR= ${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR+= ${WRKUNITDIR}
diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile
index 8a63950444f3..fd13e3fea4e8 100644
--- a/x11/fpc-x11/Makefile
+++ b/x11/fpc-x11/Makefile
@@ -5,15 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11 lang
PKGNAMESUFFIX= -x11
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal interface to X windows server
-BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc \
- fpcmake:${PORTSDIR}/lang/fpc-utils
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}