2 files changed, 223 insertions, 1 deletions

diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 21a49995ec2a..ff75044218fe 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fpc
 PORTVERSION=	2.0.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
 		ftp://planetmirror.com/pub/fpc/dist/source-${PORTVERSION}/:source \
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 1ec3e57344cd..0cd836db2af3 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -8,6 +8,8 @@ UNITNAME=		${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_S
 UNITDIR=		lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${EXTRACTUNITDIR}
+OPT=-CX
+
 
 .if !exists(${LOCALBASE}/bin/fpcmake)
 EXTRACTUNITDIR+=	fpc-bin
@@ -15,11 +17,231 @@ DISTFILES+=	${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
 MAKE_ENV+=	FPCMAKE=${WRKDIR}/${PORTNAME:S/$/-bin/}/bin/fpcmake
 .endif
 
+.if ${PKGNAMESUFFIX} == "-gdbint"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-ibase"
+.	if defined(WITH_IBASE)
+#LIB_DEPENDS=	fbembed.1:${PORTSDIR}/databases/firebird-client
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-mysql"
+.	if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-odbc"
+.	if defined(WITH_ODBC)
+LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
+.	endif
+HAVE_EXAMPLES=	true
+.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
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-postgres"
+.	if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-pasjpeg"
+HAVE_EXAMPLES=  true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-paszlib"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-regexpr"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-sqlite"
+.	if defined(WITH_SQLITE)
+USE_SQLITE=	yes
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-bfd"
+.	if defined(WITH_LIBBFD)
+RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-fftw"
+.	if defined(WITH_FFTW)
+LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-forms"
+.	if defined(WITH_XFORMS)
+LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-fcl"
+OPT+=-Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
+HAVE_EXAMPLES=	true
+.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} == "-gconf"
+.	if defined(WITH_GCONF)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=      gconf
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-gdbm"
+.	if defined(WITH_GDBM)
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-ggi"
+.	if defined(WITH_LIBGGI)
+LIB_DEPENDS=	ggi:${PORTSDIR}/graphics/libggi
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-gtk"
+.	if defined(WITH_GTK1)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=	gtk12
+.	endif
+HAVE_EXAMPLES=	true
+OPT+=-Fu${WRKDIR}/${WRKUNITDIR}/*
+.endif
+
+.if ${PKGNAMESUFFIX} == "-gtk2"
+.	if defined(WITH_GTK2)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=	gtk20
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-hash"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-imlib"
+.	if defined(WITH_IMLIB)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=	imlib
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-libgd"
+.	if defined(WITH_LIBGD)
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-libpng"
+.	if defined(WITH_LIBPNG)
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-ncurses"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-netdb"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-opengl"
+.	if defined(WITH_OPENGL)
+USE_GL=		yes
+LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-svgalib"
+.	if defined(WITH_SVGA)
+LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-syslog"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-tcl"
+.	if defined(WITH_TCL)
+RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+.	endif
+HAVE_EXAMPLES=	true
+.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} == "-utmp"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-x11"
+.	if defined(WITH_X11)
+USE_XLIB=	yes
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-zvt"
+.	if defined(WITH_ZVT)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=	libzvt
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
 post-extract:
 	@cd ${WRKDIR}/${WRKUNITDIR} && \
 		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
 
 do-build:
+	@${ECHO_CMD} ${MAKE_ENV}
+	@${ECHO_CMD} ""
 	@cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} all ${MAKE_ENV}
 
 do-install: