Index: Mk/Uses/fpc.mk =================================================================== --- Mk/Uses/fpc.mk +++ Mk/Uses/fpc.mk @@ -1,41 +1,53 @@ # # $FreeBSD$ # -# bsd.fpc.mk - Support for FreePascal based ports. +# Support for FPC-based ports. # -# Created by: Alonso Cardenas Marquez +# Feature: fpc +# Usage: USES=fpc +# Valid ARGS: (none), run, base, all # # 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). +# (none) - This automatically will install free pascal compiler, +# if you need install additional fpc units, they can be +# listed there (USE_FPC= gtk2 x11 opengl). # -# USE_FPC_RUN - If you set this to "yes", free pascal units will be -# registered also as run dependencies. +# run - 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). +# base - 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. +# all - This automatically will install all free pascal units. # +# Example: +# +# USES+= fpc:run +# USE_FPC=gtk2 # -.if !defined(_FPCMKINCLUDED) +.if !defined(_INCLUDE_USES_FPC_MK) -_FPCMKINCLUDED= yes +FPC_Include_MAINTAINER= acm@FreeBSD.org +_INCLUDE_USES_FPC_MK= yes + .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 +.if defined(USE_FPC_RUN) && empty(fpc_ARGS:Mrun) +fpc_ARGS+= run +.endif +.if defined(WANT_FPC_BASE) && empty(fpc_ARGS:Mbase) +fpc_ARGS+= base +.endif +.if defined(WANT_FPC_ALL) && empty(fpc_ARGS:Mall) +fpc_ARGS+= all +.endif DEFAULT_FPC_VER= ${FPC_DEFAULT} # When adding a version, please keep the comment in @@ -79,24 +91,16 @@ sdl sqlite svgalib symbolic syslog unzip users utmp uuid x11 \ xforms zlib -.if defined(WANT_FPC_BASE) -. if ${WANT_FPC_BASE:tl} == "yes" +.if ${fpc_ARGS:Mbase} 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" +.if ${fpc_ARGS:Mall} USE_FPC= ${_FPC_ALL_UNITS} -. else -IGNORE= unknown value, please use "yes" instead of -. endif .endif -.if ${USE_FPC:tl} != "yes" +.if defined(USE_FPC) && ${USE_FPC:tl} != "yes" . for UNITS in ${USE_FPC} . if ${_FPC_ALL_UNITS:M${UNITS}}=="" IGNORE= cannot install: unknown FPC unit ${UNITS} @@ -200,29 +204,14 @@ .endif -.if defined(_POSTMKINCLUDED) && defined(USE_FPC) +.if defined(USE_FPC) . for UNIT in ${USE_FPC} . if ${_FPC_ALL_UNITS:M${UNIT}} != "" BUILD_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${${UNIT:S/-/_/}_UNIT} -. if defined(USE_FPC_RUN) +. if ${fpc_ARGS:Mrun} || ${fpc_ARGS:Mbase} RUN_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${${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 +# End of fpc.mk file Index: Mk/bsd.fpc.mk =================================================================== --- Mk/bsd.fpc.mk +++ Mk/bsd.fpc.mk @@ -1,228 +0,0 @@ -# -# $FreeBSD$ -# -# bsd.fpc.mk - Support for FreePascal based ports. -# -# Created by: Alonso Cardenas Marquez -# -# 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 - -.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} -# When adding a version, please keep the comment in -# Mk/bsd.default-versions.mk in sync. -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}:lang/fpc - -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-pdf fcl-registry \ - fcl-res fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml fftw \ - fpindexer fppkg fv gdbint gdbm gmp googleapi graph gtk2 \ - hermes httpd22 httpd24 ibase iconvenc imagemagick \ - ldap libcurl libgd libmicrohttpd 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 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_pdf_UNIT= devel/fpc-fcl-pdf -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 -googleapi_UNIT= www/fpc-googleapi -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 -libmicrohttpd_UNIT= www/fpc-libmicrohttpd -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 -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:${${UNIT:S/-/_/}_UNIT} -. if defined(USE_FPC_RUN) -RUN_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${${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: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -1377,8 +1377,9 @@ USES+= php .endif -.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL) -.include "${PORTSDIR}/Mk/bsd.fpc.mk" +.if defined(USE_FPC) +DEV_WARNING+= "Using USE_FPC alone is deprecated, please use USES=fpc" +USES+= fpc .endif .if defined(USE_JAVA) @@ -1986,10 +1987,6 @@ .include "${PORTSDIR}/Mk/bsd.apache.mk" .endif -.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL) -.include "${PORTSDIR}/Mk/bsd.fpc.mk" -.endif - .if defined(USE_GECKO) .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif Index: archivers/fpc-bzip2/Makefile =================================================================== --- archivers/fpc-bzip2/Makefile +++ archivers/fpc-bzip2/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal bzip2 unit +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: archivers/fpc-unzip/Makefile =================================================================== --- archivers/fpc-unzip/Makefile +++ archivers/fpc-unzip/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal routines for unzipping zip files -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: archivers/peazip/Makefile =================================================================== --- archivers/peazip/Makefile +++ archivers/peazip/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= lazbuild:editors/lazarus \ fpcres:lang/fpc-utils -USES= dos2unix zip +USES= dos2unix fpc zip USE_FPC= cairo chm fcl-base fcl-image pasjpeg rtl-objpas x11 USE_GNOME= # Index: audio/fpc-a52/Makefile =================================================================== --- audio/fpc-a52/Makefile +++ audio/fpc-a52/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to a52 library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: audio/fpc-mad/Makefile =================================================================== --- audio/fpc-mad/Makefile +++ audio/fpc-mad/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to mad library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: audio/fpc-modplug/Makefile =================================================================== --- audio/fpc-modplug/Makefile +++ audio/fpc-modplug/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to modplug library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: audio/fpc-oggvorbis/Makefile =================================================================== --- audio/fpc-oggvorbis/Makefile +++ audio/fpc-oggvorbis/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to ogg & vorbis libraries -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: audio/fpc-openal/Makefile =================================================================== --- audio/fpc-openal/Makefile +++ audio/fpc-openal/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to openal library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: cad/zcad/Makefile =================================================================== --- cad/zcad/Makefile +++ cad/zcad/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= lazbuild:editors/lazarus -USES= tar:xz +USES= fpc tar:xz USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-stl fcl-xml opengl \ pasjpeg rtl-extra rtl-objpas x11 Index: comms/cqrlog/Makefile =================================================================== --- comms/cqrlog/Makefile +++ comms/cqrlog/Makefile @@ -18,7 +18,7 @@ USE_GITHUB= yes GH_ACCOUNT= ok2cqr -USES= shebangfix +USES= fpc shebangfix SHEBANG_FILES= tools/cqrlog-apparmor-fix \ voice_keyer/voice_keyer.sh Index: converters/fpc-iconvenc/Makefile =================================================================== --- converters/fpc-iconvenc/Makefile +++ converters/fpc-iconvenc/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal unit to iconv library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: databases/fpc-dblib/Makefile =================================================================== --- databases/fpc-dblib/Makefile +++ databases/fpc-dblib/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal DB-Library and FreeTDS unit -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: databases/fpc-fpindexer/Makefile =================================================================== --- databases/fpc-fpindexer/Makefile +++ databases/fpc-fpindexer/Makefile @@ -6,6 +6,7 @@ COMMENT= Database indexer with database/flat file backend +USES= fpc USE_FPC= chm dblib fcl-base fcl-db fcl-json fcl-xml ibase mysql odbc \ oracle postgres pxlib sqlite rtl-extra Index: databases/fpc-gdbm/Makefile =================================================================== --- databases/fpc-gdbm/Makefile +++ databases/fpc-gdbm/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to the GNU database system -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: databases/fpc-ibase/Makefile =================================================================== --- databases/fpc-ibase/Makefile +++ databases/fpc-ibase/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to interbase -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: databases/fpc-mysql/Makefile =================================================================== --- databases/fpc-mysql/Makefile +++ databases/fpc-mysql/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to MySQL -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: databases/fpc-odbc/Makefile =================================================================== --- databases/fpc-odbc/Makefile +++ databases/fpc-odbc/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to ODBC -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: databases/fpc-oracle/Makefile =================================================================== --- databases/fpc-oracle/Makefile +++ databases/fpc-oracle/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to Oracle -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: databases/fpc-postgres/Makefile =================================================================== --- databases/fpc-postgres/Makefile +++ databases/fpc-postgres/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to PostGreSQL -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: databases/fpc-pxlib/Makefile =================================================================== --- databases/fpc-pxlib/Makefile +++ databases/fpc-pxlib/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal unit to read various Paradox files -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: databases/fpc-sqlite/Makefile =================================================================== --- databases/fpc-sqlite/Makefile +++ databases/fpc-sqlite/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to SQLite -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-bfd/Makefile =================================================================== --- devel/fpc-bfd/Makefile +++ devel/fpc-bfd/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface for the GNU Binary Format description -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-dbus/Makefile =================================================================== --- devel/fpc-dbus/Makefile +++ devel/fpc-dbus/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to dbus library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-fcl-async/Makefile =================================================================== --- devel/fpc-fcl-async/Makefile +++ devel/fpc-fcl-async/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal asynchronous event management (FCL) -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-fcl-base/Makefile =================================================================== --- devel/fpc-fcl-base/Makefile +++ devel/fpc-fcl-base/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal Component Library base +USES= fpc USE_FPC= fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-db/Makefile =================================================================== --- devel/fpc-fcl-db/Makefile +++ devel/fpc-fcl-db/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal Database Library (FCL) +USES= fpc USE_FPC= fcl-base fcl-xml rtl-objpas rtl-extra ibase mysql odbc \ oracle postgres sqlite dblib pxlib fcl-json Index: devel/fpc-fcl-extra/Makefile =================================================================== --- devel/fpc-fcl-extra/Makefile +++ devel/fpc-fcl-extra/Makefile @@ -5,6 +5,7 @@ COMMENT= Free Pascal extra libraries (FCL) +USES= fpc USE_FPC= fcl-base fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-fpcunit/Makefile =================================================================== --- devel/fpc-fcl-fpcunit/Makefile +++ devel/fpc-fcl-fpcunit/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal unit testing library (FCL) +USES= fpc USE_FPC= fcl-base fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-image/Makefile =================================================================== --- devel/fpc-fcl-image/Makefile +++ devel/fpc-fcl-image/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal image loading and conversion libraries (FCL) +USES= fpc USE_FPC= fcl-base fcl-res pasjpeg rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-js/Makefile =================================================================== --- devel/fpc-fcl-js/Makefile +++ devel/fpc-fcl-js/Makefile @@ -1,12 +1,13 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-js +PORTREVISION= 1 COMMENT= Free Pascal Javascript scanner/parser/syntax tree (FCL) +USES= fpc USE_FPC= fcl-base fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-json/Makefile =================================================================== --- devel/fpc-fcl-json/Makefile +++ devel/fpc-fcl-json/Makefile @@ -1,12 +1,13 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-json +PORTREVISION= 1 COMMENT= Free Pascal JavaScript Object Notation implemenation (FCL) +USES= fpc USE_FPC= fcl-base rtl-objpas fcl-res MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-net/Makefile =================================================================== --- devel/fpc-fcl-net/Makefile +++ devel/fpc-fcl-net/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal network interfaces (FCL) +USES= fpc USE_FPC= fcl-base openssl fcl-xml fcl-passrc fcl-async rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-passrc/Makefile =================================================================== --- devel/fpc-fcl-passrc/Makefile +++ devel/fpc-fcl-passrc/Makefile @@ -1,12 +1,13 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-passrc +PORTREVISION= 1 COMMENT= Free Pascal language parsing library (FPC) +USES= fpc USE_FPC= fcl-base fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-pdf/Makefile =================================================================== --- devel/fpc-fcl-pdf/Makefile +++ devel/fpc-fcl-pdf/Makefile @@ -1,11 +1,12 @@ # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-pdf +PORTREVISION= 1 COMMENT= Free Pascal pdf (FCL) +USES= fpc USE_FPC= fcl-base fcl-image fcl-res fcl-xml pasjpeg rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-registry/Makefile =================================================================== --- devel/fpc-fcl-registry/Makefile +++ devel/fpc-fcl-registry/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal emulation of Windows registry (FCL) +USES= fpc USE_FPC= fcl-base fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-res/Makefile =================================================================== --- devel/fpc-fcl-res/Makefile +++ devel/fpc-fcl-res/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal resource handlers (FCL) -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-fcl-sdo/Makefile =================================================================== --- devel/fpc-fcl-sdo/Makefile +++ devel/fpc-fcl-sdo/Makefile @@ -5,6 +5,7 @@ COMMENT= Free Pascal Service Data Objects implementation (FCL) +USES= fpc USE_FPC= dblib fcl-base fcl-db fcl-json fcl-xml ibase mysql odbc \ oracle postgres pxlib rtl-extra sqlite Index: devel/fpc-fcl-sound/Makefile =================================================================== --- devel/fpc-fcl-sound/Makefile +++ devel/fpc-fcl-sound/Makefile @@ -5,6 +5,7 @@ COMMENT= Free Pascal sound loading, storing and converion (FCL) +USES= fpc USE_FPC= fcl-base fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-fcl-stl/Makefile =================================================================== --- devel/fpc-fcl-stl/Makefile +++ devel/fpc-fcl-stl/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-stl +PORTREVISION= 1 COMMENT= Free Pascal generic container library (FCL) -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-fcl-web/Makefile =================================================================== --- devel/fpc-fcl-web/Makefile +++ devel/fpc-fcl-web/Makefile @@ -1,12 +1,13 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-web +PORTREVISION= 1 COMMENT= Free Pascal web application libary (FCL) +USES= fpc USE_FPC= dblib fcl-async fcl-base fcl-db fcl-xml fcl-json fcl-net \ fcl-fpcunit fcl-passrc fastcgi httpd22 httpd24 ibase mysql \ odbc openssl oracle postgres pxlib rtl-extra sqlite Index: devel/fpc-fcl-xml/Makefile =================================================================== --- devel/fpc-fcl-xml/Makefile +++ devel/fpc-fcl-xml/Makefile @@ -6,8 +6,8 @@ COMMENT= Free Pascal XML and DOM library (FCL) +USES= fpc:run USE_FPC= fcl-base fcl-res rtl-objpas iconvenc -USE_FPC_RUN= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-fppkg/Makefile =================================================================== --- devel/fpc-fppkg/Makefile +++ devel/fpc-fppkg/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal package manager unit +USES= fpc USE_FPC= dblib fastcgi fcl-async fcl-base fcl-db fcl-fpcunit fcl-json \ fcl-net fcl-passrc fcl-web fcl-xml httpd22 httpd24 ibase \ mysql odbc openssl oracle postgres pxlib rtl-extra sqlite Index: devel/fpc-fv/Makefile =================================================================== --- devel/fpc-fv/Makefile +++ devel/fpc-fv/Makefile @@ -6,6 +6,7 @@ COMMENT= FreeVision is a Free Pascal unit for Delphi support +USES= fpc USE_FPC= rtl-console rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-gdbint/Makefile =================================================================== --- devel/fpc-gdbint/Makefile +++ devel/fpc-gdbint/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal unit providing interface to gdb -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-newt/Makefile =================================================================== --- devel/fpc-newt/Makefile +++ devel/fpc-newt/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to newt library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-pthreads/Makefile =================================================================== --- devel/fpc-pthreads/Makefile +++ devel/fpc-pthreads/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal wrapper for the pthreads library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-regexpr/Makefile =================================================================== --- devel/fpc-regexpr/Makefile +++ devel/fpc-regexpr/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal regular expression routines +USES= fpc USE_FPC= rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-sdl/Makefile =================================================================== --- devel/fpc-sdl/Makefile +++ devel/fpc-sdl/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal interface to SDL library +USES= fpc USE_FPC= pthreads x11 MASTERDIR= ${.CURDIR}/../../lang/fpc Index: devel/fpc-symbolic/Makefile =================================================================== --- devel/fpc-symbolic/Makefile +++ devel/fpc-symbolic/Makefile @@ -6,7 +6,7 @@ COMMENT= FreePascal unit for simple expression parsing and evaluating -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: devel/fpc-zlib/Makefile =================================================================== --- devel/fpc-zlib/Makefile +++ devel/fpc-zlib/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to the zlib compression library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: editors/coedit/Makefile =================================================================== --- editors/coedit/Makefile +++ editors/coedit/Makefile @@ -26,6 +26,7 @@ GH_ACCOUNT= BBasile GH_PROJECT= Coedit +USES= fpc USE_FPC= cairo chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \ fcl-stl fcl-web fcl-xml numlib openssl pasjpeg rtl-objpas \ regexpr rtl-extra x11 Index: editors/fpc-ide/Makefile =================================================================== --- editors/fpc-ide/Makefile +++ editors/fpc-ide/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal integrated IDE/compiler +USES= fpc USE_FPC= chm fv gdbint regexpr rtl-extra rtl-console fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc Index: editors/lazarus/Makefile =================================================================== --- editors/lazarus/Makefile +++ editors/lazarus/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lazarus -PORTVERSION= 1.8.0 +PORTVERSION= 1.8.2 PORTREVISION?= 0 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ @@ -17,12 +17,13 @@ ONLY_FOR_ARCHS= i386 amd64 -USES= gmake +USES= fpc gmake USE_GNOME= # USE_FPC?= cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \ fcl-registry fcl-res fcl-web fcl-xml gtk2 ibase iconvenc mysql \ numlib odbc openssl oracle pasjpeg postgres regexpr rtl-extra \ sqlite x11 +USE_XORG= x11 OPT?= "-Sgic " MAKE_ENV= OPT=${OPT} @@ -70,7 +71,7 @@ .endif .if ${PORT_OPTIONS:MGTK2} -USE_GNOME= gtk20 gdkpixbuf +USE_GNOME= cairo gtk20 gdkpixbuf2 LCL_PLATFORM= gtk2 BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 Index: editors/lazarus/distinfo =================================================================== --- editors/lazarus/distinfo +++ editors/lazarus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513100874 -SHA256 (freepascal/lazarus-1.8.0.tar.gz) = 320888ba1af17295b8d3993d50c31780d137e363e05797e3575eee90f3b3a844 -SIZE (freepascal/lazarus-1.8.0.tar.gz) = 62114372 +TIMESTAMP = 1520354258 +SHA256 (freepascal/lazarus-1.8.2.tar.gz) = 252861f86b7e49487fa925195b78e8ab6a68528d3e6059cf68630fb5bc6d5219 +SIZE (freepascal/lazarus-1.8.2.tar.gz) = 62935678 Index: editors/lazarus/files/patch-components-synedit_synedit.pp =================================================================== --- editors/lazarus/files/patch-components-synedit_synedit.pp +++ editors/lazarus/files/patch-components-synedit_synedit.pp @@ -1,20 +0,0 @@ ---- components/synedit/synedit.pp 2018-01-30 13:41:54.904942000 -0500 -+++ components/synedit/synedit.pp 2018-01-30 13:40:23.811860000 -0500 -@@ -8945,7 +8945,7 @@ - while not Highlighter.GetEol do begin - Start := Highlighter.GetTokenPos + 1; - Token := Highlighter.GetToken; -- if (PosX >= Start) and (PosX <= Start + Length(Token)) then begin -+ if (PosX >= Start) and (PosX < Start + Length(Token)) then begin - Attri := Highlighter.GetTokenAttribute; - TokenType := Highlighter.GetTokenKind; - exit(True); -@@ -8990,7 +8990,7 @@ - //TokenType := Highlighter.GetTokenKind; - Attri := Highlighter.GetTokenAttribute; - //DebugLn([' TCustomSynEdit.CaretAtIdentOrString: Start=', Start, ', Token=', Token]); -- if (PosX >= Start) and (PosX <= Start + Length(Token)) then -+ if (PosX >= Start) and (PosX < Start + Length(Token)) then - begin - AtIdent := Attri = Highlighter.IdentifierAttribute; - NearString := (Attri = Highlighter.StringAttribute) Index: ftp/fpc-libcurl/Makefile =================================================================== --- ftp/fpc-libcurl/Makefile +++ ftp/fpc-libcurl/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to libcurl -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: games/hedgewars/Makefile =================================================================== --- games/hedgewars/Makefile +++ games/hedgewars/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libphysfs.so:devel/physfs \ libpng.so:graphics/png -USES= cmake:noninja desktop-file-utils lua:51 tar:bzip2 +USES= cmake:noninja desktop-file-utils fpc lua:51 tar:bzip2 USE_SDL= sdl2 mixer2 image2 ttf2 net2 USE_FPC= opengl libpng rtl-objpas USE_QT4= corelib gui moc_build network \ Index: graphics/fpc-cairo/Makefile =================================================================== --- graphics/fpc-cairo/Makefile +++ graphics/fpc-cairo/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal interface to cairo library +USES= fpc USE_FPC= fcl-base fcl-image fcl-res pasjpeg rtl-objpas x11 MASTERDIR= ${.CURDIR}/../../lang/fpc Index: graphics/fpc-graph/Makefile =================================================================== --- graphics/fpc-graph/Makefile +++ graphics/fpc-graph/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal interface to graphical applications +USES= fpc USE_FPC= sdl x11 ${ARCH:Mi386:S/i386/pthreads/} MASTERDIR= ${.CURDIR}/../../lang/fpc Index: graphics/fpc-hermes/Makefile =================================================================== --- graphics/fpc-hermes/Makefile +++ graphics/fpc-hermes/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal hermes unit -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: graphics/fpc-imagemagick/Makefile =================================================================== --- graphics/fpc-imagemagick/Makefile +++ graphics/fpc-imagemagick/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to ImageMagick -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: graphics/fpc-libgd/Makefile =================================================================== --- graphics/fpc-libgd/Makefile +++ graphics/fpc-libgd/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to libgd for producing graphics files -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: graphics/fpc-libpng/Makefile =================================================================== --- graphics/fpc-libpng/Makefile +++ graphics/fpc-libpng/Makefile @@ -6,8 +6,8 @@ COMMENT= Free Pascal interface to libpng, for reading PNG image files +USES= fpc:run USE_FPC= zlib -USE_FPC_RUN= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: graphics/fpc-ncurses/Makefile =================================================================== --- graphics/fpc-ncurses/Makefile +++ graphics/fpc-ncurses/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to the ncurses library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: graphics/fpc-opengl/Makefile =================================================================== --- graphics/fpc-opengl/Makefile +++ graphics/fpc-opengl/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal interface to the OpenGL library +USES= fpc USE_FPC= x11 MASTERDIR= ${.CURDIR}/../../lang/fpc Index: graphics/fpc-pasjpeg/Makefile =================================================================== --- graphics/fpc-pasjpeg/Makefile +++ graphics/fpc-pasjpeg/Makefile @@ -6,7 +6,7 @@ COMMENT= Handling JPEG files with Pascal -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: graphics/fpc-proj4/Makefile =================================================================== --- graphics/fpc-proj4/Makefile +++ graphics/fpc-proj4/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to proj library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: graphics/fpc-rsvg/Makefile =================================================================== --- graphics/fpc-rsvg/Makefile +++ graphics/fpc-rsvg/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal interface to librsvg2 library +USES= fpc USE_FPC= cairo fcl-base fcl-image fcl-res gtk2 pasjpeg rtl-objpas x11 MASTERDIR= ${.CURDIR}/../../lang/fpc Index: graphics/fpc-svgalib/Makefile =================================================================== --- graphics/fpc-svgalib/Makefile +++ graphics/fpc-svgalib/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to the SVGA graphics library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: lang/fpc-base/Makefile =================================================================== --- lang/fpc-base/Makefile +++ lang/fpc-base/Makefile @@ -9,9 +9,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Meta package to install all of the Free Pascal base -USES= metaport -USE_FPC_RUN= yes -WANT_FPC_BASE= yes +USES= fpc:base metaport OPTIONS_DEFINE= DOCS Index: lang/fpc-lua/Makefile =================================================================== --- lang/fpc-lua/Makefile +++ lang/fpc-lua/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to the lua interpreter -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: lang/fpc-rexx/Makefile =================================================================== --- lang/fpc-rexx/Makefile +++ lang/fpc-rexx/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to the rexx-regina library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: lang/fpc-rtl-console/Makefile =================================================================== --- lang/fpc-rtl-console/Makefile +++ lang/fpc-rtl-console/Makefile @@ -5,6 +5,7 @@ COMMENT= Free Pascal console abstraction unit (RTL) +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: lang/fpc-rtl-extra/Makefile =================================================================== --- lang/fpc-rtl-extra/Makefile +++ lang/fpc-rtl-extra/Makefile @@ -5,7 +5,7 @@ COMMENT= Free Pascal rtl-extra unit -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: lang/fpc-rtl-objpas/Makefile =================================================================== --- lang/fpc-rtl-objpas/Makefile +++ lang/fpc-rtl-objpas/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal compatibility unit with Delphi -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: lang/fpc-rtl-unicode/Makefile =================================================================== --- lang/fpc-rtl-unicode/Makefile +++ lang/fpc-rtl-unicode/Makefile @@ -5,7 +5,7 @@ COMMENT= Free Pascal compatibility unit with Delphi -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: lang/fpc-units/Makefile =================================================================== --- lang/fpc-units/Makefile +++ lang/fpc-units/Makefile @@ -10,7 +10,7 @@ COMMENT= Meta port to install Free Pascal units ONLY_FOR_ARCHS= i386 amd64 -USES= metaport +USES= fpc:run metaport BUILDNAME= ${ARCH}-${OPSYS:tl} @@ -118,7 +118,6 @@ . endif .endfor -USE_FPC_RUN= yes USE_FPC= ${UNITS_SELECTED} .include Index: lang/fpc-utils/Makefile =================================================================== --- lang/fpc-utils/Makefile +++ lang/fpc-utils/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal Compiler utilities +USES= fpc USE_FPC= chm fcl-base fcl-fpcunit fcl-net fcl-passrc fcl-res fcl-xml \ fppkg libcurl fcl-json rtl-extra rtl-objpas openssl fcl-async \ fcl-web fcl-db ibase mysql odbc oracle postgres sqlite \ Index: lang/fpc/Makefile =================================================================== --- lang/fpc/Makefile +++ lang/fpc/Makefile @@ -21,7 +21,7 @@ MAINTAINER?= acm@FreeBSD.org COMMENT?= Free Pascal compiler with Turbo and Delphi -USES= gmake iconv +USES+= gmake iconv ONLY_FOR_ARCHS= i386 amd64 BOOTVER= 3.0.4 MANVER= 3.0.4 Index: lang/nbc/Makefile =================================================================== --- lang/nbc/Makefile +++ lang/nbc/Makefile @@ -20,7 +20,7 @@ ROBOCTL_RUN_DEPENDS= legoctl:devel/roboctl -USES= dos2unix gmake tar:tgz +USES= dos2unix fpc gmake tar:tgz USE_FPC= fcl-base fcl-image pasjpeg rtl-objpas PLIST_FILES= bin/nbc \ Index: math/fpc-fftw/Makefile =================================================================== --- math/fpc-fftw/Makefile +++ math/fpc-fftw/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to the FFTW3 library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: math/fpc-gmp/Makefile =================================================================== --- math/fpc-gmp/Makefile +++ math/fpc-gmp/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to gmp library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: math/fpc-numlib/Makefile =================================================================== --- math/fpc-numlib/Makefile +++ math/fpc-numlib/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal unit to numerical methods -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: misc/fpc-chm/Makefile =================================================================== --- misc/fpc-chm/Makefile +++ misc/fpc-chm/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal unit to manipulate chm files +USES= fpc USE_FPC= fcl-base fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc Index: multimedia/fpc-dts/Makefile =================================================================== --- multimedia/fpc-dts/Makefile +++ multimedia/fpc-dts/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to the dts library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: multimedia/fpc-libvlc/Makefile =================================================================== --- multimedia/fpc-libvlc/Makefile +++ multimedia/fpc-libvlc/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal interface to vlc media player library +USES= fpc USE_FPC= fcl-base fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: multimedia/winff/Makefile =================================================================== --- multimedia/winff/Makefile +++ multimedia/winff/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= libavutil.so:multimedia/ffmpeg NO_WRKSUBDIR= yes +USES= fpc USE_XORG= x11 USE_FPC= cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11 USE_GNOME= cairo Index: net-p2p/transmission-remote-gui/Makefile =================================================================== --- net-p2p/transmission-remote-gui/Makefile +++ net-p2p/transmission-remote-gui/Makefile @@ -17,6 +17,7 @@ fpcres:lang/fpc-utils RUN_DEPENDS= transmission-daemon:net-p2p/transmission-daemon +USES= fpc USE_FPC= cairo fcl-base fcl-image fcl-net pasjpeg rtl-objpas rtl-extra \ x11 USES= iconv zip Index: net/fpc-ldap/Makefile =================================================================== --- net/fpc-ldap/Makefile +++ net/fpc-ldap/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to OpenLDAP -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: net/fpc-pcap/Makefile =================================================================== --- net/fpc-pcap/Makefile +++ net/fpc-pcap/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal unit for libpcap library +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: russian/emkatic/Makefile =================================================================== --- russian/emkatic/Makefile +++ russian/emkatic/Makefile @@ -17,6 +17,7 @@ BUILD_DEPENDS= lazbuild:editors/lazarus \ fpcres:lang/fpc-utils +USES= fpc USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-xml pasjpeg rtl-extra x11 PROJECT_FILE= emkatic.lpi Index: science/checkmol/Makefile =================================================================== --- science/checkmol/Makefile +++ science/checkmol/Makefile @@ -19,7 +19,7 @@ EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= ${WRKSRC} -USE_FPC= yes +USES= fpc PLIST_FILES= bin/checkmol bin/matchmol Index: science/mol2ps/Makefile =================================================================== --- science/mol2ps/Makefile +++ science/mol2ps/Makefile @@ -21,6 +21,7 @@ EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= ${WRKSRC} +USES= fpc USE_FPC= rtl-objpas PLIST_FILES= bin/mol2eps bin/mol2ps bin/mol2svg %%DATADIR%%/color.conf Index: security/fpc-openssl/Makefile =================================================================== --- security/fpc-openssl/Makefile +++ security/fpc-openssl/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal unit for OpenSSL +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: sysutils/fpc-syslog/Makefile =================================================================== --- sysutils/fpc-syslog/Makefile +++ sysutils/fpc-syslog/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to the system logger -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: sysutils/fpc-users/Makefile =================================================================== --- sysutils/fpc-users/Makefile +++ sysutils/fpc-users/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal interface to manipulate system users -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: sysutils/fpc-utmp/Makefile =================================================================== --- sysutils/fpc-utmp/Makefile +++ sysutils/fpc-utmp/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal unit to gather information from the utmp file -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: sysutils/fpc-uuid/Makefile =================================================================== --- sysutils/fpc-uuid/Makefile +++ sysutils/fpc-uuid/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal uuid unit +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: textproc/fpc-aspell/Makefile =================================================================== --- textproc/fpc-aspell/Makefile +++ textproc/fpc-aspell/Makefile @@ -6,7 +6,7 @@ COMMENT= Interface to aspell spelling checker -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: textproc/fpc-libxml2/Makefile =================================================================== --- textproc/fpc-libxml2/Makefile +++ textproc/fpc-libxml2/Makefile @@ -6,6 +6,7 @@ COMMENT= Interface to xml2 library +USES= fpc USE_FPC= rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc Index: www/fpc-fastcgi/Makefile =================================================================== --- www/fpc-fastcgi/Makefile +++ www/fpc-fastcgi/Makefile @@ -6,7 +6,7 @@ COMMENT= Free Pascal fastcgi unit -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} Index: www/fpc-googleapi/Makefile =================================================================== --- www/fpc-googleapi/Makefile +++ www/fpc-googleapi/Makefile @@ -5,6 +5,7 @@ COMMENT= Free Pascal googleapi unit +USES= fpc USE_FPC= dblib fastcgi fcl-async fcl-base fcl-db fcl-json fcl-fpcunit \ fcl-net fcl-passrc fcl-res fcl-web fcl-xml httpd22 httpd24 \ ibase mysql postgres pxlib odbc openssl oracle rtl-extra \ Index: www/fpc-httpd22/Makefile =================================================================== --- www/fpc-httpd22/Makefile +++ www/fpc-httpd22/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal headers for Apache 2.2 series web server +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: www/fpc-httpd24/Makefile =================================================================== --- www/fpc-httpd24/Makefile +++ www/fpc-httpd24/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal headers for Apache 2.4 series web server +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: www/fpc-libmicrohttpd/Makefile =================================================================== --- www/fpc-libmicrohttpd/Makefile +++ www/fpc-libmicrohttpd/Makefile @@ -5,6 +5,7 @@ COMMENT= Free Pascal libmicrohttpd unit +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc Index: x11-fm/doublecmd/Makefile =================================================================== --- x11-fm/doublecmd/Makefile +++ x11-fm/doublecmd/Makefile @@ -21,7 +21,7 @@ PORTDOCS= * -USES= dos2unix desktop-file-utils +USES= dos2unix desktop-file-utils fpc USE_FPC= cairo chm fcl-base fcl-db fcl-image fcl-json fcl-registry \ fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr USE_XORG= x11 Index: x11-toolkits/fpc-gtk2/Makefile =================================================================== --- x11-toolkits/fpc-gtk2/Makefile +++ x11-toolkits/fpc-gtk2/Makefile @@ -6,6 +6,7 @@ COMMENT= Free Pascal interface to the GTK2 libraries +USES= fpc USE_FPC= cairo fcl-base fcl-image fcl-res pasjpeg rtl-objpas x11 MASTERDIR= ${.CURDIR}/../../lang/fpc Index: x11-toolkits/fpc-xforms/Makefile =================================================================== --- x11-toolkits/fpc-xforms/Makefile +++ x11-toolkits/fpc-xforms/Makefile @@ -6,6 +6,7 @@ COMMENT= X-Forms interface for Free Pascal +USES= fpc USE_FPC= x11 MASTERDIR= ${.CURDIR}/../../lang/fpc Index: x11/fpc-x11/Makefile =================================================================== --- x11/fpc-x11/Makefile +++ x11/fpc-x11/Makefile @@ -7,7 +7,7 @@ COMMENT= Free Pascal interface to X windows server -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}