2 files changed, 11 insertions, 335 deletions

diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 22dcd3f62a43..fe4479c6bccf 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -32,7 +32,6 @@ OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 OPT?=-CX
 FPCSRCDIR=	${PORTNAME}-${PORTVERSION}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -48,6 +47,7 @@ PLIST_SUB=	FPC_I386="@comment " \
 .endif
 
 .if !defined(PKGNAMESUFFIX)
+NO_STAGE=	yes
 SUB_FILES=	pkg-message
 
 BUILDNAME=	${FPC_ARCH}-freebsd
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index d4451d81df00..17a0e742f926 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -7,341 +7,30 @@ PLIST=			${.CURDIR}/pkg-plist
 PATCHDIR=		${.CURDIR}/files
 FILESDIR=		${.CURDIR}/files
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+BUILD_WRKSRC=		${WRKDIR}/${WRKUNITDIR}
+INSTALL_WRKSRC=		${WRKDIR}/${WRKUNITDIR}
 
-FPCDIR=			${LOCALBASE}/lib/${PORTNAME}/${PORTVERSION}
+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}
 
 EXTRACT_AFTER_ARGS=	${EXTRACTUNITDIR}
-OPT=-Ur -CX
+OPT+=			-Ur -CX
 
-MAKE_ENV+=		PP=${LOCALBASE}/bin/${PPNAME} \
+MAKE_ARGS=		PP=${LOCALBASE}/bin/${PPNAME} \
 			FPCDIR=${FPCDIR} \
 			FPCMAKE=${LOCALBASE}/bin/fpcmake \
 			FPCTARGET=${BUILDNAME} \
 			ARCH=${FPC_ARCH} \
 			OPT="${OPT}" \
-			BSDHIER=1
+			BSDHIER=1 \
+			INSTALL_PREFIX=${STAGEDIR}${PREFIX}
+MAKE_ENV+=		FPCDIR=${UNITDIR}
 
-.if ${PKGNAMESUFFIX} == "-a52"
-.	if defined(WITH_LIBA52)
-LIB_DEPENDS=	a52:${PORTSDIR}/audio/liba52
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-bfd"
-.	if defined(WITH_LIBBFD)
-RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-cairo"
-.	if defined(WITH_LIBCAIRO)
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-dbus"
-.	if defined(WITH_DBUS)
-LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-dts"
-.	if defined(WITH_LIBDCA)
-LIB_DEPENDS=	dca:${PORTSDIR}/multimedia/libdca
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-fcl-db"
-OPT+=	-Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \
-	-Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME} \
-	-Fu../sqldb/*
-.endif
-
-.if ${PKGNAMESUFFIX} == "-fcl-net"
-OPT+=	-Fu${WRKDIR}/${WRKUNITDIR}/*
-.endif
-
-.if ${PKGNAMESUFFIX} == "-fcl-web"
-OPT+=	-Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \
-	-Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME}
-.endif
-
-.if ${PKGNAMESUFFIX} == "-fftw"
-.	if defined(WITH_FFTW)
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-fpgtk"
-.	if defined(WITH_GTK1)
-.include <${PORTSDIR}/Mk/bsd.gnome.mk>
-USE_GNOME=	gtk12
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-fv"
-HAVE_EXAMPLES=	true
-.endif
-
-.if ${PKGNAMESUFFIX} == "-gdbm"
-.	if defined(WITH_GDBM)
-LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-ggi"
-.	if defined(WITH_LIBGGI)
-LIB_DEPENDS=	ggi:${PORTSDIR}/graphics/libggi
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-gmp"
-.	if defined(WITH_GMP)
-LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-gtk1"
-.	if defined(WITH_GTK1)
-.include <${PORTSDIR}/Mk/bsd.gnome.mk>
-USE_GNOME=	gtk12
-.	endif
-OPT+=-Fu${WRKDIR}/${WRKUNITDIR}/*
-.endif
-
-.if ${PKGNAMESUFFIX} == "-gtk2"
-.	if defined(WITH_GTK2)
-.include <${PORTSDIR}/Mk/bsd.gnome.mk>
-USE_GNOME=	gtk20
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-hermes"
-.	if defined(WITH_HERMES)
-LIB_DEPENDS=	Hermes:${PORTSDIR}/graphics/Hermes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-httpd22"
-.	if defined(WITH_APACHE22)
-USE_APACHE=	22
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-ibase"
-.	if defined(WITH_IBASE)
-USE_FIREBIRD=	yes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-iconvenc"
-# added to main port to make it compile on 10 with iconv in libc
-# USES+=iconv
-.endif
-
-.if ${PKGNAMESUFFIX} == "-ide"
-FPCDIR=		#
-.endif
-
-.if ${PKGNAMESUFFIX} == "-imagemagick"
-.	if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS=	Magick:${PORTSDIR}/graphics/ImageMagick
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-imlib"
-.	if defined(WITH_IMLIB)
-.include <${PORTSDIR}/Mk/bsd.efl.mk>
-USE_EFL=	imlib2
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-ldap"
-.	if defined(WITH_OPENLDAP)
-USE_OPENLDAP=	yes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-libcurl"
-.	if defined(WITH_LIBCURL)
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-libgd"
-.	if defined(WITH_LIBGD)
-LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-libpng"
-.	if defined(WITH_LIBPNG)
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-libxml2"
-.	if defined(WITH_LIBXML2)
-LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-lua"
-.	if defined(WITH_LUA)
-LIB_DEPENDS=	lua-5.1:${PORTSDIR}/lang/lua
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-mad"
-.if defined(WITH_LIBMAD)
-LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-matroska"
-.	if defined(WITH_LIBMATROSKA)
-LIB_DEPENDS=	matroska:${PORTSDIR}/multimedia/libmatroska
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-modplug"
-.	if defined(WITH_LIBMODPLUG)
-LIB_DEPENDS=	modplug:${PORTSDIR}/audio/libmodplug
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-mysql"
-.if defined(WITH_MYSQL)
-USE_MYSQL=	yes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-newt"
-.	if defined(WITH_NEWT)
-LIB_DEPENDS=	newt:${PORTSDIR}/devel/newt
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-odbc"
-.	if defined(WITH_ODBC)
-LIB_DEPENDS=	odbc.2:${PORTSDIR}/databases/unixODBC
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-oggvorbis"
-.	if defined(WITH_LIBOGG)
-LIB_DEPENDS+=	ogg:${PORTSDIR}/audio/libogg
-.	endif
-.	if defined(WITH_LIBVORBIS)
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-opengl"
-.	if defined(WITH_OPENGL)
-USE_GL=		glut
-.	endif
-HAVE_EXAMPLES=	true
-.endif
-
-.if ${PKGNAMESUFFIX} == "-openssl"
-.	if defined(WITH_OPENSSL)
-USE_OPENSSL=    yes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-oracle"
-.	if defined(WITH_ORACLE)
-ORACLE8_LIB=	${LOCALBASE}/oracle8-client/rdbms/lib
-RUN_DEPENDS=	${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-pcap"
-.       if defined(WITH_LIBPCAP)
-LIB_DEPENDS=    pcap:${PORTSDIR}/net/libpcap
-.       endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-postgres"
-.	if defined(WITH_PGSQL)
-USE_PGSQL=	yes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-proj4"
-.	if defined(WITH_PROJ)
-LIB_DEPENDS=	proj:${PORTSDIR}/graphics/proj
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-rexx"
-.	if defined(WITH_REXX_REGINA)
-RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-rsvg"
-.	if defined(WITH_LIBRSVG2)
-LIB_DEPENDS=	rsvg-2:${PORTSDIR}/graphics/librsvg2
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-sdl"
-.	if defined(WITH_SDL)
-USE_SDL=	sdl image mixer ttf gfx
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-sndfile"
-.	if defined(WITH_LIBSNDFILE)
-LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-sqlite"
-.	if defined(WITH_SQLITE)
-USE_SQLITE=	yes
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-svgalib"
-.	if defined(WITH_SVGA)
-LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-tcl"
-.	if defined(WITH_TCL)
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-unzip"
-.	if defined(WITH_UNZIP)
-RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-utils"
-OPT+=-Fu../fcl/*
-.endif
-
-.if ${PKGNAMESUFFIX} == "-x11"
-.	if defined(WITH_X11)
-USE_XORG=	xcursor xfont xxf86dga xxf86vm xi xinerama xkbfile xrandr xrender xres xv
-.	endif
-.endif
-
-.if ${PKGNAMESUFFIX} == "-xforms"
-.	if defined(WITH_XFORMS)
-LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms
-.	endif
-HAVE_EXAMPLES=	true
+.if ${PORT_OPTIONS:MEXAMPLES} && defined(HAVE_EXAMPLES)
+LATE_INSTALL_ARGS=	fpc_exampleinstall
 .endif
 
 post-extract:
@@ -363,16 +52,3 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(INSTALL) Package.fpc $$(INSTALL_UNITDIR)||g' \
 		${WRKDIR}/${WRKUNITDIR}/fppkg/Makefile
 .endif
-
-do-build:
-	@${ECHO_CMD} ${MAKE_ENV}
-	@${ECHO_CMD} ""
-	@cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} all ${MAKE_ENV}
-
-do-install:
-	@cd ${WRKDIR}/${WRKUNITDIR} && FPCDIR=${UNITDIR} ${GMAKE} install ${MAKE_ENV}
-.	if !defined(NOPORTDOCS)
-.		if defined(HAVE_EXAMPLES)
-			@cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} fpc_exampleinstall
-.		endif
-.	endif