Index: head/Mk/bsd.fpc.mk
===================================================================
--- head/Mk/bsd.fpc.mk	(revision 404079)
+++ head/Mk/bsd.fpc.mk	(revision 404080)
@@ -1,226 +1,226 @@
 #
 # $FreeBSD$
 #
 # bsd.fpc.mk - Support for FreePascal based ports.
 #
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 #
 # For FreeBSD committers:
 # Please send all suggested changes to the maintainer instead of committing
 # them to SVN yourself.
 #
 # USE_FPC		- If you set this to "yes", this automatically will install
 #			  free pascal compiler, if you need install additional fpc
 #			  units, they can be listed there (USE_FPC= gtk x11 opengl).
 #
 # USE_FPC_RUN		- If you set this to "yes", free pascal units will be 
 #			  registered also as run dependencies.
 #
 # WANT_FPC_BASE		- If you set this to "yes", this automatically will install
 #			  all base units of fpc (gdbint graph ibase libasync hash 
 #			  httpd mysql netdb odbc oracle pasjpeg paszlib pthreads 
 #		 	  postgres regexpr and sqlite).
 #
 # WANT_FPC_ALL		- If you set this to "yes", this automatically will install
 #			  all free pascal units.
 #
 #
 
 .if !defined(_FPCMKINCLUDED)
 
 _FPCMKINCLUDED=	yes
 
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 
 .if defined(DEFAULT_FPC_VER)
 WARNING+=	"DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
 .endif
 
 FPC_Include_MAINTAINER=	freebsd-fpc@FreeBSD.org
 FPC_Pre_Include=	bsd.fpc.mk
 
 DEFAULT_FPC_VER=	${FPC_DEFAULT}
 FPC_VER=		${DEFAULT_FPC_VER}
 FPC_ARCH=		${ARCH:S/amd64/x86_64/}
 
 .if exists(${LOCALBASE}/bin/fpc)
 FPC_CURRENT_VER!=	${LOCALBASE}/bin/fpc -iV
 .	if ${FPC_CURRENT_VER} != ${FPC_VER}
 IGNORE=	incompatible fpc ${FPC_CURRENT_VER} compiler, please install ${FPC_VER} version
 .	endif
 .endif
 
 .if ${ARCH} == "i386"
 PPNAME=			ppc386
 .elif ${ARCH} == "amd64"
 PPNAME=			ppcx64
 .else
 PPNAME=			ppc_not_yet_ported
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 .endif
 
 BUILD_DEPENDS+=		${PPNAME}:${PORTSDIR}/lang/fpc
 
