3 files changed, 37 insertions, 34 deletions

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