FPC ecosystem: Upgrade version 2.6.4 => 3.0.0

This is the first major release of FreePascal in nearly four years.
There are a ton of new features, way more to list here. see:
http://wiki.freepascal.org/FPC_New_Features_3.0

Several new unit ports were added, some were contracted.  Most of
those were absorbed into the main FPC packages, but two units are
no longer supported: sndfile and matroshka.

All 99 remaining ports (including Lazarus ports) were build tested
on FreeBSD i386 and amd64 Release 10.2

1 files changed, 41 insertions, 40 deletions

diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 458384a360d5..4ac795babe48 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -1,35 +1,39 @@
-BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
-
-PLIST_SUB+=		PORTVERSION=${PORTVERSION} \
-			BUILDNAME=${BUILDNAME}
-
-PLIST=			${.CURDIR}/pkg-plist
-PATCHDIR=		${.CURDIR}/files
-FILESDIR=		${.CURDIR}/files
-DFLY_PATCHDIR=		${.CURDIR}/dragonfly
-DFLY_FILESDIR=		${.CURDIR}/dragonfly
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-BUILD_WRKSRC=		${WRKDIR}/${WRKUNITDIR}
-INSTALL_WRKSRC=		${WRKDIR}/${WRKUNITDIR}
-
-FPCDIR?=		${LOCALBASE}/lib/${PORTNAME}/${PORTVERSION}
-UNITPREFIX=    		unit-
-UNITEXTRACT_SUFX=	.tar.gz
-UNITNAME=		${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX}
-UNITDIR=		lib/fpc/${PORTVERSION}/units/${BUILDNAME}
+BUILDNAME=	${FPC_ARCH}-${OPSYS:tl}
+
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		BUILDNAME=${BUILDNAME}
+
+PLIST=		${.CURDIR}/pkg-plist
+PATCHDIR=	${.CURDIR}/files
+FILESDIR=	${.CURDIR}/files
+DFLY_PATCHDIR=	${.CURDIR}/dragonfly
+DFLY_FILESDIR=	${.CURDIR}/dragonfly
+WRKSRC=		${WRKDIR}/${FPCSRCDIR}
+BUILD_WRKSRC=	${WRKDIR}/${WRKUNITDIR}
+INSTALL_WRKSRC=	${WRKDIR}/${WRKUNITDIR}
+
+OPT+=		-Ur
+FPCDIR?=	${LOCALBASE}/lib/fpc/${PORTVERSION}
+UNITPREFIX=    	unit-
+UNITNAME=	${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX}
+UNITDIR=	lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 
+UNITEXTRACT_SUFX=	.tar.gz
 EXTRACT_AFTER_ARGS=	${EXTRACTUNITDIR}
-OPT+=			-Ur -CX
-
-MAKE_ARGS=		PP=${LOCALBASE}/bin/${PPNAME} \
-			FPCDIR=${FPCDIR} \
-			FPCMAKE=${LOCALBASE}/bin/fpcmake \
-			FPCTARGET=${BUILDNAME} \
-			ARCH=${FPC_ARCH} \
-			OPT="${OPT}" \
-			BSDHIER=1 \
-			INSTALL_PREFIX=${STAGEDIR}${PREFIX}
-MAKE_ENV+=		FPCDIR=${UNITDIR}
+
+MAKE_ARGS+=	PP="${LOCALBASE}/bin/fpc" \
+		FPCFPMAKE="${LOCALBASE}/bin/fpc" \
+		FPCMAKE="${LOCALBASE}/bin/fpcmake" \
+		CPU_TARGET=${FPC_ARCH} \
+		OS_TARGET=${OPSYS:tl} \
+		COMPILER_OPTIONS="${OPT}" \
+		BSDHIER=1 \
+		VERBOSE=1 \
+		INSTALL="${INSTALL_DATA}" \
+		INSTALLEXE="${INSTALL_PROGRAM}" \
+		INSTALLSCR="${INSTALL_SCRIPT}" \
+		INSTALL_PREFIX="${STAGEDIR}${PREFIX}"
+ALL_TARGET=	fpc_baseinfo release
 
 .if ${PORT_OPTIONS:MEXAMPLES} && defined(HAVE_EXAMPLES)
 LATE_INSTALL_ARGS=	fpc_exampleinstall
@@ -38,19 +42,16 @@ LATE_INSTALL_ARGS=	fpc_exampleinstall
 post-extract:
 	@cd ${WRKDIR}/${WRKUNITDIR} && \
 		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
+.if ${PKGNAMESUFFIX:M-utils} || ${PKGNAMESUFFIX:M-ide}
+	${REINPLACE_CMD} -e '/globalunit/ s|\.\./packages|${FPCDIR}|' \
+		${WRKDIR}/${WRKUNITDIR}/Makefile
+.else
+	${REINPLACE_CMD} -e '/globalunit/ {s|\.\.|${FPCDIR}|;}' \
+		${WRKDIR}/${WRKUNITDIR}/Makefile
+.endif
 
 post-patch:
-.if ${PKGNAMESUFFIX} == "-fpmkunit"
-	@${REINPLACE_CMD} -e 's|\[Linux\]|\[Linux,FreeBSD,NetBSD,OpenBSD\]|g' \
-		${WRKDIR}/${WRKUNITDIR}/src/${PKGNAMESUFFIX:S/-//}.pp
-.endif
 .if ${PKGNAMESUFFIX} == "-fppkg"
 	@${REINPLACE_CMD} -e 's|packages_${OPSYS:tl}=fcl-net fcl-web|packages_${OPSYS:tl}=fcl-net|g' \
 		${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
 .endif
-.if ${PKGNAMESUFFIX} == "-utils"
-	@${REINPLACE_CMD} -e 's| fpcmkcfg||g' -e 's| fpcm||g' ${WRKDIR}/${WRKUNITDIR}/Makefile \
-		${WRKDIR}/${WRKUNITDIR}/Makefile.fpc
-	@${REINPLACE_CMD} -e 's|$$(INSTALL) Package.fpc $$(INSTALL_UNITDIR)||g' \
-		${WRKDIR}/${WRKUNITDIR}/fppkg/Makefile
-.endif