-BUILDNAME=		${FPC_ARCH}-freebsd
+BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
 UNITSDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
 MKINSTDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
 
 _FPC_ALL_UNITS=	a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \
 		fcl-async fcl-base fcl-db fcl-extra fcl-fpcunit fcl-image \
 		fcl-js fcl-json fcl-net fcl-passrc fcl-registry fcl-res \
 		fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml fftw \
 		fpindexer fppkg fv gdbint gdbm gmp graph gtk2 hermes \
 		httpd22 httpd24 ibase iconvenc imagemagick ldap libcurl \
 		libgd libpng libvlc libxml2 lua mad modplug mysql \
 		ncurses newt numlib odbc oggvorbis openal opengl openssl \
 		oracle pasjpeg pcap postgres proj4 pthreads pxlib regexpr \
 		rexx rsvg rtl-console rtl-extra rtl-objpas rtl-unicode sdl \
 		sqlite svgalib symbolic syslog tcl unzip users utmp \
 		uuid x11 xforms zlib
 
 .if defined(WANT_FPC_BASE)
 .       if ${WANT_FPC_BASE:tl} == "yes"
 USE_FPC=	gdbint graph httpd22 httpd24 ibase mysql odbc oracle pasjpeg \
 		postgres pthreads regexpr sqlite
 .       else
 IGNORE= unknown value, please use "yes" instead of
 .       endif
 .endif
 
 .if defined(WANT_FPC_ALL)
 .	if ${WANT_FPC_ALL:tl} == "yes"
 USE_FPC=	${_FPC_ALL_UNITS}
 .	else
 IGNORE=	unknown value, please use "yes" instead of
 .	endif
 .endif
 
 .if ${USE_FPC:tl} != "yes"
 .	for UNITS in ${USE_FPC}
 .		if ${_FPC_ALL_UNITS:M${UNITS}}==""
 IGNORE= cannot install: unknown FPC unit ${UNITS}
 .		endif
 .	endfor
 .endif
 
 # Base units
 gdbint_UNIT=	devel/fpc-gdbint
 graph_UNIT=	graphics/fpc-graph
 httpd22_UNIT=	www/fpc-httpd22
 httpd24_UNIT=	www/fpc-httpd24
 ibase_UNIT=	databases/fpc-ibase
 mysql_UNIT=	databases/fpc-mysql
 odbc_UNIT=	databases/fpc-odbc
 oracle_UNIT=	databases/fpc-oracle
 pasjpeg_UNIT=	graphics/fpc-pasjpeg
 postgres_UNIT=	databases/fpc-postgres
 pthreads_UNIT=	devel/fpc-pthreads
 regexpr_UNIT=	devel/fpc-regexpr
 sqlite_UNIT=	databases/fpc-sqlite
 
 # Extra units
 a52_UNIT=	audio/fpc-a52
 aspell_UNIT=	textproc/fpc-aspell
 bfd_UNIT=	devel/fpc-bfd
 bzip2_UNIT=	archivers/fpc-bzip2
 cairo_UNIT=	graphics/fpc-cairo
 chm_UNIT=	misc/fpc-chm
 dblib_UNIT=	databases/fpc-dblib
 dbus_UNIT=	devel/fpc-dbus
 dts_UNIT=	multimedia/fpc-dts
 fastcgi_UNIT=	www/fpc-fastcgi
 fcl_async_UNIT=	devel/fpc-fcl-async
 fcl_base_UNIT=	devel/fpc-fcl-base
 fcl_db_UNIT=	devel/fpc-fcl-db
 fcl_extra_UNIT=	devel/fpc-fcl-extra
 fcl_fpcunit_UNIT=	devel/fpc-fcl-fpcunit
 fcl_image_UNIT=	devel/fpc-fcl-image
 fcl_js_UNIT=	devel/fpc-fcl-js
 fcl_json_UNIT=	devel/fpc-fcl-json
 fcl_net_UNIT=	devel/fpc-fcl-net
 fcl_passrc_UNIT=	devel/fpc-fcl-passrc
 fcl_registry_UNIT=	devel/fpc-fcl-registry
 fcl_res_UNIT=	devel/fpc-fcl-res
 fcl_sdo_UNIT=	devel/fpc-fcl-sdo
 fcl_sound_UNIT=	devel/fpc-fcl-sound
 fcl_stl_UNIT=	devel/fpc-fcl-stl
 fcl_web_UNIT=	devel/fpc-fcl-web
 fcl_xml_UNIT=	devel/fpc-fcl-xml
 fftw_UNIT=	math/fpc-fftw
 fpindexer_UNIT=	databases/fpc-fpindexer
 fppkg_UNIT=	devel/fpc-fppkg
 fpvectorial_UNIT=	graphics/fpc-fpvectorial
 fv_UNIT=	devel/fpc-fv
 hermes_UNIT=	graphics/fpc-hermes
 gdbm_UNIT=	databases/fpc-gdbm
 gmp_UNIT=	math/fpc-gmp
 gtk2_UNIT=	x11-toolkits/fpc-gtk2
 iconvenc_UNIT=	converters/fpc-iconvenc
 imagemagick_UNIT=	graphics/fpc-imagemagick
 ldap_UNIT=	net/fpc-ldap
 libcurl_UNIT=	ftp/fpc-libcurl
 libgd_UNIT=	graphics/fpc-libgd
 libpng_UNIT=	graphics/fpc-libpng
 libvlc_UNIT=	multimedia/fpc-libvlc
 libxml2_UNIT=	textproc/fpc-libxml2
 lua_UNIT=	lang/fpc-lua
 mad_UNIT=	audio/fpc-mad
 modplug_UNIT=	audio/fpc-modplug
 newt_UNIT=	devel/fpc-newt
 ncurses_UNIT=	graphics/fpc-ncurses
 numlib_UNIT=	math/fpc-numlib
 oggvorbis_UNIT=	audio/fpc-oggvorbis
 openal_UNIT=	audio/fpc-openal
 opengl_UNIT=	graphics/fpc-opengl
 openssl_UNIT=	security/fpc-openssl
 pcap_UNIT=	net/fpc-pcap
 proj4_UNIT=	graphics/fpc-proj4
 pxlib_UNIT=	databases/fpc-pxlib
 rexx_UNIT=	lang/fpc-rexx
 rsvg_UNIT=	graphics/fpc-rsvg
 rtl_console_UNIT=	lang/fpc-rtl-console
 rtl_extra_UNIT=		lang/fpc-rtl-extra
 rtl_objpas_UNIT=	lang/fpc-rtl-objpas
 rtl_unicode_UNIT=	lang/fpc-rtl-unicode
 sdl_UNIT=	devel/fpc-sdl
 svgalib_UNIT=	graphics/fpc-svgalib
 symbolic_UNIT=	devel/fpc-symbolic
 syslog_UNIT=	sysutils/fpc-syslog
 tcl_UNIT=	lang/fpc-tcl
 unzip_UNIT=	archivers/fpc-unzip
 users_UNIT=	sysutils/fpc-users
 utmp_UNIT=	sysutils/fpc-utmp
 uuid_UNIT=	sysutils/fpc-uuid
 x11_UNIT=	x11/fpc-x11
 xforms_UNIT=	x11-toolkits/fpc-xforms
 zlib_UNIT=	devel/fpc-zlib
 
 .endif
 
 .if defined(_POSTMKINCLUDED) && defined(USE_FPC)
 .	for UNIT in ${USE_FPC}
 .		if ${_FPC_ALL_UNITS:M${UNIT}} != ""
 BUILD_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${PORTSDIR}/${${UNIT:S/-/_/}_UNIT}
 .			if defined(USE_FPC_RUN)
 RUN_DEPENDS+=   ${MKINSTDIR}/${UNIT}.fpm:${PORTSDIR}/${${UNIT:S/-/_/}_UNIT}
 .			endif
 
 security-check: fpc-check-install
 .		endif
 .	endfor
 
 fpc-check-install:
 .if defined(UNITPREFIX) && defined(PKGNAMESUFFIX)
 	@${ECHO_CMD} "#################################################################"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} " The following freepascal unit has been installed in your system:"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} " * ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}                           "
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "#################################################################"
 .endif
 
 .endif
 #.endif
 # End of bsd.fpc.mk file
