- Use new freepascal stuff

- Bump PORTREVISION

8 files changed, 58 insertions, 142 deletions

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