diff options
110 files changed, 153 insertions, 137 deletions
diff --git a/Mk/bsd.fpc.mk b/Mk/Uses/fpc.mk index 56ceb05fe5da..f7761f606689 100644 --- a/Mk/bsd.fpc.mk +++ b/Mk/Uses/fpc.mk @@ -1,41 +1,42 @@ # # $FreeBSD$ # -# bsd.fpc.mk - Support for FreePascal based ports. +# Support for FPC-based ports. This automatically will install free pascal +# compiler and units. # -# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> +# 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. +# run - Free pascal units will be registered also as run dependencies. # -# 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). +# 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). # -# USE_FPC_RUN - If you set this to "yes", free pascal units will be -# registered also as run dependencies. +# all - This automatically will install all free pascal units. # -# 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 you need install additional fpc units, they can be listed there (USE_FPC=gtk2 x11 opengl). # +# Example: +# +# USES+= fpc:run +# USE_FPC=gtk2 # -.if !defined(_FPCMKINCLUDED) +.if !defined(_INCLUDE_USES_FPC_MK) + +FPC_Include_MAINTAINER= acm@FreeBSD.org -_FPCMKINCLUDED= yes +_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 ${fpc_ARGS:Nrun:Nbase:Nall} +IGNORE= Unknown argument for USES=fpc: ${fpc_ARGS:Nrun:Nbase:Nall} +.endif DEFAULT_FPC_VER= ${FPC_DEFAULT} # When adding a version, please keep the comment in @@ -79,24 +80,16 @@ _FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \ 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 +193,13 @@ zlib_UNIT= devel/fpc-zlib .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 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 02ad47c0e288..7cff1daa4b01 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -380,9 +380,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # - If set, the system should use OpenLDAP libraries # with SASL support. ## -# USE_FPC - If set, this port relies on the Free Pascal language. -# Implies inclusion of bsd.fpc.mk. (Also see -# that file for more information on WANT_FPC_*). # USE_JAVA - If set, this port relies on the Java language. # Implies inclusion of bsd.java.mk. (Also see # that file for more information on USE_JAVA_*). @@ -1375,10 +1372,6 @@ DEV_WARNING+= "Using USE_PHP alone is deprecated, please use USES=php" USES+= php .endif -.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL) -.include "${PORTSDIR}/Mk/bsd.fpc.mk" -.endif - .if defined(USE_JAVA) .include "${PORTSDIR}/Mk/bsd.java.mk" .endif @@ -1991,10 +1984,6 @@ _USES_POST+= php .include "${PORTSDIR}/Mk/bsd.wx.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 diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 1c9f2164a208..81711ca5c0d5 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -150,6 +150,10 @@ DEV_ERROR+= "USE_RC_SUBR=yes has not been supported for a long time, remove it." DEV_ERROR+= "USE_TCL and USE_TK are no longer supported, please use USES=tcl or USES=tk" .endif +.if defined(USE_FPC) && ${USE_FPC:tl} == "yes" +DEV_ERROR+= "USE_FPC=yes is no longer supported, please use USES=fpc" +.endif + SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \ USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \ @@ -161,7 +165,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ USE_ZENDEXT USE_PHP_BUILD USE_BDB PLIST_DIRSTRY USE_RCORDER \ USE_OPENSSL WANT_GNOME RUBYGEM_AUTOPLIST WANT_SDL INSTALLS_EGGINFO \ USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \ - USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT + USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT \ + USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX MLINKS \ USE_MYSQL WANT_MYSQL_VER \ USE_PHPIZE WANT_PHP_CLI WANT_PHP_CGI WANT_PHP_MOD \ @@ -244,6 +249,9 @@ USE_APACHE_ALT= USES=apache:${USE_APACHE:C/2(0-9)/2.\1/g} USE_APACHE_BUILD_ALT= USES=apache:build,${USE_APACHE_BUILD:C/2(0-9)/2.\1/g} USE_APACHE_RUN_ALT= USES=apache:run,${USE_APACHE_RUN:C/2(0-9)/2.\1/g} APACHE_PORT_ALT= DEFAULT_VERSIONS+=apache=${APACHE_PORT:S/www\/apache//:C/2(0-9)/2.\1/} +USE_FPC_RUN_ALT= USES=fpc:run +WANT_FPC_BASE_ALT= USES=fpc:base +WANT_FPC_ALL_ALT= USES=fpc:all .for a in ${SANITY_DEPRECATED} .if defined(${a}) diff --git a/archivers/fpc-bzip2/Makefile b/archivers/fpc-bzip2/Makefile index 054eada631b7..ce53555e50dd 100644 --- a/archivers/fpc-bzip2/Makefile +++ b/archivers/fpc-bzip2/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -bzip2 COMMENT= Free Pascal bzip2 unit +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/archivers/fpc-unzip/Makefile b/archivers/fpc-unzip/Makefile index 6be257352eb7..d56b1b9851c8 100644 --- a/archivers/fpc-unzip/Makefile +++ b/archivers/fpc-unzip/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -unzip COMMENT= Free Pascal routines for unzipping zip files -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile index a53bd2677746..01de48a92926 100644 --- a/archivers/peazip/Makefile +++ b/archivers/peazip/Makefile @@ -15,7 +15,7 @@ LICENSE= LGPL3 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= # @@ -43,7 +43,7 @@ QT5_DESC= Use qt5 interface OPTIONS_DEFAULT= GTK2 7Z -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGTK2} USE_FPC+= gtk2 @@ -124,4 +124,4 @@ do-install: ${INSTALL_DATA} peazip.png ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_SCRIPT} ${WRKDIR}/pea ${WRKDIR}/pealauncher ${WRKDIR}/peazip ${STAGEDIR}${PREFIX}/bin/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/fpc-a52/Makefile b/audio/fpc-a52/Makefile index 4340f1821fd0..37d19d009ade 100644 --- a/audio/fpc-a52/Makefile +++ b/audio/fpc-a52/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -a52 COMMENT= Free Pascal interface to a52 library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/audio/fpc-mad/Makefile b/audio/fpc-mad/Makefile index a2a83732d6d2..fc350bd4991a 100644 --- a/audio/fpc-mad/Makefile +++ b/audio/fpc-mad/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -mad COMMENT= Free Pascal interface to mad library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/audio/fpc-modplug/Makefile b/audio/fpc-modplug/Makefile index c73972ef0618..3785d1e4f1e0 100644 --- a/audio/fpc-modplug/Makefile +++ b/audio/fpc-modplug/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -modplug COMMENT= Free Pascal interface to modplug library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/audio/fpc-oggvorbis/Makefile b/audio/fpc-oggvorbis/Makefile index 96eeae2ae518..3ce5e912af7d 100644 --- a/audio/fpc-oggvorbis/Makefile +++ b/audio/fpc-oggvorbis/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -oggvorbis COMMENT= Free Pascal interface to ogg & vorbis libraries -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/audio/fpc-openal/Makefile b/audio/fpc-openal/Makefile index e5ab7f474496..0aaaf821d207 100644 --- a/audio/fpc-openal/Makefile +++ b/audio/fpc-openal/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -openal COMMENT= Free Pascal interface to openal library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/cad/zcad/Makefile b/cad/zcad/Makefile index 8baca8928ade..162e7ca2513a 100644 --- a/cad/zcad/Makefile +++ b/cad/zcad/Makefile @@ -13,7 +13,7 @@ COMMENT= Simple CAD program 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 diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile index 57e76b6627c1..460d3d2736fa 100644 --- a/comms/cqrlog/Makefile +++ b/comms/cqrlog/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libhamlib.so:comms/hamlib USE_GITHUB= yes GH_ACCOUNT= ok2cqr -USES= shebangfix +USES= fpc shebangfix SHEBANG_FILES= tools/cqrlog-apparmor-fix \ voice_keyer/voice_keyer.sh diff --git a/converters/fpc-iconvenc/Makefile b/converters/fpc-iconvenc/Makefile index 9b702dd503f7..fd977463e727 100644 --- a/converters/fpc-iconvenc/Makefile +++ b/converters/fpc-iconvenc/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -iconvenc COMMENT= Free Pascal unit to iconv library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-dblib/Makefile b/databases/fpc-dblib/Makefile index 02761ba7cf15..cd9df5e751e2 100644 --- a/databases/fpc-dblib/Makefile +++ b/databases/fpc-dblib/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -dblib COMMENT= Free Pascal DB-Library and FreeTDS unit -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-fpindexer/Makefile b/databases/fpc-fpindexer/Makefile index d521b90f707a..85bef70d3c49 100644 --- a/databases/fpc-fpindexer/Makefile +++ b/databases/fpc-fpindexer/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fpindexer 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 diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile index 4cb774de5be9..f369f9f96be0 100644 --- a/databases/fpc-gdbm/Makefile +++ b/databases/fpc-gdbm/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -gdbm COMMENT= Free Pascal interface to the GNU database system -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile index ef8ec8069526..7f594c98ab0a 100644 --- a/databases/fpc-ibase/Makefile +++ b/databases/fpc-ibase/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -ibase COMMENT= Free Pascal interface to interbase -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile index 20a676564078..78d3ef56a0d1 100644 --- a/databases/fpc-mysql/Makefile +++ b/databases/fpc-mysql/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -mysql COMMENT= Free Pascal interface to MySQL -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile index bee3938c5db1..bff70ef61d86 100644 --- a/databases/fpc-odbc/Makefile +++ b/databases/fpc-odbc/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -odbc COMMENT= Free Pascal interface to ODBC -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile index 6038f1b02d20..db4bd8946a0e 100644 --- a/databases/fpc-oracle/Makefile +++ b/databases/fpc-oracle/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -oracle COMMENT= Free Pascal interface to Oracle -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile index 5c2a18b1e153..ad7345e8fedd 100644 --- a/databases/fpc-postgres/Makefile +++ b/databases/fpc-postgres/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -postgres COMMENT= Free Pascal interface to PostGreSQL -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-pxlib/Makefile b/databases/fpc-pxlib/Makefile index 919176533589..0d8017ea4f1e 100644 --- a/databases/fpc-pxlib/Makefile +++ b/databases/fpc-pxlib/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -pxlib COMMENT= Free Pascal unit to read various Paradox files -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile index 921b102c86d3..5fabc40c783b 100644 --- a/databases/fpc-sqlite/Makefile +++ b/databases/fpc-sqlite/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -sqlite COMMENT= Free Pascal interface to SQLite -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile index 5e416497619e..357d549bbe05 100644 --- a/devel/fpc-bfd/Makefile +++ b/devel/fpc-bfd/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -bfd COMMENT= Free Pascal interface for the GNU Binary Format description -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-dbus/Makefile b/devel/fpc-dbus/Makefile index 31c94642e74e..9f9fdca2779c 100644 --- a/devel/fpc-dbus/Makefile +++ b/devel/fpc-dbus/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -dbus COMMENT= Free Pascal interface to dbus library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fcl-async/Makefile b/devel/fpc-fcl-async/Makefile index d5e4775af266..5b76d24713fb 100644 --- a/devel/fpc-fcl-async/Makefile +++ b/devel/fpc-fcl-async/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -fcl-async COMMENT= Free Pascal asynchronous event management (FCL) -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fcl-base/Makefile b/devel/fpc-fcl-base/Makefile index a47128effb08..da17946c2fbb 100644 --- a/devel/fpc-fcl-base/Makefile +++ b/devel/fpc-fcl-base/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fcl-base COMMENT= Free Pascal Component Library base +USES= fpc USE_FPC= fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile index dea37345eb0f..10b11ec0b84c 100644 --- a/devel/fpc-fcl-db/Makefile +++ b/devel/fpc-fcl-db/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fcl-db 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 diff --git a/devel/fpc-fcl-extra/Makefile b/devel/fpc-fcl-extra/Makefile index 787554cf472b..ec0e3aea6393 100644 --- a/devel/fpc-fcl-extra/Makefile +++ b/devel/fpc-fcl-extra/Makefile @@ -5,6 +5,7 @@ PKGNAMESUFFIX= -fcl-extra COMMENT= Free Pascal extra libraries (FCL) +USES= fpc USE_FPC= fcl-base fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-fcl-fpcunit/Makefile b/devel/fpc-fcl-fpcunit/Makefile index 3dafc8971d63..e0ca0f13d0e0 100644 --- a/devel/fpc-fcl-fpcunit/Makefile +++ b/devel/fpc-fcl-fpcunit/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fcl-fpcunit COMMENT= Free Pascal unit testing library (FCL) +USES= fpc USE_FPC= fcl-base fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile index f6be2bb4f0a2..3e90d0dd9ef7 100644 --- a/devel/fpc-fcl-image/Makefile +++ b/devel/fpc-fcl-image/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fcl-image COMMENT= Free Pascal image loading and conversion libraries (FCL) +USES= fpc USE_FPC= fcl-base fcl-res pasjpeg rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-fcl-js/Makefile b/devel/fpc-fcl-js/Makefile index 4596f375464e..40f56f5433db 100644 --- a/devel/fpc-fcl-js/Makefile +++ b/devel/fpc-fcl-js/Makefile @@ -1,12 +1,13 @@ # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $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 diff --git a/devel/fpc-fcl-json/Makefile b/devel/fpc-fcl-json/Makefile index d8b5b66799ff..5768a7e458a9 100644 --- a/devel/fpc-fcl-json/Makefile +++ b/devel/fpc-fcl-json/Makefile @@ -1,12 +1,13 @@ # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $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 diff --git a/devel/fpc-fcl-net/Makefile b/devel/fpc-fcl-net/Makefile index 3216f38b62ae..688a9917290f 100644 --- a/devel/fpc-fcl-net/Makefile +++ b/devel/fpc-fcl-net/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fcl-net 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 diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile index ec86902bb2be..1b72bf1b2de1 100644 --- a/devel/fpc-fcl-passrc/Makefile +++ b/devel/fpc-fcl-passrc/Makefile @@ -1,12 +1,13 @@ # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $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 diff --git a/devel/fpc-fcl-pdf/Makefile b/devel/fpc-fcl-pdf/Makefile index d5012ee76faf..d1dd1d6a447a 100644 --- a/devel/fpc-fcl-pdf/Makefile +++ b/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 diff --git a/devel/fpc-fcl-registry/Makefile b/devel/fpc-fcl-registry/Makefile index aebc95afaeed..442b55d5589a 100644 --- a/devel/fpc-fcl-registry/Makefile +++ b/devel/fpc-fcl-registry/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fcl-registry COMMENT= Free Pascal emulation of Windows registry (FCL) +USES= fpc USE_FPC= fcl-base fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-fcl-res/Makefile b/devel/fpc-fcl-res/Makefile index 3df08d001ae5..30eeb5b5fc96 100644 --- a/devel/fpc-fcl-res/Makefile +++ b/devel/fpc-fcl-res/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -fcl-res COMMENT= Free Pascal resource handlers (FCL) -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fcl-sdo/Makefile b/devel/fpc-fcl-sdo/Makefile index ce23288a2180..8086b166dbaf 100644 --- a/devel/fpc-fcl-sdo/Makefile +++ b/devel/fpc-fcl-sdo/Makefile @@ -5,6 +5,7 @@ PKGNAMESUFFIX= -fcl-sdo 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 diff --git a/devel/fpc-fcl-sound/Makefile b/devel/fpc-fcl-sound/Makefile index c2e19fd9bf20..5f20bbc0e53f 100644 --- a/devel/fpc-fcl-sound/Makefile +++ b/devel/fpc-fcl-sound/Makefile @@ -5,6 +5,7 @@ PKGNAMESUFFIX= -fcl-sound COMMENT= Free Pascal sound loading, storing and converion (FCL) +USES= fpc USE_FPC= fcl-base fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-fcl-stl/Makefile b/devel/fpc-fcl-stl/Makefile index 10d845c3f56d..c9025e3021ed 100644 --- a/devel/fpc-fcl-stl/Makefile +++ b/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/-//} diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile index f424598d55b7..4251ba5cf50c 100644 --- a/devel/fpc-fcl-web/Makefile +++ b/devel/fpc-fcl-web/Makefile @@ -1,12 +1,13 @@ # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $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 diff --git a/devel/fpc-fcl-xml/Makefile b/devel/fpc-fcl-xml/Makefile index fe802103b042..eb1456ad5d55 100644 --- a/devel/fpc-fcl-xml/Makefile +++ b/devel/fpc-fcl-xml/Makefile @@ -6,8 +6,8 @@ PKGNAMESUFFIX= -fcl-xml 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/-//} diff --git a/devel/fpc-fppkg/Makefile b/devel/fpc-fppkg/Makefile index 141eec54ac1f..3dfc3eb8b40a 100644 --- a/devel/fpc-fppkg/Makefile +++ b/devel/fpc-fppkg/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fppkg 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 diff --git a/devel/fpc-fv/Makefile b/devel/fpc-fv/Makefile index 8fb521013c83..e391610220f1 100644 --- a/devel/fpc-fv/Makefile +++ b/devel/fpc-fv/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -fv COMMENT= FreeVision is a Free Pascal unit for Delphi support +USES= fpc USE_FPC= rtl-console rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-gdbint/Makefile b/devel/fpc-gdbint/Makefile index 2ebd9643b784..9f7dbf41375b 100644 --- a/devel/fpc-gdbint/Makefile +++ b/devel/fpc-gdbint/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -gdbint COMMENT= Free Pascal unit providing interface to gdb -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-newt/Makefile b/devel/fpc-newt/Makefile index 0039516829b2..7d2bd51eaba3 100644 --- a/devel/fpc-newt/Makefile +++ b/devel/fpc-newt/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -newt COMMENT= Free Pascal interface to newt library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-pthreads/Makefile b/devel/fpc-pthreads/Makefile index 72306e249dda..06171920cce5 100644 --- a/devel/fpc-pthreads/Makefile +++ b/devel/fpc-pthreads/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -pthreads COMMENT= Free Pascal wrapper for the pthreads library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-regexpr/Makefile b/devel/fpc-regexpr/Makefile index bcce3c555632..8e082790447a 100644 --- a/devel/fpc-regexpr/Makefile +++ b/devel/fpc-regexpr/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -regexpr COMMENT= Free Pascal regular expression routines +USES= fpc USE_FPC= rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-sdl/Makefile b/devel/fpc-sdl/Makefile index 1f2f864d7009..0506fa1c64d1 100644 --- a/devel/fpc-sdl/Makefile +++ b/devel/fpc-sdl/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -sdl COMMENT= Free Pascal interface to SDL library +USES= fpc USE_FPC= pthreads x11 MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/fpc-symbolic/Makefile b/devel/fpc-symbolic/Makefile index 6a97aaa34bbe..5728e722a754 100644 --- a/devel/fpc-symbolic/Makefile +++ b/devel/fpc-symbolic/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -symbolic COMMENT= FreePascal unit for simple expression parsing and evaluating -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-zlib/Makefile b/devel/fpc-zlib/Makefile index ca5dff109bdc..6400c967f92d 100644 --- a/devel/fpc-zlib/Makefile +++ b/devel/fpc-zlib/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -zlib COMMENT= Free Pascal interface to the zlib compression library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/editors/coedit/Makefile b/editors/coedit/Makefile index e6ca24a5b508..6a236c2d3a86 100644 --- a/editors/coedit/Makefile +++ b/editors/coedit/Makefile @@ -26,6 +26,7 @@ USE_GITHUB= yes 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 diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile index f1b13fa960b1..955044892271 100644 --- a/editors/fpc-ide/Makefile +++ b/editors/fpc-ide/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -ide COMMENT= Free Pascal integrated IDE/compiler +USES= fpc USE_FPC= chm fv gdbint regexpr rtl-extra rtl-console fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index 560abdc2b793..30a54a4fdafc 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -17,12 +17,13 @@ RUN_DEPENDS?= # 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 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/gdb:devel/gdb .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 diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile index ec07c3076fd8..a6a3579758c7 100644 --- a/ftp/fpc-libcurl/Makefile +++ b/ftp/fpc-libcurl/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -libcurl COMMENT= Free Pascal interface to libcurl -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile index 583e4227383b..8b5aec5dc986 100644 --- a/games/hedgewars/Makefile +++ b/games/hedgewars/Makefile @@ -18,7 +18,7 @@ LICENSE_COMB= multi 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 \ diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile index 653d41446ede..b63d1708d89d 100644 --- a/graphics/fpc-cairo/Makefile +++ b/graphics/fpc-cairo/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -cairo 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 diff --git a/graphics/fpc-graph/Makefile b/graphics/fpc-graph/Makefile index 730c0a92d9da..0dfcdc20897b 100644 --- a/graphics/fpc-graph/Makefile +++ b/graphics/fpc-graph/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -graph COMMENT= Free Pascal interface to graphical applications +USES= fpc USE_FPC= sdl x11 ${ARCH:Mi386:S/i386/pthreads/} MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/graphics/fpc-hermes/Makefile b/graphics/fpc-hermes/Makefile index 3edc9edd1ecb..19b4a9444503 100644 --- a/graphics/fpc-hermes/Makefile +++ b/graphics/fpc-hermes/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -hermes COMMENT= Free Pascal hermes unit -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index be4c243b1146..97fdd09696fd 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -imagemagick COMMENT= Free Pascal interface to ImageMagick -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile index 168ef35b187b..70946a41d06f 100644 --- a/graphics/fpc-libgd/Makefile +++ b/graphics/fpc-libgd/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -libgd COMMENT= Free Pascal interface to libgd for producing graphics files -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile index 586a53304843..d49d6e56786a 100644 --- a/graphics/fpc-libpng/Makefile +++ b/graphics/fpc-libpng/Makefile @@ -6,8 +6,8 @@ PKGNAMESUFFIX= -libpng 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/-//} diff --git a/graphics/fpc-ncurses/Makefile b/graphics/fpc-ncurses/Makefile index abe953aa566a..07f6619006c9 100644 --- a/graphics/fpc-ncurses/Makefile +++ b/graphics/fpc-ncurses/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -ncurses COMMENT= Free Pascal interface to the ncurses library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile index 92832c56bd7b..0c3338d11a5d 100644 --- a/graphics/fpc-opengl/Makefile +++ b/graphics/fpc-opengl/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -opengl COMMENT= Free Pascal interface to the OpenGL library +USES= fpc USE_FPC= x11 MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/graphics/fpc-pasjpeg/Makefile b/graphics/fpc-pasjpeg/Makefile index 89bc07748d6a..c32afcc24c78 100644 --- a/graphics/fpc-pasjpeg/Makefile +++ b/graphics/fpc-pasjpeg/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -pasjpeg COMMENT= Handling JPEG files with Pascal -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/graphics/fpc-proj4/Makefile b/graphics/fpc-proj4/Makefile index 769ee1e3087a..eab5bf0ae4de 100644 --- a/graphics/fpc-proj4/Makefile +++ b/graphics/fpc-proj4/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -proj4 COMMENT= Free Pascal interface to proj library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile index ea29f1b2209e..b8e18e41fb7b 100644 --- a/graphics/fpc-rsvg/Makefile +++ b/graphics/fpc-rsvg/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -rsvg 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 diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile index 1d58c0ff3b77..7d5ab76535dc 100644 --- a/graphics/fpc-svgalib/Makefile +++ b/graphics/fpc-svgalib/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -svgalib COMMENT= Free Pascal interface to the SVGA graphics library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile index 3591886853b5..7cf173c262cf 100644 --- a/lang/fpc-base/Makefile +++ b/lang/fpc-base/Makefile @@ -9,9 +9,7 @@ PKGNAMEPREFIX= fpc- 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 diff --git a/lang/fpc-lua/Makefile b/lang/fpc-lua/Makefile index 7f2aa925dad3..dabaa9495115 100644 --- a/lang/fpc-lua/Makefile +++ b/lang/fpc-lua/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -lua COMMENT= Free Pascal interface to the lua interpreter -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/lang/fpc-rexx/Makefile b/lang/fpc-rexx/Makefile index 689727cc2ea3..482cd6f9def1 100644 --- a/lang/fpc-rexx/Makefile +++ b/lang/fpc-rexx/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -rexx COMMENT= Free Pascal interface to the rexx-regina library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/lang/fpc-rtl-console/Makefile b/lang/fpc-rtl-console/Makefile index 0aa2afc3d932..bf1ca9c2250a 100644 --- a/lang/fpc-rtl-console/Makefile +++ b/lang/fpc-rtl-console/Makefile @@ -5,6 +5,7 @@ PKGNAMESUFFIX= -rtl-console COMMENT= Free Pascal console abstraction unit (RTL) +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/lang/fpc-rtl-extra/Makefile b/lang/fpc-rtl-extra/Makefile index bfecac2066f9..c7d6e4f47ec8 100644 --- a/lang/fpc-rtl-extra/Makefile +++ b/lang/fpc-rtl-extra/Makefile @@ -5,7 +5,7 @@ PKGNAMESUFFIX= -rtl-extra COMMENT= Free Pascal rtl-extra unit -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/lang/fpc-rtl-objpas/Makefile b/lang/fpc-rtl-objpas/Makefile index c9d81705a6a8..c4df8f7a509e 100644 --- a/lang/fpc-rtl-objpas/Makefile +++ b/lang/fpc-rtl-objpas/Makefile @@ -6,7 +6,7 @@ PORTREVISION= 1 COMMENT= Free Pascal compatibility unit with Delphi -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/lang/fpc-rtl-unicode/Makefile b/lang/fpc-rtl-unicode/Makefile index c5a105ce9a90..f83f5d568497 100644 --- a/lang/fpc-rtl-unicode/Makefile +++ b/lang/fpc-rtl-unicode/Makefile @@ -5,7 +5,7 @@ PKGNAMESUFFIX= -rtl-unicode COMMENT= Free Pascal compatibility unit with Delphi -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile index 6a823b176f7a..7bfcaafc9ad4 100644 --- a/lang/fpc-units/Makefile +++ b/lang/fpc-units/Makefile @@ -10,7 +10,7 @@ MAINTAINER= acm@FreeBSD.org 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 @@ UNITS_SELECTED+= ${OPT:tl:S/rtl_/rtl-/:S/fcl_/fcl-/} . endif .endfor -USE_FPC_RUN= yes USE_FPC= ${UNITS_SELECTED} .include <bsd.port.mk> diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile index 52b67ed2320e..8cbd8067895f 100644 --- a/lang/fpc-utils/Makefile +++ b/lang/fpc-utils/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -utils 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 \ diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 039d2c92ebaa..f0eadb8d4e3c 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -21,7 +21,7 @@ DIST_SUBDIR= freepascal MAINTAINER?= acm@FreeBSD.org COMMENT?= Free Pascal compiler with Turbo and Delphi -USES= gmake iconv +USES+= gmake iconv ONLY_FOR_ARCHS= i386 amd64 LLD_UNSAFE= yes # Links object with invalid section header alignment BOOTVER= 3.0.4 diff --git a/lang/nbc/Makefile b/lang/nbc/Makefile index 42d9578ca93a..9d48298c859c 100644 --- a/lang/nbc/Makefile +++ b/lang/nbc/Makefile @@ -20,7 +20,7 @@ ROBOCTL_DESC= Include roboctl to communicate with the NXT 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 \ diff --git a/math/fpc-fftw/Makefile b/math/fpc-fftw/Makefile index 4e213ca0bb93..0ccec5ff4e4c 100644 --- a/math/fpc-fftw/Makefile +++ b/math/fpc-fftw/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -fftw COMMENT= Free Pascal interface to the FFTW3 library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/math/fpc-gmp/Makefile b/math/fpc-gmp/Makefile index 12a9b9390236..330b50785f18 100644 --- a/math/fpc-gmp/Makefile +++ b/math/fpc-gmp/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -gmp COMMENT= Free Pascal interface to gmp library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/math/fpc-numlib/Makefile b/math/fpc-numlib/Makefile index 9b8499059081..5cf7a459c77a 100644 --- a/math/fpc-numlib/Makefile +++ b/math/fpc-numlib/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -numlib COMMENT= Free Pascal unit to numerical methods -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/misc/fpc-chm/Makefile b/misc/fpc-chm/Makefile index 9df9ece985be..41b8fe16426a 100644 --- a/misc/fpc-chm/Makefile +++ b/misc/fpc-chm/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -chm COMMENT= Free Pascal unit to manipulate chm files +USES= fpc USE_FPC= fcl-base fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/multimedia/fpc-dts/Makefile b/multimedia/fpc-dts/Makefile index 3cde953c6e45..af048a96a962 100644 --- a/multimedia/fpc-dts/Makefile +++ b/multimedia/fpc-dts/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -dts COMMENT= Free Pascal interface to the dts library -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/multimedia/fpc-libvlc/Makefile b/multimedia/fpc-libvlc/Makefile index 4f21b00f9577..e3634adc5d91 100644 --- a/multimedia/fpc-libvlc/Makefile +++ b/multimedia/fpc-libvlc/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -libvlc COMMENT= Free Pascal interface to vlc media player library +USES= fpc USE_FPC= fcl-base fcl-res rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile index 10f130c1bd0f..68b199b0babd 100644 --- a/multimedia/winff/Makefile +++ b/multimedia/winff/Makefile @@ -19,6 +19,7 @@ BUILD_DEPENDS= lazbuild:editors/lazarus 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 diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile index c6bbcf7be37c..8db81abb4712 100644 --- a/net-p2p/transmission-remote-gui/Makefile +++ b/net-p2p/transmission-remote-gui/Makefile @@ -17,6 +17,7 @@ BUILD_DEPENDS= lazbuild:editors/lazarus \ 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 diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile index 04a03a427a75..a7cdbf7df797 100644 --- a/net/fpc-ldap/Makefile +++ b/net/fpc-ldap/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -ldap COMMENT= Free Pascal interface to OpenLDAP -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/net/fpc-pcap/Makefile b/net/fpc-pcap/Makefile index 945319ff38d2..f31b73fc525c 100644 --- a/net/fpc-pcap/Makefile +++ b/net/fpc-pcap/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -pcap COMMENT= Free Pascal unit for libpcap library +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile index ca0bb44b48bb..04e149fa8a49 100644 --- a/russian/emkatic/Makefile +++ b/russian/emkatic/Makefile @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt 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 diff --git a/science/checkmol/Makefile b/science/checkmol/Makefile index ca3c129ff3aa..c773de126025 100644 --- a/science/checkmol/Makefile +++ b/science/checkmol/Makefile @@ -19,7 +19,7 @@ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= ${WRKSRC} -USE_FPC= yes +USES= fpc PLIST_FILES= bin/checkmol bin/matchmol diff --git a/science/mol2ps/Makefile b/science/mol2ps/Makefile index da751d383d0e..0835a44e8077 100644 --- a/science/mol2ps/Makefile +++ b/science/mol2ps/Makefile @@ -21,6 +21,7 @@ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # EXTRACT_AFTER_ARGS= ${WRKSRC} +USES= fpc USE_FPC= rtl-objpas PLIST_FILES= bin/mol2eps bin/mol2ps bin/mol2svg %%DATADIR%%/color.conf diff --git a/security/fpc-openssl/Makefile b/security/fpc-openssl/Makefile index 815e9846b6b3..25561d432739 100644 --- a/security/fpc-openssl/Makefile +++ b/security/fpc-openssl/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -openssl COMMENT= Free Pascal unit for OpenSSL +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/sysutils/fpc-syslog/Makefile b/sysutils/fpc-syslog/Makefile index 39cc204fee3b..a3691438eed5 100644 --- a/sysutils/fpc-syslog/Makefile +++ b/sysutils/fpc-syslog/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -syslog COMMENT= Free Pascal interface to the system logger -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/sysutils/fpc-users/Makefile b/sysutils/fpc-users/Makefile index 3d439be5f81e..58bfb7dcbf3a 100644 --- a/sysutils/fpc-users/Makefile +++ b/sysutils/fpc-users/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -users COMMENT= Free Pascal interface to manipulate system users -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/sysutils/fpc-utmp/Makefile b/sysutils/fpc-utmp/Makefile index ed61a8a99e1b..3ce9dc760efb 100644 --- a/sysutils/fpc-utmp/Makefile +++ b/sysutils/fpc-utmp/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -utmp 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/-//} diff --git a/sysutils/fpc-uuid/Makefile b/sysutils/fpc-uuid/Makefile index a624d77e89e6..90439f6d140a 100644 --- a/sysutils/fpc-uuid/Makefile +++ b/sysutils/fpc-uuid/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -uuid COMMENT= Free Pascal uuid unit +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/textproc/fpc-aspell/Makefile b/textproc/fpc-aspell/Makefile index 4f42a988c2ec..472b80eeb784 100644 --- a/textproc/fpc-aspell/Makefile +++ b/textproc/fpc-aspell/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -aspell COMMENT= Interface to aspell spelling checker -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/textproc/fpc-libxml2/Makefile b/textproc/fpc-libxml2/Makefile index c8826c22ed51..e3df391e290b 100644 --- a/textproc/fpc-libxml2/Makefile +++ b/textproc/fpc-libxml2/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -libxml2 COMMENT= Interface to xml2 library +USES= fpc USE_FPC= rtl-objpas MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/www/fpc-fastcgi/Makefile b/www/fpc-fastcgi/Makefile index 0de6c71e4a0d..e593bb22d784 100644 --- a/www/fpc-fastcgi/Makefile +++ b/www/fpc-fastcgi/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -fastcgi COMMENT= Free Pascal fastcgi unit -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/www/fpc-googleapi/Makefile b/www/fpc-googleapi/Makefile index 50cea32b4c9b..1ef4b46d7516 100644 --- a/www/fpc-googleapi/Makefile +++ b/www/fpc-googleapi/Makefile @@ -5,6 +5,7 @@ PKGNAMESUFFIX= -googleapi 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 \ diff --git a/www/fpc-httpd22/Makefile b/www/fpc-httpd22/Makefile index 7ea796d9bc5d..1810471ed3b8 100644 --- a/www/fpc-httpd22/Makefile +++ b/www/fpc-httpd22/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -httpd22 COMMENT= Free Pascal headers for Apache 2.2 series web server +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/www/fpc-httpd24/Makefile b/www/fpc-httpd24/Makefile index 5aee8e63e5a5..73d35e00c62b 100644 --- a/www/fpc-httpd24/Makefile +++ b/www/fpc-httpd24/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -httpd24 COMMENT= Free Pascal headers for Apache 2.4 series web server +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/www/fpc-libmicrohttpd/Makefile b/www/fpc-libmicrohttpd/Makefile index 4cbd62a210d7..6b754e0437cd 100644 --- a/www/fpc-libmicrohttpd/Makefile +++ b/www/fpc-libmicrohttpd/Makefile @@ -5,6 +5,7 @@ PKGNAMESUFFIX= -libmicrohttpd COMMENT= Free Pascal libmicrohttpd unit +USES= fpc USE_FPC= rtl-extra MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index 51ed3dd18287..8b5ee9212ff7 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= lazbuild:editors/lazarus \ 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 diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile index b4744a7a2576..eb61bbdb9eb9 100644 --- a/x11-toolkits/fpc-gtk2/Makefile +++ b/x11-toolkits/fpc-gtk2/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -gtk2 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 diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile index 58ed662a6ced..fe767eaa0b88 100644 --- a/x11-toolkits/fpc-xforms/Makefile +++ b/x11-toolkits/fpc-xforms/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -xforms COMMENT= X-Forms interface for Free Pascal +USES= fpc USE_FPC= x11 MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile index fc7df191fe3b..fb7ce047cca6 100644 --- a/x11/fpc-x11/Makefile +++ b/x11/fpc-x11/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 2 COMMENT= Free Pascal interface to X windows server -USE_FPC= yes +USES= fpc MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} |