Index: head/editors/lazarus/Makefile
===================================================================
--- head/editors/lazarus/Makefile	(revision 404079)
+++ head/editors/lazarus/Makefile	(revision 404080)
@@ -1,190 +1,190 @@
 # Created by: Shaun Amott <shaun@inerd.com>
 # $FreeBSD$
 
 PORTNAME=	lazarus
 PORTVERSION=	1.4.2
 DISTVERSIONSUFFIX=	-0
 PORTREVISION?=	3
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION:S/.0//} \
 		LOCAL/acm/freepascal
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	freebsd-fpc@FreeBSD.org
 COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler
 
 BUILD_DEPENDS?=	#
 RUN_DEPENDS?=	#
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USES=		gmake
 USE_GNOME=	#
 USE_FPC?=	cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json \
 		fcl-registry fcl-res fcl-xml gtk2 ibase iconvenc rtl-extra \
 		mysql numlib odbc oracle pasjpeg postgres sqlite x11
 OPT?=		"-Sgic "
 
 MAKE_ENV=	OPT=${OPT}
 PLIST=		${WRKDIR}/pkg-plist
 WRKSRC?=	${WRKDIR}/${PORTNAME}
 DATADIR?=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 
 .if !defined(PKGNAMESUFFIX)
 OPTIONS_DEFINE=		GDB
 OPTIONS_SINGLE=		LCL
 OPTIONS_SINGLE_LCL=	GTK2 QT4
 
 GDB_DESC=		Install a newest version  of gdb
 GTK2_DESC=		Use gtk20 interface
 QT4_DESC=		Use qt4 interface
 
 OPTIONS_DEFAULT=	GTK2 GDB
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 LAZARUS_ARCH=	i386
 .elif ${ARCH} == "amd64"
 LAZARUS_ARCH=	x86_64
 .endif
 
