diff options
80 files changed, 104 insertions, 163 deletions
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 47d23d3f3bca..178f46cb95ea 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -26,9 +26,8 @@ NLS_USES= gettext NLS_LIBS= -lintl PORTDOCS= * -USES= alias gmake libarchive libtool lua:51 pathfix pkgconfig \ +USES= alias bdb gmake libarchive libtool lua:51 pathfix pkgconfig \ shebangfix tar:bzip2 -USE_BDB= 46+ INVALID_BDB_VER=51 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 7b30b2770dee..24c434f89497 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -21,8 +21,7 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \ GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= gmake pathfix pkgconfig libtool -USE_BDB= 48+ +USES= gmake pathfix pkgconfig libtool bdb CONFIGURE_ARGS= --disable-portaudio \ --with-default-tmpdir=/tmp diff --git a/audio/moc/Makefile b/audio/moc/Makefile index 9238e4d9c7cc..cd0c5447e6bf 100644 --- a/audio/moc/Makefile +++ b/audio/moc/Makefile @@ -14,10 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libltdl.so:devel/libltdl -USES= gmake libtool ncurses pkgconfig tar:bzip2 +USES= bdb gmake libtool ncurses pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_BDB= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile index beef7d43278f..237cc9e6701c 100644 --- a/chinese/libpinyin/Makefile +++ b/chinese/libpinyin/Makefile @@ -11,9 +11,8 @@ COMMENT= Library to deal with pinyin LICENSE= GPLv2 -USE_BDB= yes USE_GNOME= glib20 -USES= gettext gmake libtool pathfix pkgconfig +USES= bdb gettext gmake libtool pathfix pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile index 2612e165cda8..aa13d94124b4 100644 --- a/chinese/libtabe/Makefile +++ b/chinese/libtabe/Makefile @@ -14,10 +14,9 @@ COMMENT= Unified library for Chinese text processing LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake libtool +USES= bdb gmake libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_BDB= yes OBSOLETE_BDB_VAR= USE_DB2 DATADIR= ${PREFIX}/share/tabe DOCSDIR= ${PREFIX}/share/doc/tabe diff --git a/chinese/p5-Lingua-ZH-TaBE/Makefile b/chinese/p5-Lingua-ZH-TaBE/Makefile index c37d03c7e001..1eaf6b1977cc 100644 --- a/chinese/p5-Lingua-ZH-TaBE/Makefile +++ b/chinese/p5-Lingua-ZH-TaBE/Makefile @@ -13,10 +13,9 @@ COMMENT= Chinese processing via libtabe LIB_DEPENDS= libtabe.so:chinese/libtabe -USES= perl5 +USES= bdb perl5 USE_PERL5= configure -USE_BDB= yes OBSOLETE_BDB_VAR= WITH_DB CONFIGURE_ARGS= DB="${BDB_LIB_NAME}" diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile index 512b2ef47a62..66bcec9a46ec 100644 --- a/comms/trustedqsl/Makefile +++ b/comms/trustedqsl/Makefile @@ -18,15 +18,12 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 -USE_BDB= 5+ - PKGMESSAGE= ${WRKDIR}/pkg-message -USES= cmake compiler:c++11-lib pkgconfig +USES= bdb:5+ cmake compiler:c++11-lib pkgconfig ssl CMAKE_ARGS= -DBDB_PREFIX=${LOCALBASE} USE_WX= 2.8+ USE_LDCONFIG= yes -USE_OPENSSL= yes OPTIONS_DEFINE= GEN_CRQ LOAD_CERT STATION_LOC CONVERTER GEN_CRQ_DESC= Build gen_crq diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 2cd2b07fad49..f4310c4db39d 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -67,7 +67,7 @@ RTREE_CONFIGURE_WITH= rtree ERRORPOP_CONFIGURE_WITH= errorpopups -BDB_USE= BDB=41+ +BDB_USES= bdb BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR} OPTCFLAGS_CFLAGS= -O2 -pipe diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile index 484bb1f63ef1..056129cadc97 100644 --- a/databases/dbtool/Makefile +++ b/databases/dbtool/Makefile @@ -31,7 +31,7 @@ OPTIONS_SINGLE_BACKEND= BDB GDBM OPTIONS_DEFAULT= GDBM BACKEND_DESC= Database backend -BDB_USE= bdb=yes +BDB_USES= bdb BDB_CONFIGURE_ON= --with-berkeley \ --with-bdb-include-dir=${BDB_INCLUDE_DIR} \ --with-bdb-lib-dir=${BDB_LIB_DIR} diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 90c77bc3619e..607a4c1abb86 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS= libsoup-gnome-2.4.so:devel/libsoup-gnome \ PORTSCOUT= limitw:1,even -USES= bison gettext gmake gnome gperf libtool pathfix pkgconfig \ +USES= bdb:5 bison gettext gmake gnome gperf libtool pathfix pkgconfig \ sqlite tar:xz # Unbreak mail/evolution with webkit-gtk3 on FreeBSD 8 and 9. Normally # this change would be done there, but it is not a C++ application, so it @@ -37,7 +37,6 @@ USES+= compiler:c++11-lib USE_GNOME= gtk30 intltool introspection:build libxml2 USE_OPENLDAP= yes GNU_CONFIGURE= yes -USE_BDB= 5 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static \ --with-openldap=yes \ diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile index 6b448406bfb3..787a93510e9f 100644 --- a/databases/fortytwo-bdb/Makefile +++ b/databases/fortytwo-bdb/Makefile @@ -14,13 +14,12 @@ COMMENT= Interface to Berkeley DB for GNUstep LICENSE= LGPL21 -USES= gnustep +USES= bdb gnustep USE_GNUSTEP= back build LIB_DEPENDS= libEncore.so:devel/fortytwo-encore DEFAULT_LIBVERSION= 0.1 USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -USE_BDB= 43+ WRKSRC= ${WRKDIR}/BDB-${PORTVERSION} DOCSDIR= ${GNUSTEP_PREFIX}/Local/Library/Documentation/BDB diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile index 2521e792cebc..e7fd54512d2d 100644 --- a/databases/libgda4/Makefile +++ b/databases/libgda4/Makefile @@ -86,7 +86,7 @@ USE_GNOME+= libgda4 .endif .if ${LIBGDA4_SLAVE}=="bdb" -USE_BDB= yes +USES+= bdb CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} .else CONFIGURE_ARGS+= --without-bdb @@ -100,7 +100,7 @@ CONFIGURE_ARGS+= --without-ldap .endif .if ${LIBGDA4_SLAVE}=="mysql" -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .else CONFIGURE_ARGS+= --without-mysql diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile index 9ea35a54b0fc..826e16e37a27 100644 --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -53,7 +53,7 @@ CONFIGURE_ARGS+=--without-ui .endif .if ${LIBGDA5_SLAVE}==bdb -USE_BDB= 5 +USES+= bdb:5 CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} .else CONFIGURE_ARGS+= --without-bdb @@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --without-ldap .endif .if ${LIBGDA5_SLAVE}==mysql -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .else CONFIGURE_ARGS+= --without-mysql diff --git a/databases/memcacheq/Makefile b/databases/memcacheq/Makefile index f863bab5c7e4..0faaab716bcf 100644 --- a/databases/memcacheq/Makefile +++ b/databases/memcacheq/Makefile @@ -19,8 +19,8 @@ USE_CSTD= gnu89 CFLAGS+= -I"${BDB_INCLUDE_DIR}" LDFLAGS+= -l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib" +USES= bdb:5 USE_RC_SUBR= memcacheq -USE_BDB= 5 GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-libevent=${LOCALBASE} --with-bdb=${LOCALBASE} --enable-threads diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile index ee56f1e62874..dd371ca36932 100644 --- a/databases/p5-BDB/Makefile +++ b/databases/p5-BDB/Makefile @@ -21,9 +21,8 @@ PORTSCOUT= skipv:1.801 CFLAGS+= -I${BDB_INCLUDE_DIR} LDFLAGS+= -lpthread -USE_BDB= yes USE_PERL5= configure -USES= perl5 +USES= bdb perl5 post-patch: @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|' ${WRKSRC}/Makefile.PL diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile index 18966dc0329c..3069e033b265 100644 --- a/databases/p5-BerkeleyDB/Makefile +++ b/databases/p5-BerkeleyDB/Makefile @@ -17,8 +17,7 @@ LICENSE_COMB= dual TEST_DEPENDS= p5-MLDBM>=0:databases/p5-MLDBM \ p5-Test-Pod>=1:devel/p5-Test-Pod -USES= perl5 shebangfix -USE_BDB= yes +USES= bdb perl5 shebangfix USE_PERL5= configure SHEBANG_FILES= mkconsts.pl diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile index 8d41cf5864dd..b7e69165c0ee 100644 --- a/databases/py-bsddb/Makefile +++ b/databases/py-bsddb/Makefile @@ -16,9 +16,8 @@ LICENSE= PSFL PORTSCOUT= ignore:1 -USE_BDB= 43+ USE_PYTHON= distutils autoplist -USES= python tar:xz +USES= bdb python tar:xz DIST_SUBDIR= python DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo diff --git a/databases/rdfdb/Makefile b/databases/rdfdb/Makefile index 899435f54dae..63f054af25d9 100644 --- a/databases/rdfdb/Makefile +++ b/databases/rdfdb/Makefile @@ -11,14 +11,11 @@ DISTNAME= rdfdb_src MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight RDF database -USE_BDB= 40+ -INVALID_BDB_VER=2 - USERS= rdfdb GROUPS= rdfdb WRKSRC= ${WRKDIR}/rdfdb -USES= gmake +USES= bdb gmake MAKEFILE= makefile ALL_TARGET= CFLAGS+= -Wno-return-type diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile index c2ae167caa25..dd0508f4003c 100644 --- a/databases/ruby-bdb/Makefile +++ b/databases/ruby-bdb/Makefile @@ -17,8 +17,6 @@ COMMENT= Ruby interface to Oracle Berkeley DB revision 2 or later LICENSE= RUBY -USE_BDB= yes - OPTIONS_DEFINE= DOCS EXAMPLES USE_RUBY= yes @@ -35,7 +33,7 @@ EXAMPLESDIR= ${RUBY_MODEXAMPLESDIR} PLIST_FILES= %%RUBY_SITEARCHLIBDIR%%/bdb.so PORTDOCS= * PORTEXAMPLES= * -USES= shebangfix tar:bzip2 +USES= bdb shebangfix tar:bzip2 SHEBANG_FILES= examples/record.rb \ examples/recno.rb \ examples/zeroc.rb \ diff --git a/devel/ice/Makefile b/devel/ice/Makefile index cf2767522399..ddddf774ee0e 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -17,7 +17,7 @@ SLAVE_PORT?= no .if ${SLAVE_PORT} == "no" LIB_DEPENDS= libexpat.so:textproc/expat2 \ libmcpp.so:devel/mcpp -USE_OPENSSL= yes +USES+= ssl .else LIB_VRS= ${PORTVERSION:R:S|.||g} LIB_DEPENDS+= libIce.so.${LIB_VRS}:devel/ice @@ -37,8 +37,8 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib WRKSRC= ${WRKDIR}/ice-${PORTVERSION} -USE_BDB= 5 -INVALID_BDB_VER= 40 41 42 43 44 46 47 48 6 +USES+= bdb:5 +INVALID_BDB_VER= 48 6 USE_LDCONFIG= yes BUILD_WRKSRC?= ${WRKSRC}/cpp INSTALL_WRKSRC?= ${WRKSRC}/cpp diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile index 914406f91149..b3c8bfe59092 100644 --- a/devel/librcc/Makefile +++ b/devel/librcc/Makefile @@ -35,7 +35,7 @@ BDB_DESC= Translation database support BDB_CONFIGURE_ENABLE= bdb BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} BDB_LDFLAGS= -L${BDB_LIB_DIR} -BDB_USE= BDB=41+ +BDB_USES= bdb TRANSLATE_DESC= Online translation support TRANSLATE_CONFIGURE_ENABLE= libtranslate diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 7d880f6152ab..4f65dfb7b16a 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -37,7 +37,7 @@ OPTIONS_NAME= devel_subversion OPTIONS_SUB= yes BDB_CONFIGURE_OFF= --without-berkeley-db -BDB_USE= BDB=42+ +BDB_USES= bdb MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug diff --git a/devel/subversion18/Makefile.common b/devel/subversion18/Makefile.common index 15a934075409..2873388b5610 100644 --- a/devel/subversion18/Makefile.common +++ b/devel/subversion18/Makefile.common @@ -39,7 +39,7 @@ OPTIONS_NAME= devel_subversion18 OPTIONS_SUB= yes BDB_CONFIGURE_OFF= --without-berkeley-db -BDB_USE= BDB=42+ +BDB_USES= bdb MAINTAINER_DEBUG_CFLAGS= -g MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug diff --git a/dns/dnshistory/Makefile b/dns/dnshistory/Makefile index ac4183cbf6b3..33767f686a4f 100644 --- a/dns/dnshistory/Makefile +++ b/dns/dnshistory/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libpcre.so:devel/pcre -USE_BDB= yes +USES= bdb GNU_CONFIGURE= yes PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile index d7864931960a..ee6b3cd77810 100644 --- a/dns/fastresolve/Makefile +++ b/dns/fastresolve/Makefile @@ -15,8 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libadns.so:dns/adns RUN_DEPENDS= p5-BerkeleyDB>=0:databases/p5-BerkeleyDB -USES= perl5 tar:bzip2 -USE_BDB= yes +USES= bdb perl5 tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL} \ djm_cv_lib_db_Dbopen=yes diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile index 779d2bfcfd76..76cb301a4e58 100644 --- a/editors/nvi-devel/Makefile +++ b/editors/nvi-devel/Makefile @@ -19,8 +19,7 @@ WIDECHAR_DESC= Enable wide-character support (UTF-8) WRKSRC= ${WRKDIR}/${DISTNAME}/build.unix GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= iconv libtool ncurses pkgconfig tar:bzip2 -USE_BDB= 42+ +USES= bdb iconv libtool ncurses pkgconfig tar:bzip2 CONFIGURE_ARGS+= --with-db-prefix=${LOCALBASE} \ --program-prefix=n CONFIGURE_SCRIPT= ../dist/configure diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 1e360b92a5b7..4a83bdd9f5e3 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -18,11 +18,10 @@ LIB_DEPENDS= libgtkspell.so:textproc/gtkspell \ libboost_thread.so:devel/boost-libs \ liblucene++.so:textproc/luceneplusplus -USES= compiler:c++11-lib desktop-file-utils gettext gmake pkgconfig +USES= bdb compiler:c++11-lib desktop-file-utils gettext gmake pkgconfig USE_WX= 3.0 WX_CONF_ARGS= absolute WX_UNICODE= yes -USE_BDB= yes WITH_BDB_HIGHEST= yes GNU_CONFIGURE= yes CONFIGURE_ENV= WXRC="${WXRC_CMD}" diff --git a/graphics/fortytwo/Makefile b/graphics/fortytwo/Makefile index d5a49076d154..21fb830437b5 100644 --- a/graphics/fortytwo/Makefile +++ b/graphics/fortytwo/Makefile @@ -13,14 +13,13 @@ COMMENT= Graph management system for GNUstep LICENSE= LGPL21 -USES= gnustep +USES= bdb gnustep USE_GNUSTEP= back build LIB_DEPENDS= libEncore.so:devel/fortytwo-encore \ libBDB.so:databases/fortytwo-bdb DEFAULT_LIBVERSION= 0.1 USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -USE_BDB= 43+ WRKSRC= ${WRKDIR}/FT-${PORTVERSION} DOCSDIR= ${GNUSTEP_PREFIX}/Local/Library/Documentation/FT diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile index 59e7e8cd4804..a16c29b683d4 100644 --- a/japanese/mutt-devel/Makefile +++ b/japanese/mutt-devel/Makefile @@ -56,10 +56,9 @@ MANJADATE= 20050813 FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd -USES= gmake iconv ncurses shebangfix autoreconf fakeroot +USES= gmake iconv ncurses shebangfix autoreconf fakeroot ssl SHEBANG_FILES= smime_keys.pl contrib/smime_keys_test.pl GNU_CONFIGURE= yes -USE_OPENSSL= yes WRKSRC= ${WRKDIR}/mutt-${VERSION} LDFLAGS+= -L${LOCALBASE}/lib -ltinfow CONFIGURE_ENV= CC="${CC} -D_DONT_USE_CTYPE_INLINE_ -D_XLOCALE_CTYPE_H ${DB_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ncurses" @@ -93,7 +92,7 @@ LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 PORT_OPTIONS+= MAILDIR_HEADER_CACHE .endif .if ${PORT_OPTIONS:MIMAP_HEADER_CACHE} -USE_BDB= 42+ +USES+= bdb CONFIGURE_SED= -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' .endif .if ${PORT_OPTIONS:MIDN} diff --git a/lang/gnu-cobol/Makefile b/lang/gnu-cobol/Makefile index 03b7848ac646..d52af877c9ef 100644 --- a/lang/gnu-cobol/Makefile +++ b/lang/gnu-cobol/Makefile @@ -12,8 +12,7 @@ COMMENT= Open-source COBOL compiler LIB_DEPENDS= libgmp.so:math/gmp -USE_BDB= yes -USES= gmake libtool ncurses +USES= bdb gmake libtool ncurses USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/lang/php55/Makefile.ext b/lang/php55/Makefile.ext index 8c7a1f9870be..b834be078ef6 100644 --- a/lang/php55/Makefile.ext +++ b/lang/php55/Makefile.ext @@ -461,7 +461,7 @@ CONFIGURE_ARGS+=--without-cdb . if ${PORT_OPTIONS:MDB4} CONFIGURE_ARGS+=--with-db4=${LOCALBASE} -USE_BDB= 40+ +USES+= bdb WITH_BDB_HIGHEST= yes . endif . if ${PORT_OPTIONS:MGDBM} diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext index 71c196bd0502..266b508ef208 100644 --- a/lang/php56/Makefile.ext +++ b/lang/php56/Makefile.ext @@ -464,7 +464,7 @@ CONFIGURE_ARGS+=--without-cdb . if ${PORT_OPTIONS:MDB4} CONFIGURE_ARGS+=--with-db4=${LOCALBASE} -USE_BDB= 40+ +USES+= bdb WITH_BDB_HIGHEST= yes . endif . if ${PORT_OPTIONS:MGDBM} diff --git a/lang/php70/Makefile.ext b/lang/php70/Makefile.ext index 42f34ec282a3..51182856614e 100644 --- a/lang/php70/Makefile.ext +++ b/lang/php70/Makefile.ext @@ -456,7 +456,7 @@ CONFIGURE_ARGS+=--without-cdb . if ${PORT_OPTIONS:MDB4} CONFIGURE_ARGS+=--with-db4=${LOCALBASE} -USE_BDB= 40+ +USES+= bdb WITH_BDB_HIGHEST= yes . endif . if ${PORT_OPTIONS:MGDBM} diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile index dbc124cf83d1..1e91ecfcbd38 100644 --- a/mail/avenger/Makefile +++ b/mail/avenger/Makefile @@ -12,8 +12,7 @@ COMMENT= Anti-spam SMTP server LICENSE= GPLv2+ # though COPYING is GPLv3 -USE_BDB= 42+ -USE_OPENSSL= yes +USES= bdb ssl GNU_CONFIGURE= yes USERS= ${PORTNAME} diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile index 75430000d514..ef0471594da3 100644 --- a/mail/bmf/Makefile +++ b/mail/bmf/Makefile @@ -18,7 +18,7 @@ HAS_CONFIGURE= yes OPTIONS_DEFINE= BDB MYSQL DEBUG DOCS OPTIONS_DEFAULT=BDB -BDB_USE= BDB=40+ +BDB_USES= bdb BDB_CONFIGURE_WITH= libdb BDB_CFLAGS= -I${BDB_INCLUDE_DIR} BDB_LDFLAGS= -L${BDB_LIB_DIR} diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index 76f953787728..4a821a663483 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -14,8 +14,7 @@ LICENSE= GPLv2 .if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR} # building master port -USE_BDB= 5+ -INVALID_BDB_VER=48 +USES+= bdb:5+ .endif OPTIONS_DEFINE= GSL UNICODE DOCS diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index b0414675b52e..2977ef33486f 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Domainkeys milter for Sendmail USE_RC_SUBR= milter-dk -USE_OPENSSL= yes +USES+= ssl .if !defined(BUILDING_INDEX) IPCCHECK!= ipcrm -q 0 2>&1 || true @@ -46,8 +46,7 @@ OPTIONS_DEFINE= DOCS IGNORE= does not work with base bdb SITE_SUB+= -e 's|%%BDB%%|dnl |g' . else -USE_BDB= 41+ -INVALID_BDB_VER= 2 40 +USES+= bdb SITE_SUB+= -e 's|%%BDB%%||g' \ -e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \ -e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \ diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 9853e1fb65bf..e8f12a1b5932 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -28,9 +28,8 @@ CONFLICTS= dovecot2-2.[0-9].* # consult the maintainer of those ports before updating this one. # ###################################################################### -USES= cpe iconv libtool:keepla +USES= cpe iconv libtool:keepla ssl USE_RC_SUBR= dovecot -USE_OPENSSL= yes PORTSCOUT= limit:^1\.2 @@ -65,7 +64,7 @@ VPOPMAIL_DESC= VPopMail support OPTIONS_SUB= yes BDB_CFLAGS= -I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR} BDB_CONFIGURE_WITH= db -BDB_USE= BDB=48+ +BDB_USES= bdb DOCS_CONFIGURE_WITH= docs GSSAPI_CONFIGURE_WITH= gssapi GSSAPI_LDFLAGS= -lgssapi_krb5 diff --git a/mail/drac/Makefile b/mail/drac/Makefile index ddd9edcc8923..b01527bd9911 100644 --- a/mail/drac/Makefile +++ b/mail/drac/Makefile @@ -35,7 +35,7 @@ DEFS= -DWITH_TI_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C DEFS+= -DTERM_KD RUN_DEPENDS+= postfix:mail/postfix .if ${PORT_OPTIONS:MDB} -USE_BDB= 41+ +USES+= bdb .endif .elif ${PORT_OPTIONS:MEXIM} DEFS+= -DTERM_KD -DREQ_HASH -DCIDR_KEY diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile index 7141155659c6..9d268f55686b 100644 --- a/mail/evolution-ews/Makefile +++ b/mail/evolution-ews/Makefile @@ -18,10 +18,9 @@ RUN_DEPENDS= evolution>=3.0.0:mail/evolution PORTSCOUT= limitw:1,even -USES= gettext gmake gnome libtool pathfix pkgconfig sqlite tar:xz +USES= bdb:5 gettext gmake gnome libtool pathfix pkgconfig sqlite tar:xz USE_GNOME= intltool GNU_CONFIGURE= yes -USE_BDB= 5 USE_OPENLDAP= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 791f04a5b3be..e77600687552 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -41,7 +41,7 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_SUB= yes AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -BDB_USE= bdb=yes +BDB_USES= bdb DMARC_LIB_DEPENDS= libopendmarc.so:mail/opendmarc EMBEDDED_PERL_USE= perl5=run,build EXIMON_USE= xorg=x11,xaw,xt @@ -262,7 +262,7 @@ SEDLIST+= -e 's,^\# (EXIM_MONITOR=),\1,' .if ${PORT_OPTIONS:MTLS} SEDLIST+= -e 's,^\# (SUPPORT_TLS=),\1,' .if ! ${PORT_OPTIONS:MGNUTLS} -USE_OPENSSL= yes +USES+= ssl SEDLIST+= -e 's,^\# (TLS_LIBS=.*-lssl[[:space:]]),\1,' .else SEDLIST+= -e 's,^\# (USE_GNUTLS=),\1,' diff --git a/mail/greyfix/Makefile b/mail/greyfix/Makefile index 7ef75807426d..73ffcee95362 100644 --- a/mail/greyfix/Makefile +++ b/mail/greyfix/Makefile @@ -13,7 +13,7 @@ COMMENT= Greylisting policy daemon for Postfix SUB_FILES= pkg-message -USE_BDB= 5+ +USES= bdb:5+ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-berkeleydb-libdir=${BDB_LIB_DIR} \ --with-berkeleydb-includedir=${BDB_INCLUDE_DIR} \ diff --git a/mail/isync/Makefile b/mail/isync/Makefile index 5b8cc093fc59..fefc78fd9664 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -14,13 +14,11 @@ LICENSE= GPLv2 LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -USES= alias cpe +USES= alias bdb cpe ssl CPE_VENDOR= oswald_buddenhagen GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sasl=${LOCALBASE} \ --with-ssl=${OPENSSLLIB:H} -USE_OPENSSL= yes -USE_BDB= 46+ CPPFLAGS+= -I${BDB_INCLUDE_DIR} LDFLAGS+= -L${BDB_LIB_DIR} diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile index 92d61d0fd607..9b6d7041c5c8 100644 --- a/mail/meta1/Makefile +++ b/mail/meta1/Makefile @@ -71,8 +71,9 @@ MAKE_ENV+= MTA_NETINET6=1 .endif .if ${PORT_OPTIONS:MBDB} +# Why keep the option if it can't work ? BROKEN= port version of Berkeley DB is not compatible -USE_BDB= 42+ +USES+= bdb INVALID_BDB_VER= 46 47 48 5 6 BERKELEYDB_SUFFIX= -db${BDB_VER} CONFIGURE_ARGS+= --disable-included-bdb @@ -85,7 +86,7 @@ PLIST_SUB+= WITH_BDBINT="" .endif .if ${PORT_OPTIONS:MPMILTER} -USE_OPENSSL= yes +USES+= ssl .else PMILTER_SUFFIX?= -nopmilter .endif diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 285fecdf9ce9..97ff37b205b2 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -22,11 +22,10 @@ LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes NO_OPTIONS_SORT=yes -USES= libtool perl5 pkgconfig shebangfix +USES= libtool perl5 pkgconfig shebangfix ssl USE_PERL5= run SHEBANG_FILES= opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \ reprrd/opendkim-reprrdimport* -USE_OPENSSL= yes USE_LDCONFIG= yes PORTDOCS= * @@ -148,7 +147,7 @@ CONFIGURE_ARGS+= --with-db-lib=c CONFIGURE_ARGS+= --with-db-incdir=${BDB_INCLUDE_DIR} \ --with-db-libdir=${BDB_LIB_DIR} \ --with-db-lib=${BDB_LIB_NAME} -USE_BDB= 40+ +USES+= bdb . endif .endif diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index d75830915797..6ce4af317db7 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -42,7 +42,7 @@ POSIX_REGEX_DESC= Native regex support .if ${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+= --enable-ssl -USE_OPENSSL= yes +USES+= ssl .else CONFIGURE_ARGS+= --disable-ssl .endif @@ -68,7 +68,7 @@ PLIST_SUB+= DAEMONMAP="@comment " CPPFLAGS+= -I${BDB_INCLUDE_DIR} CONFIGURE_ARGS+= --enable-bdb PLIST_SUB+= BDB="" -USE_BDB= yes +USES+= bdb .else CONFIGURE_ARGS+= --disable-bdb PLIST_SUB+= BDB="@comment " @@ -92,7 +92,7 @@ PLIST_SUB+= GDBM="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes +USES+= mysql CONFIGURE_ARGS+= --enable-mysql PLIST_SUB+= MYSQL="" .else diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index c2992cad8f7d..a48a5ed913be 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -46,7 +46,7 @@ OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT OPTIONS_DEFAULT= PCRE TLS -BDB_USE= BDB=yes +BDB_USES= bdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb LDAP_USE= OPENLDAP=yes LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 824abbad596e..851734c6535c 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -48,7 +48,7 @@ OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT OPTIONS_DEFAULT= PCRE TLS -BDB_USE= BDB=yes +BDB_USES= bdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb LDAP_USE= OPENLDAP=yes LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb diff --git a/mail/postfix211/Makefile b/mail/postfix211/Makefile index 69866cf3edf7..483abefa469d 100644 --- a/mail/postfix211/Makefile +++ b/mail/postfix211/Makefile @@ -47,7 +47,7 @@ OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT OPTIONS_DEFAULT= PCRE TLS -BDB_USE= BDB=yes +BDB_USES= bdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb LDAP_USE= OPENLDAP=yes LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile index 146d8715495b..ff6efb24000b 100644 --- a/mail/prayer/Makefile +++ b/mail/prayer/Makefile @@ -33,9 +33,9 @@ SESSIONCACHE_DESC= Activate Session Cache USERS= _prayer GROUPS= prayer -SESSIONCACHE_USE= BDB=5+ +SESSIONCACHE_USES= bdb:5+ LDAP_USE= OPENLDAP=yes -SSL_USE= OPENSSL=yes +SSL_USES= ssl TIDY_LIB_DEPENDS= libtidy.so:www/tidy-lib GID!= id -g diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 608babd8edb2..422893ac1a26 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -21,7 +21,7 @@ CONFLICTS?= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd- USERS= smmsp GROUPS= smmsp -USES= cpe uidfix +USES= bdb cpe uidfix MAKE_ARGS= UBINOWN=${UID} UBINGRP=${GID} \ SBINOWN=${UID} SBINGRP=${GID} \ GBINOWN=${UID} GBINGRP=${GID} \ @@ -57,7 +57,6 @@ CYRUSLOOKUP_DESC= Enable cyruslookup feature PICKY_HELO_CHECK_DESC= Enable picky HELO check MILTER_DESC= Enable milter support -BDB_USE= BDB=yes LDAP_USE= OPENLDAP=yes SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd @@ -120,7 +119,7 @@ SITE+= ${FILESDIR}/site.config.m4.ldap SITE+= ${FILESDIR}/site.config.m4.milter .endif .if ${PORT_OPTIONS:MTLS} -USE_OPENSSL= yes +USES+= ssl .endif SED_SCRIPT= -e "s|\`-O\'|\`${CFLAGS}\'|" \ diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile index 09f0a087381d..2e4e350fdaa7 100644 --- a/mail/spamprobe/Makefile +++ b/mail/spamprobe/Makefile @@ -51,7 +51,7 @@ JPEG_USES= jpeg .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBDB} -USE_BDB= 40+ +USES+= bdb CPPFLAGS+= -I${BDB_INCLUDE_DIR} LDFLAGS+= -l${BDB_LIB_NAME} .endif diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile index 5a3fcd6c1edc..fbfeaabebea2 100644 --- a/mail/spmfilter/Makefile +++ b/mail/spmfilter/Makefile @@ -44,7 +44,7 @@ PLIST_SUB= LIB_VERSION=${PORTVERSION} \ .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDB4} -USE_BDB= yes +USES+= bdb CMAKE_ARGS+= -DDB4_INCLUDE_DIR="${BDB_INCLUDE_DIR}" .else CMAKE_ARGS+= -DWITHOUT_DB4=TRUE @@ -65,7 +65,7 @@ CMAKE_ARGS+= -DWITHOUT_LDAP=TRUE .if ${PORT_OPTIONS:MMYSQL} LIB_DEPENDS+= libzdb.so:databases/libzdb -USE_MYSQL= yes +USES+= mysql _REQUIRE+= mysql .endif diff --git a/mail/vacation/Makefile b/mail/vacation/Makefile index 1ec69d89177e..0c788af82601 100644 --- a/mail/vacation/Makefile +++ b/mail/vacation/Makefile @@ -13,7 +13,7 @@ COMMENT= Email autoresponder, similar to vacation from sendmail PORTSCOUT= ignore:1 -USE_BDB= yes +USES= bdb CFLAGS+= -L${LOCALBASE}/lib diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile index e7576cc88298..d75e2e21fb58 100644 --- a/misc/hotkeys/Makefile +++ b/misc/hotkeys/Makefile @@ -23,8 +23,7 @@ CONFIGURE_ARGS= --with-db3-inc=${BDB_INCLUDE_DIR} \ USE_XORG= x11 xft xkbfile xmu GNU_CONFIGURE= yes -USE_BDB= yes -USES= gmake +USES= bdb gmake OPTIONS_DEFINE= OSD OPTIONS_DEFAULT= OSD diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index eb98f6019523..9c2829618a36 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -24,9 +24,8 @@ OPTIONS_SUB= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= compiler:c11 iconv libtool perl5 tar:xz +USES= compiler:c11 iconv libtool perl5 ssl tar:xz USE_PERL5= run -USE_OPENSSL= yes USE_RC_SUBR= jabberd USE_LDCONFIG= ${PREFIX}/lib/jabberd CONFIGURE_ARGS= --localstatedir=/var \ @@ -76,7 +75,7 @@ SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= mysql -BDB_USE= BDB=41+ +BDB_USES= bdb BDB_CONFIGURE_ENABLE= db BDB_CONFIGURE_ON= --oldincludedir=/nonexistant diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile index 1c0f3d98947f..05c90b50cc29 100644 --- a/net-p2p/bitcoin/Makefile +++ b/net-p2p/bitcoin/Makefile @@ -14,10 +14,9 @@ LICENSE= MIT LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libevent.so:devel/libevent2 -USES= autoreconf compiler:c++0x gmake libtool pkgconfig shebangfix +USES= autoreconf compiler:c++0x gmake libtool pkgconfig shebangfix ssl SHEBANG_FILES= src/test/*.py USE_GITHUB= yes -USE_OPENSSL= yes GNU_CONFIGURE= yes SLAVE_PORT?= no @@ -70,7 +69,7 @@ QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode WALLET_CONFIGURE_ENABLE= wallet WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} WALLET_LIBS= -L${BDB_LIB_DIR} -WALLET_USE= BDB=48 +WALLET_USES= bdb:48 ZMQ_CONFIGURE_ENABLE= zmq ZMQ_BUILD_DEPENDS= libzmq4>0:net/libzmq4 diff --git a/net-p2p/digitalcoin/Makefile b/net-p2p/digitalcoin/Makefile index 1bbb35092842..90f3e36070df 100644 --- a/net-p2p/digitalcoin/Makefile +++ b/net-p2p/digitalcoin/Makefile @@ -21,9 +21,7 @@ USE_GITHUB= yes GH_ACCOUNT= baritus GH_TAGNAME= 96b098a -USES= desktop-file-utils gmake -USE_OPENSSL= yes -USE_BDB= 48 +USES= bdb:48 desktop-file-utils gmake ssl USE_QT4= corelib gui qmake_build linguisttools_build uic_build \ moc_build rcc_build diff --git a/net-p2p/dogecoin/Makefile b/net-p2p/dogecoin/Makefile index 6dd3477308be..fbc9c7b49871 100644 --- a/net-p2p/dogecoin/Makefile +++ b/net-p2p/dogecoin/Makefile @@ -24,14 +24,12 @@ QRCODES_DESC= Build with QR code display USE_GITHUB= yes -USES= gmake compiler:c++11-lib pkgconfig autoreconf +USES= bdb:5 gmake compiler:c++11-lib pkgconfig autoreconf ssl GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-incompatible-bdb \ SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl" \ CRYPTO_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" CRYPTO_LIBS="-lcrypto" CONFIGURE_ENV+= OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}" -USE_OPENSSL= yes -USE_BDB= 5 CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} \ -L${LOCALBASE}/lib -L${BDB_LIB_DIR} diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile index 19e31de0c20d..8c1f07f14d0d 100644 --- a/net-p2p/jigdo/Makefile +++ b/net-p2p/jigdo/Makefile @@ -34,7 +34,7 @@ BDB_CONFIGURE_ON= --with-libdb=-l${BDB_LIB_CXX_NAME} BDB_CONFIGURE_OFF= --without-libdb BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} BDB_LIBS= -L${BDB_LIB_DIR} -BDB_USE= BDB=48+ +BDB_USES= bdb NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile index 6bc7bd3b64f0..4ac2a4f1e88e 100644 --- a/net-p2p/litecoin/Makefile +++ b/net-p2p/litecoin/Makefile @@ -16,10 +16,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_date_time.so:devel/boost-libs -USES+= autoreconf gmake libtool pkgconfig shebangfix +USES+= autoreconf gmake libtool pkgconfig shebangfix ssl SHEBANG_FILES= src/test/*.py USE_GITHUB= yes -USE_OPENSSL= yes GNU_CONFIGURE= yes SLAVE_PORT?= no @@ -71,7 +70,7 @@ QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode WALLET_CONFIGURE_ENABLE= wallet WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} WALLET_LIBS= -L${BDB_LIB_DIR} -WALLET_USE= BDB=48 +WALLET_USES= bdb:48 GH_ACCOUNT= litecoin-project diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile index 1180e8e00ef3..72e1a8dd5be2 100644 --- a/net-p2p/namecoin/Makefile +++ b/net-p2p/namecoin/Makefile @@ -24,10 +24,8 @@ QRCODES_DESC= Build with QR code display USE_GITHUB= yes -USES= gmake compiler:c++11-lib +USES= bdb:48 gmake compiler:c++11-lib ssl MAKE_JOBS_UNSAFE=yes -USE_OPENSSL= yes -USE_BDB= 48 CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} diff --git a/net-p2p/twister/Makefile b/net-p2p/twister/Makefile index 8de8c65e85d6..cdc45b9f570e 100644 --- a/net-p2p/twister/Makefile +++ b/net-p2p/twister/Makefile @@ -26,9 +26,7 @@ OPTIONS_DEFINE= DOCS USE_GITHUB= yes GH_ACCOUNT= miguelfreitas -USE_BDB= 48 -USE_OPENSSL= yes -USES= autoreconf:build gmake iconv libtool +USES= bdb:48 autoreconf:build gmake iconv libtool ssl GNU_CONFIGURE= yes CONFIGURE_WRKSRC=${WRKSRC}/libtorrent diff --git a/net-p2p/zetacoin/Makefile b/net-p2p/zetacoin/Makefile index cc134848f64d..f0e33e1399b5 100644 --- a/net-p2p/zetacoin/Makefile +++ b/net-p2p/zetacoin/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LIB_DEPENDS= libboost_date_time.so:devel/boost-libs -USES+= autoreconf compiler:c++0x gmake libtool pkgconfig:build +USES+= autoreconf compiler:c++0x gmake libtool pkgconfig:build ssl BROKEN_armv6= AtomicPointer not implemented @@ -47,7 +47,7 @@ X11_USES= desktop-file-utils WALLET_CONFIGURE_ENABLE= wallet WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} WALLET_LIBS= -L${BDB_LIB_DIR} -WALLET_USE= bdb=48 +WALLET_USES= bdb:48 QRCODES_IMPLIES= X11 QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode @@ -61,7 +61,6 @@ TEST_ALL_TARGET= check GNU_CONFIGURE= yes CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" -USE_OPENSSL= yes QT_BINARY= ${PORTNAME}-qt CLI_BINARY= ${PORTNAME}-cli diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 408bf15e4c42..9934b3909b8f 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -13,8 +13,7 @@ COMMENT= File server for Mac OS X LIB_DEPENDS= libgcrypt.so:security/libgcrypt -USES= gmake iconv libtool perl5 tar:bzip2 -USE_BDB= 46+ +USES= bdb gmake iconv libtool perl5 tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -D_IPP_PRIVATE_STRUCTURES INSTALL_TARGET= install-strip diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 253aebe3b589..0918b8171c94 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -42,8 +42,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes # :keepla because port uses lt_dlopen -USES= cpe libtool:keepla -USE_OPENSSL= yes +USES= cpe libtool:keepla ssl .if !defined(CLIENT_ONLY) USERS= ldap GROUPS= ldap @@ -359,7 +358,7 @@ PLIST_SUB+= BACK_BDB="@comment " \ BACK_HDB="@comment " .else -USE_BDB= 48+ +USES+= bdb INVALID_BDB_VER= 6 CONFIGURE_ARGS+= --enable-bdb=${BACKEND_ENABLE} \ diff --git a/news/inn/Makefile b/news/inn/Makefile index a797102f3195..e7155897d8e4 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -60,7 +60,7 @@ PLIST_SUB+= LIBVER=${LIBVER_LONG:R:R} LIBVER_LONG=${LIBVER_LONG} .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBERKELEYDB} -USE_BDB= 44+ +USES+= bdb CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} \ --with-bdb-lib=${LOCALBASE}/lib \ --with-bdb-include=${BDB_INCLUDE_DIR} @@ -108,7 +108,7 @@ PLIST_SUB+= WITHOUT_TAGGED_HASH="" SUB_LIST+= DBZ_FILES="${DBZ_FILES}" .if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes +USES+= ssl CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif diff --git a/print/panda/Makefile b/print/panda/Makefile index 574b0b5e99d3..385e4f6d579e 100644 --- a/print/panda/Makefile +++ b/print/panda/Makefile @@ -23,10 +23,9 @@ CONFIGURE_ARGS= --enable-berkeley-db CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include LIBS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -USES= autoreconf dos2unix gmake jpeg libtool pathfix pkgconfig tar:bzip2 +USES= autoreconf bdb dos2unix gmake jpeg libtool pathfix pkgconfig tar:bzip2 DOS2UNIX_GLOB= *.c PATHFIX_MAKEFILEIN= Makefile.am -USE_BDB= yes USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/security/pks/Makefile b/security/pks/Makefile index 11b23367ea0c..9f73c9d8d914 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE WRKSRC= ${WRKDIR}/${PORTNAME} USE_GCC= any -USE_BDB= 48+ +USES= bdb OPTIONS_DEFINE= DOCS PORTDOCS= pks_help.* README EMAIL diff --git a/security/sks/Makefile b/security/sks/Makefile index 79e0a1ce2459..b66f0a476060 100644 --- a/security/sks/Makefile +++ b/security/sks/Makefile @@ -13,8 +13,7 @@ PROJECTHOST= sks-keyserver USE_OCAML= yes USE_OCAML_CAMLP4=yes -USE_BDB= 5 -USES= perl5 gmake shebangfix tar:tgz +USES= bdb:5 perl5 gmake shebangfix tar:tgz USE_PERL5= build MAKE_JOBS_UNSAFE=yes SHEBANG_FILES= sks_build.sh diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile index eae675a8eb4c..b75ddaf40bed 100644 --- a/sysutils/apt/Makefile +++ b/sysutils/apt/Makefile @@ -19,11 +19,10 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ LIB_DEPENDS= libcurl.so:ftp/curl GNU_CONFIGURE= yes -USES= gettext iconv gmake shebangfix +USES= bdb gettext iconv gmake shebangfix SHEBANG_FILES= dselect/install \ dselect/setup \ dselect/update -USE_BDB= 44+ USE_LDCONFIG= yes NO_FILTER_SHLIBS= yes CPPFLAGS+= -I${LOCALBASE}/include/db${BDB_VER} -I${LOCALBASE}/include diff --git a/sysutils/cfengine22/Makefile b/sysutils/cfengine22/Makefile index 926fcd38e168..cbbf5ca8a6d0 100644 --- a/sysutils/cfengine22/Makefile +++ b/sysutils/cfengine22/Makefile @@ -20,11 +20,9 @@ CONFLICTS= cfengine-3* cfengine-devel-* USE_RC_SUBR= cfexecd cfservd -USES= cpe libtool makeinfo shebangfix +USES= bdb cpe libtool makeinfo shebangfix ssl SHEBANG_FILES= contrib/cfdoc -USE_BDB= 48+ -USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-docs \ --docdir=${DOCSDIR} \ diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile index b44675f1e758..7728ecc808ef 100644 --- a/sysutils/cfengine32/Makefile +++ b/sysutils/cfengine32/Makefile @@ -23,9 +23,7 @@ USE_RC_SUBR= cf-execd cf-serverd LIB_DEPENDS= libpcre.so:devel/pcre -USES= cpe libtool -USE_BDB= 48+ -USE_OPENSSL= yes +USES= bdb cpe libtool ssl GNU_CONFIGURE= yes # EXAMPLESDIR= ${PREFIX}/share/examples/cfengine3 DOCSDIR= ${PREFIX}/share/doc/cfengine3 diff --git a/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile index 3e0a0f9a4b88..0e88d8ec0c8e 100644 --- a/textproc/p5-RDFStore/Makefile +++ b/textproc/p5-RDFStore/Makefile @@ -17,8 +17,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ p5-DBI>=0:databases/p5-DBI RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= perl5 -USE_BDB= yes +USES= bdb perl5 USE_PERL5= configure pre-configure: diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile index d49d40ffb1a4..cdc449dd8f04 100644 --- a/textproc/redland/Makefile +++ b/textproc/redland/Makefile @@ -29,7 +29,7 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= BDB THREADS OPTIONS_DEFAULT= BDB -BDB_USE= BDB=yes +BDB_USES= bdb BDB_CONFIGURE_OFF= --with-bdb=no THREADS_CONFIGURE_ENABLE= threads diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index c654bb25832c..58159c45ec0d 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -58,7 +58,7 @@ PERL_USES= perl5 PERL_CONFIGURE_ON= --with-perl=${PERL} PERL_CONFIGURE_OFF= --without-perl -BDB_USE= BDB=yes +BDB_USES= bdb BDB_CFLAGS= -I${BDB_INCLUDE_DIR} BDB_LDFLAGS= -L${BDB_LIB_DIR} BDB_CONFIGURE_ON= --with-bdb=yes diff --git a/www/crawl/Makefile b/www/crawl/Makefile index bee8adaefaea..9a743653eef8 100644 --- a/www/crawl/Makefile +++ b/www/crawl/Makefile @@ -14,9 +14,8 @@ LICENSE= BSD4CLAUSE LIB_DEPENDS= libevent.so:devel/libevent2 -USES= pkgconfig +USES= bdb pkgconfig -USE_BDB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libevent --program-transform-name='' CONFIGURE_ENV= EVENTINC="`pkgconf --cflags libevent`" EVENTLIB="`pkgconf --libs libevent`" diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile index 1bded6fdcf6d..13ed992747f3 100644 --- a/www/squidguard/Makefile +++ b/www/squidguard/Makefile @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${LOCALBASE}/sbin/squid:www/squid -USE_BDB= yes +USES= bdb GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-db-inc=${BDB_INCLUDE_DIR} \ --with-db-lib=${BDB_LIB_DIR} \ diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index e9d44fadaec1..5fbb06a3a216 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -60,7 +60,7 @@ LIB_DEPENDS+= libGeoIP.so:net/GeoIP .if ${PORT_OPTIONS:MGEODB} .if empty(PORT_OPTIONS:MBDB1) -WITH_BDB= yes +USES+= bdb .endif PLIST_SUB+= WITH_GEODB="" .else @@ -83,8 +83,7 @@ PLIST_SUB+= WITH_GEOIP="@comment " .endif .if defined(WITH_BDB_VER) || ${PORT_OPTIONS:MBDB} -USE_BDB= yes -INVALID_BDB_VER= 2 3 40 +USES+= bdb LDFLAGS+= -L${BDB_LIB_DIR} CFLAGS+= -I${BDB_INCLUDE_DIR} .else diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile index 3764ab109df1..4c78c6aea709 100644 --- a/www/xshttpd-devel/Makefile +++ b/www/xshttpd-devel/Makefile @@ -17,8 +17,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre CONFLICTS_INSTALL= xshttpd-[0-9]* publicfile-[0-9]* -USES= tar:bzip2 -USE_OPENSSL= yes +USES= ssl tar:bzip2 USE_RC_SUBR= xshttpd GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-hier=bsd --with-userid=${WWWOWN}:${WWWGRP} @@ -26,7 +25,7 @@ CONFIGURE_ARGS= --enable-hier=bsd --with-userid=${WWWOWN}:${WWWGRP} OPTIONS_DEFINE= BDB CURL LDAP M4 NETPBM PERL OPTIONS_DEFAULT= BDB CURL M4 NETPBM OPTIONS_SUB= yes -BDB_USE= BDB=5+ +BDB_USES= bdb:5+ BDB_CONFIGURE_ON= --with-db-libdir=${BDB_LIB_DIR} \ --with-db-include-dir=${BDB_INCLUDE_DIR} BDB_CONFIGURE_WITH= db |