From 864284545c6823762414172864b5be11fb77aaed Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Tue, 28 Jan 2014 00:16:57 +0000 Subject: [PATCH] Stage support --- archivers/fpc-bzip2/Makefile | 3 +- archivers/fpc-paszlib/Makefile | 3 +- archivers/fpc-unzip/Makefile | 5 +- audio/fpc-a52/Makefile | 7 +- audio/fpc-mad/Makefile | 5 +- audio/fpc-modplug/Makefile | 5 +- audio/fpc-oggvorbis/Makefile | 6 +- audio/fpc-openal/Makefile | 3 +- audio/fpc-sndfile/Makefile | 5 +- converters/fpc-iconvenc/Makefile | 6 +- databases/fpc-dblib/Makefile | 3 +- databases/fpc-fpindexer/Makefile | 3 +- databases/fpc-gdbm/Makefile | 5 +- databases/fpc-ibase/Makefile | 5 +- databases/fpc-mysql/Makefile | 5 +- databases/fpc-odbc/Makefile | 5 +- databases/fpc-oracle/Makefile | 6 +- databases/fpc-postgres/Makefile | 5 +- databases/fpc-pxlib/Makefile | 3 +- databases/fpc-sqlite/Makefile | 5 +- devel/fpc-bfd/Makefile | 5 +- devel/fpc-dbus/Makefile | 5 +- devel/fpc-fcl-async/Makefile | 3 +- devel/fpc-fcl-base/Makefile | 3 +- devel/fpc-fcl-db/Makefile | 6 +- devel/fpc-fcl-extra/Makefile | 3 +- devel/fpc-fcl-fpcunit/Makefile | 3 +- devel/fpc-fcl-image/Makefile | 3 +- devel/fpc-fcl-js/Makefile | 3 +- devel/fpc-fcl-json/Makefile | 3 +- devel/fpc-fcl-net/Makefile | 4 +- devel/fpc-fcl-passrc/Makefile | 3 +- devel/fpc-fcl-process/Makefile | 3 +- devel/fpc-fcl-registry/Makefile | 3 +- devel/fpc-fcl-res/Makefile | 3 +- devel/fpc-fcl-web/Makefile | 5 +- devel/fpc-fcl-xml/Makefile | 3 +- devel/fpc-fpmkunit/Makefile | 3 +- devel/fpc-fppkg/Makefile | 3 +- devel/fpc-fv/Makefile | 7 +- devel/fpc-fv/pkg-plist | 12 +- devel/fpc-gdbint/Makefile | 3 +- devel/fpc-newt/Makefile | 5 +- devel/fpc-pthreads/Makefile | 3 +- devel/fpc-regexpr/Makefile | 3 +- devel/fpc-sdl/Makefile | 5 +- devel/fpc-symbolic/Makefile | 3 +- devel/fpc-zlib/Makefile | 3 +- editors/fpc-ide/Makefile | 4 +- ftp/fpc-libcurl/Makefile | 5 +- graphics/fpc-cairo/Makefile | 5 +- graphics/fpc-fpgtk/Makefile | 5 +- graphics/fpc-ggi/Makefile | 5 +- graphics/fpc-graph/Makefile | 3 +- graphics/fpc-hermes/Makefile | 5 +- graphics/fpc-imagemagick/Makefile | 5 +- graphics/fpc-imlib/Makefile | 5 +- graphics/fpc-libgd/Makefile | 5 +- graphics/fpc-libpng/Makefile | 5 +- graphics/fpc-ncurses/Makefile | 3 +- graphics/fpc-opengl/Makefile | 8 +- graphics/fpc-opengl/pkg-plist | 22 +- graphics/fpc-pasjpeg/Makefile | 3 +- graphics/fpc-proj4/Makefile | 5 +- graphics/fpc-rsvg/Makefile | 5 +- graphics/fpc-svgalib/Makefile | 5 +- lang/fpc-base/Makefile | 12 +- lang/fpc-docs/Makefile | 9 +- lang/fpc-lua/Makefile | 5 +- lang/fpc-rexx/Makefile | 5 +- lang/fpc-tcl/Makefile | 5 +- lang/fpc-units/Makefile | 6 +- lang/fpc-utils/Makefile | 4 +- lang/fpc/Makefile | 2 +- lang/fpc/Makefile.units | 344 +----------------------------- math/fpc-fftw/Makefile | 5 +- math/fpc-gmp/Makefile | 5 +- math/fpc-numlib/Makefile | 3 +- misc/fpc-chm/Makefile | 3 +- multimedia/fpc-dts/Makefile | 5 +- multimedia/fpc-matroska/Makefile | 5 +- net/fpc-ldap/Makefile | 5 +- net/fpc-pcap/Makefile | 5 +- security/fpc-hash/Makefile | 3 +- security/fpc-openssl/Makefile | 5 +- sysutils/fpc-syslog/Makefile | 3 +- sysutils/fpc-users/Makefile | 3 +- sysutils/fpc-utmp/Makefile | 3 +- sysutils/fpc-uuid/Makefile | 3 +- textproc/fpc-aspell/Makefile | 2 +- textproc/fpc-libxml2/Makefile | 5 +- www/fpc-fastcgi/Makefile | 3 +- www/fpc-httpd22/Makefile | 5 +- x11-toolkits/fpc-gnome1/Makefile | 3 +- x11-toolkits/fpc-gtk1/Makefile | 6 +- x11-toolkits/fpc-gtk2/Makefile | 5 +- x11-toolkits/fpc-xforms/Makefile | 8 +- x11-toolkits/fpc-xforms/pkg-plist | 118 +++++----- x11/fpc-x11/Makefile | 5 +- 99 files changed, 302 insertions(+), 613 deletions(-) diff --git a/archivers/fpc-bzip2/Makefile b/archivers/fpc-bzip2/Makefile index ad3ba7778657..53f73b2c1d82 100644 --- a/archivers/fpc-bzip2/Makefile +++ b/archivers/fpc-bzip2/Makefile @@ -10,9 +10,8 @@ COMMENT= Free Pascal bzip2 unit USE_FPC= yes -NO_STAGE= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} .include "${MASTERDIR}/Makefile" diff --git a/archivers/fpc-paszlib/Makefile b/archivers/fpc-paszlib/Makefile index aec1aa1afd81..93649ace0779 100644 --- a/archivers/fpc-paszlib/Makefile +++ b/archivers/fpc-paszlib/Makefile @@ -10,9 +10,8 @@ COMMENT= Free Pascal unit for native compression IO USE_FPC= hash -NO_STAGE= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} .include "${MASTERDIR}/Makefile" diff --git a/archivers/fpc-unzip/Makefile b/archivers/fpc-unzip/Makefile index 9d386ab6cabe..db31c2b4adbe 100644 --- a/archivers/fpc-unzip/Makefile +++ b/archivers/fpc-unzip/Makefile @@ -10,13 +10,14 @@ COMMENT= Free Pascal routines for unzipping zip files USE_FPC= yes -NO_STAGE= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= UNZIP UNZIP_DESC= Install unzip tools OPTIONS_DEFAULT= UNZIP +UNZIP_RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip + .include "${MASTERDIR}/Makefile" diff --git a/audio/fpc-a52/Makefile b/audio/fpc-a52/Makefile index 87cef137caae..501687a95db4 100644 --- a/audio/fpc-a52/Makefile +++ b/audio/fpc-a52/Makefile @@ -9,14 +9,15 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal interface to a52 library USE_FPC= yes -NO_STAGE= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBA52 -LIBA52_DESC= Install a52 library +LIBA52_DESC= Install a52 library OPTIONS_DEFAULT= LIBA52 +LIBA52_LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 + .include "${MASTERDIR}/Makefile" diff --git a/audio/fpc-mad/Makefile b/audio/fpc-mad/Makefile index 7ff8f0542e77..1f2cd4958831 100644 --- a/audio/fpc-mad/Makefile +++ b/audio/fpc-mad/Makefile @@ -9,14 +9,15 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal interface to mad library USE_FPC= yes -NO_STAGE= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBMAD LIBMAD_DESC= Install mad library OPTIONS_DEFAULT= LIBMAD +LIBMAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad + .include "${MASTERDIR}/Makefile" diff --git a/audio/fpc-modplug/Makefile b/audio/fpc-modplug/Makefile index 2ab6e10954ee..455e251d9151 100644 --- a/audio/fpc-modplug/Makefile +++ b/audio/fpc-modplug/Makefile @@ -9,14 +9,15 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal interface to modplug library USE_FPC= yes -NO_STAGE= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBMODPLUG LIBMODPLUG_DESC= Install modplug library OPTIONS_DEFAULT= LIBMODPLUG +LIBMODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug + .include "${MASTERDIR}/Makefile" diff --git a/audio/fpc-oggvorbis/Makefile b/audio/fpc-oggvorbis/Makefile index c4e105d834df..d2eba62f1f67 100644 --- a/audio/fpc-oggvorbis/Makefile +++ b/audio/fpc-oggvorbis/Makefile @@ -9,15 +9,17 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal interface to ogg & vorbis libraries USE_FPC= yes -NO_STAGE= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBOGG LIBVORBIS LIBOGG_DESC= Install ogg library LIBVORBIS_DESC= Install vorbis library OPTIONS_DEFAULT= LIBOGG LIBVORBIS +LIBOGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg +LIBVORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis + .include "${MASTERDIR}/Makefile" diff --git a/audio/fpc-openal/Makefile b/audio/fpc-openal/Makefile index 6ab169e9b364..6b4d5a22bcdb 100644 --- a/audio/fpc-openal/Makefile +++ b/audio/fpc-openal/Makefile @@ -9,11 +9,10 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal interface to openal library USE_FPC= yes -NO_STAGE= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= OPENAL OPENAL_DESC= Install openal library diff --git a/audio/fpc-sndfile/Makefile b/audio/fpc-sndfile/Makefile index 31bad29a35a3..344318e7892a 100644 --- a/audio/fpc-sndfile/Makefile +++ b/audio/fpc-sndfile/Makefile @@ -9,14 +9,15 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal Interface to sndfile library USE_FPC= yes -NO_STAGE= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBSNDFILE LIBSNDFILE_DESC= Install sndfile library OPTIONS_DEFAULT= LIBSNDFILE +LIBSNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile + .include "${MASTERDIR}/Makefile" diff --git a/converters/fpc-iconvenc/Makefile b/converters/fpc-iconvenc/Makefile index 295e5e3702aa..712eb2722103 100644 --- a/converters/fpc-iconvenc/Makefile +++ b/converters/fpc-iconvenc/Makefile @@ -12,7 +12,9 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} + +# added to main port to make it compile on 10 with iconv in libc +#USES= iconv -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-dblib/Makefile b/databases/fpc-dblib/Makefile index 17f306848b12..6130213a33b7 100644 --- a/databases/fpc-dblib/Makefile +++ b/databases/fpc-dblib/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-fpindexer/Makefile b/databases/fpc-fpindexer/Makefile index 61178c961603..838eb13dd773 100644 --- a/databases/fpc-fpindexer/Makefile +++ b/databases/fpc-fpindexer/Makefile @@ -12,7 +12,6 @@ USE_FPC= chm fcl-base fcl-db MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile index 565708a60111..1dab9c56cd68 100644 --- a/databases/fpc-gdbm/Makefile +++ b/databases/fpc-gdbm/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= GDBM GDBM_DESC= Install the GNU database manager OPTIONS_DEFAULT= GDBM -NO_STAGE= yes +GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm + .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile index a31c117e6915..86723607d306 100644 --- a/databases/fpc-ibase/Makefile +++ b/databases/fpc-ibase/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= IBASE IBASE_DESC= Install Interbase/Firebird client OPTIONS_DEFAULT= IBASE -NO_STAGE= yes +IBASE_USE= FIREBIRD=yes + .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile index 7b42120157f2..be61c47459b3 100644 --- a/databases/fpc-mysql/Makefile +++ b/databases/fpc-mysql/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= MYSQL MYSQL_DESC= Install MySQL client OPTIONS_DEFAULT= MYSQL -NO_STAGE= yes +MYSQL_USE= MYSQL=yes + .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile index 822ea3f3acef..058fff07d1d2 100644 --- a/databases/fpc-odbc/Makefile +++ b/databases/fpc-odbc/Makefile @@ -12,10 +12,11 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= ODBC ODBC_DESC= Install ODBC library suite for Unix -NO_STAGE= yes +ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC + .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile index e149a4147e8f..dc0a37e8cbc5 100644 --- a/databases/fpc-oracle/Makefile +++ b/databases/fpc-oracle/Makefile @@ -12,10 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= ORACLE ORACLE_DESC= Install oracle client -NO_STAGE= yes +ORACLE8_LIB= ${LOCALBASE}/oracle8-client/rdbms/lib +ORACLE_RUN_DEPENDS= ${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client + .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile index 75bbf7311cd2..36af9ad1c00b 100644 --- a/databases/fpc-postgres/Makefile +++ b/databases/fpc-postgres/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= PGSQL PGSQL_DESC= Install PostgreSQL client OPTIONS_DEFAULT= PGSQL -NO_STAGE= yes +PGSQL_USE= PGSQL=yes + .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-pxlib/Makefile b/databases/fpc-pxlib/Makefile index 939ecf7daf2b..92f2536edd71 100644 --- a/databases/fpc-pxlib/Makefile +++ b/databases/fpc-pxlib/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile index 5a8deb15a49d..b79ba6cc96dd 100644 --- a/databases/fpc-sqlite/Makefile +++ b/databases/fpc-sqlite/Makefile @@ -12,10 +12,11 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= SQLITE OPTIONS_DEFAULT= SQLITE -NO_STAGE= yes +SQLITE_USE= SQLITE=yes + .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile index 2fc4d5fc0380..d37ace1d058e 100644 --- a/devel/fpc-bfd/Makefile +++ b/devel/fpc-bfd/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBBFD LIBBFD_DESC= Install Universal BFD library from GNU binutils OPTIONS_DEFAULT= LIBBFD -NO_STAGE= yes +LIBBFD_RUN_DEPENDS= ${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd + .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-dbus/Makefile b/devel/fpc-dbus/Makefile index 727ea69c87ab..69edc77cb1c6 100644 --- a/devel/fpc-dbus/Makefile +++ b/devel/fpc-dbus/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= DBUS DBUS_DESC= Install dbus library OPTIONS_DEFAULT= DBUS -NO_STAGE= yes +DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus + .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-async/Makefile b/devel/fpc-fcl-async/Makefile index 237d7419cb4b..e94554aa6ae2 100644 --- a/devel/fpc-fcl-async/Makefile +++ b/devel/fpc-fcl-async/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-base/Makefile b/devel/fpc-fcl-base/Makefile index fafc53985c89..abfebeca213c 100644 --- a/devel/fpc-fcl-base/Makefile +++ b/devel/fpc-fcl-base/Makefile @@ -12,7 +12,6 @@ USE_FPC= hash paszlib pthreads MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile index 886264a9a8ff..6f5a3f08450b 100644 --- a/devel/fpc-fcl-db/Makefile +++ b/devel/fpc-fcl-db/Makefile @@ -13,7 +13,9 @@ USE_FPC= dblib fcl-async fcl-base fcl-json fcl-xml hash ibase mysql odbc oracle MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} +OPT= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \ + -Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME} \ + -Fu../sqldb/* -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-extra/Makefile b/devel/fpc-fcl-extra/Makefile index 453ba9280d35..e813eb9bac53 100644 --- a/devel/fpc-fcl-extra/Makefile +++ b/devel/fpc-fcl-extra/Makefile @@ -11,7 +11,6 @@ USE_FPC= fcl-base MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-fpcunit/Makefile b/devel/fpc-fcl-fpcunit/Makefile index 432397127b46..b3ecf1499892 100644 --- a/devel/fpc-fcl-fpcunit/Makefile +++ b/devel/fpc-fcl-fpcunit/Makefile @@ -12,7 +12,6 @@ USE_FPC= fcl-async fcl-base fcl-xml hash paszlib pthreads MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile index 5f5d4bb6eb36..303ebf5c7e6c 100644 --- a/devel/fpc-fcl-image/Makefile +++ b/devel/fpc-fcl-image/Makefile @@ -12,7 +12,6 @@ USE_FPC= fcl-async fcl-base hash pasjpeg paszlib pthreads libpng MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-js/Makefile b/devel/fpc-fcl-js/Makefile index a647c1cedaaf..c7b6d9573196 100644 --- a/devel/fpc-fcl-js/Makefile +++ b/devel/fpc-fcl-js/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-json/Makefile b/devel/fpc-fcl-json/Makefile index f769538908a3..29c8838661fa 100644 --- a/devel/fpc-fcl-json/Makefile +++ b/devel/fpc-fcl-json/Makefile @@ -12,7 +12,6 @@ USE_FPC= fcl-base MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-net/Makefile b/devel/fpc-fcl-net/Makefile index 164025f047f4..6c08485dc319 100644 --- a/devel/fpc-fcl-net/Makefile +++ b/devel/fpc-fcl-net/Makefile @@ -12,7 +12,7 @@ USE_FPC= fcl-async fcl-base fcl-xml fcl-passrc hash paszlib pthreads MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} +OPT= -Fu${WRKDIR}/${WRKUNITDIR}/* -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile index a6f14e090a70..efabb427bca5 100644 --- a/devel/fpc-fcl-passrc/Makefile +++ b/devel/fpc-fcl-passrc/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-process/Makefile b/devel/fpc-fcl-process/Makefile index 6ff51bfdcc2d..09291e426f06 100644 --- a/devel/fpc-fcl-process/Makefile +++ b/devel/fpc-fcl-process/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-registry/Makefile b/devel/fpc-fcl-registry/Makefile index 4775fa2d583e..eb3589224515 100644 --- a/devel/fpc-fcl-registry/Makefile +++ b/devel/fpc-fcl-registry/Makefile @@ -12,7 +12,6 @@ USE_FPC= fcl-async fcl-base fcl-xml hash paszlib pthreads MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-res/Makefile b/devel/fpc-fcl-res/Makefile index b4a83e0970e1..d76845956502 100644 --- a/devel/fpc-fcl-res/Makefile +++ b/devel/fpc-fcl-res/Makefile @@ -12,7 +12,6 @@ USE_FPC= fcl-base MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile index 6067db5e5ff6..41457e5b0349 100644 --- a/devel/fpc-fcl-web/Makefile +++ b/devel/fpc-fcl-web/Makefile @@ -14,7 +14,8 @@ USE_FPC= fastcgi fcl-async fcl-base fcl-db fcl-json fcl-net fcl-process \ MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} +OPT= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \ + -Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fcl-xml/Makefile b/devel/fpc-fcl-xml/Makefile index 19b02ad19b4c..e7d6350cc5cd 100644 --- a/devel/fpc-fcl-xml/Makefile +++ b/devel/fpc-fcl-xml/Makefile @@ -12,7 +12,6 @@ USE_FPC= fcl-async fcl-base hash iconvenc paszlib pthreads MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fpmkunit/Makefile b/devel/fpc-fpmkunit/Makefile index 4c60fb4d5c59..bfc097b00e01 100644 --- a/devel/fpc-fpmkunit/Makefile +++ b/devel/fpc-fpmkunit/Makefile @@ -12,7 +12,6 @@ USE_FPC= fcl-process paszlib MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fppkg/Makefile b/devel/fpc-fppkg/Makefile index 29779c7ffc7d..52ba6f7902d5 100644 --- a/devel/fpc-fppkg/Makefile +++ b/devel/fpc-fppkg/Makefile @@ -12,7 +12,6 @@ USE_FPC= fcl-base fcl-process fcl-web fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fv/Makefile b/devel/fpc-fv/Makefile index 679766ea7278..ac4ddb6d0691 100644 --- a/devel/fpc-fv/Makefile +++ b/devel/fpc-fv/Makefile @@ -12,7 +12,10 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} + +OPTIONS_DEFINE= EXAMPLES + +HAVE_EXAMPLES= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-fv/pkg-plist b/devel/fpc-fv/pkg-plist index 9f32a2d4a6fa..8ba3957a2e3c 100644 --- a/devel/fpc-fv/pkg-plist +++ b/devel/fpc-fv/pkg-plist @@ -68,13 +68,13 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpviews.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpsysmsg.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpasciitab.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptimeddlg.a -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/fv/testapp.lpi -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/fv/testapp.pas -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/fv/Makefile.fpc -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/fv/Makefile +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/testapp.lpi +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/testapp.pas +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/Makefile.fpc +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/Makefile @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv @dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%% @dirrmtry lib/fpc -%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/fv -%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%% +%%PORTEXAMPLES%%@dirrm share/examples/fpc-%%PORTVERSION%%/fv +%%PORTEXAMPLES%%@dirrmtry share/examples/fpc-%%PORTVERSION%% diff --git a/devel/fpc-gdbint/Makefile b/devel/fpc-gdbint/Makefile index 88d6f537efa9..e974fd742568 100644 --- a/devel/fpc-gdbint/Makefile +++ b/devel/fpc-gdbint/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-newt/Makefile b/devel/fpc-newt/Makefile index 75549dd9e907..e7792ce4f6ba 100644 --- a/devel/fpc-newt/Makefile +++ b/devel/fpc-newt/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= NEWT NEWT_DESC= Install newt library OPTIONS_DEFAULT= NEWT -NO_STAGE= yes +NEWT_LIB_DEPENDS= libnewt.so:${PORTSDIR}/devel/newt + .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-pthreads/Makefile b/devel/fpc-pthreads/Makefile index 08b2b4ded9b0..8cadc4e5f712 100644 --- a/devel/fpc-pthreads/Makefile +++ b/devel/fpc-pthreads/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-regexpr/Makefile b/devel/fpc-regexpr/Makefile index 205726503dae..8aa66968974b 100644 --- a/devel/fpc-regexpr/Makefile +++ b/devel/fpc-regexpr/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-sdl/Makefile b/devel/fpc-sdl/Makefile index 685db31c3f04..b05c32ced2b8 100644 --- a/devel/fpc-sdl/Makefile +++ b/devel/fpc-sdl/Makefile @@ -12,11 +12,12 @@ USE_FPC= pthreads x11 MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= SDL SDL_DESC= Install SDL library OPTIONS_DEFAULT= SDL -NO_STAGE= yes +SDL_USE= SDL=sdl,image,mixer,ttf,gfx + .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-symbolic/Makefile b/devel/fpc-symbolic/Makefile index a489c7e57ac8..4776161cbaf5 100644 --- a/devel/fpc-symbolic/Makefile +++ b/devel/fpc-symbolic/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/devel/fpc-zlib/Makefile b/devel/fpc-zlib/Makefile index e61c9c366899..d5c9b62815e5 100644 --- a/devel/fpc-zlib/Makefile +++ b/devel/fpc-zlib/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile index 39a9c2aef6ee..1c5ec767d0c8 100644 --- a/editors/fpc-ide/Makefile +++ b/editors/fpc-ide/Makefile @@ -11,10 +11,10 @@ COMMENT= Free Pascal integrated IDE/compiler USE_FPC= chm fcl-async fcl-base fv gdbint graph ibase hash mysql odbc \ oracle pasjpeg paszlib pthreads postgres regexpr sqlite +FPCDIR= # none UNITPREFIX= # none MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/fv +EXTRACTUNITDIR= ${WRKUNITDIR} ${FPCSRCDIR}/compiler ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/fv -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile index 6d5385966309..91f553c31e8e 100644 --- a/ftp/fpc-libcurl/Makefile +++ b/ftp/fpc-libcurl/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBCURL LIBCURL_DESC= Install curl tools and library OPTIONS_DEFAULT= LIBCURL -NO_STAGE= yes +LIBCURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile index fe573879bf45..a9c7eea3d195 100644 --- a/graphics/fpc-cairo/Makefile +++ b/graphics/fpc-cairo/Makefile @@ -13,11 +13,12 @@ USE_FPC= fcl-async fcl-base fcl-image hash pasjpeg paszlib pthreads \ MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBCAIRO LIBCAIRO_DESC= Install cairo vector graphics library OPTIONS_DEFAULT= LIBCAIRO -NO_STAGE= yes +LIBCAIRO_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-fpgtk/Makefile b/graphics/fpc-fpgtk/Makefile index 85bff15938f0..1eb69fe71fbb 100644 --- a/graphics/fpc-fpgtk/Makefile +++ b/graphics/fpc-fpgtk/Makefile @@ -12,11 +12,12 @@ USE_FPC= fcl-base gtk1 x11 opengl MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= GTK1 GTK1_DESC= Gimp Toolkit for X11 GUI (version 1.x) OPTIONS_DEFAULT= GTK1 -NO_STAGE= yes +GTK1_USE= GNOME=gtk12 + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-ggi/Makefile b/graphics/fpc-ggi/Makefile index 982d87405121..5fe7fd6238fc 100644 --- a/graphics/fpc-ggi/Makefile +++ b/graphics/fpc-ggi/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBGGI LIBGGI_DESC= Install ggi library OPTIONS_DEFAULT= LIBGGI -NO_STAGE= yes +LIBGGI_LIB_DEPENDS= libggi.so:${PORTSDIR}/graphics/libggi + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-graph/Makefile b/graphics/fpc-graph/Makefile index 51ec46a90e49..39ee681fc34d 100644 --- a/graphics/fpc-graph/Makefile +++ b/graphics/fpc-graph/Makefile @@ -12,7 +12,6 @@ USE_FPC= x11 sdl pthreads MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-hermes/Makefile b/graphics/fpc-hermes/Makefile index d219343b2775..0d1fefc89f6a 100644 --- a/graphics/fpc-hermes/Makefile +++ b/graphics/fpc-hermes/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= HERMES HERMES_DESC= Install hermes graphics library OPTIONS_DEFAULT= HERMES -NO_STAGE= yes +HERMES_LIB_DEPENDS= libHermes.so:${PORTSDIR}/graphics/Hermes + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index df0055af0bd2..96261decb2af 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= IMAGEMAGICK IMAGEMAGICK_DESC= Install ImageMagick image proccesing tool OPTIONS_DEFAULT= IMAGEMAGICK -NO_STAGE= yes +IMAGEMAGICK_LIB_DEPENDS= libMagick++.so:${PORTSDIR}/graphics/ImageMagick + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-imlib/Makefile b/graphics/fpc-imlib/Makefile index eaab0aa9b8b3..1621831cb06e 100644 --- a/graphics/fpc-imlib/Makefile +++ b/graphics/fpc-imlib/Makefile @@ -12,11 +12,12 @@ USE_FPC= gtk1 x11 opengl MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= IMLIB2 IMLIB2_DESC= Install imlib graphic library OPTIONS_DEFAULT= IMLIB2 -NO_STAGE= yes +IMLIB2_USE= EFL=imlib2 + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile index 802e13916ece..0998886696dd 100644 --- a/graphics/fpc-libgd/Makefile +++ b/graphics/fpc-libgd/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBGD LIBGD_DESC= Install gd graphic library OPTIONS_DEFAULT= LIBGD -NO_STAGE= yes +LIBGD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile index 89b981ce3fa2..1715871cf9ad 100644 --- a/graphics/fpc-libpng/Makefile +++ b/graphics/fpc-libpng/Makefile @@ -12,11 +12,12 @@ USE_FPC= zlib MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBPNG LIBPNG_DESC= Install png library for manipulating PNG images OPTIONS_DEFAULT= LIBPNG -NO_STAGE= yes +LIBPNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-ncurses/Makefile b/graphics/fpc-ncurses/Makefile index fa7d4dac697a..9090e19439c6 100644 --- a/graphics/fpc-ncurses/Makefile +++ b/graphics/fpc-ncurses/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile index e933753dac47..b3b566c2a137 100644 --- a/graphics/fpc-opengl/Makefile +++ b/graphics/fpc-opengl/Makefile @@ -12,11 +12,13 @@ USE_FPC= x11 MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -OPTIONS_DEFINE= OPENGL +OPTIONS_DEFINE= EXAMPLES OPENGL OPENGL_DESC= Install opengl libraries OPTIONS_DEFAULT= OPENGL -NO_STAGE= yes +OPENGL_USE= GL=glut +HAVE_EXAMPLES= yes + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-opengl/pkg-plist b/graphics/fpc-opengl/pkg-plist index 3514335e8c40..7e249adeb062 100644 --- a/graphics/fpc-opengl/pkg-plist +++ b/graphics/fpc-opengl/pkg-plist @@ -17,19 +17,19 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglext.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglu.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglut.a lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglx.a -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/radblur.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/morph3d.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemo.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemova.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/glxtest.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/freeglutdemo.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/bounce.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/Makefile.fpc -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/opengl/Makefile +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/radblur.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/morph3d.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemo.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemova.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/glxtest.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/freeglutdemo.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/bounce.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/Makefile.fpc +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/Makefile @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%% @dirrmtry lib/fpc -%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/opengl -%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%% +%%PORTEXAMPLES%%@dirrm share/examples/fpc-%%PORTVERSION%%/opengl +%%PORTEXAMPLES%%@dirrmtry share/examples/fpc-%%PORTVERSION%% diff --git a/graphics/fpc-pasjpeg/Makefile b/graphics/fpc-pasjpeg/Makefile index 9301224663cf..4a32bd6731a1 100644 --- a/graphics/fpc-pasjpeg/Makefile +++ b/graphics/fpc-pasjpeg/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-proj4/Makefile b/graphics/fpc-proj4/Makefile index ec6c77df1f7b..a6dd2d3cff78 100644 --- a/graphics/fpc-proj4/Makefile +++ b/graphics/fpc-proj4/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= PROJ PROJ_DESC= Install proj library OPTIONS_DEFAULT= PROJ -NO_STAGE= yes +PROJ_LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile index 663a87d99ef7..5acaf9945b5f 100644 --- a/graphics/fpc-rsvg/Makefile +++ b/graphics/fpc-rsvg/Makefile @@ -12,11 +12,12 @@ USE_FPC= gtk2 MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//:S/^/lib/} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBRSVG2 LIBRSVG2_DESC= Install librsvg2 library OPTIONS_DEFAULT= LIBRSVG2 -NO_STAGE= yes +LIBRSVG2_LIB_DEPENDS= librsvg-2.so:${PORTSDIR}/graphics/librsvg2 + .include "${MASTERDIR}/Makefile" diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile index b842f552427c..000b1e57617e 100644 --- a/graphics/fpc-svgalib/Makefile +++ b/graphics/fpc-svgalib/Makefile @@ -12,10 +12,11 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= SVGA SVGA_DESC= Install svgalib low level console graphics library -NO_STAGE= yes +SVGA_LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib + .include "${MASTERDIR}/Makefile" diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile index 725dfbb07d83..4048664a8bde 100644 --- a/lang/fpc-base/Makefile +++ b/lang/fpc-base/Makefile @@ -13,14 +13,12 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Meta package to install all of the Free Pascal base WANT_FPC_BASE= yes - -.if !defined(NOPORTDOCS) -RUN_DEPENDS+= ${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:${PORTSDIR}/lang/fpc-docs -.endif - NO_BUILD= yes +NO_INSTALL= yes +NO_MTREE= yes -do-install: # empty +OPTIONS_DEFINE= DOCS + +DOCS_RUN_DEPENDS= ${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:${PORTSDIR}/lang/fpc-docs -NO_STAGE= yes .include diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile index 0c992d0b1f88..de5aca330824 100644 --- a/lang/fpc-docs/Makefile +++ b/lang/fpc-docs/Makefile @@ -24,13 +24,8 @@ DOCSDIR= ${PREFIX}/share/doc/fpdocs-${PORTVERSION} PORTDOCS= chart.pdf fcl.pdf fpdoc.pdf prog.pdf ref.pdf rtl.pdf user.pdf SUB_FILES= pkg-message -NO_STAGE= yes do-install: - @${MKDIR} ${DOCSDIR} - @cd ${WRKDIR}/doc && \ - ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \; - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include diff --git a/lang/fpc-lua/Makefile b/lang/fpc-lua/Makefile index 88f3b0a9a434..776b2bbb49bc 100644 --- a/lang/fpc-lua/Makefile +++ b/lang/fpc-lua/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LUA LUA_DESC= Install lua library OPTIONS_DEFAULT= LUA -NO_STAGE= yes +LUA_LIB_DEPENDS= liblua-5.1.so:${PORTSDIR}/lang/lua + .include "${MASTERDIR}/Makefile" diff --git a/lang/fpc-rexx/Makefile b/lang/fpc-rexx/Makefile index 4187e3a9463b..66e8782e64f4 100644 --- a/lang/fpc-rexx/Makefile +++ b/lang/fpc-rexx/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= REXX_REGINA REXX_REGINA_DESC= Install rexx-regina library OPTIONS_DEFAULT= REXX_REGINA -NO_STAGE= yes +REXX_REGINA_RUN_DEPENDS= rexx:${PORTSDIR}/lang/rexx-regina + .include "${MASTERDIR}/Makefile" diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile index 97d1e7174b26..5f8782a7ba21 100644 --- a/lang/fpc-tcl/Makefile +++ b/lang/fpc-tcl/Makefile @@ -12,11 +12,12 @@ USE_FPC= fcl-base MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= TCL TCL_DESC= Install tool commnad language OPTIONS_DEFAULT= TCL -NO_STAGE= yes +TCL_USES= tk:84,run + .include "${MASTERDIR}/Makefile" diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile index 95f648e37e33..c06b7be1d033 100644 --- a/lang/fpc-units/Makefile +++ b/lang/fpc-units/Makefile @@ -15,6 +15,8 @@ COMMENT= A meta port to install Free Pascal units ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes +NO_INSTALL= yes +NO_MTREE= yes BUILDNAME= ${ARCH}-freebsd @@ -105,7 +107,6 @@ ZLIB_DESC= Interface to the zlib compression library LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} -NO_STAGE= yes .include OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \ @@ -125,7 +126,4 @@ UNITS_SELECTED+= ${OPT:L} .endfor USE_FPC= ${UNITS_SELECTED} -do-install: build - @${DO_NADA} - .include diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile index cace52f05be0..8cf251ab6650 100644 --- a/lang/fpc-utils/Makefile +++ b/lang/fpc-utils/Makefile @@ -12,7 +12,7 @@ USE_FPC= chm fcl-base fcl-net fcl-process fcl-res fppkg libcurl MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} +OPT= -Fu../fcl/* -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 22dcd3f62a43..fe4479c6bccf 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -32,7 +32,6 @@ OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPT?=-CX FPCSRCDIR= ${PORTNAME}-${PORTVERSION} -NO_STAGE= yes .include .if ${ARCH} == "i386" @@ -48,6 +47,7 @@ PLIST_SUB= FPC_I386="@comment " \ .endif .if !defined(PKGNAMESUFFIX) +NO_STAGE= yes SUB_FILES= pkg-message BUILDNAME= ${FPC_ARCH}-freebsd diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index d4451d81df00..17a0e742f926 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -7,341 +7,30 @@ PLIST= ${.CURDIR}/pkg-plist PATCHDIR= ${.CURDIR}/files FILESDIR= ${.CURDIR}/files WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +BUILD_WRKSRC= ${WRKDIR}/${WRKUNITDIR} +INSTALL_WRKSRC= ${WRKDIR}/${WRKUNITDIR} -FPCDIR= ${LOCALBASE}/lib/${PORTNAME}/${PORTVERSION} +FPCDIR?= ${LOCALBASE}/lib/${PORTNAME}/${PORTVERSION} UNITPREFIX= unit- UNITEXTRACT_SUFX= .tar.gz UNITNAME= ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX} UNITDIR= lib/fpc/${PORTVERSION}/units/${BUILDNAME} EXTRACT_AFTER_ARGS= ${EXTRACTUNITDIR} -OPT=-Ur -CX +OPT+= -Ur -CX -MAKE_ENV+= PP=${LOCALBASE}/bin/${PPNAME} \ +MAKE_ARGS= PP=${LOCALBASE}/bin/${PPNAME} \ FPCDIR=${FPCDIR} \ FPCMAKE=${LOCALBASE}/bin/fpcmake \ FPCTARGET=${BUILDNAME} \ ARCH=${FPC_ARCH} \ OPT="${OPT}" \ - BSDHIER=1 + BSDHIER=1 \ + INSTALL_PREFIX=${STAGEDIR}${PREFIX} +MAKE_ENV+= FPCDIR=${UNITDIR} -.if ${PKGNAMESUFFIX} == "-a52" -. if defined(WITH_LIBA52) -LIB_DEPENDS= a52:${PORTSDIR}/audio/liba52 -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-bfd" -. if defined(WITH_LIBBFD) -RUN_DEPENDS= ${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-cairo" -. if defined(WITH_LIBCAIRO) -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-dbus" -. if defined(WITH_DBUS) -LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-dts" -. if defined(WITH_LIBDCA) -LIB_DEPENDS= dca:${PORTSDIR}/multimedia/libdca -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-fcl-db" -OPT+= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \ - -Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME} \ - -Fu../sqldb/* -.endif - -.if ${PKGNAMESUFFIX} == "-fcl-net" -OPT+= -Fu${WRKDIR}/${WRKUNITDIR}/* -.endif - -.if ${PKGNAMESUFFIX} == "-fcl-web" -OPT+= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \ - -Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME} -.endif - -.if ${PKGNAMESUFFIX} == "-fftw" -. if defined(WITH_FFTW) -LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-fpgtk" -. if defined(WITH_GTK1) -.include <${PORTSDIR}/Mk/bsd.gnome.mk> -USE_GNOME= gtk12 -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-fv" -HAVE_EXAMPLES= true -.endif - -.if ${PKGNAMESUFFIX} == "-gdbm" -. if defined(WITH_GDBM) -LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-ggi" -. if defined(WITH_LIBGGI) -LIB_DEPENDS= ggi:${PORTSDIR}/graphics/libggi -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-gmp" -. if defined(WITH_GMP) -LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-gtk1" -. if defined(WITH_GTK1) -.include <${PORTSDIR}/Mk/bsd.gnome.mk> -USE_GNOME= gtk12 -. endif -OPT+=-Fu${WRKDIR}/${WRKUNITDIR}/* -.endif - -.if ${PKGNAMESUFFIX} == "-gtk2" -. if defined(WITH_GTK2) -.include <${PORTSDIR}/Mk/bsd.gnome.mk> -USE_GNOME= gtk20 -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-hermes" -. if defined(WITH_HERMES) -LIB_DEPENDS= Hermes:${PORTSDIR}/graphics/Hermes -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-httpd22" -. if defined(WITH_APACHE22) -USE_APACHE= 22 -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-ibase" -. if defined(WITH_IBASE) -USE_FIREBIRD= yes -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-iconvenc" -# added to main port to make it compile on 10 with iconv in libc -# USES+=iconv -.endif - -.if ${PKGNAMESUFFIX} == "-ide" -FPCDIR= # -.endif - -.if ${PKGNAMESUFFIX} == "-imagemagick" -. if defined(WITH_IMAGEMAGICK) -LIB_DEPENDS= Magick:${PORTSDIR}/graphics/ImageMagick -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-imlib" -. if defined(WITH_IMLIB) -.include <${PORTSDIR}/Mk/bsd.efl.mk> -USE_EFL= imlib2 -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-ldap" -. if defined(WITH_OPENLDAP) -USE_OPENLDAP= yes -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-libcurl" -. if defined(WITH_LIBCURL) -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-libgd" -. if defined(WITH_LIBGD) -LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-libpng" -. if defined(WITH_LIBPNG) -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-libxml2" -. if defined(WITH_LIBXML2) -LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-lua" -. if defined(WITH_LUA) -LIB_DEPENDS= lua-5.1:${PORTSDIR}/lang/lua -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-mad" -.if defined(WITH_LIBMAD) -LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-matroska" -. if defined(WITH_LIBMATROSKA) -LIB_DEPENDS= matroska:${PORTSDIR}/multimedia/libmatroska -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-modplug" -. if defined(WITH_LIBMODPLUG) -LIB_DEPENDS= modplug:${PORTSDIR}/audio/libmodplug -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-mysql" -.if defined(WITH_MYSQL) -USE_MYSQL= yes -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-newt" -. if defined(WITH_NEWT) -LIB_DEPENDS= newt:${PORTSDIR}/devel/newt -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-odbc" -. if defined(WITH_ODBC) -LIB_DEPENDS= odbc.2:${PORTSDIR}/databases/unixODBC -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-oggvorbis" -. if defined(WITH_LIBOGG) -LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg -. endif -. if defined(WITH_LIBVORBIS) -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-opengl" -. if defined(WITH_OPENGL) -USE_GL= glut -. endif -HAVE_EXAMPLES= true -.endif - -.if ${PKGNAMESUFFIX} == "-openssl" -. if defined(WITH_OPENSSL) -USE_OPENSSL= yes -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-oracle" -. if defined(WITH_ORACLE) -ORACLE8_LIB= ${LOCALBASE}/oracle8-client/rdbms/lib -RUN_DEPENDS= ${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-pcap" -. if defined(WITH_LIBPCAP) -LIB_DEPENDS= pcap:${PORTSDIR}/net/libpcap -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-postgres" -. if defined(WITH_PGSQL) -USE_PGSQL= yes -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-proj4" -. if defined(WITH_PROJ) -LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-rexx" -. if defined(WITH_REXX_REGINA) -RUN_DEPENDS= rexx:${PORTSDIR}/lang/rexx-regina -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-rsvg" -. if defined(WITH_LIBRSVG2) -LIB_DEPENDS= rsvg-2:${PORTSDIR}/graphics/librsvg2 -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-sdl" -. if defined(WITH_SDL) -USE_SDL= sdl image mixer ttf gfx -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-sndfile" -. if defined(WITH_LIBSNDFILE) -LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-sqlite" -. if defined(WITH_SQLITE) -USE_SQLITE= yes -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-svgalib" -. if defined(WITH_SVGA) -LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-tcl" -. if defined(WITH_TCL) -RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-unzip" -. if defined(WITH_UNZIP) -RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-utils" -OPT+=-Fu../fcl/* -.endif - -.if ${PKGNAMESUFFIX} == "-x11" -. if defined(WITH_X11) -USE_XORG= xcursor xfont xxf86dga xxf86vm xi xinerama xkbfile xrandr xrender xres xv -. endif -.endif - -.if ${PKGNAMESUFFIX} == "-xforms" -. if defined(WITH_XFORMS) -LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms -. endif -HAVE_EXAMPLES= true +.if ${PORT_OPTIONS:MEXAMPLES} && defined(HAVE_EXAMPLES) +LATE_INSTALL_ARGS= fpc_exampleinstall .endif post-extract: @@ -363,16 +52,3 @@ post-patch: @${REINPLACE_CMD} -e 's|$$(INSTALL) Package.fpc $$(INSTALL_UNITDIR)||g' \ ${WRKDIR}/${WRKUNITDIR}/fppkg/Makefile .endif - -do-build: - @${ECHO_CMD} ${MAKE_ENV} - @${ECHO_CMD} "" - @cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} all ${MAKE_ENV} - -do-install: - @cd ${WRKDIR}/${WRKUNITDIR} && FPCDIR=${UNITDIR} ${GMAKE} install ${MAKE_ENV} -. if !defined(NOPORTDOCS) -. if defined(HAVE_EXAMPLES) - @cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} fpc_exampleinstall -. endif -. endif diff --git a/math/fpc-fftw/Makefile b/math/fpc-fftw/Makefile index a730c9639174..c1544305b244 100644 --- a/math/fpc-fftw/Makefile +++ b/math/fpc-fftw/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= FFTW3 FFTW3_DESC= Install FFTW3 library OPTIONS_DEFAULT= FFTW3 -NO_STAGE= yes +FFTW3_LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 + .include "${MASTERDIR}/Makefile" diff --git a/math/fpc-gmp/Makefile b/math/fpc-gmp/Makefile index 058efaac9e21..3c9c7b0ecdf1 100644 --- a/math/fpc-gmp/Makefile +++ b/math/fpc-gmp/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= GMP GMP_DESC= Install gmp library OPTIONS_DEFAULT= GMP -NO_STAGE= yes +GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp + .include "${MASTERDIR}/Makefile" diff --git a/math/fpc-numlib/Makefile b/math/fpc-numlib/Makefile index 9c33c2f67da0..5722ea03b4bb 100644 --- a/math/fpc-numlib/Makefile +++ b/math/fpc-numlib/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/misc/fpc-chm/Makefile b/misc/fpc-chm/Makefile index 0e9e8983a168..8bf5fb1b981c 100644 --- a/misc/fpc-chm/Makefile +++ b/misc/fpc-chm/Makefile @@ -12,7 +12,6 @@ USE_FPC= fcl-xml MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/multimedia/fpc-dts/Makefile b/multimedia/fpc-dts/Makefile index e9c186a685f2..a254b5fbb88f 100644 --- a/multimedia/fpc-dts/Makefile +++ b/multimedia/fpc-dts/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBDCA LIBDCA_DESC= Install dts library OPTIONS_DEFAULT= LIBDCA -NO_STAGE= yes +LIBDCA_LIB_DEPENDS= libdca.so:${PORTSDIR}/multimedia/libdca + .include "${MASTERDIR}/Makefile" diff --git a/multimedia/fpc-matroska/Makefile b/multimedia/fpc-matroska/Makefile index bb50710e9e46..0b63bb77de73 100644 --- a/multimedia/fpc-matroska/Makefile +++ b/multimedia/fpc-matroska/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBMATROSKA LIBMATROSKA_DESC= Install matroska library OPTIONS_DEFAULT= LIBMATROSKA -NO_STAGE= yes +LIBMATROSKA_LIB_DEPENDS= libmatroska.so:${PORTSDIR}/multimedia/libmatroska + .include "${MASTERDIR}/Makefile" diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile index ef1482a4d990..9061a7c11fd9 100644 --- a/net/fpc-ldap/Makefile +++ b/net/fpc-ldap/Makefile @@ -12,11 +12,12 @@ USE_FPC= hash MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= OPENLDAP OPENLDAP_DESC= Install OpenLDAP libraries OPTIONS_DEFAULT= OPENLDAP -NO_STAGE= yes +OPENLDAP_USE= OPENLDAP=yes + .include "${MASTERDIR}/Makefile" diff --git a/net/fpc-pcap/Makefile b/net/fpc-pcap/Makefile index 682850307ab6..4bb6c1d0aba2 100644 --- a/net/fpc-pcap/Makefile +++ b/net/fpc-pcap/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBPCAP LIBPCAP_DESC= Install ubiquitous network traffic capture library OPTIONS_DEFAULT= LIBPCAP -NO_STAGE= yes +LIBPCAP_LIB_DEPENDS= libpcap.so:${PORTSDIR}/net/libpcap + .include "${MASTERDIR}/Makefile" diff --git a/security/fpc-hash/Makefile b/security/fpc-hash/Makefile index f526f38e662e..dadc378fa06c 100644 --- a/security/fpc-hash/Makefile +++ b/security/fpc-hash/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/security/fpc-openssl/Makefile b/security/fpc-openssl/Makefile index 7f12e9400454..3b9f5bf80ee1 100644 --- a/security/fpc-openssl/Makefile +++ b/security/fpc-openssl/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= OPENSSL OPENSSL_DESC= Install SSL and crypto library OPTIONS_DEFAULT= OPENSSL -NO_STAGE= yes +OPENSSL_USE= OPENSSL=yes + .include "${MASTERDIR}/Makefile" diff --git a/sysutils/fpc-syslog/Makefile b/sysutils/fpc-syslog/Makefile index f7dfca8cfde6..e01956f672ed 100644 --- a/sysutils/fpc-syslog/Makefile +++ b/sysutils/fpc-syslog/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/sysutils/fpc-users/Makefile b/sysutils/fpc-users/Makefile index c9ea655f93eb..732129c8b1f9 100644 --- a/sysutils/fpc-users/Makefile +++ b/sysutils/fpc-users/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/sysutils/fpc-utmp/Makefile b/sysutils/fpc-utmp/Makefile index b5671f42cc6a..0c6c9f9f8ca1 100644 --- a/sysutils/fpc-utmp/Makefile +++ b/sysutils/fpc-utmp/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/sysutils/fpc-uuid/Makefile b/sysutils/fpc-uuid/Makefile index 29aef38b84f7..572de1a5c4f8 100644 --- a/sysutils/fpc-uuid/Makefile +++ b/sysutils/fpc-uuid/Makefile @@ -12,7 +12,6 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/textproc/fpc-aspell/Makefile b/textproc/fpc-aspell/Makefile index af7425d36f5d..7d94875031ef 100644 --- a/textproc/fpc-aspell/Makefile +++ b/textproc/fpc-aspell/Makefile @@ -12,7 +12,7 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= ASPELL OPTIONS_DEFAULT= ASPELL diff --git a/textproc/fpc-libxml2/Makefile b/textproc/fpc-libxml2/Makefile index a2d22277f403..88ccb08cbfaa 100644 --- a/textproc/fpc-libxml2/Makefile +++ b/textproc/fpc-libxml2/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//:S/2//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= LIBXML2 LIBXML2_DESC= Install xml2 library OPTIONS_DEFAULT= LIBXML2 -NO_STAGE= yes +LIBXML2_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 + .include "${MASTERDIR}/Makefile" diff --git a/www/fpc-fastcgi/Makefile b/www/fpc-fastcgi/Makefile index f4d401d8bccf..3637679e240d 100644 --- a/www/fpc-fastcgi/Makefile +++ b/www/fpc-fastcgi/Makefile @@ -12,7 +12,6 @@ USE_FPC= fpmkunit MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/www/fpc-httpd22/Makefile b/www/fpc-httpd22/Makefile index 6fcd8402de57..7aa0f5b2d936 100644 --- a/www/fpc-httpd22/Makefile +++ b/www/fpc-httpd22/Makefile @@ -12,10 +12,11 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= APACHE22 APACHE22_DESC= Install apache22 server -NO_STAGE= yes +APACHE22_USE= APACHE=22 + .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/fpc-gnome1/Makefile b/x11-toolkits/fpc-gnome1/Makefile index bc44f77cc326..792010b1bb15 100644 --- a/x11-toolkits/fpc-gnome1/Makefile +++ b/x11-toolkits/fpc-gnome1/Makefile @@ -12,7 +12,6 @@ USE_FPC= gtk1 imlib opengl x11 MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/fpc-gtk1/Makefile b/x11-toolkits/fpc-gtk1/Makefile index 426da2d59893..54389a5e7726 100644 --- a/x11-toolkits/fpc-gtk1/Makefile +++ b/x11-toolkits/fpc-gtk1/Makefile @@ -12,11 +12,13 @@ USE_FPC= x11 opengl MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} +OPT= -Fu${WRKDIR}/${WRKUNITDIR}/* OPTIONS_DEFINE= GTK1 GTK1_DESC= Gimp Toolkit for X11 GUI (version 1.x) OPTIONS_DEFAULT= GTK1 -NO_STAGE= yes +GTK1_USE= GNOME=gtk12 + .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile index cb84108cca6d..7cf8f1f0bbce 100644 --- a/x11-toolkits/fpc-gtk2/Makefile +++ b/x11-toolkits/fpc-gtk2/Makefile @@ -12,11 +12,12 @@ USE_FPC= cairo x11 MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= GTK2 GTK2_DESC= Gimp Toolkit for X11 GUI (version 2.x) OPTIONS_DEFAULT= GTK2 -NO_STAGE= yes +GTK2_USE= GNOME=gtk20 + .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile index aff788c28fcc..eee5bd67e919 100644 --- a/x11-toolkits/fpc-xforms/Makefile +++ b/x11-toolkits/fpc-xforms/Makefile @@ -12,11 +12,13 @@ USE_FPC= x11 MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} -OPTIONS_DEFINE= XFORMS +OPTIONS_DEFINE= EXAMPLES XFORMS XFORMS_DESC= Install xforms graphical user interface toolkit OPTIONS_DEFAULT= XFORMS -NO_STAGE= yes +XFORMS_LIB_DEPENDS= libforms.so:${PORTSDIR}/x11-toolkits/xforms +HAVE_EXAMPLES= yes + .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/fpc-xforms/pkg-plist b/x11-toolkits/fpc-xforms/pkg-plist index 57e0c65679c9..521feb353368 100644 --- a/x11-toolkits/fpc-xforms/pkg-plist +++ b/x11-toolkits/fpc-xforms/pkg-plist @@ -3,67 +3,67 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/Package.fpc lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/libpxforms.a -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/xyplotover.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/touchbutton.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/srs.xbm -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/sliderall.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/secretinput.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/pushme.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/pushbutton.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/pup.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/positioner.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/porsche.xpm -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/objreturn.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/objpos.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/objinactive.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/nomail.xbm -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/newbutton.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/ndial.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/multilabel.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/minput.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/menu.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/longlabel.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/ll.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/ldial.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/lalign.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/invslider.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/inputall.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/iconify.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/group.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/goodies.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/free1.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/fonts.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/flclock.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/fdial.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse1.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/cursor.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/crab45.xpm -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/crab.xpm -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/counter.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel1.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/colbrowser.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/choice.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/chartstrip.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/chartall.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/canvas.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/butttypes.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/buttonall.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/browserop.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/browserall.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/boxtype.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/borderwidth.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/bm2.xbm -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/bm1.xbm -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/arrowbutton.pp -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile.fpc -%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/xforms/yesno.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/xyplotover.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/touchbutton.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/srs.xbm +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/sliderall.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/secretinput.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pushme.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pushbutton.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pup.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/positioner.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/porsche.xpm +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objreturn.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objpos.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objinactive.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/nomail.xbm +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/newbutton.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ndial.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/multilabel.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/minput.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/menu.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/longlabel.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ll.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ldial.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/lalign.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/invslider.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/inputall.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/iconify.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/group.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/goodies.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/free1.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fonts.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/flclock.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fdial.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse1.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/cursor.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/crab45.xpm +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/crab.xpm +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/counter.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel1.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colbrowser.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/choice.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/chartstrip.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/chartall.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/canvas.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/butttypes.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/buttonall.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/browserop.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/browserall.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/boxtype.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/borderwidth.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/bm2.xbm +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/bm1.xbm +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/arrowbutton.pp +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile.fpc +%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/yesno.pp @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% @dirrmtry lib/fpc/%%PORTVERSION%%/units @dirrmtry lib/fpc/%%PORTVERSION%% @dirrmtry lib/fpc -%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/xforms -%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%% +%%PORTEXAMPLES%%@dirrm share/examples/fpc-%%PORTVERSION%%/xforms +%%PORTEXAMPLES%%@dirrmtry share/examples/fpc-%%PORTVERSION%% diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile index 97a6d3b29eee..872b2cbebd86 100644 --- a/x11/fpc-x11/Makefile +++ b/x11/fpc-x11/Makefile @@ -12,11 +12,12 @@ USE_FPC= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR+= ${WRKUNITDIR} +EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= X11 X11_DESC= Install X libraries OPTIONS_DEFAULT= X11 -NO_STAGE= yes +X11_USE= XORG=xcursor,xfont,xxf86dga,xxf86vm,xi,xinerama,xkbfile,xrandr,xrender,xres,xv + .include "${MASTERDIR}/Makefile"