-BUILDNAME=	${LAZARUS_ARCH}-freebsd
+BUILDNAME=	${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_UNITS_DIR=	${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}
 
 .if !defined(PKGNAMESUFFIX)
 BUILD_DEPENDS+=	fpcres:${PORTSDIR}/lang/fpc-utils \
 		${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units \
 		${LCL_UNITS_DIR}/nogui/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-nogui
 RUN_DEPENDS+=	fpcres:${PORTSDIR}/lang/fpc-utils \
 		${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units \
 		${LCL_UNITS_DIR}/nogui/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-nogui
 
 USES+=		gettext iconv
 USE_FPC+=	chm
 
 MAN1S=		lazarus-ide.1 lazbuild.1 startlazarus.1
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR="${PORTSDIR}"
 
 .if ${PORT_OPTIONS:MGDB}
 RUN_DEPENDS+=	${LOCALBASE}/bin/gdb:${PORTSDIR}/devel/gdb
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	gtk20 gdkpixbuf
 LCL_PLATFORM=	gtk2
 BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
 RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
 LIB_DEPENDS+=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
 LCL_PLATFORM=	qt
 BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
 RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
 #OPT_EXTRA=	"-dUSE_QT_45"
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKDIR}/man1
 	@${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/
 	@${MV} ${WRKSRC}/install/man/man1/lazbuild.1 ${WRKDIR}/man1/
 	@${MV} ${WRKSRC}/install/man/man1/startlazarus.1 ${WRKDIR}/man1/
 	@${MV} ${WRKSRC}/examples ${WRKDIR}/examples
 	@${MV} ${WRKSRC}/docs ${WRKDIR}/docs
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
 			-e 's|tools: lcl|tools:|g' -e '3080d' -e '3082d' -e '3083d' -e '3084d' -e '3085d' -e '3086d' ${WRKSRC}/${MAKEFILE}
 
 pre-build:
 	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units
 	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib ${WRKSRC}/components/debuggerintf/lib
 	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units ${WRKSRC}/components/ideintf/units
 	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units ${WRKSRC}/components/synedit/units
 	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib
 	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib ${WRKSRC}/components/lazdebuggergdbmi/lib
 
 do-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM}
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} tools LCL_PLATFORM=${LCL_PLATFORM}
 
 post-build:
 	@cd ${WRKSRC} && \
 		${RM} -Rf COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
 			ide/Makefile*.orig ide/Makefile*.bak lcl/units components/ideintf/units \
 				components/synedit/units components/lazcontrols/lib
 
 pre-install:
 	@${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper
 	@${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/lazarus-wrapper
 	@${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper
 
 	@${RM} -f ${PLIST}
 	@${RM} -f ${WRKSRC}/lcl/units
 	@${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS
 
 .	for FILE in bin/lazarus bin/lazbuild
 		@${ECHO_CMD} ${FILE} >> ${PLIST}
 .	endfor
 .	for m in ${MAN1S}
 		@${ECHO_CMD} man/man1/${m}.gz >> ${PLIST}
 .	endfor
 
 	@${ECHO_CMD} "%%DATADIR%%/docs" >> ${PLIST}
 	@cd ${WRKDIR}/docs && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST}
 
 	@${ECHO_CMD} "%%DATADIR%%/examples" >> ${PLIST}
 	@cd ${WRKDIR}/examples && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%EXAMPLESDIR%%/|' >> ${PLIST} && \
 		${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%EXAMPLESDIR%%/|' >> ${PLIST}
 
 	@cd ${WRKSRC} && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 		${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST}
 
 do-install:
 .for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \
 	packager tools units
 		@${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE}
 		@cd ${WRKSRC}/${DIRE} && \
 			${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \
 				${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/${DIRE}/{}" \;
 .endfor
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \
 		${STAGEDIR}${DATADIR}/tools/updatepofiles
 
 .for FILE in lazarus startlazarus lazbuild
 	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR}
 .endfor
 
 	@cd ${WRKDIR}/docs && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/{}" \;
 	@${LN} -s ${DOCSDIR} ${STAGEDIR}${DATADIR}/docs
 
 	@cd ${WRKDIR}/examples && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${EXAMPLESDIR}/{}" \;
 	@${LN} -s ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 
 	${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA}	${WRKSRC}/Makefile* ${WRKSRC}/fpmake*  ${STAGEDIR}${DATADIR}
 .for FILE in ${MAN1S}
 	${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
 	${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild
 
 .else
 .include "${MASTERDIR}/Makefile.common"
 .endif
 
 .include <bsd.port.mk>