Index: head/Mk/Uses/mysql.mk =================================================================== --- head/Mk/Uses/mysql.mk (revision 416239) +++ head/Mk/Uses/mysql.mk (revision 416240) @@ -1,136 +1,143 @@ # $FreeBSD$ # # Provide support for MySQL # Feature: mysql # Usage: USES=mysql or USES=mysql:args -# Valid ARGS: , server, embedded +# Valid ARGS: , client, server, embedded # # version If no version is given (by the maintainer via the port), try to # find the currently installed version. Fall back to default if # necessary (MySQL-5.6 = 56). +# client Depends on the libmysqlclient library (default) # server/embedded # Depend on the server at run/build time. If none of these is # set, depends on the client. # # IGNORE_WITH_MYSQL # This variable can be defined if the ports does not support one # or more versions of MySQL. # WITH_MYSQL_VER # User defined variable to set MySQL version. # MYSQL_VER # Detected MySQL version. # # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_MYSQL_MK) _INCLUDE_USES_MYSQL_MK= yes .include "${PORTSDIR}/Mk/bsd.default-versions.mk" .if !empty(mysql_ARGS) .undef _WANT_MYSQL_VER .undef _WANT_MYSQL_SERVER .undef _WANT_MYSQL_EMBEDDED _MYSQL_ARGS= ${mysql_ARGS:S/,/ /g} .if ${_MYSQL_ARGS:Mserver} _WANT_MYSQL_SERVER= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver} .endif .if ${_MYSQL_ARGS:Membedded} _WANT_MYSQL_EMBEDDED= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nembedded} .endif +.if ${_MYSQL_ARGS:Mclient} +_WANT_MYSQL_CLIENT= yes +_MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient} +.endif # Port requested a version .if !empty(_MYSQL_ARGS) _WANT_MYSQL_VER= ${_MYSQL_ARGS} .endif .endif # !empty(mysql_ARGS) .if defined(DEFAULT_MYSQL_VER) WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead" .endif DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. MYSQL51_LIBVER= 16 MYSQL55_LIBVER= 18 MYSQL55m_LIBVER= 18 MYSQL55p_LIBVER= 18 MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 MYSQL57_LIBVER= 20 MYSQL100m_LIBVER= 18 MYSQL101m_LIBVER= 18 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) _MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/' _PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l _MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l .if ${_PERCONA} == 1 _MYSQL_VER= ${_MYSQL}p .elif ${_MARIADB} == 1 _MYSQL_VER= ${_MYSQL}m .else _MYSQL_VER= ${_MYSQL} .endif .endif .if defined(_WANT_MYSQL_VER) .if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} IGNORE= cannot install: the port wants mysql${_WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client .endif MYSQL_VER= ${_WANT_MYSQL_VER} .elif defined(WITH_MYSQL_VER) MYSQL_VER= ${WITH_MYSQL_VER} .else .if defined(_MYSQL_VER) MYSQL_VER= ${_MYSQL_VER} .else MYSQL_VER= ${DEFAULT_MYSQL_VER} .endif .endif # _WANT_MYSQL_VER .if defined(_MYSQL_VER) .if ${_MYSQL_VER} != ${MYSQL_VER} IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client .endif .endif .if (${MYSQL_VER:C/[0-9]*//} == "m") _MYSQL_FLAVOUR= mariadb .elif (${MYSQL_VER:C/[0-9]*//} == "p") _MYSQL_FLAVOUR= percona .else _MYSQL_FLAVOUR= mysql .endif _MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client _MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) .if defined(IGNORE_WITH_MYSQL) . for VER in ${IGNORE_WITH_MYSQL} . if (${MYSQL_VER} == "${VER}") IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported) . endif . endfor .endif # IGNORE_WITH_MYSQL .if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED) RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} .if defined(_WANT_MYSQL_EMBEDDED) BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} .endif -.else +.endif +.if defined(_WANT_MYSQL_CLIENT) || \ + !(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)) LIB_DEPENDS+= libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} .endif .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} .endif # Check for correct libs .endif Index: head/databases/ateam_mysql_ldap_auth/Makefile =================================================================== --- head/databases/ateam_mysql_ldap_auth/Makefile (revision 416239) +++ head/databases/ateam_mysql_ldap_auth/Makefile (revision 416240) @@ -1,39 +1,38 @@ # Created by: Ganbold Tsagaankhuu # $FreeBSD$ PORTNAME= ateam_mysql_ldap_auth PORTVERSION= 1.0 CATEGORIES= databases MAINTAINER= ganbold@FreeBSD.org COMMENT= A-Team MySQL LDAP authentication plugin LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libconfig.so:devel/libconfig -RUN_DEPENDS= mysql${MYSQL_VER}-server>5.6:databases/mysql56-server USE_OPENLDAP= yes -USES= gmake mysql +USES= gmake mysql:client,server USE_GITHUB= yes GH_ACCOUNT= ateamsystems GH_TAGNAME= f6a1a5d PLIST_FILES= lib/mysql/plugin/auth_ldap.so \ "@sample etc/ateam_mysql_ldap_auth.conf.sample" \ ${DOCSDIR}/README \ ${DOCSDIR}/INSTALL SUB_FILES= pkg-message do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/mysql/plugin ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/auth_ldap.so ${STAGEDIR}${PREFIX}/lib/mysql/plugin/ ${INSTALL_DATA} ${WRKSRC}/ateam_mysql_ldap_auth.conf ${STAGEDIR}${PREFIX}/etc/ateam_mysql_ldap_auth.conf.sample ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ ${INSTALL_MAN} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}/ .include Index: head/mail/gld/Makefile =================================================================== --- head/mail/gld/Makefile (revision 416239) +++ head/mail/gld/Makefile (revision 416240) @@ -1,73 +1,73 @@ # Created by: Blaz Zupan # $FreeBSD$ PORTNAME= gld PORTVERSION= 1.8 PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.gasmi.net/down/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Greylisting daemon for Postfix BROKEN= unfetchable USE_RC_SUBR= gld HAS_CONFIGURE= yes SUB_FILES= pkg-message OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL PGSQL OPTIONS_DEFINE= LOCAL_DB_SERVER DOCS OPTIONS_DEFAULT= MYSQL LOCAL_DB_SERVER_DESC= RUN_DEPEND also on selected DB server .include .if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -USE_MYSQL= yes . if ${PORT_OPTIONS:MLOCAL_DB_SERVER} -RUN_DEPENDS+= mysql-server>=0:databases/mysql${MYSQL_VER}-server SUB_LIST+= MYSQL=mysql SUB_LIST+= PGSQL= +USES+= mysql:client,server . else SUB_LIST+= MYSQL= +USES+= mysql . endif .endif .if ${PORT_OPTIONS:MPGSQL} CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} USES+= pgsql . if ${PORT_OPTIONS:MLOCAL_DB_SERVER} RUN_DEPENDS+= postgresql-server>=0:databases/postgresql${PGSQL_VER}-server SUB_LIST+= PGSQL=postgresql SUB_LIST+= MYSQL= . else SUB_LIST+= PGSQL= . endif .endif post-extract: @${RM} -f ${WRKSRC}/config.cache post-patch: ${REINPLACE_CMD} -e 's|\(@CC@\ \)-O2|\1${CFLAGS}|' \ ${WRKSRC}/Makefile.in pre-build: ${REINPLACE_CMD} -e 's,"/etc/gld.conf","${PREFIX}/etc/gld.conf",' ${WRKSRC}/gld.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gld ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/gld.conf ${STAGEDIR}${PREFIX}/etc/gld.conf.sample .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in HISTORY LICENCE README table-whitelist.sql tables.mysql tables.pgsql ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .endif .include Index: head/multimedia/mythtv/Makefile =================================================================== --- head/multimedia/mythtv/Makefile (revision 416239) +++ head/multimedia/mythtv/Makefile (revision 416240) @@ -1,126 +1,126 @@ # Created by: Stacey Son , Ari Maniatis # $FreeBSD$ PORTNAME= mythtv PORTVERSION= 0.27.5.20150616 PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org COMMENT= MythTV is a homebrew PVR project LIB_DEPENDS= libmp3lame.so:audio/lame \ libfreetype.so:print/freetype2 \ libtag.so:audio/taglib \ libxml2.so:textproc/libxml2 BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat \ yasm:devel/yasm RUN_DEPENDS= tv_check:textproc/p5-xmltv \ wget:ftp/wget CONFLICTS= mythtv-frontend-[0-9]* USE_GITHUB= yes GH_ACCOUNT= MythTV GH_TAGNAME= ad97d24 WRKSRC_SUBDIR= ${PORTNAME} ONLY_FOR_ARCHS= i386 amd64 USE_PERL5= run build NOPRECIOUSMAKEVARS= # don't override $(ARCH) in ffmpeg makefiles USES= gmake libtool perl5 pkgconfig pathfix shebangfix SHEBANG_FILES= programs/scripts/database/mythconverg_backup.pl \ programs/scripts/database/mythconverg_restore.pl USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \ moc_build qmake_build rcc_build uic_build imageformats QT_NONSTANDARD= yes -USE_MYSQL= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/mythtv/filters REINPLACE_ARGS= -i "" USE_RC_SUBR= mythbackend DESTDIRNAME= INSTALL_ROOT USERS= mythtv GROUPS= mythtv MAKE_ENV= QTDIR="${QT_PREFIX}" \ QMAKESPEC="${QMAKESPEC}" CPPFLAGS+= ${QTCPPFLAGS} CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \ QTDIR="${QT_PREFIX}" CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig" LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" --dvb-path="${LOCALBASE}/include" \ --libxml2-path="${LOCALBASE}/include/libxml2" --enable-v4l2 --enable-ivtv --enable-xv \ --disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa --disable-mythlogserver QMAKESPEC?= ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ OPTIONS_DEFINE= BINDINGS LIRC MYSQL OPENGL VDPAU OPTIONS_DEFAULT= BINDINGS OPENGL VDPAU OPTIONS_SUB= BINDINGS BINDINGS_DESC= Perl and Python bindings LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc -MYSQL_RUN_DEPENDS= mysqld_safe:databases/mysql${MYSQL_VER}-server +MYSQL_USES= mysql:client,server +MYSQL_USES_OFF= mysql VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau OPENGL_CONFIGURE_ENABLE= opengl-video .include SUB_FILES= pkg-message .if ${PORT_OPTIONS:MBINDINGS} CONFIGURE_ARGS+= --python=${PYTHON_CMD} USES+= python PYDISTUTILS_PKGNAME=MythTV PYDISTUTILS_PKGVERSION=0.27._1 BUILD_DEPENDS+= py*-lxml>=0:devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb \ ${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber \ p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \ p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined \ p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \ p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \ p5-DBI>=0:databases/p5-DBI \ p5-DBD-mysql>0:databases/p5-DBD-mysql RUN_DEPENDS+= py*-lxml>=0:devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb \ ${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber \ p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \ p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined \ p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \ p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \ p5-DBI>=0:databases/p5-DBI \ p5-DBD-mysql>0:databases/p5-DBD-mysql .else CONFIGURE_ARGS+=--without-bindings=perl,python .endif .if ${PORT_OPTIONS:MOPENGL} USE_QT4+= opengl .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/libs/libmythtv/libmythtv.pro \ ${WRKSRC}/bindings/perl/MythTV/Recording.pm \ ${WRKSRC}/programs/mythtranscode/replex/Makefile.standalone \ ${WRKSRC}/programs/scripts/database/mythconverg_backup.pl \ ${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \ ${WRKSRC}/programs/mythcommflag/mythcommflag-analyze post-install: @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/mythtv/database @${CP} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database .include Index: head/www/rnews/Makefile =================================================================== --- head/www/rnews/Makefile (revision 416239) +++ head/www/rnews/Makefile (revision 416240) @@ -1,84 +1,85 @@ # Created by: Vincent Tantardini # $FreeBSD$ PORTNAME= rnews PORTVERSION= 1.01 PORTREVISION= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Server-side RSS aggregator written in PHP with MySQL BROKEN_powerpc64= Does not build NO_BUILD= yes SUB_FILES= pkg-message OPTIONS_DEFINE= GD MYSQLSERVER DOCS OPTIONS_DEFAULT= GD MYSQLSERVER_DESC= Use MySQL-Server on localhost .include USE_PHP= mysql mbstring pcre xml iconv -USE_MYSQL= yes .if ${PORT_OPTIONS:MGD} USE_PHP+= gd .endif .if ${PORT_OPTIONS:MMYSQLSERVER} -RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:databases/mysql${MYSQL_VER}-server +USES+= mysql:client,server +.else +USES+= mysql .endif RUN_DEPENDS+= curl:ftp/curl .if ${PORT_OPTIONS:MDOCS} PORTDOCS= CHANGELOG INSTALL LICENSE README UPGRADE .endif CONFIGS= inc/config.php inc/config_user.php do-install: @${FIND} -s ${WRKSRC} -type d | ${SED} -e 's,^${WRKSRC},${STAGEDIR}${WWWDIR},' \ | ${XARGS} ${MKDIR} ${INSTALL_DATA} -v ${WRKSRC}/*.php ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} -v ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} -v ${WRKSRC}/*.js ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/.htaccess ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/tmp/.htaccess ${STAGEDIR}${WWWDIR}/tmp ${INSTALL_DATA} ${WRKSRC}/favicon.ico ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/help.html ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} -v ${WRKSRC}/img/*.gif ${STAGEDIR}${WWWDIR}/img ${INSTALL_DATA} -v ${WRKSRC}/img/*.png ${STAGEDIR}${WWWDIR}/img ${INSTALL_DATA} -v ${WRKSRC}/img/*.jpg ${STAGEDIR}${WWWDIR}/img ( ${FIND} ${WRKSRC}/inc -type f -not -name config_user.php -a -not -name config.php; ${ECHO} ${STAGEDIR}${WWWDIR}/inc ) \ | ${XARGS} ${INSTALL_DATA} -v ${INSTALL_DATA} -v ${WRKSRC}/magpierss/*.inc ${STAGEDIR}${WWWDIR}/magpierss ${INSTALL_DATA} ${WRKSRC}/magpierss/extlib/Snoopy.class.inc ${STAGEDIR}${WWWDIR}/magpierss/extlib ${INSTALL_DATA} -v ${WRKSRC}/opml/*.opml ${STAGEDIR}${WWWDIR}/opml .for FILE in ${CONFIGS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${WWWDIR}/${FILE}.sample .endfor .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} . for FILE in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} . endfor .endif create-plist: @${FIND} -s ${WRKSRC} \( -name "*.php" -o -name "*.inc" -o -name "*.js" -o -name "*.css" -o -name "*.jpg" \ -o -name "*.gif" -o -name "*.png" -o -name ".htaccess" -o -name "help.html" -o -name "favicon.ico" -o -name "*.opml" \) \ -and -not -name config_user.php -and -not -name config.php \ | ${SED} -e 's,^${WRKSRC},%%WWWDIR%%,' > ${PLIST} .for FILE in ${CONFIGS} @${ECHO_CMD} '@sample(${WWWOWN},,) %%WWWDIR%%/${FILE}.sample' >> ${PLIST} .endfor .for DIR in magpierss/cache img/feeds tmp @${ECHO_CMD} '@dir(${WWWOWN},,) %%WWWDIR%%/${DIR}' >> ${PLIST} .endfor .include