Index: head/audio/ario/Makefile =================================================================== --- head/audio/ario/Makefile (revision 411989) +++ head/audio/ario/Makefile (revision 411990) @@ -1,52 +1,52 @@ # Created by: Grzegorz Blach # $FreeBSD$ PORTNAME= ario PORTVERSION= 1.5.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= audio MASTER_SITES= SF/ario-player/ario-player/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Ario is a GTK2 client for MPD LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libcurl.so:${PORTSDIR}/ftp/curl \ libnotify.so:${PORTSDIR}/devel/libnotify \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ libtag_c.so:${PORTSDIR}/audio/taglib \ libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \ libmpdclient.so:${PORTSDIR}/audio/libmpdclient GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib USES= gmake libtool pkgconfig USE_LDCONFIG= yes USE_GNOME= gtk20 intltool INSTALLS_ICONS= yes INSTALL_TARGET= install-strip OPTIONS_DEFINE= AVAHI NLS AVAHI_DESC= Zeroconf support (Avahi) AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app AVAHI_CONFIGURE_ENABLE= avahi NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_USES_OFF= gettext-tools post-patch: @${REINPLACE_CMD} -e 's|glib/gslist.h|glib.h|g ; \ s|glib/gkeyfile.h>|glib.h>|g' \ ${WRKSRC}/src/ario-util.h \ ${WRKSRC}/src/plugins/ario-plugin-info.c \ ${WRKSRC}/src/ario-profiles.h .include Index: head/audio/pianobar/Makefile =================================================================== --- head/audio/pianobar/Makefile (revision 411989) +++ head/audio/pianobar/Makefile (revision 411990) @@ -1,33 +1,33 @@ # Created by: John Hixson # $FreeBSD$ PORTNAME= pianobar PORTVERSION= 2015.11.22 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://6xq.net/projects/${PORTNAME}/ MAINTAINER= john@pcbsd.org COMMENT= Command line Pandora player LICENSE= MIT LIB_DEPENDS= libao.so:${PORTSDIR}/audio/libao \ libfaad.so:${PORTSDIR}/audio/faad \ libmad.so:${PORTSDIR}/audio/libmad \ libgnutls.so:${PORTSDIR}/security/gnutls \ libjson-c.so:${PORTSDIR}/devel/json-c \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libcurl.so:${PORTSDIR}/ftp/curl PLIST_FILES= bin/pianobar \ man/man1/pianobar.1.gz USES= alias gmake pkgconfig tar:bzip2 MAKE_ARGS+= CC="${CC}" PREFIX="${PREFIX}" CFLAGS+= -I${LOCALBASE}/include -std=c99 LDFLAGS+= -L${LOCALBASE}/lib .include Index: head/audio/tomahawk/Makefile =================================================================== --- head/audio/tomahawk/Makefile (revision 411989) +++ head/audio/tomahawk/Makefile (revision 411990) @@ -1,54 +1,55 @@ # Created by: Nicola Vitale # $FreeBSD$ PORTNAME= tomahawk PORTVERSION= 0.8.4 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= ports@FreeBSD.org COMMENT= Multi-source, social, and smart music player LICENSE= GPLv3 BUILD_DEPENDS= google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash \ websocketpp>=0.4.0:${PORTSDIR}/devel/websocketpp RUN_DEPENDS= phonon-vlc>=0.6.1:${PORTSDIR}/multimedia/phonon-vlc LIB_DEPENDS= libattica.so:${PORTSDIR}/x11-toolkits/attica \ liblucene++.so:${PORTSDIR}/textproc/luceneplusplus \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libechonest.so:${PORTSDIR}/audio/libechonest \ libgnutls.so:${PORTSDIR}/security/gnutls \ libjreen.so:${PORTSDIR}/net-im/libjreen \ liblastfm.so:${PORTSDIR}/audio/liblastfm \ libqca.so:${PORTSDIR}/devel/qca \ libqjson.so:${PORTSDIR}/devel/qjson \ libqtkeychain.so:${PORTSDIR}/security/qtkeychain-qt4 \ libquazip.so:${PORTSDIR}/archivers/quazip \ libtag.so:${PORTSDIR}/audio/taglib CMAKE_ARGS= -DBUILD_RELEASE="ON" CXXFLAGS+= -Wno-cast-align -I${LOCALBASE}/include GH_ACCOUNT= tomahawk-player TELEPATHY_LIB_DEPENDS= libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 TELEPATHY_DESC= Configure Telepathy Settings TELEPATHY_USE_KDE4= kdelibs automoc4 INSTALLS_ICONS= yes OPTIONS_DEFAULT= OPTIONS_DEFINE= TELEPATHY OPTIONS_SUB= yes PLIST_SUB+= DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,} \ PORTVERSION=${PORTVERSION} USES= cmake compiler:c++11-lib desktop-file-utils pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes USE_QT4= dbus designer gui linguist_build moc_build \ network phonon qmake_build qtestlib rcc_build \ sql-sqlite2 svg uic_build xml .include Index: head/benchmarks/postal/Makefile =================================================================== --- head/benchmarks/postal/Makefile (revision 411989) +++ head/benchmarks/postal/Makefile (revision 411990) @@ -1,48 +1,48 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= postal PORTVERSION= 0.73 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= benchmarks mail MASTER_SITES= http://www.coker.com.au/postal/ MAINTAINER= ports@FreeBSD.org COMMENT= Benchmark SMTP/POP servers LICENSE= GPLv3 USES= gmake tar:tgz GNU_CONFIGURE= yes PLIST_FILES= bin/postal-list \ man/man1/postal-list.1.gz \ man/man8/bhm.8.gz \ man/man8/postal.8.gz \ man/man8/rabid.8.gz \ sbin/bhm \ sbin/postal \ sbin/rabid OPTIONS_RADIO= TLS OPTIONS_RADIO_TLS= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_USES= pkgconfig GNUTLS_CONFIGURE_OFF= --disable-gnutls GNUTLS_CPPFLAGS= $$(pkg-config --cflags gnutls) GNUTLS_LDFLAGS= $$(pkg-config --libs gnutls) OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_OFF= --disable-openssl post-patch: @${REINPLACE_CMD} -e \ 's|-lpthread|-pthread| ; \ s|-lgcrypt||' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|-pedantic|| ; \ s|-O2 -g|$$(CPPFLAGS)| ; \ s|-lstdc++|$$(LDFLAGS)|' ${WRKSRC}/Makefile.in .include Index: head/databases/freetds/Makefile =================================================================== --- head/databases/freetds/Makefile (revision 411989) +++ head/databases/freetds/Makefile (revision 411990) @@ -1,74 +1,75 @@ # Created by: Domas Mituzas # $FreeBSD$ PORTNAME= freetds PORTVERSION= 0.95.87 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/ MAINTAINER= bofh@FreeBSD.org COMMENT= Sybase/Microsoft TDS protocol library LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt TDS_VER?= 5.0 USES= autoreconf gmake iconv libtool:keepla pkgconfig readline tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib LIBS+= -lgcrypt -lpthread CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \ --enable-sybase-compat --enable-msdblib USE_LDCONFIG= yes INSTALL_TARGET= install-strip PORTDOCS= * OPTIONS_DEFINE= DOCS MARS OPTIONS_SINGLE= SSL ODBC OPTIONS_SINGLE_SSL= OPENSSL GNUTLS OPTIONS_DEFAULT= OPENSSL MARS UNIXODBC OPTIONS_SINGLE_ODBC= IODBC UNIXODBC OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ON= --with-gnutls IODBC_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc IODBC_CONFIGURE_ON= --with-iodbc=${LOCALBASE} IODBC_CPPFLAGS= -I${LOCALBASE}/include/libiodbc UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC UNIXODBC_CONFIGURE_ON= --with-unixodbc=${LOCALBASE} MARS_DESC= Enable MARS code (Experimental) MARS_CONFIGURE_ON= --enable-mars .include .if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC} PLIST_SUB+= ODBC="" .else PLIST_SUB+= ODBC="@comment " .endif post-extract: @cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.sample @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.sample @cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample post-patch: @${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \ 's||| ; \ s|/freetds.conf|/freetds.conf.sample|g ; \ s|/locales.conf|/locales.conf.sample|g ; \ s|/pool.conf|/pool.conf.sample|g ; \ s| common.h||g' @${REINPLACE_CMD} -e 's|\(\$with_iodbc/include\)|\1/libiodbc|g' \ ${WRKSRC}/configure.ac post-install: ${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample .include Index: head/databases/freetds-devel/Makefile =================================================================== --- head/databases/freetds-devel/Makefile (revision 411989) +++ head/databases/freetds-devel/Makefile (revision 411990) @@ -1,92 +1,93 @@ # Created by: Domas Mituzas # $FreeBSD$ PORTNAME= freetds PORTVERSION= 0.99.614 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/current/ PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-dev.${PORTVERSION} MAINTAINER= bofh@FreeBSD.org COMMENT= Sybase/Microsoft TDS protocol library LICENSE= LGPL20 WRKSRC= ${WRKDIR}/${PORTNAME}-dev.${PORTVERSION} TDS_VER?= 7.2 USES= autoreconf gettext-tools gmake iconv libtool:keepla pkgconfig tar:bzip2 GNU_GONFIGURE= yes CPPFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \ --enable-msdblib --enable-sybase-compat \ --docdir=${DOCSDIR} USE_LDCONFIG= yes SUB_FILES= pkg-message INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS ODBCWIDE OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS OPTIONS_DEFAULT= OPENSSL OPTIONS_RADIO= ODBC OPTIONS_RADIO_ODBC= IODBC UNIXODBC ODBCWIDE_DESC= Enable Wide ODBC Support OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ON= --with-gnutls IODBC_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc IODBC_CONFIGURE_ON= --with-iodbc=${LOCALBASE} IODBC_CPPFLAGS= -I${LOCALBASE}/include/libiodbc UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC UNIXODBC_CONFIGURE_ON= --with-unixodbc=${LOCALBASE} ODBCWIDE_CONFIGURE_ON= --enable-odbc-wide PORTDOCS= * CONFLICTS= freetds-0.64.[0-9] .include .if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC} PLIST_SUB+= ODBC="" .else PLIST_SUB+= ODBC="@comment " .endif post-extract: @cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.sample @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.sample @cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample post-patch: @${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|g' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \ 's|/pool.conf|/pool.conf.sample|g ; \ s| common.h||g ; \ s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g ; \ s|%%ICONV_LIB%%|${ICONV_LIB}|' @${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \ s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's|$$ODBC_INC/isql.h|$$ODBC_INC/libiodbc/isql.h|g ; \ s|$$ODBC_INC/isqlext.h|$$ODBC_INC/libiodbc/isqlext.h|g' ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/userguide @${MKDIR} ${STAGEDIR}${DOCSDIR}/reference @${FIND} ${WRKSRC}/doc/userguide \( -type f -o -type l \) \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/userguide ';' @${FIND} ${WRKSRC}/doc/reference \( -type f -o -type l \) \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/reference ';' @cd ${WRKSRC}/doc && \ ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR} .endif .include Index: head/databases/glom/Makefile =================================================================== --- head/databases/glom/Makefile (revision 411989) +++ head/databases/glom/Makefile (revision 411990) @@ -1,57 +1,57 @@ # Created by: Adam Weinberger # $FreeBSD$ PORTNAME= glom PORTVERSION= 1.28.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= kwm@FreeBSD.org COMMENT= GNOME database designer and user interface BUILD_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \ itstool:${PORTSDIR}/textproc/itstool \ libepc>=0.4.0:${PORTSDIR}/www/libepc \ libgda5-mysql>=0:${PORTSDIR}/databases/libgda5-mysql \ libgda5-postgresql>=0:${PORTSDIR}/databases/libgda5-postgresql LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ libepc-1.0.so:${PORTSDIR}/www/libepc \ libgoocanvasmm-2.0.so:${PORTSDIR}/graphics/goocanvasmm2 \ libevview3.so:${PORTSDIR}/graphics/evince RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \ libgda5-mysql>=0:${PORTSDIR}/databases/libgda5-mysql \ libgda5-postgresql>=0:${PORTSDIR}/databases/libgda5-postgresql GNU_CONFIGURE= yes USES= desktop-file-utils gettext gmake libarchive libtool pathfix \ pgsql pkgconfig python shared-mime-info tar:xz WANT_PGSQL= server USE_GNOME= gnomedocutils gnomeprefix intlhack pygobject3 libxml2 \ gtksourceviewmm3 libgdamm5 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-postgres-utils=${LOCALBASE}/bin \ --disable-documentation INSTALLS_ICONS= yes .include #PLIST_SUB+= VERSION=${PORTVERSION:R} PLIST_SUB+= VERSION=1.26 post-patch: @${REINPLACE_CMD} -e 's|-update-mime-database|true|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|std::locale("")|std::locale()|g' \ ${WRKSRC}/glom/libglom/data_structure/glomconversions.cc \ ${WRKSRC}/glom/libglom/data_structure/glomconversions.h \ ${WRKSRC}/glom/libglom/utils.cc \ ${WRKSRC}/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc \ ${WRKSRC}/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc \ ${WRKSRC}/glom/main.cc .include Index: head/deskutils/fusenshi/Makefile =================================================================== --- head/deskutils/fusenshi/Makefile (revision 411989) +++ head/deskutils/fusenshi/Makefile (revision 411990) @@ -1,27 +1,27 @@ # Created by: Masanori OZAWA (ozawa@ongs.co.jp) # $FreeBSD$ PORTNAME= fusenshi PORTVERSION= 0.9.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= deskutils MASTER_SITES= http://www.ongs.co.jp/projects/fusenshi/ MAINTAINER= ozawa@ongs.co.jp COMMENT= Post-it(R) like application with network support USES= gettext pkgconfig tar:tgz USE_GNOME= gtkmm24 gtksourceview libxml2 USE_XORG= x11 MAKE_JOBS_UNSAFE= yes .ifdef WITHOUT_SSL MAKE_ARGS+= WITHOUT_SSL=yes .else LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls .endif post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fusenshi .include Index: head/deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp =================================================================== --- head/deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp (nonexistent) +++ head/deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp (revision 411990) @@ -0,0 +1,20 @@ +--- src/net/fusenshisslclientsocket.cpp.orig 2007-04-02 10:44:52 UTC ++++ src/net/fusenshisslclientsocket.cpp +@@ -52,9 +52,6 @@ bool FusenshiSSLClientSocket::connect(un + { + // 通信を暗号化しますが、ホストの証明は行いません。 + int ret; +- const int cert_priority[] = { +- GNUTLS_CRT_X509, 0 +- }; + + if (NULL != m_session) close(); + +@@ -64,7 +61,6 @@ bool FusenshiSSLClientSocket::connect(un + + gnutls_init(&m_session, GNUTLS_CLIENT); + gnutls_set_default_priority(m_session); +- gnutls_certificate_type_set_priority(m_session, cert_priority); + + gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, cert); + Property changes on: head/deskutils/fusenshi/files/patch-src_net_fusenshisslclientsocket.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp =================================================================== --- head/deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp (nonexistent) +++ head/deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp (revision 411990) @@ -0,0 +1,22 @@ +--- src/net/fusenshisslserversocket.cpp.orig 2007-04-02 10:44:52 UTC ++++ src/net/fusenshisslserversocket.cpp +@@ -56,9 +56,6 @@ public: + bool sslAccept(int sock) + { + int ret; +- const int cert_priority[] = { +- GNUTLS_CRT_X509, 0 +- }; + + m_socket = sock; + +@@ -69,8 +66,7 @@ public: + if (!cert) return false; + + gnutls_init(&m_session, GNUTLS_SERVER); +- gnutls_set_default_export_priority(m_session); +- gnutls_certificate_type_set_priority(m_session, cert_priority); ++ gnutls_set_default_priority(m_session); + + gnutls_credentials_set(m_session, GNUTLS_CRD_CERTIFICATE, cert); + gnutls_certificate_server_set_request(m_session, GNUTLS_CERT_REQUIRE); Property changes on: head/deskutils/fusenshi/files/patch-src_net_fusenshisslserversocket.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/deskutils/taskd/Makefile =================================================================== --- head/deskutils/taskd/Makefile (revision 411989) +++ head/deskutils/taskd/Makefile (revision 411990) @@ -1,57 +1,57 @@ # Created by: gahr # $FreeBSD$ PORTNAME= taskd PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://taskwarrior.org/download/ MAINTAINER= skreuzer@FreeBSD.org COMMENT= Multi-user server for taskwarrior LICENSE= MIT LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USES= cmake:outsource compiler:c++11-lib shebangfix SHEBANG_FILES= demo/client/case* \ demo/client/malformed* \ demo/client/run \ demo/client/setup \ demo/server/run \ demo/server/setup \ mon/create \ scripts/setup_server.bash \ src/taskdctl \ pki/generate \ pki/generate.ca \ pki/generate.client \ pki/generate.crl \ pki/generate.server CFLAGS+= -g -O0 PLIST_FILES= bin/taskd \ bin/taskdctl \ man/man1/taskd.1.gz \ man/man1/taskdctl.1.gz \ man/man5/taskdrc.5.gz \ share/taskd/README \ share/taskd/generate \ share/taskd/generate.ca \ share/taskd/generate.client \ share/taskd/generate.crl \ share/taskd/generate.server \ share/taskd/vars PORTDOCS= * post-install: (cd ${WRKSRC}/pki && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) .for s in generate generate.ca generate.client generate.crl generate.server ${CHMOD} 755 ${STAGEDIR}${DATADIR}/${s} .endfor .include Index: head/deskutils/taskwarrior/Makefile =================================================================== --- head/deskutils/taskwarrior/Makefile (revision 411989) +++ head/deskutils/taskwarrior/Makefile (revision 411990) @@ -1,35 +1,36 @@ # Created by: gahr # $FreeBSD$ PORTNAME= taskwarrior PORTVERSION= 2.5.0 +PORTREVISION= 1 CATEGORIES= deskutils DISTNAME= task-${PORTVERSION} MAINTAINER= skreuzer@FreeBSD.org COMMENT= Feature-rich command-line todo list manager LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls USES= compiler:c++11-lib cmake python:test shebangfix USE_GITHUB= yes GH_ACCOUNT= taskwarrior GH_PROJECT= task CMAKE_ARGS+= -DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \ -DTASK_MAN1DIR:STRING=man/man1 \ -DTASK_MAN5DIR:STRING=man/man5 SHEBANG_FILES= scripts/*/*.pl \ doc/rc/refresh \ do-test: @cd ${WRKSRC}/test && \ ${PYTHON_CMD} run_all --verbose && \ ${PYTHON_CMD} problems .include Index: head/devel/anjuta/Makefile =================================================================== --- head/devel/anjuta/Makefile (revision 411989) +++ head/devel/anjuta/Makefile (revision 411990) @@ -1,124 +1,125 @@ # Created by: Dmitry Sivachenko # $FreeBSD$ PORTNAME= anjuta PORTVERSION= 3.18.2 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Integrated Development Environment for C and C++ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \ itstool:${PORTSDIR}/textproc/itstool LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ libgdl-3.so:${PORTSDIR}/x11-toolkits/gdl RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \ autogen:${PORTSDIR}/devel/autogen \ automake>=0:${PORTSDIR}/devel/automake \ autoconf>=0:${PORTSDIR}/devel/autoconf \ libtool>=2.4:${PORTSDIR}/devel/libtool \ gdb>=7.10:${PORTSDIR}/devel/gdb \ gmake:${PORTSDIR}/devel/gmake \ yelp>=3.0.0:${PORTSDIR}/x11/yelp PORTSCOUT= limitw:1,even USES= bison desktop-file-utils gettext gmake gnome libtool pathfix \ perl5 pkgconfig:both python shared-mime-info shebangfix tar:xz SHEBANG_FILES= plugins/project-wizard/templates/js_minimal/src/main.js \ plugins/tools/scripts/find-fixmes.pl \ plugins/tools/scripts/translation-status.pl \ plugins/tools/scripts/prepare-changelog.pl SHEBANG_LANG+= gjs gjs_OLD_CMD= /usr/bin/gjs gjs_CMD= ${LOCALBASE}/bin/gjs INSTALLS_ICONS= yes USE_LDCONFIG= yes USE_GNOME= gtksourceview3 intlhack libgda5 libwnck3 vte3 GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-symbol-db-shm=/tmp \ --disable-packagekit \ --disable-neon \ --enable-compile-warnings=minimum \ --enable-introspection=yes DOCSDIR= share/doc/libanjuta INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.anjuta.cvs.gschema.xml \ org.gnome.anjuta.document-manager.gschema.xml \ org.gnome.anjuta.file-manager.gschema.xml \ org.gnome.anjuta.gschema.xml \ org.gnome.anjuta.plugins.build.gschema.xml \ org.gnome.anjuta.plugins.cpp.gschema.xml \ org.gnome.anjuta.plugins.debug-manager.gschema.xml \ org.gnome.anjuta.plugins.git.gschema.xml \ org.gnome.anjuta.plugins.indent-c.gschema.xml \ org.gnome.anjuta.plugins.indent-python.gschema.xml \ org.gnome.anjuta.plugins.js.gschema.xml \ org.gnome.anjuta.plugins.message-manager.gschema.xml \ org.gnome.anjuta.plugins.parser-cxx.gschema.xml \ org.gnome.anjuta.plugins.project-wizard.gschema.xml \ org.gnome.anjuta.plugins.python.gschema.xml \ org.gnome.anjuta.plugins.run.gschema.xml \ org.gnome.anjuta.plugins.sourceview.gschema.xml \ org.gnome.anjuta.plugins.vala.gschema.xml \ org.gnome.anjuta.snippets.gschema.xml \ org.gnome.anjuta.starter.gschema.xml \ org.gnome.anjuta.symbol-db.gschema.xml \ org.gnome.anjuta.terminal.gschema.xml \ org.gnome.anjuta.tools.gschema.xml OPTIONS_SUB= yes OPTIONS_DEFINE= SVN DEVHELP VALA GLADE TERMINAL OPTIONS_DEFAULT=SVN DEVHELP VALA GLADE TERMINAL SVN_DESC= Subversion plugin DEVHELP_DESC= Devhelp plugin VALA_DESC= Vala support GLADE_DESC= Build glade plugin TERMINAL_DESC= Build build-in terminal GLADE_LIB_DEPENDS= libgladeui-2.so:${PORTSDIR}/devel/glade GLADE_CONFIGURE_ENABLE= plugin-glade TERMINAL_USE= GNOME=vte3 TERMINAL_CONFIGURE_ENABLE= plugin-terminal SVN_BUILD_DEPENDS= svn:${PORTSDIR}/devel/subversion SVN_LIB_DEPENDS= libapr-1.so:${PORTSDIR}/devel/apr1 \ libserf-1.so:${PORTSDIR}/www/serf SVN_RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion SVN_CONFIGURE_ENABLE= plugin-subversion DEVHELP_LIB_DEPENDS= libdevhelp-3.so:${PORTSDIR}/devel/devhelp DEVHELP_CONFIGURE_ENBABLE= plugin-devhelp VALA_VER= 0.30 VALA_BUILD_DEPENDS= vala>=${VALA_VER}<${VALA_VER}.99:${PORTSDIR}/lang/vala VALA_RUN_DEPENDS= vala>=${VALA_VER}<${VALA_VER}.99:${PORTSDIR}/lang/vala VALA_CONFIGURE_ENABLE= vala post-patch: @${REINPLACE_CMD} -e 's|"make|"gmake|g' \ ${WRKSRC}/plugins/build-basic-autotools/plugin.c @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \ ${WRKSRC}/libanjuta/anjuta-utils.c @${REINPLACE_CMD} -e 's|ac_ct_CXX" = "x"|CXX" = "x"|g' \ -e 's|libvala-0.28|libvala-${VALA_VER}|g' \ -e 's|valaver="-0.28"|valaver="-${VALA_VER}"|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|values.h|limits.h|g' \ ${WRKSRC}/plugins/project-wizard/property.h \ ${WRKSRC}/plugins/project-wizard/install.h @${REINPLACE_CMD} -e 's|-fprofile-arcs||g' \ ${WRKSRC}/libanjuta/tests/Makefile.in \ ${WRKSRC}/libanjuta/tests/Makefile.am @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \ ${WRKSRC}/plugins/gdb/debugger.c .include Index: head/devel/gsoap/Makefile =================================================================== --- head/devel/gsoap/Makefile (revision 411989) +++ head/devel/gsoap/Makefile (revision 411990) @@ -1,44 +1,45 @@ # Created by: Sergey Matveychuk # $FreeBSD$ PORTNAME= gsoap PORTVERSION= 2.8.27 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2/gSOAP DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= bofh@FreeBSD.org COMMENT= Generator Tools for Coding SOAP/XML Web Services in C and C++ LICENSE= GPLv2 CONFIGURE_ENV= LEX=flex YACC=yacc GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes USES= pathfix zip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgpg-error.so:${PORTSDIR}/security/libgpg-error GNUTLS_CONFIGURE_ON= --enable-gnutls GNUTLS_LDFLAGS= -L${LOCALBASE}/lib OPENSSL_CONFIGURE_ENABLE= ssl post-patch: @${REINPLACE_CMD} -e 's| sys/timeb.h | |' \ -e 's|-DSOAPCPP_IMPORT_PATH=|-DSOAPCPP2_IMPORT_PATH=|' \ -e 's|-DWSDL_IMPORT_PATH=|-DWSDL2H_IMPORT_PATH=|' \ ${WRKSRC}/${CONFIGURE_SCRIPT} post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gsoap ${INSTALL_DATA} ${WRKSRC}/gsoap/stdsoap2.c ${WRKSRC}/gsoap/dom.cpp \ ${STAGEDIR}${PREFIX}/lib/gsoap @${LN} -fs stdsoap2.c ${STAGEDIR}${PREFIX}/lib/gsoap/stdsoap2.cpp @${LN} -fs dom.cpp ${STAGEDIR}${PREFIX}/lib/gsoap/dom.c .include Index: head/devel/gwenhywfar/Makefile =================================================================== --- head/devel/gwenhywfar/Makefile (revision 411989) +++ head/devel/gwenhywfar/Makefile (revision 411990) @@ -1,93 +1,93 @@ # $FreeBSD$ PORTNAME= gwenhywfar PORTVERSION= 4.14.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel net security MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=01&file=01&dummy=/ MAINTAINER?= jhale@FreeBSD.org COMMENT?= Multi-platform helper library for networking and security applications LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgnutls.so:${PORTSDIR}/security/gnutls USES= gettext gmake iconv libtool pathfix pkgconfig USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-release="yes" \ --with-guis="${SLAVEPORT}" CPPFLAGS+= -DGCRYPT_NO_DEPRECATED -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl INSTALL_TARGET= install-strip USE_LDCONFIG= yes GWEN_SHLIB_VER= 60 PLIST_SUB= GWEN_SHLIB_VER="${GWEN_SHLIB_VER}" .if !defined(SLAVEPORT) OPTIONS_DEFINE= DOXYGEN MEMDEBUG DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \ dot:${PORTSDIR}/graphics/graphviz DOXYGEN_CONFIGURE_ENABLE= full-doc MEMDEBUG_DESC= Enable memory debugger statistic MEMDEBUG_CONFIGURE_ENABLE= memtrace .endif .include .if defined(SLAVEPORT) LIB_DEPENDS+= libgwenhywfar.so:${PORTSDIR}/devel/gwenhywfar BUILD_WRKSRC= ${WRKSRC}/gui INSTALL_WRKSRC= ${WRKSRC}/gui/${SLAVEPORT} . if ${SLAVEPORT}=="fox16" LIB_DEPENDS+= libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16 CONFIGURE_ARGS+=--with-fox-includes=${LOCALBASE}/include/fox-1.6 \ --with-fox-libs=${LOCALBASE}/lib . endif . if ${SLAVEPORT}=="gtk2" USE_GNOME+= gtk20 . endif . if ${SLAVEPORT}=="qt4" USE_QT4= gui moc_build uic_build QT_NONSTANDARD= yes CONFIGURE_ARGS+=--with-qt4-includes=${QT_INCDIR} \ --with-qt4-libs=${QT_LIBDIR} \ --with-qt4-moc=${MOC} \ --with-qt4-uic=${UIC} . endif .endif post-patch: .if defined(SLAVEPORT) @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|[$$][(]top_builddir[)]/src/[$$][(]gwenhywfar_internal_libname[)]|$$(gwenhywfar_libs)|g' \ -e 's|[$$][(]builddir[)]/../cpp/libgwengui-cpp.la|-lgwengui-cpp|g' \ -e 's|[$$][(]top_builddir[)]/gui/cpp/libgwengui-cpp.la|-lgwengui-cpp|g' \ -e '/^SUBDIRS/s|cpp ||g' .endif post-build: .if ${PORT_OPTIONS:MDOXYGEN} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} srcdoc .endif post-install: .if ${PORT_OPTIONS:MDOXYGEN} ${MKDIR} ${STAGEDIR}${DOCSDIR}/apidoc cd ${WRKSRC}/apidoc && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/apidoc @${FIND} -P ${STAGEDIR}${DOCSDIR} -type f 2>/dev/null | \ ${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST} .endif .include Index: head/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c =================================================================== --- head/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c (nonexistent) +++ head/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c (revision 411990) @@ -0,0 +1,17 @@ +--- src/sio/syncio_tls.c.orig 2014-10-12 13:12:22 UTC ++++ src/sio/syncio_tls.c +@@ -361,12 +361,10 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO + + /* possibly force protocol priority */ + if (lflags & GWEN_SYNCIO_TLS_FLAGS_FORCE_SSL_V3) { +- const int proto_prio[2] = { GNUTLS_SSL3, 0 }; +- + DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3"); +- rv=gnutls_protocol_set_priority(xio->session, proto_prio); ++ rv=gnutls_priority_set_direct(xio->session, "NORMAL:-VERS-TLS-ALL:+VERS-SSL3.0", NULL); + if (rv) { +- DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv)); ++ DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_priority_set_direct: %d (%s)", rv, gnutls_strerror(rv)); + gnutls_deinit(xio->session); + return GWEN_ERROR_GENERIC; + } Property changes on: head/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/hs-git-annex/Makefile =================================================================== --- head/devel/hs-git-annex/Makefile (revision 411989) +++ head/devel/hs-git-annex/Makefile (revision 411990) @@ -1,121 +1,122 @@ # Created by: frase@frase.id.au # $FreeBSD$ PORTNAME= git-annex PORTVERSION= 5.20150727 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Manage files with git, without checking their contents into git LICENSE= GPLv3 USE_CABAL= optparse-applicative>=0.10 cryptohash>=0.11.0 exceptions>=0.6 \ QuickCheck>=2.1 stm>=2.3 mtl>=2 data-default case-insensitive \ uuid random dlist unix-compat SafeSemaphore async IfElse \ MissingH hslogger monad-logger utf8-string text sandi json \ monad-control bloomfilter edit-distance resourcet aws>=0.9.2 \ http-conduit http-types network>=2.6 network-uri>=2.6 USES= gmake perl5 USE_PERL5= build MAN1PAGES= git-annex.1 git-annex-shell.1 BUILD_DEPENDS+= rsync:${PORTSDIR}/net/rsync \ git:${PORTSDIR}/devel/git \ gsha256sum:${PORTSDIR}/sysutils/coreutils RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync \ git:${PORTSDIR}/devel/git \ gsha256sum:${PORTSDIR}/sysutils/coreutils EXECUTABLE= git-annex git-annex-shell STANDALONE= yes FLAGS_DEFINE= S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \ XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DESKTOPNOTIFY \ TORRENTPARSER EKG DATABASE FLAGS_DEFAULT= S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \ XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DATABASE S3_DESC= S3 support S3_FLAG_ENABLE= S3 S3_FLAG_CABAL= hS3 ASSISTANT_DESC= 'assistant' and 'watch' commands ASSISTANT_FLAG_ENABLE= Assistant INOTIFY_DESC= File system notifications support INOTIFY_FLAG_ENABLE= Inotify INOTIFY_FLAG_CABAL= hinotify WEBAPP_DESC= Web application (requires assistant) WEBAPP_FLAG_DEPENDS= ASSISTANT WEBAPP_FLAG_ENABLE= Webapp WEBAPP_FLAG_CABAL= yesod>=1.2.6 yesod-static>=1.2.4 yesod-form>=1.3.15 \ yesod-core>=1.2.19 path-pieces>=0.1.4 warp>=3.0.05 \ warp-tls wai wai-extra blaze-builder crypto-api \ clientsession aeson shakespeare>=2.0.0 WEBAPP_SECURE_DESC= Secure webapp (requires webbapp) WEBAPP_SECURE_FLAG_DEPENDS= WEBAPP WEBAPP_SECURE_FLAG_ENABLE= Webapp-secure WEBAPP_SECURE_FLAG_CABAL= warp-tls>=1.4 securemem byteable PAIRING_DESC= Enable pairing (requires web application) PAIRING_FLAG_DEPENDS= WEBAPP PAIRING_FLAG_ENABLE= Pairing PAIRING_FLAG_CABAL= network-multicast network-info XMPP_DESC= Enable notifications using XMPP (requires assistant) XMPP_FLAG_DEPENDS= ASSISTANT XMPP_FLAG_ENABLE= XMPP XMPP_FLAG_CABAL= gnutls>=0.1.4 network-protocol-xmpp xml-types DNS_DESC= Use the DNS library for lookups (requires XMPP) DNS_FLAG_DEPENDS= ASSISTANT XMPP DNS_FLAG_ENABLE= DNS DNS_FLAG_CABAL= dns PRODUCTION_DESC= Production build PRODUCTION_FLAG_ENABLE= Production TDFA_DESC= Use regex-tdfa for wildcards TDFA_FLAG_ENABLE= TDFA TDFA_FLAG_CABAL= regex-tdfa WEBDAV_DESC= WebDAV support WEBDAV_FLAG_ENABLE= WebDAV WEBDAV_FLAG_CABAL= DAV>=0.3 http-conduit xml-conduit http-types FEED_DESC= Podcast feed support FEED_FLAG_ENABLE= Feed FEED_FLAG_CABAL= feed QUVI_DESC= quvi to download videos QUVI_FLAG_ENABLE= Quvi QUVI_FLAG_CABAL= aeson TAHOE_DESC= Tahoe special remote TAHOE_FLAG_ENABLE= Tahoe TAHOE_FLAG_CABAL= aeson DESKTOPNOTIFY_DESC= Desktop environment notifications DESKTOPNOTIFY_FLAG_ENABLE= DesktopNotify TORRENTPARSER_DESC= Use haskell torrent library to parse torrent files TORRENTPARSER_FLAG_ENABLE= TorrentParser TORRENTPARSER_FLAG_CABAL= torrent>=10000.0.0 EKG_DESC= EKG for run-time monitoring EKG_FLAG_ENABLE= EKG EKG_FLAG_CABAL= ekg DATABASE_DESC= Build with persistent for database use DATABASE_FLAG_ENABLE= Database DATABASE_FLAG_CABAL= esqueleto persistent-sqlite persistent \ persistent-template .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: head/devel/librelp/Makefile =================================================================== --- head/devel/librelp/Makefile (revision 411989) +++ head/devel/librelp/Makefile (revision 411990) @@ -1,31 +1,32 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= librelp PORTVERSION= 1.2.9 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://download.rsyslog.com/librelp/ MAINTAINER= brd@FreeBSD.org COMMENT= Reliable event logging protocol library LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls USES= libtool pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip PLIST_FILES= include/${PORTNAME}.h \ lib/${PORTNAME}.a \ lib/${PORTNAME}.so lib/${PORTNAME}.so.0 \ lib/${PORTNAME}.so.0.1.0 \ libdata/pkgconfig/relp.pc PORT_VERBS= relp post-patch: @${REINPLACE_CMD} -e '/CFLAGS/s| -g||g' \ ${WRKSRC}/configure .include Index: head/devel/libvirt/Makefile =================================================================== --- head/devel/libvirt/Makefile (revision 411989) +++ head/devel/libvirt/Makefile (revision 411990) @@ -1,158 +1,159 @@ # Created by: Jason Helfman # $FreeBSD$ PORTNAME= libvirt PORTVERSION= 1.3.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ MAINTAINER= novel@FreeBSD.org COMMENT= Toolkit to interact with virtualization capabilities LICENSE= LGPL3 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libxml2.so:${PORTSDIR}/textproc/libxml2 \ libssh2.so:${PORTSDIR}/security/libssh2 BUILD_DEPENDS= dnsmasq:${PORTSDIR}/dns/dnsmasq \ xsltproc:${PORTSDIR}/textproc/libxslt RUN_DEPENDS= dnsmasq:${PORTSDIR}/dns/dnsmasq \ dmidecode:${PORTSDIR}/sysutils/dmidecode OPTIONS_DEFINE= DOCS GNUTLS NLS QEMU SASL OPTIONS_DEFAULT= GNUTLS OPTIONS_DEFINE_amd64= XEN .if exists(/usr/sbin/bhyve) OPTIONS_DEFINE_amd64+= BHYVE OPTIONS_DEFAULT_amd64+= BHYVE .else PLIST_SUB+= BHYVE="@comment " CONFIGURE_ARGS+= --without-bhyve .endif QEMU_DESC= QEMU driver BHYVE_DESC= bhyve driver XEN_DESC= Xen support via libxl OPTIONS_SUB= yes BHYVE_CONFIGURE_WITH= bhyve QEMU_CONFIGURE_WITH= qemu yajl QEMU_CFLAGS= -I${LOCALBASE}/include QEMU_LIB_DEPENDS= libyajl.so:${PORTSDIR}/devel/yajl QEMU_RUN_DEPENDS= dmidecode:${PORTSDIR}/sysutils/dmidecode \ qemu-io:${PORTSDIR}/emulators/qemu-devel GNUTLS_CONFIGURE_ON= --with-gnutls=${LOCALBASE} GNUTLS_CONFIGURE_OFF= --without-gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE} SASL_CONFIGURE_WITH= sasl SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 XEN_CONFIGURE_WITH= libxl XEN_CFLAGS= -I${LOCALBASE}/include XEN_LIB_DEPENDS= libxenlight.so:${PORTSDIR}/sysutils/xen-tools VARDIR= /var USE_RC_SUBR= libvirtd virtlogd GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-avahi \ --without-polkit \ --without-hal \ --without-udev \ --without-netcf \ --without-sysctl \ --without-lxc \ --without-uml \ --without-xen \ --without-login-shell \ --with-ssh2 \ --localstatedir=${VARDIR} # random_data fix can be removed when 8.x is eol CONFIGURE_ENV= ac_cv_type_struct_random_data="" # limit production release x.x.x PORTSCOUT= limit:\d+\.\d+\.\d+$$ LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector USES= charsetfix cpe gmake libtool pathfix perl5 pkgconfig CPE_VENDOR= redhat USE_PERL5= build USE_LDCONFIG= yes INSTALL_TARGET= install-strip SHLIB_VER= 0.1003.${PORTVERSION:E} PLIST_SUB+= PORTVERSION="-${PORTVERSION}" \ SHLIB_VER=${SHLIB_VER} PORTDOCS= * SUB_FILES= pkg-message .include .if !${PLIST_SUB:MXEN} PLIST_SUB+= XEN="@comment " .endif CONF_FILES= \ libvirt-admin.conf \ libvirt.conf \ libvirtd.conf \ libxl.conf \ qemu.conf \ virtlockd.conf \ virtlogd.conf post-patch: @${REINPLACE_CMD} -e 's|ln -s ../default.xml|true|' \ -e 's|$$(DESTDIR)$$(confdir)/qemu/networks|${STAGEDIR}${EXAMPLESDIR}/networks|' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's|cp $$(DESTDIR)|cp -f $$(DESTDIR)|' \ ${WRKSRC}/src/Makefile.in post-install: @${RMDIR} ${STAGEDIR}${EXAMPLESDIR}/networks/autostart @${MKDIR} ${STAGEDIR}${ETCDIR}/qemu/networks/autostart @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .for dir in run/libvirt/network \ run/libvirt/qemu \ run/libvirt/lockd \ log/libvirt/uml \ log/libvirt/qemu \ log/libvirt/lxc \ lib/libvirt/boot \ lib/libvirt/lockd/files \ lib/libvirt/images \ lib/libvirt/dnsmasq \ lib/libvirt/filesystems \ lib/libvirt/network \ lib/libvirt/qemu/channel/target \ cache/libvirt/qemu @${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}" .endfor .for file in ${CONF_FILES} @if test -f ${STAGEDIR}${ETCDIR}/${file}; then \ ${MV} ${STAGEDIR}${ETCDIR}/${file} \ ${STAGEDIR}${ETCDIR}/${file}.sample; fi .endfor regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Index: head/dns/knot2/Makefile =================================================================== --- head/dns/knot2/Makefile (revision 411989) +++ head/dns/knot2/Makefile (revision 411990) @@ -1,79 +1,80 @@ # Created by: Leo Vandewoestijne # $FreeBSD$ PORTNAME= knot DISTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ http://dns-lab.com/downloads/knot-dns/ PKGNAMESUFFIX= 2 MAINTAINER= freebsd@dns-lab.com COMMENT= High performance authoritative-only DNS server LICENSE= GPLv3 LIB_DEPENDS= libfstrm.so:${PORTSDIR}/devel/fstrm \ libgnutls.so:${PORTSDIR}/security/gnutls \ libjansson.so:${PORTSDIR}/devel/jansson \ liblmdb.so:${PORTSDIR}/databases/lmdb \ libnettle.so:${PORTSDIR}/security/nettle \ liburcu.so:${PORTSDIR}/sysutils/liburcu CONFLICTS= knot-1.* knot1-[0-6].* USES= alias libtool pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rundir=/var/run/knot \ --with-storage=/var/db/knot \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig .if defined(BATCH) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --disable-silent-rules .endif INSTALL_TARGET= install-strip USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message USERS= knot GROUPS= knot SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}" PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS OPTIONS_DEFINE= DNSTAP FASTPARSER IDN DNSTAP_DESC= dnstap support (see dnstap.info) DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_LIB_DEPENDS= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c # XXX: because `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from # `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which # should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure # script, provide it here explicitly as patching those files would result # in higher line count. Ideally this bug should be fixed upstream. DNSTAP_CPPFLAGS= -I${LOCALBASE}/include FASTPARSER_DESC= Fast zone parser (demanding compilation) FASTPARSER_CONFIGURE_ENABLE= fastparser IDN_CONFIGURE_WITH= libidn IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn post-patch: @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|' \ ${WRKSRC}/src/Makefile.in @${RM} -rf ${WRKSRC}/src/zscanner/scanner.c post-install: ${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \ ${STAGEDIR}${ETCDIR}/knot.conf.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .include Index: head/editors/abiword/Makefile =================================================================== --- head/editors/abiword/Makefile (revision 411989) +++ head/editors/abiword/Makefile (revision 411990) @@ -1,183 +1,183 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= abiword PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/ DIST_SUBDIR= AbiWord MAINTAINER= gnome@FreeBSD.org COMMENT= Open-source, cross-platform WYSIWYG word processor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libpopt.so:${PORTSDIR}/devel/popt \ libpng.so:${PORTSDIR}/graphics/png \ libwv.so:${PORTSDIR}/textproc/wv \ libfribidi.so:${PORTSDIR}/converters/fribidi \ libgoffice-0.10.so:${PORTSDIR}/devel/goffice010 RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu USES= desktop-file-utils gmake iconv jpeg libtool pathfix pkgconfig USE_GNOME= libxml2 gtk30 librsvg2 libxslt GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \ --enable-shared="yes" --enable-static="no" USE_LDCONFIG= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip PLIST_SUB+= ABIVERSION=3.0 OPTIONS_DEFINE= AIKSAURUS CLIPART DEBUG MATHVIEW NLS OTS PSION \ TEMPLATES WP OPTIONS_DEFAULT=CLIPART COLSERVICE COLSUGAR COLTCP SPELLCHECK TEMPLATES OPTIONS_SUB= yes OPTIONS_GROUP= DICT COLLAB OPTIONS_GROUP_DICT= GRAMMAR SPELLCHECK OPTIONS_GROUP_COLLAB= COLFAKE COLSERVICE COLSIP COLSUGAR COLTCP COLTELEPATHY COLXMPP AIKSAURUS_DESC= Thesaurus plugin CLIPART_DESC= Include clipart COLLAB_DESC= Collaboration backend COLFAKE_DESC= Fake collaboration for debugging purposes only COLSERVICE_DESC= Collaborate with AbiCollab.net webservice COLSIP_DESC= Collaborate with the SIP/SIMPLE backend COLSUGAR_DESC= Collaborate with the Sugar/OLPC environment COLTCP_DESC= Collaborate with direct TCP peer to peer connections COLTELEPATHY_DESC= Collaborate with the Telepathy backend (experimental) COLXMPP_DESC= Collaborate with the Jabber/XMPP backend DICT_DESC= Spelling and grammar checking GRAMMAR_DESC= Grammar checking plugin (requires SPELLCHECK option) MATHVIEW_DESC= MathML render plugin OTS_DESC= Text Summarizer plugin PSION_DESC= Psion 5(MX) files convertion plugin SPELLCHECK_DESC= Spell checking support TEMPLATES_DESC= Include additional templates WP_DESC= WordPerfect img/doc import/export plugin # check configure for ALL_PLUGINS for complete list ABIWORD_PLUGINS= garble loadbindings opml xslfo bmp iscii sdw babelfish \ paint command latex pdf wikipedia hrtext openxml \ goffice wmf kword mif wml s5 freetranslation gdict mht \ applix t602 docbook google eml hancom presentation \ clarisworks pdb urldict openwriter mswrite gimp \ passepartout eml # opendocument enabled by default, rsvg plugin isn't needed on unix. # Plugins we don't support: # gda AIKSAURUS_LIB_DEPENDS= libAiksaurusGTK-1.2.so:${PORTSDIR}/textproc/aiksaurus-gtk CLIPART_CONFIGURE_ENABLE= clipart COLFAKE_CONFIGURE_ENABLE= collab-backend-fake COLSERVICE_CONFIGURE_ENABLE= collab-backend-service COLSERVICE_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio COLSERVICE_LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ libgnutls.so:${PORTSDIR}/security/gnutls COLSERVICE_RUN_DEPENDS= ${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio COLSIP_CONFIGURE_ENABLE= collab-backend-sip COLSUGAR_CONFIGURE_ENABLE= collab-backend-sugar COLSUGAR_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib COLTCP_CONFIGURE_ENABLE= collab-backend-tcp COLTCP_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio COLTCP_RUN_DEPENDS= ${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio COLTELEPATHY_CONFIGURE_ENABLE= collab-backend-telepathy COLTELEPATHY_LIB_DEPENDS= libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib COLXMPP_CONFIGURE_ENABLE= collab-backend-xmpp COLXMPP_LIB_DEPENDS= libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth DEBUG_CONFIGURE_ENABLE= debug GRAMMAR_LIB_DEPENDS= liblink-grammar.so:${PORTSDIR}/textproc/link-grammar MATHVIEW_USES= bison MATHVIEW_LIB_DEPENDS= libmathview.so:${PORTSDIR}/x11-toolkits/gtkmathview NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OTS_LIB_DEPENDS= libots-1.so:${PORTSDIR}/textproc/ots PSION_LIB_DEPENDS= libpsiconv.so:${PORTSDIR}/converters/psiconv SPELLCHECK_LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant SPELLCHECK_CONFIGURE_ENABLE= spell TEMPLATES_CONFIGURE_ENABLE= templates WP_USE= gnome=libgsf WP_LIB_DEPENDS= libwpg-0.3.so:${PORTSDIR}/graphics/libwpg03 \ libwpd-0.10.so:${PORTSDIR}/textproc/libwpd010 \ libwps-0.4.so:${PORTSDIR}/textproc/libwps .include .if ${PORT_OPTIONS:MAIKSAURUS} ABIWORD_PLUGINS+= aiksaurus .endif .if ${PORT_OPTIONS:MCOL*} PLIST_SUB+= COLLAB="" ABIWORD_PLUGINS+= collab .else PLIST_SUB+= COLLAB="@comment " .endif .if ${PORT_OPTIONS:MGRAMMAR} ABIWORD_PLUGINS+= grammar .endif .if ${PORT_OPTIONS:MMATHVIEW} ABIWORD_PLUGINS+= mathview .endif .if ${PORT_OPTIONS:MOTS} ABIWORD_PLUGINS+= ots .endif .if ${PORT_OPTIONS:MPSION} ABIWORD_PLUGINS+= psion .endif .if ${PORT_OPTIONS:MWP} ABIWORD_PLUGINS+= wpg wordperfect .endif post-patch: @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ ${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \ ${WRKSRC}/src/af/util/xp/ut_go_file.h # The following substitutions ensure that plugins are linked with libabiword # from the work or stage directory instead of a previously installed library. # In pseudo code: # s,PLUGIN_LIBS="$PLUGIN_LIBS -Lsrc -labiword", # PLUGIN_LIBS="src/libabiword.la $PLUGIN_LIBS", # s,foo_LIBS="$foo_LIBS $PLUGIN_LIBS", # foo_LIBS="$PLUGIN_LIBS $foo_LIBS", # The initial value of PLUGIN_LIBS may contain -L/usr/local/lib so it would # have to come after -Lsrc, but -Lsrc is not correct when libtool relinks # plugins during staging so use src/libabiword.la and let libtool figure out # what flags are needed. Secondly, switch around foo_LIBS and PLUGIN_LIBS # because foo_LIBS may contain -L/usr/local/lib. @${REINPLACE_CMD} \ -e "s,\$$PLUGIN_LIBS \"'-L\$${top_builddir}/src'\" -labiword-\$$ABIWORD_SERIES,\\\\\$${top_builddir}/src/libabiword-\$$ABIWORD_SERIES.la \$$PLUGIN_LIBS," \ -e "/_LIBS=/s,\"\\(.*\\)\"\\('\$${PLUGIN_LIBS}.*'\\),\\2\" \\1\"," \ -e 's|" == "|" = "|g' ${WRKSRC}/configure .include Index: head/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp =================================================================== --- head/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp (nonexistent) +++ head/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp (revision 411990) @@ -0,0 +1,24 @@ +--- plugins/collab/backends/service/xp/tls_tunnel.cpp.orig 2014-11-04 01:12:14 UTC ++++ plugins/collab/backends/service/xp/tls_tunnel.cpp +@@ -306,8 +306,6 @@ void Proxy::tunnel_(transport_ptr_t tran + disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr); + } + +-static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 }; +-static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 }; + + // FIXME: this clientproxy can only handle 1 SSL connection at the same time + ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, +@@ -399,9 +397,9 @@ session_ptr_t ClientProxy::setup_tls_ses + + // setup session + return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t()); +- return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t()); +- return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t()); +- return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t()); ++ return_val_if_neg(gnutls_priority_set_direct(*session_ptr,"NORMAL" ++ ":-CIPHER-ALL:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:+ARCFOUR-128" ++ ":-KX-ALL:+ANON-DH:+RSA:+DHE-DSS:+DHE-RSA",NULL), session_ptr_t()); + return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t()); + + // setup transport Property changes on: head/editors/abiword/files/patch-plugins_collab_backends_service_xp_tls_tunnel.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/emacs/Makefile =================================================================== --- head/editors/emacs/Makefile (revision 411989) +++ head/editors/emacs/Makefile (revision 411990) @@ -1,255 +1,255 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 3 CATEGORIES= editors ipv6 MASTER_SITES= GNU PKGNAMESUFFIX?= 24 PATCH_SITE_SUBDIR+= ashish PATCH_DIST_STRIP= -p1 MAINTAINER= ashish@FreeBSD.org COMMENT= GNU editing macros LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \ xemacs-[0-9]* xemacs-devel-[0-9]* xemacs-mule-[0-9]* \ xemacs-devel-mule-[0-9]* \ emacs-devel-[0-9]* EMACS_VER= 24.5 GNU_CONFIGURE= yes USES= cpe gmake makeinfo ncurses pkgconfig shebangfix tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INFO_PATH= ${DATADIR_REL}/info WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CPE_VENDOR= gnu SUB_FILES= pkg-install SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} SHEBANG_FILES= lib-src/grep-changelog CONFIGURE_ARGS= --localstatedir=/var PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} MAKE_ENV= LC_ALL=C INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \ ebrowse ede ediff edt efaq eieio eintr elisp emacs-gnutls \ emacs-mime emacs epa erc ert eshell eudc eww flymake forms \ gnus htmlfontify idlwave ido info mairix-el message mh-e \ newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex \ remember sasl sc semantic ses sieve smtpmail speedbar srecode \ todo-mode tramp url vip viper widget wisent woman OPTIONS_DEFINE= CANNA X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \ XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY OPTIONS_SINGLE= X11 SOUND CANNA_DESC= Canna support ACL_DESC= ACL support GSETTINGS_DESC= GSettings support SCROLLBARS_DESC= Toolkit scroll-bars SOUND_DESC= Sound support SOURCES_DESC= Install sources XAW_DESC= Athena widgets XAW3D_DESC= Athena3D widgets XIM_DESC= X Input Method Support M17N_DESC= M17N support for text-shaping OTF_DESC= Opentype fonts suport FILENOTIFY_DESC= File notification support LTO_DESC= Enable link-time optimization (requires GCC 4.6+) OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF OPTIONS_SINGLE_SOUND= ALSA OSS .if !defined(EMACS_NO_X11_SLAVE) OPTIONS_DEFAULT=DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF \ SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS OSS X11 CONFLICTS+= emacs-nox11-[0-9]* .else OPTIONS_DEFAULT=SOURCES GNUTLS XML CONFLICTS+= emacs24-[0-9]* .endif OPTIONS_SUB= SOURCES CANNA_CONFIGURE_ON= --with-canna \ --with-canna-includes=${LOCALBASE}/include \ --with-canna-libraries=${LOCALBASE}/lib CANNA_PATCH_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ LOCAL CANNA_PATCHFILES= emacs24.4canna-20141030.diff.gz CANNA_LIB_DEPENDS= libcanna.so:${PORTSDIR}/japanese/canna-lib SOUND_CONFIGURE_OFF= --with-sound=no ALSA_CONFIGURE_ON= --with-sound=alsa ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib OSS_CONFIGURE_ON= --with-sound=oss DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_WITH= dbus GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls XML_USE= GNOME=libxml2 XML_CONFIGURE_WITH= xml2 SVG_USE= GNOME=librsvg2 SVG_CONFIGURE_WITH= rsvg X11_CONFIGURE_WITH= x X11_USE= XORG=x11 X11_USES= desktop-file-utils GTK2_USE= GNOME=gtk20 GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 GTK3_USE= GNOME=gtk30 GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 XAW3D_LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw XAW_CONFIGURE_ON+= --with-x-toolkit=athena --without-xaw3d MOTIF_USES= motif MOTIF_CONFIGURE_ON+= --with-x-toolkit=motif SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff TIFF_CONFIGURE_WITH= tiff GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib GIF_CONFIGURE_WITH= gif PNG_LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_WITH= png XPM_USE= XORG=xpm XPM_CONFIGURE_WITH= xpm XFT_USE= XORG=xft XFT_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 XFT_CONFIGURE_WITH= xft M17N_LIB_DEPENDS= libm17n.so:${PORTSDIR}/devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf OTF_CONFIGURE_WITH= libotf MAGICK_LIB_DEPENDS= libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick GSETTINGS_USE= gnome=glib20 GSETTINGS_CONFIGURE_WITH= gsettings GCONF_USE= gnome=gconf2 GCONF_CONFIGURE_WITH= gconf XIM_CONFIGURE_WITH= xim LTO_CONFIGURE_ON= --enable-link-time-optimization LTO_USE= GCC=4.6+ ACL_CONFIGURE_OFF= --disable-acl FILENOTIFY_CONFIGURE_ON= --with-file-notification=gfile FILENOTIFY_CONFIGURE_OFF= --without-file-notification FILENOTIFY_USE= GNOME=glib20 .include # clang is broken on i386 platform in -O2, due to use of alloca, and stack realignment # and %esi as frame pointer register # http://llvm.org/bugs/show_bug.cgi?id=18171 # fixed in r263312 (11-CURRENT), and fixed in r263765 (10-STABLE) .if ${ARCH} == "i386" .if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100015) USE_GCC= any .endif .endif DBUS_PTHREAD_LIBS= ${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE} .if ${PORT_OPTIONS:MX11} INSTALLS_ICONS= yes .if !${PORT_OPTIONS:MXFT} .if ${PORT_OPTIONS:MM17N} IGNORE= m17n support for text-shaping requires Xft. Please run 'make config' .elif ${PORT_OPTIONS:MOTF} IGNORE= opentype fonts support requires Xft. Please run 'make config' .endif .endif .else .for OPT in SVG GTK2 GTK3 XAW3D XAW MOTIF SCROLLBARS JPEG TIFF GIF PNG XPM XFT M17N MAGICK GCONF GSETTINGS XIM .if ${PORT_OPTIONS:M${OPT}} IGNORE= option ${OPT} requires requires X11 option .endif .endfor .endif .if !${PORT_OPTIONS:MDBUS} .if ${PORT_OPTIONS:MGSETTINGS} IGNORE= support for GSettings requires DBUS. Please run 'make config' .endif .endif .include # Building with GCC 4.6+ requires it .if ${ncurses_ARGS} == "port" LDFLAGS+= -ltinfo .endif .if ${ARCH} == "ia64" BROKEN= Emacs 24.X does not currently build on ia64 .endif post-patch: @${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el .if empty(PORT_OPTIONS:MX11) @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop .endif post-configure: @${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \ ${WRKSRC}/src/Makefile post-install: @${RM} -rf ${STAGEDIR}/var/games/emacs .if ${PORT_OPTIONS:MSOURCES} @${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src ${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el .endif @${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name '*.gz' -exec ${GUNZIP_CMD} '{}' \; .if !defined(WITHOUT_X11) pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11." @${ECHO_MSG} .endif .include Index: head/editors/emacs-devel/Makefile =================================================================== --- head/editors/emacs-devel/Makefile (revision 411989) +++ head/editors/emacs-devel/Makefile (revision 411990) @@ -1,253 +1,254 @@ # Created by: Kenneth Vestergaard Schmidt # $FreeBSD$ PORTNAME= emacs PORTVERSION= ${EMACS_VER} +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= editors ipv6 MASTER_SITES= GNU_ALPHA/emacs/pretest PKGNAMESUFFIX= -devel MAINTAINER= ashish@FreeBSD.org COMMENT= GNU editing macros LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_sparc64= fails to compile at bootstrap phase BROKEN_ia64= Emacs 24.X does not currently build on ia64 CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* \ emacs23-[0-9]* emacs24-[0-9]* xemacs-[0-9]* \ xemacs-devel-[0-9]* xemacs-mule-[0-9]* \ xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]* EMACS_VER= 25.0.92 GNU_CONFIGURE= yes USES= cpe gmake makeinfo ncurses pkgconfig tar:xz INFO_PATH= ${DATADIR_REL}/info CPE_VENDOR= gnu SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\ ${CONFIGURE_TARGET} CONFIGURE_ARGS= --localstatedir=/var --with-gameuser=games:games PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} MAKE_ENV= LC_ALL=C INFO= ada-mode auth autotype bovine calc ccmode cl dbus \ dired-x ebrowse ede ediff edt efaq eieio eintr elisp \ emacs emacs-gnutls emacs-mime epa erc ert eshell eudc \ eww flymake forms gnus htmlfontify idlwave ido info \ mairix-el message mh-e newsticker nxml-mode \ octave-mode org pcl-cvs pgg rcirc reftex remember \ sasl sc semantic ses sieve smtpmail speedbar srecode \ todo-mode tramp url vhdl-mode vip viper widget wisent \ woman OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND \ SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK \ GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES XWIDGETS OPTIONS_SINGLE= X11 SOUND ACL_DESC= ACL support GSETTINGS_DESC= GSettings support SCROLLBARS_DESC=Toolkit scroll-bars SOUND_DESC= Sound support SOURCES_DESC= Install sources XAW_DESC= Athena widgets XAW3D_DESC= Athena3D widgets XIM_DESC= X Input Method Support M17N_DESC= M17N support for text-shaping OTF_DESC= Opentype fonts suport FILENOTIFY_DESC=File notification support LTO_DESC= Enable link-time optimization (requires GCC 4.6+) LLDB_DESC= Enable lldb support for GUD (from llvm.org) MODULES_DESC= Dynamic modules support XWIDGETS_DESC= Enable use of some GTK widgets in Emacs buffers OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF OPTIONS_SINGLE_SOUND= ALSA OSS OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2 \ JPEG M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOUND \ SOURCES SVG TIFF X11 XFT XIM XML XPM OPTIONS_SUB= YES LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el SOUND_CONFIGURE_OFF= --with-sound=no ALSA_CONFIGURE_ON= --with-sound=alsa ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib OSS_CONFIGURE_ON= --with-sound=oss DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_WITH= dbus GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls XML_USE= GNOME=libxml2 XML_CONFIGURE_WITH= xml2 SVG_USE= GNOME=librsvg2 SVG_CONFIGURE_WITH= rsvg X11_CONFIGURE_WITH= x X11_USE= XORG=x11 X11_USES= desktop-file-utils GTK2_USE= GNOME=gtk20 GTK2_CONFIGURE_ON= -with-x-toolkit=gtk2 GTK3_USE= GNOME=gtk30 GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 XAW3D_LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw XAW_CONFIGURE_ON+= --with-x-toolkit=athena --without-xaw3d MOTIF_USES= motif MOTIF_CONFIGURE_ON+= --with-x-toolkit=motif SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars SYNC_INPUT_CONFIGURE_WITH=sync-input JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff TIFF_CONFIGURE_WITH= tiff GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib GIF_CONFIGURE_WITH= gif PNG_LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_WITH= png XPM_USE= XORG=xpm XPM_CONFIGURE_WITH= xpm XFT_USE= XORG=xft XFT_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 XFT_CONFIGURE_WITH= xft M17N_LIB_DEPENDS= libm17n.so:${PORTSDIR}/devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf OTF_CONFIGURE_WITH= libotf MAGICK_LIB_DEPENDS=libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick GSETTINGS_USE= gnome=glib20 GSETTINGS_CONFIGURE_WITH=gsettings GCONF_USE= gnome=gconf2 GCONF_CONFIGURE_WITH= gconf XIM_CONFIGURE_WITH= xim LTO_CONFIGURE_ON= --enable-link-time-optimization LTO_USE= GCC=4.6+ ACL_CONFIGURE_OFF= --disable-acl FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile FILENOTIFY_CONFIGURE_OFF=--without-file-notification FILENOTIFY_USE= GNOME=glib20 CAIRO_USE= GNOME=cairo CAIRO_CONFIGURE_ON= --with-cairo MODULES_CONFIGURE_ON= --with-modules XWIDGETS_CONFIGURE_ON= --with-xwidgets XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 .include # clang is broken on i386 platform in -O2, due to use of alloca, and # stack realignment and %esi as frame pointer register # http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312 # (11-CURRENT), and fixed in r263765 (10-STABLE) .if ${ARCH} == "i386" .if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && \ ${OSVERSION} < 1100015) USE_GCC= any .endif .endif .if ${PORT_OPTIONS:MX11} INSTALLS_ICONS= yes .if !${PORT_OPTIONS:MXFT} .if ${PORT_OPTIONS:MM17N} IGNORE= m17n requires Xft. Please run 'make config' .elif ${PORT_OPTIONS:MOTF} IGNORE= support for Opentype fonts require Xft. Please run 'make config' .endif .endif .else .for OPT in GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF \ PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM .if ${PORT_OPTIONS:M${OPT}} IGNORE= option ${OPT} requires X11 option .endif .endfor .endif .if !${PORT_OPTIONS:MDBUS} .if ${PORT_OPTIONS:MGSETTINGS} IGNORE= support for GSettings requires DBUS. Please run 'make config' .endif .endif .if !${PORT_OPTIONS:MGTK3} .if ${PORT_OPTIONS:MXWIDGETS} IGNORE= support for XWidgets requires GTK3. Please run 'make config' .endif .endif .include # Building with GCC 4.6+ requires it .if ${ncurses_ARGS} == "port" LDFLAGS+= -ltinfo .endif post-patch: @${RM} -f ${WRKSRC}/info/* @${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \ "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el .if empty(PORT_OPTIONS:MX11) @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \ ${WRKSRC}/etc/emacs.desktop .endif post-install: .if ${PORT_OPTIONS:MSOURCES} @${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \ ${STAGEDIR}${DATADIR}/${EMACS_VER}/src ${INSTALL_DATA} ${WRKSRC}/sources.el \ ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el .endif @${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \ '*.gz' -exec ${GUNZIP_CMD} '{}' \; .if !defined(WITHOUT_X11) pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "====> Define WITHOUT_X11 to disable X11 support." @${ECHO_MSG} .endif .include Index: head/editors/vanubi/Makefile =================================================================== --- head/editors/vanubi/Makefile (revision 411989) +++ head/editors/vanubi/Makefile (revision 411990) @@ -1,32 +1,33 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= vanubi PORTVERSION= 0.0.16 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= olivierd@FreeBSD.org COMMENT= Programming editor written in Vala LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala GH_TAGNAME= eedac1d USE_GITHUB= yes USES= autoreconf desktop-file-utils execinfo gmake libtool pkgconfig GNU_CONFIGURE= yes USE_GNOME= glib20 gtk30 gtksourceview3 libwnck3 vte3 USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS=--without-asciidoc --disable-static post-patch: ${REINPLACE_CMD} -e 's|vte-2.90|vte-2.91|' \ ${WRKSRC}/configure.ac .include Index: head/emulators/qemu/Makefile =================================================================== --- head/emulators/qemu/Makefile (revision 411989) +++ head/emulators/qemu/Makefile (revision 411990) @@ -1,202 +1,203 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= qemu PORTVERSION= 2.4.1 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER= bofh@FreeBSD.org COMMENT?= QEMU CPU Emulator LICENSE= GPLv2 HAS_CONFIGURE= yes USES= cpe gmake pkgconfig bison perl5 python:2,build tar:bzip2 USE_PERL5= build USE_XORG= pixman USE_GNOME+= glib20 MAKE_ENV+= BSD_MAKE="${MAKE}" ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts? OPTIONS_DEFINE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ STATIC_LINK DOCS BSD_USER SAMBA_DESC= samba dependency (for -smb) GNUTLS_DESC= gnutls dependency (vnc encryption) SASL_DESC= cyrus-sasl dependency (vnc encryption) JPEG_DESC= jpeg dependency (vnc lossy compression) PNG_DESC= png dependency (vnc compression) CDROM_DMA_DESC= IDE CDROM DMA PCAP_DESC= pcap dependency (networking with bpf) USBREDIR_DESC= usb device network redirection (experimental!) GNS3_DESC= gns3 patches (promiscuous multicast) X86_TARGETS_DESC= Don't build non-x86 system targets BSD_USER_DESC= Also build bsd-user targets (for testing) STATIC_LINK_DESC= Statically link the executables OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP GNS3 OPTIONS_SUB= yes X11_USE= SDL=sdl X11_CONFIGURE_ON= --enable-sdl X11_CONFIGURE_OFF= --disable-sdl GTK2_USE= GNOME=gtk20,vte GTK2_USES= gettext GTK2_CONFIGURE_OFF= --disable-gtk --disable-vte GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_OFF= --disable-vnc-tls SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 SASL_CONFIGURE_OFF= --disable-vnc-sasl JPEG_USES= jpeg JPEG_CONFIGURE_OFF= --disable-vnc-jpeg PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_OFF= --disable-vnc-png CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl CURL_CONFIGURE_OFF= --disable-curl OPENGL_USE= GL=yes OPENGL_CONFIGURE_OFF= --disable-opengl USBREDIR_BUILD_DEPENDS= usbredir>=0.6:${PORTSDIR}/net/usbredir USBREDIR_RUN_DEPENDS= usbredir>=0.6:${PORTSDIR}/net/usbredir USBREDIR_CONFIGURE_OFF= --disable-usb-redir PCAP_CONFIGURE_ON= --enable-pcap STATIC_LINK_CONFIGURE_ON= --static SAMBA_RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba36 DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html DOCS_USES= makeinfo DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1 .if !defined(QEMU_USER_STATIC) CONFLICTS_INSTALL= qemu-devel-[0-9]* qemu-sbruno-[0-9]* .endif PORTDOCS= docs qemu-doc.html qemu-tech.html qmp-commands.txt WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --disable-smartcard-nss --disable-libssh2 --enable-debug \ --prefix=${PREFIX} --cc=${CC} --enable-docs --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --smbd=${LOCALBASE}/sbin/smbd --enable-debug-info --python=${PYTHON_CMD} \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" .include .if defined(QEMU_USER_STATIC) .if ${ARCH} != "amd64" CONFIGURE_ARGS+= --target-list=i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user .else CONFIGURE_ARGS+= --target-list=i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user .endif .else .if ${PORT_OPTIONS:MX86_TARGETS} .if ${PORT_OPTIONS:MBSD_USER} .if ${ARCH} != "amd64" CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user .else CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user .endif .else CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu .endif .else .if empty(PORT_OPTIONS:MBSD_USER) CONFIGURE_ARGS+= --disable-bsd-user .else .if ${ARCH} != "amd64" CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,aarch64-softmmu,alpha-softmmu,arm-softmmu,cris-softmmu,lm32-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mipsel-softmmu,mips64-softmmu,mips64el-softmmu,or32-softmmu,ppc-softmmu,ppcemb-softmmu,ppc64-softmmu,sh4-softmmu,sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,s390x-softmmu,xtensa-softmmu,xtensaeb-softmmu,unicore32-softmmu,moxie-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user .endif .endif .endif .endif .if ${PORT_OPTIONS:MBSD_USER} && ${ARCH} == "sparc64" IGNORE= bsd-user targets not tested on sparc64 .endif .if empty(PORT_OPTIONS:MBSD_USER) || ${ARCH} != "amd64" PLIST_SUB+= BSD_USER64="@comment " .else PLIST_SUB+= BSD_USER64="" .endif .if defined(QEMU_USER_STATIC) PLIST_SUB+= SOFTMMU="@comment " STATIC="-static" .else PLIST_SUB+= SOFTMMU="" STATIC="" .endif .if ${PORT_OPTIONS:MSTATIC_LINK} && (${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MX11}) IGNORE= X11 ui cannot be built static .endif .if !defined(STRIP) || ${STRIP} == "" CONFIGURE_ARGS+=--disable-strip .endif .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif .if ${ARCH} == "powerpc" MAKE_ARGS+= ARCH=ppc .endif .if ${ARCH} == "powerpc64" MAKE_ARGS+= ARCH=ppc64 .endif .if ${ARCH} == "sparc64" CONFIGURE_ARGS+= --sparc_cpu=v9 .endif # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) # but it shouldn't matter much post-patch: @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure @${REINPLACE_CMD} -E \ -e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \ ${WRKSRC}/qemu-doc.texi @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile.target @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/scripts/texi2pod.pl post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/hw/ide/internal.h post-patch-GNS3-on: @${REINPLACE_CMD} -e 's|(buf\[0\] & 1) && (rctl & E1000_RCTL_MPE)|buf[0] \& 1|' \ ${WRKSRC}/hw/net/e1000.c post-patch-PCAP-on: @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet post-configure: @${REINPLACE_CMD} -E \ -e "s|^(HOST_USB=)bsd|\1stub|" \ ${WRKSRC}/config-host.mak .if !target(post-install) post-install: ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) .endif .include Index: head/emulators/qemu-devel/Makefile =================================================================== --- head/emulators/qemu-devel/Makefile (revision 411989) +++ head/emulators/qemu-devel/Makefile (revision 411990) @@ -1,150 +1,150 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= qemu DISTVERSION= 2.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ PKGNAMESUFFIX= -devel MAINTAINER= bofh@FreeBSD.org COMMENT= QEMU CPU Emulator - development version LICENSE= GPLv2 HAS_CONFIGURE= yes USES= cpe gmake pkgconfig bison perl5 python:2,build tar:bzip2 USE_PERL5= build USE_XORG= pixman USE_GNOME+= glib20 MAKE_ENV+= BSD_MAKE="${MAKE}" ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts? OPTIONS_DEFINE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ STATIC_LINK DOCS SAMBA_DESC= samba dependency (for -smb) GNUTLS_DESC= gnutls dependency (vnc encryption) SASL_DESC= cyrus-sasl dependency (vnc encryption) JPEG_DESC= jpeg dependency (vnc lossy compression) PNG_DESC= png dependency (vnc compression) CDROM_DMA_DESC= IDE CDROM DMA PCAP_DESC= pcap dependency (networking with bpf) USBREDIR_DESC= usb device network redirection (experimental!) GNS3_DESC= gns3 patches (promiscuous multicast) X86_TARGETS_DESC= Don't build non-x86 system targets STATIC_LINK_DESC= Statically link the executables OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP GNS3 OPTIONS_SUB= yes X11_USE= SDL=sdl X11_CONFIGURE_ON= --enable-sdl X11_CONFIGURE_OFF= --disable-sdl GTK2_USE= GNOME=gtk20,vte GTK2_USES= gettext GTK2_CONFIGURE_OFF= --disable-gtk --disable-vte GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_OFF= --disable-gnutls SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 SASL_CONFIGURE_OFF= --disable-vnc-sasl JPEG_USES= jpeg JPEG_CONFIGURE_OFF= --disable-vnc-jpeg PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_OFF= --disable-vnc-png CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl CURL_CONFIGURE_OFF= --disable-curl OPENGL_USE= GL=yes OPENGL_CONFIGURE_OFF= --disable-opengl USBREDIR_BUILD_DEPENDS= usbredir>=0.6:${PORTSDIR}/net/usbredir USBREDIR_RUN_DEPENDS= usbredir>=0.6:${PORTSDIR}/net/usbredir USBREDIR_CONFIGURE_OFF= --disable-usb-redir PCAP_CONFIGURE_ON= --enable-pcap PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-patch STATIC_LINK_CONFIGURE_ON= --static STATIC_LINK_PREVENTS= GTK2 X11 STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static SAMBA_RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba36 DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html DOCS_USES= makeinfo DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1 PORTDOCS= docs qemu-doc.html qemu-tech.html qmp-commands.txt WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --disable-libssh2 --enable-debug \ --prefix=${PREFIX} --cc=${CC} --enable-docs --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --smbd=${LOCALBASE}/sbin/smbd --enable-debug-info --python=${PYTHON_CMD} \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" .include .if !defined(STRIP) || ${STRIP} == "" CONFIGURE_ARGS+=--disable-strip .endif .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif .if ${ARCH} == "powerpc" MAKE_ARGS+= ARCH=ppc .endif .if ${ARCH} == "powerpc64" MAKE_ARGS+= ARCH=ppc64 .endif .if ${ARCH} == "sparc64" CONFIGURE_ARGS+= --sparc_cpu=v9 .endif # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) # but it shouldn't matter much post-patch: @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure @${REINPLACE_CMD} -E \ -e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \ ${WRKSRC}/qemu-doc.texi @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile.target @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/scripts/texi2pod.pl post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/hw/ide/internal.h post-patch-GNS3-on: @${REINPLACE_CMD} -e 's|(buf\[0\] & 1) && (rctl & E1000_RCTL_MPE)|buf[0] \& 1|' \ ${WRKSRC}/hw/net/e1000.c # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet post-configure: @${REINPLACE_CMD} -E \ -e "s|^(HOST_USB=)bsd|\1stub|" \ ${WRKSRC}/config-host.mak .if !target(post-install) post-install: ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-* post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) .endif .include Index: head/emulators/qemu-sbruno/Makefile =================================================================== --- head/emulators/qemu-sbruno/Makefile (revision 411989) +++ head/emulators/qemu-sbruno/Makefile (revision 411990) @@ -1,282 +1,282 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= qemu PORTVERSION= 2.5.50.g20160215 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= GH \ LOCAL/nox:dtc \ http://people.freebsd.org/~nox/tmp/distfiles/:dtc PKGNAMESUFFIX?= -sbruno DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ dtc-v1.4.0${EXTRACT_SUFX}:dtc DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER= sbruno@FreeBSD.org COMMENT?= QEMU CPU Emulator - github bsd-user branch USE_GITHUB= yes GH_ACCOUNT= seanbruno GH_PROJECT= ${PORTNAME}-bsd-user GH_TAGNAME= cada59f HAS_CONFIGURE= yes USES= gmake pkgconfig bison perl5 python:2,build USE_PERL5= build USE_XORG= pixman USE_GNOME+= glib20 PATCH_STRIP= -p1 MAKE_ENV+= BSD_MAKE="${MAKE}" ONLY_FOR_ARCHS= amd64 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts? BROKEN_i386= aarch64 system target is currently broken for i386 hosts, disable for now while dealing with upstream. OPTIONS_DEFINE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ CDROM_DMA PCAP USBREDIR X86_TARGETS BSD_USER \ STATIC_LINK DOCS SAMBA_DESC= samba dependency (for -smb) GNUTLS_DESC= gnutls dependency (vnc encryption) SASL_DESC= cyrus-sasl dependency (vnc encryption) JPEG_DESC= jpeg dependency (vnc lossy compression) PNG_DESC= png dependency (vnc compression) CDROM_DMA_DESC= IDE CDROM DMA PCAP_DESC= pcap dependency (networking with bpf) USBREDIR_DESC= usb device network redirection (experimental!) X86_TARGETS_DESC= Don't build non-x86 system targets BSD_USER_DESC= Also build bsd-user targets (for testing) STATIC_LINK_DESC= Statically link the executables OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP .if !defined(QEMU_USER_STATIC) CONFLICTS_INSTALL= qemu-[0-9]* qemu-devel-* .endif .if defined(QEMU_USER_STATIC) .if exists(/usr/sbin/binmiscctl) USE_RC_SUBR= qemu_user_static SUB_LIST= NAME=qemu_user_static .endif .endif .include CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --extra-ldflags=-L\"${LOCALBASE}/lib\" CONFIGURE_ARGS+= --disable-libssh2 PORTDOCS= docs qemu-doc.html qemu-tech.html qmp-commands.txt .if defined(QEMU_USER_STATIC) .if ${ARCH} != "amd64" CONFIGURE_ARGS+= --target-list=i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user .else CONFIGURE_ARGS+= --target-list=i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user .endif .else .if ${PORT_OPTIONS:MX86_TARGETS} .if ${PORT_OPTIONS:MBSD_USER} .if ${ARCH} != "amd64" CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user .else CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user .endif .else CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu .endif .else .if empty(PORT_OPTIONS:MBSD_USER) CONFIGURE_ARGS+= --disable-bsd-user .else .if ${ARCH} != "amd64" CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,aarch64-softmmu,alpha-softmmu,arm-softmmu,cris-softmmu,lm32-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mipsel-softmmu,mips64-softmmu,mips64el-softmmu,or32-softmmu,ppc-softmmu,ppcemb-softmmu,ppc64-softmmu,sh4-softmmu,sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,s390x-softmmu,xtensa-softmmu,xtensaeb-softmmu,unicore32-softmmu,moxie-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user .endif .endif .endif .endif .if empty(PORT_OPTIONS:MBSD_USER) PLIST_SUB+= BSD_USER="@comment " .else PLIST_SUB+= BSD_USER="" .if ${ARCH} == "sparc64" IGNORE= bsd-user targets not tested on sparc64 .endif .endif .if empty(PORT_OPTIONS:MBSD_USER) || ${ARCH} != "amd64" PLIST_SUB+= BSD_USER64="@comment " .else PLIST_SUB+= BSD_USER64="" .endif .if ${PORT_OPTIONS:MX86_TARGETS} PLIST_SUB+= NONX86="@comment " .else PLIST_SUB+= NONX86="" .endif .if defined(QEMU_USER_STATIC) PLIST_SUB+= SOFTMMU="@comment " PLIST_SUB+= STATIC="-static" .else PLIST_SUB+= SOFTMMU="" PLIST_SUB+= STATIC="" .endif WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC} --enable-docs \ --disable-linux-user --disable-linux-aio \ --disable-kvm --disable-xen \ --smbd=${LOCALBASE}/sbin/smbd \ --enable-debug \ --enable-debug-info \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" .if empty(PORT_OPTIONS:MX11) CONFIGURE_ARGS+= --disable-sdl .else CONFIGURE_ARGS+= --enable-sdl USE_SDL= sdl .endif .if empty(PORT_OPTIONS:MGTK2) CONFIGURE_ARGS+= --disable-gtk --disable-vte PLIST_SUB+= GTK2="@comment " .else USE_GNOME+= gtk20 vte USES+= gettext PLIST_SUB+= GTK2="" .endif .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls .endif .if empty(PORT_OPTIONS:MSASL) CONFIGURE_ARGS+= --disable-vnc-sasl .else LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 .endif .if empty(PORT_OPTIONS:MJPEG) CONFIGURE_ARGS+= --disable-vnc-jpeg .else USES+= jpeg .endif .if empty(PORT_OPTIONS:MPNG) CONFIGURE_ARGS+= --disable-vnc-png .else LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png .endif .if empty(PORT_OPTIONS:MCURL) CONFIGURE_ARGS+= --disable-curl .else LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl .endif .if empty(PORT_OPTIONS:MOPENGL) CONFIGURE_ARGS+= --disable-opengl .else USE_GL= yes .endif .if empty(PORT_OPTIONS:MUSBREDIR) CONFIGURE_ARGS+= --disable-usb-redir .else BUILD_DEPENDS+= usbredir>=0.6:${PORTSDIR}/net/usbredir RUN_DEPENDS+= usbredir>=0.6:${PORTSDIR}/net/usbredir .endif .if ${PORT_OPTIONS:MPCAP} CONFIGURE_ARGS+= --enable-pcap .else CONFIGURE_ARGS+= --disable-pcap .endif .if ${PORT_OPTIONS:MSTATIC_LINK} .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MX11} IGNORE= the X11 ui cannot be built static .endif CONFIGURE_ARGS+= --static .endif .if ${PORT_OPTIONS:MSAMBA} RUN_DEPENDS+= ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba36 .endif .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html USES+= makeinfo .else MAKE_ARGS+= NOPORTDOCS=1 .endif .if !defined(STRIP) || ${STRIP} == "" CONFIGURE_ARGS+=--disable-strip .endif .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif .if ${ARCH} == "powerpc" MAKE_ARGS+= ARCH=ppc .endif .if ${ARCH} == "powerpc64" MAKE_ARGS+= ARCH=ppc64 .endif .if ${ARCH} == "sparc64" CONFIGURE_ARGS+= --sparc_cpu=v9 .endif CONFIGURE_ARGS+= --python=${PYTHON_CMD} # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) # but it shouldn't matter much post-patch: @${MV} ${WRKDIR}/dtc ${WRKSRC} @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure #.if ${PORT_OPTIONS:MPCAP} # @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch #.endif .if empty(PORT_OPTIONS:MCDROM_DMA) @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch .endif @${REINPLACE_CMD} -E \ -e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \ ${WRKSRC}/qemu-doc.texi @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile.target @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/scripts/texi2pod.pl # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet post-configure: @${REINPLACE_CMD} -E \ -e "s|^(HOST_USB=)bsd|\1stub|" \ ${WRKSRC}/config-host.mak .if !target(post-install) post-install: .if ${PORT_OPTIONS:MDOCS} @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) .endif ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-* .endif .include Index: head/emulators/wine/Makefile =================================================================== --- head/emulators/wine/Makefile (revision 411989) +++ head/emulators/wine/Makefile (revision 411990) @@ -1,151 +1,151 @@ # Created by: Gerald Pfeifer # $FreeBSD$ PORTNAME= wine DISTVERSION= 1.8.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ http://ibiblio.org/pub/linux/system/emulators/wine/ MAINTAINER?= gerald@FreeBSD.org COMMENT?= Microsoft Windows compatibility environment LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 CONFLICTS_INSTALL= wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \ i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose --disable-tests \ --without-alsa --without-capi --without-dbus \ --without-gettext --without-gettextpo \ --without-gphoto --without-gsm --without-gstreamer \ --without-opencl \ --without-osmesa \ --with-oss \ --without-sane \ --without-tiff \ --without-xinerama CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" WINELIBDIR?= ${PREFIX}/lib .if !defined(USE_LDCONFIG32) USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine .endif ONLY_FOR_ARCHS= i386 amd64 USES= bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2 SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ tools/winedump/function_grep.pl SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PORTDATA= l_intl.nls wine.inf OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO OPTIONS_DEFAULT=X11 OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine PORTSCOUT= limitw:1,even CUPS_CONFIGURE_WITH= cups CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups DOSBOX_RUN_DEPENDS= dosbox:${PORTSDIR}/emulators/dosbox GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine_gecko-2.40-x86.msi:${PORTSDIR}/emulators/wine-gecko GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls HAL_CONFIGURE_WITH= hal HAL_LIB_DEPENDS= libhal.so:${PORTSDIR}/sysutils/hal LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes LIBXSLT_CONFIGURE_WITH= xslt LIBXSLT_LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.5.6.msi:${PORTSDIR}/emulators/wine-mono MPG123_CONFIGURE_WITH= mpg123 MPG123_LIB_DEPENDS= libmpg123.so:${PORTSDIR}/audio/mpg123 OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal V4L_CONFIGURE_WITH= v4l V4L_LIB_DEPENDS= libv4l1.so:${PORTSDIR}/multimedia/libv4l WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML X11_CONFIGURE_WITH= x cms fontconfig freetype glu jpeg opengl png xinput2 xrandr xrender X11_USES= jpeg X11_USE= GL=glu XORG=xcomposite,xcursor,xi,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libpng.so:${PORTSDIR}/graphics/png .include .if ${ARCH} == amd64 # Wine is composed of three parts: # - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386) # - wine64 (aka this part of this port) is the 64-bit component and runs 64-bit programs # (on FreeBSD/amd64) # - wow64 (a subset of emulators/i386-wine-devel) is a part of the 64-bit component that runs # 32-bit programs (on FreeBSD/amd64) # We also currently have: # - "wine32" (aka emulators/i386-wine-devel) is the 32-bit component and runs 32-bit programs # (on FreeBSD/amd64). This will be superseded by wow64. # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64. CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib PLIST_SUB+= WINE32="@comment " WINE64="" .if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38 CPPFLAGS+= -D__builtin_ms_va_list=__builtin_va_list \ -D__builtin_ms_va_start=__builtin_va_start \ -D__builtin_ms_va_end=__builtin_va_end \ -D__builtin_ms_va_copy=__builtin_va_copy .endif # Wine assumes a WoW64 package is available however WoW64 is not yet available on FreeBSD. post-patch: ${REINPLACE_CMD} 's|/wine|/wine64|g' ${WRKSRC}/tools/wineapploader.in .else PLIST_SUB+= WINE32="" WINE64="@comment " .endif pre-build: cd ${WRKSRC} && ${MAKE_CMD} depend post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ ${STAGEDIR}${WINELIBDIR}/libwine.so.1 @${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README ANNOUNCE AUTHORS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump .include Index: head/emulators/wine-devel/Makefile =================================================================== --- head/emulators/wine-devel/Makefile (revision 411989) +++ head/emulators/wine-devel/Makefile (revision 411990) @@ -1,178 +1,179 @@ # Created by: Gerald Pfeifer # $FreeBSD$ PORTNAME= wine DISTVERSION= 1.9.6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ http://ibiblio.org/pub/linux/system/emulators/wine/ PKGNAMESUFFIX?= -devel DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= gerald@FreeBSD.org COMMENT?= Microsoft Windows compatibility environment LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ prelink:${PORTSDIR}/sysutils/prelink LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 CONFLICTS_INSTALL= wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \ i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose --disable-tests \ --without-alsa --without-capi --without-dbus \ --without-gettext --without-gettextpo \ --without-gphoto --without-gsm --without-gstreamer \ --without-opencl \ --without-osmesa \ --with-oss \ --without-sane \ --without-tiff \ --without-xinerama CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" WINELIBDIR?= ${PREFIX}/lib .if !defined(USE_LDCONFIG32) USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine .endif ONLY_FOR_ARCHS= i386 amd64 USES= bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2 SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ tools/winedump/function_grep.pl SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PORTDATA= l_intl.nls wine.inf OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L WINEMAKER X11 GECKO MONO OPTIONS_DEFAULT=X11 OPTIONS_SUB= yes STAGING_DESC= Include the Wine Staging patchset DOSBOX_DESC= Use DOSBox to run MS-DOS programs LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine CUPS_CONFIGURE_WITH= cups CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups DOSBOX_RUN_DEPENDS= dosbox:${PORTSDIR}/emulators/dosbox GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine_gecko-2.44-x86.msi:${PORTSDIR}/emulators/wine-gecko-devel GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls HAL_CONFIGURE_WITH= hal HAL_LIB_DEPENDS= libhal.so:${PORTSDIR}/sysutils/hal LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes LIBXSLT_CONFIGURE_WITH= xslt LIBXSLT_LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.6.0.msi:${PORTSDIR}/emulators/wine-mono-devel MPG123_CONFIGURE_WITH= mpg123 MPG123_LIB_DEPENDS= libmpg123.so:${PORTSDIR}/audio/mpg123 OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal STAGING_LIB_DEPENDS= libtxc_dxtn.so:${PORTSDIR}/graphics/s2tc V4L_CONFIGURE_WITH= v4l V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l1.so:${PORTSDIR}/multimedia/libv4l WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML X11_CONFIGURE_WITH= x cms fontconfig freetype glu jpeg opengl png xinput2 xrandr xrender X11_USES= jpeg X11_USE= GL=glu XORG=xcomposite,xcursor,xi,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libpng.so:${PORTSDIR}/graphics/png .include .if ${ARCH} == amd64 # Wine is composed of three parts: # - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386) # - wine64 (aka this part of this port) is the 64-bit component and runs 64-bit programs # (on FreeBSD/amd64) # - wow64 (a subset of emulators/i386-wine-devel) is a part of the 64-bit component that runs # 32-bit programs (on FreeBSD/amd64) # We also currently have: # - "wine32" (aka emulators/i386-wine-devel) is the 32-bit component and runs 32-bit programs # (on FreeBSD/amd64). This will be superseded by wow64. # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64. CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib PLIST_SUB+= WINE32="@comment " WINE64="" # On FreeBSD 9.x, even when CHOSEN_COMPILER_TYPE from Mk/Uses/compiler.mk # is set to clang, COMPILER_VERSION is still at 42 from the system compiler # that is GCC 4.2. Hack around this a bit. .if ${CHOSEN_COMPILER_TYPE} == clang && ( ${COMPILER_VERSION} < 38 || ${COMPILER_VERSION} == 42 ) CPPFLAGS+= -D__builtin_ms_va_list=__builtin_va_list \ -D__builtin_ms_va_start=__builtin_va_start \ -D__builtin_ms_va_end=__builtin_va_end \ -D__builtin_ms_va_copy=__builtin_va_copy .endif # Wine assumes a WoW64 package is available however WoW64 is not yet available on FreeBSD. post-patch: ${REINPLACE_CMD} 's|/wine|/wine64|g' ${WRKSRC}/tools/wineapploader.in .else PLIST_SUB+= WINE32="" WINE64="@comment " .endif .if ${PORT_OPTIONS:MSTAGING} MASTER_SITES+= https://github.com/compholio/wine-compholio-daily/archive/:cho COMP_DIST= v${DISTVERSION}.tar.gz DISTFILES+= ${COMP_DIST}:cho EXTRACT_DEPENDS=bash:${PORTSDIR}/shells/bash \ git:${PORTSDIR}/devel/git \ ${AUTOCONF_DEPENDS} # Fix build on FreeBSD 9.x (false positive: powl) CONFIGURE_ENV+= ac_cv_have_powl=no CONFIGURE_ARGS+=--without-pulse USE_AUTOTOOLS= autoconf:env post-extract: fix-shebang cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${COMP_DIST} --strip-components 1 ${REINPLACE_CMD} 's|autoreconf|${AUTORECONF}|g' ${WRKSRC}/patches/patchinstall.sh cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all .endif pre-build: cd ${WRKSRC} && ${MAKE_CMD} depend post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ ${STAGEDIR}${WINELIBDIR}/libwine.so.1 @${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README ANNOUNCE AUTHORS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump .include Index: head/ftp/curl/Makefile =================================================================== --- head/ftp/curl/Makefile (revision 411989) +++ head/ftp/curl/Makefile (revision 411990) @@ -1,188 +1,189 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= curl PORTVERSION= 7.48.0 +PORTREVISION= 1 CATEGORIES= ftp www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet MAINTAINER?= sunpoet@FreeBSD.org COMMENT?= Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 METALINK PROXY PSL RTMP TLS_SRP OPTIONS_RADIO= RESOLV SSL OPTIONS_SINGLE= GSSAPI OPTIONS_RADIO_RESOLV= CARES THREADED_RESOLVER OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL WOLFSSL OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= CA_BUNDLE COOKIES IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP CA_BUNDLE_DESC= Install CA bundle for OpenSSL CA_BUNDLE_IMPLIES= OPENSSL COOKIES_DESC= Cookies support CURL_DEBUG_DESC= cURL debug memory tracking LDAPS_IMPLIES= LDAP LIBSSH2_DESC= SCP/SFTP support via libssh2 LIBSSH2_IMPLIES= OPENSSL RESOLV_DESC= DNS resolving options THREADED_RESOLVER_DESC= Threaded DNS resolver TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support LOCALBASE?= /usr/local .if defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)) OPTIONS_DEFAULT+= GSSAPI_NONE .else OPTIONS_DEFAULT+= GSSAPI_BASE .endif CONFIGURE_ARGS+=--disable-werror \ --enable-imap --enable-pop3 --enable-rtsp --enable-smtp \ --without-axtls CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ ac_cv_func_SSLv2_client_method=no GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_ENV= ${MAKE_ENV} LC_ALL=C TEST_TARGET= test USE_PERL5= build USES= gmake libtool localbase pathfix perl5 tar:lzma .if !defined(BUILDING_HIPHOP) USE_LDCONFIG= yes USES+= cpe PORTDOCS= * PORTEXAMPLES= * CPE_VENDOR= haxx DOCS= BINDINGS BUGS CODE_OF_CONDUCT.md CONTRIBUTE FAQ FEATURES \ HISTORY HTTP-COOKIES HTTP2.md INSTALL INSTALL.devcpp INTERNALS \ KNOWN_BUGS LICENSE-MIXING MAIL-ETIQUETTE MANUAL \ RELEASE-PROCEDURE RESOURCES ROADMAP.md SECURITY SSL-PROBLEMS \ SSLCERTS THANKS TODO TheArtOfHttpScripting VERSIONS \ curl-config.html curl-config.pdf curl.html curl.pdf index.html \ mk-ca-bundle.html mk-ca-bundle.pdf .endif SLAVEDIRS= ftp/curl-hiphop CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle CA_BUNDLE_CONFIGURE_ON= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss CARES_CONFIGURE_ENABLE= ares CARES_LIB_DEPENDS= libcares.so:${PORTSDIR}/dns/c-ares COOKIES_CONFIGURE_ENABLE= cookies CURL_DEBUG_CONFIGURE_ENABLE= curldebug DEBUG_CONFIGURE_ENABLE= debug GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS} GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_BASE_LIBS= ${GSSAPILIBS} GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS} GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_HEIMDAL_LIBS= ${GSSAPILIBS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_CPPFLAGS= ${GSSAPICPPFLAGS} GSSAPI_MIT_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_MIT_LIBS= ${GSSAPILIBS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi HTTP2_BUILD_DEPENDS= nghttp2>=1.0.0:${PORTSDIR}/www/nghttp2 HTTP2_CONFIGURE_WITH= nghttp2 HTTP2_LIB_DEPENDS= libnghttp2.so:${PORTSDIR}/www/nghttp2 HTTP2_RUN_DEPENDS= nghttp2>=1.0.0:${PORTSDIR}/www/nghttp2 HTTP2_USES= pkgconfig IDN_CONFIGURE_WITH= libidn IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_ENABLE= ipv6 LDAP_CONFIGURE_ENABLE= ldap LDAP_USE= OPENLDAP=yes LDAPS_CONFIGURE_ENABLE= ldaps LIBSSH2_CONFIGURE_WITH= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 METALINK_CONFIGURE_WITH=libmetalink METALINK_LIB_DEPENDS= libmetalink.so:${PORTSDIR}/misc/libmetalink METALINK_LIBS= -lcrypto NSS_CONFIGURE_WITH= nss NSS_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss NSS_USES= pkgconfig OPENSSL_CONFIGURE_OFF= --without-ssl OPENSSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} OPENSSL_USE= OPENSSL=yes POLARSSL_CONFIGURE_WITH=polarssl POLARSSL_LIB_DEPENDS= libmbedtls.so.9:${PORTSDIR}/security/polarssl13 PROXY_CONFIGURE_ENABLE= proxy PSL_CONFIGURE_WITH= libpsl PSL_LIB_DEPENDS= libpsl.so:${PORTSDIR}/dns/libpsl RTMP_CONFIGURE_WITH= librtmp RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_USES= pkgconfig THREADED_RESOLVER_CONFIGURE_ENABLE= threaded-resolver TLS_SRP_CONFIGURE_ENABLE= tls-srp WOLFSSL_CONFIGURE_WITH= cyassl WOLFSSL_LIB_DEPENDS= libwolfssl.so:${PORTSDIR}/security/wolfssl .include .if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP} IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS .endif .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL} && !${PORT_OPTIONS:MWOLFSSL} IGNORE= only supports LDAPS with SSL .endif .if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && (defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so))) IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl" .if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} IGNORE= GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options .endif .if ${PORT_OPTIONS:MTLS_SRP} IGNORE= unsupported TLS-SRP in LibreSSL .endif .endif post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|; s|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|include |include |' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h @${REINPLACE_CMD} -e 's|gss_nt_service_name|GSS_C_NT_HOSTBASED_SERVICE|' ${WRKSRC}/lib/curl_sasl_gssapi.c .if !defined(BUILDING_HIPHOP) post-install: ${LN} -s libcurl.so.4 ${STAGEDIR}${PREFIX}/lib/libcurl.so.7 ${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/ cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.m4 *.pdf ${STAGEDIR}${DOCSDIR}/libcurl/ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/ .endif pre-test-PROXY-off: @${ECHO_MSG} "******************************************" @${ECHO_MSG} "* You have disabled curl proxy support. *" @${ECHO_MSG} "* Some tests SHALL FAIL! *" @${ECHO_MSG} "* This is being addressed. *" @${ECHO_MSG} "******************************************" .include Index: head/ftp/filezilla/Makefile =================================================================== --- head/ftp/filezilla/Makefile (revision 411989) +++ head/ftp/filezilla/Makefile (revision 411990) @@ -1,50 +1,51 @@ # $FreeBSD$ PORTNAME= filezilla PORTVERSION= 3.16.0 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION} DISTNAME= FileZilla_${PORTVERSION}_src MAINTAINER= matthew@reztek.cz COMMENT= Fast and reliable cross-platform FTP, FTPS, and SFTP client LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils BUILD_DEPENDS:= ${RUN_DEPENDS} LIB_DEPENDS= libfilezilla.so:${PORTSDIR}/ftp/libfilezilla \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgnutls.so:${PORTSDIR}/security/gnutls \ libidn.so:${PORTSDIR}/dns/libidn \ libpugixml.so:${PORTSDIR}/textproc/pugixml BROKEN_FreeBSD_9= requires C++14 complier, 9.x lacks C++11 standard library INSTALLS_ICONS= yes USES= compiler:c++14-lang gmake localbase pkgconfig sqlite tar:bzip2 USE_WX= 3.0 WX_CONF_ARGS= relative GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= DBUS NLS OPTIONS_DEFAULT=DBUS NLS OPTIONS_SUB= yes DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_WITH= dbus NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-locales .if !defined(MAINTAINER_MODE) CONFIGURE_ARGS+= --disable-manualupdatecheck .endif post-patch: ${REINPLACE_CMD} -Ee 's|(dummy) wxrc|\1 ${WXRC_CMD:T}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .include Index: head/ftp/lftp/Makefile =================================================================== --- head/ftp/lftp/Makefile (revision 411989) +++ head/ftp/lftp/Makefile (revision 411990) @@ -1,62 +1,63 @@ # Created by: Andrey Zakhvatov # $FreeBSD$ PORTNAME= lftp PORTVERSION= 4.6.5 +PORTREVISION= 1 CATEGORIES= ftp ipv6 MASTER_SITES= http://lftp.yar.ru/ftp/ \ http://lftp.yar.ru/ftp/old/ \ http://lftp.cybermirror.org/ \ http://lftp.cybermirror.org/old/ \ http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \ http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/old/ \ http://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \ ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ MAINTAINER= martymac@FreeBSD.org COMMENT= Shell-like command line ftp client LICENSE= GPLv3 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 USES= charsetfix iconv libtool localbase readline shebangfix GNU_CONFIGURE= yes PORTDOCS= AUTHORS BUGS ChangeLog FAQ FEATURES INSTALL \ MIRRORS NEWS README README.debug-levels README.modules \ THANKS TODO SHEBANG_FILES= src/verify-file \ src/convert-mozilla-cookies \ src/xdg-move OPTIONS_DEFINE= NLS OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= OPENSSL GNUTLS OPTIONS_DEFAULT= SSL OPENSSL NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USE= OPENSSL=yes GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_USES= pkgconfig .include .if ${PORT_OPTIONS:MOPENSSL} . if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 WITH_OPENSSL_PORT= yes CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} . endif .endif post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/lftp.conf \ ${STAGEDIR}${PREFIX}/etc/lftp.conf.sample ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/ftp/wget/Makefile =================================================================== --- head/ftp/wget/Makefile (revision 411989) +++ head/ftp/wget/Makefile (revision 411990) @@ -1,75 +1,76 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= wget DISTVERSION= 1.16.3 +PORTREVISION= 1 CATEGORIES= ftp www ipv6 MASTER_SITES= GNU MAINTAINER= vd@FreeBSD.org COMMENT= Retrieve files from the Net via HTTP(S) and FTP LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING USES= charsetfix cpe gmake makeinfo perl5 tar:xz USE_PERL5= build CPE_VENDOR= gnu GNU_CONFIGURE= yes OPTIONS_SUB= yes OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL=GNUTLS OPENSSL OPTIONS_DEFINE= IPV6 NLS IDN PCRE OPTIONS_DEFAULT=OPENSSL IDN PCRE_DESC= Support Perl regular expressions in addition to POSIX IPV6_CONFIGURE_ENABLE= ipv6 NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_CPPFLAGS= -I${LOCALBASE}/include NLS_LDFLAGS= -L${LOCALBASE}/lib IDN_USES= iconv IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn IDN_CONFIGURE_ENABLE= iri IDN_CONFIGURE_ON= --with-libidn=${LOCALBASE} PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PCRE_CPPFLAGS= -I${LOCALBASE}/include PCRE_LDFLAGS= -L${LOCALBASE}/lib PCRE_CONFIGURE_ENV_OFF= ac_cv_header_pcre_h=no .include .if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ssl=openssl --with-libssl-prefix=${OPENSSLBASE} CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .elif ${PORT_OPTIONS:MGNUTLS} USES+= pkgconfig LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--with-ssl=gnutls CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .else CONFIGURE_ARGS+=--without-ssl .endif INFO= wget # eliminate gmakism post-patch: ${REINPLACE_CMD} -e 's,$$<,$$(srcdir)/wget.texi,' \ -e 's,WGETRC = $$(sysconfdir)/wgetrc,&.sample,' \ ${WRKSRC}/doc/Makefile.in ${REINPLACE_CMD} -e 's,/usr/local/etc/wgetrc,${PREFIX}/etc/wgetrc,' \ -e 's,@file{},@file{${PREFIX}},' \ ${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi ${REINPLACE_CMD} -e '/ac_fn_c_check_header_mongrel.*uuid\/uuid.h/ d' \ ${WRKSRC}/configure .include Index: head/ftp/wput/Makefile =================================================================== --- head/ftp/wput/Makefile (revision 411989) +++ head/ftp/wput/Makefile (revision 411990) @@ -1,44 +1,44 @@ # Created by: Nosov Artem # $FreeBSD$ PORTNAME= wput PORTVERSION= 0.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= ftp MASTER_SITES= SF MAINTAINER= chip-set@mail.ru COMMENT= Uploads files or directories to a ftpserver with support of resuming PORTDOCS= ABOUT-NLS COPYING ChangeLog INSTALL TODO PORTEXAMPLES= USAGE.examples USAGE.resumehandling USAGE.urlhandling \ passwordfile wputrc USES= tar:tgz GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= TLS NLS DOCS EXAMPLES OPTIONS_DEFAULT=TLS OPTIONS_SUB= yes TLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls TLS_CONFIGURE_WITH= ssl NLS_USES= gettext iconv NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_WITH= libintl-prefix=${LOCALBASE} NLS_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} pre-configure: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ ${WRKSRC}/src/memdbg.c \ ${WRKSRC}/src/socketlib.c post-install: ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/ @${INSTALL} -d ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${EXAMPLESDIR} .include Index: head/ftp/wzdftpd/Makefile =================================================================== --- head/ftp/wzdftpd/Makefile (revision 411989) +++ head/ftp/wzdftpd/Makefile (revision 411990) @@ -1,107 +1,107 @@ # Created by: Roman Bogorodskiy # $FreeBSD$ PORTNAME= wzdftpd PORTVERSION= 0.8.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= ftp ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= Modular FTP server configurable online using SITE commands LICENSE= GPLv2+ OPTIONS_DEFINE= ICONV IPV6 MYSQL PERL PGSQL SQLITE TCL DOCS OPTIONS_RADIO= TLS ZEROCONF OPTIONS_RADIO_TLS= GNUTLS OPENSSL OPTIONS_RADIO_ZEROCONF= AVAHI HOWL OPTIONS_DEFAULT= AVAHI GNUTLS HOWL_DESC= Zeroconf support via Howl OPTIONS_SUB= yes USES= autoreconf gettext-tools libtool pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${ETCDIR} --without-pam --disable-bonjour INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_RC_SUBR= wzdftpd CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --disable-utf8 ICONV_USES= iconv TCL_CONFIGURE_ON= --with-tcl=${TCL_LIBDIR} TCL_CONFIGURE_OFF= --without-tcl TCL_USES= tcl OPENSSL_CONFIGURE_ENABLE= openssl OPENSSL_USE= OPENSSL=yes GNUTLS_CONFIGURE_ENABLE= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls IPV6_CONFIGURE_ENABLE= ipv6 PERL_CONFIGURE_ENABLE= perl PERL_USES= perl5 MYSQL_CONFIGURE_ENABLE= mysql MYSQL_USE= MYSQL=yes PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --disable-pgsql PGSQL_USES= pgsql SQLITE_CONFIGURE_ENABLE= sqlite3 SQLITE_USE= SQLITE=3 AVAHI_CONFIGURE_ON= --with-zeroconf --enable-avahi AVAHI_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libavahi-core.so:${PORTSDIR}/net/avahi-app HOWL_CONFIGURE_ON= --with-zeroconf --enable-howl HOWL_CPPFLAGS= -I${LOCALBASE}/include/howl HOWL_LIB_DEPENDS= libhowl.so:${PORTSDIR}/net/howl .include .if ${PORT_OPTIONS:MAVAHI} || ${PORT_OPTIONS:MHOWL} PLIST_SUB+= ZEROCONF="" .else PLIST_SUB+= ZEROCONF="@comment " .endif post-patch: @${TOUCH} ${WRKSRC}/config.rpath @${ECHO_CMD} "ACLOCAL_AMFLAGS= -I ac-helpers" >> ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e \ '/LDFLAGS/s|@PTHREAD_CFLAGS@|@LTLIBICONV@|' \ ${WRKSRC}/libwzd-core/Makefile.am @${REINPLACE_CMD} -e \ 's|INSTALLDIRS=vendor|INSTALLPRIVLIB=$${prefix}/lib| ; \ /MAKE/s| install| pure_install|' \ ${WRKSRC}/libwzd-perl/Makefile.am .for i in backends modules @${FIND} ${WRKSRC}/${i} -name "Makefile.am" | ${XARGS} \ ${REINPLACE_CMD} -e \ '/^libdir/s|$${pkgdatadir}|$${prefix}/lib/wzdftpd|' .endfor @${FIND} ${WRKSRC} -name "*_tls.c" | ${XARGS} ${REINPLACE_CMD} -e \ '//d ; \ /gcry_control/d' \ post-install: (cd ${WRKSRC} && ${INSTALL_DATA} *.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig ) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog NEWS Permissions.ReadMeFirst README \ TLS.ReadMeFirst UPGRADING wzd_tls.cnf (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor .include Index: head/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c =================================================================== --- head/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c (nonexistent) +++ head/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c (revision 411990) @@ -0,0 +1,52 @@ +--- libwzd-core/wzd_tls.c.orig 2007-10-25 17:25:33 UTC ++++ libwzd-core/wzd_tls.c +@@ -946,19 +946,13 @@ int tls_exit(void) + + static gnutls_session initialize_tls_session(gnutls_connection_end con_end) + { +- /* Allow connections to servers that have OpenPGP keys as well. +- */ +- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; +- + gnutls_session session; + + gnutls_init(&session, con_end); + +- /* avoid calling all the priority functions, since the defaults +- * are adequate. ++ /* Allow connections to servers that have OpenPGP keys as well. + */ +- gnutls_set_default_priority(session); +- gnutls_certificate_type_set_priority(session, cert_type_priority); ++ gnutls_priority_set_direct(session, "NORMAL:+CTYPE-OPENPGP", NULL); + + gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); + +@@ -1001,27 +995,6 @@ int tls_auth (const char *type, wzd_cont + } + + /** \todo XXX parse TLS cipher names */ +- { +- /** Note that the priority is set on the client. The server does not use +- * the algorithm's priority except for disabling algorithms that were not +- * specified. +- */ +- const int cipherPriority[] = +- { +- GNUTLS_CIPHER_ARCFOUR_128, +- GNUTLS_CIPHER_3DES_CBC, +- GNUTLS_CIPHER_AES_128_CBC, +- GNUTLS_CIPHER_AES_256_CBC, +- GNUTLS_CIPHER_ARCFOUR_40, +-#if ( (LIBGNUTLS_VERSION_MAJOR > 1) || (LIBGNUTLS_VERSION_MINOR >= 3) ) +- GNUTLS_CIPHER_RC2_40_CBC, +- GNUTLS_CIPHER_DES_CBC, +-#endif +- 0 +- }; +- +- gnutls_cipher_set_priority(session, cipherPriority); +- } + + /* ensure socket is non-blocking */ + #if defined(_MSC_VER) || (defined(__CYGWIN__) && defined(WINSOCK_SUPPORT)) Property changes on: head/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/libggz/Makefile =================================================================== --- head/games/libggz/Makefile (revision 411989) +++ head/games/libggz/Makefile (revision 411990) @@ -1,35 +1,35 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= libggz PORTVERSION= ${GGZ_VERSION} -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= games MAINTAINER= ports@FreeBSD.org COMMENT= The GGZ Gaming Zone - Base Library LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt USES= libtool pathfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug USE_LDCONFIG= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread OPTIONS_DEFAULT= OPENSSL OPTIONS_SINGLE= TLS OPTIONS_SINGLE_TLS= GNUTLS OPENSSL GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ARGS= --with-tls=GnuTLS OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ARGS= --with-tls=OpenSSL .include "${.CURDIR}/../libggz/bsd.ggz.mk" .include Index: head/games/macopix/Makefile =================================================================== --- head/games/macopix/Makefile (revision 411989) +++ head/games/macopix/Makefile (revision 411990) @@ -1,115 +1,115 @@ # Created by: Shinya Esu # $FreeBSD$ PORTNAME= macopix PORTVERSION= 1.7.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES} MAINTAINER= ports@FreeBSD.org COMMENT= Window sitter for X11 LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff RESTRICTED= 'contains commercial character data' RESTRICTED_FILES= \ macopix-mascot-comic_party-euc-ja-1.02.tar.gz \ macopix-mascot-cosmos-euc-ja-1.02.tar.gz \ macopix-mascot-kanon-euc-ja-1.02.tar.gz \ macopix-mascot-mizuiro-euc-ja-1.02.tar.gz \ macopix-mascot-one-euc-ja-1.02.tar.gz \ macopix-mascot-pia2-euc-ja-1.02.tar.gz \ macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz \ macopix-mascot-tsukihime-euc-ja-1.02.tar.gz \ macopix-mascot-marimite-euc-ja-2.20.tar.gz \ macopix-mascot-HxB-euc-ja-0.30.tar.gz USES= gettext gmake iconv jpeg libtool pkgconfig USE_XORG= x11 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lX11 ${ICONV_LIB} OPTIONS_DEFINE= DOCS GNUTLS GTK1 GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ON= --with-gnutls GTK1_USE= GNOME=gtk12,gdkpixbuf GTK1_CONFIGURE_ON= --with-gtk1 .include .if ! ${PORT_OPTIONS:MGNUTLS} USE_OPENSSL= yes .endif .if ${PORT_OPTIONS:MGTK1} PKGNAMESUFFIX= -gtk1 .else USE_GNOME+= gtk20 .endif post-patch: @${REINPLACE_CMD} -e 's/_MAIL } MailStatus/_MAIL } MailStatus2/' ${WRKSRC}/src/main.h .if ${PORT_OPTIONS:MGTK1} @${REINPLACE_CMD} 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' \ ${WRKSRC}/src/nokkari.c .endif post-install: # install mascot file @${MKDIR} ${STAGEDIR}${DATADIR}/pixmap cd ${WRKDIR}/macopix-mascot-comic_party-euc-ja-1.02 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.comipa.jp cd ${WRKDIR}/macopix-mascot-cosmos-euc-ja-1.02 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.cosmos.jp cd ${WRKDIR}/macopix-mascot-kanon-euc-ja-1.02 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.kanon.jp cd ${WRKDIR}/macopix-mascot-mizuiro-euc-ja-1.02 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.mizuiro.jp cd ${WRKDIR}/macopix-mascot-one-euc-ja-1.02 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.one.jp cd ${WRKDIR}/macopix-mascot-pia2-euc-ja-1.02 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.pia2.jp cd ${WRKDIR}/macopix-mascot-triangle_heart-euc-ja-1.02 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.trh.jp cd ${WRKDIR}/macopix-mascot-tsukihime-euc-ja-1.02 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.tsuki.jp cd ${WRKDIR}/macopix-mascot-marimite-euc-ja-2.20 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.marimite.jp cd ${WRKDIR}/macopix-mascot-HxB-euc-ja-0.30 \ && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.HxB.jp @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} NKR.README.ja README README.ja \ ${STAGEDIR}${DOCSDIR}/ .include Index: head/games/pokerth/Makefile =================================================================== --- head/games/pokerth/Makefile (revision 411989) +++ head/games/pokerth/Makefile (revision 411990) @@ -1,53 +1,53 @@ # Created by: Yinghong.Liu # $FreeBSD$ PORTNAME= pokerth PORTVERSION= 1.1.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1 DISTNAME= PokerTH-${PORTVERSION}-src MAINTAINER= madpilot@FreeBSD.org COMMENT= Poker game written in C++/Qt4 LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libmikmod.so:${PORTSDIR}/audio/libmikmod \ libgnutls.so:${PORTSDIR}/security/gnutls \ libcurl.so:${PORTSDIR}/ftp/curl \ libgsasl.so:${PORTSDIR}/security/gsasl \ libtinyxml.so:${PORTSDIR}/textproc/tinyxml \ libprotobuf.so:${PORTSDIR}/devel/protobuf BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:${PORTSDIR}/irc/libircclient USES= iconv gmake qmake tar:bzip2 USE_QT4= gui corelib network sql sql-sqlite3 \ moc_build rcc_build uic_build USE_SDL= mixer QMAKE_SOURCE_PATH= pokerth.pro PORTDOCS= server_setup_howto.txt post-patch: @${REINPLACE_CMD} -E \ -e 's|/usr([a-z|/]*)|${LOCALBASE}/\1|g' \ -e 's|(-lcurl)|\1 ${ICONV_LIB}|g' \ -e 's|(-lcrypto) -liconv|\1 ${ICONV_LIB}|' \ -e 's:boost_([a-z]+)-[-|a-z|0-9|_]*:boost_\1:g' \ -e 's|LIB_DIRS =.*|LIB_DIRS = ${LOCALBASE}/lib|g' \ -e '/.*QMAKE_CXXFLAGS.*/d' \ ${WRKSRC}/*.pro @${FIND} ${WRKSRC} -name '*.cpp' -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|[io]fstream|std::&|' post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pokerth ${INSTALL_PROGRAM} ${WRKSRC}/bin/pokerth_server ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/docs/pokerth.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/server_setup_howto.txt ${STAGEDIR}${DOCSDIR} .include Index: head/graphics/gnome-color-manager/Makefile =================================================================== --- head/graphics/gnome-color-manager/Makefile (revision 411989) +++ head/graphics/gnome-color-manager/Makefile (revision 411990) @@ -1,56 +1,57 @@ # Created by: FreeBSD GNOME Team # $FreeBSD$ PORTNAME= gnome-color-manager PORTVERSION= 3.18.0 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Session framework for the GNOME desktop to manage color profiles BUILD_DEPENDS= docbook2man:${PORTSDIR}/textproc/docbook-utils \ itstool:${PORTSDIR}/textproc/itstool \ docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libcolord.so:${PORTSDIR}/graphics/colord \ libcolord-gtk.so:${PORTSDIR}/graphics/colord-gtk \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libexif.so:${PORTSDIR}/graphics/libexif PORTSCOUT= limitw:1,even USE_XORG= xrandr USE_GNOME= gnomedesktop3 gtk30 intlhack vte3 USES= desktop-file-utils gettext gmake gnome pathfix pkgconfig tar:xz USE_LDCONFIG= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-clutter=no CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= RAW OPTIONS_DEFAULT=RAW RAW_DESC= Enable RAW EXIF support .include .if ${PORT_OPTIONS:MRAW} LIB_DEPENDS+= libexiv2.so:${PORTSDIR}/graphics/exiv2 CONFIGURE_ARGS+=--enable-exiv=yes PLIST_SUB+= RAW="" .else CONFIGURE_ARGS+=--enable-exiv=no PLIST_SUB+= RAW="@comment " .endif post-patch: @${REINPLACE_CMD} -e 's|-Wclobbered||g ; s|-Wempty-body||g ; \ s|-Wignored-qualifiers||g ; s|-Wtype-limits||g ; \ s|-Wmissing-parameter-type||g' \ ${WRKSRC}/configure .include Index: head/irc/anope/Makefile =================================================================== --- head/irc/anope/Makefile (revision 411989) +++ head/irc/anope/Makefile (revision 411990) @@ -1,153 +1,153 @@ # Created by: mat # $FreeBSD$ PORTNAME= anope PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc MAINTAINER= feld@FreeBSD.org COMMENT= Set of IRC services for IRC networks LICENSE= GPLv2 USES= cmake:outsource shebangfix CMAKE_ARGS+= -DINSTDIR:STRING="${LOCALBASE}/anope" CPPFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= "-L${LOCALBASE}/lib" SHEBANG_FILES= ${WRKSRC}/src/tools/*.sh USE_GITHUB= yes USE_RC_SUBR= anope SUB_FILES= pkg-message OPTIONS_DEFINE= GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX SASL SQLITE STATS TRE OPTIONS_DEFAULT= MYSQL OPENSSL POSIX POSIX_DESC= POSIX Regex Module STATS_DESC= Channel Statistics Module TRE_DESC= Tre Regex Module NLS_USES= gettext .include .if ${PORT_OPTIONS:MGNUTLS} PLIST_SUB+= GNUTLS="" LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls .else PLIST_SUB+= GNUTLS="@comment " .endif .if ${PORT_OPTIONS:MLDAP} PLIST_SUB+= LDAP="" USE_OPENLDAP= yes .else PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} PLIST_SUB+= MYSQL="" USE_MYSQL= yes .else PLIST_SUB+= MYSQL="@comment " .endif .if ${PORT_OPTIONS:MOPENSSL} PLIST_SUB+= OPENSSL="" OPENSSL_USE= openssl=yes .else PLIST_SUB+= OPENSSL="@comment " .endif .if ${PORT_OPTIONS:MPCRE} PLIST_SUB+= PCRE="" LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre .else PLIST_SUB+= PCRE="@comment " .endif .if ${PORT_OPTIONS:MPOSIX} PLIST_SUB+= POSIX="" .else PLIST_SUB+= POSIX="@comment " .endif .if ${PORT_OPTIONS:MSASL} PLIST_SUB+= SASL="" LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 .else PLIST_SUB+= SASL="@comment " .endif .if ${PORT_OPTIONS:MSQLITE} PLIST_SUB+= SQLITE="" USES+= sqlite .else PLIST_SUB+= SQLITE="@comment " .endif .if ${PORT_OPTIONS:MSTATS} PLIST_SUB+= STATS="" .else PLIST_SUB+= STATS="@comment " .endif .if ${PORT_OPTIONS:MTRE} PLIST_SUB+= TRE="" LIB_DEPENDS+= libtre.so:${PORTSDIR}/textproc/libtre .else PLIST_SUB+= TRE="@comment " .endif .include # XXX Add here other arch which needs -fPIC :-) .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC .endif post-patch: .if ${PORT_OPTIONS:MGNUTLS} ${LN} -s ${WRKSRC}/modules/extra/m_ssl_gnutls.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MLDAP} ${LN} -s ${WRKSRC}/modules/extra/m_ldap.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_ldap_authentication.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_ldap_oper.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MMYSQL} ${LN} -s ${WRKSRC}/modules/extra/m_mysql.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_sql_authentication.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_sql_log.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_sql_oper.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MOPENSSL} ${LN} -s ${WRKSRC}/modules/extra/m_ssl_openssl.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MSQLITE} ${LN} -s ${WRKSRC}/modules/extra/m_sqlite.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MPCRE} ${LN} -s ${WRKSRC}/modules/extra/m_regex_pcre.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MPOSIX} ${LN} -s ${WRKSRC}/modules/extra/m_regex_posix.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MSASL} ${LN} -s ${WRKSRC}/modules/extra/m_sasl_dh-aes.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_sasl_dh-blowfish.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MSTATS} ${LN} -s ${WRKSRC}/modules/extra/stats ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MTRE} ${LN} -s ${WRKSRC}/modules/extra/m_regex_tre.cpp ${WRKSRC}/modules/ .endif post-install: ${MKDIR} ${STAGEDIR}/${LOCALBASE}/anope/data/backups ${MKDIR} ${STAGEDIR}/${LOCALBASE}/anope/logs .include Index: head/irc/bitlbee/Makefile =================================================================== --- head/irc/bitlbee/Makefile (revision 411989) +++ head/irc/bitlbee/Makefile (revision 411990) @@ -1,107 +1,107 @@ # $FreeBSD$ PORTNAME= bitlbee PORTVERSION= 3.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= irc MASTER_SITES= http://get.bitlbee.org/src/ \ LOCAL/brix MAINTAINER= garga@FreeBSD.org COMMENT= IRC to other chat networks gateway LICENSE= GPLv2 BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \ xsltproc:${PORTSDIR}/textproc/libxslt SUB_FILES= pkg-message PORTDOCS= AUTHORS CHANGES CREDITS FAQ README PORTEXAMPLES= bitlbee.conf motd.txt GNU_CONFIGURE= yes USES= gmake pkgconfig python:build USE_RC_SUBR= bitlbee USE_GNOME= glib20 OPTIONS_SUB= yes OPTIONS_DEFINE= DEBUG DOCS EXAMPLES OTR OPTIONS_SINGLE= EVENTS SSL OPTIONS_SINGLE_EVENTS= GLIB LIBEVENT OPTIONS_SINGLE_SSL= OPENSSL GNUTLS NSS OPTIONS_MULTI= PROTO OPTIONS_MULTI_PROTO= JABBER LIBPURPLE MSN OSCAR SKYPE TWITTER YAHOO OTR_DESC= Off-the-Record Messaging support LIBPURPLE_DESC= Use libpurple for protocol support MSN_DESC= Microsoft Messenger support OSCAR_DESC= OSCAR (ICQ, AIM) support SKYPE_DESC= Skype support TWITTER_DESC= Twitter support YAHOO_DESC= Yahoo! Messenger support GLIB_DESC= Use glib as event handler LIBEVENT_DESC= Use libevent as event handler OPTIONS_DEFAULT= GLIB GNUTLS JABBER OSCAR OTR TWITTER YAHOO CONFIGURE_ARGS= --config=/var/db/bitlbee \ --pcdir=${PREFIX}/libdata/pkgconfig DEBUG_CONFIGURE_ON= --debug=1 GNUTLS_CONFIGURE_ON= --ssl=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt JABBER_CONFIGURE_OFF= --jabber=0 LIBEVENT_CONFIGURE_ON= --events=libevent --libevent=${LOCALBASE} LIBEVENT_LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 LIBPURPLE_CONFIGURE_ON= --purple=1 LIBPURPLE_LIB_DEPENDS= libpurple.so:${PORTSDIR}/net-im/libpurple MSN_CONFIGURE_OFF= --msn=0 NSS_CONFIGURE_ON= --ssl=nss NSS_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss OPENSSL_CONFIGURE_ON= --ssl=openssl OSCAR_CONFIGURE_OFF= --oscar=0 OTR_CONFIGURE_ON= --otr=1 OTR_LIB_DEPENDS= libotr.so.5:${PORTSDIR}/security/libotr SKYPE_CONFIGURE_ON= --skype=1 SKYPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Skype4Py>0:${PORTSDIR}/net-im/py-skype4py SKYPE_USES= python TWITTER_CONFIGURE_OFF= --twitter=0 YAHOO_CONFIGURE_OFF= --yahoo=0 USERS= bitlbee GROUPS= bitlbee .include post-patch: @${REINPLACE_CMD} -e '/^install:/ s/$$/ install-dev/' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s|^\(EFLAGS=.*\)|\1 ${LDFLAGS}|" \ ${WRKSRC}/configure @${REINPLACE_CMD} -e "s:/etc/bitlbee/motd.txt:${ETCDIR}/motd.txt:" \ -e "s:/var/lib/bitlbee:/var/db/bitlbee:" \ ${WRKSRC}/bitlbee.conf @${REINPLACE_CMD} -e "s:/var/lib/bitlbee:/var/db/bitlbee:" \ ${WRKSRC}/doc/bitlbee.8 post-install: .if ${PORT_OPTIONS:MSKYPE} ${MV} ${STAGEDIR}${PREFIX}/etc/skyped/skyped.conf \ ${STAGEDIR}${PREFIX}/etc/skyped/skyped.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/skyped/skyped.cnf \ ${STAGEDIR}${PREFIX}/etc/skyped/skyped.cnf.sample .endif ${MKDIR} ${STAGEDIR}${ETCDIR} .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/doc/@} ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${STAGEDIR}${EXAMPLESDIR} .endif .include Index: head/irc/ctrlproxy/Makefile =================================================================== --- head/irc/ctrlproxy/Makefile (revision 411989) +++ head/irc/ctrlproxy/Makefile (revision 411990) @@ -1,41 +1,41 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= ctrlproxy PORTVERSION= 3.0.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= irc MASTER_SITES= http://launchpadlibrarian.net/50016234/ \ LOCAL/ashish/ MAINTAINER= ashish@FreeBSD.org COMMENT= Flexible IRC proxy LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls USE_GNOME= glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes USES= pkgconfig gmake CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ctrlproxy @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ctrlproxy-admin @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/linestack-cmd @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ctrlproxyd ${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy_config.5 ${STAGEDIR}${MANPREFIX}/man/man5 @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/doc/help.txt ${STAGEDIR}${DATADIR}/help.txt @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in AUTHORS HACKING NEWS README ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/doc/user-guide.html ${STAGEDIR}${DOCSDIR} .include Index: head/irc/inspircd/Makefile =================================================================== --- head/irc/inspircd/Makefile (revision 411989) +++ head/irc/inspircd/Makefile (revision 411990) @@ -1,153 +1,153 @@ # Created by: Craig Edwards # $FreeBSD$ PORTNAME= inspircd PORTVERSION= 2.0.20 DISTVERSIONPREFIX= v -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= irc MAINTAINER= feld@FreeBSD.org COMMENT= Modular C++ IRC daemon LICENSE= GPLv2 CONFLICTS= inspircd-1.* USE_GITHUB= yes GH_ACCOUNT= inspircd USE_RC_SUBR= ${PORTNAME} MAKEFILE= BSDmakefile USERS= ircd GROUPS= ircd INSPIRCD_UID= 72 INSPIRCD_RUN?= /var/run/${PORTNAME} INSPIRCD_LOG?= /var/log/${PORTNAME}/ircd.log SUB_LIST+= PORTNAME=${PORTNAME} \ INSPIRCD_LOG=${INSPIRCD_LOG} \ INSPIRCD_RUN=${INSPIRCD_RUN} \ USERS=${USERS} \ GROUPS=${GROUPS} # Configure script is written in perl USES= cpe perl5 USE_PERL5= build CPE_VENDOR= inspire_ircd CPE_PRODUCT= inspircd HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-cc=${CXX} --config-dir=${ETCDIR} \ --module-dir=${PREFIX}/lib/${PORTNAME}/modules \ --prefix=${PREFIX}/lib/${PORTNAME} \ --binary-dir=${PREFIX}/bin --library-dir=${PREFIX}/lib/${PORTNAME} \ --log-dir=${INSPIRCD_LOG} --data-dir=/var/db/inspircd \ --enable-kqueue --disable-interactive \ --uid=${INSPIRCD_UID} OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAPAUTH LDAPOPER GNUTLS OPENSSL PCRE POSIX OPTIONS_DEFAULT= OPENSSL POSIX GNUTLS_DESC= Build m_ssl_gnutls module LDAPAUTH_DESC= Build m_ldapauth module LDAPOPER_DESC= Build m_ldapoper module MYSQL_DESC= Build m_mysql module OPENSSL_DESC= Build m_ssl_openssl module PGSQL_DESC= Build m_pgsql module SQLITE_DESC= Build m_sqlite3 module PCRE_DESC= Build m_regex_pcre module POSIX_DESC= Build m_regex_posix module .include .if ${PORT_OPTIONS:MLDAPAUTH} USE_OPENLDAP= yes EXTRAS:=${EXTRAS},m_ldapauth.cpp PLIST_SUB+= LDAPAUTH="" .else PLIST_SUB+= LDAPAUTH="@comment " .endif .if ${PORT_OPTIONS:MLDAPOPER} USE_OPENLDAP= yes EXTRAS:=${EXTRAS},m_ldapoper.cpp PLIST_SUB+= LDAPOPER="" .else PLIST_SUB+= LDAPOPER="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes EXTRAS:=${EXTRAS},m_mysql.cpp PLIST_SUB+= MYSQL="" .else PLIST_SUB+= MYSQL="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql EXTRAS:=${EXTRAS},m_pgsql.cpp PLIST_SUB+= PGSQL="" .else PLIST_SUB+= PGSQL="@comment " .endif .if ${PORT_OPTIONS:MSQLITE} USES+= pkgconfig sqlite EXTRAS:=${EXTRAS},m_sqlite3.cpp PLIST_SUB+= SQLITE="" .else PLIST_SUB+= SQLITE="@comment " .endif .if ${PORT_OPTIONS:MGNUTLS} USES+= pkgconfig LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --enable-gnutls EXTRAS:=${EXTRAS},m_ssl_gnutls.cpp PLIST_SUB+= GNUTLS="" .else PLIST_SUB+= GNUTLS="@comment " .endif .if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL=yes CONFIGURE_ARGS+= --enable-openssl EXTRAS:=${EXTRAS},m_ssl_openssl.cpp PLIST_SUB+= OPENSSL="" .else PLIST_SUB+= OPENSSL="@comment " .endif .if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre EXTRAS:=${EXTRAS},m_regex_pcre.cpp PLIST_SUB+= PCRE="" .else PLIST_SUB+= PCRE="@comment " .endif .if ${PORT_OPTIONS:MPOSIX} EXTRAS:=${EXTRAS},m_regex_posix.cpp PLIST_SUB+= POSIX="" .else PLIST_SUB+= POSIX="@comment " .endif pre-configure: @if [ ${EXTRAS} ]; then \ cd ${WRKSRC} && ./${CONFIGURE_SCRIPT} --enable-extras=${EXTRAS} ; \ fi post-patch: @${REINPLACE_CMD} -e 's|DATA_PATH "/inspircd.pid"|"/var/run/inspircd/inspircd.pid"|' ${WRKSRC}/src/inspircd.cpp @${REINPLACE_CMD} -e 's|conf/examples|examples|g' ${WRKSRC}/docs/conf/inspircd.conf.example post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/irc/minbif/Makefile =================================================================== --- head/irc/minbif/Makefile (revision 411989) +++ head/irc/minbif/Makefile (revision 411990) @@ -1,84 +1,84 @@ # Created by: Frank Steinborn # $FreeBSD$ PORTNAME= minbif PORTVERSION= 1.0.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= irc net-im MASTER_SITES= https://symlink.me/attachments/download/148/ MAINTAINER= ports@FreeBSD.org COMMENT= IRC to instant messaging gateway LICENSE= GPLv2 LIB_DEPENDS= libpurple.so:${PORTSDIR}/net-im/libpurple USES= cmake pkgconfig USE_GNOME= glib20 USE_RC_SUBR= ${PORTNAME} CFLAGS+= -DX_DISPLAY_MISSING LDFLAGS+= -pthread USERS= minbif GROUPS= minbif SUB_FILES= pkg-message SUB_LIST= USERS="${USERS}" OPTIONS_DEFINE= CACA GNUTLS VIDEO PLUGINS DOCS OPTIONS_DEFAULT= CACA VIDEO_IMPLIES= CACA CACA_DESC= Buddy icon display using libcaca VIDEO_DESC= Webcam display using libcaca (implies CACA) PLUGINS_DESC= Compile additional libpurple-plugins CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca \ libImlib2.so:${PORTSDIR}/graphics/imlib2 CACA_CMAKE_ON= -DENABLE_CACA:BOOL=ON -DENABLE_IMLIB:BOOL=ON CACA_CMAKE_OFF= -DENABLE_CACA:BOOL=OFF -DENABLE_IMLIB:BOOL=OFF GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CMAKE_ON= -DENABLE_TLS:BOOL=ON GNUTLS_CMAKE_OFF= -DENABLE_TLS:BOOL=OFF PLUGINS_USE= GNOME=libxml2 PLUGINS_CMAKE_ON= -DENABLE_PLUGIN:BOOL=ON PLUGINS_CMAKE_OFF= -DENABLE_PLUGIN:BOOL=OFF PLUGINS_PLIST_FILES= lib/purple-2/libcoincoin.so \ lib/purple-2/libgayattitude.so VIDEO_USE= GSTREAMER=core,good VIDEO_CMAKE_ON= -DENABLE_VIDEO:BOOL=ON VIDEO_CMAKE_OFF= -DENABLE_VIDEO:BOOL=OFF VIDEO_LIB_DEPENDS= libgstfarsight-0.10.so:${PORTSDIR}/net-im/farsight2 post-patch: @${REINPLACE_CMD} -e \ 's|"-lpthread -lstdc++"||' ${WRKSRC}/src/CMakeLists.txt @${REINPLACE_CMD} -e '/pam_misc\.h/d' ${WRKSRC}/src/im/auth_pam.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/minbif.8 ${STAGEDIR}${MANPREFIX}/man/man8 @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/minbif.conf \ ${STAGEDIR}${ETCDIR}/minbif.conf.sample ${INSTALL_DATA} ${WRKSRC}/minbif.motd \ ${STAGEDIR}${ETCDIR}/minbif.motd.sample do-install-PLUGINS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/purple-2 ${INSTALL_LIB} ${WRKSRC}/plugins/coincoin/libcoincoin.so \ ${WRKSRC}/plugins/gayattitude/libgayattitude.so \ ${STAGEDIR}${PREFIX}/lib/purple-2 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS ChangeLog README doc/minbif.xinetd ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/irc/ngircd/Makefile =================================================================== --- head/irc/ngircd/Makefile (revision 411989) +++ head/irc/ngircd/Makefile (revision 411990) @@ -1,66 +1,67 @@ # Created by: Kirill Ponomarew # $FreeBSD$ PORTNAME= ngircd PORTVERSION= 23 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://arthur.barton.de/pub/${PORTNAME}/ \ http://ngircd.mirror.3rz.org/pub/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org COMMENT= Free open source daemon for Internet Relay Chat (IRC) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules # --docdir=${WRKDIR}/tmproot USE_RC_SUBR= ngircd CPE_VENDOR= barton CPE_VERSION= ${PORTVERSION:C/^([0-9]+)$/\1.0/} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= * PLIST_FILES= etc/ngircd.conf.sample \ man/man5/ngircd.conf.5.gz \ man/man8/ngircd.8.gz \ sbin/ngircd OPTIONS_DEFINE= DEBUG DOCS ICONV IDENT IPV6 IRCPLUS LIBWRAP \ SNIFFER SYSLOG ZLIB OPTIONS_RADIO= TLS OPTIONS_RADIO_TLS= GNUTLS OPENSSL OPTIONS_DEFAULT= ICONV IRCPLUS LIBWRAP OPENSSL SYSLOG ZLIB DEBUG_CONFIGURE_EBABLE= debug GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls ICONV_USES= iconv ICONV_CONFIGURE_WITH= iconv IDENT_DESC= IDENT (AUTH) protocol support IDENT_LIB_DEPENDS= libident.so:${PORTSDIR}/security/libident INDENT_CONFIGURE_WITH= dent IPV6_CONFIGURE_ENABLE= ipv6 IRCPLUS_DESC= IRC+ protocol IRCPLUS_CONFIGURE_ENABLE= ircplus LIBWRAP_CONFIGURE_WITH= tcp-wrappers OPENSSL_USE= openssl=yes OPENSSL_CONFIGURE_WITH= openssl SNIFFER_DESC= IRC traffic sniffer SNIFFER_CONFIGURE_ENABLE= sniffer SYSLOG_CONFIGURE_WITH= syslog ZLIB_CONFIGURE_WITH= zlib post-patch: @${REINPLACE_CMD} -e \ '/LIBS/s|-liconv|${ICONV_LIB}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ '/toplevel/s| \.\./COPYING|| ; \ /INSTALL/s|.conf$$|.conf.sample|' ${WRKSRC}/doc/Makefile.in .include Index: head/irc/scrollz/Makefile =================================================================== --- head/irc/scrollz/Makefile (revision 411989) +++ head/irc/scrollz/Makefile (revision 411990) @@ -1,57 +1,58 @@ # Created by: Will Andrews # $FreeBSD$ PORTNAME= ScrollZ PORTVERSION= 2.3 DISTVERSIONPREFIX= ${PORTNAME}- +PORTREVISION= 1 CATEGORIES= irc ipv6 MAINTAINER= freebsd@bitchx.org COMMENT= Enhanced ircII client that supports scripts, colors, and more LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= gmake iconv ncurses USE_GITHUB= yes GNU_CONFIGURE= yes DATADIR= ${PREFIX}/share/${PORTNAME:tl} PLIST_SUB= SCROLLZ_VER="${PORTVERSION}" OPTIONS_DEFINE= IPV6 REGEX UTF8 OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL REGEX UTF8 IPV_CONFIGURE_ENABLE= ipv6 GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_USES= pkgconfig GNUTLS_CONFIGURE_ON= --with-ssl REGEX_CONFIGURE_ENABLE= regexp OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} UTF8_CONFIGURE_ENABLE= utf8 .include .if !empty(ICONV_LIB) CONFIGURE_ENV+=ac_cv_func_iconv_open=yes .endif post-patch: @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure pre-build: .if !defined(BATCH) @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o SZdist \ SZdist.c) @(cd ${WRKSRC} && ./SZdist) .endif post-install: .for i in scrollz-${PORTVERSION} wservz @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor .include Index: head/irc/weechat/Makefile =================================================================== --- head/irc/weechat/Makefile (revision 411989) +++ head/irc/weechat/Makefile (revision 411990) @@ -1,117 +1,118 @@ # Created by: clement # $FreeBSD$ PORTNAME= weechat PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://weechat.org/files/src/ MAINTAINER= jase@FreeBSD.org COMMENT= Lightweight and user friendly ncurses based IRC client LICENSE= GPLv3 CONFLICTS= weechat-devel-[0-9]* USE_LDCONFIG= yes USES= cmake iconv localbase ncurses tar:bzip2 CMAKE_ARGS+= -DENABLE_GUILE=no \ -DICONV_INCLUDE_PATH=${ICONV_INCLUDE_PATH} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl \ libgcrypt.so:${PORTSDIR}/security/libgcrypt OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA JAVASCRIPT CHARSET BACKTRACE ASPELL \ GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS OPTIONS_DEFAULT=RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \ GNUTLS CA_BUNDLE ICON MANPAGES OPTIONS_SUB= yes BACKTRACE_DESC= Provide crash backtraces CA_BUNDLE_DESC= Include CA bundle for certificate verification CHARSET_DESC= Charset conversion support ICON_DESC= Desktop icon JAVASCRIPT_DESC=Javascript support PYTHON_DESC= Python scripting language support RUBY_DESC= Ruby scripting language support ASPELL_CMAKE_OFF= -DENABLE_ASPELL=no ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell BACKTRACE_USES= execinfo CA_BUNDLE_CMAKE_ON= -DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss CHARSET_CMAKE_OFF= -DENABLE_CHARSET=no DOCS_CMAKE_ON= -DENABLE_DOC=yes JAVASCRIPT_CMAKE_OFF= -DENABLE_JAVASCRIPT=no JAVASCRIPT_CMAKE_ON= -DENABLE_JAVASCRIPT=yes JAVASCRIPT_LIB_DEPENDS= libv8.so:${PORTSDIR}/lang/v8 GNUTLS_CMAKE_OFF= -DENABLE_GNUTLS=no GNUTLS_USES= pkgconfig -GNUTLS_LIB_DEPENDS= libgnutls.so.28:${PORTSDIR}/security/gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls LUA_CMAKE_OFF= -DENABLE_LUA=no LUA_CMAKE_ON= -DBSD_LUA_LIBDIR=${LUA_LIBDIR} \ -DBSD_LUA_INCDIR=${LUA_INCDIR} \ -DBSD_LUA_VER=${LUA_VER} LUA_USES= lua:51 MANPAGES_CMAKE_ON= -DENABLE_MAN=yes -DMANDIR=${MANPREFIX}/man NLS_CMAKE_OFF= -DENABLE_NLS=no NLS_USES= gettext PERL_CMAKE_OFF= -DENABLE_PERL=no PERL_USES= perl5 PYTHON_CMAKE_OFF= -DENABLE_PYTHON=no PYTHON_CMAKE_ON= -DBSD_PYTHON_CMD=${PYTHON_CMD} \ -DBSD_PYTHON_VER=${PYTHON_VERSION} PYTHON_USES= python RUBY_CMAKE_OFF= -DENABLE_RUBY=no RUBY_CMAKE_ON= -DBSD_RUBY_CMD=${RUBY} \ -DBSD_RUBY_VER=${RUBY_NAME} RUBY_USE= ruby=yes TCL_CMAKE_OFF= -DENABLE_TCL=no TCL_CMAKE_ON= -DBSD_TCL_VER=${TCL_VER} \ -DBSD_TCL_LIBDIR=${LOCALBASE}/lib \ -DBSD_TCL_INCDIR=${TCL_INCLUDEDIR} TCL_USES= tcl:85+ .include .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \ asciidoc:${PORTSDIR}/textproc/asciidoc \ source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight .endif post-patch: @${REINPLACE_CMD} -e 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt .for f in src/CMakeLists.txt src/core/CMakeLists.txt cmake/*.cmake @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/${f} .endfor .if empty(PORT_OPTIONS:MBACKTRACE) @${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' \ ${WRKSRC}/src/core/CMakeLists.txt .endif .if empty(PORT_OPTIONS:MICON) @${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' \ ${WRKSRC}/CMakeLists.txt .endif post-install: ${LN} -sf ${PREFIX}/bin/weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses .include Index: head/japanese/jd/Makefile =================================================================== --- head/japanese/jd/Makefile (revision 411989) +++ head/japanese/jd/Makefile (revision 411990) @@ -1,39 +1,40 @@ # Created by: Takashi Kato # $FreeBSD$ PORTNAME= jd PORTVERSION= 2.8.9 DISTVERSIONSUFFIX= -150226 +PORTREVISION= 1 CATEGORIES= japanese www MASTER_SITES= SFJP/jd4linux/62877 MAINTAINER= townwear@gmail.com COMMENT= 2ch browser LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt USES= autoreconf iconv:translit libtool tar:tgz USE_GNOME= gtk20 gtkmm24 libgnomeui GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sessionlib=gnomeui LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} OPTIONS_DEFINE= ONIGURUMA PANGOLAYOUT ONIGURUMA_DESC= Use oniguruma regular expressions library PANGOLAYOUT_DESC= Use PANGOLayout instead of PangoGlyphString ONIGURUMA_CONFIGURE_WITH= oniguruma ONIGURUMA_LIB_DEPENDS= libonig.so:${PORTSDIR}/devel/oniguruma5 PANGOLAYOUT_CONFIGURE_WITH= pangolayout PLIST_FILES= bin/jd \ share/applications/jd.desktop \ share/pixmaps/jd.png .include Index: head/lang/gnustep-base/Makefile =================================================================== --- head/lang/gnustep-base/Makefile (revision 411989) +++ head/lang/gnustep-base/Makefile (revision 411990) @@ -1,81 +1,79 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= gnustep-base PORTVERSION= 1.24.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel gnustep MASTER_SITES= GNUSTEP/core MAINTAINER= theraven@FreeBSD.org COMMENT= GNUstep Foundation library LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 LIB_DEPENDS+= libxslt.so:${PORTSDIR}/textproc/libxslt LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt RUN_DEPENDS+= ${LOCALBASE}/GNUstep/System/Library/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-procfs --disable-mixedabi CONFIGURE_ENV= OBJCFLAGS='-fobjc-runtime=gnustep-1.7 -fblocks' USES= pkgconfig iconv gnustep USE_GNUSTEP= build USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} MAKE_FLAGS= OPTFLAG="${CFLAGS}" ETCDIR= ${LOCALBASE}/etc STAGEHEADER= ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Headers PLIST_SUB+= BASEVERSION=${PORTVERSION:R} OPTIONS_DEFINE= ICU OPTIONS_RADIO= SSL ZEROCONF OPTIONS_RADIO_SSL= GNUTLS OPENSSL OPTIONS_RADIO_ZEROCONF= AVAHI MDNS OPTIONS_DEFAULT= ICU GNUTLS AVAHI OPTIONS_SUB= yes ZEROCONF_DESC= Zeroconf (Bonjour) support AVAHI_DESC= Zeroconf via Avahi (preferred) MDNS_DESC= Zeroconf via mDNSResponder ICU_LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu ICU_CONFIGURE_OFF= --disable-icu -GNUTLS_LIB_DEPENDS= libgnutls-openssl.so:${PORTSDIR}/security/gnutls -GNUTLS_CONFIGURE_ON= --with-tls-prefix=${LOCALBASE} \ - TLS_CONFIG="pkg-config -gnutls" -GNUTLS_CONFIGURE_OFF= --disable-tls +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_ENABLE=tls OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_OFF= --disable-openssl .include .if ${PORT_OPTIONS:MAVAHI} CONFIGURE_ARGS+= --with-zeroconf-api=avahi LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app .elif ${PORT_OPTIONS:MMDNS} CONFIGURE_ARGS+= --with-zeroconf-api=mdns LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder .else CONFIGURE_ARGS+= --disable-zeroconf .endif post-extract: @${REINPLACE_CMD} -e "s|/usr/local/|${LOCALBASE}/| ; \ s|HAVE_TLS|HAVE_GNUTLS|" ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${FILESDIR}/gdomap_if ${STAGEDIR}${ETCDIR} ${RMDIR} ${STAGEHEADER}/gnustep/base ${RMDIR} ${STAGEHEADER}/GNUstepBase/unicode .include Index: head/mail/anubis/Makefile =================================================================== --- head/mail/anubis/Makefile (revision 411989) +++ head/mail/anubis/Makefile (revision 411990) @@ -1,109 +1,109 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= anubis PORTVERSION= 4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= GNU MAINTAINER= jhale@FreeBSD.org COMMENT= Outgoing SMTP mail processor LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= autoreconf charsetfix cpe makeinfo pkgconfig shebangfix CHARSETFIX_MAKEFILEIN= gnulib.mk CPE_VENDOR= gnu SHEBANG_FILES= contrib/msg2smtp.pl USE_RC_SUBR= anubis GNU_CONFIGURE= yes INFO= anubis PORTEXAMPLES= 1anubisrc 2anubisrc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= NLS EXAMPLES GUILE GNUPG GNUTLS GSASL \ LIBWRAP PCRE PAM SOCKS OPTIONS_GROUP= DB OPTIONS_GROUP_DB= GDBM MYSQL PGSQL OPTIONS_DEFAULT= GUILE GNUPG GNUTLS GSASL OPTIONS_SUB= yes NO_OPTIONS_SORT= yes .if !exists(/usr/include/tcpd.h) OPTIONS_EXCLUDE+= LIBWRAP .endif .if !exists(/usr/lib/libpam.so) OPTIONS_EXCLUDE+= PAM .endif GDBM_DESC= GDBM backend GDBM_IMPLIES= GSASL GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm GDBM_CONFIGURE_WITH= gdbm GNUPG_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme GNUPG_CONFIGURE_WITH= gpgme GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls GSASL_DESC= GSASL support (required for databases) GSASL_LIB_DEPENDS= libgsasl.so:${PORTSDIR}/security/gsasl GSASL_CONFIGURE_WITH= gsasl GUILE_LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile GUILE_CONFIGURE_WITH= guile GUILE_PORTEXAMPLES= anubis.scm anubisrc.guile LIBWRAP_CONFIGURE_WITH= tcp-wrappers MYSQL_IMPLIES= GSASL MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_WITH= mysql MYSQL_VARS= REQUIRE+=mysql NLS_USES= gettext iconv NLS_CONFIGURE_ENABLE= nls PAM_CONFIGURE_WITH= pam PAM_PORTEXAMPLES= pam PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PCRE_CONFIGURE_WITH= pcre PGSQL_IMPLIES= GSASL PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgres PGSQL_VARS= REQUIRE+=postgresql SOCKS_DESC= SOCKS proxy support SOCKS_CONFIGURE_WITH= socks-proxy .include # Default requirement for anubis rc script REQUIRE+= mail SUB_LIST+= REQUIRE="${REQUIRE}" post-patch: @${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/src/headers.h post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*rc ${STAGEDIR}${EXAMPLESDIR} .if ${PORT_OPTIONS:MGUILE} cd ${WRKSRC}/examples && \ ${INSTALL_DATA} ${GUILE_PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif .if ${PORT_OPTIONS:MPAM} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pam ${INSTALL_DATA} ${WRKSRC}/examples/pam/anubis* ${STAGEDIR}${EXAMPLESDIR}/pam .endif .include Index: head/mail/courier-imap/Makefile =================================================================== --- head/mail/courier-imap/Makefile (revision 411989) +++ head/mail/courier-imap/Makefile (revision 411990) @@ -1,151 +1,151 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= courier-imap PORTVERSION= 4.16.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= mail ipv6 MASTER_SITES= SF/courier/imap/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes BUILD_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base \ ${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool LIB_DEPENDS= libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode USES= gmake perl5 tar:bzip2 GNU_CONFIGURE= yes USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl CPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include LDFLAGS+= -L${LOCALBASE}/lib -L${PREFIX}/lib CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash MAKE_ENV:= ${CONFIGURE_ENV} ALL_TARGET= all makeimapaccess makedat # # options available: # # WITH_SYSLOG_FACILITY: The syslogfacility to use # OPTIONS_DEFINE= FAM TRASHQUOTA GDBM IPV6 GNUTLS FAM_DESC= Fam support for IDLE command TRASHQUOTA_DESC= Include deleted mails in the quota GNUTLS_DESC= Use GnuTLS instead of OpenSSL (Enables SNI) FAM_USES= fam .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" .endif CONFDIR?= ${PREFIX}/etc/${PORTNAME} USERDB?= ${PREFIX}/etc/userdb LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME} USE_OPENSSL= yes PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --localstatedir="${PREFIX}/var" \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ --enable-workarounds-for-imap-client-bugs \ --enable-unicode \ --disable-root-check \ --with-locking-method=fcntl \ COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig .include .if ${PORT_OPTIONS:MGNUTLS} CONFIGURE_ARGS+=--with-gnutls LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls USES+= pkgconfig .endif .include .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif .if ${PORT_OPTIONS:MSYSLOG_FACILITY} CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY} .endif .if ${PORT_OPTIONS:MAUTH_USERDB} .if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB} LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm .else CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} .endif .endif .if ! ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+=--without-ipv6 .endif .if ${PORT_OPTIONS:MTRASHQUOTA} CONFIGURE_ARGS+=--with-trashquota .endif .if ${PORT_OPTIONS:MFAM} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif EXTRA_DOCS= AUTHORS INSTALL NEWS \ libs/imap/ChangeLog \ libs/imap/README \ libs/imap/README.proxy \ libs/maildir/README.imapkeywords.html \ libs/maildir/README.maildirfilter.html \ libs/maildir/README.maildirquota.txt \ libs/maildir/README.sharedfolders.txt \ libs/tcpd/README.couriertls \ post-patch: .if ! ${PORT_OPTIONS:MFAM} @${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \ ${WRKSRC}/libs/maildir/configure .endif @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/libs/liblock/configure @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|TLS_PROTOCOL=SSL3|TLS_PROTOCOL=SSL23|g' \ ${WRKSRC}/libs/imap/pop3d-ssl.dist.in \ ${WRKSRC}/libs/imap/imapd-ssl.dist.in post-install: ${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/ .for i in imapd pop3d ${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} .for a in ${EXTRA_DOCS} ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor @${ECHO_MSG} "In case you use authpam, you should put the following lines" @${ECHO_MSG} "in your /etc/pam.d/imap" @${ECHO_MSG} "auth required pam_unix.so try_first_pass" @${ECHO_MSG} "account required pam_unix.so try_first_pass" @${ECHO_MSG} "session required pam_permit.so" @${ECHO_MSG} "" @${ECHO_MSG} "You will have to run ${DATADIR}/mkimapdcert to create" @${ECHO_MSG} "a self-signed certificate if you want to use imapd-ssl." @${ECHO_MSG} "And you will have to copy and edit the *.dist files to *" @${ECHO_MSG} "in ${CONFDIR}." @${ECHO_MSG} "" .include Index: head/mail/exim/Makefile =================================================================== --- head/mail/exim/Makefile (revision 411989) +++ head/mail/exim/Makefile (revision 411990) @@ -1,607 +1,608 @@ # Created by: markm@FreeBSD.org # $FreeBSD$ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= EXIM/exim4/:exim DISTNAME= ${PORTNAME}-${EXIM_VERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim DIST_SUBDIR= exim EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= vsevolod@FreeBSD.org COMMENT?= High performance MTA for Unix systems on the Internet LICENSE= GPLv2 USES= cpe tar:bzip2 perl5 USE_PERL5= run # Exim build system is job unsafe atm MAKE_JOBS_UNSAFE= yes # One can tune the following "hidden" knobs: # - EXIM_USER: user exim is running as; # - EXIM_GROUP: ditto for the group; # - LOGDIR: where Exim logs will be put; # - LOG_FILE_PATH: path where '%s' will be substituted with # the target name (main, reject, etc); # - CONFIG_FILE_PATH: path to the default configuration file; # - ALT_CONFIG_PREFIX: path to the default prefix for all # configuration files, excluding the main one; # will be effective only when WITH_ALT_CONFIG_PREFIX # will be set via OPTIONS. .if make(makesum) && !defined(FETCH_ALL) .error "You forgot to define FETCH_ALL to create the sane distinfo" .endif .include "options" OPTIONS_SUB= yes AUTH_SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 BDB_USE= bdb=yes DMARC_LIB_DEPENDS= libopendmarc.so:${PORTSDIR}/mail/opendmarc EMBEDDED_PERL_USE= perl5=run,build EXIMON_USE= xorg=x11,xaw,xt GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls ICONV_USES= iconv:lib,build INTERNATIONAL_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn MYSQL_USE= mysql=yes OPENLDAP_USE= openldap=yes PGSQL_USES= pgsql REDIS_LIB_DEPENDS= libhiredis.so:${PORTSDIR}/databases/hiredis SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd SA_EXIM_RUN_DEPENDS= ${LOCALBASE}/bin/spamc:${PORTSDIR}/mail/spamassassin SPF_LIB_DEPENDS= libspf2.so:${PORTSDIR}/mail/libspf2 SQLITE_USE= sqlite=yes SQLITE_USES= pkgconfig .include # OCSP is supported for openssl only .if ${PORT_OPTIONS:MOCSP} .if ! ${PORT_OPTIONS:MTLS} IGNORE= you cannot enable OCSP stapling without TLS support .elif ${PORT_OPTIONS:MGNUTLS} IGNORE= you cannot enable OCSP stapling with gnutls .endif .endif # DMARC implies SPF .if ${PORT_OPTIONS:MDMARC} .if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM} IGNORE= you cannot enable DMARC without SPF and DKIM support .endif .endif # DANE implies DNSSEC .if ${PORT_OPTIONS:MDANE} .if ! ${PORT_OPTIONS:MDNSSEC} || ! ${PORT_OPTIONS:MTLS} IGNORE= you cannot enable DANE without DNSSEC support or without TLS support .endif # Use Openssl from the ports .if ${OSVERSION} < 1000000 . if ! ${PORT_OPTIONS:MGNUTLS} WITH_OPENSSL_PORT= yes . endif .endif .endif .if ${PORT_OPTIONS:MSA_EXIM} || defined(FETCH_ALL) MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim .endif EXIM_VERSION= 4.86.2 SA_EXIM_VERSION=4.2 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" .if !defined(EXIMON_ONLY) PLIST_SUB+= EXIM="" .if defined(PKGNAMESUFFIX) CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-4.* .endif .for suffix in -ldap2 -mysql -postgresql -sa-exim -sqlite .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != ${suffix} CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}${suffix}-4.* .endif .endfor .if ${PORT_OPTIONS:MEXIMON} CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-monitor-4.* .endif PKGMESSAGE= ${WRKDIR}/POST-INSTALL-NOTES .else # !EXIMON_ONLY PLIST_SUB+= EXIM="@comment " PORT_OPTIONS+= EXIMON PKGMESSAGE= ${WRKDIR}/pkg-message EXIM_INSTALL_ARG+= "eximon" "eximon.bin" .endif # !EXIMON_ONLY PORTDOC_BASE= ACKNOWLEDGMENTS NOTICE README.UPDATING PORTDOC_FILES= ChangeLog Exim3.upgrade Exim4.upgrade NewStuff \ OptionLists.txt README README.SIEVE dbm.discuss.txt \ experimental-spec.txt filter.txt spec.txt PORT_EXAMPLES= convert4r3 convert4r4 transport-filter.pl DAILY_SCRIPTS= 150.exim-tidydb 460.exim-mail-rejects MAKE_ENV+= OSTYPE="${OPSYS}" ARCHTYPE="${ARCH}" DUMMY_LDFLAGS="${DUMMY_LDFLAGS}" STRIP_COMMAND="${STRIP_CMD}" EXIM_USER?= mailnull EXIM_GROUP?= mail # Default user/group are system ones, so we don't want to check them .if ${EXIM_USER} != "mailnull" USERS= ${EXIM_USER} .endif .if ${EXIM_GROUP} != "mail" GROUPS= ${EXIM_GROUP} .endif LOGDIR?= /var/log/exim LOG_FILE_PATH?= ${LOGDIR}/%slog CONFIG_FILE_PATH?= ${PREFIX}/etc/exim/configure ALT_CONFIG_PREFIX?= ${PREFIX}/etc/exim/ EXIM_DYNAMIC_LDFLAGS= -fPIC -rdynamic -export-dynamic SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \ -e 's,%%EXIM_USER%%,${EXIM_USER},g' \ -e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g' \ -e 's,%%LOGDIR%%,${LOGDIR},g' SEDLIST+= -e 's,XX_CFLAGS_XX,${CFLAGS:S/,/\\,/g},' \ -e 's,XX_PREFIX_XX,${PREFIX:S/,/\\,/g},' \ -e 's,XX_LOCALBASE_XX,${LOCALBASE:S/,/\\,/g},' \ -e 's,XX_LOG_FILE_PATH_XX,${LOG_FILE_PATH:S/,/\\,/g},' \ -e 's,XX_CONFIG_FILE_PATH_XX,${CONFIG_FILE_PATH:S/,/\\,/g},' \ -e 's,XX_ALT_CONFIG_PREFIX_XX,${ALT_CONFIG_PREFIX:S/,/\\,/g},' \ -e 's,XX_EXIM_USER_XX,${EXIM_USER:S/,/\\,/g},' \ -e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP:S/,/\\,/g},' \ -e 's,XX_DEFAULT_CHARSET_XX,${WITH_DEFAULT_CHARSET:S/,/\\,/g},' \ -e 's,XX_DYNAMIC_LDFLAGS_XX,${EXIM_DYNAMIC_LDFLAGS:S/,/\\,/g},' PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}-${PORTREVISION}" \ EXIM_USER=${EXIM_USER} \ EXIM_GROUP=${EXIM_GROUP} \ LOGDIR="${LOGDIR:S/^\///}" # Exim refuses to run local deliveries as root by default. You can # add other users to this colon-separated list that cannot be # overridden at runtime below, but are advised not to remove "root". #WITH_FIXED_NEVER_USERS= root:daemon:bin # When Exim is decoding MIME "words" in header lines it converts any foreign # character sets to the one that is set in the headers_charset option. # The default setting is defined by this setting: WITH_DEFAULT_CHARSET?= ISO-8859-1 # You should not need to fiddle with anything below this point. LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre .if ! ${PORT_OPTIONS:MDKIM} SEDLIST+= -e 's,^\# (DISABLE_DKIM=),\1,' .endif .if ${PORT_OPTIONS:MLISTMATCH_RHS} SEDLIST+= -e 's,^\# (EXPAND_LISTMATCH_RHS=),\1,' .endif .if ${PORT_OPTIONS:MDCC} SEDLIST+= -e 's,^\# (EXPERIMENTAL_DCC=),\1,' .endif .if ${PORT_OPTIONS:MPROXY} SEDLIST+= -e 's,^\# (EXPERIMENTAL_PROXY=),\1,' .endif .if ${PORT_OPTIONS:MCERTNAMES} SEDLIST+= -e 's,^\# (EXPERIMENTAL_CERTNAMES=),\1,' .endif .if ${PORT_OPTIONS:MDSN} SEDLIST+= -e 's,^\# (EXPERIMENTAL_DSN=),\1,' .endif .if ${PORT_OPTIONS:MDANE} SEDLIST+= -e 's,^\# (EXPERIMENTAL_DANE=),\1,' .endif .if ${PORT_OPTIONS:MEVENT} SEDLIST+= -e 's,^\# (EXPERIMENTAL_EVENT=),\1,' .endif .if ${PORT_OPTIONS:MINTERNATIONAL} SEDLIST+= -e 's,^\# (EXPERIMENTAL_INTERNATIONAL=),\1,' \ -e 's,XX_IDN_LIBS_XX,-L${LOCALBASE}/lib -lidn,' .else SEDLIST+= -e 's,XX_IDN_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MSOCKS} SEDLIST+= -e 's,^\# (EXPERIMENTAL_SOCKS=),\1,' .endif .if !${PORT_OPTIONS:MPRDR} SEDLIST+= -e 's,^\# (DISABLE_PRDR=),\1,' .endif .if !${PORT_OPTIONS:MOCSP} SEDLIST+= -e 's,^\# (DISABLE_OCSP=),\1,' .endif .if !${PORT_OPTIONS:MDNSSEC} SEDLIST+= -e 's,^\# (DISABLE_DNSSEC=),\1,' .endif .if ${PORT_OPTIONS:MDMARC} SEDLIST+= -e 's,XX_DMARC_LIBS_XX,-L${LOCALBASE}/lib -lopendmarc,' \ -e 's,^\# (EXPERIMENTAL_DMARC=),\1,' .else SEDLIST+= -e 's,XX_DMARC_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MWISHLIST} EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name 'wishlist-*.patch'` .endif .if ${PORT_OPTIONS:MFIXED_NEVER_USERS} SEDLIST+= -e 's,^(FIXED_NEVER_USERS=).*,\1${WITH_FIXED_NEVER_USERS:S/,/\\,/g},' .endif .if ${PORT_OPTIONS:MEXIMON} SEDLIST+= -e 's,^\# (EXIM_MONITOR=),\1,' .endif .if ${PORT_OPTIONS:MTLS} SEDLIST+= -e 's,^\# (SUPPORT_TLS=),\1,' .if ! ${PORT_OPTIONS:MGNUTLS} USE_OPENSSL= yes SEDLIST+= -e 's,^\# (TLS_LIBS=.*-lssl[[:space:]]),\1,' .else SEDLIST+= -e 's,^\# (USE_GNUTLS=),\1,' SEDLIST+= -e 's,^\# (TLS_LIBS=.*-lgnutls[[:space:]]),\1,' .endif .endif .if ${PORT_OPTIONS:MEMBEDDED_PERL} SEDLIST+= -e 's,^\# (EXIM_PERL=),\1,' .endif .if ${PORT_OPTIONS:MTCP_WRAPPERS} SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,-lwrap,' \ -e 's,^\# (USE_TCP_WRAPPERS=),\1,' .else SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MICONV} SEDLIST+= -e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib ${ICONV_LIB},' \ -e 's,^\# (HAVE_ICONV=),\1,' .else SEDLIST+= -e 's,XX_ICONV_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MOPENLDAP_VER} && ${WITH_OPENLDAP_VER:tl} != "auto" WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif .if ${PORT_OPTIONS:MOPENLDAP} LDAP_LIB_TYPE= OPENLDAP2 SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -llber -lldap,' \ -e 's,XX_LDAP_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include,' \ -e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE:S/,/\\,/g},' \ -e 's,^\# (LOOKUP_LDAP=),\1,' .else SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \ -e 's,^(LDAP_LIB_TYPE=),\# \1,' .endif .if ${PORT_OPTIONS:MBDB} INVALID_BDB_VER= 2 3 DB_LIBS= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} DB_INCLUDES= -I${BDB_INCLUDE_DIR} .else DB_LIBS= DB_INCLUDES= SEDLIST+= -e 's,^(DBMLIB=),\# \1,' .endif SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \ -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},' .if ${PORT_OPTIONS:MMYSQL} SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -lmysqlclient,' \ -e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \ -e 's,^\# (LOOKUP_MYSQL=),\1,' .else SEDLIST+= -e 's,XX_MYSQL_[^ ]*_XX,,' .endif .if ${PORT_OPTIONS:MSASLAUTHD} SASLAUTHD_SOCKET?= /var/run/saslauthd/mux SEDLIST+= -e 's,^\# (CYRUS_SASLAUTHD_SOCKET=).*,\1${SASLAUTHD_SOCKET:S/,/\\,/g},' .endif .if ${PORT_OPTIONS:MPAM} SEDLIST+= -e 's,XX_PAM_LIBS_XX,-lpam,' \ -e 's,^\# (SUPPORT_PAM=),\1,' .else SEDLIST+= -e 's,XX_PAM_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MAUTH_CRAM_MD5} SEDLIST+= -e 's,^\# (AUTH_CRAM_MD5=),\1,' .endif .if ${PORT_OPTIONS:MAUTH_PLAINTEXT} SEDLIST+= -e 's,^\# (AUTH_PLAINTEXT=),\1,' .endif .if ${PORT_OPTIONS:MAUTH_DOVECOT} SEDLIST+= -e 's,^\# (AUTH_DOVECOT=),\1,' .endif .if ${PORT_OPTIONS:MAUTH_SPA} SEDLIST+= -e 's,^\# (AUTH_SPA=),\1,' .endif .if ${PORT_OPTIONS:MAUTH_SASL} SEDLIST+= -e 's,^\# (AUTH_CYRUS_SASL=),\1,' \ -e 's,^\# (AUTH_LIBS=.*-lsasl2),\1,' .endif .if ${PORT_OPTIONS:MAUTH_RADIUS} WITH_RADIUS_TYPE?= RADLIB .if ${WITH_RADIUS_TYPE:tl} == radlib SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-lradius,' \ -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1/etc/radius.conf,' \ -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADLIB,' .elif ${WITH_RADIUS_TYPE:tl} == radiusclient LIB_DEPENDS+= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lradiusclient-ng,' \ -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE:S/,/\\,/g}/etc/radiusclient-ng/radiusclient.conf,' \ -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENTNEW,' .else IGNORE= the variable WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT .endif .else SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MPGSQL} SEDLIST+= -e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lpq,' \ -e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/pgsql,' \ -e 's,^\# (LOOKUP_PGSQL=),\1,' .else SEDLIST+= -e 's,XX_PGSQL_[^ ]*_XX,,' .endif .if ! ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL} && !defined(LDAP_LIB_TYPE) && \ ! ${PORT_OPTIONS:MBDB} SEDLIST+= -e 's,^(LOOKUP_LIBS=),\# \1,' \ -e 's,^(LOOKUP_INCLUDE=),\# \1,' .endif .if ! ${PORT_OPTIONS:MDNSDB} SEDLIST+= -e 's,^(LOOKUP_DNSDB=),\# \1,' .endif .if ${PORT_OPTIONS:MMAILDIR} SEDLIST+= -e 's,^\# (SUPPORT_MAILDIR=),\1,' .endif .if ${PORT_OPTIONS:MMAILSTORE} SEDLIST+= -e 's,^\# (SUPPORT_MAILSTORE=),\1,' .endif .if ${PORT_OPTIONS:MMBX} SEDLIST+= -e 's,^\# (SUPPORT_MBX=),\1,' .endif .if ${PORT_OPTIONS:MCDB} SEDLIST+= -e 's,^\# (LOOKUP_CDB=),\1,' .endif .if ${PORT_OPTIONS:MDSEARCH} SEDLIST+= -e 's,^\# (LOOKUP_DSEARCH=),\1,' .endif .if ! ${PORT_OPTIONS:MLSEARCH} SEDLIST+= -e 's,^(LOOKUP_LSEARCH=),\# \1,' .endif .if ${PORT_OPTIONS:MNIS} SEDLIST+= -e 's,^\# (LOOKUP_NIS=),\1,' .endif .if ${PORT_OPTIONS:MPASSWD} SEDLIST+= -e 's,^\# (LOOKUP_PASSWD=),\1,' .endif .if ${PORT_OPTIONS:MSQLITE} SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,`pkg-config --static --libs sqlite3`,' \ -e 's,XX_SQLITE_FLAGS_XX,`pkg-config --cflags sqlite3`,' \ -e 's,^\# (LOOKUP_SQLITE=),\1,' .else SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,,' \ -e 's,XX_SQLITE_FLAGS_XX,,' .endif .if ${PORT_OPTIONS:MREDIS} SEDLIST+= -e 's,XX_REDIS_LIBS_XX,-L${LOCALBASE}/lib -lhiredis,' \ -e 's,^\# (LOOKUP_REDIS=),\1,' \ -e 's,^\# (EXPERIMENTAL_REDIS=),\1,' .else SEDLIST+= -e 's,XX_REDIS_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MLMTP} SEDLIST+= -e 's,^\# (TRANSPORT_LMTP=),\1,' .endif .if ! ${PORT_OPTIONS:MALT_CONFIG_PREFIX} SEDLIST+= -e 's,^(ALT_CONFIG_PREFIX=),\# \1,' .endif .if ${PORT_OPTIONS:MSPF} SEDLIST+= -e 's,XX_SPF_FLAGS_XX,-DSPF,' \ -e 's,XX_SPF_LIBS_XX,-L${LOCALBASE}/lib -lspf2 -lpthread,' \ -e 's,^\# (EXPERIMENTAL_SPF=),\1,' .else SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ -e 's,XX_SPF_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MSRS} LIB_DEPENDS+= libsrs_alt.so:${PORTSDIR}/mail/libsrs_alt SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS,' \ -e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs_alt,' .else SEDLIST+= -e 's,XX_SRS_FLAGS_XX,,' \ -e 's,XX_SRS_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MREADLINE} SEDLIST+= -e 's,^\# (USE_READLINE=),\1,' .endif .if ${PORT_OPTIONS:MCONTENT_SCAN} SEDLIST+= -e 's,^\# (WITH_CONTENT_SCAN=),\1,' .endif .if ${PORT_OPTIONS:MOLD_DEMIME} SEDLIST+= -e 's,^\# (WITH_OLD_DEMIME=),\1,' .endif .if !defined(EXIMON_ONLY) && ${PORT_OPTIONS:MDAEMON} USE_RC_SUBR= exim PLIST_SUB+= EXIMDAEMON="" SUB_LIST+= LOGDIR="${LOGDIR}" .else PLIST_SUB+= EXIMDAEMON="@comment " .endif .if ${PORT_OPTIONS:MIPV6} SEDLIST+= -e 's,^\# (HAVE_IPV6=),\1,' .endif .if ${PORT_OPTIONS:MDISABLE_D_OPT} SEDLIST+= -e 's,^\# (DISABLE_D_OPTION=),\1,' .else .if defined(WHITELIST_D_MACROS) SEDLIST+= -e 's,^\# (WHITELIST_D_MACROS=).*$$,\1${WHITELIST_D_MACROS:S/,/\\,/g},' .endif .endif .if defined(TRUSTED_CONFIG_LIST) SEDLIST+= -e 's,^\# (TRUSTED_CONFIG_LIST=).*$$,\1${TRUSTED_CONFIG_LIST:S/,/\\,/g},' .endif MAKE_ENV+= INSTALL_ARG="${EXIM_INSTALL_ARG}" DUMMY_LDFLAGS!= ${ECHO_CMD} ${LDFLAGS} | ${SED} -e 's|-Wl,-rpath|-Wl,-DUMMYrpath|g; s|-rpath|-Wl,-rpath|g; s|-DUMMYrpath|-rpath|g' pre-everything:: @${ECHO} 'Exim now drops privileges when alternate configuration' @${ECHO} 'files are used. You can set make variable TRUSTED_CONFIG_LIST' @${ECHO} 'to specify the list of configuration files for which' @${ECHO} 'root privileges will be retained.' @${ECHO} '' @${ECHO} 'You can whitelist some macros using the make variable' @${ECHO} 'WHITELIST_D_MACROS. This is useful if you are running' @${ECHO} 'with DISABLE_D_OPT set, but macros whitelisting will be' @${ECHO} 'removed in some future Exim release, so it is better' @${ECHO} 'to use TRUSTED_CONFIG_LIST to set the list of trusted' @${ECHO} 'configuration files.' .if empty(.MAKEFLAGS:M-s) && ${PORT_OPTIONS:MWISHLIST} @${ECHO} '' @${ECHO} 'Included extra patches:' @${FIND} ${PATCHDIR} -name 'wishlist-*.patch' \ -exec ${SED} -ne 's,^# , ,p' {} \; @${ECHO} '' .endif post-extract: .if ${PORT_OPTIONS:MSA_EXIM} @cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} .endif do-configure: @${MKDIR} ${WRKSRC}/Local @${SED} -E ${SEDLIST} ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile .if ${PORT_OPTIONS:MEXIMON} @${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf .endif @${REINPLACE_CMD} -E ${SEDLIST} ${WRKSRC}/src/configure.default @${REINPLACE_CMD} -e 's!$$(LDFLAGS)!$$(DUMMY_LDFLAGS) -L$${LOCALBASE}/lib!' ${WRKSRC}/OS/Makefile-Base @${REINPLACE_CMD} -e 's/"(Exim $$version_number)\\n\\t"/"(Exim $$version_number (${OPSYS}))\\n\\t"/' \ ${WRKSRC}/src/globals.c @${REINPLACE_CMD} -e 's/Exim version %s \(#%s \)\{0,1\}/&(${OPSYS} ${OSREL}) /' ${WRKSRC}/src/exim.c @${REINPLACE_CMD} -e 's/^#include "cnumber\.h"$$/${PORTREVISION}/' ${WRKSRC}/src/version.c @${REINPLACE_CMD} -E -e 's/^(PERL_COMMAND=).*/\1${PERL:S,/,\/,g}/' \ -e 's/^(CC=).*/\1${CC:S,/,\/,g}/' ${WRKSRC}/OS/Makefile-Default .if ${PORT_OPTIONS:MSA_EXIM} @${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/sa-exim.c/' \ ${WRKSRC}/OS/Makefile-Default @${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.c ${WRKSRC}/Local @{ \ ${ECHO_CMD} "char *version=\"${SA_EXIM_VERSION}\";"; \ ${ECHO_CMD} "#define SPAMC_LOCATION \"${LOCALBASE}/bin/spamc\""; \ ${ECHO_CMD} "#define SPAMASSASSIN_CONF \"${PREFIX}/etc/exim/sa-exim.conf\""; \ } > ${WRKSRC}/Local/sa-exim.h @${REINPLACE_CMD} -e 's,/usr/bin/spamc,${LOCALBASE}/bin/spamc,' \ ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf .endif @${REINPLACE_CMD} -E -e 's/XX_STRIPCMD_XX/${STRIP_CMD:S,/,\/,g}/' \ ${WRKSRC}/OS/Makefile-FreeBSD @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure) post-build: .for script in ${DAILY_SCRIPTS} @${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh > ${WRKDIR}/${script}.sh .endfor @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > \ ${WRKDIR}/POST-INSTALL-NOTES @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES.clamd > ${WRKDIR}/POST-INSTALL-NOTES.clamd @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES @[ ! -f ${PKGDIR}/pkg-message ] || ${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-message > ${WRKDIR}/pkg-message .if !defined(EXIMON_ONLY) post-install: .if ${PORT_OPTIONS:MDAEMON} ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily .for script in ${DAILY_SCRIPTS} ${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${STAGEDIR}${PREFIX}/etc/periodic/daily/${script} .endfor .endif @${MKDIR} -m 750 ${STAGEDIR}${LOGDIR} ${INSTALL_MAN} ${WRKSRC}/doc/exim.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${STAGEDIR}${DOCSDIR} .for docfile in ${PORTDOC_BASE} ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor .for docfile in ${PORTDOC_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${STAGEDIR}${DOCSDIR} .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for example in ${PORT_EXAMPLES} ${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${STAGEDIR}${EXAMPLESDIR} .endfor .endif .if ${PORT_OPTIONS:MSA_EXIM} ${INSTALL_DATA} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf \ ${STAGEDIR}${PREFIX}/etc/exim/sa-exim.conf.sample .endif .endif # ! defined(EXIMON_ONLY) .include Index: head/mail/libetpan/Makefile =================================================================== --- head/mail/libetpan/Makefile (revision 411989) +++ head/mail/libetpan/Makefile (revision 411990) @@ -1,46 +1,46 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= libetpan PORTVERSION= 1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MAINTAINER= pawel@FreeBSD.org COMMENT= Mail framework for C language LICENSE= BSD3CLAUSE LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 USE_GITHUB= yes GH_ACCOUNT= dinhviethoa USES= autoreconf gmake iconv libtool GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread OPTIONS_DEFINE= IPV6 OPTIONS_SINGLE= CRYPTO OPTIONS_SINGLE_CRYPTO= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL GNUTLS_CONFIGURE_ON= --without-openssl --with-gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt IPV6_CONFIGURE_ENABLE= ipv6 OPENSSL_CONFIGURE_ON= --with-openssl="${OPENSSLBASE}" OPENSSL_USE= OPENSSL=yes pre-configure: @(cd ${WRKSRC} && ${LN} -s README.md README) .include Index: head/mail/libvmime/Makefile =================================================================== --- head/mail/libvmime/Makefile (revision 411989) +++ head/mail/libvmime/Makefile (revision 411990) @@ -1,35 +1,35 @@ # Created by: delphij@FreeBSD.org # $FreeBSD$ PORTNAME= libvmime PORTVERSION= 0.9.2.s20140721 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MAINTAINER= delphij@FreeBSD.org COMMENT= All-in-one Internet mail library LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgsasl.so:${PORTSDIR}/security/gsasl USE_GITHUB= yes GH_ACCOUNT= kisli GH_PROJECT= vmime GH_TAGNAME= 03a0e36 USES= cmake:outsource compiler:c++11-lib iconv pkgconfig USE_LDCONFIG= yes CMAKE_ARGS= -DLIB_SUFFIX:STRING="" \ -DVMIME_BUILD_SAMPLES:BOOL=NO \ -DVMIME_SHARED_PTR_USE_BOOST:BOOL=NO \ -DVMIME_SHARED_PTR_USE_CXX:BOOL=YES post-patch: @${REINPLACE_CMD} 's,$${VMIME_INSTALL_LIBDIR}/pkgconfig,${PREFIX}/libdata/pkgconfig,' \ ${WRKSRC}/CMakeLists.txt .include Index: head/mail/mpop/Makefile =================================================================== --- head/mail/mpop/Makefile (revision 411989) +++ head/mail/mpop/Makefile (revision 411990) @@ -1,51 +1,52 @@ # Created by: Sylvio Cesar # $FreeBSD$ PORTNAME= mpop DISTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} MAINTAINER= jbeich@FreeBSD.org COMMENT= Small and fast POP3 client LICENSE= GPLv3+ USES= cpe gmake makeinfo pkgconfig tar:xz CPE_VENDOR= martin_lambers GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules --with-tls=no INFO= mpop OPTIONS_DEFINE= GSASL IDN LIBSECRET NLS OPTIONS_RADIO= TLS OPTIONS_RADIO_TLS= GNUTLS OPENSSL OPTIONS_DEFAULT= IDN OPENSSL OPTIONS_SUB= yes GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ON= --with-tls=gnutls GSASL_DESC= ${SASL_DESC} via GNU SASL GSASL_LIB_DEPENDS= libgsasl.so:security/gsasl GSASL_CONFIGURE_WITH= libgsasl IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_CONFIGURE_WITH= libidn LIBSECRET_DESC= GNOME password management LIBSECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret LIBSECRET_CONFIGURE_WITH= libsecret NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OPENSSL_USE= openssl=yes OPENSSL_CONFIGURE_ENV= ${OPENSSLINC:M/usr/include:C,.+,libssl_CFLAGS=" ",} \ ${OPENSSLLIB:M/usr/lib:C,.+,libssl_LIBS="-lssl -lcrypto",} OPENSSL_CONFIGURE_ON= --with-tls=openssl post-patch: @${REINPLACE_CMD} -Ee 's/Debian/${OPSYS}/' \ -e 's,/etc/ssl/certs,${LOCALBASE}/share/certs,' \ -e '/crt/s/ca(\\?)-certificates/ca\1-root\1-nss/' \ -e 's/ca\\?-certificates/ca_root_nss/' \ ${WRKSRC}/doc/mpop* .include Index: head/mail/msmtp/Makefile =================================================================== --- head/mail/msmtp/Makefile (revision 411989) +++ head/mail/msmtp/Makefile (revision 411990) @@ -1,68 +1,69 @@ # Created by: R.I.Pienaar # $FreeBSD$ PORTNAME= msmtp PORTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= SF MAINTAINER= novel@FreeBSD.org COMMENT= SMTP plugin for MUAs LICENSE= GPLv3 GNU_CONFIGURE= yes USES= gmake makeinfo pkgconfig tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INFO= msmtp OPTIONS_DEFINE= DOCS GSASL NLS IDN LIBSECRET MSMTPQ OPTIONS_RADIO= TLS OPTIONS_RADIO_TLS= GNUTLS OPENSSL OPTIONS_DEFAULT= MSMTPQ OPENSSL OPTIONS_SUB= yes GSASL_DESC= GSASL support LIBSECRET_DESC= GNOME password management MSMTPQ_DESC= Install offline messaging scripts GSASL_CONFIGURE_WITH= libgsasl GSASL_LIB_DEPENDS= libgsasl.so:${PORTSDIR}/security/gsasl IDN_CONFIGURE_WITH= libidn IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn LIBSECRET_CONFIGURE_WITH= libsecret LIBSECRET_LIB_DEPENDS= libsecret-1.so:${PORTSDIR}/security/libsecret MSMTPQ_PORTDOCS= README.msmtpq NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext GNUTLS_CONFIGURE_ON= --with-ssl=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls OPENSSL_VARS= USE_OPENSSL=yes OPENSSL_CONFIGURE_ON= --with-ssl=openssl OPENSSL_CONFIGURE_ENV= libssl_CFLAGS="-I${OPENSSLINC}" \ libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" CERTSFILE= ${LOCALBASE}/share/certs/ca-root-nss.crt .include .if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL} RUN_DEPENDS+= ${CERTSFILE}:${PORTSDIR}/security/ca_root_nss .else CONFIGURE_ARGS+= --with-ssl=no .endif post-extract: @${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${CERTSFILE}|' \ ${WRKSRC}/doc/msmtp.1 .if ${PORT_OPTIONS:MMSMTPQ} post-stage: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtp-queue ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtpq ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/README.msmtpq ${STAGEDIR}${DOCSDIR} .endif .include Index: head/mail/nullmailer/Makefile =================================================================== --- head/mail/nullmailer/Makefile (revision 411989) +++ head/mail/nullmailer/Makefile (revision 411990) @@ -1,59 +1,59 @@ # Created by: clive # $FreeBSD$ PORTNAME= nullmailer PORTVERSION= 1.13 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ \ http://untroubled.org/nullmailer/archive/ MAINTAINER= uffe@uffe.org COMMENT= MTA for hosts which relay to a fixed set of smart relays LICENSE= GPLv2 LOCALSTATEDIR= /var/spool .if defined(MAINTAINER_MODE) UID_FILES+= ../../UIDs GID_FILES+= ../../GIDs .endif USERS= nullmail GROUPS= nullmail NULLMAIL_UID= 522 NULLMAIL_GID= 522 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--localstatedir=${LOCALSTATEDIR} USE_SUBMAKE= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES+= pkg-install pkg-deinstall pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message PLIST_SUB+= LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS} SUB_LIST+= LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS} OPTIONS_DEFINE= GNUTLS .include .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lgnutls CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+=--enable-tls .else CONFIGURE_ARGS+=--disable-tls .endif post-install: ${INSTALL_DATA} -c ${FILESDIR}/remotes.sample ${STAGEDIR}${ETCDIR} ${ECHO} 'hostname' > ${STAGEDIR}${ETCDIR}/me.sample .include Index: head/mail/opendkim/Makefile =================================================================== --- head/mail/opendkim/Makefile (revision 411989) +++ head/mail/opendkim/Makefile (revision 411990) @@ -1,180 +1,180 @@ # Created by: Hirohisa Yamaguchi # $FreeBSD$ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail security MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/Previous%20Releases \ ftp://ftpmirror.uk/freebsd-ports/${PORTNAME}/ MAINTAINER= freebsd-ports@dan.me.uk COMMENT= DKIM library and milter implementation LICENSE= BSD3CLAUSE SENDMAIL LICENSE_COMB= multi LICENSE_FILE_SENDMAIL= ${WRKSRC}/LICENSE.Sendmail LICENSE_GROUPS_SENDMAIL= FSF OSI LICENSE_NAME_SENDMAIL= Sendmail Open Source License 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 USE_PERL5= run SHEBANG_FILES= opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \ reprrd/opendkim-reprrdimport* USE_OPENSSL= yes USE_LDCONFIG= yes PORTDOCS= * CONFIGURE_ARGS+= --without-tre OPTIONS_SUB= yes OPTIONS_SINGLE= RESOLV OPTIONS_SINGLE_RESOLV= STOCK_RESOLVER UNBOUND OPTIONS_DEFINE= FILTER CURL GNUTLS JANSSON LDNS LMDB LUA MEMCACHED \ BDB_BASE OPENDBX OPENLDAP POPAUTH QUERY_CACHE SASL OPTIONS_DEFAULT= FILTER LUA UNBOUND STOCK_RESOLVER_DESC= Use the stock resolver library UNBOUND_DESC= Use unbound DNS library UNBOUND_CONFIGURE_WITH= unbound UNBOUND_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound FILTER_DESC= OpenDKIM filter, requires libmilter/Sendmail FILTER_USE= RC_SUBR=milter-opendkim CURL_DESC= Use cURL for web queries CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl GNUTLS_DESC= Use GnuTLS instead of OpenSSL GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_CONFIGURE_OFF= --with-openssl=${OPENSSLBASE} JANSSON_DESC= Statistics and other output as JSON data JANSSON_CONFIGURE_WITH= libjansson JANSSON_LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson LDNS_DESC= Use LDNS library for DNS queries LDNS_CONFIGURE_WITH= ldns LDNS_LIB_DEPENDS= libldns.so:${PORTSDIR}/dns/ldns LMDB_DESC= Use Lightning Memory-Mapped DB key-value store LMDB_CONFIGURE_WITH= lmdb LMDB_LIB_DEPENDS= liblmdb.so:${PORTSDIR}/databases/lmdb LUA_DESC= Describe filter policy with lua LUA_CONFIGURE_WITH= lua LUA_USES= lua MEMCACHED_DESC= Use memcached as a data set MEMCACHED_CONFIGURE_WITH= libmemcached MEMCACHED_LIB_DEPENDS= libmemcached.so:${PORTSDIR}/databases/libmemcached BDB_BASE_DESC= Use Berkeley DB from base OPENDBX_DESC= Store filter policies via OpenDBX OPENDBX_CONFIGURE_WITH= odbx OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx OPENLDAP_DESC= Store filter policies in LDAP OPENLDAP_CONFIGURE_WITH=openldap OPENLDAP_USE= OPENLDAP=yes POPAUTH_DESC= Use POP authentication DB POPAUTH_CONFIGURE_ENABLE= popauth QUERY_CACHE_DESC= Cache DNS query results locally QUERY_CACHE_CONFIGURE_ENABLE= query_cache SASL_DESC= Enable SASL authentication with LDAP SASL_CONFIGURE_WITH= sasl DOCS_CONFIGURE_ON= --docdir=${WRKDIR}/doc MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig" MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP} .include "${.CURDIR}/Makefile.options" .include .if ${PORT_OPTIONS:MSASL} && ${PORT_OPTIONS:MOPENLDAP} WANT_OPENLDAP_SASL= yes .endif .if ${PORT_OPTIONS:MFILTER} SUB_FILES= pkg-message WITHOUT_MILTER_CFLAGS= yes WITHOUT_MILTER_LDFLAGS= yes .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" CONFIGURE_ARGS+= --with-milter=${MILTERBASE} .endif .if ${PORT_OPTIONS:MLUA_ONLY_SIGNING} || \ ${PORT_OPTIONS:MRBL} .if !${PORT_OPTIONS:MLUA} IGNORE= options LUA_ONLY_SIGNING and RBL require LUA as well .endif .endif .if ${PORT_OPTIONS:MREPUTATION} .if !${PORT_OPTIONS:MCURL} || !${PORT_OPTIONS:MJANSSON} IGNORE= option REPUTATION requires CURL and JANSSON as well .endif .endif .if ${PORT_OPTIONS:MSTATSEXT} .if !${PORT_OPTIONS:MSTATS} || !${PORT_OPTIONS:MLUA} IGNORE= option STATSEXT requires STATS and LUA as well .endif .endif .if ${PORT_OPTIONS:MPOPAUTH} \ || ${PORT_OPTIONS:MQUERY_CACHE} \ || ${PORT_OPTIONS:MLDAP_CACHING} \ || ${PORT_OPTIONS:MREPUTATION} \ || ${PORT_OPTIONS:MSTATS} . if ${PORT_OPTIONS:MBDB_BASE} CONFIGURE_ARGS+= --with-db-lib=c . else CONFIGURE_ARGS+= --with-db-incdir=${BDB_INCLUDE_DIR} \ --with-db-libdir=${BDB_LIB_DIR} \ --with-db-lib=${BDB_LIB_NAME} USE_BDB= 40+ . endif .endif .if ${PORT_OPTIONS:MCODECOVERAGE} LDFLAGS+= -lpthread .endif pre-configure: ${REINPLACE_CMD} -e '/LIBLUA_LIBS/s/lua5\.[0-9]/lua-${LUA_VER}/' \ -e '/PKG_CONFIG/s/lua5\.[0-9]/lua-${LUA_VER}/' \ -e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \ ${WRKSRC}/configure post-patch: .if ${PORT_OPTIONS:MLCOV} ${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/libopendkim/tests/ ${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/opendkim/tests/ ${FIND} ${WRKSRC} -type f -name \*-helper.sh -exec ${CHMOD} 755 {} + .endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail ${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \ ${STAGEDIR}${PREFIX}/etc/mail/ regression-test: build cd ${WRKSRC} ; ${MAKE} check .include Index: head/mail/wmbiff/Makefile =================================================================== --- head/mail/wmbiff/Makefile (revision 411989) +++ head/mail/wmbiff/Makefile (revision 411990) @@ -1,41 +1,41 @@ # Created by: Jim Mock # $FreeBSD$ PORTNAME= wmbiff PORTVERSION= 0.4.27 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= mail windowmaker afterstep MASTER_SITES= SF MAINTAINER= garga@FreeBSD.org COMMENT= xbiff-like Window Maker dock app LICENSE= GPLv2 OPTIONS_DEFINE= GNUTLS USES= shebangfix SHEBANG_FILES= scripts/security.debian.rb USE_XORG= xpm GNU_CONFIGURE= yes PLIST_FILES= bin/wmbiff \ lib/wmbiff/security.debian.rb \ man/man1/wmbiff.1.gz \ man/man5/wmbiffrc.5.gz \ %%DATADIR%%/sample.wmbiffrc \ %%DATADIR%%/skins/wmbiff-master-contrast.xpm \ %%DATADIR%%/skins/wmbiff-master-led.xpm GNUTLS_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ON= --with-libgnutls-prefix=${LOCALBASE} \ --with-libgcrypt-prefix=${LOCALBASE} GNUTLS_CONFIGURE_OFF= --disable-crypto post-install: @${ECHO_MSG} "===> Installing sample.wmbiffrc to ${DATADIR}" @${ECHO_MSG} "===> Modify it to suit your needs and copy to ~/.wmbiffrc" ${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${STAGEDIR}${DATADIR} .include Index: head/mail/xfce4-mailwatch-plugin/Makefile =================================================================== --- head/mail/xfce4-mailwatch-plugin/Makefile (revision 411989) +++ head/mail/xfce4-mailwatch-plugin/Makefile (revision 411990) @@ -1,31 +1,31 @@ # Created by: Martin Wilke (miwi@FreeBSD.org) # $FreeBSD$ PORTNAME= xfce4-mailwatch-plugin PORTVERSION= 1.2.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail xfce MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Mail notification applet for the Xfce panel LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack USE_XFCE= panel USE_XORG= x11 CONFIGURE_ARGS=--enable-ipv6 post-patch: ${REINPLACE_CMD} -e 's|xfce-mail|mail-send|' \ ${WRKSRC}/panel-plugin/mailwatch-plugin.c .include Index: head/multimedia/ffmpeg/Makefile =================================================================== --- head/multimedia/ffmpeg/Makefile (revision 411989) +++ head/multimedia/ffmpeg/Makefile (revision 411990) @@ -1,473 +1,474 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= ffmpeg PORTVERSION= 2.8.6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils HAS_CONFIGURE= yes USES= compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix USE_LDCONFIG= yes USE_PERL5= build SHEBANG_FILES= doc/texi2pod.pl OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \ DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \ FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK LADSPA \ LAME LIBBLURAY MODPLUG OPENAL OPENCL OPENCV OPENGL \ OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO QUVI \ RTCPU RTMP SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \ THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS VO_AACENC \ VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \ XVIDEO ZMQ ZVBI OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ OPENCV RTCPU SCHROEDINGER THEORA VORBIS VPX X264 XVID OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= GNUTLS OPENSSL OPTIONS_GROUP= LICENSE OPTIONS_GROUP_LICENSE= GPL3 NONFREE OPTIONS_DEFINE_amd64= MMX SSE OPTIONS_DEFINE_armv6= VFP NEON OPTIONS_DEFINE_armv6hf= VFP NEON OPTIONS_DEFINE_i386= MMX SSE OPTIONS_DEFAULT_amd64= MMX SSE OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MMMX} ${MACHINE_CPU:tu:MSSE} ASS_DESC= Subtitles rendering via libass BS2B_DESC= Bauer Stereophonic-to-Binaural filter CDIO_DESC= Audio CD grabbing with libcdio DC1394_DESC= IIDC-1394 grabbing using libdc1394 FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FFSERVER_DESC= Build and install ffserver FLITE_DESC= Voice synthesis support via libflite GME_DESC= Game Music Emu demuxer GPL3_DESC= Allow (L)GPL version 3 code(cs) ILBC_DESC= Internet Low Bit Rate codec LICENSE_DESC= Licensing options NEON_DESC= Enable Media Processing Engine instructions NONFREE_DESC= Allow use of nonfree code OPENCL_DESC= Heterogeneous computing via OpenCL OPENH264_DESC= H.264 video codec support via OpenH264 QUVI_DESC= Flash media stream URLs RTCPU_DESC= Detect CPU capabilities at runtime VFP_DESC= Enable Vector Floating Point instructions VIDSTAB_DESC= Video stabilization filter X11GRAB_DESC= X11 grabbing (legacy) XCB_DESC= X11 grabbing using XCB ZMQ_DESC= Message passing via libzmq${ZMQ_VERSION} ZVBI_DESC= Teletext support via libzvbi OPTIONS_SUB= yes # aacplus AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus AACPLUS_CONFIGURE_ENABLE= libaacplus AACPLUS_IMPLIES= NONFREE # alsa ALSA_CONFIGURE_OFF= --disable-indev=alsa \ --disable-outdev=alsa ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib # Opencore AMR NB AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb AMR_NB_IMPLIES= GPL3 # Opencore AMR WB AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb AMR_WB_IMPLIES= GPL3 # ass ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass ASS_CONFIGURE_ENABLE= libass # bs2b BS2B_LIB_DEPENDS= libbs2b.so:${PORTSDIR}/audio/libbs2b BS2B_CONFIGURE_ENABLE= libbs2b # caca CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca CACA_CONFIGURE_ENABLE= libcaca # cdio CDIO_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio # celt CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt CELT_CONFIGURE_ENABLE= libcelt # dc1394 DC1394_LIB_DEPENDS= libdc1394.so:${PORTSDIR}/multimedia/libdc1394 DC1394_CONFIGURE_ENABLE= libdc1394 # debugging DEBUG_CONFIGURE_ON= --disable-stripping DEBUG_CONFIGURE_OFF= --disable-debug # docs DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html DOCS_CONFIGURE_ENABLE= htmlpages # faac FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CONFIGURE_ENABLE= libfaac FAAC_IMPLIES= NONFREE # fdk_aac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac FDK_AAC_IMPLIES= NONFREE # ffserver FFSERVER_CONFIGURE_ENABLE= ffserver FFSERVER_VARS= USE_RC_SUBR+=ffserver # flite FLITE_LIB_DEPENDS= libflite.so:${PORTSDIR}/audio/flite FLITE_CONFIGURE_ENABLE= libflite # fontconfig FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig # freetype FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype # frei0r FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r # fribidi FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi FRIBIDI_CONFIGURE_ENABLE= libfribidi # gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls # gme GME_LIB_DEPENDS= libgme.so:${PORTSDIR}/audio/libgme GME_CONFIGURE_ENABLE= libgme # gsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm GSM_CONFIGURE_ENABLE= libgsm # iconv ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv # ilbc ILBC_LIB_DEPENDS= libilbc.so:${PORTSDIR}/net/libilbc ILBC_CONFIGURE_ENABLE= libilbc # jack JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_OFF= --disable-indev=jack # ladspa LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa LADSPA_CONFIGURE_ENABLE= ladspa # lame LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= libmp3lame # libbluray LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray # libv4l V4L_BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l V4L_CONFIGURE_ENABLE= libv4l2 V4L_CONFIGURE_OFF= --disable-indev=v4l2 \ --disable-outdev=v4l2 # mmx support MMX_CONFIGURE_ENABLE= mmx # modplug MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= libmodplug # OpenAL OPENAL_LIB_DEPENDS= libopenal.so:${PORTSDIR}/audio/openal-soft OPENAL_CONFIGURE_ENABLE= openal OPENAL_CONFIGURE_OFF= --disable-indev=openal # opencl OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd OPENCL_CONFIGURE_ENABLE= opencl # opencv OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core OPENCV_CONFIGURE_ENABLE= libopencv # opengl OPENGL_USE= GL=gl OPENGL_CONFIGURE_ENABLE= opengl # openh264 OPENH264_LIB_DEPENDS= libopenh264.so:${PORTSDIR}/multimedia/openh264 OPENH264_CONFIGURE_ENABLE= libopenh264 # openjpeg OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg # openssl OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ENABLE= openssl OPENSSL_IMPLIES= NONFREE # optimizations OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer # opus OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= libopus # pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \ --disable-outdev=pulse # quvi QUVI_LIB_DEPENDS= libquvi.so:${PORTSDIR}/multimedia/libquvi QUVI_CONFIGURE_ENABLE= libquvi # rtcpu RTCPU_CONFIGURE_ENABLE= runtime-cpudetect # rtmp RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= librtmp # schroedinger SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger # sdl SDL_USE= SDL=sdl SDL_CONFIGURE_ENABLE= ffplay SDL_CONFIGURE_OFF= --disable-outdev=sdl # smbclient SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient SMB_CONFIGURE_ENABLE= libsmbclient SMB_IMPLIES= GPL3 # snappy SNAPPY_LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy SNAPPY_CONFIGURE_ENABLE= libsnappy # speex SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= libspeex # sse support SSE_CONFIGURE_ENABLE= sse SSE_VARS= FFMPEG_CFLAGS+="-msse" SSE_IMPLIES= MMX # ssh SSH_LIB_DEPENDS= libssh.so:${PORTSDIR}/security/libssh SSH_CONFIGURE_ENABLE= libssh # theora THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora # twolame TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame TWOLAME_CONFIGURE_ENABLE= libtwolame # vaapi VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi # vdpau VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau # armv6 VFP_CONFIGURE_ENABLE= vfp NEON_CONFIGURE_ENABLE= neon NEON_CONFIGURE_ON= --cpu=armv7-a # vo-aacenc VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc VO_AACENC_IMPLIES= GPL3 # vo-amrwbenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc VO_AMRWBENC_IMPLIES= GPL3 # vid.stab VIDSTAB_LIB_DEPENDS= libvidstab.so:${PORTSDIR}/multimedia/vid.stab VIDSTAB_CONFIGURE_ENABLE= libvidstab # vorbis VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis VORBIS_VARS= FFMPEG_CFLAGS+="-I${LOCALBASE}/include/vorbis" # vp8 VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx # wavpack WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack WAVPACK_CONFIGURE_ENABLE= libwavpack # webp WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp WEBP_CONFIGURE_ENABLE= libwebp # x11grab X11GRAB_USE= XORG=x11,xext,xfixes X11GRAB_CONFIGURE_ENABLE= x11grab # x264 X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 # x265 X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265 X265_CONFIGURE_ENABLE= libx265 # xcb XCB_USE= XORG=xcb XCB_CONFIGURE_ENABLE= libxcb # xvid XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid XVID_CONFIGURE_ENABLE= libxvid # xv XVIDEO_USE= XORG=xv XVIDEO_CONFIGURE_OFF= --disable-outdev=xv # zmq ZMQ_LIB_DEPENDS= libzmq.so:${PORTSDIR}/net/libzmq${ZMQ_VERSION} ZMQ_CONFIGURE_ENABLE= libzmq ZMQ_VERSION?= 4 # zvbi ZVBI_LIB_DEPENDS= libzvbi.so:${PORTSDIR}/devel/libzvbi ZVBI_CONFIGURE_ENABLE= libzvbi # License knobs GPL3_CONFIGURE_ENABLE= version3 GPL3_VARS= LICENSE="GPLv3+ LGPL3+" LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 NONFREE_CONFIGURE_ENABLE=nonfree NONFREE_VARS= RESTRICTED="linking to libfaac or libaacplus restricts redistribution" INSTALL_TARGET= install-progs install-doc install-data \ install-libs install-headers DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ --datadir="${DATADIR}" \ --pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-avresample \ --enable-pthreads \ --disable-libstagefright-h264 \ --disable-libutvideo \ --disable-libsoxr \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ --extra-libs="-lpthread" CONFIGURE_ENV_armv6_clang= ASFLAGS=-no-integrated-as CONFIGURE_ARGS_armv6= --disable-fast-unaligned CONFIGURE_ARGS_FreeBSD_9= --enable-memalign-hack DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ README.md RELEASE_NOTES # under doc subdirectory DOC_DOCFILES= APIchanges *.txt PORTDOCS= * # Custom helpers. FOO_${ARCH} style from bsd.port.mk CONFIGURE_ENV+= ${CONFIGURE_ENV_${ARCH}_${CHOSEN_COMPILER_TYPE}} CONFIGURE_ARGS+=${CONFIGURE_ARGS_${OPSYS}_${OSREL:R}} CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ -e 's|freetype/freetype.h|freetype.h|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} post-patch-SDL-on: @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E \ -e 's|#include Index: head/multimedia/kodi/Makefile =================================================================== --- head/multimedia/kodi/Makefile (revision 411989) +++ head/multimedia/kodi/Makefile (revision 411990) @@ -1,162 +1,162 @@ # $FreeBSD$ PORTNAME= kodi DISTVERSION= 15.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia java MAINTAINER= mickael.maillot@gmail.com COMMENT= Award winning media center application LICENSE= GPLv2 BUILD_DEPENDS= enca:${PORTSDIR}/converters/enca \ gawk:${PORTSDIR}/lang/gawk \ gperf:${PORTSDIR}/devel/gperf \ cmake:${PORTSDIR}/devel/cmake \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ nasm:${PORTSDIR}/devel/nasm \ gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20 \ swig2.0:${PORTSDIR}/devel/swig20 LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libcdio.so:${PORTSDIR}/sysutils/libcdio \ libcurl.so:${PORTSDIR}/ftp/curl \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libdrm.so:${PORTSDIR}/graphics/libdrm \ libenca.so:${PORTSDIR}/converters/enca \ libFLAC.so:${PORTSDIR}/audio/flac \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfribidi.so:${PORTSDIR}/converters/fribidi \ libgnutls.so:${PORTSDIR}/security/gnutls \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ libjasper.so:${PORTSDIR}/graphics/jasper \ libltdl.so:${PORTSDIR}/devel/libltdl \ libmodplug.so:${PORTSDIR}/audio/libmodplug \ libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \ libpcre.so:${PORTSDIR}/devel/pcre \ libpng.so:${PORTSDIR}/graphics/png \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libtag.so:${PORTSDIR}/audio/taglib \ libtinyxml.so:${PORTSDIR}/textproc/tinyxml \ libvorbis.so:${PORTSDIR}/audio/libvorbis \ libxslt.so:${PORTSDIR}/textproc/libxslt \ libyajl.so:${PORTSDIR}/devel/yajl RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ glxinfo:${PORTSDIR}/graphics/mesa-demos \ python:${PORTSDIR}/lang/python \ xdpyinfo:${PORTSDIR}/x11/xdpyinfo USE_GITHUB= yes GH_TUPLE= xbmc:xbmc:f4dda26 xbmc:FFmpeg:2.6.4-Isengard:ffmpeg USES= autoreconf:build compiler:c++11-lib gettext gmake iconv jpeg \ libtool pkgconfig python:2 GNU_CONFIGURE= yes USE_XORG= xmu xrandr xt xtst USE_GL= glu glew USE_SDL= image sdl2 USE_JAVA= yes USE_LDCONFIG= yes JAVA_BUILD= jre NOPRECIOUSMAKEVARS= yes INSTALLS_ICONS= yes ONLY_FOR_ARCHS= i386 amd64 KODI_ARCH_i386= x86 KODI_ARCH_amd64=x86_64 PLIST_SUB= ARCH=${KODI_ARCH_${ARCH}} OPTIONS_SUB= yes OPTIONS_DEFINE= AIRPLAY AIRTUNES AVAHI CEC DOCS \ LIBBLURAY LIRC MYSQL NFS NONFREE PULSEAUDIO RTMP \ SFTP SMB VAAPI VDPAU WEBSERVER AIRPLAY_DESC= AirPlay support via libplist AIRTUNES_DESC= AirTunes support via libshairplay CEC_DESC= CEC adapter support NONFREE_DESC= Enable non-free components (rar, ccx, ffmpeg) SFTP_DESC= SSH SFTP support via libssh OPTIONS_DEFAULT= AIRPLAY AIRTUNES AVAHI LIBBLURAY LIRC MYSQL \ NFS PULSEAUDIO RTMP SFTP SMB VAAPI VDPAU WEBSERVER AIRPLAY_LIB_DEPENDS= libplist.so:${PORTSDIR}/devel/libplist AIRPLAY_CONFIGURE_ENABLE= airplay AIRTUNES_LIB_DEPENDS= libshairplay.so:${PORTSDIR}/audio/shairplay AIRTUNES_CONFIGURE_ENABLE= airtunes AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app AVAHI_CONFIGURE_ENABLE= avahi CEC_BROKEN= libcec >= 3.0.0 has not been ported yet CEC_BUILD_DEPENDS= libcec>=3.0.0:${PORTSDIR}/multimedia/libcec CEC_LIB_DEPENDS= libcec.so:${PORTSDIR}/multimedia/libcec CEC_CONFIGURE_ENABLE= libcec LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray LIRC_RUN_DEPENDS= lircd:${PORTSDIR}/comms/lirc MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= mysql NFS_LIB_DEPENDS= libnfs.so:${PORTSDIR}/net/libnfs NFS_CONFIGURE_ENABLE= nfs NONFREE_CONFIGURE_ENABLE= non-free NONFREE_VARS= NO_CDROM="Restricted binary distribution" \ NO_PACKAGE="Restricted binary distribution" PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= rtmp SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient SMB_RUN_DEPENDS= nmblookup:${PORTSDIR}/net/samba-nmblookup SMB_CONFIGURE_ENABLE= samba VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau WEBSERVER_LIB_DEPENDS= libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd WEBSERVER_CONFIGURE_ENABLE= webserver SFTP_BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh SFTP_RUN_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh SFTP_CONFIGURE_ENABLE= ssh CONFIGURE_ARGS+= --disable-debug --disable-alsa post-extract: ${MV} ${WRKSRC_ffmpeg} ${WRKSRC}/tools/depends/target/ffmpeg/ post-patch: ${REINPLACE_CMD} 's;make;gmake;' \ ${WRKSRC}/bootstrap \ ${WRKSRC}/codegenerator.mk \ ${WRKSRC}/xbmc/Makefile.in ${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk pre-configure: cd ${WRKSRC} && ${SH} ./bootstrap post-install: ${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 (cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf kodi.bin.1.gz kodi.1.gz) ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi.bin ${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '*.so' -or -name '*.xbs' -or -name '*.vis' \ | ${XARGS} ${STRIP_CMD} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi-xrandr .include Index: head/multimedia/libav/Makefile =================================================================== --- head/multimedia/libav/Makefile (revision 411989) +++ head/multimedia/libav/Makefile (revision 411990) @@ -1,226 +1,227 @@ # $FreeBSD$ PORTNAME= libav PORTVERSION= 11.6 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= Realtime audio/video conversion library BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm USES= cpe gmake perl5 pkgconfig tar:xz USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} HAS_CONFIGURE= yes USE_PERL5= build CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --prefix="${PREFIX}" \ --libdir="${PREFIX}/lib/${PORTNAME}" \ --shlibdir="${PREFIX}/lib/${PORTNAME}" \ --incdir="${PREFIX}/include/${PORTNAME}" \ --mandir="${PREFIX}/man" \ --datadir="${DATADIR}" \ --extra-ldflags="-L${LOCALBASE}/lib" \ --enable-pthreads \ --enable-shared \ --enable-runtime-cpudetect \ --disable-debug \ --cc="${CC}" OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DC1394 DOCS FREETYPE \ FREI0R GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL \ OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX THEORA V4L VAAPI \ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX WAVPACK WEBP X11GRAB \ X264 XVID ZLIB OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ THEORA VO_AACENC VORBIS VPX X264 XVID ZLIB FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK ILBC_DESC= iLBC en/decoding via libilbc X11GRAB_DESC= X11 grabbing DC1394_DESC= IIDC-1394 grabbing using libdc1394 OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CONFIGURE_ON= --enable-indev=alsa --enable-outdev=alsa ALSA_CONFIGURE_OFF= --disable-indev=alsa --disable-outdev=alsa AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb AMR_WB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb BZIP2_CONFIGURE_ENABLE= bzlib CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio \ libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio DC1394_LIB_DEPENDS= libdc1394.so:${PORTSDIR}/multimedia/libdc1394 DC1394_CONFIGURE_ENABLE= libdc1394 DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CONFIGURE_ENABLE= libfaac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm GSM_CONFIGURE_ENABLE= libgsm ILBC_BUILD_DEPENDS= ${LOCALBASE}/include/ilbc.h:${PORTSDIR}/net/libilbc ILBC_CONFIGURE_ENABLE= libilbc JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_ON= --enable-indev=jack JACK_CONFIGURE_OFF= --disable-indev=jack LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= libmp3lame OPENCV_LIB_DEPENDS= libopencv_gpu.so:${PORTSDIR}/graphics/opencv OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg OPENSSL_CONFIGURE_ENABLE= openssl OPENSSL_USE= OPENSSL=yes OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= libopus PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= librtmp SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger SDL_USE= SDL=sdl SDL_CONFIGURE_ENABLE= avplay SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= libspeex THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat V4L_CONFIGURE_ON= --enable-indev=v4l2 V4L_CONFIGURE_OFF= --disable-indev=v4l2 VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack WAVPACK_CONFIGURE_ENABLE= libwavpack WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp WEBP_CONFIGURE_ENABLE= libwebp X11GRAB_USE= XORG=x11,xext,xfixes X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid XVID_CONFIGURE_ENABLE= libxvid ZLIB_CONFIGURE_ENABLE= zlib .include .if ${ARCH} == "armv6" CONFIGURE_ENV+= ASFLAGS=-no-integrated-as .endif .if ${ARCH} == "i386" CONFIGURE_ARGS+= --extra-cflags=-m32 .endif # License definitions .if ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC} || ${PORT_OPTIONS:MOPENSSL} RESTRICTED= linking to libfaac or libaacplus or using OpenSSL support restricts redistribution CONFIGURE_ARGS+= --enable-nonfree AV_NONFREE= true .endif .if ${PORT_OPTIONS:MCDIO} || ${PORT_OPTIONS:MX264} || ${PORT_OPTIONS:MXVID} || ${PORT_OPTIONS:MX11GRAB} CONFIGURE_ARGS+= --enable-gpl .if !defined(AV_NONFREE) LICENSE= GPLv2+ AV_ISGPL= true .endif .endif .if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || ${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC} CONFIGURE_ARGS+= --enable-version3 .if !defined(AV_NONFREE) .if defined(AV_ISGPL) LICENSE= GPLv3+ .else LICENSE= LGPL3+ .endif .endif .endif .if !defined(AV_NONFREE) && !defined(AV_ISGPL) && !defined(LICENSE) LICENSE= LGPL21+ .endif post-patch: @${REINPLACE_CMD} -e 's|freetype/freetype.h|freetype2/freetype.h|' \ -e 's|-ldc1394 -lraw1394|-ldc1394|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ ${WRKSRC}/configure \ ${WRKSRC}/libavcodec/libgsmdec.c @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/library.mak post-configure-DOCS-off: @${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak post-stage: .for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\ lib/libav/libavfilter.so.5.0.0 lib/libav/libavformat.so.56.1.0\ lib/libav/libavcodec.so.56.1.0 lib/libav/libavresample.so.2.1.0\ lib/libav/libswscale.so.3.0.0 lib/libav/libavutil.so.54.3.0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a} .endfor .include Index: head/multimedia/mencoder/Makefile =================================================================== --- head/multimedia/mencoder/Makefile (revision 411989) +++ head/multimedia/mencoder/Makefile (revision 411990) @@ -1,128 +1,129 @@ # Created by: Thomas E. Zander # $FreeBSD$ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org COMMENT= Convenient video file and movie encoder .include "${.CURDIR}/../mplayer/Makefile.common" OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO DEBUG DV FAAC FONTCONFIG \ FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \ MAD NAS OCFLAGS OPENAL OPENJPEG OPUS PULSEAUDIO REAL \ RTMP SCHROEDINGER SMB SPEEX THEORA TWOLAME V4L VPX \ X264 XVID OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS X264 XVID OPTIONS_DEFINE_i386= RTCPU OPTIONS_DEFINE_amd64= RTCPU OPTIONS_DEFINE_powerpc= RTCPU OPTIONS_DEFAULT_i386= RTCPU OPTIONS_DEFAULT_amd64= RTCPU OPTIONS_DEFAULT_powerpc=RTCPU BLURAY_DESC?= BluRay support LZO_DESC?= Enable external liblzo library OCFLAGS_DESC?= Use optimized compiler flags REAL_DESC?= Enable realplayer plugin RTCPU_DESC?= Use runtime CPU detection RESTRICTED= Port has restricted dependencies PATCHDIR= ${.CURDIR}/../mplayer/files FILESDIR= ${PATCHDIR} DATADIR= ${PREFIX}/share/mplayer TOOLFILES= aconvert.sh binary_codecs.sh calcbpp.pl \ checktree.sh countquant.pl divx2svcd.sh \ dvd2divxscript.pl edgedetect.fp edgeenh.fp \ emboss.fp mencvcd.sh midentify.sh \ mpconsole.sh mphelp_check.py mplmult.sh \ plotpsnr.pl psnr-video.sh qepdvcd.sh \ subedit.pl subsearch.sh vobshift.py \ w32codec_dl.pl wma2ogg.pl USES+= alias iconv pkgconfig shebangfix SHEBANG_FILES= TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl \ TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \ TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \ TOOLS/qepdvcd.sh TOOLS/subedit.pl TOOLS/w32codec_dl.pl \ TOOLS/wma2ogg.pl .include "${.CURDIR}/../mplayer/Makefile.optvars" .include CONFIGURE_ARGS+= --disable-mplayer \ --disable-libdca \ --disable-x11 \ --disable-vdpau \ --disable-rtc \ --disable-arts \ --disable-caca \ --disable-lirc \ --disable-sdl \ --disable-svga \ --disable-aa \ --disable-joystick \ --disable-directfb \ --disable-mpg123 \ --disable-enca \ --disable-musepack LIB_DEPENDS+= libmp3lame.so:${PORTSDIR}/audio/lame ALL_TARGET= mencoder .include "${.CURDIR}/../mplayer/Makefile.options" pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" @${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:" @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}" @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}" post-patch: @${REINPLACE_CMD} \ -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \ s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \ -e 's|/usr/local|${LOCALBASE}|' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|-lbz2|/usr/lib/libbz2.so|' \ -e 's|-lncurses|/usr/lib/libncurses.so|' \ -e 's|-liconv|${ICONV_LIB}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} -E ${WRKSRC} -type f \ -iregex ".*(configure|.sh|Makefile)" -print0 | \ ${XARGS} -x -0 -n 10 \ ${REINPLACE_CMD} -E \ -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ -e 's|\$$\(CC\)|${CC}|' \ -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|' @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin post-install: ${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/mencoder.1 @${MKDIR} ${STAGEDIR}${DATADIR} @${CHMOD} 755 ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/tools @${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools .for tool in ${TOOLFILES} ${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools .endfor .include Index: head/multimedia/mplayer/Makefile =================================================================== --- head/multimedia/mplayer/Makefile (revision 411989) +++ head/multimedia/mplayer/Makefile (revision 411990) @@ -1,176 +1,177 @@ # Created by: Thomas E. Zander with help from Vladimir Kushnir # $FreeBSD$ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org COMMENT= High performance media player supporting many formats .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common" OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV DVDNAV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \ OPENJPEG OPUS PULSEAUDIO REAL RTC RTMP \ SCHROEDINGER SDL SKINS SMB SPEEX SVGALIB V4L VDPAU VPX \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC OPTIONS_DEFAULT=DVDNAV FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL \ SKINS X11 X11DGA X11VM XINERAMA XVIDEO OPTIONS_DEFINE_i386= RTCPU OPTIONS_DEFINE_amd64= RTCPU OPTIONS_DEFINE_powerpc= RTCPU OPTIONS_DEFAULT_i386= RTCPU VDPAU OPTIONS_DEFAULT_amd64= RTCPU VDPAU OPTIONS_DEFAULT_powerpc=RTCPU DVDNAV_DESC?= DVD navigation features support BLURAY_DESC?= BluRay support ENCA_DESC?= Charset conversion via enca LZO_DESC?= External liblzo support OCFLAGS_DESC?= ${OPTIMIZED_CFLAGS_DESC} REAL_DESC?= Enable realplayer plugin RTC_DESC?= Add support for kernel real time clock RTCPU_DESC?= Use runtime CPU detection SKINS_DESC?= Install skins for GUI X11DGA_DESC?= X11 DGA video driver support X11VM_DESC?= X11 VidMode support SUB_FILES= pkg-message CONFLICTS= mplayer2-2.* CONFFILES= example.conf input.conf menu.conf dvb-menu.conf USES+= iconv pkgconfig .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars" .include CONFIGURE_ARGS+= --disable-arts \ --disable-directfb \ --disable-faac \ --disable-libdca \ --disable-toolame \ --disable-twolame \ --disable-x264 \ --disable-xvid \ --disable-libdirac-lavc \ --disable-mencoder \ --disable-mpg123 \ --disable-musepack \ --disable-theora .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} PLIST_SUB+= GMPLAYER="" DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false .if ${PORT_OPTIONS:MSKINS} RUN_DEPENDS+= mplayer-skins>=0:${PORTSDIR}/multimedia/mplayer-skins .endif USE_GNOME+= gtk20 CONFIGURE_ARGS+= --enable-gui .else PLIST_SUB+= GMPLAYER="@comment " .endif #GUI && X11 .if ${PORT_OPTIONS:MX11} USE_XORG= x11 xproto xscrnsaver .if ${PORT_OPTIONS:MXVIDEO} USE_XORG+= xv .else CONFIGURE_ARGS+=--disable-xv .endif .if ${PORT_OPTIONS:MX11DGA} USE_XORG+= xxf86dga .else CONFIGURE_ARGS+=--disable-dga1 --disable-dga2 .endif .if ${PORT_OPTIONS:MOPENGL} USE_GL+= gl .else CONFIGURE_ARGS+=--disable-gl .endif .if ${PORT_OPTIONS:MXINERAMA} USE_XORG+= xinerama xineramaproto .else CONFIGURE_ARGS+=--disable-xinerama .endif .if ${PORT_OPTIONS:MX11VM} USE_XORG+= xxf86vm .else CONFIGURE_ARGS+=--disable-vm .endif .if ${PORT_OPTIONS:MXVMC} USE_XORG+= xvmc CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW .endif .else #X11 CONFIGURE_ARGS+=--disable-x11 .endif .include .include "${.CURDIR}/../../multimedia/mplayer/Makefile.options" pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" @${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:" @${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}" @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}" @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}" .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} @${ECHO_MSG} "If you want to use the GUI, you can use the skins from" @${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins" @${ECHO_MSG} "or download them from" @${ECHO_MSG} "http://www.mplayerhq.hu/" .endif post-patch: @${REINPLACE_CMD} \ -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \ s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \ -e 's|/usr/local|${LOCALBASE}|' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|-lbz2|/usr/lib/libbz2.so|' \ -e 's|-lncurses|/usr/lib/libncurses.so|' \ -e 's|-liconv|${ICONV_LIB}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} -E ${WRKSRC} -type f \ -iregex ".*(configure|.sh|Makefile)" -print0 | \ ${XARGS} -x -0 -n 10 \ ${REINPLACE_CMD} -E \ -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ -e 's|\$$\(CC\)|${CC}|' \ -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|' @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g' post-patch-RTC-on: @${REINPLACE_CMD} -e 's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' ${WRKSRC}/mplayer.c post-install: @${MKDIR} ${STAGEDIR}${DATADIR} @${CHMOD} 755 ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc @${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc .for conf in ${CONFFILES} ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc .endfor .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} @${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer @(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz) ${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png .endif .include Index: head/multimedia/vlc/Makefile =================================================================== --- head/multimedia/vlc/Makefile (revision 411989) +++ head/multimedia/vlc/Makefile (revision 411990) @@ -1,374 +1,374 @@ # Created by: Brian Somers # $FreeBSD$ PORTNAME= vlc DISTVERSION= 2.2.1 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ ftp://ftp.crans.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ MAINTAINER= multimedia@FreeBSD.org COMMENT?= Qt based multimedia player and streaming server LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libidn.so:${PORTSDIR}/dns/libidn BUILD_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg \ yasm:${PORTSDIR}/devel/yasm RUN_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg USES= compiler:c11 desktop-file-utils gmake iconv libtool pathfix \ pkgconfig tar:xz USE_GNOME= libxml2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFLICTS?= vlc-qt4-* GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-avcodec --enable-avformat --enable-dvbpsi \ --enable-fontconfig --enable-freetype --enable-libgcrypt \ --enable-libxml2 --enable-oss --enable-postproc \ --enable-swscale --enable-vlc \ --disable-alsa --disable-chromaprint --disable-crystalhd \ --disable-dc1394 --disable-decklink --disable-directfb \ --disable-dv1394 --disable-egl --disable-fdkaac \ --disable-gles1 --disable-gles2 --disable-kai --disable-kva \ --disable-libvnc --disable-opencv --disable-projectm \ --disable-quicksync --disable-silent-rules --disable-telx \ --disable-tiger --disable-tremor --disable-udev \ --disable-update-check --disable-vcdx --disable-vsxu \ --disable-wasapi --disable-x26410b \ --with-kde-solid=${PREFIX}/share/apps/solid/actions \ ac_cv_search_pthread_rwlock_init=-pthread .if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif CPPFLAGS+= -I${LOCALBASE}/include CFLAGS_i386= -fomit-frame-pointer OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA DIRAC DOCS DVDREAD \ DVDNAV FAAD FLAC FLUID FRIBIDI GME GNOMEVFS2 GNUTLS \ GOOM HTTPD JACK KATE LIBBLURAY LIBRSVG2 LIBSSH2 LIRC \ LIVEMEDIA LUA MAD MATROSKA MODPLUG \ MPEG2 MTP MUSEPACK NCURSES NLS NOTIFY OGG OPTIMIZED_CFLAGS \ OPUS PNG PULSEAUDIO QT4 QT5 REALRTSP RUNROOT SAMPLERATE \ SCHROEDINGER SDL SHOUTCAST SKINS SMB STREAM SPEEX \ TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS \ X11 X264 X265 ZVBI OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \ HTTPD LIVEMEDIA LUA MAD MATROSKA MPEG2 OGG OPTIMIZED_CFLAGS \ OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME V4L \ VCD VORBIS X11 OPTIONS_SUB= yes ASS_DESC= ASS/SSA subtitle rendering DVDREAD_DESC= DVD Playback support DVDNAV_DESC= DVD menu navigation FLUID_DESC= Fluidsynth MIDI support FREERDP_DESC= RDP support GME_DESC= Game Music Emu (libgme) support GOOM_DESC= Goom visualisation plugin KATE_DESC= Kate codec support LIBSSH2_DESC= SCP/SFTP support via libssh2 REALRTSP_DESC= Real RTSP access module RUNROOT_DESC= Enable running as root SIDPLAY_DESC= C64 sid demux support SKINS_DESC= Skins interface module STREAM_DESC= stream output TAGLIB_DESC= ID3 tag and Ogg comment support VCD_DESC= Audio/Video CD support ZVBI_DESC= VBI decoding support A52_CONFIGURE_ENABLE= a52 A52_CONFIGURE_ON= --with-a52=${LOCALBASE} A52_LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 AALIB_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib AALIB_CONFIGURE_ENABLE= aa ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass ASS_CONFIGURE_ENABLE= libass AVAHI_LIB_DEPENDS= libavahi-common.so:${PORTSDIR}/net/avahi-app AVAHI_CONFIGURE_ENABLE= bonjour CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca CACA_CONFIGURE_ENABLE= caca DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_ENABLE= dbus DCA_LIB_DEPENDS= libdca.so:${PORTSDIR}/multimedia/libdca DCA_CONFIGURE_ENABLE= dca DIRAC_LIB_DEPENDS= libdirac_decoder.so:${PORTSDIR}/multimedia/dirac DIRAC_CONFIGURE_ENABLE= dirac DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread DVDREAD_CONFIGURE_ENABLE= dvdread DVDNAV_LIB_DEPENDS= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav DVDNAV_CONFIGURE_ENABLE=dvdnav FAAD_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad FAAD_CONFIGURE_ENABLE= faad FAAD_CONFIGURE_ENV= CPPFLAGS_faad="-I${LOCALBASE}/include" \ LIBS_faad="-L${LOCALBASE}/lib" FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CONFIGURE_ENABLE= flac FLUID_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth FLUID_CONFIGURE_ENABLE= fluidsynth # XXX vlc doesn't seem to like the freerdp version in ports #FREERDP_LIB_DEPENDS= libfreerdp-core.so:${PORTSDIR}/net/freerdp #FREERDP_CONFIGURE_ENABLE= libfreerdp CONFIGURE_ARGS+= -disable-freerdp FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi FRIBIDI_CONFIGURE_ENABLE= fribidi GME_LIB_DEPENDS= libgme.so:${PORTSDIR}/audio/libgme GME_CONFIGURE_ENABLE= gme GME_CONFIGURE_ENV= LIBS_gme="-L${LOCALBASE}/lib -lgme" GNOMEVFS2_USE= GNOME=gnomevfs2 GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ENABLE=gnutls GOOM_LIB_DEPENDS= libgoom2.so:${PORTSDIR}/graphics/goom GOOM_CONFIGURE_ENABLE= goom HTTPD_CONFIGURE_ENABLE= httpd JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_ENABLE= jack KATE_LIB_DEPENDS= libkate.so:${PORTSDIR}/multimedia/libkate KATE_CONFIGURE_ENABLE= kate LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= bluray LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_CONFIGURE_ENABLE= svg LIBSSH2_LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 LIBSSH2_CONFIGURE_ENABLE= sftp LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc LIRC_CONFIGURE_ENABLE= lirc LIRC_CONFIGURE_ENV= LIBS_lirc="-L${LOCALBASE}/lib -llirc_client" LIVEMEDIA_LIB_DEPENDS= libliveMedia.so:${PORTSDIR}/net/liveMedia LIVEMEDIA_CONFIGURE_ENABLE= live555 LIVEMEDIA_CONFIGURE_ENV= \ LIVE555_CFLAGS="-I${LOCALBASE}/include/liveMedia \ -I${LOCALBASE}/include/UsageEnvironment \ -I${LOCALBASE}/include/groupsock \ -I${LOCALBASE}/include/BasicUsageEnvironment" \ LIVE555_LIBS="-L${LOCALBASE}/lib -lliveMedia \ -lgroupsock -lBasicUsageEnvironment \ -lUsageEnvironment" LUA_USES= lua LUA_CONFIGURE_ENABLE= lua LUA_CONFIGURE_ON= LUAC=${LUAC_CMD} LUA_CFLAGS="-I${LUA_INCDIR}" \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad MAD_CONFIGURE_ENABLE= mad MAD_CONFIGURE_ON= --with-mad=${LOCALBASE} MATROSKA_LIB_DEPENDS= libmatroska.so:${PORTSDIR}/multimedia/libmatroska MATROSKA_CONFIGURE_ENABLE= mkv MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= mod MPEG2_LIB_DEPENDS= libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 MPEG2_CONFIGURE_ENABLE= libmpeg2 MTP_LIB_DEPENDS= libmtp.so:${PORTSDIR}/multimedia/libmtp MTP_CONFIGURE_ENABLE= mtp MUSEPACK_LIB_DEPENDS= libmpcdec.so:${PORTSDIR}/audio/musepack MUSEPACK_CONFIGURE_ENABLE= mpc MUSEPACK_CONFIGURE_ENV= LIBS_mpc="-L${LOCALBASE}/lib -lmpcdec" NCURSES_USES= ncurses NCURSES_CONFIGURE_ENV= NCURSES_CFLAGS="-I${NCURSESINC}" \ NCURSES_LIBS="-L${NCURSESLIB} -lncursesw" NCURSES_CONFIGURE_ENABLE= ncurses NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify NOTIFY_USE= GNOME=gtk20 NOTIFY_CONFIGURE_ENABLE=notify OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg OGG_CONFIGURE_ENABLE= ogg OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= opus PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_ENABLE= png PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse QT4_USE= QT4=gui,corelib,moc_build,rcc_build,uic_build # QT_CFLAGS: pkg-config --cflags "QtCore QtGui >= 4.6.0" # QT_LIBS: pkg-config --libs "QtCore QtGui >= 4.6.0" QT4_CONFIGURE_ENV= QT_CFLAGS="-I${QT_INCDIR}/QtGui -DQT_SHARED -I${QT_INCDIR} -I${QT_INCDIR}/QtCore" \ QT_LIBS="-lQtGui -L${QT_LIBDIR} -lQtCore" QT5_USE= QT5=gui,core,widgets,x11extras,buildtools_build REALRTSP_CONFIGURE_ENABLE= realrtsp RUNROOT_CONFIGURE_ENABLE= run-as-root SAMPLERATE_LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= schroedinger SDL_USE= SDL=image SDL_CONFIGURE_ENABLE= sdl sdl-image # libsidplay build broken with: # /usr/bin/ld: /usr/local/lib/sidplay/builders/libresid-builder.a(resid-builder.o): relocation R_X86_64_32S against `_ZTV12ReSIDBuilder' can not be used when making a shared object; recompile with -fPIC #SIDPLAY_LIB_DEPENDS= libsidplay2.so:${PORTSDIR}/audio/libsidplay2 #SIDPLAY_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders #SIDPLAY_CONFIGURE_ENABLE= sid CONFIGURE_ARGS+= --disable-sid SHOUTCAST_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout SHOUTCAST_CONFIGURE_ENABLE= shout SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient SMB_CONFIGURE_ENABLE= smbclient STREAM_CONFIGURE_ENABLE=sout SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= speex TAGLIB_LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib TAGLIB_CONFIGURE_ENABLE=taglib THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE=theora TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame TWOLAME_CONFIGURE_ENABLE= twolame UPNP_LIB_DEPENDS= libupnp.so:${PORTSDIR}/devel/upnp UPNP_CONFIGURE_ENABLE= upnp V4L_BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l V4L_CONFIGURE_ENABLE= v4l2 VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= libva VCD_LIB_DEPENDS= libcddb.so:${PORTSDIR}/audio/libcddb VCD_CONFIGURE_ENABLE= vcd libcddb VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE=vorbis X11_USE= GL=gl XORG=xcb,xproto X11_LIB_DEPENDS= libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms X11_CONFIGURE_ENABLE= glx xcb xvideo X11_CONFIGURE_WITH= x X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= x264 X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265 X265_CONFIGURE_ENABLE= x265 ZVBI_LIB_DEPENDS= libzvbi.so:${PORTSDIR}/devel/libzvbi ZVBI_CONFIGURE_ENABLE= zvbi PORTDATA= * PORTDOCS= * WITH_CDROM_DEVICE?=/dev/cd0 WITH_DVD_DEVICE?=/dev/cd0 .include .if ${PORT_OPTIONS:MX11} INSTALLS_ICONS= yes .endif .if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4} CONFIGURE_ARGS+= --enable-qt .else CONFIGURE_ARGS+= --disable-qt .endif .if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MQT4} IGNORE= please choose one of QT4 or QT5 .endif .if ${PORT_OPTIONS:MSKINS} .if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4} LIB_DEPENDS+= libminizip.so:${PORTSDIR}/archivers/minizip \ libtar.so:${PORTSDIR}/devel/libtar USE_XORG+= xext xinerama xpm CONFIGURE_ARGS+=--enable-skins2 --enable-libtar .else IGNORE= SKINS option requires QT4 or QT5 option .endif .else CONFIGURE_ARGS+=--disable-skins2 --disable-libtar .endif post-patch: @${REINPLACE_CMD} \ -e '\|LIBS|s|-lrt||' \ -e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \ -e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \ ${WRKSRC}/src/libvlc-module.c @${RM} -rf ${WRKSRC}/modules/access/v4l2/linux # XXX FreeBSD doesn't have strerror_l() - use the android version of error.c @${CP} ${WRKSRC}/src/android/error.c ${WRKSRC}/src/posix .if ${PORT_OPTIONS:MQT4} # XXX no sane way to tell configure not to pick up Qt5X11Extras with qt4 @${REINPLACE_CMD} s/Qt5X11Extras/Qt5X11Extras-not/ \ ${WRKSRC}/configure .endif post-install: @(cd ${STAGEDIR}${PREFIX} && ${FIND} -s lib/vlc -not -name '*.la' \ -type f -o -type l >> ${TMPPLIST}) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/vlc/plugins/*/*.so .include Index: head/net/csync2/Makefile =================================================================== --- head/net/csync2/Makefile (revision 411989) +++ head/net/csync2/Makefile (revision 411990) @@ -1,45 +1,46 @@ # Created by: Aaron Dalton # $FreeBSD$ PORTNAME= csync2 PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://oss.linbit.com/csync2/ MAINTAINER= alexey@renatasystems.org COMMENT= Cluster synchronization tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librsync.so.2:${PORTSDIR}/net/librsync1 \ libgnutls.so:${PORTSDIR}/security/gnutls \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 OPTIONS_DEFINE= CSYNC2_COMPARE DOCS OPTIONS_SUB= yes CSYNC2_COMPARE_DESC= Install csync2-compare script CSYNC2_COMPARE_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USES= pkgconfig shebangfix SHEBANG_FILES= csync2-compare GNU_CONFIGURE= yes CONFIGURE_ARGS= ac_cv_prog_PDFLATEX= CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib USE_RC_SUBR= csync2 SUB_FILES= pkg-install post-patch: @${REINPLACE_CMD} -e 's|(localstatedir)/lib|(localstatedir)/db|' \ -e 's/-ldl//' ${WRKSRC}/Makefile.in post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/csync2.cfg \ ${STAGEDIR}${PREFIX}/etc/csync2.cfg.sample ${MKDIR} ${STAGEDIR}/var/backups/csync2 .include Index: head/net/glib-networking/Makefile =================================================================== --- head/net/glib-networking/Makefile (revision 411989) +++ head/net/glib-networking/Makefile (revision 411990) @@ -1,36 +1,37 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= glib-networking PORTVERSION= 2.46.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Network-related giomodules for glib BUILD_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libp11-kit.so:${PORTSDIR}/security/p11-kit \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libproxy.so:${PORTSDIR}/net/libproxy RUN_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas PORTSCOUT= limitw:1,even USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz USE_GNOME= glib20 intltool GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip post-patch: @${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure .include Index: head/net/gtk-vnc/Makefile =================================================================== --- head/net/gtk-vnc/Makefile (revision 411989) +++ head/net/gtk-vnc/Makefile (revision 411990) @@ -1,39 +1,40 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= gtk-vnc PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= VNC viewer widget for GTK+ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 USE_GNOME= gtk30 intltool introspection:build USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gtk=3.0 --enable-introspection \ --disable-plugin --without-python MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip OPTIONS_DEFINE= PULSEAUDIO OPTIONS_DEFAULT=PULSEAUDIO OPTIONS_SUB= yes PULSEAUDIO_DESC= use PulseAudio for audio playback PULSEAUDIO_CONFIGURE_WITH= pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio .include Index: head/net/hs-network-protocol-xmpp/Makefile =================================================================== --- head/net/hs-network-protocol-xmpp/Makefile (revision 411989) +++ head/net/hs-network-protocol-xmpp/Makefile (revision 411990) @@ -1,16 +1,17 @@ # $FreeBSD$ PORTNAME= network-protocol-xmpp PORTVERSION= 0.4.8 +PORTREVISION= 1 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Client library for the XMPP protocol LICENSE= GPLv3 USE_CABAL= gnuidn>=0.2 gnutls>=0.1.4 gsasl>=0.3 libxml-sax>=0.7 \ monads-tf>=0.1 network>=2.2 text>=0.10 xml-types>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: head/net/libvncserver/Makefile =================================================================== --- head/net/libvncserver/Makefile (revision 411989) +++ head/net/libvncserver/Makefile (revision 411990) @@ -1,48 +1,48 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= libvncserver PORTVERSION= 0.9.9 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net devel MASTER_SITES= SF DISTNAME= LibVNCServer-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Provide an easy API to a custom vnc server LICENSE= GPLv2 LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png USES= jpeg libtool pathfix USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --without-x INSTALL_TARGET= install-strip OPTIONS_DEFINE= GNUTLS OPENSSL GCRYPT IPV6 OPTIONS_DEFAULT=OPENSSL GCRYPT_DESC= libgcrypt support GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls OPENSSL_CONFIGURE_WITH= crypto ssl OPENSSL_USE= OPENSSL=yes GCRYPT_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt GCRYPT_CONFIGURE_WITH= gcrypt IPV6_CONFIGURE_WITH= ipv6 post-patch: @${REINPLACE_CMD} -e \ '/^SUBDIRS/s|x11vnc||g' ${WRKSRC}/Makefile.in post-install: ${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb .include Index: head/net/morebalance/Makefile =================================================================== --- head/net/morebalance/Makefile (revision 411989) +++ head/net/morebalance/Makefile (revision 411990) @@ -1,34 +1,34 @@ # Created by: Clement Laforet # $FreeBSD$ PORTNAME= morebalance PORTVERSION= 0.4 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= net MASTER_SITES= http://morebalance.coolprojects.org/ MAINTAINER= ports@FreeBSD.org COMMENT= Modular open source user-space load balancing system LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ libgnutls.so:${PORTSDIR}/security/gnutls \ libggz.so:${PORTSDIR}/games/libggz CFLAGS+= -I${LOCALBASE}/include MAKE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" USES= gettext LDFLAGS+= -lz -lpthread LDFLAGS+= -L${LOCALBASE}/lib -lpcre -lggz -lgnutls -lintl do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.conf.5 \ ${STAGEDIR}${MANPREFIX}/man/man5 ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} install-messages ${MAKE_ARGS} .include Index: head/net/net6/Makefile =================================================================== --- head/net/net6/Makefile (revision 411989) +++ head/net/net6/Makefile (revision 411990) @@ -1,34 +1,34 @@ # Created by: Andreas Kohn # $FreeBSD$ PORTNAME= net6 PORTVERSION= 1.3.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net devel MASTER_SITES= http://releases.0x539.de/net6/ MAINTAINER= ports@FreeBSD.org COMMENT= Network access framework for IPv4/IPv6 LICENSE= LGPL20+ # though COPYING is LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \ libgnutls.so:${PORTSDIR}/security/gnutls GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= cpe libtool pathfix pkgconfig USE_LDCONFIG= yes CPE_VENDOR= armin_burgmeier OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_CPPFLAGS= -I${LOCALBASE}/include NLS_LDFLAGS= -L${LOCALBASE}/lib .include Index: head/net/net6/files/patch-src-encrypt.cpp =================================================================== --- head/net/net6/files/patch-src-encrypt.cpp (nonexistent) +++ head/net/net6/files/patch-src-encrypt.cpp (revision 411990) @@ -0,0 +1,14 @@ +--- src/encrypt.cpp.orig 2011-09-28 11:15:10 UTC ++++ src/encrypt.cpp +@@ -175,10 +175,7 @@ net6::tcp_encrypted_socket_base:: + gnutls_session_t sess): + tcp_client_socket(cobj), session(sess), state(DEFAULT) + { +- const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 }; +- +- gnutls_set_default_priority(session); +- gnutls_kx_set_priority(session, kx_prio); ++ gnutls_priority_set_direct(session, "NORMAL:-KX-ALL:+ANON-DH", NULL); + + gnutls_transport_set_ptr( + session, Property changes on: head/net/net6/files/patch-src-encrypt.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/ocserv/Makefile =================================================================== --- head/net/ocserv/Makefile (revision 411989) +++ head/net/ocserv/Makefile (revision 411990) @@ -1,73 +1,74 @@ # Created by: Carlos J Puga Medina # $FreeBSD$ PORTNAME= ocserv PORTVERSION= 0.10.12 +PORTREVISION= 1 CATEGORIES= net security MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/ MAINTAINER= cpm@FreeBSD.org COMMENT= Server implementing the AnyConnect SSL VPN protocol LICENSE= GPLv2 BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \ gsed:${PORTSDIR}/textproc/gsed \ bash:${PORTSDIR}/shells/bash LIB_DEPENDS= liblz4.so:${PORTSDIR}/archivers/liblz4 \ libiconv.so:${PORTSDIR}/converters/libiconv \ libtalloc.so:${PORTSDIR}/devel/talloc \ libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \ libgnutls.so:${PORTSDIR}/security/gnutls \ libtasn1.so:${PORTSDIR}/security/libtasn1 USES= autoreconf cpe gettext gmake gperf libtool ncurses \ pathfix pkgconfig readline tar:xz CPE_VENDOR= infradead CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-nls \ --enable-local-libopts \ --without-http-parser \ --without-pcl-lib \ --without-radius USERS= _ocserv GROUPS= _ocserv USE_RC_SUBR= ocserv OPTIONS_DEFINE= DOCS EXAMPLES GSSAPI PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README TODO PORTEXAMPLES= profile.xml sample.config sample.passwd GSSAPI_USES= gssapi:mit GSSAPI_LIB_DEPENDS= libkrb5support.so:${PORTSDIR}/security/krb5 GSSAPI_CONFIGURE_OFF= --without-gssapi post-patch: ${RM} ${WRKSRC}/doc/occtl.8 ${RM} ${WRKSRC}/doc/ocpasswd.8 ${RM} ${WRKSRC}/doc/ocserv.8 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/occtl ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ocpasswd ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ocserv ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ocserv/ ${MKDIR} ${STAGEDIR}/var/run/ocserv/ ${CP} ${FILESDIR}/ocserv.conf ${STAGEDIR}${PREFIX}/etc/ocserv/conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .include Index: head/net/remmina-plugin-vnc/Makefile =================================================================== --- head/net/remmina-plugin-vnc/Makefile (revision 411989) +++ head/net/remmina-plugin-vnc/Makefile (revision 411990) @@ -1,19 +1,19 @@ # Created by: Alexander Logvinov # $FreeBSD$ -PORTREVISION= 5 +PORTREVISION= 6 PKGNAMESUFFIX= -vnc COMMENT= Remmina plugin for VNC protocol LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libvncserver.so:${PORTSDIR}/net/libvncserver USES= jpeg MASTERDIR= ${.CURDIR}/../remmina-plugins PLIST_SUB+= ICONS="" SSH="" .include "${MASTERDIR}/Makefile" Index: head/net/samba41/Makefile =================================================================== --- head/net/samba41/Makefile (revision 411989) +++ head/net/samba41/Makefile (revision 411990) @@ -1,528 +1,528 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ PORTNAME?= ${SAMBA4_BASENAME}41 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* DEPRECATED= not supported by the upstream EXPIRATION_DATE= 2016-03-01 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 SAMBA4_VERSION= 4.1.22 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) CPE_VENDOR= samba CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private SAMBA4_LIBDIR= ${PREFIX}/lib SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/shared-modules SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \ --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ --includedir="${SAMBA4_INCLUDEDIR}" \ --datadir="${DATADIR}" \ --libdir="${SAMBA4_LIBDIR}" \ --with-pammodulesdir="${SAMBA4_LIBDIR}" \ --with-privatelibdir="${SAMBA4_LIBDIR}/samba" \ --with-modulesdir="${SAMBA4_MODULEDIR}" \ --with-pkgconfigdir="${PKGCONFIGDIR}" \ --localstatedir="${VARDIR}" \ --with-piddir="${SAMBA4_RUNDIR}" \ --with-sockets-dir="${SAMBA4_RUNDIR}" \ --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ --with-lockdir="${SAMBA4_LOCKDIR}" \ --with-statedir="${SAMBA4_LOCKDIR}" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" # Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES= cpe compiler waf pkgconfig perl5 python:2 \ execinfo readline iconv shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} # XXX: Unconditional dependencies which can't be switched off (if present # in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify # SASL LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 # GNUTLS LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls # NFS4 ACL glue LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl # External Samba dependencies # IDL compiler BUILD_DEPENDS+= p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl # BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " # ntdb BUILD_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb RUN_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb SAMBA4_BUNDLED_LIBS+= !ntdb # talloc BUILD_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc RUN_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent BUILD_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent RUN_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb RUN_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ldb BUILD_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb RUN_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SYSLOG UTMP OPTIONS_DEFAULT= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ DNSUPDATE DOCS FAM LDAP \ PTHREADPOOL QUOTAS SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support AIO_SUPPORT_DESC= Asynchronous IO support DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support UTMP_DESC= UTMP accounting support ############################################################################## OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_MODULES DEVELOPER_DESC= With development support MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER BIND99_DESC= Use bind99 as AD DC DNS server frontend BIND910_DESC= Use bind910 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ --with-winbind \ --without-gettext \ --with-sendfile-support \ --builtin-libraries=smbclient \ ${ICONV_CONFIGURE_BASE} # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) .if ${ARCH} == "amd64" CFLAGS+= -fno-omit-frame-pointer .endif .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MBIND910} RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" .endif .if ${PORT_OPTIONS:MDEBUG} WITH_DEBUG= yes CONFIGURE_ARGS+= --verbose MAKE_ARGS+= --verbose CONFIGURE_ARGS+= --enable-debug .endif # https://bugzilla.samba.org/show_bug.cgi?id=8969 .if ${PORT_OPTIONS:MDEVELOPER} #GDB_CMD?= gdb79 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then. GDB_CMD?= ${LOCALBASE}/bin/gdb BUILD_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb RUN_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls CONFIGURE_ARGS+= --enable-developer --enable-socket-wrapper --enable-nss-wrapper --enable-selftest PLIST_SUB+= DEVELOPER="" .else GDB_CMD= true PLIST_SUB+= DEVELOPER="@comment " .endif ############################################################################## # XXX: That will blow up your installation # https://bugzilla.samba.org/show_bug.cgi?id=9302 .if defined(CRAZY) WANT_EXP_MODULES= auth_samba4 auth_script auth_skel auth_unix auth_wbc \ gpext_registry gpext_scripts gpext_security idmap_ad \ idmap_autorid idmap_hash idmap_ldap idmap_passdb \ idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \ pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \ vfs_acl_xattr vfs_aio_fork vfs_aio_posix \ vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \ vfs_catia vfs_commit vfs_crossrename vfs_default_quota \ vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \ vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \ vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \ vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \ vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \ vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \ vfs_streams_xattr vfs_syncops vfs_time_audit \ vfs_xattr_tdb vfs_zfsacl .endif .if ${PORT_OPTIONS:MEXP_MODULES} . if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry . endif .endif .if ${PORT_OPTIONS:MACL_SUPPORT} LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl WANT_EXP_MODULES+= vfs_zfsacl SAMBA4_MODULES+= vfs_zfsacl CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support .endif .if ! ${PORT_OPTIONS:MAD_DC} CONFIGURE_ARGS+= --without-ad-dc PLIST_SUB+= AD_DC="@comment " .else PLIST_SUB+= AD_DC="" .endif .if ${PORT_OPTIONS:MADS} SAMBA4_WANT_ADS= yes SAMBA4_WANT_LDAP= yes # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 SAMBA4_MODULES+= idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2 .endif .if ${PORT_OPTIONS:MAIO_SUPPORT} CONFIGURE_ARGS+= --with-aio-support SAMBA4_MODULES+= vfs_aio_posix .else CONFIGURE_ARGS+= --without-aio-support .endif .if ${PORT_OPTIONS:MAVAHI} LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+= --enable-avahi .else CONFIGURE_ARGS+= --disable-avahi .endif .if ${PORT_OPTIONS:MMDNSRESPONDER} LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder CONFIGURE_ARGS+= --enable-dnssd .else CONFIGURE_ARGS+= --disable-dnssd .endif .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups CONFIGURE_ARGS+= --enable-cups --enable-iprint .else CONFIGURE_ARGS+= --disable-cups --disable-iprint .endif .if ${PORT_OPTIONS:MDNSUPDATE} SAMBA_WANT_ADS= yes CONFIGURE_ARGS+= --with-dnsupdate .else CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 .if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam SAMBA4_MODULES+= vfs_notify_fam .else CONFIGURE_ARGS+= --without-fam .endif .if ${PORT_OPTIONS:MLDAP} SAMBA4_WANT_LDAP= yes .endif .if ${PORT_OPTIONS:MPAM_SMBPASS} CONFIGURE_ARGS+= --with-pam_smbpass PLIST_SUB+= SMBPASS="" .else CONFIGURE_ARGS+= --without-pam_smbpass PLIST_SUB+= SMBPASS="@comment " .endif .if ${PORT_OPTIONS:MPTHREADPOOL} CONFIGURE_ARGS+= --enable-pthreadpool SAMBA4_MODULES+= vfs_aio_pthread .else CONFIGURE_ARGS+= --disable-pthreadpool .endif .if ${PORT_OPTIONS:MQUOTAS} CONFIGURE_ARGS+= --with-quotas .else CONFIGURE_ARGS+= --without-quotas .endif .if ${PORT_OPTIONS:MSYSLOG} CONFIGURE_ARGS+= --with-syslog .else CONFIGURE_ARGS+= --without-syslog .endif .if ${PORT_OPTIONS:MUTMP} CONFIGURE_ARGS+= --with-utmp .else CONFIGURE_ARGS+= --without-utmp .endif .if defined(SAMBA4_WANT_ADS) CONFIGURE_ARGS+= --with-ads .else CONFIGURE_ARGS+= --without-ads .endif .if defined(SAMBA4_WANT_LDAP) USE_OPENLDAP= yes #WANT_OPENLDAP_SASL= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else CONFIGURE_ARGS+= --without-ldap PLIST_SUB+= LDAP="@comment " .endif .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif # XXX: Dirty .for module in auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \ gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \ nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \ vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls vfs_notify_fam \ vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent . if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}} PLIST_SUB+= MODULE_${module:tu}="" . else PLIST_SUB+= MODULE_${module:tu}="@comment " . endif .endfor ############################################################################## # !SAMBA4_SUBPORT .endif .include .if !defined(SAMBA4_SUBPORT) SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ SAMBA4_CONFIG="${SAMBA4_CONFIG}" PLIST_SUB+= ${SAMBA4_SUB} SUB_LIST+= ${SAMBA4_SUB} USE_RC_SUBR= samba_server SUB_FILES= pkg-message README.FreeBSD # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \ profiles.1 regdiff.1 regpatch.1 regshell.1 \ regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \ smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \ smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \ testparm.1 vfstest.1 wbinfo.1 SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \ smb.conf.5 SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 SAMBA_MAN8+= eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \ idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \ smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \ vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 \ vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \ vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \ vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \ vfs_netatalk.8 vfs_notify_fam.8 vfs_prealloc.8 \ vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \ vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \ vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \ vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \ vfs_tsmsm.8 vfs_xattr_tdb.8 winbindd.8 \ vfs_linux_xfs_sgid.8 vfs_btrfs.8 PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: @${RM} -rf ${WRKSRC}/pidl post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \ ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ ${PATCH_WRKSRC}/dynconfig/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi # XXX: Gross hack to allow build newer Samba while old one is installed. # This implies that LINKFLAGS_PYEMBED contains flags which are already # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread post-configure: -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} . for man in libcli/nbt/man/nmblookup4.1 \ librpc/tools/ndrdump.1 \ source4/lib/registry/man/regdiff.1 \ source4/lib/registry/man/regpatch.1 \ source4/lib/registry/man/regshell.1 \ source4/lib/registry/man/regtree.1 \ source4/torture/man/gentest.1 \ source4/torture/man/locktest.1 \ source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ source4/utils/man/oLschema2ldif.1 -@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` ${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} . endfor -@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8} -${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . endfor .endif post-install: @${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} . for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} . endfor .endif # Run post-install script .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} @${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor @${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs @${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor .if ${PORT_OPTIONS:MDEVELOPER} test: build @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@) .endif # !SAMBA4_SUBPORT .endif .include Index: head/net/samba42/Makefile =================================================================== --- head/net/samba42/Makefile (revision 411989) +++ head/net/samba42/Makefile (revision 411990) @@ -1,534 +1,534 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ PORTNAME?= ${SAMBA4_BASENAME}42 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.* EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 SAMBA4_VERSION= 4.2.7 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) CPE_VENDOR= samba CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private SAMBA4_LIBDIR= ${PREFIX}/lib SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/shared-modules SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ --includedir="${SAMBA4_INCLUDEDIR}" \ --datadir="${DATADIR}" \ --libdir="${SAMBA4_LIBDIR}" \ --with-pammodulesdir="${SAMBA4_LIBDIR}" \ --with-privatelibdir="${SAMBA4_LIBDIR}/samba" \ --with-modulesdir="${SAMBA4_MODULEDIR}" \ --with-pkgconfigdir="${PKGCONFIGDIR}" \ --localstatedir="${VARDIR}" \ --with-piddir="${SAMBA4_RUNDIR}" \ --with-sockets-dir="${SAMBA4_RUNDIR}" \ --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ --with-lockdir="${SAMBA4_LOCKDIR}" \ --with-statedir="${SAMBA4_LOCKDIR}" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" # Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES= cpe compiler waf pkgconfig perl5 python:2 \ execinfo readline iconv shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} # XXX: Unconditional dependencies which can't be switched off(if present # in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify # SASL LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 # GNUTLS LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls # NFS4 ACL glue LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl # Libarchive BUILD_DEPENDS+= libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive RUN_DEPENDS+= libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive # External Samba dependencies # IDL compiler BUILD_DEPENDS+= p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl # BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc RUN_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent BUILD_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent RUN_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb RUN_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ntdb BUILD_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb RUN_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb SAMBA4_BUNDLED_LIBS+= !ntdb # ldb BUILD_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb RUN_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SYSLOG UTMP OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ DNSUPDATE DOCS FAM LDAP \ PTHREADPOOL QUOTAS SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support AIO_SUPPORT_DESC= Asyncronous IO support DNSUPDATE_DESC= Dynamic DNS update (require ADS) EXP_MODULES_DESC= Experimental modules FAM_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support UTMP_DESC= UTMP accounting support ############################################################################## OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_MODULES DEVELOPER_DESC= With development support MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER BIND99_DESC= Use bind99 as AD DC DNS server frontend BIND910_DESC= Use bind910 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ --with-winbind \ --without-gettext \ --with-sendfile-support \ --builtin-libraries=smbclient \ ${ICONV_CONFIGURE_BASE} # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) .if ${ARCH} == "amd64" CFLAGS+= -fno-omit-frame-pointer .endif .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MBIND910} RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" .else SUB_LIST+= NSUPDATE="@comment " .endif .if ${PORT_OPTIONS:MDEBUG} WITH_DEBUG= yes CONFIGURE_ARGS+= --verbose MAKE_ARGS+= --verbose CONFIGURE_ARGS+= --enable-debug .endif # https://bugzilla.samba.org/show_bug.cgi?id=8969 .if ${PORT_OPTIONS:MDEVELOPER} #GDB_CMD?= gdb79 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then. GDB_CMD?= ${LOCALBASE}/bin/gdb BUILD_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb RUN_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls CONFIGURE_ARGS+= --enable-developer --enable-selftest PLIST_SUB+= DEVELOPER="" .else GDB_CMD= true PLIST_SUB+= DEVELOPER="@comment " .endif ############################################################################## # XXX: That will blow up your installation # https://bugzilla.samba.org/show_bug.cgi?id=9302 .if defined(CRAZY) WANT_EXP_MODULES= auth_samba4 auth_script auth_skel auth_unix auth_wbc \ gpext_registry gpext_scripts gpext_security idmap_ad \ idmap_autorid idmap_hash idmap_ldap idmap_passdb \ idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \ pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \ vfs_acl_xattr vfs_aio_fork vfs_aio_posix \ vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \ vfs_catia vfs_commit vfs_crossrename vfs_default_quota \ vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \ vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \ vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \ vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \ vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \ vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \ vfs_streams_xattr vfs_syncops vfs_time_audit \ vfs_xattr_tdb vfs_zfsacl .endif .if ${PORT_OPTIONS:MEXP_MODULES} . if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry . endif .endif .if ${PORT_OPTIONS:MACL_SUPPORT} LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl WANT_EXP_MODULES+= vfs_zfsacl SAMBA4_MODULES+= vfs_zfsacl CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support .endif .if ! ${PORT_OPTIONS:MAD_DC} CONFIGURE_ARGS+= --without-ad-dc PLIST_SUB+= AD_DC="@comment " SUB_LIST+= AD_DC="@comment " .else PLIST_SUB+= AD_DC="" SUB_LIST+= AD_DC="" .endif .if ${PORT_OPTIONS:MADS} SAMBA4_WANT_ADS= yes SAMBA4_WANT_LDAP= yes # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 SAMBA4_MODULES+= idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2 .endif .if ${PORT_OPTIONS:MAIO_SUPPORT} CONFIGURE_ARGS+= --with-aio-support SAMBA4_MODULES+= vfs_aio_posix .else CONFIGURE_ARGS+= --without-aio-support .endif .if ${PORT_OPTIONS:MAVAHI} LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+= --enable-avahi .else CONFIGURE_ARGS+= --disable-avahi .endif .if ${PORT_OPTIONS:MMDNSRESPONDER} LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder CONFIGURE_ARGS+= --enable-dnssd .else CONFIGURE_ARGS+= --disable-dnssd .endif .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups CONFIGURE_ARGS+= --enable-cups --enable-iprint .else CONFIGURE_ARGS+= --disable-cups --disable-iprint .endif .if ${PORT_OPTIONS:MDNSUPDATE} SAMBA_WANT_ADS= yes CONFIGURE_ARGS+= --with-dnsupdate .else CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 .if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam SAMBA4_MODULES+= vfs_notify_fam .else CONFIGURE_ARGS+= --without-fam .endif .if ${PORT_OPTIONS:MLDAP} SAMBA4_WANT_LDAP= yes .endif .if ${PORT_OPTIONS:MPAM_SMBPASS} CONFIGURE_ARGS+= --with-pam_smbpass PLIST_SUB+= SMBPASS="" .else CONFIGURE_ARGS+= --without-pam_smbpass PLIST_SUB+= SMBPASS="@comment " .endif .if ${PORT_OPTIONS:MPTHREADPOOL} CONFIGURE_ARGS+= --enable-pthreadpool SAMBA4_MODULES+= vfs_aio_pthread .else CONFIGURE_ARGS+= --disable-pthreadpool .endif .if ${PORT_OPTIONS:MQUOTAS} CONFIGURE_ARGS+= --with-quotas .else CONFIGURE_ARGS+= --without-quotas .endif .if ${PORT_OPTIONS:MSYSLOG} CONFIGURE_ARGS+= --with-syslog .else CONFIGURE_ARGS+= --without-syslog .endif .if ${PORT_OPTIONS:MUTMP} CONFIGURE_ARGS+= --with-utmp .else CONFIGURE_ARGS+= --without-utmp .endif .if defined(SAMBA4_WANT_ADS) CONFIGURE_ARGS+= --with-ads .else CONFIGURE_ARGS+= --without-ads .endif .if defined(SAMBA4_WANT_LDAP) USE_OPENLDAP= yes #WANT_OPENLDAP_SASL= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else CONFIGURE_ARGS+= --without-ldap PLIST_SUB+= LDAP="@comment " .endif .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif # XXX: Dirty .for module in auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \ gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \ nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \ vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls vfs_notify_fam \ vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent . if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}} PLIST_SUB+= MODULE_${module:tu}="" . else PLIST_SUB+= MODULE_${module:tu}="@comment " . endif .endfor ############################################################################## # !SAMBA4_SUBPORT .endif .include .if !defined(SAMBA4_SUBPORT) SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ SAMBA4_CONFIG="${SAMBA4_CONFIG}" PLIST_SUB+= ${SAMBA4_SUB} SUB_LIST+= ${SAMBA4_SUB} USE_RC_SUBR= samba_server SUB_FILES= pkg-message README.FreeBSD # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \ profiles.1 regdiff.1 regpatch.1 regshell.1 \ regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \ smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \ smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \ testparm.1 vfstest.1 wbinfo.1 SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \ smb.conf.5 SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 SAMBA_MAN8+= eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \ idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \ smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \ vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 vfs_ceph.8 \ vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \ vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \ vfs_fruit.8 vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \ vfs_netatalk.8 vfs_notify_fam.8 vfs_prealloc.8 \ vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \ vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \ vfs_shadow_copy2.8 vfs_snapper.8 vfs_smb_traffic_analyzer.8 \ vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \ vfs_tsmsm.8 vfs_worm.8 vfs_xattr_tdb.8 winbindd.8 \ vfs_linux_xfs_sgid.8 vfs_btrfs.8 PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: @${RM} -rf ${WRKSRC}/pidl post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \ ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ ${PATCH_WRKSRC}/dynconfig/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi # XXX: Gross hack to allow build newer Samba while old one is installed. # This implies that LINKFLAGS_PYEMBED contains flags which are already # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread post-configure: -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} . for man in libcli/nbt/man/nmblookup4.1 \ librpc/tools/ndrdump.1 \ source4/lib/registry/man/regdiff.1 \ source4/lib/registry/man/regpatch.1 \ source4/lib/registry/man/regshell.1 \ source4/lib/registry/man/regtree.1 \ source4/torture/man/gentest.1 \ source4/torture/man/locktest.1 \ source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ source4/utils/man/oLschema2ldif.1 -@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` @${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} . endfor -@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8} -@${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . endfor .endif post-install: @${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} . for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} . endfor .endif # Run post-install script .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} @${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor @${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs @${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor .if ${PORT_OPTIONS:MDEVELOPER} test: build @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@) .endif # !SAMBA4_SUBPORT .endif .include Index: head/net/samba43/Makefile =================================================================== --- head/net/samba43/Makefile (revision 411989) +++ head/net/samba43/Makefile (revision 411990) @@ -1,530 +1,530 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ PORTNAME?= ${SAMBA4_BASENAME}43 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 SAMBA4_VERSION= 4.3.3 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) CPE_VENDOR= samba CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private SAMBA4_LIBDIR= ${PREFIX}/lib SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/shared-modules SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ --includedir="${SAMBA4_INCLUDEDIR}" \ --datadir="${DATADIR}" \ --libdir="${SAMBA4_LIBDIR}" \ --with-pammodulesdir="${SAMBA4_LIBDIR}" \ --with-privatelibdir="${SAMBA4_LIBDIR}/samba" \ --with-modulesdir="${SAMBA4_MODULEDIR}" \ --with-pkgconfigdir="${PKGCONFIGDIR}" \ --localstatedir="${VARDIR}" \ --with-piddir="${SAMBA4_RUNDIR}" \ --with-sockets-dir="${SAMBA4_RUNDIR}" \ --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ --with-lockdir="${SAMBA4_LOCKDIR}" \ --with-statedir="${SAMBA4_LOCKDIR}" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" # Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES= cpe compiler waf pkgconfig perl5 python:2 \ execinfo readline iconv shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} # XXX: Unconditional dependencies which can't be switched off(if present # in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify # SASL LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 # GNUTLS LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls # NFS4 ACL glue LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl # Libarchive BUILD_DEPENDS+= libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive RUN_DEPENDS+= libarchive>=3.1.2:${PORTSDIR}/archivers/libarchive # External Samba dependencies # IDL compiler BUILD_DEPENDS+= p5-Parse-Pidl>=4.3.1:${PORTSDIR}/devel/p5-Parse-Pidl # BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc RUN_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent BUILD_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent RUN_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb RUN_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ldb BUILD_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb RUN_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SYSLOG UTMP OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ DNSUPDATE DOCS FAM LDAP \ PTHREADPOOL QUOTAS SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support AIO_SUPPORT_DESC= Asyncronous IO support DNSUPDATE_DESC= Dynamic DNS update (require ADS) EXP_MODULES_DESC= Experimental modules FAM_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support UTMP_DESC= UTMP accounting support ############################################################################## OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_MODULES DEVELOPER_DESC= With development support MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER BIND99_DESC= Use bind99 as AD DC DNS server frontend BIND910_DESC= Use bind910 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ --with-winbind \ --without-gettext \ --with-sendfile-support \ --builtin-libraries=smbclient \ ${ICONV_CONFIGURE_BASE} # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) .if ${ARCH} == "amd64" CFLAGS+= -fno-omit-frame-pointer .endif .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MBIND910} RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" .else SUB_LIST+= NSUPDATE="@comment " .endif .if ${PORT_OPTIONS:MDEBUG} WITH_DEBUG= yes CONFIGURE_ARGS+= --verbose MAKE_ARGS+= --verbose CONFIGURE_ARGS+= --enable-debug .endif # https://bugzilla.samba.org/show_bug.cgi?id=8969 .if ${PORT_OPTIONS:MDEVELOPER} #GDB_CMD?= gdb79 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 # XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then. GDB_CMD?= ${LOCALBASE}/bin/gdb BUILD_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb RUN_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls CONFIGURE_ARGS+= --enable-developer --enable-selftest PLIST_SUB+= DEVELOPER="" .else GDB_CMD= true PLIST_SUB+= DEVELOPER="@comment " .endif ############################################################################## # XXX: That will blow up your installation # https://bugzilla.samba.org/show_bug.cgi?id=9302 .if defined(CRAZY) WANT_EXP_MODULES= auth_samba4 auth_script auth_skel auth_unix auth_wbc \ gpext_registry gpext_scripts gpext_security idmap_ad \ idmap_autorid idmap_hash idmap_ldap idmap_passdb \ idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \ pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \ vfs_acl_xattr vfs_aio_fork vfs_aio_posix \ vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \ vfs_catia vfs_commit vfs_crossrename vfs_default_quota \ vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \ vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \ vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \ vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \ vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \ vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \ vfs_streams_xattr vfs_syncops vfs_time_audit \ vfs_xattr_tdb vfs_zfsacl .endif .if ${PORT_OPTIONS:MEXP_MODULES} . if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry . endif .endif .if ${PORT_OPTIONS:MACL_SUPPORT} LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl WANT_EXP_MODULES+= vfs_zfsacl SAMBA4_MODULES+= vfs_zfsacl CONFIGURE_ARGS+= --with-acl-support .else CONFIGURE_ARGS+= --without-acl-support .endif .if ! ${PORT_OPTIONS:MAD_DC} CONFIGURE_ARGS+= --without-ad-dc PLIST_SUB+= AD_DC="@comment " SUB_LIST+= AD_DC="@comment " .else PLIST_SUB+= AD_DC="" SUB_LIST+= AD_DC="" .endif .if ${PORT_OPTIONS:MADS} SAMBA4_WANT_ADS= yes SAMBA4_WANT_LDAP= yes # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 SAMBA4_MODULES+= idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2 .endif .if ${PORT_OPTIONS:MAIO_SUPPORT} CONFIGURE_ARGS+= --with-aio-support SAMBA4_MODULES+= vfs_aio_posix .else CONFIGURE_ARGS+= --without-aio-support .endif .if ${PORT_OPTIONS:MAVAHI} LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+= --enable-avahi .else CONFIGURE_ARGS+= --disable-avahi .endif .if ${PORT_OPTIONS:MMDNSRESPONDER} LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder CONFIGURE_ARGS+= --enable-dnssd .else CONFIGURE_ARGS+= --disable-dnssd .endif .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups CONFIGURE_ARGS+= --enable-cups --enable-iprint .else CONFIGURE_ARGS+= --disable-cups --disable-iprint .endif .if ${PORT_OPTIONS:MDNSUPDATE} SAMBA_WANT_ADS= yes CONFIGURE_ARGS+= --with-dnsupdate PLIST_SUB+= DNSUPDATE="" .else CONFIGURE_ARGS+= --without-dnsupdate PLIST_SUB+= DNSUPDATE="@comment " .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 .if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam .else CONFIGURE_ARGS+= --without-fam .endif .if ${PORT_OPTIONS:MLDAP} SAMBA4_WANT_LDAP= yes .endif .if ${PORT_OPTIONS:MPAM_SMBPASS} CONFIGURE_ARGS+= --with-pam_smbpass PLIST_SUB+= SMBPASS="" .else CONFIGURE_ARGS+= --without-pam_smbpass PLIST_SUB+= SMBPASS="@comment " .endif .if ${PORT_OPTIONS:MPTHREADPOOL} CONFIGURE_ARGS+= --enable-pthreadpool SAMBA4_MODULES+= vfs_aio_pthread .else CONFIGURE_ARGS+= --disable-pthreadpool .endif .if ${PORT_OPTIONS:MQUOTAS} CONFIGURE_ARGS+= --with-quotas .else CONFIGURE_ARGS+= --without-quotas .endif .if ${PORT_OPTIONS:MSYSLOG} CONFIGURE_ARGS+= --with-syslog .else CONFIGURE_ARGS+= --without-syslog .endif .if ${PORT_OPTIONS:MUTMP} CONFIGURE_ARGS+= --with-utmp .else CONFIGURE_ARGS+= --without-utmp .endif .if defined(SAMBA4_WANT_ADS) CONFIGURE_ARGS+= --with-ads .else CONFIGURE_ARGS+= --without-ads .endif .if defined(SAMBA4_WANT_LDAP) USE_OPENLDAP= yes #WANT_OPENLDAP_SASL= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" .else CONFIGURE_ARGS+= --without-ldap PLIST_SUB+= LDAP="@comment " .endif .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif # XXX: Dirty .for module in auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \ gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \ nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \ vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls \ vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent . if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}} PLIST_SUB+= MODULE_${module:tu}="" . else PLIST_SUB+= MODULE_${module:tu}="@comment " . endif .endfor ############################################################################## # !SAMBA4_SUBPORT .endif .include .if !defined(SAMBA4_SUBPORT) SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ SAMBA4_CONFIG="${SAMBA4_CONFIG}" PLIST_SUB+= ${SAMBA4_SUB} SUB_LIST+= ${SAMBA4_SUB} USE_RC_SUBR= samba_server SUB_FILES= pkg-message README.FreeBSD # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \ profiles.1 regdiff.1 regpatch.1 regshell.1 \ regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \ smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \ smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \ testparm.1 vfstest.1 wbinfo.1 SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \ smb.conf.5 SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 SAMBA_MAN8+= eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \ idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \ smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \ vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 vfs_ceph.8 \ vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \ vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \ vfs_fruit.8 vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \ vfs_netatalk.8 vfs_prealloc.8 \ vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \ vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \ vfs_shadow_copy2.8 vfs_snapper.8 vfs_smb_traffic_analyzer.8 \ vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \ vfs_tsmsm.8 vfs_worm.8 vfs_xattr_tdb.8 winbindd.8 \ vfs_linux_xfs_sgid.8 vfs_btrfs.8 vfs_shell_snap.8 vfs_unityed_media.8 PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: @${RM} -rf ${WRKSRC}/pidl post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \ ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ ${PATCH_WRKSRC}/dynconfig/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi # XXX: Gross hack to allow build newer Samba while old one is installed. # This implies that LINKFLAGS_PYEMBED contains flags which are already # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread post-configure: -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} . for man in libcli/nbt/man/nmblookup4.1 \ librpc/tools/ndrdump.1 \ source4/lib/registry/man/regdiff.1 \ source4/lib/registry/man/regpatch.1 \ source4/lib/registry/man/regshell.1 \ source4/lib/registry/man/regtree.1 \ source4/torture/man/gentest.1 \ source4/torture/man/locktest.1 \ source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ source4/utils/man/oLschema2ldif.1 -@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` ${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} . endfor -@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8} -${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages . endfor .endif post-install: @${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} . for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} . endfor .endif # Run post-install script .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} @${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor @${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs @${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor .if ${PORT_OPTIONS:MDEVELOPER} test: build @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@) .endif # !SAMBA4_SUBPORT .endif .include Index: head/net/sixxs-aiccu/Makefile =================================================================== --- head/net/sixxs-aiccu/Makefile (revision 411989) +++ head/net/sixxs-aiccu/Makefile (revision 411990) @@ -1,65 +1,65 @@ # Created by: Meno Abels # $FreeBSD$ PORTNAME= aiccu PORTVERSION= 20070115 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net ipv6 MASTER_SITES= http://www.sixxs.net/archive/sixxs/aiccu/unix/ PKGNAMEPREFIX= sixxs- DISTNAME= aiccu_20070115 MAINTAINER= ports@FreeBSD.org COMMENT= SixXS IPv6 TIC+ tunnel broker heartbeat client LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/doc/LICENSE USE_RC_SUBR= sixxs-aiccu USES= gmake CFLAGS+= -D_REENTRANT -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib MAKE_ARGS+= CC="${CC}" LDFLAGS="${LDFLAGS}" WRKSRC= ${WRKDIR}/aiccu BUILD_WRKSRC= ${WRKDIR}/aiccu/unix-console PORTDOCS= README OPTIONS_DEFINE= GNUTLS LOG_DAEMON DOCS GNUTLS_DESC= Use gnutls to secure TIC supporting starttls LOG_DAEMON_DESC=Log to LOG_DAEMON instead to LOG_LOCAL7 OPTIONS_DEFAULT+= GNUTLS .include .if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libgnutls-openssl.so:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CFLAGS+= -DAICCU_GNUTLS LDFLAGS+= -lgnutls .endif post-patch: @${REINPLACE_CMD} \ -e 's:verbose true:verbose false:' \ -e 's:daemonize false:daemonize true:' \ -e 's:automatic false:automatic true:' \ -e 's:tunnel_id T2995:#tunnel_id TXXXX:' \ -e 's:ipv4_interface eth0:ipv4_interface sis0:' \ -e 's:ipv6_interface sixxs:ipv6_interface gif0:' \ ${WRKSRC}/doc/aiccu.conf .if ${PORT_OPTIONS:MLOG_DAEMON} do-configure: @${REINPLACE_CMD} \ -e 's:LOG_LOCAL7:LOG_DAEMON:' \ ${WRKSRC}/common/common.c .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unix-console/aiccu ${STAGEDIR}${PREFIX}/sbin/sixxs-aiccu ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/aiccu.conf ${STAGEDIR}${PREFIX}/etc/aiccu.conf.sample .include Index: head/net/sixxs-aiccu/files/patch-common-common.c =================================================================== --- head/net/sixxs-aiccu/files/patch-common-common.c (nonexistent) +++ head/net/sixxs-aiccu/files/patch-common-common.c (revision 411990) @@ -0,0 +1,25 @@ +--- common/common.c.orig 2006-12-21 14:08:50 UTC ++++ common/common.c +@@ -271,8 +271,6 @@ TLSSOCKET sock_alloc(void); + TLSSOCKET sock_alloc(void) + { + #ifdef AICCU_GNUTLS +- /* Allow connections to servers that have OpenPGP keys as well */ +- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; + int ret; + #endif /* AICCU_GNUTLS*/ + +@@ -296,11 +294,8 @@ TLSSOCKET sock_alloc(void) + return NULL; + } + +- /* Use default priorities */ +- gnutls_set_default_priority(sock->session); +- /* XXX: Return value is not documented in GNUTLS documentation! */ +- +- gnutls_certificate_type_set_priority(sock->session, cert_type_priority); ++ /* Allow connections to servers that have OpenPGP keys as well */ ++ gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL); + /* XXX: Return value is not documented in GNUTLS documentation! */ + + /* Configure the x509 credentials for the current session */ Property changes on: head/net/sixxs-aiccu/files/patch-common-common.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/tigervnc/Makefile =================================================================== --- head/net/tigervnc/Makefile (revision 411989) +++ head/net/tigervnc/Makefile (revision 411990) @@ -1,139 +1,139 @@ # Created by: Koichiro IWAO # $FreeBSD$ PORTNAME= tigervnc PORTVERSION= 1.6.0 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= net x11-servers MAINTAINER= meta+ports@vmeta.jp COMMENT= High-performance, platform-neutral implementation of VNC LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENCE.TXT PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch BUILD_DEPENDS= ${LOCALBASE}/include/GL/internal/dri_interface.h:${PORTSDIR}/graphics/dri \ ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util \ bash:${PORTSDIR}/shells/bash # almost equivalent to x11-servers/xorg-server's RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp CONFLICTS= tridiavnc-[0-9]* \ tightvnc-[0-9]* \ vnc-[0-9]* USES= autoreconf:build cmake cpe gmake jpeg libtool pkgconfig python USE_GL= gl USE_LDCONFIG= yes USE_OPENSSL= yes USE_GITHUB= yes GH_ACCOUNT= TigerVNC USE_XORG+= bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \ inputproto kbproto pixman randrproto renderproto resourceproto \ scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \ xfont xproto xrandr xtrans xtst xorg-macros presentproto CFLAGS+= -fPIC OPTIONS_DEFINE= GNUTLS NLS PAM VIEWER DOCS OPTIONS_DEFAULT= GNUTLS NLS PAM VIEWER VIEWER_DESC= Build vncviewer .include CMAKE_ARGS= -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX} .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libtasn1.so:${PORTSDIR}/security/libtasn1 \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgpg-error.so:${PORTSDIR}/security/libgpg-error \ libgnutls.so:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --enable-glx-tls CMAKE_ARGS+= -DENABLE_GNUTLS=1 .else CMAKE_ARGS+= -DENABLE_GNUTLS=0 .endif .if ${PORT_OPTIONS:MNLS} USES+= gettext CMAKE_ARGS+= -DENABLE_NLS=1 PLIST_SUB+= NLS="" .else CMAKE_ARGS+= -DENABLE_NLS=0 PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MPAM} CMAKE_ARGS+= -DENABLE_PAM=1 .else CMAKE_ARGS+= -DENABLE_PAM=0 .endif .if ${PORT_OPTIONS:MVIEWER} CMAKE_ARGS+= -DBUILD_VIEWER=1 LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libfltk.so:${PORTSDIR}/x11-toolkits/fltk # ImageMagick is required to generate icons during build process BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick USE_XORG+= xcursor xfixes xft xinerama PLIST_SUB+= VIEWER="" INSTALLS_ICONS= yes DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \ "${PORTNAME}" "vncviewer" "Network;" false .else CMAKE_ARGS+= -DBUILD_VIEWER=0 PLIST_SUB+= VIEWER="@comment " .endif MAKE_ARGS+= TIGERVNC_SRCDIR=${WRKSRC} CONFIGURE_ARGS+= \ --prefix=${PREFIX} --mandir=${PREFIX}/man/ \ --docdir=${PREFIX}/share/doc/${PORTNAME}/ --with-pic --without-dtrace \ --disable-static --disable-dri --disable-unit-tests \ --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \ --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ --disable-config-dbus --disable-config-hal \ --disable-dri2 --enable-install-libxf86config --enable-glx \ --with-default-font-path="catalogue:${LOCALBASE}/share/fonts,built-ins" \ --with-xkb-path=${LOCALBASE}/share/X11/xkb \ --with-xkb-bin-directory=${LOCALBASE}/bin \ --with-serverconfig-path=${LOCALBASE}/lib/X11 \ --disable-selective-werror \ --with-fontrootdir=${LOCALBASE}/share/fonts .include TIGERVNC_XORG_PATCH_VER= 117 # import from x11-server/xorg-server/Makefile .ifdef WITH_OPENSSL_BASE # The reason why I use this is cause openssl from base doesn't # install a .pc file and configure will fail trying to find it. # Setting both of those variables to a *non-empty* value by-passes # the pkg-config check. CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif XORG_WRKDIR= ${MAKE} -C ${PORTSDIR}/x11-servers/xorg-server -VWRKSRC pre-patch: @${CP} -R `${XORG_WRKDIR}`/ ${WRKSRC}/unix/xserver/ post-patch: @cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver${TIGERVNC_XORG_PATCH_VER}.patch post-configure: @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${AUTORECONF} -fiv @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure ${CONFIGURE_ARGS} post-build: @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} SHELL=${LOCALBASE}/bin/bash post-install: @cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install .include Index: head/net/uget/Makefile =================================================================== --- head/net/uget/Makefile (revision 411989) +++ head/net/uget/Makefile (revision 411990) @@ -1,42 +1,43 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= uget PORTVERSION= 2.0.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SF/urlget/${PORTNAME}%20%28stable%29/${PORTVERSION} MAINTAINER= olivierd@FreeBSD.org COMMENT= Download manager application LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= curl-config:${PORTSDIR}/ftp/curl LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgnutls.so:${PORTSDIR}/security/gnutls RUN_DEPENDS= aria2c:${PORTSDIR}/www/aria2 USES= compiler:c11 gettext-tools gmake pkgconfig GNU_CONFIGURE= yes USE_GNOME= glib20 gtk30 intltool intlhack INSTALLS_ICONS= yes INSTALL_TARGET= install-strip # Avoid warning, with redefinition of typedef (C11 feature) CFLAGS+= -Wno-typedef-redefinition CONFIGURE_ARGS=--enable-appindicator=no \ --disable-pwmd \ --with-gnutls=yes OPTIONS_DEFINE= GSTREAMER NLS OPTIONS_DEFAULT= GSTREAMER NLS GSTREAMER_USE= gstreamer1=yes GSTREAMER_CONFIGURE_ENABLE= gstreamer NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls OPTIONS_SUB= yes .include Index: head/net/vinagre/Makefile =================================================================== --- head/net/vinagre/Makefile (revision 411989) +++ head/net/vinagre/Makefile (revision 411990) @@ -1,57 +1,57 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= vinagre PORTVERSION= 3.18.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC client for the GNOME Desktop BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool LIB_DEPENDS= libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc \ libgdbm.so:${PORTSDIR}/databases/gdbm \ libsecret-1.so:${PORTSDIR}/security/libsecret RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme PORTSCOUT= limitw:1,even USES= desktop-file-utils gettext gmake gnome pathfix pkgconfig \ shared-mime-info tar:xz USE_GNOME= gtk30 intlhack libxml2 vte3 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-ssh CPPFLAGS+= -I${LOCALBASE}/include -Wno-format-nonliteral LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.Vinagre.gschema.xml OPTIONS_SUB= yes OPTIONS_DEFINE= AVAHI SPICE TELEPATHY RDP DOCS OPTIONS_DEFAULT=AVAHI SPICE TELEPATHY RDP AVAHI_CONFIGURE_WITH= avahi AVAHI_LIB_DEPENDS= libavahi-ui-gtk3.so:${PORTSDIR}/net/avahi-gtk3 SPICE_DESC= SPICE protocol support SPICE_CONFIGURE_ENABLE= spice SPICE_BUILD_DEPENDS= spice-gtk>=0.30_1:${PORTSDIR}/deskutils/spice-gtk SPICE_LIB_DEPENDS= libspice-client-gtk-3.0.so:${PORTSDIR}/deskutils/spice-gtk TELEPATHY_DESC= Telepathy integration TELEPATHY_CONFIGURE_WITH= telepathy TELEPATHY_LIB_DEPENDS= libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib RDP_DESC= MS Windows remote desktop support RDP_CONFIGURE_ENABLE= rdp RDP_BUILD_DEPENDS= xfreerdp:${PORTSDIR}/net/freerdp RDP_RUN_DEPENDS= xfreerdp:${PORTSDIR}/net/freerdp post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS COPYING ChangeLog NEWS README ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/net/vino/Makefile =================================================================== --- head/net/vino/Makefile (revision 411989) +++ head/net/vino/Makefile (revision 411990) @@ -1,34 +1,34 @@ # Created by: Tom McLaughlin # $FreeBSD$ PORTNAME= vino PORTVERSION= 3.18.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC server that allows for remote access to your GNOME desktop LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libsecret-1.so:${PORTSDIR}/security/libsecret \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ libnotify.so:${PORTSDIR}/devel/libnotify \ libavahi-glib.so:${PORTSDIR}/net/avahi-app PORTSCOUT= limitw:1,even USES= cpe gettext gmake gnome pathfix pkgconfig tar:xz CPE_VENDOR= david_king USE_GNOME= gtk30 intlhack USE_XORG= xdamage xfixes xtst GNU_CONFIGURE= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include -Wno-format-nonliteral LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.Vino.enums.xml org.gnome.Vino.gschema.xml .include Index: head/net/wireshark/Makefile =================================================================== --- head/net/wireshark/Makefile (revision 411989) +++ head/net/wireshark/Makefile (revision 411990) @@ -1,163 +1,163 @@ # Created by: Bill Fumerola # $FreeBSD$ PORTNAME?= wireshark PORTVERSION= 2.0.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ http://wireshark.askapache.com/download/src/all-versions/ \ ftp://ftp.uni-kl.de/pub/wireshark/src/ \ http://prdownloads.sourceforge.net/wireshark/ \ http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ ftp://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ http://wireshark.zing.org/download/src/ DISTNAME= ${DATADIR_NAME}-${PORTVERSION} MAINTAINER= marcus@FreeBSD.org COMMENT?= Powerful network analyzer/capture tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS?= wireshark-qt5-[0-9]* DATADIR_NAME= wireshark DATADIR= ${PREFIX}/share/${DATADIR_NAME} GNU_CONFIGURE= yes USES= alias cpe gmake libtool perl5 pkgconfig python:build tar:bzip2 USE_PERL5= build USE_GNOME= glib20 USE_OPENSSL= yes CONFIGURE_ARGS+= --program-transform-name="" \ --with-ssl=${OPENSSLBASE} INSTALL_TARGET= install-strip USE_LDCONFIG= yes CFLAGS+= -funit-at-a-time LIBS+= -L${LOCALBASE}/lib PLIST_SUB+= PORTVERSION=${PORTVERSION} .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ reordercap captype androiddump .if defined(LITE) PKGNAMESUFFIX= -lite PLIST_SUB+= ${x:tu}="@comment $x not installed" \ ${x:tu}_MAN="@comment $x not installed " CONFIGURE_ARGS+= --enable-$x=no OPTIONS_EXCLUDE+= RTP SNMP GEOIP LUA ADNS CARES .else PLIST_SUB+= ${x:tu}=bin/$x \ ${x:tu}_MAN="" .endif .endfor OPTIONS_DEFINE= RTP SNMP IPV6 GEOIP LUA GCRYPT GNUTLS OPTIONS_RADIO= ASYNCDNS GUI OPTIONS_SINGLE= KERBEROS OPTIONS_RADIO_ASYNCDNS= ADNS CARES OPTIONS_RADIO_GUI= GTK2 GTK3 QT5 OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEIMDAL KRB_MIT KRB_NONE OPTIONS_DEFAULT?= SNMP ADNS IPV6 GEOIP KRB_BASE GTK3 RTP_DESC= Enable support for playing back RTP streams GCRYPT_DESC= IPsec decryption support GNUTLS_DESC= SSL decryption support ASYNCDNS_DESC= Asynchronous DNS lookup support ADNS_DESC= Asynchronous DNS resolution via GNU adns KERBEROS_DESC= Kerberos dissection support KRB_BASE_DESC= Kerberos support via base system KRB_HEIMDAL_DESC= Kerberos support via security/heimdal KRB_MIT_DESC= Kerberos support via security/krb5 KRB_NONE_DESC= Disable Kerberos support GTK2_USE= GNOME=gtk20 GTK3_USE= GNOME=gtk30 QT5_USE= QT5=core,gui,widgets,printsupport,buildtools_build LUA_USES= lua:5[1-2] KRB_BASE_USES= gssapi KRB_HEIMDAL_USES= gssapi:heimdal KRB_MIT_USES= gssapi:mit RTP_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio SNMP_LIB_DEPENDS= libsmi.so:${PORTSDIR}/net-mgmt/libsmi ADNS_LIB_DEPENDS= libadns.so:${PORTSDIR}/dns/adns CARES_LIB_DEPENDS= libcares.so:${PORTSDIR}/dns/c-ares GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP GCRYPT_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls IPV6_CONFIGURE_ENABLE= ipv6 KRB_NONE_CONFIGURE_ON= --without-krb5 KRB_NONE_CONFIGURE_OFF= --with-krb5 KRB_NONE_CONFIGURE_ENV_OFF= KRB5_CONFIG=${KRB5CONFIG} GTK2_CONFIGURE_WITH= gtk2 GTK3_CONFIGURE_WITH= gtk3 QT5_CONFIGURE_WITH= qt LUA_CONFIGURE_WITH= lua RTP_CONFIGURE_WITH= portaudio SNMP_CONFIGURE_WITH= libsmi ADNS_CONFIGURE_WITH= adns CARES_CONFIGURE_WITH= c-ares GEOIP_CONFIGURE_WITH= geoip GCRYPT_CONFIGURE_WITH= gcrypt GNUTLS_CONFIGURE_WITH= gnutls LUA_CPPFLAGS= -I${LUA_INCDIR} QT5_MAKE_ENV= PATH="${PATH}:${QT_BINDIR}" QT5_VARS= PKGNAMESUFFIX=-qt5 QT5_PLIST_SUB= GUI_GTK="@comment " GTK2_PLIST_SUB= GUI_GTK="" GTK3_PLIST_SUB= GUI_GTK="" OPTIONS_SUB= LUA .include .if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \ empty(PORT_OPTIONS:MQT5) CONFIGURE_ARGS+= --disable-wireshark PLIST_SUB+= GUI="@comment " .else USES+= desktop-file-utils shared-mime-info INSTALLS_ICONS= yes PLIST_SUB+= GUI="" .endif .if ${PORT_OPTIONS:MKRB_BASE} && exists(${LOCALBASE}/include/krb5.h) IGNORE= cannot build with base Kerberos if krb5 port is installed. \ Use ``make config'' to choose a different option .endif .if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \ ${PORT_OPTIONS:MRTP} IGNORE= the RTP support requires GTK+ frontend .endif post-patch: @${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g ; \ s|-DQT_GUI_LIB|-DQT_GUI_LIB $$CPPFLAGS| ' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/share/applications|${DESKTOPDIR}|g ; \ s|/usr/share|${LOCALBASE}/share|g ; \ s|{mime/packages,applications}|mime/packages| ; \ s|{apps,mimetypes}|apps $$(DESTDIR)${LOCALBASE}/share/icons/hicolor/$$$${size}x$$$${size}/mimetypes|' \ ${WRKSRC}/Makefile.in .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-gtk \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .endif .include Index: head/net-im/climm/Makefile =================================================================== --- head/net-im/climm/Makefile (revision 411989) +++ head/net-im/climm/Makefile (revision 411990) @@ -1,90 +1,90 @@ # Created by: mph # $FreeBSD$ PORTNAME= climm PORTVERSION= 0.7.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-im MASTER_SITES= http://www.climm.org/source/ \ http://http.bg.climm.org/source/ EXTRACT_SUFX= .tgz MAINTAINER= johans@FreeBSD.org COMMENT= CLI-based Multi-Messenger USES= gmake pkgconfig GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= ICONV P2P TCL OTR REMOTE XMPP DOCS OPTIONS_DEFAULT=ICONV P2P TCL OTR REMOTE P2P_DESC= Enable Peer2peer connection support OTR_DESC= Enable OTR encryption support REMOTE_DESC= Enable Remote control fifo support XMPP_DESC= Enable XMPP Jabber support .include .if ${PORT_OPTIONS:MOTR} CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-otr LIB_DEPENDS+= libotr.so.2:${PORTSDIR}/security/libotr3 .else CONFIGURE_ARGS+= --disable-otr .endif .if ${PORT_OPTIONS:MICONV} USES+= iconv .else CONFIGURE_ARGS+= --disable-iconv .endif .if ${PORT_OPTIONS:MP2P} CONFIGURE_ARGS+= --enable-peer2peer .else CONFIGURE_ARGS+= --disable-peer2peer .endif .if ${PORT_OPTIONS:MTCL} USES+= tcl .else CONFIGURE_ARGS+= --disable-tcl .endif .if ${PORT_OPTIONS:MREMOTE} CONFIGURE_ARGS+= --enable-remote .else CONFIGURE_ARGS+= --disable-remote .endif .if ${PORT_OPTIONS:MXMPP} CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-xmpp --enable-ssl=gnutls \ --with-libgcrypt-prefix=${LOCALBASE} CONFIGURE_ENV+= LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkgconf gnutls" LIB_DEPENDS+= libiksemel.so:${PORTSDIR}/textproc/iksemel \ libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgpg-error.so:${PORTSDIR}/security/libgpg-error .else USE_OPENSSL= yes CONFIGURE_ARGS+= --disable-xmpp --enable-ssl=openssl .endif post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/ doc//' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '/^noinst_LIBRARIES/d' ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e '/ac_lib/s/tcl8\./tcl8/g' \ -e '/libgnutls_config_version=/s/--version/--modversion/' \ ${WRKSRC}/configure post-install: ${INSTALL_MAN} ${WRKSRC}/doc/climm.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/climmrc.5 ${STAGEDIR}${PREFIX}/man/man5 ${INSTALL_MAN} ${WRKSRC}/doc/climmcmds.7 ${STAGEDIR}${PREFIX}/man/man7 @${MKDIR} ${STAGEDIR}${DOCSDIR} .for ext in i18n logformat png txt xpm ${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/net-im/empathy/Makefile =================================================================== --- head/net-im/empathy/Makefile (revision 411989) +++ head/net-im/empathy/Makefile (revision 411990) @@ -1,91 +1,92 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= empathy PORTVERSION= 3.12.11 +PORTREVISION= 1 CATEGORIES= net-im gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME IM client based around telepathy BUILD_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \ ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \ geoclue>=0:${PORTSDIR}/net/geoclue \ itstool:${PORTSDIR}/textproc/itstool \ mc-tool:${PORTSDIR}/net-im/telepathy-mission-control LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \ libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \ libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \ libpulse.so:${PORTSDIR}/audio/pulseaudio \ libtelepathy.so:${PORTSDIR}/net-im/libtelepathy \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libtelepathy-farstream.so:${PORTSDIR}/net-im/telepathy-farstream \ libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \ libfolks-telepathy.so:${PORTSDIR}/net-im/folks \ libnotify.so:${PORTSDIR}/devel/libnotify \ libgcr-3.so:${PORTSDIR}/security/gcr \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \ libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \ ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \ geoclue>=0:${PORTSDIR}/net/geoclue \ mc-tool:${PORTSDIR}/net-im/telepathy-mission-control USES= gettext gmake gnome libtool pathfix pkgconfig python tar:xz USE_GNOME= evolutiondataserver3 intlhack USE_GSTREAMER1= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes MAKE_JOBS_UNSAFE= YES GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-Werror \ --enable-goa \ --enable-gst-1.0=yes \ --enable-location=yes INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml \ org.gnome.telepathy-account-widgets.gschema.xml OPTIONS_SUB= yes OPTIONS_DEFINE= JABBER MSN IRC SALUT HAZE MAP CHEESE OPTIONS_DEFAULT=JABBER MSN IRC SALUT MAP JABBER_DESC= Enable jabber (XMPP) client support MSN_DESC= Enable MSN client support IRC_DESC= Enable IRC client support SALUT_DESC= Enable link-local (serverless) XMPP support HAZE_DESC= Enable libpurple protocol integration MAP_DESC= Enable graphical map support CHEESE_DESC= Enable cheese camera support JABBER_RUN_DEPENDS= ${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble MSN_RUN_DEPENDS= ${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly IRC_RUN_DEPENDS= ${LOCALBASE}/libexec/telepathy-idle:${PORTSDIR}/net-im/telepathy-idle SALUT_RUN_DEPENDS= ${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut HAZE_RUN_DEPENDS= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze MAP_USE= GL=gl MAP_LIB_DEPENDS= libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain MAP_CONFIGURE_ENABLE= map CHEESE_BUILD_DEPENDS= cheese>=0:${PORTSDIR}/multimedia/cheese CHEESE_RUN_DEPENDS= cheese>=0:${PORTSDIR}/multimedia/cheese CHEESE_CONFIGURE_WITH= cheese PLIST_SUB= PORTVERSION=${PORTVERSION} post-patch: @${REINPLACE_CMD} -e 's|clutter-gst-1.0|clutter-gst-2.0|g ;\ s|MISSION_CONTROL_PLUGINS_DIR=`pkg-config -|MISSION_CONTROL_PLUGINS_DIR=$${libdir}/`pkg-config -|g' \ ${WRKSRC}/configure # workaround wierd bug that happened in 3.12.11. post-install: @${MV} ${STAGEDIR}/mission-control-plugins.0 \ ${STAGEDIR}${PREFIX}/lib/ .include Index: head/net-im/gloox/Makefile =================================================================== --- head/net-im/gloox/Makefile (revision 411989) +++ head/net-im/gloox/Makefile (revision 411990) @@ -1,41 +1,42 @@ # Created by: trasz # $FreeBSD$ PORTNAME= gloox PORTVERSION= 1.0.14 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://camaya.net/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Jabber/XMPP client library LICENSE= GPLv3 #LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \ libgnutls.so:${PORTSDIR}/security/gnutls USES= libtool pathfix pkgconfig tar:bzip2 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PORTSCOUT= skipv:1.0.x OPTIONS_DEFINE= MDNSRESPONDER MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/mDNSResponder MDNSRESPONDER_CONFIGURE_ENABLE= mdns post-patch: @${REINPLACE_CMD} -e \ 's| -ansi|| ; \ s|\(enable_mdns=\)yes|\1$$enableval|' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's| -pedantic|| ; \ s| -pipe||' .include Index: head/net-im/jabber/Makefile =================================================================== --- head/net-im/jabber/Makefile (revision 411989) +++ head/net-im/jabber/Makefile (revision 411990) @@ -1,119 +1,119 @@ # Created by: joe # $FreeBSD$ PORTNAME= jabber PORTVERSION= 1.6.1.1 -PORTREVISION= 18 +PORTREVISION= 19 PORTEPOCH= 1 CATEGORIES= net-im ipv6 MASTER_SITES= http://download.jabberd.org/jabberd14/%SUBDIR%/ MASTER_SITE_SUBDIR= . old DISTNAME= jabberd14-${PORTVERSION} DIST_SUBDIR= jabber MAINTAINER= ports@FreeBSD.org COMMENT= XMPP/Jabber server daemon LICENSE= GPLv2 LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \ libpth.so:${PORTSDIR}/devel/pth-hard \ libidn.so:${PORTSDIR}/dns/libidn \ libgnutls.so:${PORTSDIR}/security/gnutls \ libexpat.so:${PORTSDIR}/textproc/expat2 OPTIONS_DEFINE= IPV6 MYSQL PGSQL DOCS GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= gettext gmake iconv libtool pkgconfig USE_RC_SUBR= jabber CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${JABBER_ETCDIR} \ --includedir=${PREFIX}/include/jabber \ --libdir=${PREFIX}/lib/jabber USE_LDCONFIG= ${PREFIX}/lib/jabber MAKE_JOBS_UNSAFE= yes CPPFLAGS+= $$(pth-config --cflags) \ -I${LOCALBASE}/include LDFLAGS+= $$(pth-config --ldflags) \ -L${LOCALBASE}/lib SUB_FILES= pkg-message SUB_LIST= JABBER_USER=${JABBER_USER} \ JABBER_GROUP=${JABBER_GROUP} \ JABBER_ETCDIR="${JABBER_ETCDIR}" \ JABBER_LOGDIR="${JABBER_LOGDIR}" \ JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \ JABBER_RUNDIR="${JABBER_RUNDIR}" PLIST_SUB= JABBER_USER=${JABBER_USER} \ JABBER_GROUP=${JABBER_GROUP} \ JABBER_LOGDIR="${JABBER_LOGDIR}" \ JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \ JABBER_RUNDIR="${JABBER_RUNDIR}" USERS= ${JABBER_USER} GROUPS= ${JABBER_GROUP} JABBER_USER= jabber JABBER_GROUP= jabber JABBER_ETCDIR= ${PREFIX}/etc JABBER_RUNDIR= /var/run/jabberd JABBER_SPOOLDIR=/var/spool/jabberd JABBER_LOGDIR= /var/log/jabberd .include .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} .endif .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif .if exists(${LOCALBASE}/include/pth/pthread.h) IGNORE= pth with soft syscalls is installed, please reinstall pth from devel/pth-hard .endif post-patch: @${REINPLACE_CMD} -e \ 's|\\\$$(localstatedir)/log/jabberd|${JABBER_LOGDIR}|g ; \ s|\\\$$(localstatedir)/spool/jabberd|${JABBER_SPOOLDIR}| ; \ s|\\\$$(localstatedir)/run/jabberd|${JABBER_RUNDIR}|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|@localstatedir@/log/jabberd|${JABBER_LOGDIR}|g ; \ s|@localstatedir@/spool/jabberd|${JABBER_SPOOLDIR}|g ; \ s|@localstatedir@/run/jabberd|${JABBER_RUNDIR}|g' \ ${WRKSRC}/jabber.xml.dist.in @${REINPLACE_CMD} -e \ '//s|^|//| ; \ /gcry_control/s|^|//|' \ ${WRKSRC}/jabberd/gcrypt_init.c @${REINPLACE_CMD} -e \ 's|locale, LOCALEDIR)|locale)|' \ ${WRKSRC}/jabberd/lib/messages.cc @${REINPLACE_CMD} -e \ 's|"$(localedir)|"$$(DESTDIR)$(localedir)|' \ ${WRKSRC}/po/Makefile.in @${LN} -s jabberd.8.in ${WRKSRC}/man/jabberd14.8.in post-install: @${TOUCH} ${STAGEDIR}${PREFIX}/include/jabber/platform-settings (cd ${WRKSRC} && ${INSTALL_DATA} jabber.xml.dist \ ${STAGEDIR}${PREFIX}/etc/jabber.xml.sample) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog INSTALL NEWS README README.SQL README.config \ README.filespool README.karma README.protocols TODO UPGRADE mysql.sql (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor .include Index: head/net-im/jabber/files/patch-jabberd-mio_tls.cc =================================================================== --- head/net-im/jabber/files/patch-jabberd-mio_tls.cc (revision 411989) +++ head/net-im/jabber/files/patch-jabberd-mio_tls.cc (revision 411990) @@ -1,155 +1,236 @@ ---- jabberd/mio_tls.cc.orig 2008-03-06 10:21:01.669677189 +0100 -+++ jabberd/mio_tls.cc 2008-03-06 10:35:04.744064592 +0100 +--- jabberd/mio_tls.cc.orig 2007-07-16 23:20:44 UTC ++++ jabberd/mio_tls.cc @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include -@@ -612,7 +611,7 @@ +@@ -612,7 +611,7 @@ static void mio_tls_process_credentials( } // load OpenPGP key/certificate - ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); + ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64); if (ret < 0) { log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret)); continue; -@@ -631,7 +630,7 @@ +@@ -631,7 +630,7 @@ static void mio_tls_process_credentials( } // load the OpenPGP keyring - ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); + ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64); if (ret < 0) { log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret)); continue; -@@ -640,23 +639,6 @@ +@@ -640,23 +639,6 @@ static void mio_tls_process_credentials( continue; } - // load GnuPG trustdb - if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) { - char const *const file = xmlnode_get_data(cur); - - if (file == NULL) { - log_warn(NULL, "Initializing TLS subsystem: element inside the TLS configuration, that does not contain a file-name."); - continue; - } - - // load the GnuPG trustdb - ret = gnutls_certificate_set_openpgp_trustdb(current_credentials, file); - if (ret < 0) { - log_error(NULL, "Error loading GnuPG trustdb %s: %s", file, gnutls_strerror(ret)); - continue; - } - } - // setup protocols to use if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) { char const *const protocols_data = xmlnode_get_data(cur); -@@ -916,7 +898,7 @@ +@@ -916,7 +898,7 @@ bool mio_tls_early_init() { /* load asn1 tree to be used by libtasn1 */ ret = asn1_array2tree(subjectAltName_asn1_tab, &mio_tls_asn1_tree, NULL); if (ret != ASN1_SUCCESS) { - std::cerr << "Error preparing the libtasn1 library: " << libtasn1_strerror(ret) << std::endl; + std::cerr << "Error preparing the libtasn1 library: " << asn1_strerror(ret) << std::endl; return false; /* XXX we have to delete the structure on shutdown using asn1_delete_structure(&mio_tls_asn1_tree) */ } -@@ -1498,7 +1480,6 @@ +@@ -1302,80 +1284,32 @@ int mio_ssl_starttls(mio m, int originat + + // overwrite protocol priorities? + if (mio_tls_protocols.find(identity) != mio_tls_protocols.end()) { +- ret = gnutls_protocol_set_priority(session, mio_tls_protocols[identity]); +- if (ret < 0) { +- log_notice(identity, "error setting protocol priority: %s", gnutls_strerror(ret)); +- } + } else if (mio_tls_protocols.find("*") != mio_tls_protocols.end()) { +- ret = gnutls_protocol_set_priority(session, mio_tls_protocols["*"]); +- if (ret < 0) { +- log_notice(identity, "error setting protocol priority: %s", gnutls_strerror(ret)); +- } + } + + // overwrite kx algorithm priorities? + if (mio_tls_kx.find(identity) != mio_tls_kx.end()) { +- ret = gnutls_kx_set_priority(session, mio_tls_kx[identity]); +- if (ret < 0) { +- log_notice(identity, "error setting kx algorithm priority: %s", gnutls_strerror(ret)); +- } + } else if (mio_tls_kx.find("*") != mio_tls_kx.end()) { +- ret = gnutls_kx_set_priority(session, mio_tls_kx["*"]); +- if (ret < 0) { +- log_notice(identity, "error setting kx algorithm priority: %s", gnutls_strerror(ret)); +- } + } + + // overwrite cipher priorities? + if (mio_tls_ciphers.find(identity) != mio_tls_ciphers.end()) { +- ret = gnutls_cipher_set_priority(session, mio_tls_ciphers[identity]); +- if (ret < 0) { +- log_notice(identity, "error setting cipher algorithm priority: %s", gnutls_strerror(ret)); +- } + } else if (mio_tls_ciphers.find("*") != mio_tls_ciphers.end()) { +- ret = gnutls_cipher_set_priority(session, mio_tls_ciphers["*"]); +- if (ret < 0) { +- log_notice(identity, "error setting cipher algorithm priority: %s", gnutls_strerror(ret)); +- } + } + + // overwrite certificate priorities? + if (mio_tls_certtypes.find(identity) != mio_tls_certtypes.end()) { +- ret = gnutls_certificate_type_set_priority(session, mio_tls_certtypes[identity]); +- if (ret < 0) { +- log_notice(identity, "error setting certificate priorities: %s", gnutls_strerror(ret)); +- } + } else if (mio_tls_certtypes.find("*") != mio_tls_certtypes.end()) { +- ret = gnutls_certificate_type_set_priority(session, mio_tls_certtypes["*"]); +- if (ret < 0) { +- log_notice(identity, "error setting certificate priorities: %s", gnutls_strerror(ret)); +- } + } + + // overwrite mac algorithm priorities? + if (mio_tls_mac.find(identity) != mio_tls_mac.end()) { +- ret = gnutls_mac_set_priority(session, mio_tls_mac[identity]); +- if (ret < 0) { +- log_notice(identity, "error setting mac algorithm priorities: %s", gnutls_strerror(ret)); +- } + } else if (mio_tls_mac.find("*") != mio_tls_mac.end()) { +- ret = gnutls_mac_set_priority(session, mio_tls_mac["*"]); +- if (ret < 0) { +- log_notice(identity, "error setting mac algorithm priorities: %s", gnutls_strerror(ret)); +- } + } + + // overwrite compression algorithm priorities? + if (mio_tls_compression.find(identity) != mio_tls_compression.end()) { +- ret = gnutls_compression_set_priority(session, mio_tls_compression[identity]); +- if (ret < 0) { +- log_notice(identity, "error setting compression algorithm priorities: %s", gnutls_strerror(ret)); +- } + } else if (mio_tls_compression.find("*") != mio_tls_compression.end()) { +- ret = gnutls_compression_set_priority(session, mio_tls_compression["*"]); +- if (ret < 0) { +- log_notice(identity, "error setting compression algorithm priorities: %s", gnutls_strerror(ret)); +- } + } + + /* setting certificate credentials */ +@@ -1498,7 +1432,6 @@ static int mio_tls_check_openpgp(mio m, const gnutls_datum_t *cert_list = NULL; unsigned int cert_list_size = 0; -#ifdef HAVE_GNUTLS_EXTRA // get the certificate (it's only a single one for OpenPGP) cert_list = gnutls_certificate_get_peers(static_cast(m->ssl), &cert_list_size); if (cert_list == NULL || cert_list_size <= 0) { -@@ -1566,7 +1547,6 @@ +@@ -1566,7 +1499,6 @@ static int mio_tls_check_openpgp(mio m, // free memory gnutls_openpgp_key_deinit(pgpkey); pool_free(jidpool); -#endif return 0; } -@@ -1684,14 +1664,14 @@ +@@ -1684,14 +1616,14 @@ static int mio_tls_check_x509(mio m, cha /* init subjectAltName_element */ ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.SubjectAltName", &subjectAltName_element); if (ret != ASN1_SUCCESS) { - log_warn(log_id.c_str(), "error creating asn1 element for PKIX1.SubjectAltName: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str()); + log_warn(log_id.c_str(), "error creating asn1 element for PKIX1.SubjectAltName: %s (%s)", asn1_strerror(ret), cert_subject.c_str()); break; } /* decode the extension */ ret = asn1_der_decoding(&subjectAltName_element, subjectAltName, subjectAltName_size, NULL); if (ret != ASN1_SUCCESS) { - log_warn(log_id.c_str(), "error DER decoding subjectAltName extension: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str()); + log_warn(log_id.c_str(), "error DER decoding subjectAltName extension: %s (%s)", asn1_strerror(ret), cert_subject.c_str()); asn1_delete_structure(&subjectAltName_element); break; } -@@ -1712,7 +1692,7 @@ +@@ -1712,7 +1644,7 @@ static int mio_tls_check_x509(mio m, cha break; } if (ret != ASN1_SUCCESS) { - log_notice(log_id.c_str(), "error accessing type for %s in subjectAltName: %s (%s)", cnt_string, libtasn1_strerror(ret), cert_subject.c_str()); + log_notice(log_id.c_str(), "error accessing type for %s in subjectAltName: %s (%s)", cnt_string, asn1_strerror(ret), cert_subject.c_str()); break; } -@@ -1732,7 +1712,7 @@ +@@ -1732,7 +1664,7 @@ static int mio_tls_check_x509(mio m, cha ret = asn1_read_value(subjectAltName_element, access_string, dNSName, &dNSName_len); if (ret != ASN1_SUCCESS) { - log_notice(log_id.c_str(), "error accessing %s in subjectAltName: %s (%s)", access_string, libtasn1_strerror(ret), cert_subject.c_str()); + log_notice(log_id.c_str(), "error accessing %s in subjectAltName: %s (%s)", access_string, asn1_strerror(ret), cert_subject.c_str()); break; } -@@ -1772,7 +1752,7 @@ +@@ -1772,7 +1704,7 @@ static int mio_tls_check_x509(mio m, cha /* get the OID of the otherName */ ret = asn1_read_value(subjectAltName_element, access_string_type, otherNameType, &otherNameType_len); if (ret != ASN1_SUCCESS) { - log_notice(log_id.c_str(), "error accessing type information %s in subjectAltName: %s (%s)", access_string_type, libtasn1_strerror(ret), cert_subject.c_str()); + log_notice(log_id.c_str(), "error accessing type information %s in subjectAltName: %s (%s)", access_string_type, asn1_strerror(ret), cert_subject.c_str()); break; } -@@ -1785,7 +1765,7 @@ +@@ -1785,7 +1717,7 @@ static int mio_tls_check_x509(mio m, cha /* get the value of the otherName */ ret = asn1_read_value(subjectAltName_element, access_string_value, otherNameValue, &otherNameValue_len); if (ret != ASN1_SUCCESS) { - log_notice(log_id.c_str(), "error accessing value of othername %s in subjectAltName: %s (%s)", access_string_value, libtasn1_strerror(ret), cert_subject.c_str()); + log_notice(log_id.c_str(), "error accessing value of othername %s in subjectAltName: %s (%s)", access_string_value, asn1_strerror(ret), cert_subject.c_str()); break; } -@@ -1799,21 +1779,21 @@ +@@ -1799,21 +1731,21 @@ static int mio_tls_check_x509(mio m, cha ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.DirectoryString", &directoryString_element); if (ret != ASN1_SUCCESS) { - log_notice(log_id.c_str(), "error creating DirectoryString element: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str()); + log_notice(log_id.c_str(), "error creating DirectoryString element: %s (%s)", asn1_strerror(ret), cert_subject.c_str()); asn1_delete_structure(&directoryString_element); break; } ret = asn1_der_decoding(&directoryString_element, otherNameValue, otherNameValue_len, NULL); if (ret != ASN1_SUCCESS) { - log_notice(log_id.c_str(), "error decoding DirectoryString: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str()); + log_notice(log_id.c_str(), "error decoding DirectoryString: %s (%s)", asn1_strerror(ret), cert_subject.c_str()); asn1_delete_structure(&directoryString_element); break; } ret = asn1_read_value(directoryString_element, "utf8String", thisIdOnXMPPaddr, &thisIdOnXMPPaddr_len); if (ret != ASN1_SUCCESS) { - log_notice(log_id.c_str(), "error accessing utf8String of DirectoryString: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str()); + log_notice(log_id.c_str(), "error accessing utf8String of DirectoryString: %s (%s)", asn1_strerror(ret), cert_subject.c_str()); asn1_delete_structure(&directoryString_element); break; } Index: head/net-im/libpurple/Makefile =================================================================== --- head/net-im/libpurple/Makefile (revision 411989) +++ head/net-im/libpurple/Makefile (revision 411990) @@ -1,340 +1,340 @@ # Created by: Jim Mock # $FreeBSD$ PORTNAME?= libpurple PORTVERSION= 2.10.12 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= net-im MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION} DISTNAME= pidgin-${PORTVERSION} MAINTAINER?= marcus@FreeBSD.org COMMENT?= Backend library for the Pidgin multi-protocol messaging client USES= cpe gettext gmake libtool pathfix pkgconfig tar:bzip2 USE_GNOME?= gnomeprefix intltool glib20 libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS?=--disable-gtkui \ --disable-consoleui \ --with-dynamic-prpls=${PRPL_MODULES:S/,$//} \ --enable-static \ --disable-nm CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .if !defined(PIDGIN_SLAVE) # Pidgin slave ports that require the following functionality, must explicitly # set these macros themselves. USES+= iconv python USE_LDCONFIG= yes WANT_GNOME= yes .if defined(PACKAGE_BUILDING) .undef WITHOUT_GNOME WITH_GNOME= yes .endif .endif PRPL_MODULES= CPE_VENDOR= pidgin OPTIONS_DEFINE= BONJOUR DBUS GNUTLS NSS SASL GSTREAMER VV IDN PERL TCLTK \ SAMETIME SILC GG IRC JABBER MSN MYSPACE NOVELL OSCAR QQ \ SIMPLE YAHOO ZEPHYR OPTIONS_DEFAULT= BONJOUR DBUS NSS GSTREAMER VV IDN GG IRC JABBER MSN \ MYSPACE NOVELL OSCAR QQ SIMPLE YAHOO ZEPHYR BONJOUR_DESC= mDNS support GNUTLS_DESC= Use GNUTLS for encryption support NSS_DESC= Use Mozilla NSS for encryption support SASL_DESC= Cyrus SASL support (for jabberd) GSTREAMER_DESC= Use GStreamer for playing sounds VV_DESC= Video and voice support SAMETIME_DESC= The Lotus Sametime chat protocol SILC_DESC= The Secure Internet Live Conferencing protocol GG_DESC= The Gadu-Gadu chat protocol IRC_DESC= The Internet Relay Chat protocol JABBER_DESC= The Jabber/XMPP/Google Talk protocol MSN_DESC= The MSN Messenger protocol MYSPACE_DESC= The MySpaceIM protocol NOVELL_DESC= The Novell GroupWise chat protocol OSCAR_DESC= The AIM/ICQ/Oscar protocol QQ_DESC= The Tercent QQ chat protocol SIMPLE_DESC= The SIMPLE chat protocol YAHOO_DESC= The Yahoo! Messenger protocol ZEPHYR_DESC= The Zephyr chat protocol .if defined(WITH_GTKUI) OPTIONS_DEFINE+= GTKSPELL CAP OPTIONS_DEFAULT+= GTKSPELL CAP GTKSPELL_DESC= Spell checking support CAP_DESC= Contact Availability Prediction plugin PLIST_SUB+= GTKUI="" .else PLIST_SUB+= GTKUI="@comment not installed: " .endif .if defined(WITH_CONSOLEUI) OPTIONS_DEFINE+=NCURSES NCURSES_DESC= Build with ncurses from ports PLIST_SUB+= CONSOLEUI="" .else PLIST_SUB+= CONSOLEUI="@comment not installed: " .endif CONFIGURE_ARGS+=--disable-doxygen .include .if ${PORT_OPTIONS:MTCLTK} USES+= tk CFLAGS+= -I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR} CONFIGURE_ARGS+= --with-tclconfig=${TCL_LIBDIR} \ --with-tkconfig=${TK_LIBDIR} PLIST_SUB+= TCL:="" .else CONFIGURE_ARGS+= --disable-tcl PLIST_SUB+= TCL:="@comment not installed: " .endif .if ${PORT_OPTIONS:MNCURSES} USES+= ncurses:port CONFIGURE_ARGS+=--with-ncurses-headers=${LOCALBASE}/include/ncurses/ .else USES+= ncurses .endif .if ${PORT_OPTIONS:MPERL} USES+= perl5 CONFIGURE_ARGS+= --with-perl-lib=site PLIST_SUB+= PERL:="" .if !defined(PIDGIN_SLAVE) || defined(WITH_GTKUI) PLIST_SUB+= PERLMAN:="" .else PLIST_SUB+= PERLMAN:="@comment not installed: " .endif .else CONFIGURE_ARGS+= --disable-perl PLIST_SUB+= PERL:="@comment not installed: " \ PERLMAN:="@comment not installed: " .endif .if !defined(PIDGIN_SLAVE) USE_GNOME+= gconf2 GCONF_SCHEMAS= purple.schemas .endif #.if defined(WITH_GTKUI) && ${HAVE_GNOME:Mevolutiondataserver}!="" #USE_GNOME+= evolutiondataserver #PLIST_SUB+= EVO="" #CONFIGURE_ARGS+= --enable-gevolution #.else CONFIGURE_ARGS+= --disable-gevolution PLIST_SUB+= EVO="@comment not installed: " #.endif .if ${PORT_OPTIONS:MGSTREAMER} USE_GSTREAMER+= core good .else CONFIGURE_ARGS+=--disable-gstreamer .endif .if ${PORT_OPTIONS:MVV} && ${PORT_OPTIONS:MGSTREAMER} LIB_DEPENDS+= libfarstream-0.2.so:${PORTSDIR}/net-im/farstream USE_GSTREAMER+= v4l2 PLIST_SUB+= VV="" .else CONFIGURE_ARGS+=--disable-vv PLIST_SUB+= VV="@comment " .endif .if ${PORT_OPTIONS:MIDN} LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn .else CONFIGURE_ARGS+=--disable-idn .endif .if ${PORT_OPTIONS:MCAP} LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+=--enable-cap PLIST_SUB+= CAP="" .else CONFIGURE_ARGS+=--disable-cap PLIST_SUB+= CAP="@comment not installed: " .endif .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --enable-gnutls=yes PLIST_SUB+= GNUTLS="" .else CONFIGURE_ARGS+= --enable-gnutls=no PLIST_SUB+= GNUTLS="@comment " .endif .if ${PORT_OPTIONS:MNSS} LIB_DEPENDS+= libnss3.so:${PORTSDIR}/security/nss CONFIGURE_ARGS+= --enable-nss=yes \ --with-nspr-includes=${LOCALBASE}/include/nspr \ --with-nspr-libs=${LOCALBASE}/lib \ --with-nss-includes=${LOCALBASE}/include/nss/nss \ --with-nss-libs=${LOCALBASE}/lib/nss PLIST_SUB+= NSS="" .else CONFIGURE_ARGS+= --enable-nss=no PLIST_SUB+= NSS="@comment " .endif .if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --enable-cyrus-sasl .endif .if ${PORT_OPTIONS:MBONJOUR} LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app PLIST_SUB+= BONJOUR="" PRPL_MODULES:= bonjour,${PRPL_MODULES} .else CONFIGURE_ARGS+=--disable-avahi PLIST_SUB+= BONJOUR="@comment not installed: " .endif .if ${PORT_OPTIONS:MGTKSPELL} LIB_DEPENDS+= libgtkspell.so:${PORTSDIR}/textproc/gtkspell .else CONFIGURE_ARGS+= --disable-gtkspell .endif .if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib .if !defined(PIDGIN_SLAVE) RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus .endif CONFIGURE_ARGS+= --enable-dbus PLIST_SUB+= DBUS="" .else CONFIGURE_ARGS+= --disable-dbus PLIST_SUB+= DBUS="@comment not installed: " .endif .if ${PORT_OPTIONS:MSAMETIME} LIB_DEPENDS+= libmeanwhile.so:${PORTSDIR}/net-im/meanwhile PLIST_SUB+= SAMETIME="" PRPL_MODULES:= sametime,${PRPL_MODULES} .else PLIST_SUB+= SAMETIME="@comment not installed: " CONFIGURE_ARGS+=--disable-meanwhile .endif .if ${PORT_OPTIONS:MSILC} LIB_DEPENDS+= libsilcclient.so:${PORTSDIR}/devel/silc-toolkit CONFIGURE_ARGS+= --with-silc-includes=${LOCALBASE}/include/silc \ --with-silc-libs=${LOCALBASE}/lib PLIST_SUB+= SILC="" PRPL_MODULES:= silc,${PRPL_MODULES} .else PLIST_SUB+= SILC="@comment not installed: " .endif .if ${PORT_OPTIONS:MGG} PLIST_SUB+= GG="" PRPL_MODULES:= gg,${PRPL_MODULES} .else PLIST_SUB+= GG="@comment not installed: " .endif .if ${PORT_OPTIONS:MIRC} PLIST_SUB+= IRC="" PRPL_MODULES:= irc,${PRPL_MODULES} .else PLIST_SUB+= IRC="@comment not installed: " .endif .if ${PORT_OPTIONS:MJABBER} PLIST_SUB+= JABBER="" PRPL_MODULES:= jabber,${PRPL_MODULES} .else PLIST_SUB+= JABBER="@comment not installed: " .endif .if ${PORT_OPTIONS:MMSN} PLIST_SUB+= MSN="" PRPL_MODULES:= msn,${PRPL_MODULES} .else PLIST_SUB+= MSN="@comment not installed: " .endif .if ${PORT_OPTIONS:MMYSPACE} PLIST_SUB+= MYSPACE="" PRPL_MODULES:= myspace,${PRPL_MODULES} .else PLIST_SUB+= MYSPACE="@comment not installed: " .endif .if ${PORT_OPTIONS:MNOVELL} PLIST_SUB+= NOVELL="" PRPL_MODULES:= novell,${PRPL_MODULES} .else PLIST_SUB+= NOVELL="@comment not installed: " .endif .if ${PORT_OPTIONS:MOSCAR} PLIST_SUB+= OSCAR="" PRPL_MODULES:= oscar,${PRPL_MODULES} .else PLIST_SUB+= OSCAR="@comment not installed: " .endif #.if ${PORT_OPTIONS:MQQ} #PLIST_SUB+= QQ="" #PRPL_MODULES:= qq,${PRPL_MODULES} #.else #PLIST_SUB+= QQ="@comment not installed: " #.endif .if ${PORT_OPTIONS:MSIMPLE} PLIST_SUB+= SIMPLE="" PRPL_MODULES:= simple,${PRPL_MODULES} .else PLIST_SUB+= SIMPLE="@comment not installed: " .endif .if ${PORT_OPTIONS:MYAHOO} PLIST_SUB+= YAHOO="" PRPL_MODULES:= yahoo,${PRPL_MODULES} .else PLIST_SUB+= YAHOO="@comment not installed: " .endif .if ${PORT_OPTIONS:MZEPHYR} PLIST_SUB+= ZEPHYR="" PRPL_MODULES:= zephyr,${PRPL_MODULES} .else PLIST_SUB+= ZEPHYR="@comment not installed: " .endif pre-everything:: .if ! ${PORT_OPTIONS:MGNUTLS} && ! ${PORT_OPTIONS:MNSS} @${ECHO_MSG} "WARNING: In order to use MSN, you must enable the GNUTLS and/or NSS options." .endif post-patch: @${REINPLACE_CMD} \ -e 's|-lpthread $$LIBDL|-lpthread ${ICONV_LIB}|' \ ${WRKSRC}/configure .if defined(PIDGIN_SLAVE) @${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|' @${REINPLACE_CMD} -e 's|gconftool-2|gconftool-disabled|g' \ ${WRKSRC}/configure .endif .if !defined(PIDGIN_SLAVE) && ${PORT_OPTIONS:MPERL} post-stage: @${SED} -i '' -e 's|^${STAGEDIR}||g' \ ${STAGEDIR}${PREFIX}/lib/purple-2/perl/auto/Purple/.packlist .endif .include Index: head/net-im/licq-jabber/Makefile =================================================================== --- head/net-im/licq-jabber/Makefile (revision 411989) +++ head/net-im/licq-jabber/Makefile (revision 411990) @@ -1,37 +1,37 @@ # $FreeBSD$ PORTNAME= jabber PORTVERSION= 1.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MAINTAINER= dinoex@FreeBSD.org COMMENT= Jabber (XMPP) plugin for Licq LICENSE= GPLv2 LIB_DEPENDS= libgloox.so:${PORTSDIR}/net-im/gloox \ libboost_regex.so:${PORTSDIR}/devel/boost-libs USES= cmake pkgconfig DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} DOCFILES= README PLIST_FILES= lib/licq/protocol_jabber.so \ %%PORTDOCS%%%%DOCSDIR%%/README LICQ_PORT?= net-im/licq OPTIONS_DEFINE= DOCS .include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" .if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif .include Index: head/net-im/loudmouth/files/patch-configure =================================================================== --- head/net-im/loudmouth/files/patch-configure (revision 411989) +++ head/net-im/loudmouth/files/patch-configure (nonexistent) @@ -1,28 +0,0 @@ ---- configure.orig 2009-08-17 03:50:55.000000000 -0400 -+++ configure 2009-08-17 03:50:59.000000000 -0400 -@@ -21983,12 +21983,14 @@ fi - if test x$libgnutls_config_prefix != x ; then - libgnutls_config_args="$libgnutls_config_args --prefix=$libgnutls_config_prefix" - if test x${LIBGNUTLS_CONFIG+set} != xset ; then -- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config -+ LIBGNUTLS_CONFIG=pkg-config - fi - fi - -+ libgnutls_config_args="$libgnutls_config_args gnutls" -+ - # Extract the first word of "libgnutls-config", so it can be a program name with args. --set dummy libgnutls-config; ac_word=$2 -+set dummy pkg-config; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then -@@ -22037,7 +22039,7 @@ echo $ECHO_N "checking for libgnutls - v - else - LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` - LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` -- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` -+ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion` - - - ac_save_CFLAGS="$CFLAGS" Property changes on: head/net-im/loudmouth/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c =================================================================== --- head/net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c (revision 411989) +++ head/net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c (nonexistent) @@ -1,28 +0,0 @@ ---- loudmouth/lm-ssl-gnutls.c.orig 2010-04-17 15:56:39.000000000 -0400 -+++ loudmouth/lm-ssl-gnutls.c 2010-04-17 15:56:43.000000000 -0400 -@@ -32,7 +32,7 @@ - - #include - --#define CA_PEM_FILE "/etc/ssl/certs/ca-certificates.crt" -+#define CA_PEM_FILE "%%LOCALBASE%%/share/certs/ca-root-nss.crt" - - struct _LmSSL { - LmSSLBase base; -@@ -200,6 +200,7 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons - { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; - const int compression_priority[] = - { GNUTLS_COMP_DEFLATE, GNUTLS_COMP_NULL, 0 }; -+ gnutls_priority_t priorities_cache; - - gnutls_init (&ssl->gnutls_session, GNUTLS_CLIENT); - gnutls_set_default_priority (ssl->gnutls_session); -@@ -213,6 +214,8 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons - - gnutls_transport_set_ptr (ssl->gnutls_session, - (gnutls_transport_ptr_t)(glong) fd); -+ gnutls_priority_init (&priorities_cache, "NONE:+VERS-TLS1.0:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL:NORMAL:%COMPAT", NULL); -+ gnutls_priority_set (ssl->gnutls_session, priorities_cache); - - ret = gnutls_handshake (ssl->gnutls_session); - Property changes on: head/net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/loudmouth/files/patch-loudmouth_lm-error.c =================================================================== --- head/net-im/loudmouth/files/patch-loudmouth_lm-error.c (revision 411989) +++ head/net-im/loudmouth/files/patch-loudmouth_lm-error.c (nonexistent) @@ -1,11 +0,0 @@ ---- loudmouth/lm-error.c.orig 2012-05-22 10:05:29.000000000 +0200 -+++ loudmouth/lm-error.c 2012-05-22 10:05:41.000000000 +0200 -@@ -19,7 +19,7 @@ - */ - - #include --#include -+#include - #include "lm-error.h" - - /** Property changes on: head/net-im/loudmouth/files/patch-loudmouth_lm-error.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/loudmouth/files/patch-loudmouth_Makefile.in =================================================================== --- head/net-im/loudmouth/files/patch-loudmouth_Makefile.in (revision 411989) +++ head/net-im/loudmouth/files/patch-loudmouth_Makefile.in (nonexistent) @@ -1,12 +0,0 @@ ---- loudmouth/Makefile.in.orig 2008-07-06 15:44:25.000000000 -0400 -+++ loudmouth/Makefile.in 2008-07-06 15:43:53.000000000 -0400 -@@ -306,8 +306,7 @@ libloudmouthinclude_HEADERS = \ - - libloudmouth_1_la_LIBADD = \ - $(LOUDMOUTH_LIBS) \ -- $(LIBIDN_LIBS) \ -- -lresolv -+ $(LIBIDN_LIBS) - - libloudmouth_1_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ Property changes on: head/net-im/loudmouth/files/patch-loudmouth_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/loudmouth/Makefile =================================================================== --- head/net-im/loudmouth/Makefile (revision 411989) +++ head/net-im/loudmouth/Makefile (revision 411990) @@ -1,52 +1,45 @@ # Created by: Adam Weinberger # $FreeBSD$ # $MCom: ports/trunk/net-im/loudmouth/Makefile 19914 2014-09-25 22:33:21Z kwm $ PORTNAME= loudmouth -PORTVERSION= 1.4.3 -PORTREVISION= 11 -CATEGORIES= net-im gnome -MASTER_SITES= GNOME +PORTVERSION= 1.5.3 +CATEGORIES= net-im +MASTER_SITES= https://mcabber.com/files/loudmouth/ \ + http://www.lilotux.net/~mikael/mcabber/files/loudmouth/ MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight Jabber client library -LICENSE= GPLv2 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn -USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig tar:bzip2 USE_GNOME= glib20 GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-gtk-doc -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib +CONFIGURE_ARGS= --disable-gtk-doc --disable-rebuilds \ + --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig INSTALL_TARGET= install-strip +OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT=GNUTLS OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= GNUTLS OPENSSL .include .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls -RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -.endif - -.if ${PORT_OPTIONS:MOPENSSL} +CONFIGURE_ARGS+=--with-ssl=gnutls +.elif ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ssl=openssl RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -.endif - -.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} +.else CONFIGURE_ARGS+=--without-ssl .endif - -post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/loudmouth/lm-ssl-gnutls.c .include Index: head/net-im/loudmouth/distinfo =================================================================== --- head/net-im/loudmouth/distinfo (revision 411989) +++ head/net-im/loudmouth/distinfo (revision 411990) @@ -1,2 +1,2 @@ -SHA256 (loudmouth-1.4.3.tar.bz2) = 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3 -SIZE (loudmouth-1.4.3.tar.bz2) = 366818 +SHA256 (loudmouth-1.5.3.tar.bz2) = 54329415cb1bacb783c20f5f1f975de4fc460165d0d8a1e3b789367b5f69d32c +SIZE (loudmouth-1.5.3.tar.bz2) = 375974 Index: head/net-im/loudmouth/pkg-descr =================================================================== --- head/net-im/loudmouth/pkg-descr (revision 411989) +++ head/net-im/loudmouth/pkg-descr (revision 411990) @@ -1,3 +1,5 @@ Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol. It's designed to be easy to get started with and yet extensible to let you do anything the Jabber protocol allows. + +WWW: https://mcabber.com/ Index: head/net-im/loudmouth/pkg-plist =================================================================== --- head/net-im/loudmouth/pkg-plist (revision 411989) +++ head/net-im/loudmouth/pkg-plist (revision 411990) @@ -1,32 +1,34 @@ include/loudmouth-1.0/loudmouth/lm-connection.h include/loudmouth-1.0/loudmouth/lm-error.h include/loudmouth-1.0/loudmouth/lm-message-handler.h include/loudmouth-1.0/loudmouth/lm-message-node.h include/loudmouth-1.0/loudmouth/lm-message.h include/loudmouth-1.0/loudmouth/lm-proxy.h include/loudmouth-1.0/loudmouth/lm-ssl.h include/loudmouth-1.0/loudmouth/lm-utils.h include/loudmouth-1.0/loudmouth/loudmouth.h lib/libloudmouth-1.a lib/libloudmouth-1.so lib/libloudmouth-1.so.0 lib/libloudmouth-1.so.0.1.0 libdata/pkgconfig/loudmouth-1.0.pc -share/gtk-doc/html/loudmouth/ch01.html -share/gtk-doc/html/loudmouth/home.png -share/gtk-doc/html/loudmouth/index.html -share/gtk-doc/html/loudmouth/index.sgml -share/gtk-doc/html/loudmouth/left.png -share/gtk-doc/html/loudmouth/loudmouth-lm-connection.html -share/gtk-doc/html/loudmouth/loudmouth-lm-error.html -share/gtk-doc/html/loudmouth/loudmouth-lm-message-handler.html -share/gtk-doc/html/loudmouth/loudmouth-lm-message.html -share/gtk-doc/html/loudmouth/loudmouth-lm-message-node.html -share/gtk-doc/html/loudmouth/loudmouth-lm-proxy.html -share/gtk-doc/html/loudmouth/loudmouth-lm-ssl.html -share/gtk-doc/html/loudmouth/loudmouth-lm-utils.html -share/gtk-doc/html/loudmouth/loudmouth.devhelp -share/gtk-doc/html/loudmouth/loudmouth.devhelp2 -share/gtk-doc/html/loudmouth/right.png -share/gtk-doc/html/loudmouth/style.css -share/gtk-doc/html/loudmouth/up.png +%%PORTDOCS%%share/gtk-doc/html/loudmouth/ch01.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/home.png +%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/index.sgml +%%PORTDOCS%%share/gtk-doc/html/loudmouth/left-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/loudmouth/left.png +%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmConnection.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmError.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessage.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageHandler.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmMessageNode.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmProxy.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-LmSSL.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth-Miscellaneous-Utility-Functions.html +%%PORTDOCS%%share/gtk-doc/html/loudmouth/loudmouth.devhelp2 +%%PORTDOCS%%share/gtk-doc/html/loudmouth/right-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/loudmouth/right.png +%%PORTDOCS%%share/gtk-doc/html/loudmouth/style.css +%%PORTDOCS%%share/gtk-doc/html/loudmouth/up-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/loudmouth/up.png Index: head/net-im/telepathy-gabble/Makefile =================================================================== --- head/net-im/telepathy-gabble/Makefile (revision 411989) +++ head/net-im/telepathy-gabble/Makefile (revision 411990) @@ -1,44 +1,44 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= telepathy-gabble PORTVERSION= 0.18.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Jabber Connection Manager for Telepathy Framework BUILD_DEPENDS= telepathy-glib>=0.22.0:${PORTSDIR}/net-im/telepathy-glib \ ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ libnice.so:${PORTSDIR}/net-im/libnice \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth RUN_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ libnice-gst1>=0:${PORTSDIR}/net-im/libnice-gst1 PORTSCOUT= limitw:1,even USES= alias gmake libtool pathfix pkgconfig python:build sqlite USE_GNOME= glib20 gtksourceview3 libxslt:build USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt CONFIGURE_ENV= LIBS="-pthread" INSTALL_TARGET= install-strip PLIST_SUB= PVERSION=${PORTVERSION} .if defined(WITH_OPENSSL_BASE) CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include" .endif post-patch: @${REINPLACE_CMD} -e 's|-Werror||g' \ ${WRKSRC}/lib/ext/wocky/configure .include Index: head/net-im/telepathy-salut/Makefile =================================================================== --- head/net-im/telepathy-salut/Makefile (revision 411989) +++ head/net-im/telepathy-salut/Makefile (revision 411990) @@ -1,33 +1,33 @@ # Created by: Florent Thoumie # $FreeBSD$ # $MCom: ports/trunk/net-im/telepathy-salut/Makefile 19802 2014-08-13 12:13:08Z gusi $ PORTNAME= telepathy-salut PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Link-local Connection Manager for Telepathy Framework LIB_DEPENDS= libavahi-glib.so:${PORTSDIR}/net/avahi-app \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup GNU_CONFIGURE= yes USES= gmake libtool pathfix pkgconfig python:build sqlite USE_GNOME= glib20 libxslt:build USE_OPENSSL= yes CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no LDFLAGS+= -lpthread INSTALL_TARGET= install-strip PLIST_SUB+= VERSION=${PORTVERSION} post-patch: @${REINPLACE_CMD} -e 's|make -C|${GMAKE} -C|g' \ ${WRKSRC}/src/Makefile.in \ ${WRKSRC}/tests/Makefile.in .include Index: head/net-p2p/gnunet/Makefile =================================================================== --- head/net-p2p/gnunet/Makefile (revision 411989) +++ head/net-p2p/gnunet/Makefile (revision 411990) @@ -1,116 +1,116 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= gnunet PORTVERSION= 0.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p ipv6 security MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org COMMENT= Anonymous, distributed, reputation-based network LICENSE= GPLv3 LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg \ libopus.so:${PORTSDIR}/audio/opus \ libpulse.so:${PORTSDIR}/audio/pulseaudio \ libltdl.so:${PORTSDIR}/devel/libltdl \ libunistring.so:${PORTSDIR}/devel/libunistring \ libidn.so:${PORTSDIR}/dns/libidn \ libglpk.so:${PORTSDIR}/math/glpk \ libgmp.so:${PORTSDIR}/math/gmp \ libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libextractor.so:${PORTSDIR}/textproc/libextractor USES= gmake iconv libtool pathfix pkgconfig USE_GNOME= glib20 USE_GSTREAMER1= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules \ --with-extractor=${LOCALBASE} \ --with-gnutls=${LOCALBASE} \ --with-libgcrypt-prefix=${LOCALBASE} \ --with-libunistring-prefix=${LOCALBASE} \ --with-ltdl=${LOCALBASE} \ --with-nssdir=no INSTALL_TARGET= install-strip USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GROUPS= gnunet USERS= gnunet SUB_FILES= pkg-install pkg-deinstall pkg-message SUB_LIST= GNUNET_DAEMON_DIR="${GNUNET_DAEMON_DIR}" PLIST_SUB= GNUNET_DAEMON_DIR="${GNUNET_DAEMON_DIR}" OPTIONS_DEFINE= DOCS EXAMPLES HTTP NLS OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT= SQLITE OPTIONS_SUB= yes HTTP_DESC= Enable HTTP transport via libmicrohttpd HTTP_LIB_DEPENDS= libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd HTTP_CONFIGURE_ON= --with-microhttpd=${LOCALBASE} HTTP_CONFIGURE_OFF= --without-microhttpd MYSQL_DESC= Use MySQL for the data store and cache MYSQL_USE= mysql=yes MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_CONFIGURE_OFF= --without-mysql NLS_USES= gettext NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE} NLS_CONFIGURE_OFF= --disable-nls PGSQL_DESC= Use PostgreSQL for the data store and cache PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-postgres=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-postgres SQLITE_DESC= Use SQLite for the data store and cache SQLITE_USE= sqlite=yes SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} SQLITE_CONFIGURE_OFF= --without-sqlite #If a non-default GNUNET_DAEMON_DIR is defined, the home directory #of the gnunet user may need to be adjusted -- e.g., via: #pw usermod gnunet -d $GNUNET_DAEMON_DIR GNUNET_DAEMON_DIR?= /var/lib/gnunet post-patch: @${REINPLACE_CMD} -e \ '/^install-data-am/s|install-docDATA||' ${WRKSRC}/Makefile.in .for i in configure gnunet_config.h \ src/datacache/plugin_datacache_postgres.c \ src/datastore/plugin_datastore_postgres.c \ src/include/gnunet_postgres_lib.h @${REINPLACE_CMD} -e \ 's|postgresql/||g' ${WRKSRC}/${i} .endfor post-build: @${PRINTF} "%s\n%s\n%s\n" "[PATHS]" \ "SERVICEHOME = ${GNUNET_DAEMON_DIR}" \ "DEFAULTCONFIG = ${PREFIX}/etc/gnunet.conf" \ > ${WRKDIR}/gnunet.conf.sample post-install: (cd ${WRKSRC}/contrib && ${INSTALL_PROGRAM} timeout_watchdog \ ${STAGEDIR}${PREFIX}/bin) (cd ${WRKDIR} && ${INSTALL_DATA} gnunet.conf.sample \ ${STAGEDIR}${PREFIX}/etc) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog NEWS README (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ ${STAGEDIR}${DOCSDIR}) .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in gnunet_janitor.py gnunet_pyexpect.py report.sh (cd ${WRKSRC}/contrib && ${INSTALL_DATA} ${i} \ ${STAGEDIR}${EXAMPLESDIR}) .endfor .include Index: head/net-p2p/gtk-gnutella/Makefile =================================================================== --- head/net-p2p/gtk-gnutella/Makefile (revision 411989) +++ head/net-p2p/gtk-gnutella/Makefile (revision 411990) @@ -1,111 +1,112 @@ # Created by: rbt@zort.on.ca # $FreeBSD$ # # A quick note on configurable make symbols: # # INTERACTIVE_CONFIGURE: Launches Configure in its default mode, which is # *very* interactive. Disabled here by default to conform to FreeBSD # guidelines, this mode is useful if you have problems with the # default Configure. # # GUI: Disable this to build a headless version of Gtk-Gnutella. Therefore, # monitoring of operations for Gtk-Gnutella will have to be # done without relying on any GUI, and the configuration is done via # files only. # # TLS: Enable support for scrambling GNet connections. Currently supported # only by Gtk-Gnutella. # # NLS: Enable National Language Support for translation of User Interface. # # IPV6: Enable to support IPv6 connections. The real configuration takes # place at run-time so keeping it enabled will not force IPv6 usage. # # DBUS: Enable D-Bus IPC support. Gtk-Gnutella will send out messages onto # the D-Bus message bus. That way external applications can easily # act on certain events that happen, such as a completed download. # # DEBUG: Compile with debugging symbols. Useful if you intend to make a # bug report. # # PORTABILITY: Configure code to use the PATH variable at run-time at a # cost in performance. Useful if you intend to move the executable # to multiple machines. # PORTNAME= gtk-gnutella PORTVERSION= 1.1.9 +PORTREVISION= 1 CATEGORIES= net-p2p ipv6 MASTER_SITES= SF MAINTAINER= woodsb02@gmail.com COMMENT= GTK based Gnutella client LICENSE= GPLv2+ USES= iconv localbase pkgconfig tar:bzip2 USE_GNOME= glib20 libxml2 HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -O -Dyacc='byacc' \ -Dprefix='${PREFIX}' \ -Dprivlib='${DATADIR}' \ -Dmansrc='${MANPREFIX}/man/man1' \ -Dlocale='${PREFIX}/share/locale' \ -Dcc='${CC}' -Doptimize='${CFLAGS}' \ -Dccflags='${CPPFLAGS}' -Dldflags='${LDFLAGS}' \ -Dusemymalloc='n' MAKE_ARGS= INSTALL_PREFIX="${STAGEDIR}" INSTALL_TARGET= install install.man PLIST_SUB= ARCH="${ARCH}" OPSYS="${OPSYS:tl}" ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DBUS DEBUG GUI IPV6 NLS PORTABILITY TLS OPTIONS_DEFAULT= GUI TLS OPTIONS_SUB= yes DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_OFF= -Ud_dbus DEBUG_CONFIGURE_ON= -Ud_official GUI_USE= gnome=gtk20 GUI_VARS= INSTALLS_ICONS=yes GUI_CONFIGURE_OFF= -Dd_headless IPV6_CONFIGURE_OFF= -Ud_ipv6 NLS_USES= gettext NLS_CONFIGURE_OFF= -Ud_nls PORTABILITY_DESC= Use the PATH variable at run-time PORTABILITY_CONFIGURE_ON= -Dd_portable TLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls TLS_CONFIGURE_OFF= -Ud_gnutls .if !defined(INTERACTIVE_CONFIGURE) CONFIGURE_ARGS+= -ders .endif post-extract: @${CHMOD} -R a+rX ${WRKSRC} post-patch: @${FIND} ${WRKSRC} -name "Makefile.SH" | ${XARGS} ${REINPLACE_CMD} -e \ 's|@exit 0|@echo done|' post-patch-DEBUG-off: @${REINPLACE_CMD} 's/(INSTALL) -c -m 555/(INSTALL) -c -s -m 555/g' \ ${WRKSRC}/src/Makefile.SH post-install-GUI-on: .for i in 16 32 128 256 512 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps (cd ${WRKSRC}/extra_files && ${INSTALL_DATA} gtk-gnutella.${i}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/gtk-gnutella.png) .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps (cd ${WRKSRC}/extra_files && ${INSTALL_DATA} gtk-gnutella.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/gtk-gnutella.svg) .include Index: head/net-p2p/ncdc/Makefile =================================================================== --- head/net-p2p/ncdc/Makefile (revision 411989) +++ head/net-p2p/ncdc/Makefile (revision 411990) @@ -1,40 +1,40 @@ # Created by: Dmitriy Limonov # $FreeBSD$ PORTNAME= ncdc PORTVERSION= 1.19.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ http://dev.yorhel.nl/download/ MAINTAINER= earl1k@mail.ru COMMENT= Lightweight direct connect client with ncurses interface LICENSE= MIT LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libpcre.so:${PORTSDIR}/devel/pcre \ libgmp.so:${PORTSDIR}/math/gmp \ libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libnettle.so:${PORTSDIR}/security/nettle \ libp11-kit.so:${PORTSDIR}/security/p11-kit USES= gmake pkgconfig ncurses USE_GNOME= glib20 GNU_CONFIGURE= yes PLIST_FILES= bin/ncdc \ man/man1/ncdc.1.gz CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= GEOIP GEOIP_CONFIGURE_WITH= geoip GEOIP_CONFIGURE_ENV= GEOIP_CFLAGS="-I${LOCALBASE}/include" \ GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP" GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP .include Index: head/news/nzbget/Makefile =================================================================== --- head/news/nzbget/Makefile (revision 411989) +++ head/news/nzbget/Makefile (revision 411990) @@ -1,65 +1,65 @@ # Created by: Lewis Thompson # $FreeBSD$ PORTNAME= nzbget PORTVERSION= 16.4 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= news MAINTAINER= toxic@doobie.com COMMENT= Binary newsreader supporting NZB files LICENSE= GPLv2 LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 USES= ncurses pkgconfig shebangfix USE_RC_SUBR= nzbget GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libcurses-includes=${NCURSESINC} \ --with-libcurses-libraries=${NCURSESLIB} CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread BINMODE= 0755 SHEBANG_FILES= scripts/*.py USE_GITHUB= yes OPTIONS_DEFINE= 7Z PYTHON RAR DOCS OPTIONS_SINGLE= TLSLIB OPTIONS_SINGLE_TLSLIB= GNUTLS OPENSSL OPTIONS_DEFAULT= GNUTLS PAR PYTHON RAR 7Z 7Z_DESC= Support extraction of 7z archives PYTHON_DESC= Support for python post-processing scripts RAR_DESC= Support extraction of rar archives 7Z_RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip PYTHON_USES= python:run RAR_RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar OPENSSL_CONFIGURE_ON= --with-tlslib=OpenSSL \ --with-openssl-includes=${OPENSSLINC} \ --with-openssl-libraries=${OPENSSLLIB} OPENSSL_USE= OPENSSL=yes GNUTLS_CONFIGURE_ON= --with-tlslib=GnuTLS GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt .include .if (${ARCH} == "i386") CONFIGURE_ARGS+= --disable-sigchld-handler .endif post-install: ${INSTALL_DATA} ${WRKSRC}/nzbget.conf \ ${STAGEDIR}${PREFIX}/etc/nzbget.conf.sample .include Index: head/polish/ekg2/Makefile =================================================================== --- head/polish/ekg2/Makefile (revision 411989) +++ head/polish/ekg2/Makefile (revision 411990) @@ -1,93 +1,93 @@ # Created by: Aleksander Fafula # $FreeBSD$ PORTNAME= ekg2 PORTVERSION= 0.3.1 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= polish net-im MASTER_SITES= http://pl.ekg2.org/ MAINTAINER= pawel@FreeBSD.org COMMENT= Text-mode Gadu-Gadu, Jabber, and IRC client LIB_DEPENDS= libgadu.so:${PORTSDIR}/polish/libgadu \ libgnutls.so:${PORTSDIR}/security/gnutls \ libexpat.so:${PORTSDIR}/textproc/expat2 LICENSE= GPLv2 GNU_CONFIGURE= yes USES= gmake iconv libtool pathfix pkgconfig readline CONFIGURE_ARGS+= --enable-shared \ --disable-static \ --enable-dynamic \ --with-expat \ --without-sqlite \ --without-gpm-mouse \ --with-libgadu \ --without-gif \ --without-libjpeg \ --without-libidn INSTALL_TARGET= install-strip LDFLAGS+= -L${LOCALBASE}/lib -lintl -pthread CFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= ASPELL GPG GSM GTK2 NLS PERL PYTHON SQLITE UNICODE XOSD OPTIONS_DEFAULT=ASPELL OPTIONS_SUB= yes GPG_DESC= GPG plugin GSM_DESC= GSM audio plugin GTK2_DESC= GTK+ 2 plugin PERL_DESC= Perl plugin PYTHON_DESC= Python plugin SQLITE_DESC= SQLite plugin UNICODE_DESC= Unicode support (experimental) XOSD_DESC= Xosd plugin ASPELL_CONFIGURE_WITH= aspell ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell ASPELL_RUN_DEPENDS= ${LOCALBASE}/share/aspell/pl.rws:${PORTSDIR}/polish/aspell GPG_CONFIGURE_WITH= gpg GPG_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme \ libgpg-error.so:${PORTSDIR}/security/libgpg-error GPG_RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg GSM_CONFIGURE_WITH= libgsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm GTK2_CONFIGURE_WITH= gtk GTK2_USE= GNOME=gtk2 NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext PERL_CONFIGURE_WITH= perl PERL_USES= perl5 PYTHON_CONFIGURE_WITH= python PYTHON_USES= python shebangfix SHEBANG_FILES= contrib/python/notify-bubble.py SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 UNICODE_CONFIGURE_ENABLE= unicode XOSD_CONFIGURE_WITH= libxosd XOSD_LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd post-patch: # needs newer headers for O_NOFOLLOW flag @${REINPLACE_CMD} '/_XOPEN_SOURCE/ s|600|700|' \ ${WRKSRC}/plugins/xmsg/xmsg.c post-patch-UNICODE-on: @${REINPLACE_CMD} -e 's|ncursesw/||' ${WRKSRC}/configure \ ${WRKSRC}/plugins/ncurses/ecurses.h .include Index: head/print/cups/Makefile =================================================================== --- head/print/cups/Makefile (revision 411989) +++ head/print/cups/Makefile (revision 411990) @@ -1,133 +1,133 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= cups PORTVERSION= 2.1.3 DISTVERSIONSUFFIX=-source -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= http://www.cups.org/software/${PORTVERSION}/ MAINTAINER= tijl@FreeBSD.org COMMENT= Common UNIX Printing System LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE.txt LICENSE_FILE_LGPL20= ${WRKSRC}/LICENSE.txt CONFLICTS= LPRng-[0-9]* DESTDIRNAME= DSTROOT GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dnssd \ --disable-gssapi \ --disable-launchd \ --disable-systemd \ --with-cups-user=${USERS} \ --with-cups-group=${GROUPS} \ --with-system-groups=wheel \ --with-dbusdir="${PREFIX}/etc/dbus-1" \ --with-icondir="${PREFIX}/share/icons" \ --with-menudir="${DESKTOPDIR}" \ --with-printcap="${PREFIX}/etc/printcap" \ --with-rcdir=no \ --with-optim=" " \ --with-pam-module="unix" \ ac_cv_path_JAVA= ac_cv_path_PERL= ac_cv_path_PHPCGI= \ ac_cv_path_PHP= ac_cv_path_PYTHON= CPPFLAGS+= -isystem ${LOCALBASE}/include # libpaper mainly LIBS+= -L${LOCALBASE}/lib USES= cpe gmake iconv pkgconfig tar:bzip2 CPE_VENDOR= apple USE_LDCONFIG= yes USE_RC_SUBR= cupsd WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GROUPS= cups USERS= cups OPTIONS_DEFINE= AVAHI DBUS DOCS GNUTLS IPPTOOL LIBPAPER NLS X11 OPTIONS_DEFAULT= AVAHI DBUS GNUTLS LIBPAPER OPTIONS_SUB= yes AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app AVAHI_CONFIGURE_ENABLE= avahi AVAHI_SUB_LIST= AVAHI_DAEMON=avahi_daemon AVAHI_SUB_LIST_OFF= AVAHI_DAEMON= DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_ENABLE= dbus DBUS_SUB_LIST= DBUS_DAEMON=dbus DBUS_SUB_LIST_OFF= DBUS_DAEMON= GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ON= --enable-gnutls GNUTLS_CONFIGURE_OFF= --disable-ssl IPPTOOL_DESC= Internet Printing Protocol testing tool LIBPAPER_LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper LIBPAPER_CONFIGURE_ENABLE=libpaper X11_DESC= Install desktop menu item X11_BUILD_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils X11_RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils .if defined(CUPS_OVERWRITE_BASE) PLIST_SUB+= OVERWRITE="" .else PLIST_SUB+= OVERWRITE="@comment " .endif .if exists(/usr/lib/libusb.so) PLIST_SUB+= USB="" .else PLIST_SUB+= USB="@comment " .endif .include .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no .endif post-patch: @${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in @${REINPLACE_CMD} 's/usblp/ulpt/g' ${WRKSRC}/backend/usb-libusb.c @${REINPLACE_CMD} -e 's|/usr/local/etc/pam.d|${LOCALBASE}/etc/pam.d|' \ -e 's/-fstack-protector//' ${WRKSRC}/configure @${REINPLACE_CMD} 's|http://www.cups.org|https://cups.org|' \ ${WRKSRC}/doc/index.html.in \ ${WRKSRC}/doc/??/index.html.in \ ${WRKSRC}/templates/header.tmpl.in \ ${WRKSRC}/templates/??/header.tmpl.in \ ${WRKSRC}/templates/help-header.tmpl \ ${WRKSRC}/templates/??/help-header.tmpl @${REINPLACE_CMD} '/stripopt=/s/-x//' ${WRKSRC}/install-sh @${REINPLACE_CMD} 's|/etc/cups|${LOCALBASE}/etc/cups|g' \ ${WRKSRC}/man/*.man* @${REINPLACE_CMD} -e 's|\.default|.sample|'\ ${WRKSRC}/cgi-bin/admin.c\ ${WRKSRC}/conf/Makefile post-patch-DOCS-off: # Link to online documentation. @${REINPLACE_CMD} \ 's|"/*help/|"https://cups.org/documentation.php/doc-${PORTVERSION:R}/|' \ ${WRKSRC}/doc/index.html.in \ ${WRKSRC}/doc/??/index.html.in \ ${WRKSRC}/templates/choose-uri.tmpl \ ${WRKSRC}/templates/??/choose-uri.tmpl \ ${WRKSRC}/templates/header.tmpl.in \ ${WRKSRC}/templates/??/header.tmpl.in \ ${WRKSRC}/templates/samba-export.tmpl \ ${WRKSRC}/templates/??/samba-export.tmpl post-install: ${LN} -sf lpr ${STAGEDIR}${PREFIX}/bin/lpr-cups ${INSTALL_DATA} ${FILESDIR}/cups.conf.sample \ ${STAGEDIR}${PREFIX}/etc/devd ${INSTALL_DATA} ${FILESDIR}/cups ${STAGEDIR}${PREFIX}/etc/pam.d .include Index: head/print/cups/files/patch-cups-config.in =================================================================== --- head/print/cups/files/patch-cups-config.in (nonexistent) +++ head/print/cups/files/patch-cups-config.in (revision 411990) @@ -0,0 +1,11 @@ +--- cups-config.in.orig 2013-05-29 11:51:34 UTC ++++ cups-config.in +@@ -105,7 +105,7 @@ while test $# -gt 0; do + ;; + --libs) + if test $static = no; then +- libs="@EXTLINKCUPS@ $LIBS"; ++ libs="@EXTLINKCUPS@"; + if test $image = yes; then + libs="@EXTLINKCUPSIMAGE@ $libs" + fi Property changes on: head/print/cups/files/patch-cups-config.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/print/cups-bjnp/Makefile =================================================================== --- head/print/cups-bjnp/Makefile (revision 411989) +++ head/print/cups-bjnp/Makefile (revision 411990) @@ -1,20 +1,20 @@ # $FreeBSD$ PORTNAME= cups-bjnp PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= SF MAINTAINER= danilo@FreeBSD.org COMMENT= CUPS backend for Canon USB over IP protocol LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups GNU_CONFIGURE= yes # Just to avoid a tautological pointer compare in bjnp-commands.c:187 CONFIGURE_ARGS+= --disable-Werror CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .include Index: head/print/cups-filters/Makefile =================================================================== --- head/print/cups-filters/Makefile (revision 411989) +++ head/print/cups-filters/Makefile (revision 411990) @@ -1,63 +1,63 @@ # $FreeBSD$ PORTNAME= cups-filters PORTVERSION= 1.8.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/cups-filters/ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Backends, filters and other software (was part of the core CUPS) BUILD_DEPENDS= pdftops:${PORTSDIR}/graphics/poppler-utils RUN_DEPENDS= pdftops:${PORTSDIR}/graphics/poppler-utils LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ libijs.so:${PORTSDIR}/print/libijs \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libqpdf.so:${PORTSDIR}/print/qpdf \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libcupsimage.so:${PORTSDIR}/print/cups \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libpoppler.so:${PORTSDIR}/graphics/poppler CONFLICTS= cups-pstoraster-[0-9]* foomatic-filters-[0-9]* USES= compiler:c++11-lib cpe ghostscript gmake jpeg libtool pathfix \ pkgconfig shebangfix tar:xz CPE_VENDOR= linuxfoundation SHEBANG_FILES= filter/braille/drivers/generic/brftoembosser.in \ filter/braille/drivers/index/imageubrltoindexv3.in \ filter/braille/drivers/index/imageubrltoindexv4.in \ filter/braille/drivers/index/textbrftoindexv3.in \ filter/braille/filters/imagetobrf.in \ filter/braille/filters/texttobrf.in filter/textonly USE_GNOME= glib20 USE_RC_SUBR= cups_browsed GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-shell=/bin/sh ZLIB_CFLAGS=" " ZLIB_LIBS="-lz" INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes OPTIONS_DEFINE= AVAHI DOCS OPTIONS_DEFAULT=AVAHI AVAHI_CONFIGURE_ENABLE= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app AVAHI_SUB_LIST= AVAHI_DAEMON=avahi_daemon AVAHI_SUB_LIST_OFF= AVAHI_DAEMON= post-patch: @${REINPLACE_CMD} 's:-std=c++0x:-std=c++11:' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} 's|/usr/share/liblouis|${LOCALBASE}/share/liblouis|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ -e 's|README.gz|README|' \ ${WRKSRC}/utils/cups-browsed.8 \ ${WRKSRC}/utils/cups-browsed.conf.5 .include Index: head/print/ghostscript8-base/Makefile =================================================================== --- head/print/ghostscript8-base/Makefile (revision 411989) +++ head/print/ghostscript8-base/Makefile (revision 411990) @@ -1,158 +1,158 @@ # Created by: Andreas Klemm # $FreeBSD$ PORTNAME= ghostscript PORTVERSION= 8.71 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ http://www.humblesoft.com/pub/:epag PKGNAMESUFFIX= 8-base DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= doceng@FreeBSD.org COMMENT= Ghostscript 8.x PostScript interpreter, base part LICENSE= GPLv3 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libjasper.so:${PORTSDIR}/graphics/jasper \ libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ libpaper.so:${PORTSDIR}/print/libpaper \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts CONFLICTS_INSTALL= \ gambc-[0-9]* \ ghostscript[789]-[0-9]* \ ghostscript[789]-nox11-[0-9]* \ ghostscript9-agpl-[0-9]* \ ghostscript9-agpl-nox11-[0-9]* USES= autoreconf gmake pkgconfig shebangfix tar:xz USE_LDCONFIG= yes SHEBANG_FILES= ${WRKSRC}/lib/fixmswrd.pl EXTRACT_AFTER_ARGS= ${EXCLUDE_DIRS:S/^/--exclude /} GNU_CONFIGURE= yes DATADIR= ${PREFIX}/share/${PORTNAME}/${PORTVERSION} MAKE_JOBS_UNSAFE= yes MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".so" \ SOC_LOADER="dxmainc.c" CONFIGURE_ENV= ${MAKE_ENV} CONFIGURE_ARGS= --disable-compile-inits \ --enable-contrib \ --enable-dynamic \ --with-ijs \ --with-jasper \ --with-libpaper \ --without-x \ --disable-gtk \ --with-drivers="" CPPFLAGS+= -DUPD_SIGNAL=0 \ -DJBIG_NO_MEMENTO \ -I. \ -I${WRKSRC}/jasper/src/libjasper/include \ -I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib XCFLAGS= -DA4 XLDFLAGS= -lpthread ALL_TARGET= so INSTALL_TARGET= soinstall PLIST_SUB= SHLIB_VER="${PORTVERSION:R}" \ GS_VERSION="${PORTVERSION}" SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS_DEFINE= DOCS CAIRO CUPS FONTCONFIG ICONV OPTIONS_DEFAULT=DOCS CAIRO CUPS FONTCONFIG ICONV OPTIONS_SUB= yes FONTCONFIG_DESC=Enable fontconfig support FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig NO_OPTIONS_SORT=yes EXCLUDE_DIRS= jbig2dec jpeg expat jasper libpng tiff zlib .include "Makefile.drivers" .include .include "files/Makefile.drivers_post" PORTDOCS= japanese chp2200 epson740 lxm3200-tweaked md2k_md5k PORTDOC_FILES= japanese/Gdevlips.htm japanese/README.gs550j \ japanese/cdj880.txt japanese/dj505j.txt japanese/djgpp.txt \ japanese/gdev10v.txt japanese/gdevalps.txt \ japanese/gdevcd8.txt japanese/gdevdmpr.txt \ japanese/gdevfmlbp.txt japanese/gdevj100.txt \ japanese/gdevlbp3.txt japanese/gdevmag.txt \ japanese/gdevmd2k.txt japanese/gdevmjc.txt \ japanese/gdevml6.txt japanese/gdevp201.txt japanese/gs261j.euc \ japanese/gs261j.txt chp2200/AUTHORS chp2200/INSTALL \ epson740/README epson740/upp-HowTo-to-be \ lxm3200-tweaked/LICENSE lxm3200-tweaked/README \ lxm3200-tweaked/RELEASE_NOTES \ lxm3200-tweaked/Z12-Z31-QuickSetup md2k_md5k/README.jis post-patch: ${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \ ${WRKSRC}/contrib/japanese/dmp_site.ps pre-build-drivers.mak: @${ECHO_CMD} '# automatically generated' > ${WRKSRC}/base/drivers.mak .for N in ${DEVS_LIST} @${ECHO_CMD} 'DEVICE_${N}=' >> ${WRKSRC}/base/drivers.mak .endfor .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ ${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \ ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .for N in ${DEVS_LIST} .if ${PORT_OPTIONS:MGS_${D}} .if !defined(OPTIONS_UNSET) || !${OPTIONS_UNSET:MGS_${D}} .for X in ${DEVICE_${N}:M${D}.dev} @${ECHO_CMD} 'DEVICE_${N}+= $$(DD)${D}.dev' >> ${WRKSRC}/base/drivers.mak .endfor .endif .endif .endfor .endfor pre-build: pre-build-drivers.mak ${MKDIR} ${WRKSRC}/obj ${WRKSRC}/bin ${WRKSRC}/freetype/include ${LN} -s -f ${LOCALBASE}/include/ft2build.h \ ${WRKSRC}/freetype/include/ft2build.h ${LN} -s -f ${LOCALBASE}/include/freetype2/freetype \ ${WRKSRC}/freetype/include/freetype ${MKDIR} ${WRKSRC}/freetype/objs ${LN} -s -f ${LOCALBASE}/lib/libfreetype.so \ ${WRKSRC}/freetype/objs/freetype214MT_D.so pre-install: cd ${WRKSRC}/Resource/Init && ${RM} -f \ gs_statd.ps.orig gs_ttf.ps.orig pdf_font.ps.orig ${MKDIR} ${STAGEDIR}${DATADIR} post-install-DOCS-on: post-install-docs ${MKDIR} ${WRKSRC}/contrib/japanese ${INSTALL_DATA} ${WRKSRC}/contrib/japanese/doc/* \ ${WRKSRC}/contrib/japanese ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/contrib && \ ${TAR} -cf - ${PORTDOC_FILES} | \ (cd ${STAGEDIR}${DOCSDIR} && ${TAR} -xof -) post-install: ${INSTALL_DATA} ${WRKSRC}/lib/FAPIcidfmap \ ${WRKSRC}/lib/FAPIconfig ${WRKSRC}/lib/FAPIfontmap \ ${STAGEDIR}${DATADIR}/Resource/Init ${LN} -sf gsc ${STAGEDIR}${PREFIX}/bin/gs ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont \ ${STAGEDIR}${DATADIR}/Resource/CIDFont .include Index: head/print/ghostscript9-agpl-base/Makefile =================================================================== --- head/print/ghostscript9-agpl-base/Makefile (revision 411989) +++ head/print/ghostscript9-agpl-base/Makefile (revision 411990) @@ -1,150 +1,150 @@ # $FreeBSD$ PORTNAME= ghostscript PORTVERSION= 9.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \ http://www.humblesoft.com/pub/:epag PKGNAMESUFFIX= 9-agpl-base DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= doceng@FreeBSD.org COMMENT= Ghostscript 9.x PostScript interpreter, base part LICENSE= AGPLv3 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libidn.so:${PORTSDIR}/dns/libidn \ libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libpaper.so:${PORTSDIR}/print/libpaper \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts CONFLICTS_INSTALL= \ gambc-[0-9]* \ ghostscript[789]-[0-9]* \ ghostscript[789]-nox11-[0-9]* \ ghostscript9-agpl-[0-9]* \ ghostscript9-agpl-nox11-[0-9]* USES= autoreconf gmake iconv jpeg pkgconfig:build tar:bzip2 USE_LDCONFIG= yes EXTRACT_AFTER_ARGS= ${EXCLUDE_DIRS:S/^/--exclude /} DATADIR= ${PREFIX}/share/${PORTNAME}/${PORTVERSION} GNU_CONFIGURE= yes MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ SOC_LOADER="dxmainc.c" CONFIGURE_ENV= ${MAKE_ENV} CONFIGURE_ARGS= --disable-compile-inits \ --enable-contrib \ --enable-dynamic \ --enable-freetype \ --with-libiconv=native \ --with-system-libtiff \ --with-ijs \ --with-libidn \ --with-libpaper \ --without-x \ --disable-gtk \ --with-drivers="" CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${LOCALBASE}/include/libpng \ -I${WRKSRC}/openjpeg/src/lib/openjp2 \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib XCFLAGS= -DA4 XLDFLAGS= -lpthread ALL_TARGET= so INSTALL_TARGET= soinstall PLIST_SUB= SHLIB_VER="${PORTVERSION:R}" \ GS_VERSION="${PORTVERSION}" SUB_FILES= pkg-message SUB_LIST= DATADIR="${DATADIR}" PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS_DEFINE= DOCS CUPS FONTCONFIG ICONV OPTIONS_DEFAULT=DOCS CUPS FONTCONFIG ICONV OPTIONS_SUB= yes FONTCONFIG_DESC=Enable fontconfig support FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig NO_OPTIONS_SORT=yes EXCLUDE_DIRS= freetype jbig2dec jpeg expat lcms2 libpng tiff zlib .include "Makefile.drivers" .include .include "files/Makefile.drivers_post" PORTDOCS= japanese chp2200 epson740 lxm3200-tweaked md2k_md5k PORTDOC_FILES= japanese/Gdevlips.htm japanese/README.gs550j \ japanese/cdj880.txt japanese/dj505j.txt japanese/djgpp.txt \ japanese/gdev10v.txt japanese/gdevalps.txt \ japanese/gdevcd8.txt japanese/gdevdmpr.txt \ japanese/gdevfmlbp.txt japanese/gdevj100.txt \ japanese/gdevlbp3.txt japanese/gdevmag.txt \ japanese/gdevmd2k.txt japanese/gdevmjc.txt \ japanese/gdevml6.txt japanese/gdevp201.txt japanese/gs261j.euc \ japanese/gs261j.txt chp2200/AUTHORS chp2200/INSTALL \ epson740/README epson740/upp-HowTo-to-be \ lxm3200-tweaked/LICENSE lxm3200-tweaked/README \ lxm3200-tweaked/RELEASE_NOTES \ lxm3200-tweaked/Z12-Z31-QuickSetup md2k_md5k/README.jis post-patch: ${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \ ${WRKSRC}/contrib/japanese/dmp_site.ps pre-build-drivers.mak: @${ECHO_CMD} '# automatically generated' > ${WRKSRC}/base/drivers.mak @${ECHO_CMD} 'DEVICE_DEVS=$${DISPLAY_DEV}' >> ${WRKSRC}/base/drivers.mak .for N in ${DEVS_LIST} @${ECHO_CMD} '${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}=' >> ${WRKSRC}/base/drivers.mak .endfor .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ ${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \ ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .for N in ${DEVS_LIST} .if ${PORT_OPTIONS:MGS_${D}} .if !defined(OPTIONS_UNSET) || !${OPTIONS_UNSET:MGS_${D}} .for X in ${${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}:M${D}.dev} @${ECHO_CMD} '${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}+= $$(DD)${D}.dev' >> ${WRKSRC}/base/drivers.mak .endfor .endif .endif .endfor .endfor pre-build: pre-build-drivers.mak ${MKDIR} ${WRKSRC}/obj ${MKDIR} ${WRKSRC}/bin pre-install: cd ${WRKSRC}/Resource/Init && ${RM} -f \ gs_statd.ps.orig gs_ttf.ps.orig pdf_font.ps.orig ${MKDIR} ${STAGEDIR}${DATADIR} post-install-DOCS-on: post-install-docs ${MKDIR} ${WRKSRC}/contrib/japanese ${INSTALL_DATA} ${WRKSRC}/contrib/japanese/doc/* \ ${WRKSRC}/contrib/japanese ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/contrib && \ ${TAR} -cf - ${PORTDOC_FILES} | \ (cd ${STAGEDIR}${DOCSDIR} && ${TAR} -xof -) post-install: ${LN} -sf gsc ${STAGEDIR}${PREFIX}/bin/gs ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont \ ${STAGEDIR}${DATADIR}/Resource/CIDFont/fonts .include Index: head/print/ghostscript9-base/Makefile =================================================================== --- head/print/ghostscript9-base/Makefile (revision 411989) +++ head/print/ghostscript9-base/Makefile (revision 411990) @@ -1,151 +1,151 @@ # $FreeBSD$ PORTNAME= ghostscript PORTVERSION= 9.06 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ http://www.humblesoft.com/pub/:epag PKGNAMESUFFIX= 9-base DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= doceng@FreeBSD.org COMMENT= Ghostscript 9.x PostScript interpreter, base part LICENSE= GPLv3 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libidn.so:${PORTSDIR}/dns/libidn \ libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libpaper.so:${PORTSDIR}/print/libpaper \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts CONFLICTS_INSTALL= \ gambc-[0-9]* \ ghostscript[789]-[0-9]* \ ghostscript[789]-nox11-[0-9]* \ ghostscript9-agpl-[0-9]* \ ghostscript9-agpl-nox11-[0-9]* USES= autoreconf gmake jpeg pkgconfig:build tar:bzip2 USE_LDCONFIG= yes EXTRACT_AFTER_ARGS= ${EXCLUDE_DIRS:S/^/--exclude /} DATADIR= ${PREFIX}/share/${PORTNAME}/${PORTVERSION} GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ SOC_LOADER="dxmainc.c" CONFIGURE_ENV= ${MAKE_ENV} CONFIGURE_ARGS= --disable-compile-inits \ --enable-contrib \ --enable-dynamic \ --enable-freetype \ --with-system-libtiff \ --with-ijs \ --with-libidn \ --without-jasper \ --with-libpaper \ --without-x \ --disable-gtk \ --with-drivers="" CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${LOCALBASE}/include/libpng \ -I${WRKSRC}/openjpeg/libopenjpeg \ -I${WRKSRC}/openjpeg \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib XCFLAGS= -DA4 XLDFLAGS= -lpthread ALL_TARGET= so INSTALL_TARGET= soinstall PLIST_SUB= SHLIB_VER="${PORTVERSION:R}" \ GS_VERSION="${PORTVERSION}" SUB_FILES= pkg-message SUB_LIST= DATADIR="${DATADIR}" PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS_DEFINE= DOCS CUPS FONTCONFIG ICONV OPTIONS_DEFAULT=DOCS CUPS FONTCONFIG ICONV OPTIONS_SUB= yes FONTCONFIG_DESC=Enable fontconfig support FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig NO_OPTIONS_SORT=yes EXCLUDE_DIRS= freetype jbig2dec jpeg expat jasper lcms lcms2 libpng tiff zlib .include "Makefile.drivers" .include .include "files/Makefile.drivers_post" PORTDOCS= japanese chp2200 epson740 lxm3200-tweaked md2k_md5k PORTDOC_FILES= japanese/Gdevlips.htm japanese/README.gs550j \ japanese/cdj880.txt japanese/dj505j.txt japanese/djgpp.txt \ japanese/gdev10v.txt japanese/gdevalps.txt \ japanese/gdevcd8.txt japanese/gdevdmpr.txt \ japanese/gdevfmlbp.txt japanese/gdevj100.txt \ japanese/gdevlbp3.txt japanese/gdevmag.txt \ japanese/gdevmd2k.txt japanese/gdevmjc.txt \ japanese/gdevml6.txt japanese/gdevp201.txt japanese/gs261j.euc \ japanese/gs261j.txt chp2200/AUTHORS chp2200/INSTALL \ epson740/README epson740/upp-HowTo-to-be \ lxm3200-tweaked/LICENSE lxm3200-tweaked/README \ lxm3200-tweaked/RELEASE_NOTES \ lxm3200-tweaked/Z12-Z31-QuickSetup md2k_md5k/README.jis post-patch: ${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \ ${WRKSRC}/contrib/japanese/dmp_site.ps pre-build-drivers.mak: @${ECHO_CMD} '# automatically generated' > ${WRKSRC}/base/drivers.mak @${ECHO_CMD} 'DEVICE_DEVS=$${DISPLAY_DEV}' >> ${WRKSRC}/base/drivers.mak .for N in ${DEVS_LIST} @${ECHO_CMD} '${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}=' >> ${WRKSRC}/base/drivers.mak .endfor .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//} \ ${OPTIONS_GROUP_ICONV:MGS_*:S/^GS_//} \ ${OPTIONS_GROUP_SVGALIB:MGS_*:S/^GS_//} .for N in ${DEVS_LIST} .if ${PORT_OPTIONS:MGS_${D}} .if !defined(OPTIONS_UNSET) || !${OPTIONS_UNSET:MGS_${D}} .for X in ${${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}:M${D}.dev} @${ECHO_CMD} '${N:S/^/DEVICE_/:S/^DEVICE_DISPLAY_DEV/DISPLAY_DEV/}+= $$(DD)${D}.dev' >> ${WRKSRC}/base/drivers.mak .endfor .endif .endif .endfor .endfor pre-build: pre-build-drivers.mak ${MKDIR} ${WRKSRC}/obj ${MKDIR} ${WRKSRC}/bin pre-install: cd ${WRKSRC}/Resource/Init && ${RM} -f \ gs_statd.ps.orig gs_ttf.ps.orig pdf_font.ps.orig ${MKDIR} ${STAGEDIR}${DATADIR} post-install-DOCS-on: post-install-docs ${MKDIR} ${WRKSRC}/contrib/japanese ${INSTALL_DATA} ${WRKSRC}/contrib/japanese/doc/* \ ${WRKSRC}/contrib/japanese ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/contrib && \ ${TAR} -cf - ${PORTDOC_FILES} | \ (cd ${STAGEDIR}${DOCSDIR} && ${TAR} -xof -) post-install: ${LN} -sf gsc ${STAGEDIR}${PREFIX}/bin/gs ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont \ ${STAGEDIR}${DATADIR}/Resource/CIDFont/fonts .include Index: head/print/gnome-cups-manager/Makefile =================================================================== --- head/print/gnome-cups-manager/Makefile (revision 411989) +++ head/print/gnome-cups-manager/Makefile (revision 411990) @@ -1,50 +1,50 @@ # Created by: Glenn Johnson # $FreeBSD$ # $MCom: ports/print/gnome-cups-manager/Makefile,v 1.8 2007/07/20 01:11:31 mezz Exp $ PORTNAME= gnome-cups-manager PORTVERSION= 0.31 -PORTREVISION= 15 +PORTREVISION= 16 PORTEPOCH= 1 CATEGORIES= print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Administration tool for cups LIB_DEPENDS= libgnomecups-1.0.so:${PORTSDIR}/print/libgnomecups RUN_DEPENDS= gnomesu:${PORTSDIR}/security/libgnomesu USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 USE_GNOME= gnomeprefix intlhack libgnomeprintui libgnomeui USE_LDCONFIG= yes USE_XORG= x11 INSTALLS_ICONS= yes INSTALL_TARGET= install-strip GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -D_IPP_PRIVATE_STRUCTURES LIBS+= -L${LOCALBASE}/lib post-patch: @${SED} -e 's|%%PREFIX%%|${PREFIX}|' \ < ${FILESDIR}/gnome-cups-manager.desktop \ > ${WRKSRC}/gnome-cups-manager.desktop @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|-D.*_DISABLE_DEPRECATED||g' @${REINPLACE_CMD} '/^gnome_cups_icon_LDADD =/s/$$/ -lX11/' \ ${WRKSRC}/gnome-cups-manager/Makefile.in @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \ ${WRKSRC}/libgnomecups/gnome-cups-ui-driver.c @${REINPLACE_CMD} -e 's|glib/gmacros.h>|glib.h>|g' \ -e 's|glib/gstrfuncs.h>|glib.h>|g' \ ${WRKSRC}/libgnomecups/gnome-cups-ui-init.h \ ${WRKSRC}/libgnomecups/gnome-cups-ui-print.h \ ${WRKSRC}/libgnomecups/gnome-cups-i18n.c \ ${WRKSRC}/libgnomecups/gnome-cups-ui-driver.c post-install: ${INSTALL_DATA} ${WRKSRC}/gnome-cups-manager.desktop \ ${STAGEDIR}${PREFIX}/share/applications .include Index: head/print/gtklp/Makefile =================================================================== --- head/print/gtklp/Makefile (revision 411989) +++ head/print/gtklp/Makefile (revision 411990) @@ -1,39 +1,39 @@ # Created by: Martin Klaffenboeck # $FreeBSD$ PORTNAME= gtklp PORTVERSION= 1.3.1 DISTVERSIONSUFFIX= .src -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= GTK interface to cups LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= autoreconf gettext libtool pkgconfig GNU_CONFIGURE= yes USE_GNOME= gtk20 USE_OPENSSL= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib DESKTOP_ENTRIES="GtkLP" "" "${PORTNAME}" "${PORTNAME}" "System;GTK;" "" post-install: .for i in 16 24 32 48 64 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps (cd ${WRKSRC}/libgtklp/icons && ${INSTALL_DATA} ${i}x${i}.xpm \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/gtklp.xpm) .endfor .include Index: head/print/gutenprint-cups/Makefile =================================================================== --- head/print/gutenprint-cups/Makefile (revision 411989) +++ head/print/gutenprint-cups/Makefile (revision 411990) @@ -1,18 +1,18 @@ # Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/print/gutenprint-cups/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $ -PORTEPOCH= 0 +PORTREVISION= 3 PKGNAMESUFFIX= -cups MAINTAINER= cmt@burggraben.net COMMENT= GutenPrint CUPS drivers LICENSE= GPLv2 MASTERDIR= ${.CURDIR}/../../print/gutenprint-base GUT_SLAVE= cups PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Index: head/print/gutenprint-foomatic/Makefile =================================================================== --- head/print/gutenprint-foomatic/Makefile (revision 411989) +++ head/print/gutenprint-foomatic/Makefile (revision 411990) @@ -1,18 +1,18 @@ # Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/print/gutenprint-foomatic/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $ -PORTEPOCH= 0 +PORTREVISION= 2 PKGNAMESUFFIX= -foomatic MAINTAINER= cmt@burggraben.net COMMENT= GutenPrint Foomatic Drivers LICENSE= GPLv2 MASTERDIR= ${.CURDIR}/../../print/gutenprint-base GUT_SLAVE= foomatic PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Index: head/print/gutenprint-ijs/Makefile =================================================================== --- head/print/gutenprint-ijs/Makefile (revision 411989) +++ head/print/gutenprint-ijs/Makefile (revision 411990) @@ -1,18 +1,18 @@ # Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/print/gutenprint-ijs/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $ -PORTEPOCH= 0 +PORTREVISION= 2 PKGNAMESUFFIX= -ijs MAINTAINER= cmt@burggraben.net COMMENT= GutenPrint Ghostscript Drivers LICENSE= GPLv2 MASTERDIR= ${.CURDIR}/../../print/gutenprint-base GUT_SLAVE= ijs PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Index: head/print/libgnomecups/Makefile =================================================================== --- head/print/libgnomecups/Makefile (revision 411989) +++ head/print/libgnomecups/Makefile (revision 411990) @@ -1,25 +1,25 @@ # Created by: Glenn Johnson # $FreeBSD$ PORTNAME= libgnomecups PORTVERSION= 0.2.3 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Support library for gnome cups administration LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups USES= pkgconfig pathfix gettext gmake libtool:keepla tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= intlhack glib20 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -D_IPP_PRIVATE_STRUCTURES LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .include Index: head/print/libgnomeprint/Makefile =================================================================== --- head/print/libgnomeprint/Makefile (revision 411989) +++ head/print/libgnomeprint/Makefile (revision 411990) @@ -1,58 +1,58 @@ # Created by: Vanilla I. Shu # $FreeBSD$ # $MCom: ports/print/libgnomeprint/Makefile,v 1.77 2010/09/28 16:38:29 kwm Exp $ PORTNAME= libgnomeprint PORTVERSION= 2.18.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Gnome print support library USES= tar:bzip2 .if !defined(REFERENCE_PORT) LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig GNU_CONFIGURE= yes USES+= bison gettext gmake libtool:keepla pathfix pkgconfig USE_GNOME= gnomeprefix intlhack glib20 pango libxml2 libartlgpl2 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=${PORTVERSION} \ LIBVERSION=2.2 OPTIONS_DEFINE= CUPS OPTIONS_DEFAULT=CUPS .include .if ${PORT_OPTIONS:MCUPS} CONFIGURE_ARGS+= --with-cups LIB_DEPENDS+= libgnomecups-1.0.so:${PORTSDIR}/print/libgnomecups PLIST_SUB+= CUPS:="" .else CONFIGURE_ARGS+= --without-cups PLIST_SUB+= CUPS:="@comment " .endif post-patch: @${REINPLACE_CMD} -e "/^SUBDIRS =/s|tests||" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "/^SUBDIRS =/s|doc||" ${WRKSRC}/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts @${TOUCH} ${STAGEDIR}${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomeprint-2-2.so.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomeprint/2.18.8/modules/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomeprint/2.18.8/modules/*/*.so .include .endif Index: head/print/p5-Net-CUPS/Makefile =================================================================== --- head/print/p5-Net-CUPS/Makefile (revision 411989) +++ head/print/p5-Net-CUPS/Makefile (revision 411990) @@ -1,23 +1,23 @@ # Created by: Gvozdikov Veniamin # $FreeBSD$ PORTNAME= Net-CUPS PORTVERSION= 0.61 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= vg@FreeBSD.org COMMENT= Interface to the CUPS API LICENSE= ART10 GPLv1 LICENSE_COMB= dual LIB_DEPENDS= libcupsimage.so:${PORTSDIR}/print/cups \ libcupsfilters.so:${PORTSDIR}/print/cups-filters USES= perl5 USE_PERL5= configure .include Index: head/print/qpdfview/Makefile =================================================================== --- head/print/qpdfview/Makefile (revision 411989) +++ head/print/qpdfview/Makefile (revision 411990) @@ -1,51 +1,51 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= qpdfview PORTVERSION= 0.4.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= https://launchpadlibrarian.net/226592308/ \ https://launchpad.net/${PORTVERSION}/trunk/${PORTVERSION}/+download/ MAINTAINER= vg@FreeBSD.org COMMENT= Tabbed DjVu/PDF/PS document viewer LICENSE= GPLv2 USES= desktop-file-utils pkgconfig qmake USE_LDCONFIG= yes QMAKE_SOURCE_PATH= ${PORTNAME}.pro DATADIR= ${PREFIX}/share/${PORTNAME} OPTIONS_SINGLE= TOOLKITS OPTIONS_SINGLE_TOOLKITS= QT4 QT5 OPTIONS_DEFINE= CUPS OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= DJVU PS BACKEND_DESC= Additional documents support OPTIONS_DEFAULT= QT4 CUPS PS OPTIONS_SUB= yes CUPS_QMAKE_OFF= "CONFIG+=without_cups" CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups DJVU_LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre DJVU_QMAKE_OFF= "CONFIG+=without_djvu" QT4_USE= qt4=dbus,gui,linguisttools,moc_build,rcc_build,sql,sql-sqlite3,svg,xml QT4_LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 QT5_USE= qt5=buildtools_build,concurrent,linguisttools,printsupport,sql,sql-sqlite3,svg,xml QT5_LIB_DEPENDS= libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5 PS_LIB_DEPENDS= libspectre.so:${PORTSDIR}/print/libspectre PS_QMAKE_OFF= "CONFIG+=without_ps" pre-configure: ${REINPLACE_CMD} -e 's#/usr#${PREFIX}#g;s#${PREFIX}/share/man#${PREFIX}/man#g' \ ${WRKSRC}/${PORTNAME}.pri cd ${WRKSRC} && ${LRELEASE} ${PORTNAME}.pro .include Index: head/print/splix/Makefile =================================================================== --- head/print/splix/Makefile (revision 411989) +++ head/print/splix/Makefile (revision 411990) @@ -1,81 +1,81 @@ # $FreeBSD$ PORTNAME= splix PORTVERSION= 2.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES?= print MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= CUPS printer drivers for Samsung Printer Language printers LIB_DEPENDS= libcupsimage.so:${PORTSDIR}/print/cups USES= gmake tar:bzip2 MODELS= DELL SAMSUNG XEROX PPD_DELL= 1100 1110 PPD_SAMSUNG= clp500 clp510 clp550 clp610 \ ml1510 ml1520 ml1610 ml1630 ml1640 ml1710 ml1740 ml1750 \ ml2010 ml2150 ml2250 ml2251 ml2510 ml2550 \ ml3050 ml3560 \ scx4200 scx4500 PPD_XEROX= ph3115 ph3116 ph3117 ph3120 ph3121 ph3122 ph3130 ph3150 \ ph3420 ph3425 ph5500 ph6100 wc3119 ph3160 PPD_SAMSUNG_JBIG= clp200 clp300 clp600 clx216x clx2170 clx3160 PPD_XEROX_JBIG= ph6110 FILTER_FILE= rastertoqpdl pstoqpdl CUPS_CONFIG= ${LOCALBASE}/bin/cups-config BIN_DEST_DIR= `${CUPS_CONFIG} --serverbin | ${SED} \ 's|${LOCALBASE}|${PREFIX}|'`/filter CUPS_DATA_DIR= `${CUPS_CONFIG} --datadir | ${SED} \ 's|${LOCALBASE}|${PREFIX}|'` DEST_DIR_DELL= ${CUPS_DATA_DIR}/model/dell DEST_DIR_SAMSUNG= ${CUPS_DATA_DIR}/model/samsung DEST_DIR_XEROX= ${CUPS_DATA_DIR}/model/xerox OPTIONS_DEFINE= JBIG BLACKOPTIM JBIG_DESC= Enable use of JBIG algorithm (pattented) BLACKOPTIM_DESC= Enable black correction algorithm OPTIONS_DEFAULT= JBIG BLACKOPTIM -.include "bsd.port.options.mk" +.include -post-patch: - @${REINPLACE_CMD} -e '/^CC.*:= gcc/d' -e '/^CXX.*:= g++/d' \ - -e 's/make/gmake/' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's/g++/$$(CXX)/' ${WRKSRC}/rules.mk - -post-configure: - .if ${PORT_OPTIONS:MJBIG} PPD_SAMSUNG+= ${PPD_SAMSUNG_JBIG} PPD_XEROX+= ${PPD_XEROX_JBIG} LIB_DEPENDS+= libjbig.so:${PORTSDIR}/graphics/jbigkit .else MAKE_ARGS+= DISABLE_JBIG=1 .endif .if empty(PORT_OPTIONS:MBLACKOPTIM) MAKE_ARGS+= DISABLE_BLACKOPTIM=1 .endif .if defined(CACHESIZE) MAKE_ARGS+= CACHESIZE=${CACHESIZE} .endif + +post-patch: + @${REINPLACE_CMD} -e '/^CC.*:= gcc/d' -e '/^CXX.*:= g++/d' \ + -e 's/make/$$(MAKE)/' ${WRKSRC}/Makefile + @${REINPLACE_CMD} '/cups-config --libs/s/$$/ -pthread/' \ + ${WRKSRC}/module.mk + @${REINPLACE_CMD} 's/g++/$$(CXX)/' ${WRKSRC}/rules.mk do-install: ${MKDIR} ${STAGEDIR}${BIN_DEST_DIR} .for MODEL in ${MODELS} ${MKDIR} ${STAGEDIR}${DEST_DIR_${MODEL}} .for PPD in $(PPD_${MODEL}) ${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd ${STAGEDIR}$(DEST_DIR_${MODEL}) .endfor .endfor .for FILTER in ${FILTER_FILE} ${INSTALL_PROGRAM} ${WRKSRC}/optimized/${FILTER} ${STAGEDIR}${BIN_DEST_DIR} .endfor .include Index: head/security/gnomint/Makefile =================================================================== --- head/security/gnomint/Makefile (revision 411989) +++ head/security/gnomint/Makefile (revision 411990) @@ -1,36 +1,36 @@ # Created by: Kevin Zheng # $FreeBSD$ PORTNAME= gnomint PORTVERSION= 1.2.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= security MASTER_SITES= SF MAINTAINER= kevinz5000@gmail.com COMMENT= X.509 Certification Authority management tool LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgnutls.so:${PORTSDIR}/security/gnutls \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 GNU_CONFIGURE= yes USES= gettext-tools gmake perl5 pkgconfig readline USE_GNOME= gconf2 gdkpixbuf2 glib20 gtk20 intltool CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls post-install: ${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig .include Index: head/security/gnupg/Makefile =================================================================== --- head/security/gnupg/Makefile (revision 411989) +++ head/security/gnupg/Makefile (revision 411990) @@ -1,64 +1,64 @@ # $FreeBSD$ PORTNAME= gnupg PORTVERSION= 2.1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= GNUPG DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= kuriyama@FreeBSD.org COMMENT= The GNU Privacy Guard LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libassuan.so:${PORTSDIR}/security/libassuan \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libksba.so:${PORTSDIR}/security/libksba \ libnpth.so:${PORTSDIR}/devel/npth BUILD_DEPENDS= libgpg-error>=1.16:${PORTSDIR}/security/libgpg-error RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry GNU_CONFIGURE= YES USES= cpe gmake iconv pkgconfig tar:bzip2 USE_LDCONFIG= YES # libreadline.so.8 is placed in /lib, but --with-readline argument # will be treated as $value/lib, so try using /usr instead. # Otherwise, $PREFIX/lib/libreadline.so.6 will be linked when # devel/readline is installed. CONFIGURE_ARGS+= --disable-ntbtls --enable-symcryptrun --with-readline=/usr CONFLICTS= gnupg-2.0.* dirmngr-* CPE_VENDOR= gnupg OPTIONS_DEFINE= GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) KDNS_DESC= Use DNS CERT helper SUID_GPG_DESC= Install GPG with suid OPTIONS_DEFAULT= GNUTLS NO_OPTIONS_SORT= YES OPTIONS_SUB= YES # In jail, SUID is required to avoid warning (security.bsd.unprivileged_mlock sysctl is not used in jail). DOCS_CONFIGURE_ENABLE= doc DOCS_INFO= gnupg GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls KDNS_LIB_DEPENDS= libadns.so:${PORTSDIR}/dns/adns KDNS_CONFIGURE_ON= --with-adns=${LOCALBASE} LDAP_CONFIGURE_ENABLE= ldap LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls SCDAEMON_CONFIGURE_ENABLE= scdaemon verify: checksum gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig .include Index: head/security/gnutls/Makefile =================================================================== --- head/security/gnutls/Makefile (revision 411989) +++ head/security/gnutls/Makefile (revision 411990) @@ -1,72 +1,72 @@ # $FreeBSD$ PORTNAME= gnutls -PORTVERSION= 3.3.17.1 -PORTREVISION= 3 +PORTVERSION= 3.4.10 CATEGORIES= security net -MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R:R} +MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R} MAINTAINER= tijl@FreeBSD.org COMMENT= GNU Transport Layer Security library LICENSE= GPLv3 LGPL21 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libnettle.so:${PORTSDIR}/security/nettle \ libtasn1.so:${PORTSDIR}/security/libtasn1 BUILD_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss USES= cpe gmake iconv libtool makeinfo pathfix pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-guile \ --disable-silent-rules \ --enable-local-libopts \ ac_cv_type_max_align_t=yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib MAKE_ENV= MAKEINFOFLAGS=--no-split +INSTALL_TARGET= install-strip CPE_VENDOR= gnu -OPTIONS_DEFINE= CRYWRAP EXAMPLES LIBDANE NLS P11KIT TPM ZLIB -OPTIONS_DEFAULT= CRYWRAP P11KIT TPM ZLIB +OPTIONS_DEFINE= CRYWRAP DANE EXAMPLES IDN NLS P11KIT TPM ZLIB +OPTIONS_DEFAULT= CRYWRAP IDN P11KIT TPM ZLIB OPTIONS_SUB= yes CRYWRAP_DESC= Enable Crywrap TLS proxy service -CRYWRAP_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn +CRYWRAP_IMPLIES= IDN CRYWRAP_CONFIGURE_ENABLE= crywrap -LIBDANE_DESC= DNSSEC support for DANE (danetool --check) -LIBDANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound -LIBDANE_CONFIGURE_ENABLE= libdane +DANE_DESC= Certificate verification via DNSSEC +DANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound +DANE_CONFIGURE_ENABLE= libdane +IDN_CONFIGURE_WITH= idn +IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn + NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext P11KIT_DESC= PKCS\#11 and p11-kit support P11KIT_CONFIGURE_WITH= p11-kit P11KIT_LIB_DEPENDS= libp11-kit.so:${PORTSDIR}/security/p11-kit TPM_DESC= TPM (trousers) support TPM_CONFIGURE_WITH= tpm TPM_LIB_DEPENDS= libtspi.so:${PORTSDIR}/security/trousers ZLIB_CONFIGURE_WITH= zlib INFO= gnutls gnutls-guile post-patch: @${RM} ${WRKSRC}/doc/*.info* - ${SED} -i '' -e 's|^+_NORETURN_H|_NORETURN_H|' \ - ${WRKSRC}/src/libopts/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnutls*.so.* .include Index: head/security/gnutls/distinfo =================================================================== --- head/security/gnutls/distinfo (revision 411989) +++ head/security/gnutls/distinfo (revision 411990) @@ -1,2 +1,2 @@ -SHA256 (gnutls-3.3.17.1.tar.xz) = b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4 -SIZE (gnutls-3.3.17.1.tar.xz) = 6339588 +SHA256 (gnutls-3.4.10.tar.xz) = 6a32c2b4acbd33ff7eefcbd1357009da04c94c60146ef61320b6c076b1bdf59f +SIZE (gnutls-3.4.10.tar.xz) = 6645892 Index: head/security/gnutls/files/patch-lib__x509__rfc2818_hostname.c =================================================================== --- head/security/gnutls/files/patch-lib__x509__rfc2818_hostname.c (revision 411989) +++ head/security/gnutls/files/patch-lib__x509__rfc2818_hostname.c (nonexistent) @@ -1,10 +0,0 @@ ---- lib/x509/rfc2818_hostname.c.orig 2014-10-02 13:35:09.427374817 -0500 -+++ lib/x509/rfc2818_hostname.c 2014-10-02 13:35:33.657427866 -0500 -@@ -19,6 +19,7 @@ - * - */ - -+#include - #include - #include - #include Property changes on: head/security/gnutls/files/patch-lib__x509__rfc2818_hostname.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/gnutls/files/patch-configure =================================================================== --- head/security/gnutls/files/patch-configure (nonexistent) +++ head/security/gnutls/files/patch-configure (revision 411990) @@ -0,0 +1,18 @@ +--- configure.orig 2016-03-03 07:52:15 UTC ++++ configure +@@ -47228,6 +47228,7 @@ fi + $as_echo "$enable_dane" >&6; } + + if test "$enable_dane" != "no"; then ++ oldlibs="$LIBS" + LIBS="$oldlibs -lunbound" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unbound library" >&5 + $as_echo_n "checking for unbound library... " >&6; } +@@ -47444,6 +47445,7 @@ else + fi + + if test "$with_tpm" != "no"; then ++ oldlibs="$LIBS" + LIBS="$oldlibs -ltspi" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tss library" >&5 + $as_echo_n "checking for tss library... " >&6; } Property changes on: head/security/gnutls/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gnutls/files/patch-lib-tpm.c =================================================================== --- head/security/gnutls/files/patch-lib-tpm.c (nonexistent) +++ head/security/gnutls/files/patch-lib-tpm.c (revision 411990) @@ -0,0 +1,10 @@ +--- lib/tpm.c.orig 2015-09-26 12:02:10 UTC ++++ lib/tpm.c +@@ -71,7 +71,6 @@ typedef TSS_RESULT (*Tspi_DecodeBER_TssB + typedef TSS_RESULT (*Tspi_Context_LoadKeyByBlob_func)(TSS_HCONTEXT, TSS_HKEY, UINT32, BYTE*, TSS_HKEY*); + typedef TSS_RESULT (*Tspi_Policy_AssignToObject_func)(TSS_HPOLICY, TSS_HOBJECT); + typedef TSS_RESULT (*Tspi_GetAttribData_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32*, BYTE**); +-typedef TSS_RESULT (*Tspi_Context_GetTpmObject_func)(TSS_HCONTEXT, TSS_HTPM*); + typedef TSS_RESULT (*Tspi_TPM_StirRandom_func)(TSS_HTPM, UINT32, BYTE*); + typedef TSS_RESULT (*Tspi_SetAttribUint32_func)(TSS_HOBJECT, TSS_FLAG, TSS_FLAG, UINT32); + typedef TSS_RESULT (*Tspi_EncodeDER_TssBlob_func)(UINT32, BYTE*, UINT32, UINT32*, BYTE*); Property changes on: head/security/gnutls/files/patch-lib-tpm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gnutls/pkg-plist =================================================================== --- head/security/gnutls/pkg-plist (revision 411989) +++ head/security/gnutls/pkg-plist (revision 411990) @@ -1,1065 +1,1136 @@ bin/certtool -%%LIBDANE%%bin/danetool +%%DANE%%bin/danetool bin/gnutls-cli bin/gnutls-cli-debug bin/gnutls-serv bin/ocsptool %%P11KIT%%bin/p11tool bin/psktool bin/srptool %%TPM%%bin/tpmtool include/gnutls/abstract.h include/gnutls/compat.h include/gnutls/crypto.h -%%LIBDANE%%include/gnutls/dane.h +%%DANE%%include/gnutls/dane.h include/gnutls/dtls.h include/gnutls/gnutls.h include/gnutls/gnutlsxx.h include/gnutls/ocsp.h include/gnutls/openpgp.h -include/gnutls/openssl.h include/gnutls/pkcs11.h include/gnutls/pkcs12.h +include/gnutls/pkcs7.h include/gnutls/self-test.h +include/gnutls/system-keys.h include/gnutls/tpm.h -include/gnutls/x509.h +include/gnutls/urls.h include/gnutls/x509-ext.h +include/gnutls/x509.h info/gnutls-client-server-use-case.png info/gnutls-handshake-sequence.png info/gnutls-handshake-state.png info/gnutls-internals.png info/gnutls-layers.png info/gnutls-logo.png info/gnutls-modauth.png info/gnutls-pgp.png info/gnutls-x509.png info/pkcs11-vision.png -%%LIBDANE%%lib/libgnutls-dane.so -%%LIBDANE%%lib/libgnutls-dane.so.0 -%%LIBDANE%%lib/libgnutls-dane.so.0.5.0 -lib/libgnutls-openssl.so -lib/libgnutls-openssl.so.27 -lib/libgnutls-openssl.so.27.0.2 +%%DANE%%lib/libgnutls-dane.so +%%DANE%%lib/libgnutls-dane.so.0 +%%DANE%%lib/libgnutls-dane.so.0.4.1 lib/libgnutls.so -lib/libgnutls.so.28 -lib/libgnutls.so.28.41.9 +lib/libgnutls.so.30 +lib/libgnutls.so.30.6.2 lib/libgnutlsxx.so lib/libgnutlsxx.so.28 lib/libgnutlsxx.so.28.1.0 libdata/pkgconfig/gnutls.pc -%%LIBDANE%%libdata/pkgconfig/gnutls-dane.pc +%%DANE%%libdata/pkgconfig/gnutls-dane.pc man/man1/certtool.1.gz -%%LIBDANE%%man/man1/danetool.1.gz +%%DANE%%man/man1/danetool.1.gz man/man1/gnutls-cli-debug.1.gz man/man1/gnutls-cli.1.gz man/man1/gnutls-serv.1.gz man/man1/ocsptool.1.gz man/man1/p11tool.1.gz man/man1/psktool.1.gz man/man1/srptool.1.gz man/man1/tpmtool.1.gz +man/man3/gnutls_aead_cipher_decrypt.3.gz +man/man3/gnutls_aead_cipher_deinit.3.gz +man/man3/gnutls_aead_cipher_encrypt.3.gz +man/man3/gnutls_aead_cipher_init.3.gz man/man3/gnutls_alert_get.3.gz man/man3/gnutls_alert_get_name.3.gz man/man3/gnutls_alert_get_strname.3.gz man/man3/gnutls_alert_send.3.gz man/man3/gnutls_alert_send_appropriate.3.gz man/man3/gnutls_alpn_get_selected_protocol.3.gz man/man3/gnutls_alpn_set_protocols.3.gz man/man3/gnutls_anon_allocate_client_credentials.3.gz man/man3/gnutls_anon_allocate_server_credentials.3.gz man/man3/gnutls_anon_free_client_credentials.3.gz man/man3/gnutls_anon_free_server_credentials.3.gz man/man3/gnutls_anon_set_params_function.3.gz man/man3/gnutls_anon_set_server_dh_params.3.gz man/man3/gnutls_anon_set_server_params_function.3.gz man/man3/gnutls_auth_client_get_type.3.gz man/man3/gnutls_auth_get_type.3.gz man/man3/gnutls_auth_server_get_type.3.gz +man/man3/gnutls_buffer_append_data.3.gz man/man3/gnutls_bye.3.gz man/man3/gnutls_certificate_activation_time_peers.3.gz man/man3/gnutls_certificate_allocate_credentials.3.gz man/man3/gnutls_certificate_client_get_request_status.3.gz -man/man3/gnutls_certificate_client_set_retrieve_function.3.gz man/man3/gnutls_certificate_expiration_time_peers.3.gz man/man3/gnutls_certificate_free_ca_names.3.gz man/man3/gnutls_certificate_free_cas.3.gz man/man3/gnutls_certificate_free_credentials.3.gz man/man3/gnutls_certificate_free_crls.3.gz man/man3/gnutls_certificate_free_keys.3.gz man/man3/gnutls_certificate_get_crt_raw.3.gz man/man3/gnutls_certificate_get_issuer.3.gz +man/man3/gnutls_certificate_get_openpgp_crt.3.gz +man/man3/gnutls_certificate_get_openpgp_key.3.gz man/man3/gnutls_certificate_get_ours.3.gz man/man3/gnutls_certificate_get_peers.3.gz man/man3/gnutls_certificate_get_peers_subkey_id.3.gz +man/man3/gnutls_certificate_get_trust_list.3.gz +man/man3/gnutls_certificate_get_verify_flags.3.gz +man/man3/gnutls_certificate_get_x509_crt.3.gz +man/man3/gnutls_certificate_get_x509_key.3.gz man/man3/gnutls_certificate_send_x509_rdn_sequence.3.gz man/man3/gnutls_certificate_server_set_request.3.gz -man/man3/gnutls_certificate_server_set_retrieve_function.3.gz man/man3/gnutls_certificate_set_dh_params.3.gz +man/man3/gnutls_certificate_set_flags.3.gz man/man3/gnutls_certificate_set_key.3.gz man/man3/gnutls_certificate_set_ocsp_status_request_file.3.gz man/man3/gnutls_certificate_set_ocsp_status_request_function.3.gz man/man3/gnutls_certificate_set_openpgp_key.3.gz man/man3/gnutls_certificate_set_openpgp_key_file.3.gz man/man3/gnutls_certificate_set_openpgp_key_file2.3.gz man/man3/gnutls_certificate_set_openpgp_key_mem.3.gz man/man3/gnutls_certificate_set_openpgp_key_mem2.3.gz man/man3/gnutls_certificate_set_openpgp_keyring_file.3.gz man/man3/gnutls_certificate_set_openpgp_keyring_mem.3.gz man/man3/gnutls_certificate_set_params_function.3.gz man/man3/gnutls_certificate_set_pin_function.3.gz man/man3/gnutls_certificate_set_retrieve_function.3.gz man/man3/gnutls_certificate_set_retrieve_function2.3.gz -man/man3/gnutls_certificate_set_rsa_export_params.3.gz man/man3/gnutls_certificate_set_trust_list.3.gz man/man3/gnutls_certificate_set_verify_flags.3.gz man/man3/gnutls_certificate_set_verify_function.3.gz man/man3/gnutls_certificate_set_verify_limits.3.gz man/man3/gnutls_certificate_set_x509_crl.3.gz man/man3/gnutls_certificate_set_x509_crl_file.3.gz man/man3/gnutls_certificate_set_x509_crl_mem.3.gz man/man3/gnutls_certificate_set_x509_key.3.gz man/man3/gnutls_certificate_set_x509_key_file.3.gz man/man3/gnutls_certificate_set_x509_key_file2.3.gz man/man3/gnutls_certificate_set_x509_key_mem.3.gz man/man3/gnutls_certificate_set_x509_key_mem2.3.gz man/man3/gnutls_certificate_set_x509_simple_pkcs12_file.3.gz man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem.3.gz man/man3/gnutls_certificate_set_x509_system_trust.3.gz man/man3/gnutls_certificate_set_x509_trust.3.gz man/man3/gnutls_certificate_set_x509_trust_dir.3.gz man/man3/gnutls_certificate_set_x509_trust_file.3.gz man/man3/gnutls_certificate_set_x509_trust_mem.3.gz man/man3/gnutls_certificate_type_get.3.gz man/man3/gnutls_certificate_type_get_id.3.gz man/man3/gnutls_certificate_type_get_name.3.gz man/man3/gnutls_certificate_type_list.3.gz -man/man3/gnutls_certificate_type_set_priority.3.gz man/man3/gnutls_certificate_verification_status_print.3.gz man/man3/gnutls_certificate_verify_peers.3.gz man/man3/gnutls_certificate_verify_peers2.3.gz man/man3/gnutls_certificate_verify_peers3.3.gz man/man3/gnutls_check_version.3.gz man/man3/gnutls_cipher_add_auth.3.gz man/man3/gnutls_cipher_decrypt.3.gz man/man3/gnutls_cipher_decrypt2.3.gz man/man3/gnutls_cipher_deinit.3.gz man/man3/gnutls_cipher_encrypt.3.gz man/man3/gnutls_cipher_encrypt2.3.gz man/man3/gnutls_cipher_get.3.gz man/man3/gnutls_cipher_get_block_size.3.gz man/man3/gnutls_cipher_get_id.3.gz man/man3/gnutls_cipher_get_iv_size.3.gz man/man3/gnutls_cipher_get_key_size.3.gz man/man3/gnutls_cipher_get_name.3.gz man/man3/gnutls_cipher_get_tag_size.3.gz man/man3/gnutls_cipher_init.3.gz man/man3/gnutls_cipher_list.3.gz man/man3/gnutls_cipher_self_test.3.gz man/man3/gnutls_cipher_set_iv.3.gz -man/man3/gnutls_cipher_set_priority.3.gz man/man3/gnutls_cipher_suite_get_name.3.gz man/man3/gnutls_cipher_suite_info.3.gz man/man3/gnutls_cipher_tag.3.gz man/man3/gnutls_compression_get.3.gz man/man3/gnutls_compression_get_id.3.gz man/man3/gnutls_compression_get_name.3.gz man/man3/gnutls_compression_list.3.gz -man/man3/gnutls_compression_set_priority.3.gz man/man3/gnutls_credentials_clear.3.gz man/man3/gnutls_credentials_get.3.gz man/man3/gnutls_credentials_set.3.gz +man/man3/gnutls_crypto_register_aead_cipher.3.gz +man/man3/gnutls_crypto_register_cipher.3.gz +man/man3/gnutls_crypto_register_digest.3.gz +man/man3/gnutls_crypto_register_mac.3.gz man/man3/gnutls_db_check_entry.3.gz man/man3/gnutls_db_check_entry_time.3.gz man/man3/gnutls_db_get_default_cache_expiration.3.gz man/man3/gnutls_db_get_ptr.3.gz man/man3/gnutls_db_remove_session.3.gz man/man3/gnutls_db_set_cache_expiration.3.gz man/man3/gnutls_db_set_ptr.3.gz man/man3/gnutls_db_set_remove_function.3.gz man/man3/gnutls_db_set_retrieve_function.3.gz man/man3/gnutls_db_set_store_function.3.gz man/man3/gnutls_deinit.3.gz man/man3/gnutls_dh_get_group.3.gz man/man3/gnutls_dh_get_peers_public_bits.3.gz man/man3/gnutls_dh_get_prime_bits.3.gz man/man3/gnutls_dh_get_pubkey.3.gz man/man3/gnutls_dh_get_secret_bits.3.gz man/man3/gnutls_dh_params_cpy.3.gz man/man3/gnutls_dh_params_deinit.3.gz man/man3/gnutls_dh_params_export2_pkcs3.3.gz man/man3/gnutls_dh_params_export_pkcs3.3.gz man/man3/gnutls_dh_params_export_raw.3.gz man/man3/gnutls_dh_params_generate2.3.gz man/man3/gnutls_dh_params_import_pkcs3.3.gz man/man3/gnutls_dh_params_import_raw.3.gz +man/man3/gnutls_dh_params_import_raw2.3.gz man/man3/gnutls_dh_params_init.3.gz man/man3/gnutls_dh_set_prime_bits.3.gz man/man3/gnutls_digest_get_id.3.gz man/man3/gnutls_digest_get_name.3.gz +man/man3/gnutls_digest_get_oid.3.gz man/man3/gnutls_digest_list.3.gz man/man3/gnutls_digest_self_test.3.gz man/man3/gnutls_dtls_cookie_send.3.gz man/man3/gnutls_dtls_cookie_verify.3.gz man/man3/gnutls_dtls_get_data_mtu.3.gz man/man3/gnutls_dtls_get_mtu.3.gz man/man3/gnutls_dtls_get_timeout.3.gz man/man3/gnutls_dtls_prestate_set.3.gz man/man3/gnutls_dtls_set_data_mtu.3.gz man/man3/gnutls_dtls_set_mtu.3.gz man/man3/gnutls_dtls_set_timeouts.3.gz man/man3/gnutls_ecc_curve_get.3.gz +man/man3/gnutls_ecc_curve_get_id.3.gz man/man3/gnutls_ecc_curve_get_name.3.gz +man/man3/gnutls_ecc_curve_get_oid.3.gz man/man3/gnutls_ecc_curve_get_size.3.gz man/man3/gnutls_ecc_curve_list.3.gz man/man3/gnutls_error_is_fatal.3.gz man/man3/gnutls_error_to_alert.3.gz man/man3/gnutls_est_record_overhead_size.3.gz +man/man3/gnutls_ext_get_data.3.gz +man/man3/gnutls_ext_register.3.gz +man/man3/gnutls_ext_set_data.3.gz man/man3/gnutls_fingerprint.3.gz man/man3/gnutls_fips140_mode_enabled.3.gz man/man3/gnutls_global_deinit.3.gz man/man3/gnutls_global_init.3.gz man/man3/gnutls_global_set_audit_log_function.3.gz man/man3/gnutls_global_set_log_function.3.gz man/man3/gnutls_global_set_log_level.3.gz man/man3/gnutls_global_set_mem_functions.3.gz man/man3/gnutls_global_set_mutex.3.gz man/man3/gnutls_global_set_time_function.3.gz man/man3/gnutls_handshake.3.gz man/man3/gnutls_handshake_description_get_name.3.gz man/man3/gnutls_handshake_get_last_in.3.gz man/man3/gnutls_handshake_get_last_out.3.gz man/man3/gnutls_handshake_set_hook_function.3.gz man/man3/gnutls_handshake_set_max_packet_length.3.gz man/man3/gnutls_handshake_set_post_client_hello_function.3.gz man/man3/gnutls_handshake_set_private_extensions.3.gz man/man3/gnutls_handshake_set_random.3.gz man/man3/gnutls_handshake_set_timeout.3.gz man/man3/gnutls_hash.3.gz man/man3/gnutls_hash_deinit.3.gz man/man3/gnutls_hash_fast.3.gz man/man3/gnutls_hash_get_len.3.gz man/man3/gnutls_hash_init.3.gz man/man3/gnutls_hash_output.3.gz man/man3/gnutls_heartbeat_allowed.3.gz man/man3/gnutls_heartbeat_enable.3.gz man/man3/gnutls_heartbeat_get_timeout.3.gz man/man3/gnutls_heartbeat_ping.3.gz man/man3/gnutls_heartbeat_pong.3.gz man/man3/gnutls_heartbeat_set_timeouts.3.gz man/man3/gnutls_hex2bin.3.gz man/man3/gnutls_hex_decode.3.gz +man/man3/gnutls_hex_decode2.3.gz man/man3/gnutls_hex_encode.3.gz +man/man3/gnutls_hex_encode2.3.gz man/man3/gnutls_hmac.3.gz man/man3/gnutls_hmac_deinit.3.gz man/man3/gnutls_hmac_fast.3.gz man/man3/gnutls_hmac_get_len.3.gz man/man3/gnutls_hmac_init.3.gz man/man3/gnutls_hmac_output.3.gz man/man3/gnutls_hmac_set_nonce.3.gz man/man3/gnutls_init.3.gz man/man3/gnutls_key_generate.3.gz man/man3/gnutls_kx_get.3.gz man/man3/gnutls_kx_get_id.3.gz man/man3/gnutls_kx_get_name.3.gz man/man3/gnutls_kx_list.3.gz -man/man3/gnutls_kx_set_priority.3.gz man/man3/gnutls_load_file.3.gz man/man3/gnutls_mac_get.3.gz man/man3/gnutls_mac_get_id.3.gz man/man3/gnutls_mac_get_key_size.3.gz man/man3/gnutls_mac_get_name.3.gz man/man3/gnutls_mac_get_nonce_size.3.gz man/man3/gnutls_mac_list.3.gz man/man3/gnutls_mac_self_test.3.gz -man/man3/gnutls_mac_set_priority.3.gz +man/man3/gnutls_memcmp.3.gz +man/man3/gnutls_memset.3.gz man/man3/gnutls_ocsp_req_add_cert.3.gz man/man3/gnutls_ocsp_req_add_cert_id.3.gz man/man3/gnutls_ocsp_req_deinit.3.gz man/man3/gnutls_ocsp_req_export.3.gz man/man3/gnutls_ocsp_req_get_cert_id.3.gz man/man3/gnutls_ocsp_req_get_extension.3.gz man/man3/gnutls_ocsp_req_get_nonce.3.gz man/man3/gnutls_ocsp_req_get_version.3.gz man/man3/gnutls_ocsp_req_import.3.gz man/man3/gnutls_ocsp_req_init.3.gz man/man3/gnutls_ocsp_req_print.3.gz man/man3/gnutls_ocsp_req_randomize_nonce.3.gz man/man3/gnutls_ocsp_req_set_extension.3.gz man/man3/gnutls_ocsp_req_set_nonce.3.gz man/man3/gnutls_ocsp_resp_check_crt.3.gz man/man3/gnutls_ocsp_resp_deinit.3.gz man/man3/gnutls_ocsp_resp_export.3.gz man/man3/gnutls_ocsp_resp_get_certs.3.gz man/man3/gnutls_ocsp_resp_get_extension.3.gz man/man3/gnutls_ocsp_resp_get_nonce.3.gz man/man3/gnutls_ocsp_resp_get_produced.3.gz man/man3/gnutls_ocsp_resp_get_responder.3.gz +man/man3/gnutls_ocsp_resp_get_responder_raw_id.3.gz man/man3/gnutls_ocsp_resp_get_response.3.gz man/man3/gnutls_ocsp_resp_get_signature.3.gz man/man3/gnutls_ocsp_resp_get_signature_algorithm.3.gz man/man3/gnutls_ocsp_resp_get_single.3.gz man/man3/gnutls_ocsp_resp_get_status.3.gz man/man3/gnutls_ocsp_resp_get_version.3.gz man/man3/gnutls_ocsp_resp_import.3.gz man/man3/gnutls_ocsp_resp_init.3.gz man/man3/gnutls_ocsp_resp_print.3.gz man/man3/gnutls_ocsp_resp_verify.3.gz man/man3/gnutls_ocsp_resp_verify_direct.3.gz man/man3/gnutls_ocsp_status_request_enable_client.3.gz man/man3/gnutls_ocsp_status_request_get.3.gz man/man3/gnutls_ocsp_status_request_is_checked.3.gz +man/man3/gnutls_oid_to_digest.3.gz +man/man3/gnutls_oid_to_ecc_curve.3.gz +man/man3/gnutls_oid_to_pk.3.gz +man/man3/gnutls_oid_to_sign.3.gz +man/man3/gnutls_openpgp_crt_check_email.3.gz man/man3/gnutls_openpgp_crt_check_hostname.3.gz man/man3/gnutls_openpgp_crt_check_hostname2.3.gz man/man3/gnutls_openpgp_crt_deinit.3.gz man/man3/gnutls_openpgp_crt_export.3.gz man/man3/gnutls_openpgp_crt_export2.3.gz man/man3/gnutls_openpgp_crt_get_auth_subkey.3.gz man/man3/gnutls_openpgp_crt_get_creation_time.3.gz man/man3/gnutls_openpgp_crt_get_expiration_time.3.gz man/man3/gnutls_openpgp_crt_get_fingerprint.3.gz man/man3/gnutls_openpgp_crt_get_key_id.3.gz man/man3/gnutls_openpgp_crt_get_key_usage.3.gz man/man3/gnutls_openpgp_crt_get_name.3.gz man/man3/gnutls_openpgp_crt_get_pk_algorithm.3.gz man/man3/gnutls_openpgp_crt_get_pk_dsa_raw.3.gz man/man3/gnutls_openpgp_crt_get_pk_rsa_raw.3.gz man/man3/gnutls_openpgp_crt_get_preferred_key_id.3.gz man/man3/gnutls_openpgp_crt_get_revoked_status.3.gz man/man3/gnutls_openpgp_crt_get_subkey_count.3.gz man/man3/gnutls_openpgp_crt_get_subkey_creation_time.3.gz man/man3/gnutls_openpgp_crt_get_subkey_expiration_time.3.gz man/man3/gnutls_openpgp_crt_get_subkey_fingerprint.3.gz man/man3/gnutls_openpgp_crt_get_subkey_id.3.gz man/man3/gnutls_openpgp_crt_get_subkey_idx.3.gz man/man3/gnutls_openpgp_crt_get_subkey_pk_algorithm.3.gz man/man3/gnutls_openpgp_crt_get_subkey_pk_dsa_raw.3.gz man/man3/gnutls_openpgp_crt_get_subkey_pk_rsa_raw.3.gz man/man3/gnutls_openpgp_crt_get_subkey_revoked_status.3.gz man/man3/gnutls_openpgp_crt_get_subkey_usage.3.gz man/man3/gnutls_openpgp_crt_get_version.3.gz man/man3/gnutls_openpgp_crt_import.3.gz man/man3/gnutls_openpgp_crt_init.3.gz man/man3/gnutls_openpgp_crt_print.3.gz man/man3/gnutls_openpgp_crt_set_preferred_key_id.3.gz man/man3/gnutls_openpgp_crt_verify_ring.3.gz man/man3/gnutls_openpgp_crt_verify_self.3.gz man/man3/gnutls_openpgp_keyring_check_id.3.gz man/man3/gnutls_openpgp_keyring_deinit.3.gz man/man3/gnutls_openpgp_keyring_get_crt.3.gz man/man3/gnutls_openpgp_keyring_get_crt_count.3.gz man/man3/gnutls_openpgp_keyring_import.3.gz man/man3/gnutls_openpgp_keyring_init.3.gz man/man3/gnutls_openpgp_privkey_deinit.3.gz man/man3/gnutls_openpgp_privkey_export.3.gz man/man3/gnutls_openpgp_privkey_export2.3.gz man/man3/gnutls_openpgp_privkey_export_dsa_raw.3.gz man/man3/gnutls_openpgp_privkey_export_rsa_raw.3.gz man/man3/gnutls_openpgp_privkey_export_subkey_dsa_raw.3.gz man/man3/gnutls_openpgp_privkey_export_subkey_rsa_raw.3.gz man/man3/gnutls_openpgp_privkey_get_fingerprint.3.gz man/man3/gnutls_openpgp_privkey_get_key_id.3.gz man/man3/gnutls_openpgp_privkey_get_pk_algorithm.3.gz man/man3/gnutls_openpgp_privkey_get_preferred_key_id.3.gz man/man3/gnutls_openpgp_privkey_get_revoked_status.3.gz man/man3/gnutls_openpgp_privkey_get_subkey_count.3.gz man/man3/gnutls_openpgp_privkey_get_subkey_creation_time.3.gz man/man3/gnutls_openpgp_privkey_get_subkey_expiration_time.3.gz man/man3/gnutls_openpgp_privkey_get_subkey_fingerprint.3.gz man/man3/gnutls_openpgp_privkey_get_subkey_id.3.gz man/man3/gnutls_openpgp_privkey_get_subkey_idx.3.gz man/man3/gnutls_openpgp_privkey_get_subkey_pk_algorithm.3.gz man/man3/gnutls_openpgp_privkey_get_subkey_revoked_status.3.gz man/man3/gnutls_openpgp_privkey_import.3.gz man/man3/gnutls_openpgp_privkey_init.3.gz man/man3/gnutls_openpgp_privkey_sec_param.3.gz man/man3/gnutls_openpgp_privkey_set_preferred_key_id.3.gz man/man3/gnutls_openpgp_privkey_sign_hash.3.gz man/man3/gnutls_openpgp_send_cert.3.gz man/man3/gnutls_openpgp_set_recv_key_function.3.gz man/man3/gnutls_packet_deinit.3.gz man/man3/gnutls_packet_get.3.gz man/man3/gnutls_pcert_deinit.3.gz +man/man3/gnutls_pcert_export_openpgp.3.gz +man/man3/gnutls_pcert_export_x509.3.gz man/man3/gnutls_pcert_import_openpgp.3.gz man/man3/gnutls_pcert_import_openpgp_raw.3.gz man/man3/gnutls_pcert_import_x509.3.gz +man/man3/gnutls_pcert_import_x509_list.3.gz man/man3/gnutls_pcert_import_x509_raw.3.gz man/man3/gnutls_pcert_list_import_x509_raw.3.gz man/man3/gnutls_pem_base64_decode.3.gz -man/man3/gnutls_pem_base64_decode_alloc.3.gz +man/man3/gnutls_pem_base64_decode2.3.gz man/man3/gnutls_pem_base64_encode.3.gz -man/man3/gnutls_pem_base64_encode_alloc.3.gz +man/man3/gnutls_pem_base64_encode2.3.gz man/man3/gnutls_perror.3.gz man/man3/gnutls_pk_algorithm_get_name.3.gz man/man3/gnutls_pk_bits_to_sec_param.3.gz man/man3/gnutls_pk_get_id.3.gz man/man3/gnutls_pk_get_name.3.gz +man/man3/gnutls_pk_get_oid.3.gz man/man3/gnutls_pk_list.3.gz man/man3/gnutls_pk_self_test.3.gz man/man3/gnutls_pk_to_sign.3.gz man/man3/gnutls_pkcs11_add_provider.3.gz +man/man3/gnutls_pkcs11_copy_attached_extension.3.gz +man/man3/gnutls_pkcs11_copy_pubkey.3.gz man/man3/gnutls_pkcs11_copy_secret_key.3.gz man/man3/gnutls_pkcs11_copy_x509_crt.3.gz +man/man3/gnutls_pkcs11_copy_x509_crt2.3.gz man/man3/gnutls_pkcs11_copy_x509_privkey.3.gz +man/man3/gnutls_pkcs11_copy_x509_privkey2.3.gz man/man3/gnutls_pkcs11_crt_is_known.3.gz man/man3/gnutls_pkcs11_deinit.3.gz man/man3/gnutls_pkcs11_delete_url.3.gz man/man3/gnutls_pkcs11_get_pin_function.3.gz man/man3/gnutls_pkcs11_get_raw_issuer.3.gz +man/man3/gnutls_pkcs11_get_raw_issuer_by_dn.3.gz +man/man3/gnutls_pkcs11_get_raw_issuer_by_subject_key_id.3.gz man/man3/gnutls_pkcs11_init.3.gz man/man3/gnutls_pkcs11_obj_deinit.3.gz man/man3/gnutls_pkcs11_obj_export.3.gz man/man3/gnutls_pkcs11_obj_export2.3.gz man/man3/gnutls_pkcs11_obj_export3.3.gz man/man3/gnutls_pkcs11_obj_export_url.3.gz man/man3/gnutls_pkcs11_obj_flags_get_str.3.gz man/man3/gnutls_pkcs11_obj_get_exts.3.gz man/man3/gnutls_pkcs11_obj_get_flags.3.gz man/man3/gnutls_pkcs11_obj_get_info.3.gz man/man3/gnutls_pkcs11_obj_get_type.3.gz man/man3/gnutls_pkcs11_obj_import_url.3.gz man/man3/gnutls_pkcs11_obj_init.3.gz -man/man3/gnutls_pkcs11_obj_list_import_url.3.gz -man/man3/gnutls_pkcs11_obj_list_import_url2.3.gz +man/man3/gnutls_pkcs11_obj_list_import_url3.3.gz +man/man3/gnutls_pkcs11_obj_list_import_url4.3.gz +man/man3/gnutls_pkcs11_obj_set_info.3.gz man/man3/gnutls_pkcs11_obj_set_pin_function.3.gz +man/man3/gnutls_pkcs11_privkey_cpy.3.gz man/man3/gnutls_pkcs11_privkey_deinit.3.gz man/man3/gnutls_pkcs11_privkey_export_pubkey.3.gz man/man3/gnutls_pkcs11_privkey_export_url.3.gz man/man3/gnutls_pkcs11_privkey_generate.3.gz man/man3/gnutls_pkcs11_privkey_generate2.3.gz +man/man3/gnutls_pkcs11_privkey_generate3.3.gz man/man3/gnutls_pkcs11_privkey_get_info.3.gz man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3.gz man/man3/gnutls_pkcs11_privkey_import_url.3.gz man/man3/gnutls_pkcs11_privkey_init.3.gz man/man3/gnutls_pkcs11_privkey_set_pin_function.3.gz man/man3/gnutls_pkcs11_privkey_status.3.gz man/man3/gnutls_pkcs11_reinit.3.gz man/man3/gnutls_pkcs11_set_pin_function.3.gz man/man3/gnutls_pkcs11_set_token_function.3.gz man/man3/gnutls_pkcs11_token_get_flags.3.gz man/man3/gnutls_pkcs11_token_get_info.3.gz man/man3/gnutls_pkcs11_token_get_mechanism.3.gz man/man3/gnutls_pkcs11_token_get_random.3.gz man/man3/gnutls_pkcs11_token_get_url.3.gz man/man3/gnutls_pkcs11_token_init.3.gz man/man3/gnutls_pkcs11_token_set_pin.3.gz man/man3/gnutls_pkcs11_type_get_name.3.gz man/man3/gnutls_pkcs12_bag_decrypt.3.gz man/man3/gnutls_pkcs12_bag_deinit.3.gz +man/man3/gnutls_pkcs12_bag_enc_info.3.gz man/man3/gnutls_pkcs12_bag_encrypt.3.gz man/man3/gnutls_pkcs12_bag_get_count.3.gz man/man3/gnutls_pkcs12_bag_get_data.3.gz man/man3/gnutls_pkcs12_bag_get_friendly_name.3.gz man/man3/gnutls_pkcs12_bag_get_key_id.3.gz man/man3/gnutls_pkcs12_bag_get_type.3.gz man/man3/gnutls_pkcs12_bag_init.3.gz man/man3/gnutls_pkcs12_bag_set_crl.3.gz man/man3/gnutls_pkcs12_bag_set_crt.3.gz man/man3/gnutls_pkcs12_bag_set_data.3.gz man/man3/gnutls_pkcs12_bag_set_friendly_name.3.gz man/man3/gnutls_pkcs12_bag_set_key_id.3.gz +man/man3/gnutls_pkcs12_bag_set_privkey.3.gz man/man3/gnutls_pkcs12_deinit.3.gz man/man3/gnutls_pkcs12_export.3.gz man/man3/gnutls_pkcs12_export2.3.gz man/man3/gnutls_pkcs12_generate_mac.3.gz +man/man3/gnutls_pkcs12_generate_mac2.3.gz man/man3/gnutls_pkcs12_get_bag.3.gz man/man3/gnutls_pkcs12_import.3.gz man/man3/gnutls_pkcs12_init.3.gz +man/man3/gnutls_pkcs12_mac_info.3.gz man/man3/gnutls_pkcs12_set_bag.3.gz man/man3/gnutls_pkcs12_simple_parse.3.gz man/man3/gnutls_pkcs12_verify_mac.3.gz +man/man3/gnutls_pkcs7_add_attr.3.gz +man/man3/gnutls_pkcs7_attrs_deinit.3.gz man/man3/gnutls_pkcs7_deinit.3.gz man/man3/gnutls_pkcs7_delete_crl.3.gz man/man3/gnutls_pkcs7_delete_crt.3.gz man/man3/gnutls_pkcs7_export.3.gz man/man3/gnutls_pkcs7_export2.3.gz +man/man3/gnutls_pkcs7_get_attr.3.gz man/man3/gnutls_pkcs7_get_crl_count.3.gz man/man3/gnutls_pkcs7_get_crl_raw.3.gz +man/man3/gnutls_pkcs7_get_crl_raw2.3.gz man/man3/gnutls_pkcs7_get_crt_count.3.gz man/man3/gnutls_pkcs7_get_crt_raw.3.gz +man/man3/gnutls_pkcs7_get_crt_raw2.3.gz +man/man3/gnutls_pkcs7_get_embedded_data.3.gz +man/man3/gnutls_pkcs7_get_signature_count.3.gz +man/man3/gnutls_pkcs7_get_signature_info.3.gz man/man3/gnutls_pkcs7_import.3.gz man/man3/gnutls_pkcs7_init.3.gz +man/man3/gnutls_pkcs7_print.3.gz man/man3/gnutls_pkcs7_set_crl.3.gz man/man3/gnutls_pkcs7_set_crl_raw.3.gz man/man3/gnutls_pkcs7_set_crt.3.gz man/man3/gnutls_pkcs7_set_crt_raw.3.gz +man/man3/gnutls_pkcs7_sign.3.gz +man/man3/gnutls_pkcs7_signature_info_deinit.3.gz +man/man3/gnutls_pkcs7_verify.3.gz +man/man3/gnutls_pkcs7_verify_direct.3.gz +man/man3/gnutls_pkcs8_info.3.gz +man/man3/gnutls_pkcs_schema_get_name.3.gz +man/man3/gnutls_pkcs_schema_get_oid.3.gz man/man3/gnutls_prf.3.gz man/man3/gnutls_prf_raw.3.gz +man/man3/gnutls_prf_rfc5705.3.gz man/man3/gnutls_priority_certificate_type_list.3.gz man/man3/gnutls_priority_cipher_list.3.gz man/man3/gnutls_priority_compression_list.3.gz man/man3/gnutls_priority_deinit.3.gz man/man3/gnutls_priority_ecc_curve_list.3.gz man/man3/gnutls_priority_get_cipher_suite_index.3.gz man/man3/gnutls_priority_init.3.gz man/man3/gnutls_priority_kx_list.3.gz man/man3/gnutls_priority_mac_list.3.gz man/man3/gnutls_priority_protocol_list.3.gz man/man3/gnutls_priority_set.3.gz man/man3/gnutls_priority_set_direct.3.gz man/man3/gnutls_priority_sign_list.3.gz +man/man3/gnutls_priority_string_list.3.gz man/man3/gnutls_privkey_decrypt_data.3.gz man/man3/gnutls_privkey_deinit.3.gz man/man3/gnutls_privkey_export_dsa_raw.3.gz man/man3/gnutls_privkey_export_ecc_raw.3.gz +man/man3/gnutls_privkey_export_openpgp.3.gz +man/man3/gnutls_privkey_export_pkcs11.3.gz man/man3/gnutls_privkey_export_rsa_raw.3.gz +man/man3/gnutls_privkey_export_x509.3.gz man/man3/gnutls_privkey_generate.3.gz man/man3/gnutls_privkey_get_pk_algorithm.3.gz man/man3/gnutls_privkey_get_type.3.gz man/man3/gnutls_privkey_import_dsa_raw.3.gz man/man3/gnutls_privkey_import_ecc_raw.3.gz man/man3/gnutls_privkey_import_ext.3.gz man/man3/gnutls_privkey_import_ext2.3.gz +man/man3/gnutls_privkey_import_ext3.3.gz man/man3/gnutls_privkey_import_openpgp.3.gz man/man3/gnutls_privkey_import_openpgp_raw.3.gz man/man3/gnutls_privkey_import_pkcs11.3.gz man/man3/gnutls_privkey_import_pkcs11_url.3.gz man/man3/gnutls_privkey_import_rsa_raw.3.gz man/man3/gnutls_privkey_import_tpm_raw.3.gz man/man3/gnutls_privkey_import_tpm_url.3.gz man/man3/gnutls_privkey_import_url.3.gz man/man3/gnutls_privkey_import_x509.3.gz man/man3/gnutls_privkey_import_x509_raw.3.gz man/man3/gnutls_privkey_init.3.gz man/man3/gnutls_privkey_set_pin_function.3.gz man/man3/gnutls_privkey_sign_data.3.gz man/man3/gnutls_privkey_sign_hash.3.gz -man/man3/gnutls_privkey_sign_raw_data.3.gz man/man3/gnutls_privkey_status.3.gz man/man3/gnutls_privkey_verify_params.3.gz man/man3/gnutls_protocol_get_id.3.gz man/man3/gnutls_protocol_get_name.3.gz man/man3/gnutls_protocol_get_version.3.gz man/man3/gnutls_protocol_list.3.gz -man/man3/gnutls_protocol_set_priority.3.gz man/man3/gnutls_psk_allocate_client_credentials.3.gz man/man3/gnutls_psk_allocate_server_credentials.3.gz man/man3/gnutls_psk_client_get_hint.3.gz man/man3/gnutls_psk_free_client_credentials.3.gz man/man3/gnutls_psk_free_server_credentials.3.gz man/man3/gnutls_psk_server_get_username.3.gz man/man3/gnutls_psk_set_client_credentials.3.gz man/man3/gnutls_psk_set_client_credentials_function.3.gz man/man3/gnutls_psk_set_params_function.3.gz man/man3/gnutls_psk_set_server_credentials_file.3.gz man/man3/gnutls_psk_set_server_credentials_function.3.gz man/man3/gnutls_psk_set_server_credentials_hint.3.gz man/man3/gnutls_psk_set_server_dh_params.3.gz man/man3/gnutls_psk_set_server_params_function.3.gz man/man3/gnutls_pubkey_deinit.3.gz man/man3/gnutls_pubkey_encrypt_data.3.gz man/man3/gnutls_pubkey_export.3.gz man/man3/gnutls_pubkey_export2.3.gz man/man3/gnutls_pubkey_export_dsa_raw.3.gz man/man3/gnutls_pubkey_export_ecc_raw.3.gz man/man3/gnutls_pubkey_export_ecc_x962.3.gz man/man3/gnutls_pubkey_export_rsa_raw.3.gz man/man3/gnutls_pubkey_get_key_id.3.gz man/man3/gnutls_pubkey_get_key_usage.3.gz man/man3/gnutls_pubkey_get_openpgp_key_id.3.gz man/man3/gnutls_pubkey_get_pk_algorithm.3.gz man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3.gz -man/man3/gnutls_pubkey_get_verify_algorithm.3.gz man/man3/gnutls_pubkey_import.3.gz man/man3/gnutls_pubkey_import_dsa_raw.3.gz man/man3/gnutls_pubkey_import_ecc_raw.3.gz man/man3/gnutls_pubkey_import_ecc_x962.3.gz man/man3/gnutls_pubkey_import_openpgp.3.gz man/man3/gnutls_pubkey_import_openpgp_raw.3.gz man/man3/gnutls_pubkey_import_pkcs11.3.gz -man/man3/gnutls_pubkey_import_pkcs11_url.3.gz man/man3/gnutls_pubkey_import_privkey.3.gz man/man3/gnutls_pubkey_import_rsa_raw.3.gz man/man3/gnutls_pubkey_import_tpm_raw.3.gz man/man3/gnutls_pubkey_import_tpm_url.3.gz man/man3/gnutls_pubkey_import_url.3.gz man/man3/gnutls_pubkey_import_x509.3.gz man/man3/gnutls_pubkey_import_x509_crq.3.gz man/man3/gnutls_pubkey_import_x509_raw.3.gz man/man3/gnutls_pubkey_init.3.gz man/man3/gnutls_pubkey_print.3.gz man/man3/gnutls_pubkey_set_key_usage.3.gz man/man3/gnutls_pubkey_set_pin_function.3.gz -man/man3/gnutls_pubkey_verify_data.3.gz man/man3/gnutls_pubkey_verify_data2.3.gz -man/man3/gnutls_pubkey_verify_hash.3.gz man/man3/gnutls_pubkey_verify_hash2.3.gz man/man3/gnutls_pubkey_verify_params.3.gz man/man3/gnutls_random_art.3.gz man/man3/gnutls_range_split.3.gz man/man3/gnutls_record_can_use_length_hiding.3.gz man/man3/gnutls_record_check_corked.3.gz man/man3/gnutls_record_check_pending.3.gz man/man3/gnutls_record_cork.3.gz man/man3/gnutls_record_disable_padding.3.gz +man/man3/gnutls_record_discard_queued.3.gz man/man3/gnutls_record_get_direction.3.gz man/man3/gnutls_record_get_discarded.3.gz man/man3/gnutls_record_get_max_size.3.gz +man/man3/gnutls_record_get_state.3.gz man/man3/gnutls_record_overhead_size.3.gz man/man3/gnutls_record_recv.3.gz man/man3/gnutls_record_recv_packet.3.gz man/man3/gnutls_record_recv_seq.3.gz man/man3/gnutls_record_send.3.gz man/man3/gnutls_record_send_range.3.gz -man/man3/gnutls_record_set_max_empty_records.3.gz man/man3/gnutls_record_set_max_size.3.gz +man/man3/gnutls_record_set_state.3.gz man/man3/gnutls_record_set_timeout.3.gz man/man3/gnutls_record_uncork.3.gz +man/man3/gnutls_register_custom_url.3.gz man/man3/gnutls_rehandshake.3.gz man/man3/gnutls_rnd.3.gz man/man3/gnutls_rnd_refresh.3.gz -man/man3/gnutls_rsa_export_get_modulus_bits.3.gz -man/man3/gnutls_rsa_export_get_pubkey.3.gz -man/man3/gnutls_rsa_params_cpy.3.gz -man/man3/gnutls_rsa_params_deinit.3.gz -man/man3/gnutls_rsa_params_export_pkcs1.3.gz -man/man3/gnutls_rsa_params_export_raw.3.gz -man/man3/gnutls_rsa_params_generate2.3.gz -man/man3/gnutls_rsa_params_import_pkcs1.3.gz -man/man3/gnutls_rsa_params_import_raw.3.gz -man/man3/gnutls_rsa_params_init.3.gz man/man3/gnutls_safe_renegotiation_status.3.gz man/man3/gnutls_sec_param_get_name.3.gz man/man3/gnutls_sec_param_to_pk_bits.3.gz man/man3/gnutls_sec_param_to_symmetric_bits.3.gz man/man3/gnutls_server_name_get.3.gz man/man3/gnutls_server_name_set.3.gz man/man3/gnutls_session_channel_binding.3.gz man/man3/gnutls_session_enable_compatibility_mode.3.gz +man/man3/gnutls_session_etm_status.3.gz +man/man3/gnutls_session_ext_master_secret_status.3.gz man/man3/gnutls_session_force_valid.3.gz man/man3/gnutls_session_get_data.3.gz man/man3/gnutls_session_get_data2.3.gz man/man3/gnutls_session_get_desc.3.gz man/man3/gnutls_session_get_id.3.gz man/man3/gnutls_session_get_id2.3.gz man/man3/gnutls_session_get_ptr.3.gz man/man3/gnutls_session_get_random.3.gz +man/man3/gnutls_session_get_verify_cert_status.3.gz man/man3/gnutls_session_is_resumed.3.gz man/man3/gnutls_session_resumption_requested.3.gz man/man3/gnutls_session_set_data.3.gz man/man3/gnutls_session_set_id.3.gz man/man3/gnutls_session_set_premaster.3.gz man/man3/gnutls_session_set_ptr.3.gz +man/man3/gnutls_session_set_verify_cert.3.gz +man/man3/gnutls_session_set_verify_cert2.3.gz +man/man3/gnutls_session_set_verify_function.3.gz man/man3/gnutls_session_ticket_enable_client.3.gz man/man3/gnutls_session_ticket_enable_server.3.gz man/man3/gnutls_session_ticket_key_generate.3.gz -man/man3/gnutls_set_default_export_priority.3.gz man/man3/gnutls_set_default_priority.3.gz man/man3/gnutls_sign_algorithm_get.3.gz man/man3/gnutls_sign_algorithm_get_client.3.gz man/man3/gnutls_sign_algorithm_get_requested.3.gz -man/man3/gnutls_sign_callback_get.3.gz -man/man3/gnutls_sign_callback_set.3.gz man/man3/gnutls_sign_get_hash_algorithm.3.gz man/man3/gnutls_sign_get_id.3.gz man/man3/gnutls_sign_get_name.3.gz +man/man3/gnutls_sign_get_oid.3.gz man/man3/gnutls_sign_get_pk_algorithm.3.gz man/man3/gnutls_sign_is_secure.3.gz man/man3/gnutls_sign_list.3.gz man/man3/gnutls_srp_allocate_client_credentials.3.gz man/man3/gnutls_srp_allocate_server_credentials.3.gz man/man3/gnutls_srp_base64_decode.3.gz -man/man3/gnutls_srp_base64_decode_alloc.3.gz +man/man3/gnutls_srp_base64_decode2.3.gz man/man3/gnutls_srp_base64_encode.3.gz -man/man3/gnutls_srp_base64_encode_alloc.3.gz +man/man3/gnutls_srp_base64_encode2.3.gz man/man3/gnutls_srp_free_client_credentials.3.gz man/man3/gnutls_srp_free_server_credentials.3.gz man/man3/gnutls_srp_server_get_username.3.gz man/man3/gnutls_srp_set_client_credentials.3.gz man/man3/gnutls_srp_set_client_credentials_function.3.gz man/man3/gnutls_srp_set_prime_bits.3.gz man/man3/gnutls_srp_set_server_credentials_file.3.gz man/man3/gnutls_srp_set_server_credentials_function.3.gz man/man3/gnutls_srp_set_server_fake_salt_seed.3.gz man/man3/gnutls_srp_verifier.3.gz man/man3/gnutls_srtp_get_keys.3.gz man/man3/gnutls_srtp_get_mki.3.gz man/man3/gnutls_srtp_get_profile_id.3.gz man/man3/gnutls_srtp_get_profile_name.3.gz man/man3/gnutls_srtp_get_selected_profile.3.gz man/man3/gnutls_srtp_set_mki.3.gz man/man3/gnutls_srtp_set_profile.3.gz man/man3/gnutls_srtp_set_profile_direct.3.gz man/man3/gnutls_store_commitment.3.gz man/man3/gnutls_store_pubkey.3.gz man/man3/gnutls_strerror.3.gz man/man3/gnutls_strerror_name.3.gz man/man3/gnutls_subject_alt_names_deinit.3.gz man/man3/gnutls_subject_alt_names_get.3.gz man/man3/gnutls_subject_alt_names_init.3.gz man/man3/gnutls_subject_alt_names_set.3.gz man/man3/gnutls_supplemental_get_name.3.gz +man/man3/gnutls_supplemental_recv.3.gz +man/man3/gnutls_supplemental_register.3.gz +man/man3/gnutls_supplemental_send.3.gz +man/man3/gnutls_system_key_add_x509.3.gz +man/man3/gnutls_system_key_delete.3.gz +man/man3/gnutls_system_key_iter_deinit.3.gz +man/man3/gnutls_system_key_iter_get_info.3.gz +man/man3/gnutls_system_recv_timeout.3.gz man/man3/gnutls_tdb_deinit.3.gz man/man3/gnutls_tdb_init.3.gz man/man3/gnutls_tdb_set_store_commitment_func.3.gz man/man3/gnutls_tdb_set_store_func.3.gz man/man3/gnutls_tdb_set_verify_func.3.gz man/man3/gnutls_tpm_get_registered.3.gz man/man3/gnutls_tpm_key_list_deinit.3.gz man/man3/gnutls_tpm_key_list_get_url.3.gz man/man3/gnutls_tpm_privkey_delete.3.gz man/man3/gnutls_tpm_privkey_generate.3.gz man/man3/gnutls_transport_get_int.3.gz man/man3/gnutls_transport_get_int2.3.gz man/man3/gnutls_transport_get_ptr.3.gz man/man3/gnutls_transport_get_ptr2.3.gz man/man3/gnutls_transport_set_errno.3.gz man/man3/gnutls_transport_set_errno_function.3.gz man/man3/gnutls_transport_set_int.3.gz man/man3/gnutls_transport_set_int2.3.gz man/man3/gnutls_transport_set_ptr.3.gz man/man3/gnutls_transport_set_ptr2.3.gz man/man3/gnutls_transport_set_pull_function.3.gz man/man3/gnutls_transport_set_pull_timeout_function.3.gz man/man3/gnutls_transport_set_push_function.3.gz man/man3/gnutls_transport_set_vec_push_function.3.gz man/man3/gnutls_url_is_supported.3.gz man/man3/gnutls_verify_stored_pubkey.3.gz man/man3/gnutls_x509_aia_deinit.3.gz man/man3/gnutls_x509_aia_get.3.gz man/man3/gnutls_x509_aia_init.3.gz man/man3/gnutls_x509_aia_set.3.gz man/man3/gnutls_x509_aki_deinit.3.gz man/man3/gnutls_x509_aki_get_cert_issuer.3.gz man/man3/gnutls_x509_aki_get_id.3.gz man/man3/gnutls_x509_aki_init.3.gz man/man3/gnutls_x509_aki_set_cert_issuer.3.gz man/man3/gnutls_x509_aki_set_id.3.gz man/man3/gnutls_x509_crl_check_issuer.3.gz man/man3/gnutls_x509_crl_deinit.3.gz man/man3/gnutls_x509_crl_dist_points_deinit.3.gz man/man3/gnutls_x509_crl_dist_points_get.3.gz man/man3/gnutls_x509_crl_dist_points_init.3.gz man/man3/gnutls_x509_crl_dist_points_set.3.gz man/man3/gnutls_x509_crl_export.3.gz man/man3/gnutls_x509_crl_export2.3.gz man/man3/gnutls_x509_crl_get_authority_key_gn_serial.3.gz man/man3/gnutls_x509_crl_get_authority_key_id.3.gz man/man3/gnutls_x509_crl_get_crt_count.3.gz man/man3/gnutls_x509_crl_get_crt_serial.3.gz man/man3/gnutls_x509_crl_get_dn_oid.3.gz man/man3/gnutls_x509_crl_get_extension_data.3.gz man/man3/gnutls_x509_crl_get_extension_data2.3.gz man/man3/gnutls_x509_crl_get_extension_info.3.gz man/man3/gnutls_x509_crl_get_extension_oid.3.gz man/man3/gnutls_x509_crl_get_issuer_dn.3.gz man/man3/gnutls_x509_crl_get_issuer_dn2.3.gz man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3.gz man/man3/gnutls_x509_crl_get_next_update.3.gz man/man3/gnutls_x509_crl_get_number.3.gz man/man3/gnutls_x509_crl_get_raw_issuer_dn.3.gz man/man3/gnutls_x509_crl_get_signature.3.gz man/man3/gnutls_x509_crl_get_signature_algorithm.3.gz man/man3/gnutls_x509_crl_get_this_update.3.gz man/man3/gnutls_x509_crl_get_version.3.gz man/man3/gnutls_x509_crl_import.3.gz man/man3/gnutls_x509_crl_init.3.gz man/man3/gnutls_x509_crl_iter_crt_serial.3.gz man/man3/gnutls_x509_crl_iter_deinit.3.gz man/man3/gnutls_x509_crl_list_import.3.gz man/man3/gnutls_x509_crl_list_import2.3.gz man/man3/gnutls_x509_crl_print.3.gz man/man3/gnutls_x509_crl_privkey_sign.3.gz man/man3/gnutls_x509_crl_set_authority_key_id.3.gz man/man3/gnutls_x509_crl_set_crt.3.gz man/man3/gnutls_x509_crl_set_crt_serial.3.gz man/man3/gnutls_x509_crl_set_next_update.3.gz man/man3/gnutls_x509_crl_set_number.3.gz man/man3/gnutls_x509_crl_set_this_update.3.gz man/man3/gnutls_x509_crl_set_version.3.gz man/man3/gnutls_x509_crl_sign.3.gz man/man3/gnutls_x509_crl_sign2.3.gz man/man3/gnutls_x509_crl_verify.3.gz man/man3/gnutls_x509_crq_deinit.3.gz man/man3/gnutls_x509_crq_export.3.gz man/man3/gnutls_x509_crq_export2.3.gz man/man3/gnutls_x509_crq_get_attribute_by_oid.3.gz man/man3/gnutls_x509_crq_get_attribute_data.3.gz man/man3/gnutls_x509_crq_get_attribute_info.3.gz man/man3/gnutls_x509_crq_get_basic_constraints.3.gz man/man3/gnutls_x509_crq_get_challenge_password.3.gz man/man3/gnutls_x509_crq_get_dn.3.gz man/man3/gnutls_x509_crq_get_dn2.3.gz man/man3/gnutls_x509_crq_get_dn_by_oid.3.gz man/man3/gnutls_x509_crq_get_dn_oid.3.gz man/man3/gnutls_x509_crq_get_extension_by_oid.3.gz man/man3/gnutls_x509_crq_get_extension_by_oid2.3.gz man/man3/gnutls_x509_crq_get_extension_data.3.gz man/man3/gnutls_x509_crq_get_extension_data2.3.gz man/man3/gnutls_x509_crq_get_extension_info.3.gz man/man3/gnutls_x509_crq_get_key_id.3.gz man/man3/gnutls_x509_crq_get_key_purpose_oid.3.gz man/man3/gnutls_x509_crq_get_key_rsa_raw.3.gz man/man3/gnutls_x509_crq_get_key_usage.3.gz man/man3/gnutls_x509_crq_get_pk_algorithm.3.gz man/man3/gnutls_x509_crq_get_private_key_usage_period.3.gz +man/man3/gnutls_x509_crq_get_signature_algorithm.3.gz man/man3/gnutls_x509_crq_get_subject_alt_name.3.gz man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3.gz man/man3/gnutls_x509_crq_get_version.3.gz man/man3/gnutls_x509_crq_import.3.gz man/man3/gnutls_x509_crq_init.3.gz man/man3/gnutls_x509_crq_print.3.gz man/man3/gnutls_x509_crq_privkey_sign.3.gz man/man3/gnutls_x509_crq_set_attribute_by_oid.3.gz man/man3/gnutls_x509_crq_set_basic_constraints.3.gz man/man3/gnutls_x509_crq_set_challenge_password.3.gz man/man3/gnutls_x509_crq_set_dn.3.gz man/man3/gnutls_x509_crq_set_dn_by_oid.3.gz man/man3/gnutls_x509_crq_set_key.3.gz man/man3/gnutls_x509_crq_set_key_purpose_oid.3.gz man/man3/gnutls_x509_crq_set_key_rsa_raw.3.gz man/man3/gnutls_x509_crq_set_key_usage.3.gz man/man3/gnutls_x509_crq_set_private_key_usage_period.3.gz man/man3/gnutls_x509_crq_set_pubkey.3.gz man/man3/gnutls_x509_crq_set_subject_alt_name.3.gz man/man3/gnutls_x509_crq_set_version.3.gz man/man3/gnutls_x509_crq_sign.3.gz man/man3/gnutls_x509_crq_sign2.3.gz man/man3/gnutls_x509_crq_verify.3.gz +man/man3/gnutls_x509_crt_check_email.3.gz man/man3/gnutls_x509_crt_check_hostname.3.gz man/man3/gnutls_x509_crt_check_hostname2.3.gz man/man3/gnutls_x509_crt_check_issuer.3.gz man/man3/gnutls_x509_crt_check_revocation.3.gz man/man3/gnutls_x509_crt_cpy_crl_dist_points.3.gz man/man3/gnutls_x509_crt_deinit.3.gz man/man3/gnutls_x509_crt_export.3.gz man/man3/gnutls_x509_crt_export2.3.gz man/man3/gnutls_x509_crt_get_activation_time.3.gz man/man3/gnutls_x509_crt_get_authority_info_access.3.gz man/man3/gnutls_x509_crt_get_authority_key_gn_serial.3.gz man/man3/gnutls_x509_crt_get_authority_key_id.3.gz man/man3/gnutls_x509_crt_get_basic_constraints.3.gz man/man3/gnutls_x509_crt_get_ca_status.3.gz man/man3/gnutls_x509_crt_get_crl_dist_points.3.gz man/man3/gnutls_x509_crt_get_dn.3.gz man/man3/gnutls_x509_crt_get_dn2.3.gz man/man3/gnutls_x509_crt_get_dn_by_oid.3.gz man/man3/gnutls_x509_crt_get_dn_oid.3.gz man/man3/gnutls_x509_crt_get_expiration_time.3.gz man/man3/gnutls_x509_crt_get_extension_by_oid.3.gz man/man3/gnutls_x509_crt_get_extension_by_oid2.3.gz man/man3/gnutls_x509_crt_get_extension_data.3.gz man/man3/gnutls_x509_crt_get_extension_data2.3.gz man/man3/gnutls_x509_crt_get_extension_info.3.gz man/man3/gnutls_x509_crt_get_extension_oid.3.gz man/man3/gnutls_x509_crt_get_fingerprint.3.gz man/man3/gnutls_x509_crt_get_issuer.3.gz man/man3/gnutls_x509_crt_get_issuer_alt_name.3.gz man/man3/gnutls_x509_crt_get_issuer_alt_name2.3.gz man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3.gz man/man3/gnutls_x509_crt_get_issuer_dn.3.gz man/man3/gnutls_x509_crt_get_issuer_dn2.3.gz man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3.gz man/man3/gnutls_x509_crt_get_issuer_dn_oid.3.gz man/man3/gnutls_x509_crt_get_issuer_unique_id.3.gz man/man3/gnutls_x509_crt_get_key_id.3.gz man/man3/gnutls_x509_crt_get_key_purpose_oid.3.gz man/man3/gnutls_x509_crt_get_key_usage.3.gz man/man3/gnutls_x509_crt_get_name_constraints.3.gz man/man3/gnutls_x509_crt_get_pk_algorithm.3.gz man/man3/gnutls_x509_crt_get_pk_dsa_raw.3.gz +man/man3/gnutls_x509_crt_get_pk_ecc_raw.3.gz man/man3/gnutls_x509_crt_get_pk_rsa_raw.3.gz man/man3/gnutls_x509_crt_get_policy.3.gz man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3.gz man/man3/gnutls_x509_crt_get_private_key_usage_period.3.gz man/man3/gnutls_x509_crt_get_proxy.3.gz man/man3/gnutls_x509_crt_get_raw_dn.3.gz man/man3/gnutls_x509_crt_get_raw_issuer_dn.3.gz man/man3/gnutls_x509_crt_get_serial.3.gz man/man3/gnutls_x509_crt_get_signature.3.gz man/man3/gnutls_x509_crt_get_signature_algorithm.3.gz man/man3/gnutls_x509_crt_get_subject.3.gz man/man3/gnutls_x509_crt_get_subject_alt_name.3.gz man/man3/gnutls_x509_crt_get_subject_alt_name2.3.gz man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3.gz man/man3/gnutls_x509_crt_get_subject_key_id.3.gz man/man3/gnutls_x509_crt_get_subject_unique_id.3.gz -man/man3/gnutls_x509_crt_get_verify_algorithm.3.gz man/man3/gnutls_x509_crt_get_version.3.gz man/man3/gnutls_x509_crt_import.3.gz man/man3/gnutls_x509_crt_import_pkcs11.3.gz -man/man3/gnutls_x509_crt_import_pkcs11_url.3.gz +man/man3/gnutls_x509_crt_import_url.3.gz man/man3/gnutls_x509_crt_init.3.gz man/man3/gnutls_x509_crt_list_import.3.gz man/man3/gnutls_x509_crt_list_import2.3.gz man/man3/gnutls_x509_crt_list_import_pkcs11.3.gz man/man3/gnutls_x509_crt_list_verify.3.gz man/man3/gnutls_x509_crt_print.3.gz man/man3/gnutls_x509_crt_privkey_sign.3.gz man/man3/gnutls_x509_crt_set_activation_time.3.gz man/man3/gnutls_x509_crt_set_authority_info_access.3.gz man/man3/gnutls_x509_crt_set_authority_key_id.3.gz man/man3/gnutls_x509_crt_set_basic_constraints.3.gz man/man3/gnutls_x509_crt_set_ca_status.3.gz man/man3/gnutls_x509_crt_set_crl_dist_points.3.gz man/man3/gnutls_x509_crt_set_crl_dist_points2.3.gz man/man3/gnutls_x509_crt_set_crq.3.gz man/man3/gnutls_x509_crt_set_crq_extensions.3.gz man/man3/gnutls_x509_crt_set_dn.3.gz man/man3/gnutls_x509_crt_set_dn_by_oid.3.gz man/man3/gnutls_x509_crt_set_expiration_time.3.gz man/man3/gnutls_x509_crt_set_extension_by_oid.3.gz man/man3/gnutls_x509_crt_set_issuer_alt_name.3.gz man/man3/gnutls_x509_crt_set_issuer_dn.3.gz man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3.gz +man/man3/gnutls_x509_crt_set_issuer_unique_id.3.gz man/man3/gnutls_x509_crt_set_key.3.gz man/man3/gnutls_x509_crt_set_key_purpose_oid.3.gz man/man3/gnutls_x509_crt_set_key_usage.3.gz man/man3/gnutls_x509_crt_set_name_constraints.3.gz man/man3/gnutls_x509_crt_set_pin_function.3.gz man/man3/gnutls_x509_crt_set_policy.3.gz man/man3/gnutls_x509_crt_set_private_key_usage_period.3.gz man/man3/gnutls_x509_crt_set_proxy.3.gz man/man3/gnutls_x509_crt_set_proxy_dn.3.gz man/man3/gnutls_x509_crt_set_pubkey.3.gz man/man3/gnutls_x509_crt_set_serial.3.gz man/man3/gnutls_x509_crt_set_subject_alt_name.3.gz man/man3/gnutls_x509_crt_set_subject_alternative_name.3.gz man/man3/gnutls_x509_crt_set_subject_key_id.3.gz +man/man3/gnutls_x509_crt_set_subject_unique_id.3.gz man/man3/gnutls_x509_crt_set_version.3.gz man/man3/gnutls_x509_crt_sign.3.gz man/man3/gnutls_x509_crt_sign2.3.gz man/man3/gnutls_x509_crt_verify.3.gz -man/man3/gnutls_x509_crt_verify_data.3.gz -man/man3/gnutls_x509_crt_verify_hash.3.gz +man/man3/gnutls_x509_crt_verify_data2.3.gz man/man3/gnutls_x509_dn_deinit.3.gz man/man3/gnutls_x509_dn_export.3.gz man/man3/gnutls_x509_dn_export2.3.gz man/man3/gnutls_x509_dn_get_rdn_ava.3.gz +man/man3/gnutls_x509_dn_get_str.3.gz man/man3/gnutls_x509_dn_import.3.gz man/man3/gnutls_x509_dn_init.3.gz man/man3/gnutls_x509_dn_oid_known.3.gz man/man3/gnutls_x509_dn_oid_name.3.gz man/man3/gnutls_x509_ext_deinit.3.gz man/man3/gnutls_x509_ext_export_aia.3.gz man/man3/gnutls_x509_ext_export_authority_key_id.3.gz man/man3/gnutls_x509_ext_export_basic_constraints.3.gz man/man3/gnutls_x509_ext_export_crl_dist_points.3.gz man/man3/gnutls_x509_ext_export_key_purposes.3.gz man/man3/gnutls_x509_ext_export_key_usage.3.gz man/man3/gnutls_x509_ext_export_name_constraints.3.gz man/man3/gnutls_x509_ext_export_policies.3.gz man/man3/gnutls_x509_ext_export_private_key_usage_period.3.gz man/man3/gnutls_x509_ext_export_proxy.3.gz man/man3/gnutls_x509_ext_export_subject_alt_names.3.gz man/man3/gnutls_x509_ext_export_subject_key_id.3.gz man/man3/gnutls_x509_ext_import_aia.3.gz man/man3/gnutls_x509_ext_import_authority_key_id.3.gz man/man3/gnutls_x509_ext_import_basic_constraints.3.gz man/man3/gnutls_x509_ext_import_crl_dist_points.3.gz man/man3/gnutls_x509_ext_import_key_purposes.3.gz man/man3/gnutls_x509_ext_import_key_usage.3.gz man/man3/gnutls_x509_ext_import_name_constraints.3.gz man/man3/gnutls_x509_ext_import_policies.3.gz man/man3/gnutls_x509_ext_import_private_key_usage_period.3.gz man/man3/gnutls_x509_ext_import_proxy.3.gz man/man3/gnutls_x509_ext_import_subject_alt_names.3.gz man/man3/gnutls_x509_ext_import_subject_key_id.3.gz man/man3/gnutls_x509_ext_print.3.gz man/man3/gnutls_x509_key_purpose_deinit.3.gz man/man3/gnutls_x509_key_purpose_get.3.gz man/man3/gnutls_x509_key_purpose_init.3.gz man/man3/gnutls_x509_key_purpose_set.3.gz man/man3/gnutls_x509_name_constraints_add_excluded.3.gz man/man3/gnutls_x509_name_constraints_add_permitted.3.gz man/man3/gnutls_x509_name_constraints_check.3.gz man/man3/gnutls_x509_name_constraints_check_crt.3.gz man/man3/gnutls_x509_name_constraints_deinit.3.gz man/man3/gnutls_x509_name_constraints_get_excluded.3.gz man/man3/gnutls_x509_name_constraints_get_permitted.3.gz man/man3/gnutls_x509_name_constraints_init.3.gz man/man3/gnutls_x509_othername_to_virtual.3.gz man/man3/gnutls_x509_policies_deinit.3.gz man/man3/gnutls_x509_policies_get.3.gz man/man3/gnutls_x509_policies_init.3.gz man/man3/gnutls_x509_policies_set.3.gz man/man3/gnutls_x509_policy_release.3.gz man/man3/gnutls_x509_privkey_cpy.3.gz man/man3/gnutls_x509_privkey_deinit.3.gz man/man3/gnutls_x509_privkey_export.3.gz man/man3/gnutls_x509_privkey_export2.3.gz man/man3/gnutls_x509_privkey_export2_pkcs8.3.gz man/man3/gnutls_x509_privkey_export_dsa_raw.3.gz man/man3/gnutls_x509_privkey_export_ecc_raw.3.gz man/man3/gnutls_x509_privkey_export_pkcs8.3.gz man/man3/gnutls_x509_privkey_export_rsa_raw.3.gz man/man3/gnutls_x509_privkey_export_rsa_raw2.3.gz man/man3/gnutls_x509_privkey_fix.3.gz man/man3/gnutls_x509_privkey_generate.3.gz man/man3/gnutls_x509_privkey_get_key_id.3.gz man/man3/gnutls_x509_privkey_get_pk_algorithm.3.gz man/man3/gnutls_x509_privkey_get_pk_algorithm2.3.gz man/man3/gnutls_x509_privkey_import.3.gz man/man3/gnutls_x509_privkey_import2.3.gz man/man3/gnutls_x509_privkey_import_dsa_raw.3.gz man/man3/gnutls_x509_privkey_import_ecc_raw.3.gz man/man3/gnutls_x509_privkey_import_openssl.3.gz man/man3/gnutls_x509_privkey_import_pkcs8.3.gz man/man3/gnutls_x509_privkey_import_rsa_raw.3.gz man/man3/gnutls_x509_privkey_import_rsa_raw2.3.gz man/man3/gnutls_x509_privkey_init.3.gz man/man3/gnutls_x509_privkey_sec_param.3.gz +man/man3/gnutls_x509_privkey_set_pin_function.3.gz man/man3/gnutls_x509_privkey_sign_data.3.gz man/man3/gnutls_x509_privkey_sign_hash.3.gz man/man3/gnutls_x509_privkey_verify_params.3.gz man/man3/gnutls_x509_rdn_get.3.gz man/man3/gnutls_x509_rdn_get_by_oid.3.gz man/man3/gnutls_x509_rdn_get_oid.3.gz man/man3/gnutls_x509_trust_list_add_cas.3.gz man/man3/gnutls_x509_trust_list_add_crls.3.gz man/man3/gnutls_x509_trust_list_add_named_crt.3.gz man/man3/gnutls_x509_trust_list_add_system_trust.3.gz man/man3/gnutls_x509_trust_list_add_trust_dir.3.gz man/man3/gnutls_x509_trust_list_add_trust_file.3.gz man/man3/gnutls_x509_trust_list_add_trust_mem.3.gz man/man3/gnutls_x509_trust_list_deinit.3.gz man/man3/gnutls_x509_trust_list_get_issuer.3.gz +man/man3/gnutls_x509_trust_list_get_issuer_by_dn.3.gz +man/man3/gnutls_x509_trust_list_get_issuer_by_subject_key_id.3.gz man/man3/gnutls_x509_trust_list_init.3.gz +man/man3/gnutls_x509_trust_list_iter_deinit.3.gz +man/man3/gnutls_x509_trust_list_iter_get_ca.3.gz man/man3/gnutls_x509_trust_list_remove_cas.3.gz man/man3/gnutls_x509_trust_list_remove_trust_file.3.gz man/man3/gnutls_x509_trust_list_remove_trust_mem.3.gz man/man3/gnutls_x509_trust_list_verify_crt.3.gz man/man3/gnutls_x509_trust_list_verify_crt2.3.gz man/man3/gnutls_x509_trust_list_verify_named_crt.3.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-alert.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select-pkcs11.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-anon.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-dtls.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-psk.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-resume.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-srp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-crq.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-ocsp-client.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs11-list.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs12.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-anon.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-dtls.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-pgp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-psk.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-srp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-serv-x509.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-session-info.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-verify-ssh.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-verify.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-x509-info.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/print-ciphersuites.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/verify.c %%NLS%%share/locale/cs/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/de/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/en@quot/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/eo/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/fi/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/fr/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/it/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/ms/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/nl/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/pl/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/sv/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/uk/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/vi/LC_MESSAGES/gnutls.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnutls.mo Index: head/security/gsasl/Makefile =================================================================== --- head/security/gsasl/Makefile (revision 411989) +++ head/security/gsasl/Makefile (revision 411990) @@ -1,46 +1,46 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= gsasl PORTVERSION= 1.8.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security MASTER_SITES= GNU MAINTAINER= johans@FreeBSD.org COMMENT= GNU SASL Library LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgnutls.so:${PORTSDIR}/security/gnutls \ libntlm.so:${PORTSDIR}/security/libntlm USES= charsetfix pathfix perl5 pkgconfig libtool USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls INFO= gsasl CPPFLAGS+= -nostdinc -I/usr/include -I${LOCALBASE}/include LDFLAGS+= -L/usr/lib -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e '/^en@/d' \ ${WRKSRC}/lib/po/LINGUAS ${WRKSRC}/po/LINGUAS post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgsasl.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/reference ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/reference/html/* \ ${STAGEDIR}${DOCSDIR}/reference .include Index: head/security/hs-gnutls/Makefile =================================================================== --- head/security/hs-gnutls/Makefile (revision 411989) +++ head/security/hs-gnutls/Makefile (revision 411990) @@ -1,18 +1,19 @@ # $FreeBSD$ PORTNAME= gnutls PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Bindings for GNU libgnutls LICENSE= GPLv3 USE_CABAL= monads-tf>=0.1.0 USES= pkgconfig LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: head/security/libprelude/files/patch-src__include__prelude-plugin.h =================================================================== --- head/security/libprelude/files/patch-src__include__prelude-plugin.h (revision 411989) +++ head/security/libprelude/files/patch-src__include__prelude-plugin.h (nonexistent) @@ -1,13 +0,0 @@ ---- src/include/prelude-plugin.h.orig 2012-06-02 00:12:30.000000000 +0900 -+++ src/include/prelude-plugin.h 2012-09-11 15:46:33.000000000 +0900 -@@ -61,9 +61,9 @@ - */ - #ifdef PRELUDE_APPLICATION_USE_LIBTOOL2 - # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols --#endif - - extern const void *lt_preloaded_symbols[]; -+#endif - - #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS() \ - prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols) Property changes on: head/security/libprelude/files/patch-src__include__prelude-plugin.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/libprelude/Makefile =================================================================== --- head/security/libprelude/Makefile (revision 411989) +++ head/security/libprelude/Makefile (revision 411990) @@ -1,76 +1,48 @@ # Created by: Clement Laforet # $FreeBSD$ PORTNAME= libprelude -PORTVERSION= 1.0.1 -PORTREVISION= 9 +PORTVERSION= 1.2.6 CATEGORIES= security -MASTER_SITES= http://www.prelude-ids.org/attachments/download/241/ +MASTER_SITES= http://www.prelude-siem.org/attachments/download/410/ MAINTAINER= koobs@FreeBSD.org -COMMENT= Framework library for Prelude NIDS +COMMENT= Sensor support library from Prelude SIEM -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE.README +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \ - libgmp.so:${PORTSDIR}/math/gmp \ libgnutls.so:${PORTSDIR}/security/gnutls \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libgpg-error.so:${PORTSDIR}/security/libgpg-error \ - libnettle.so:${PORTSDIR}/security/nettle \ - libp11-kit.so:${PORTSDIR}/security/p11-kit + libgcrypt.so:${PORTSDIR}/security/libgcrypt -BROKEN_sparc64= does not compile - OPTIONS_DEFINE= DOCS PERL PYTHON OPTIONS_SUB= yes -USES= charsetfix gettext gmake iconv libtool pathfix pkgconfig +USES= charsetfix gettext-runtime gmake iconv libtool pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-static \ - --localstatedir=/var \ - --enable-gtk-doc=no \ - --with-html-dir=${PREFIX}/share/doc - +CONFIGURE_ARGS= --without-lua \ + --without-python3 \ + --without-swig \ + --without-valgrind \ + ac_cv_path_RUBY= CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip ETCDIR= ${PREFIX}/etc/prelude -PORTDOCS= * -PERL_CONFIGURE_WITH= perl +PERL_CONFIGURE_WITH= perl=${PERL} PERL_USES= perl5 -PYTHON_CONFIGURE_WITH= python -PYTHON_USES= python +PYTHON_CONFIGURE_WITH= python2=${PYTHON_CMD} +PYTHON_USES= python:2.7 +PYTHON_PLIST_SUB= VERSION="${PORTVERSION}" -.include - -.if ${PORT_OPTIONS:MPYTHON} -PLIST_SUB+= PYTHON_VER="${PYTHON_VER}" VERSION="${PORTVERSION}" -.endif - -.include - -post-patch: - @${REINPLACE_CMD} '\,gnutls/extra\.h,d' \ - ${WRKSRC}/prelude-admin/prelude-admin.c \ - ${WRKSRC}/prelude-admin/server.c - post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - .for f in client.conf global.conf idmef-client.conf tls.conf - ${INSTALL_DATA} ${WRKSRC}/${f} \ + ${MV} ${STAGEDIR}${ETCDIR}/default/${f} \ ${STAGEDIR}${ETCDIR}/default/${f}.sample - ${RM} ${STAGEDIR}${ETCDIR}/default/${f} # Remove files install-data-local installs .endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${STAGEDIR}${DOCSDIR} -.endif - -.include +.include Index: head/security/libprelude/distinfo =================================================================== --- head/security/libprelude/distinfo (revision 411989) +++ head/security/libprelude/distinfo (revision 411990) @@ -1,2 +1,2 @@ -SHA256 (libprelude-1.0.1.tar.gz) = 852d981e7d23e49ec25a96a7f54c19a7ee72cd786a0d02c43a27e3e770d5cb6b -SIZE (libprelude-1.0.1.tar.gz) = 2791973 +SHA256 (libprelude-1.2.6.tar.gz) = 37541fc6c0593da09410d74b3801cdc672344bdfd711f689157fd41eac06c9c7 +SIZE (libprelude-1.2.6.tar.gz) = 2926210 Index: head/security/libprelude/pkg-descr =================================================================== --- head/security/libprelude/pkg-descr (revision 411989) +++ head/security/libprelude/pkg-descr (revision 411990) @@ -1,7 +1,13 @@ -Prelude is a new innovative hybrid Intrusion Detection system designed -to be very modular, distributed, rock solid and fast. +Prelude is a Universal "Security Information & Event Management" (SIEM) +system. Prelude collects, normalizes, sorts, aggregates, correlates and +reports all security-related events. -This library provides a number of features to sensors, including -communication with the manager. +As well as being capable of recovering any type of log (system logs, syslog, +flat files, etc.), Prelude benefits from a native support with a number of +systems dedicated to enriching information even further (snort, samhain, +ossec, auditd, etc.). -WWW: http://www.prelude-ids.org/ +This library provides functionality for sensors (connection with a manager, +handling sensor-exported options,...). + +WWW: https://www.prelude-siem.org/ Index: head/security/libprelude/pkg-plist =================================================================== --- head/security/libprelude/pkg-plist (revision 411989) +++ head/security/libprelude/pkg-plist (revision 411990) @@ -1,88 +1,134 @@ bin/libprelude-config bin/prelude-adduser bin/prelude-admin @sample %%ETCDIR%%/default/client.conf.sample @sample %%ETCDIR%%/default/global.conf.sample @sample %%ETCDIR%%/default/idmef-client.conf.sample @sample %%ETCDIR%%/default/tls.conf.sample include/libprelude/common.h include/libprelude/daemonize.h include/libprelude/idmef.h include/libprelude/idmef.hxx include/libprelude/idmef-additional-data.h include/libprelude/idmef-class.h +include/libprelude/idmef-class.hxx include/libprelude/idmef-criteria.h include/libprelude/idmef-criteria.hxx include/libprelude/idmef-criterion-value.h include/libprelude/idmef-data.h include/libprelude/idmef-message-helpers.h include/libprelude/idmef-message-id.h include/libprelude/idmef-message-print.h include/libprelude/idmef-message-read.h include/libprelude/idmef-message-write.h +include/libprelude/idmef-object.h include/libprelude/idmef-path.h include/libprelude/idmef-path.hxx include/libprelude/idmef-time.h include/libprelude/idmef-time.hxx include/libprelude/idmef-tree-data.h include/libprelude/idmef-tree-wrap.h include/libprelude/idmef-value.h include/libprelude/idmef-value.hxx include/libprelude/idmef-value-type.h include/libprelude/prelude.h include/libprelude/prelude.hxx include/libprelude/prelude-async.h include/libprelude/prelude-client.h include/libprelude/prelude-client.hxx include/libprelude/prelude-client-easy.hxx include/libprelude/prelude-client-profile.h include/libprelude/prelude-client-profile.hxx include/libprelude/prelude-config.h include/libprelude/prelude-connection.h include/libprelude/prelude-connection.hxx include/libprelude/prelude-connection-pool.h include/libprelude/prelude-connection-pool.hxx include/libprelude/prelude-error.h include/libprelude/prelude-error.hxx include/libprelude/prelude-extract.h include/libprelude/prelude-failover.h include/libprelude/prelude-hash.h include/libprelude/prelude-ident.h include/libprelude/prelude-inttypes.h include/libprelude/prelude-io.h include/libprelude/prelude-linked-object.h include/libprelude/prelude-list.h include/libprelude/prelude-log.h include/libprelude/prelude-log.hxx +include/libprelude/prelude-macros.h include/libprelude/prelude-message-id.h include/libprelude/prelude-msg.h include/libprelude/prelude-msgbuf.h include/libprelude/prelude-option-wide.h include/libprelude/prelude-option.h include/libprelude/prelude-plugin.h include/libprelude/prelude-string.h include/libprelude/prelude-thread.h include/libprelude/prelude-timer.h -lib/libprelude.a lib/libprelude.so -lib/libprelude.so.2 -lib/libprelude.so.2.19.1 -lib/libpreludecpp.a +lib/libprelude.so.23 +lib/libprelude.so.23.1.0 lib/libpreludecpp.so -lib/libpreludecpp.so.0 -lib/libpreludecpp.so.0.3.0 -man/man1/prelude-admin.1.gz +lib/libpreludecpp.so.8 +lib/libpreludecpp.so.8.0.0 %%PERL%%%%SITE_ARCH%%/Prelude.pm %%PERL%%%%SITE_ARCH%%/auto/Prelude/Prelude.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy-%%VERSION%%-py%%PYTHON_VER%%.egg-info -%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/_PreludeEasy.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info %%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc libdata/pkgconfig/libprelude.pc +man/man1/prelude-admin.1.gz share/aclocal/libprelude.m4 -@dir %%ETCDIR%%/profile -@dir(root,wheel,711) /var/spool/prelude +%%PORTDOCS%%share/gtk-doc/html/libprelude/api-index-full.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/ch01.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/deprecated-api-index.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/home.png +%%PORTDOCS%%share/gtk-doc/html/libprelude/index.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/index.sgml +%%PORTDOCS%%share/gtk-doc/html/libprelude/left.png +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-additional-data.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criteria.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-criterion-value.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-data.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-print.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-read.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-message-write.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-path.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-time.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-tree-wrap.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-idmef-value.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-async.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client-profile.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-client.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection-pool.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-connection.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-error.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-failover.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-hash.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-ident.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-inttypes.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-io.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-linked-object.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-list.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-log.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msg.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-msgbuf.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option-wide.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-option.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-plugin.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-string.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude-timer.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude-prelude.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp +%%PORTDOCS%%share/gtk-doc/html/libprelude/libprelude.devhelp2 +%%PORTDOCS%%share/gtk-doc/html/libprelude/object-tree.html +%%PORTDOCS%%share/gtk-doc/html/libprelude/right.png +%%PORTDOCS%%share/gtk-doc/html/libprelude/style.css +%%PORTDOCS%%share/gtk-doc/html/libprelude/up.png +%%DATADIR%%/swig/libpreludecpp.i +%%PERL%%%%DATADIR%%/swig/perl/libpreludecpp-perl.i +%%PYTHON%%%%DATADIR%%/swig/python/libpreludecpp-python.i +@dir(,,711) %%ETCDIR%%/profile +@dir(,,711) /var/spool/prelude Index: head/security/libpreludedb/Makefile =================================================================== --- head/security/libpreludedb/Makefile (revision 411989) +++ head/security/libpreludedb/Makefile (revision 411990) @@ -1,74 +1,43 @@ # Created by: Sergei Kolobov # $FreeBSD$ PORTNAME= libpreludedb -PORTVERSION= 1.0.1p1 -PORTREVISION= 10 +PORTVERSION= 1.2.6 CATEGORIES= security -MASTER_SITES= https://www.prelude-ids.org/attachments/download/287/ +MASTER_SITES= http://www.prelude-siem.org/attachments/download/408/ MAINTAINER= ports@FreeBSD.org -COMMENT= Framework library for access to Prelude NIDS database +COMMENT= Library to access Prelude IDMEF database LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \ - libgmp.so:${PORTSDIR}/math/gmp \ - libgnutls.so:${PORTSDIR}/security/gnutls \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libgpg-error.so:${PORTSDIR}/security/libgpg-error \ - libprelude.so:${PORTSDIR}/security/libprelude \ - libnettle.so:${PORTSDIR}/security/nettle \ - libp11-kit.so:${PORTSDIR}/security/p11-kit +LIB_DEPENDS= libprelude.so:${PORTSDIR}/security/libprelude -USES= gettext gmake iconv libtool +USES= gmake libtool GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-gtk-doc=no \ - --with-html-dir=${PREFIX}/share/doc +CONFIGURE_ARGS= --without-swig \ + --without-python3 INSTALL_TARGET= install-strip USE_LDCONFIG= yes -PORTDOCS= * - -OPTIONS_DEFINE= DOCS PERL PYTHON +OPTIONS_DEFINE= DOCS PYTHON OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT= MYSQL OPTIONS_SUB= yes MYSQL_DESC= MySQL plugin MYSQL_USE= mysql=yes MYSQL_CONFIGURE_WITH= mysql -PERL_DESC= Perl bindings -PERL_USES= perl5 -PERL_USE= perl5=build,run -PERL_CONFIGURE_WITH= perl PGSQL_DESC= PostgreSQL plugin PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgresql -PYTHON_USES= python -PYTHON_CONFIGURE_WITH= python -PYTHON_PLIST_SUB= PYTHON_VER="${PYTHON_VER}" +PYTHON_USES= python:2.7 +PYTHON_CONFIGURE_WITH= python2=${PYTHON_CMD} +PYTHON_PLIST_SUB= VERSION=${PORTVERSION} SQLITE_DESC= SQLite3 plugin SQLITE_USE= sqlite=yes SQLITE_CONFIGURE_WITH= sqlite3 - -post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 \ - ${STAGEDIR}${MAN1PREFIX}/man/man1 - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/api/html/* \ - ${STAGEDIR}${DOCSDIR} - -post-install-PERL-on: - @${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \ - -name "*.so" | ${XARGS} ${STRIP_CMD} - -post-install-PYTHON-on: - @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \ - -name "*.so" | ${XARGS} ${STRIP_CMD} .include Index: head/security/libpreludedb/distinfo =================================================================== --- head/security/libpreludedb/distinfo (revision 411989) +++ head/security/libpreludedb/distinfo (revision 411990) @@ -1,2 +1,2 @@ -SHA256 (libpreludedb-1.0.1p1.tar.gz) = c62a30d2d96bea4188328124a85a53e2aa1e6effebe15c83dd4440248e0f4f61 -SIZE (libpreludedb-1.0.1p1.tar.gz) = 939675 +SHA256 (libpreludedb-1.2.6.tar.gz) = e855358b90811132c5e2e9fecf168eedee3c2bda03cd8eb4ae34a6e31f1540b1 +SIZE (libpreludedb-1.2.6.tar.gz) = 1230637 Index: head/security/libpreludedb/files/patch-Makefile.in =================================================================== --- head/security/libpreludedb/files/patch-Makefile.in (revision 411989) +++ head/security/libpreludedb/files/patch-Makefile.in (nonexistent) @@ -1,13 +0,0 @@ ---- Makefile.in.orig 2009-07-15 13:49:18.000000000 +0600 -+++ Makefile.in 2009-09-04 10:56:03.000000000 +0600 -@@ -645,9 +645,8 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4 --DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc - EXTRA_DIST = LICENSE.README HACKING.README --SUBDIRS = m4 libmissing src plugins bindings docs -+SUBDIRS = m4 libmissing src plugins bindings - MAINTAINERCLEANFILES = \ - $(srcdir)/INSTALL \ - $(srcdir)/aclocal.m4 \ Property changes on: head/security/libpreludedb/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/libpreludedb/pkg-descr =================================================================== --- head/security/libpreludedb/pkg-descr (revision 411989) +++ head/security/libpreludedb/pkg-descr (revision 411990) @@ -1,6 +1,12 @@ -Prelude is a new innovative hybrid Intrusion Detection system designed -to be very modular, distributed, rock solid and fast. +Prelude is a Universal "Security Information & Event Management" (SIEM) +system. Prelude collects, normalizes, sorts, aggregates, correlates and +reports all security-related events. +As well as being capable of recovering any type of log (system logs, syslog, +flat files, etc.), Prelude benefits from a native support with a number of +systems dedicated to enriching information even further (snort, samhain, +ossec, auditd, etc.). + This library provides a framework for easy access to the Prelude database. -WWW: http://www.prelude-ids.org/ +WWW: https://www.prelude-siem.org/ Index: head/security/libpreludedb/pkg-plist =================================================================== --- head/security/libpreludedb/pkg-plist (revision 411989) +++ head/security/libpreludedb/pkg-plist (revision 411990) @@ -1,48 +1,73 @@ bin/libpreludedb-config bin/preludedb-admin include/libpreludedb/preludedb.h +include/libpreludedb/preludedb.hxx include/libpreludedb/preludedb-error.h +include/libpreludedb/preludedb-error.hxx include/libpreludedb/preludedb-path-selection.h include/libpreludedb/preludedb-plugin-format.h include/libpreludedb/preludedb-plugin-sql.h include/libpreludedb/preludedb-sql-settings.h include/libpreludedb/preludedb-sql.h +include/libpreludedb/preludedb-sql.hxx include/libpreludedb/preludedb-version.h lib/libpreludedb.so -lib/libpreludedb.so.0 -lib/libpreludedb.so.0.4.10 +lib/libpreludedb.so.7 +lib/libpreludedb.so.7.0.0 +lib/libpreludedbcpp.so +lib/libpreludedbcpp.so.2 +lib/libpreludedbcpp.so.2.0.0 lib/libpreludedb/plugins/formats/classic.so %%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so %%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so %%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so -%%PERL%%%%SITE_ARCH%%/PreludeDB.pm -%%PERL%%%%SITE_ARCH%%/auto/PreludeDB/PreludeDB.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-0.0.0-py%%PYTHON_VER%%.egg-info +%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-%%VERSION%%-py%%PYTHON_VER%%.egg-info %%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc man/man1/preludedb-admin.1.gz share/aclocal/libpreludedb.m4 +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/api-index-full.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/ch01.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/deprecated-api-index.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/home.png +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.sgml +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/left.png +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-error.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-path-selection.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-format.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-sql.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql-settings.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-version.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2 +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/object-tree.html +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/right.png +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/style.css +%%PORTDOCS%%share/gtk-doc/html/libpreludedb/up.png %%DATADIR%%/classic/mysql-update-14-1.sql %%DATADIR%%/classic/mysql-update-14-2.sql %%DATADIR%%/classic/mysql-update-14-3.sql %%DATADIR%%/classic/mysql-update-14-4.sql %%DATADIR%%/classic/mysql-update-14-5.sql %%DATADIR%%/classic/mysql-update-14-6.sql %%DATADIR%%/classic/mysql-update-14-7.sql %%DATADIR%%/classic/mysql.sql %%DATADIR%%/classic/mysql2pgsql.sh %%DATADIR%%/classic/mysql2sqlite.sh %%DATADIR%%/classic/pgsql-update-14-1.sql %%DATADIR%%/classic/pgsql-update-14-2.sql %%DATADIR%%/classic/pgsql-update-14-3.sql %%DATADIR%%/classic/pgsql-update-14-4.sql %%DATADIR%%/classic/pgsql-update-14-5.sql %%DATADIR%%/classic/pgsql-update-14-6.sql %%DATADIR%%/classic/pgsql-update-14-7.sql %%DATADIR%%/classic/pgsql.sql %%DATADIR%%/classic/sqlite-update-14-4.sql %%DATADIR%%/classic/sqlite-update-14-5.sql %%DATADIR%%/classic/sqlite-update-14-6.sql %%DATADIR%%/classic/sqlite-update-14-7.sql %%DATADIR%%/classic/sqlite.sql Index: head/security/openconnect/Makefile =================================================================== --- head/security/openconnect/Makefile (revision 411989) +++ head/security/openconnect/Makefile (revision 411990) @@ -1,44 +1,45 @@ # Created by: Damian Gerow # $FreeBSD$ PORTNAME= openconnect PORTVERSION= 7.06 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.infradead.org/pub/openconnect/ \ http://mirrors.rit.edu/zi/ MAINTAINER= zi@FreeBSD.org COMMENT= Client for Cisco's AnyConnect SSL VPN LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LGPL LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 RUN_DEPENDS= vpnc-script:${PORTSDIR}/sysutils/vpnc-scripts GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --with-vpnc-script=${LOCALBASE}/sbin/vpnc-script \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --without-stoken --without-openssl-version-check USES= cpe gmake libtool pkgconfig python:build CPE_VENDOR= infradead INSTALL_TARGET= install-strip USE_LDCONFIG= yes PORTDOCS= * OPTIONS_DEFINE= PROXY GNUTLS PROXY_DESC= Automatic proxy configuration via libproxy PROXY_LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy PROXY_CONFIGURE_WITH= libproxy GNUTLS_DESC= Use GnuTLS instead of OpenSSL (experimental) GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_USE_OFF= OPENSSL=yes post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR} .include Index: head/security/openvas-cli/Makefile =================================================================== --- head/security/openvas-cli/Makefile (revision 411989) +++ head/security/openvas-cli/Makefile (revision 411990) @@ -1,26 +1,27 @@ # $FreeBSD$ PORTNAME= openvas-cli PORTVERSION= 1.4.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/2209/ MAINTAINER= ports@FreeBSD.org COMMENT= OpenVAS command-line interface and Nagios plugin LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libopenvas_base.so:${PORTSDIR}/security/openvas-libraries CFLAGS+= -Wno-missing-field-initializers USES= cmake:outsource gnome pkgconfig USE_GNOME= glib20 libxslt:run post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios ${MV} ${STAGEDIR}${PREFIX}/bin/check_omp \ ${STAGEDIR}${PREFIX}/libexec/nagios .include Index: head/security/openvas-libraries/Makefile =================================================================== --- head/security/openvas-libraries/Makefile (revision 411989) +++ head/security/openvas-libraries/Makefile (revision 411990) @@ -1,37 +1,38 @@ # Created by: Tomoyuki Sakurai # $FreeBSD$ PORTNAME= openvas-libraries PORTVERSION= 8.0.7 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/2291/ MAINTAINER= ports@FreeBSD.org COMMENT= OpenVAS libraries LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.GPLv2 LIB_DEPENDS= libhiredis.so:${PORTSDIR}/databases/hiredis \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp \ libgnutls.so:${PORTSDIR}/security/gnutls \ libgpgme.so:${PORTSDIR}/security/gpgme \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libksba.so:${PORTSDIR}/security/libksba \ libssh.so:${PORTSDIR}/security/libssh USES= bison cmake:outsource gnome pkgconfig USE_LDCONFIG= yes USE_GNOME= glib20 OPTIONS_DEFINE= LDAP RADIUS OPTIONS_DEFAULT=LDAP LDAP_CMAKE_OFF= -DBUILD_WITHOUT_LDAP=1 LDAP_USE= OPENLDAP=yes RADIUS_CMAKE_ON=-DBUILD_WITH_RADIUS=1 RADIUS_LIB_DEPENDS= libfreeradius-client.so:${PORTSDIR}/net/freeradius-client .include Index: head/security/openvas-manager/Makefile =================================================================== --- head/security/openvas-manager/Makefile (revision 411989) +++ head/security/openvas-manager/Makefile (revision 411990) @@ -1,28 +1,29 @@ # $FreeBSD$ PORTNAME= openvas-manager PORTVERSION= 6.0.8 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/2295/ MAINTAINER= ports@FreeBSD.org COMMENT= OpenVAS manager LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgpgme.so:${PORTSDIR}/security/gpgme \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libopenvas_base.so:${PORTSDIR}/security/openvas-libraries USES= cmake:outsource execinfo gnome pkgconfig sqlite USE_GNOME= glib20 USE_RC_SUBR= openvasmd OPTIONS_DEFINE= DOCS post-install: ${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} .include Index: head/security/py-gnutls/Makefile =================================================================== --- head/security/py-gnutls/Makefile (revision 411989) +++ head/security/py-gnutls/Makefile (revision 411990) @@ -1,35 +1,36 @@ # Created by: Li-Wen Hsu # $FreeBSD$ PORTNAME= gnutls PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= python-gnutls-${PORTVERSION} MAINTAINER= lwhsu@FreeBSD.org COMMENT= Python wrapper for the GNUTLS library LICENSE= LGPL20 LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls USES= python USE_PYTHON= autoplist distutils PYDISTUTILS_PKGNAME= python_gnutls EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} OPTIONS_DEFINE= EXAMPLES post-patch: ${REINPLACE_CMD} -e "s|include_dirs=.*|include_dirs=\['${LOCALBASE}/include'\],|" ${WRKSRC}/setup.py ${REINPLACE_CMD} -e "s|library_dirs=.*|library_dirs=\['${LOCALBASE}/lib'\],|" ${WRKSRC}/setup.py ${REINPLACE_CMD} -e "s|\.26||g" ${WRKSRC}/gnutls/library/functions.py post-install: @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} ${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}/${EXAMPLESDIR} .include Index: head/security/shishi/Makefile =================================================================== --- head/security/shishi/Makefile (revision 411989) +++ head/security/shishi/Makefile (revision 411990) @@ -1,49 +1,49 @@ # $FreeBSD$ PORTNAME= shishi PORTVERSION= 1.0.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= security MASTER_SITES= GNU MAINTAINER= johans@FreeBSD.org COMMENT= Free implementation of the Kerberos 5 network security system LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \ libtasn1.so:${PORTSDIR}/security/libtasn1 \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgnutls.so:${PORTSDIR}/security/gnutls USES= iconv libtool makeinfo pathfix perl5 pkgconfig USE_LDCONFIG= yes USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-db-dir=/var/shishi MAKE_ENV= MAKEINFOFLAGS=--no-split INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls INFO= shishi SUB_FILES= pkg-message CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib post-extract: @${RM} -f ${WRKSRC}/doc/shishi.info* @cd ${WRKSRC}/db/gl && ${LN} -s ../../build-aux/link-warning.h post-patch: @${REINPLACE_CMD} -e 's/$$(LINK_WARNING_H)/link-warning.h/' \ ${WRKSRC}/db/gl/Makefile.in @${REINPLACE_CMD} -e 's:\.\./gl/libgnu.la:../db/gl/libgnu.la &:' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e '/^AM_CPPFLAGS/s:-I[^ ]*/gl ::g' \ ${WRKSRC}/examples/Makefile.in .include Index: head/security/suricata/Makefile =================================================================== --- head/security/suricata/Makefile (revision 411989) +++ head/security/suricata/Makefile (revision 411990) @@ -1,149 +1,149 @@ # Created by: Patrick Tracanelli # $FreeBSD$ PORTNAME= suricata PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.openinfosecfoundation.org/download/ MAINTAINER= koobs@FreeBSD.org COMMENT= High Performance Network IDS, IPS and Security Monitoring engine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ libnet.so:${PORTSDIR}/net/libnet \ libyaml.so:${PORTSDIR}/textproc/libyaml USES= autoreconf cpe gmake libtool pathfix pkgconfig USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes CPE_VENDOR= openinfosecfoundation INSTALL_TARGET= install-strip PATHFIX_MAKEFILEIN= Makefile.am OPTIONS_DEFINE= GEOIP HTP_PORT IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE SC TESTS OPTIONS_DEFAULT= HTP_PORT IPFW JSON NETMAP PRELUDE OPTIONS_RADIO= SCRIPTS OPTIONS_RADIO_SCRIPTS= LUA LUAJIT OPTIONS_SUB= yes SCRIPTS_DESC= Scripting GEOIP_DESC= GeoIP support HTP_PORT_DESC= Use libhtp from ports IPFW_DESC= IPFW and IP Divert support for inline IDP JSON_DESC= JSON output support LUA_DESC= LUA scripting support LUAJIT_DESC= LuaJIT scripting support NETMAP_DESC= Netmap support for inline IDP NSS_DESC= File checksums and SSL/TLS fingerprinting PORTS_PCAP_DESC= Use libpcap from ports PRELUDE_DESC= Prelude support for NIDS alerts SC_DESC= Suricata socket client (suricatasc) TESTS_DESC= Unit tests in suricata binary GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP GEOIP_CONFIGURE_ON= --enable-geoip HTP_PORT_LIB_DEPENDS= libhtp.so:${PORTSDIR}/devel/libhtp HTP_PORT_CONFIGURE_ON= --enable-non-bundled-htp HTP_PORT_CONFIGURE_OFF= --enable-bundled-htp HTP_PORT_CONFLICTS_INSTALL_OFF= libhtp-[0-9]* libhtp-suricata HTP_PORT_USES_OFF= iconv:translit IPFW_CONFIGURE_ON= --enable-ipfw JSON_LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson JSON_CONFIGURE_ON= --with-libjansson-includes=${LOCALBASE}/include \ --with-libjansson-libraries=${LOCALBASE}/lib LUA_USES= lua:51 LUA_CONFIGURE_ON= --enable-lua \ --with-liblua-includes=${LUA_INCDIR} \ --with-liblua-libraries=${LUA_LIBDIR} LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit LUAJIT_CONFIGURE_ON= --enable-luajit NSS_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss \ libnspr4.so:${PORTSDIR}/devel/nspr NSS_CONFIGURE_ON= --with-libnss-includes=${LOCALBASE}/include/nss/nss \ --with-libnss-libraries=${LOCALBASE}/lib \ --with-libnspr-libraries=${LOCALBASE}/lib \ --with-libnspr-includes=${LOCALBASE}/include/nspr NETMAP_CONFIGURE_ENABLE= netmap PORTS_PCAP_LIB_DEPENDS= libpcap.so:${PORTSDIR}/net/libpcap PORTS_PCAP_CONFIGURE_ON= --with-libpcap-includes=${LOCALBASE}/include \ --with-libpcap-libraries=${LOCALBASE}/lib PORTS_PCAP_CONFIGURE_OFF= --with-libpcap-includes=/usr/include \ --with-libpcap-libraries=/usr/lib PRELUDE_LIB_DEPENDS= libprelude.so:${PORTSDIR}/security/libprelude PRELUDE_CONFIGURE_ENABLE= prelude PRELUDE_CONFIGURE_ON= --with-libprelude-prefix=${LOCALBASE} SC_USES= python SC_CONFIGURE_ENV= ac_cv_path_HAVE_PYTHON_CONFIG=yes SC_CONFIGURE_ENV_OFF= ac_cv_path_HAVE_PYTHON_CONFIG=no TESTS_CONFIGURE_ENABLE= unittests SUB_FILES= pkg-message CONFIGURE_ARGS+=--enable-gccprotect \ --disable-silent-rules \ --with-libpcre-includes=${LOCALBASE}/include \ --with-libpcre-libraries=${LOCALBASE}/lib \ --with-libyaml-includes=${LOCALBASE}/include \ --with-libyaml-libraries=${LOCALBASE}/lib \ --with-libnet-includes=${LOCALBASE}/include \ --with-libnet-libraries=${LOCALBASE}/lib \ --with-libhtp-includes=${LOCALBASE}/include/ \ --with-libhtp-libraries=${LOCALBASE}/lib \ --disable-gccmarch-native CONFIG_DIR?= ${ETCDIR} CONFIG_FILES= suricata.yaml classification.config reference.config threshold.config RULES_DIR= ${CONFIG_DIR}/rules RULES_FILES= app-layer-events.rules decoder-events.rules dns-events.rules files.rules \ http-events.rules modbus-events.rules smtp-events.rules stream-events.rules \ tls-events.rules LOGS_DIR?= /var/log/${PORTNAME} .include pre-patch: ${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4 post-install: ${MKDIR} ${STAGEDIR}${CONFIG_DIR} ${MKDIR} ${STAGEDIR}${RULES_DIR} ${MKDIR} ${STAGEDIR}${LOGS_DIR} .for f in ${CONFIG_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample .endfor .for f in ${RULES_FILES} ${INSTALL_DATA} ${WRKSRC}/rules/${f} ${STAGEDIR}${RULES_DIR}/${f} .endfor .if ${PORT_OPTIONS:MSC} (cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) .endif TEST_TARGET= check .include Index: head/security/xmlsec1/Makefile =================================================================== --- head/security/xmlsec1/Makefile (revision 411989) +++ head/security/xmlsec1/Makefile (revision 411990) @@ -1,81 +1,81 @@ # Created by: Jim Geovedi # $FreeBSD$ PORTNAME= xmlsec1 PORTVERSION= 1.2.20 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \ ftp://ftp.aleksey.com/pub/xmlsec/releases/ \ ftp://ftp.xmlsoft.org/xmlsec/releases/ \ ftp://ftp.rpmfind.net/pub/XML/xmlsec/releases/ MAINTAINER= johans@FreeBSD.org COMMENT= XML Security Library LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl OPTIONS_DEFINE= DOCS GNUTLS NSS OPTIONS_SUB= yes GNUTLS_DESC= Enable GNUTLS support GNUTLS_CONFIGURE_WITH= gnutls="${LOCALBASE}" GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls NSS_DESC= Enable Mozilla's NSS support NSS_CONFIGURE_WITH= nss="${LOCALBASE}" nspr="${LOCALBASE}" NSS_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= libtool pathfix pkgconfig USE_OPENSSL= yes USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC} DOCS=docs CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}" .if !defined(.PARSEDIR) MAKE_ARGS+= -EABS_BUILDDIR .endif .include # avoid --without-opt=PATH constructs CONFIGURE_ARGS:=${CONFIGURE_ARGS:C/without-([a-z]*)=.*/without-\1/} post-patch: @${REINPLACE_CMD} -e 's|src apps man docs|src apps man \$${DOCS}|g' \ -e 's|^confexecdir =.*$$|confexecdir = \$$(sysconfdir)|g' \ -e 's|/tmp/\*\.log|${WRKSRC}/*.log|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} \ -e '/^XMLSEC_SHLIBSFX="/s|"[^"]*"|".so"|' \ -e 's|openssl_exlibs=-ldl|openssl_exlibs=|' \ -e 's|-ldl"|"|' \ -e 's,with_nss/include,with_nss/include/nss/nss,' \ -e 's,with_nss/lib,with_nss/lib/nss,g' \ -e 's,\(CPPFLAGS="\$$NSS_CFLAGS\),\1 $$NSPR_CFLAGS,' \ -e '/XMLSEC_CRYPTO_LIST=.*openssl/s,$$,\; CPPFLAGS="$$CPPFLAGS $$OPENSSL_CFLAGS",' \ -e 's,\(-lplc4\)",\1 -lpthread",' \ -e '/ test /s, == , = ,' \ ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} \ -e 's,total_time.*/ 1000),total_time*1000/CLOCKS_PER_SEC,' \ ${WRKSRC}/apps/xmlsec.c @${REINPLACE_CMD} -e 's,\\\\\\,\\,g' ${WRKSRC}/*.pc.in .if ${PORT_OPTIONS:MGNUTLS} # Don't rely on broken autodetection @${REINPLACE_CMD} -e '/^GNUTLS_FOUND/s/no/yes/' \ -e '/^GNUTLS_LIBS=/s,"","-L${LOCALBASE}/lib -lgnutls",' \ ${WRKSRC}/${CONFIGURE_SCRIPT} .endif .if ${PORT_OPTIONS:MNSS} # Makeing the xmlsec1 executable multi-threaded to let load -lnss, # when needed. @${REINPLACE_CMD} -e 's,^\(xmlsec1_LDADD = \)\\$$,\1 -L${LOCALBASE}/lib -lpthread\\,' \ ${WRKSRC}/apps/Makefile.in .endif .include Index: head/sysutils/cinnamon-settings-daemon/Makefile =================================================================== --- head/sysutils/cinnamon-settings-daemon/Makefile (revision 411989) +++ head/sysutils/cinnamon-settings-daemon/Makefile (revision 411990) @@ -1,78 +1,78 @@ # Created by: Gustau Perez i Querol # $FreeBSD$ PORTNAME= cinnamon-settings-daemon PORTVERSION= 2.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 3 settings daemon BUILD_DEPENDS= cinnamon-session:${PORTSDIR}/x11/cinnamon-session \ gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \ docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl LIB_DEPENDS= libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \ libibus-1.0.so:${PORTSDIR}/textproc/ibus \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libcolord.so:${PORTSDIR}/graphics/colord \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop \ libpulse.so:${PORTSDIR}/audio/pulseaudio \ libgdbm.so:${PORTSDIR}/databases/gdbm \ libnotify.so:${PORTSDIR}/devel/libnotify RUN_DEPENDS= cinnamon-session:${PORTSDIR}/x11/cinnamon-session \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas USES= autoreconf gettext gmake libtool pathfix \ pkgconfig tar:xz USE_GNOME= gnomeprefix intlhack libgnomekbd \ libxslt:build USE_GITHUB= yes GH_ACCOUNT= linuxmint USE_XORG= xxf86misc GNU_CONFIGURE= yes PATHFIX_MAKEFILEIN= Makefile.am INSTALLS_ICONS= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gudev \ --disable-systemd \ --disable-packagekit \ --with-gnome-distributor="FreeBSD GNOME Project" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.cinnamon.settings-daemon.enums.xml \ org.cinnamon.settings-daemon.peripherals.gschema.xml \ org.cinnamon.settings-daemon.plugins.background.gschema.xml \ org.cinnamon.settings-daemon.plugins.color.gschema.xml \ org.cinnamon.settings-daemon.plugins.gschema.xml \ org.cinnamon.settings-daemon.plugins.housekeeping.gschema.xml \ org.cinnamon.settings-daemon.plugins.keyboard.gschema.xml \ org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml \ org.cinnamon.settings-daemon.plugins.orientation.gschema.xml \ org.cinnamon.settings-daemon.plugins.power.gschema.xml \ org.cinnamon.settings-daemon.plugins.print-notifications.gschema.xml \ org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml \ org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml \ OPTIONS_SUB= yes OPTIONS_DEFINE= CUPS SMARTCARD OPTIONS_DEFAULT=CUPS SMARTCARD SMARTCARD_DESC= Smartcard support CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups SMARTCARD_CONFIGURE_ENABLE= smartcard-support SMARTCARD_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss post-patch: @${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \ ${WRKSRC}/data/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml.in.in @${REINPLACE_CMD} -e '/wacom/d' \ ${WRKSRC}/data/Makefile.am .include Index: head/sysutils/gkrellm2/Makefile =================================================================== --- head/sysutils/gkrellm2/Makefile (revision 411989) +++ head/sysutils/gkrellm2/Makefile (revision 411990) @@ -1,90 +1,84 @@ # $FreeBSD$ PORTNAME= gkrellm PORTVERSION= 2.3.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils ipv6 MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \ LOCAL/ume PKGNAMESUFFIX= 2 MAINTAINER= ume@FreeBSD.org COMMENT= GTK based system monitor LICENSE= GPLv3 USES= gmake pkgconfig tar:bzip2 USE_RC_SUBR= gkrellmd WANT_GNOME= yes -OPTIONS_DEFINE= DOCS CLIENT NLS NTLM -OPTIONS_RADIO= SSL -OPTIONS_RADIO_SSL= GNUTLS OPENSSL +OPTIONS_DEFINE= DOCS CLIENT NLS NTLM OPENSSL OPTIONS_DEFAULT= CLIENT NTLM OPENSSL OPTIONS_SUB= yes CLIENT_DESC= GKrellM Client CLIENT_CONFLICTS= gkrellm-[^2].* gkrellm[^2]-[^2].* CLIENT_USE= GNOME=gtk20 XORG=sm,x11 CLIENT_USE_OFF= GNOME=glib20 CLIENT_VARS_OFF= BUILD_WRKSRC=${WRKSRC}/server \ INSTALL_WRKSRC=${WRKSRC}/server NTLM_LIB_DEPENDS= libntlm.so:${PORTSDIR}/security/libntlm NTLM_VARS_OFF= MAKE_ENV+=without-ntlm=1 .include .if ${PORT_OPTIONS:MCLIENT} .if ${PORT_OPTIONS:MNLS} USES+= gettext .else MAKE_ENV+= enable_nls=0 .endif -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libgnutls-openssl.so:${PORTSDIR}/security/gnutls -MAKE_ENV+= GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \ - without-ssl=1 -.elif ${PORT_OPTIONS:MOPENSSL} +.if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes MAKE_ENV+= without-gnutls=1 .else MAKE_ENV+= without-gnutls=1 without-ssl=1 .endif .endif PORTDOCS= COPYRIGHT CREDITS README Themes.html ALL_TARGET= freebsd MAKE_ENV+= INSTALLROOT=${PREFIX} INSTALL_PREFIX=$(STAGEDIR) \ PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ SINSTALLDIR=${PREFIX}/sbin \ MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \ VERSION=${PORTVERSION} CFLAGS+= -DSYSTEM_THEMES_DIR='\"${LOCALBASE}/share/gkrellm2/themes\"' \ -DSYSTEM_PLUGINS_DIR='\"${LOCALBASE}/libexec/gkrellm2/plugins\"' \ -DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"' \ -DGKRELLMD_SYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins-gkrellmd\"' post-patch: @${REINPLACE_CMD} -e 's/gthread-2.0/gmodule-2.0 gthread-2.0/g' \ ${WRKSRC}/src/Makefile post-install-CLIENT-on: @${MKDIR} ${STAGEDIR}${LOCALBASE}/libexec/gkrellm2/plugins @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/gkrellm2/themes post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \ ${STAGEDIR}${EXAMPLESDIR}/gkrellmd.conf post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/sysutils/gnome-control-center/Makefile =================================================================== --- head/sysutils/gnome-control-center/Makefile (revision 411989) +++ head/sysutils/gnome-control-center/Makefile (revision 411990) @@ -1,73 +1,73 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= gnome-control-center PORTVERSION= 3.18.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 3 project BUILD_DEPENDS= gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon \ gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \ docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \ iso-codes>=0:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libupower-glib.so:${PORTSDIR}/sysutils/upower \ libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \ libcolord.so:${PORTSDIR}/graphics/colord \ libcolord-gtk.so:${PORTSDIR}/graphics/colord-gtk \ libibus-1.0.so:${PORTSDIR}/textproc/ibus \ libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \ libsocialweb.so:${PORTSDIR}/www/libsocialweb \ libpwquality.so:${PORTSDIR}/security/libpwquality \ libgtop-2.0.so:${PORTSDIR}/devel/libgtop \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libgrilo-0.2.so:${PORTSDIR}/net/grilo \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \ gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon \ gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \ iso-codes>=0:${PORTSDIR}/misc/iso-codes \ glxinfo:${PORTSDIR}/graphics/mesa-demos \ apg:${PORTSDIR}/security/apg \ gcm-calibrate:${PORTSDIR}/graphics/gnome-color-manager CONFLICTS= gnome-media-2.[0-9]* PORTSCOUT= limitw:1,even USES= compiler:c++11-lib gettext gmake gnome pathfix pkgconfig tar:xz USE_GNOME= gnomedesktop3 intltool libxml2 USE_XORG= xscrnsaver x11 xxf86misc kbproto xi GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_SUB= yes OPTIONS_DEFINE= CUPS OPTIONS_DEFAULT=CUPS CUPS_DESC= Cups (printing) support CHEESE_DESC= Cheese webcam support OPTIONS_DEFINE_i386= CHEESE OPTIONS_DEFAULT_i386= CHEESE OPTIONS_DEFINE_amd64= CHEESE OPTIONS_DEFAULT_amd64= CHEESE CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups \ libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient CUPS_CONFIGURE_ENABLE= cups CHEESE_LIB_DEPENDS= libcheese.so:${PORTSDIR}/multimedia/cheese CHEESE_CONFIGURE_WITH= cheese .include post-patch: @${REINPLACE_CMD} -e 's|datetime wacom|datetime|g' \ ${WRKSRC}/panels/Makefile.in .include Index: head/sysutils/gnome-settings-daemon/Makefile =================================================================== --- head/sysutils/gnome-settings-daemon/Makefile (revision 411989) +++ head/sysutils/gnome-settings-daemon/Makefile (revision 411990) @@ -1,82 +1,82 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= gnome-settings-daemon PORTVERSION= 3.18.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 3 settings daemon BUILD_DEPENDS= gnome-session>=0:${PORTSDIR}/x11/gnome-session \ geoclue>=0:${PORTSDIR}/net/geoclue \ docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas LIB_DEPENDS= libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \ libibus-1.0.so:${PORTSDIR}/textproc/ibus \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libcolord.so:${PORTSDIR}/graphics/colord \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libpulse.so:${PORTSDIR}/audio/pulseaudio \ libgdbm.so:${PORTSDIR}/databases/gdbm \ libnotify.so:${PORTSDIR}/devel/libnotify \ libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \ libgweather-3.so:${PORTSDIR}/net/libgweather RUN_DEPENDS= gnome-session>=0:${PORTSDIR}/x11/gnome-session \ geoclue>=0:${PORTSDIR}/net/geoclue \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas PORTSCOUT= limitw:1,even USE_XORG= xxf86misc USE_GNOME= gnomedesktop3 intltool libxslt USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --disable-gudev \ --with-nssdb=${LOCALBASE}/share/certs/ca-root-nss.crt \ --disable-wayland \ --disable-rfkill \ --disable-network-manager CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip OPTIONS_SUB= yes OPTIONS_DEFINE= CUPS SMARTCARD OPTIONS_DEFAULT=CUPS SMARTCARD SMARTCARD_DESC= Smartcard support CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups SMARTCARD_CONFIGURE_ENABLE= smartcard-support SMARTCARD_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss GLIB_SCHEMAS= org.gnome.settings-daemon.enums.xml \ org.gnome.settings-daemon.peripherals.gschema.xml \ org.gnome.settings-daemon.plugins.color.gschema.xml \ org.gnome.settings-daemon.plugins.datetime.gschema.xml \ org.gnome.settings-daemon.plugins.gschema.xml \ org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \ org.gnome.settings-daemon.plugins.keyboard.gschema.xml \ org.gnome.settings-daemon.plugins.media-keys.gschema.xml \ org.gnome.settings-daemon.plugins.power.gschema.xml \ org.gnome.settings-daemon.plugins.power.gschema.xml.override \ org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \ org.gnome.settings-daemon.plugins.sharing.gschema.xml \ org.gnome.settings-daemon.plugins.xrandr.gschema.xml \ org.gnome.settings-daemon.plugins.xsettings.gschema.xml post-patch: @${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \ ${WRKSRC}/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in post-install: ${INSTALL_DATA} ${FILESDIR}/org.gnome.settings-daemon.plugins.power.gschema.xml.override \ ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/ .include Index: head/sysutils/heartbeat/Makefile =================================================================== --- head/sysutils/heartbeat/Makefile (revision 411989) +++ head/sysutils/heartbeat/Makefile (revision 411990) @@ -1,159 +1,159 @@ # Created by: Scott Kleihege # $FreeBSD$ PORTNAME= heartbeat PORTVERSION= 2.1.4 -PORTREVISION= 26 +PORTREVISION= 27 CATEGORIES= sysutils #MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2 MASTER_SITES= LOCAL/kuriyama/heartbeat DISTNAME= STABLE-${PORTVERSION} DIST_SUBDIR= heartbeat MAINTAINER= ports@encarnate.com COMMENT= Subsystem for High-Availability Clustering LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \ libgnutls.so:${PORTSDIR}/security/gnutls \ libnet.so:${PORTSDIR}/net/libnet \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ libxml2.so:${PORTSDIR}/textproc/libxml2 BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison USES= autoreconf cpe gettext gmake libtool perl5 pkgconfig python tar:bzip2 \ shebangfix SHEBANG_FILES= ldirectord/ldirectord.in \ lib/plugins/stonith/external/ibmrsa-telnet \ lib/plugins/stonith/external/vmware \ lib/plugins/stonith/external/xen0-ha-dom0-stonith-helper \ lib/plugins/stonith/external/xen0-ha.in USE_GNOME= glib20 USE_LDCONFIG= yes CPE_VENDOR= linux-ha GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USERS= hacluster GROUPS= haclient CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var \ --with-miBsdir=${PREFIX}/snmp/mibs \ --with-initdir=${PREFIX}/etc/rc.d \ --with-group-id=275 \ --with-ccmuser-id=275 \ --with-ocf-root=${PREFIX}/etc/ocf \ --disable-rpath \ --disable-dopd \ --disable-fatal-warnings SUB_FILES= pkg-install pkg-message PKGDEINSTALL= ${PKGINSTALL} PLIST_SUB= USER=${USERS} GROUP=${GROUPS} OPTIONS_DEFINE= MGMT LDIRECTORD APCSNMP DRAC3 DOCS MGMT_DESC= Enable X11 Management Utilities LDIRECTORD_DESC= Enable Linux Director Daemon APCSNMP_DESC= Enable APC SNMP Stonith Device DRAC3_DESC= Enable Dell DRACIII Stonith Device APCSNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp DRAC3_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl .include .if ${PORT_OPTIONS:MMGMT} BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13 RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2 PLIST_SUB+= MGMT="" .else CONFIGURE_ARGS+= --disable-mgmt PLIST_SUB+= MGMT="@comment " .endif .if ${PORT_OPTIONS:MLDIRECTORD} RUN_DEPENDS+= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools USES+= perl5 USE_PERL5= run PLIST_SUB+= LDIRECTORD="" .else CONFIGURE_ARGS+= --disable-ldirectord PLIST_SUB+= LDIRECTORD="@comment " .endif .if ${PORT_OPTIONS:MAPCSNMP} PLIST_SUB+= APCSNMP="" .else PLIST_SUB+= APCSNMP="@comment " .endif .if ${PORT_OPTIONS:MDRAC3} PLIST_SUB+= DRAC3="" .else PLIST_SUB+= DRAC3="@comment " .endif # BladeHPI Stonith Automagic Building .if exists (${STAGEDIR}${PREFIX}/include/openhpi/SaHpi.h) PLIST_SUB+= HPI="" .else PLIST_SUB+= HPI="@comment " .endif # IPMI Lan Stonith Automagic Building .if exists (${STAGEDIR}${PREFIX}/include/ipmilan.h) PLIST_SUB+= IPMI="" .else PLIST_SUB+= IPMI="@comment " .endif # VACM Stonith Automagic Building .if exists (${STAGEDIR}${PREFIX}/include/vacmclient_api.h) PLIST_SUB+= VACM="" .else PLIST_SUB+= VACM="@comment " .endif post-extract: @${MV} ${WRKDIR}/Heartbeat-STABLE-2-1-${DISTNAME} ${WRKSRC} @${CP} -f ${FILESDIR}/heartbeat.in ${WRKSRC}/heartbeat/init.d/ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/resources/OCF/IPaddr .if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|^\(docdir.*doc/\).*|\1${PORTNAME}|' \ ${WRKSRC}/configure.in \ ${WRKSRC}/doc/Makefile.am .else @${REINPLACE_CMD} -e 's| doc | |' \ ${WRKSRC}/Makefile.am .endif post-install: ${MKDIR} -m 0750 ${STAGEDIR}/var/run/heartbeat/pengine ${MKDIR} ${STAGEDIR}/var/lib/heartbeat/mgmt ${TOUCH} ${STAGEDIR}/var/run/heartbeat.pid .if ${PORT_OPTIONS:MDOCS} # Install sample configuration ${CP} -p ${STAGEDIR}${DOCSDIR}/authkeys ${STAGEDIR}${PREFIX}/etc/ha.d/authkeys.sample ${CP} -p ${STAGEDIR}${DOCSDIR}/ha.cf ${STAGEDIR}${PREFIX}/etc/ha.d/ha.cf.sample ${CP} -p ${STAGEDIR}${DOCSDIR}/logd.cf ${STAGEDIR}${PREFIX}/etc/ha.d/logd.cf.sample .endif .if ${PORT_OPTIONS:MLDIRECTORD} ${CP} -p ${WRKSRC}/ldirectord/ldirectord.cf ${STAGEDIR}${PREFIX}/etc/ha.d/ldirectord.cf.sample .endif .include Index: head/sysutils/heartbeat/files/patch-crm-cib-remote.c =================================================================== --- head/sysutils/heartbeat/files/patch-crm-cib-remote.c (nonexistent) +++ head/sysutils/heartbeat/files/patch-crm-cib-remote.c (revision 411990) @@ -0,0 +1,26 @@ +--- crm/cib/remote.c.orig 2008-08-18 12:32:19 UTC ++++ crm/cib/remote.c +@@ -45,13 +45,6 @@ void cib_send_remote_msg(void *session, + + #ifdef HAVE_GNUTLS_GNUTLS_H + # define DH_BITS 1024 +-const int tls_kx_order[] = { +- GNUTLS_KX_ANON_DH, +- GNUTLS_KX_DHE_RSA, +- GNUTLS_KX_DHE_DSS, +- GNUTLS_KX_RSA, +- 0 +-}; + gnutls_dh_params dh_params; + gnutls_anon_server_credentials anon_cred; + char *cib_send_tls(gnutls_session *session, HA_Message *msg); +@@ -83,8 +76,7 @@ create_tls_session(int csock) + session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session)); + + gnutls_init(session, GNUTLS_SERVER); +- gnutls_set_default_priority(*session); +- gnutls_kx_set_priority (*session, tls_kx_order); ++ gnutls_priority_set_direct (*session, "NORMAL:-KX-ALL:+ANON-DH:+DHE-RSA:+DHE-DSS:+RSA", NULL); + gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anon_cred); + gnutls_transport_set_ptr(*session, + (gnutls_transport_ptr) GINT_TO_POINTER(csock)); Property changes on: head/sysutils/heartbeat/files/patch-crm-cib-remote.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c =================================================================== --- head/sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c (nonexistent) +++ head/sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c (revision 411990) @@ -0,0 +1,34 @@ +--- lib/mgmt/mgmt_tls_lib.c.orig 2008-08-18 12:32:19 UTC ++++ lib/mgmt/mgmt_tls_lib.c +@@ -38,11 +38,6 @@ static gnutls_dh_params dh_params; + gnutls_anon_server_credentials anoncred_server; + gnutls_anon_client_credentials anoncred_client; + +-const int kx_prio[] = +-{ +- GNUTLS_KX_ANON_DH, +- 0 +-}; + + int + tls_init_client(void) +@@ -58,8 +53,7 @@ tls_attach_client(int sock) + int ret; + gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session)); + gnutls_init(session, GNUTLS_CLIENT); +- gnutls_set_default_priority(*session); +- gnutls_kx_set_priority (*session, kx_prio); ++ gnutls_priority_set_direct(*session, "NORMAL:-KX-ALL:+ANON-DH", NULL); + gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_client); + gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock)); + ret = gnutls_handshake(*session); +@@ -131,8 +125,7 @@ tls_attach_server(int sock) + int ret; + gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session)); + gnutls_init(session, GNUTLS_SERVER); +- gnutls_set_default_priority(*session); +- gnutls_kx_set_priority (*session, kx_prio); ++ gnutls_priority_set_direct(*session, "NORMAL:-KX-ALL:+ANON-DH", NULL); + gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_server); + gnutls_dh_set_prime_bits(*session, DH_BITS); + gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock)); Property changes on: head/sysutils/heartbeat/files/patch-lib-mgmt-mgmt_tls_lib.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c =================================================================== --- head/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c (revision 411989) +++ head/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c (revision 411990) @@ -1,32 +1,44 @@ ---- lib/plugins/quorum/quorumd.c.orig +--- lib/plugins/quorum/quorumd.c.orig 2008-08-18 12:32:19 UTC +++ lib/plugins/quorum/quorumd.c -@@ -353,15 +353,28 @@ +@@ -327,11 +327,9 @@ initialize_tls_session (int sd) + { + int ret; + gnutls_session session; +- const int cert_type_priority[2] = { GNUTLS_CRT_X509,0}; + + gnutls_init (&session, GNUTLS_CLIENT); + gnutls_set_default_priority (session); +- gnutls_certificate_type_set_priority (session, cert_type_priority); + gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred); + gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd)); + ret = gnutls_handshake (session); +@@ -353,15 +351,28 @@ verify_certificate (gnutls_session sessi unsigned int cert_list_size; const gnutls_datum *cert_list; - int ret; + int ret; + int status; gnutls_x509_crt cert; - ret = gnutls_certificate_verify_peers (session); + ret = gnutls_certificate_verify_peers2 (session, &status); if (ret < 0) { printf("gnutls_certificate_verify_peers2 returns error.\n"); return -1; } + if (status & GNUTLS_CERT_INVALID) { + printf("The certificate is not trusted.\n"); + return -1; + } + if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) { + printf("The certificate hasn't got a known issuer.\n"); + return -1; + } + if (status & GNUTLS_CERT_REVOKED) { + printf("The certificate has been revoked.\n"); + return -1; + } if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) { printf("The certificate is not a x.509 cert\n"); return -1; Index: head/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c =================================================================== --- head/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c (revision 411989) +++ head/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c (revision 411990) @@ -1,29 +1,41 @@ ---- membership/quorumd/quorumdtest.c.orig +--- membership/quorumd/quorumdtest.c.orig 2008-08-18 12:32:19 UTC +++ membership/quorumd/quorumdtest.c -@@ -162,16 +162,16 @@ +@@ -136,11 +136,9 @@ initialize_tls_session (int sd) + { + int ret; + gnutls_session session; +- const int cert_type_priority[2] = { GNUTLS_CRT_X509,0}; + + gnutls_init (&session, GNUTLS_CLIENT); + gnutls_set_default_priority (session); +- gnutls_certificate_type_set_priority (session, cert_type_priority); + gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred); + gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd)); + ret = gnutls_handshake (session); +@@ -162,16 +160,16 @@ verify_certificate (gnutls_session sessi unsigned int cert_list_size; const gnutls_datum *cert_list; - int ret; + int ret; + int status; gnutls_x509_crt cert; - ret = gnutls_certificate_verify_peers (session); + ret = gnutls_certificate_verify_peers2 (session, &status); if (ret < 0) { printf("gnutls_certificate_verify_peers2 returns error.\n"); return -1; } -/* if (status & GNUTLS_CERT_INVALID) { printf("The certificate is not trusted.\n"); return -1; -@@ -184,7 +184,6 @@ +@@ -184,7 +182,6 @@ verify_certificate (gnutls_session sessi printf("The certificate has been revoked.\n"); return -1; } -*/ if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) { printf("The certificate is not a x.509 cert\n"); return -1; Index: head/sysutils/rsyslog7/Makefile =================================================================== --- head/sysutils/rsyslog7/Makefile (revision 411989) +++ head/sysutils/rsyslog7/Makefile (revision 411990) @@ -1,165 +1,165 @@ # $FreeBSD$ PORTNAME= rsyslog PORTVERSION= 7.6.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= brd@FreeBSD.org COMMENT= Syslogd supporting SQL, TCP, and TLS BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt \ rst2man:${PORTSDIR}/textproc/py-docutils LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ libestr.so:${PORTSDIR}/devel/libestr \ libjson-c.so:${PORTSDIR}/devel/json-c \ liblogging-stdlog.so:${PORTSDIR}/devel/liblogging USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf PORTSCOUT= limit:^7\.4 PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP UUID DBI_DESC= LibDBI output module for rsyslog GNUTLS_DESC= GNUTLS module for rsyslog GSSAPI_DESC= GSS API input/output module for rsyslog MYSQL_DESC= MySQL output module for rsyslog PGSQL_DESC= PostgreSQL output module for rsyslog RELP_DESC= RELP input/output module for rsyslog RFC3195_DESC= RFC3195 input support for rsyslog SNMP_DESC= SNMP trap sender for rsyslog UUID_DESC= Support for generating a UUID per log message USES= alias libtool pkgconfig .include .if ${PORT_OPTIONS:MDBI} LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.so .else CONFIGURE_ARGS+=--disable-libdbi .endif .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.so .else CONFIGURE_ARGS+=--disable-gnutls .endif .if ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--enable-gssapi-krb5 PLIST_FILES+= lib/rsyslog/imgssapi.so \ lib/rsyslog/lmgssutil.so \ lib/rsyslog/omgssapi.so .else CONFIGURE_ARGS+=--disable-gssapi-krb5 .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql PLIST_FILES+= lib/rsyslog/ommysql.so .else CONFIGURE_ARGS+=--disable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+=--enable-pgsql PLIST_FILES+= lib/rsyslog/ompgsql.so .else CONFIGURE_ARGS+=--disable-pgsql .endif .if ${PORT_OPTIONS:MRELP} LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.so \ lib/rsyslog/omrelp.so .else CONFIGURE_ARGS+=--disable-relp .endif .if ${PORT_OPTIONS:MRFC3195} LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging CONFIGURE_ARGS+=--enable-rfc3195 PLIST_FILES+= lib/rsyslog/im3195.so .else CONFIGURE_ARGS+=--disable-rfc3195 .endif .if ${PORT_OPTIONS:MSNMP} LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.so .else CONFIGURE_ARGS+=--disable-snmp .endif .if ${PORT_OPTIONS:MUUID} LIB_DEPENDS+= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid .else CONFIGURE_ARGS+=--disable-uuid .endif .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif .ifdef WITH_SANE_HOSTNAME EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif CONFLICTS= rsyslog6-[1-9]* rsyslog-devel-[0-9]* CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes .ifdef WITH_DEBUG CONFIGURE_ARGS+=--enable-rtinst --enable-debug .endif .include .if ${ARCH} == "i386" CPPFLAGS+=-march=i686 .endif CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm" CFLAGS+= ${CPPFLAGS} USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages --disable-testbench post-patch: @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/ @${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/ @${INSTALL_DATA} ${WRKSRC}/doc/*png ${STAGEDIR}${DOCSDIR}/ @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR} .for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail omruleset ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so .endfor .include Index: head/sysutils/rsyslog8/Makefile =================================================================== --- head/sysutils/rsyslog8/Makefile (revision 411989) +++ head/sysutils/rsyslog8/Makefile (revision 411990) @@ -1,117 +1,118 @@ # $FreeBSD$ PORTNAME= rsyslog PORTVERSION= 8.11.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= brd@FreeBSD.org COMMENT= Syslogd supporting SQL, TCP, and TLS BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt \ rst2man:${PORTSDIR}/textproc/py-docutils LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ libestr.so:${PORTSDIR}/devel/libestr \ libjson-c.so:${PORTSDIR}/devel/json-c \ liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid USE_LDCONFIG= yes PORTSCOUT= limit:^8\. PKGNAMESUFFIX= 8 OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP SNMP \ NORMALIZE DBI_DESC= LibDBI output module for rsyslog GNUTLS_DESC= GNUTLS module for rsyslog GSSAPI_DESC= GSS API input/output module for rsyslog MYSQL_DESC= MySQL output module for rsyslog PGSQL_DESC= PostgreSQL output module for rsyslog RELP_DESC= RELP input/output module for rsyslog SNMP_DESC= SNMP trap sender for rsyslog NORMALIZE_DESC= Message normalization module for rsyslog USES= libtool pkgconfig autoreconf DBI_LIB_DEPENDS= libdbi.so:${PORTSDIR}/databases/libdbi DBI_CONFIGURE_ENABLE= libdbi DBI_PLIST_FILES= lib/rsyslog/omlibdbi.so GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_PLIST_FILES= lib/rsyslog/lmnsd_gtls.so GSSAPI_CONFIGURE_ENABLE=gssapi-krb5 GSSAPI_PLIST_FILES= lib/rsyslog/imgssapi.so \ lib/rsyslog/lmgssutil.so \ lib/rsyslog/omgssapi.so MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= mysql MYSQL_PLIST_FILES= lib/rsyslog/ommysql.so PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= pgsql PGSQL_PLIST_FILES= lib/rsyslog/ompgsql.so RELP_LIB_DEPENDS= librelp.so:${PORTSDIR}/devel/librelp RELP_CONFIGURE_ENABLE= relp RELP_PLIST_FILES= lib/rsyslog/imrelp.so \ lib/rsyslog/omrelp.so SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp SNMP_CONFIGURE_ENABLE= snmp SNMP_PLIST_FILES= lib/rsyslog/omsnmp.so NORMALIZE_LIB_DEPENDS= liblognorm.so:${PORTSDIR}/devel/liblognorm NORMALIZE_CONFIGURE_ENABLE= mmnormalize NORMALIZE_PLIST_FILES= lib/rsyslog/mmnormalize.so .include .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif .ifdef WITH_SANE_HOSTNAME EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif CONFLICTS= rsyslog6-* rsyslog-[0-9].* CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes INSTALL_TARGET= install-strip .ifdef WITH_DEBUG CONFIGURE_ARGS+=--enable-rtinst --enable-debug .endif .include .if ${ARCH} == "i386" CPPFLAGS+=-march=i686 .endif CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm" CFLAGS+= ${CPPFLAGS} USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message CONFIGURE_ARGS+= --enable-cached-man-pages --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench post-patch: @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c @${FIND} ${WRKSRC} -name '*.bak' -delete .include Index: head/textproc/iksemel/Makefile =================================================================== --- head/textproc/iksemel/Makefile (revision 411989) +++ head/textproc/iksemel/Makefile (revision 411990) @@ -1,32 +1,32 @@ # Created by: trasz # $FreeBSD$ PORTNAME= iksemel PORTVERSION= 1.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MASTER_SITES= GOOGLE_CODE MAINTAINER= ports@FreeBSD.org COMMENT= XML parser library mainly designed for Jabber applications LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls USES= autoreconf libtool makeinfo pathfix pkgconfig PATHFIX_MAKEFILEIN= Makefile.am GNU_CONFIGURE= yes CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes INSTALL_TARGET= install-strip INFO= iksemel post-patch: @${REINPLACE_CMD} -e 's|@setfilename iksemel|@setfilename iksemel.info|' \ ${WRKSRC}/doc/iksemel.texi .include Index: head/textproc/iksemel/files/patch-src-stream.c =================================================================== --- head/textproc/iksemel/files/patch-src-stream.c (nonexistent) +++ head/textproc/iksemel/files/patch-src-stream.c (revision 411990) @@ -0,0 +1,27 @@ +--- src/stream.c.orig 2009-07-23 11:16:35 UTC ++++ src/stream.c +@@ -63,11 +63,6 @@ tls_pull (iksparser *prs, char *buffer, + static int + handshake (struct stream_data *data) + { +- const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 }; +- const int kx_priority[] = { GNUTLS_KX_RSA, 0 }; +- const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0}; +- const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 }; +- const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 }; + int ret; + + if (gnutls_global_init () != 0) +@@ -80,11 +75,7 @@ handshake (struct stream_data *data) + gnutls_certificate_free_credentials (data->cred); + return IKS_NOMEM; + } +- gnutls_protocol_set_priority (data->sess, protocol_priority); +- gnutls_cipher_set_priority(data->sess, cipher_priority); +- gnutls_compression_set_priority(data->sess, comp_priority); +- gnutls_kx_set_priority(data->sess, kx_priority); +- gnutls_mac_set_priority(data->sess, mac_priority); ++ gnutls_set_default_priority(data->sess); + gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred); + + gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push); Property changes on: head/textproc/iksemel/files/patch-src-stream.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/aws/Makefile =================================================================== --- head/www/aws/Makefile (revision 411989) +++ head/www/aws/Makefile (revision 411990) @@ -1,185 +1,185 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= aws PORTVERSION= 3.3.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://downloads.dragonlace.net/src/ MAINTAINER= marino@FreeBSD.org COMMENT= Adacore Ada Web Server and framework LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi BUILD_DEPENDS= gprbuild:${PORTSDIR}/devel/gprbuild \ templates_parser>11:${PORTSDIR}/textproc/templates_parser \ xmlada>=4.4:${PORTSDIR}/textproc/xmlada \ asis>=2013:${PORTSDIR}/lang/asis \ gnatpython>=20101207:${PORTSDIR}/devel/gnatpython RUN_DEPENDS= templates_parser>11:${PORTSDIR}/textproc/templates_parser \ xmlada>=4.4:${PORTSDIR}/textproc/xmlada GNU_CONFIGURE= yes NO_MTREE= yes USES= ada gmake python tar:bzip2 DOTBUILD= release LINK_SSL= -- LINK_TLS= -- LINK_LDP= -- NAME_IP6= -- NAME_STD= -- BUILD_TYPE= release ADDL_RPATH= ${LOCALBASE}/lib:${LOCALBASE}/lib/aws/native/relocatable AUX_TARGET= ${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL} TEMPARSE= ${WRKSRC}/.build/${AUX_TARGET}/${BUILD_TYPE} OPTIONS_SINGLE= Secure-Socket-Layer OPTIONS_DEFINE= IP6 DEBUG LDAP SHARED DOCS OPTIONS_DEFAULT= SSL SHARED OPTIONS_SUB= yes NO_OPTIONS_SORT= yes DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx OPTIONS_SINGLE_Secure-Socket-Layer= SSL GNUTLS NOSSL NOSSL_DESC= Disable SSL support SHARED_DESC= Build shared libraries in addition to static ones IP6_DESC= Support IPv6 instead of IPv4 CONF_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} CONF_ARGS+= GCC=ada CONF_ARGS+= PYTHON=python${PYTHON_VER} CONF_ARGS+= XMLADA=true CONF_ARGS+= PRJ_BUILD=${DOTBUILD} CONF_ARGS+= prefix=${PREFIX} CONF_ARGS+= LPATH=${PREFIX}/lib CONF_ARGS+= ZPATH=/usr/lib CONF_ARGS+= ZLIB=true CONF_ARGS+= ASIS=true CONF_ARGS+= DEFAULT_LIBRARY_TYPE=static .include ################### ## SSL Support ## ################### .if ${PORT_OPTIONS:MSSL} WITH_OPENSSL_PORT= yes USE_OPENSSL= yes CONF_ARGS+= SOCKET=openssl CONF_ARGS+= LPATH=${PREFIX}/lib LINK_SSL= .endif .if ${PORT_OPTIONS:MGNUTLS} CONF_ARGS+= SOCKET=gnutls LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls LINK_TLS= .endif .if ${PORT_OPTIONS:MNOSSL} CONF_ARGS+= SOCKET=std CONF_ARGS+= LPATH= NAME_STD= .endif #################### ## LDAP Support ## #################### .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONF_ARGS+= LDAP=true LINK_LDP= .endif #################### ## IPv6 Support ## #################### .if ${PORT_OPTIONS:MIP6} CONF_ARGS+= IPv6=true NAME_IP4= -- NAME_IP6= .endif ##################### ## Debug Support ## ##################### .if ${PORT_OPTIONS:MDEBUG} CONF_ARGS+= DEBUG=true BUILD_TYPE= debug .endif ############################## ## Shared Runtime Library ## ############################## .if ${PORT_OPTIONS:MSHARED} CONF_ARGS+= ENABLE_SHARED=true .else CONF_ARGS+= ENABLE_SHARED=false .endif post-patch: @${MKDIR} ${WRKSRC}/templates_parser \ ${TEMPARSE}/static/obj/temparse \ ${TEMPARSE}/static/lib/temparse \ ${TEMPARSE}/relocatable/obj/temparse \ ${TEMPARSE}/relocatable/lib/temparse \ ${WRKSRC}/templates_parser/tools \ ${WRKSRC}/templates_parser/xsrc \ ${WRKSRC}/templates_parser/src @${REINPLACE_CMD} \ -e 's|@ADDITIONAL_RPATH@|${ADDL_RPATH}|' \ -e 's|@PREFIX@|${LOCALBASE}|g' \ ${WRKSRC}/aws.gpr \ ${WRKSRC}/src/src.gpr \ ${WRKSRC}/include/include.gpr @${SED} -e 's|@PREFIX@|${LOCALBASE}|g' ${FILESDIR}/temparse.gpr.in \ > ${WRKSRC}/templates_parser/temparse.gpr do-configure: # If we want to do templates_parser copy in an earlier target then # templates_parser needs to be listed as an EXTRACT_DEPENDS @${CP} ${LOCALBASE}/lib/templates_parser/* \ ${TEMPARSE}/static/lib/temparse @${CP} ${LOCALBASE}/lib/templates_parser.relocatable/*.ali \ ${TEMPARSE}/relocatable/lib/temparse @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${MAKE_CMD} setup ${CONF_ARGS} do-build: # We cannot use a redefined ALL_TARGET because MAKE_JOBS_SAFE is set # for PROCESSORS, but that also sets -j for gmake which breaks build cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} build .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} html .endif test: .if exists(${LOCALBASE}/bin/awsres) @cd ${WRKSRC}/regtests && ${SETENV} ${MAKE_ENV} TIMEOUT=75 \ python${PYTHON_VER} testsuite.py .else @${ECHO} "AWS has to be installed before testing" .endif post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/gpr/manifests ${RM} ${STAGEDIR}${PREFIX}/include/aws.relocatable/Makefile ${RM} ${STAGEDIR}${PREFIX}/include/aws/Makefile ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \ ${STAGEDIR}${PREFIX}/share/gps/plug-ins ${CAT} ${FILESDIR}/aws.gpr.in | ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ -e 's|@SSL@|${LINK_SSL}|g' -e 's|@TLS@|${LINK_TLS}|g' \ -e 's|@LDP@|${LINK_LDP}|g' -e 's|@IP4@|${NAME_IP4}|g' \ -e 's|@IP6@|${NAME_IP6}|g' -e 's|@STD@|${NAME_STD}|g' \ > ${STAGEDIR}${PREFIX}/lib/gnat/aws.gpr cd ${WRKSRC}/gps && ${INSTALL_DATA} *.xml aws.py \ ${STAGEDIR}${PREFIX}/share/gps/plug-ins .include Index: head/www/gurlchecker/Makefile =================================================================== --- head/www/gurlchecker/Makefile (revision 411989) +++ head/www/gurlchecker/Makefile (revision 411990) @@ -1,76 +1,76 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= gurlchecker PORTVERSION= 0.10.1 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= www gnome MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/547/ MAINTAINER= ports@FreeBSD.org COMMENT= Gnome program to check a page/website for broken links LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnet-2.0.so:${PORTSDIR}/net/gnet2 OPTIONS_DEFINE= CROCO TIDY CLAMAV GNUTLS OPTIONS_DEFAULT=CLAMAV GNUTLS CROCO_DESC= Library for CSS2 validation TIDY_DESC= Library for HTML w3c validation CLAMAV_DESC= Library for virii scan GNUTLS_DESC= Library for HTTPS check USES= gmake libtool pathfix pkgconfig USE_GNOME= gnomeprefix intlhack libgnomeui GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lm .include .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MCROCO} LIB_DEPENDS+= libcroco-0.6.so:${PORTSDIR}/textproc/libcroco .else CONFIGURE_ARGS+= --disable-croco .endif .if ${PORT_OPTIONS:MTIDY} LIB_DEPENDS+= libtidy.so:${PORTSDIR}/www/tidy-lib .else CONFIGURE_ARGS+= --disable-tidy .endif .if ${PORT_OPTIONS:MCLAMAV} LIB_DEPENDS+= libclamav.so:${PORTSDIR}/security/clamav .else CONFIGURE_ARGS+= --disable-clamav .endif .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls .else CONFIGURE_ARGS+= --disable-gnutls .endif post-patch: @${REINPLACE_CMD} -e \ '/maxratio/s|^.*||' ${WRKSRC}/src/ucclam.c @${REINPLACE_CMD} -e \ '/^SUBDIRS/s|doc ui man|ui|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|-lresolv||g' ${WRKSRC}/src/Makefile.in .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e \ '/^SUBDIRS/s|po ui|ui|g' ${WRKSRC}/Makefile.in .endif .include Index: head/www/hydra/Makefile =================================================================== --- head/www/hydra/Makefile (revision 411989) +++ head/www/hydra/Makefile (revision 411990) @@ -1,53 +1,55 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= hydra PORTVERSION= 0.1.8 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= www MASTER_SITES= http://hydra.hellug.gr/download/ PKGNAMESUFFIX= -web MAINTAINER= ports@FreeBSD.org COMMENT= High performance multi-threaded web server LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls + +BROKEN= Needs to be ported to GnuTLS 3.4; abandoned upstream USES= perl5 pkgconfig shebangfix SHEBANG_FILES= src/webindex.pl USE_RC_SUBR= hydra USE_PERL5= run GNU_CONFIGURE= yes CFLAGS+= -DENABLE_SSL -DHAVE_LIBGNUTLS CPPFLAGS+= $$(pkg-config --cflags gnutls) LDFLAGS+= $$(pkg-config --libs gnutls) PLIST_SUB= LOGDIR="${LOGDIR}" SUB_FILES= pkg-deinstall SUB_LIST= LOGDIR="${LOGDIR}" CONFLICTS_INSTALL= hydra-[0-9]* LOGDIR?= /var/log/hydra post-patch: @${REINPLACE_CMD} -e \ '/LDFLAGS/s| -g"|"|' ${WRKSRC}/configure .for f in src/defines.h examples/hydra.conf @${REINPLACE_CMD} -e \ 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOGDIR%%|${LOGDIR}|g ; \ s|%%WWWOWN%%|${WWWOWN}|g ; \ s|%%WWWGRP%%|${WWWGRP}|g' ${WRKSRC}/${f} .endfor post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGDIR} .for f in hydra.conf mime.types (cd ${WRKSRC}/examples && ${INSTALL_DATA} ${f} \ ${STAGEDIR}${ETCDIR}/${f}.sample) .endfor .include Index: head/www/libepc/Makefile =================================================================== --- head/www/libepc/Makefile (revision 411989) +++ head/www/libepc/Makefile (revision 411990) @@ -1,27 +1,27 @@ # Created by: Koop Mast # $FreeBSD$ # $MCom: ports/trunk/www/libepc/Makefile 19822 2014-08-20 08:57:46Z gusi $ PORTNAME= libepc PORTVERSION= 0.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= GNOME MAINTAINER= kwm@FreeBSD.org COMMENT= The Easy Publish and Consume library LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ libgnutls.so:${PORTSDIR}/security/gnutls \ libavahi-ui-gtk3.so:${PORTSDIR}/net/avahi-gtk3 USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_GNOME= gnomeprefix gtk30 intltool USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .include Index: head/www/libmicrohttpd/Makefile =================================================================== --- head/www/libmicrohttpd/Makefile (revision 411989) +++ head/www/libmicrohttpd/Makefile (revision 411990) @@ -1,56 +1,56 @@ # Created by: David Barksdale # $FreeBSD$ PORTNAME= libmicrohttpd PORTVERSION= 0.9.37 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= GNU MAINTAINER= gaod@hychen.org COMMENT= C library for embedding HTTP server functionality LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= cpe libtool pathfix USE_LDCONFIG= yes USE_OPENSSL= yes CPE_VENDOR= gnu OPTIONS_DEFINE= GNUTLS GNUTLS_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= libgcrypt-prefix=${LOCALBASE} gnutls=${LOCALBASE} GNUTLS_CONFIGURE_ENABLE=https INFO= libmicrohttpd libmicrohttpd-tutorial PLIST_FILES= include/microhttpd.h \ lib/libmicrohttpd.a \ lib/libmicrohttpd.so \ lib/libmicrohttpd.so.10 \ lib/libmicrohttpd.so.10.27.0 \ libdata/pkgconfig/libmicrohttpd.pc \ libdata/pkgconfig/libmicrospdy.pc \ man/man3/libmicrohttpd.3.gz .include .if !(defined(WITH_OPENSSL_BASE) && ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015) PLIST_FILES+= include/microspdy.h \ lib/libmicrospdy.a \ lib/libmicrospdy.so \ lib/libmicrospdy.so.0 \ lib/libmicrospdy.so.0.0.0 .endif post-patch: @${REINPLACE_CMD} -e 's|bin_PROGRAMS =|noinst_PROGRAMS +=|' \ ${WRKSRC}/src/examples/Makefile.in .include Index: head/www/ocaml-net/Makefile =================================================================== --- head/www/ocaml-net/Makefile (revision 411989) +++ head/www/ocaml-net/Makefile (revision 411990) @@ -1,87 +1,88 @@ # Created by: Stephane Legrand # $FreeBSD$ PORTNAME= net PORTVERSION= 4.0.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- DISTNAME= ocaml${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= OCaml modules for Internet applications LICENSE= GPLv2 BUILD_DEPENDS= ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre RUN_DEPENDS= ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre CONFLICTS= ocaml-equeue-2* ocaml-netclient-0* USES= gmake USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_CAMLP4= yes USE_OCAML_LDCONFIG= yes USE_OCAMLFIND_PLIST= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= -disable-gtk \ -enable-pcre ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/netplex-admin \ bin/ocamlrpcgen DOCSDIR= ${PREFIX}/share/doc/ocaml/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PKGNAMEPREFIX}${PORTNAME} SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} PORTDOCS= * PORTEXAMPLES= * OCAML_PKGDIRS= netsys netshm equeue shell netstring rpc-generator \ rpc pop smtp netclient netcgi2 netgssapi netplex \ netcgi2-plex netcamlbox netmulticore rpc-auth-local \ netstring-pcre netunidata OCAML_LDLIBS= ${OCAML_PKGDIRS:S/^/${OCAML_SITELIBDIR}\//} OPTIONS_DEFINE= NETHTTPD GTK2 GNUTLS APACHE ZIP EXAMPLES DOCS OPTIONS_DEFAULT=GNUTLS NETHTTPD_DESC= Integrated HTTP daemon ZIP_DESC= Compression support APACHE_DESC= Apache mod connector (experimental) GNUTLS_DESC= SSL/TLS support via GnuTLS GTK2_BUILD_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 GTK2_RUN_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 ZIP_BUILD_DEPENDS= ${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip ZIP_RUN_DEPENDS= ${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip NETHTTPD_CONFIGURE_ON= -with-nethttpd NETHTTPD_VARS= OCAML_PKGDIRS+=nethttpd GTK2_CONFIGURE_ON= -enable-gtk2 GTK2_VARS= OCAML_PKGDIRS+=equeue-gtk2 GNUTLS_USES= pkgconfig GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ON= -enable-gnutls GNUTLS_VARS= OCAML_PKGDIRS+=nettls-gnutls APACHE_BROKEN= does not build with APACHE option enabled APACHE_USE= APACHE=22+ APACHE_CONFIGURE_ON= -enable-apache -apxs ${APXS} -apache ${HTTPD} APACHE_VARS= OCAML_PKGDIRS+=netcgi2-apache ZIP_CONFIGURE_ON= -enable-zip ZIP_VARS= OCAML_PKGDIRS+=netzip post-patch: @${REINPLACE_CMD} -e 's/camlzip/zip/' ${WRKSRC}/configure post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/) post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ @(cd ${WRKSRC}/examples/ && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/) .include Index: head/www/retawq/Makefile =================================================================== --- head/www/retawq/Makefile (revision 411989) +++ head/www/retawq/Makefile (revision 411990) @@ -1,56 +1,56 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= retawq DISTVERSION= 0.2.6c -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.6c MAINTAINER= ports@FreeBSD.org COMMENT= Interactive, multi-threaded web browser for text terminals USES= gettext ncurses HAS_CONFIGURE= yes CONFIGURE_ARGS= --path-archprefix=${PREFIX} --path-prefix=${PREFIX} \ --enable-i18n --enable-local-cgi --enable-ipv6 PLIST_FILES= bin/retawq \ man/man1/retawq.1.gz \ share/locale/de/LC_MESSAGES/retawq.mo \ share/locale/es/LC_MESSAGES/retawq.mo \ share/locale/fr/LC_MESSAGES/retawq.mo \ share/locale/pt_BR/LC_MESSAGES/retawq.mo PORTDOCS= * CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread OPTIONS_DEFINE= DOCS OPTIONS_RADIO= BACKEND BACKEND_DESC= SSL Backend OPTIONS_RADIO_BACKEND= OPENSSL GNUTLS GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ON= --set-tls=1 OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ON= --set-tls=2 OPENSSL_LDFLAGS= -lssl -lcrypto post-configure: ${REINPLACE_CMD} -e 's|_IN_H 0|_IN_H 1|g ; \ s|_SOCKET_H 0|_SOCKET_H 1|g' ${WRKSRC}/.config do-install: ${INSTALL_PROGRAM} ${WRKSRC}/retawq ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/docu/retawq.1 ${STAGEDIR}${MANPREFIX}/man/man1 .for lang in de es fr pt_BR @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/i18n/${lang}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docu/*.html ${STAGEDIR}${DOCSDIR} .include Index: head/www/tntnet/Makefile =================================================================== --- head/www/tntnet/Makefile (revision 411989) +++ head/www/tntnet/Makefile (revision 411990) @@ -1,39 +1,39 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= tntnet PORTVERSION= 2.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www devel MASTER_SITES= http://www.tntnet.org/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Webapplicationserver for C++ LIB_DEPENDS= libcxxtools.so:${PORTSDIR}/devel/cxxtools BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip USES= cpe iconv libtool pathfix pkgconfig shebangfix SHEBANG_FILES= tntnet-conf2xml.pl USE_CSTD= gnu89 PATCH_STRIP= -p1 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var .if defined(WITH_GNUTLS) CONFIGURE_ARGS+= --with-ssl=gnutls LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls .else CONFIGURE_ARGS+= --with-ssl=openssl USE_OPENSSL= yes .endif USERS= www GROUPS= www post-configure: ${REINPLACE_CMD} 's/^\(#define[[:space:]]*HAVE_SENDFILE[[:space:]]*\).*/\1\0/' ${WRKSRC}/framework/common/config.h .include Index: head/www/webkit2-gtk3/Makefile =================================================================== --- head/www/webkit2-gtk3/Makefile (revision 411989) +++ head/www/webkit2-gtk3/Makefile (revision 411990) @@ -1,84 +1,85 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.8.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 3 toolkit BUILD_DEPENDS= geoclue>=0:${PORTSDIR}/net/geoclue LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libwebp.so:${PORTSDIR}/graphics/webp \ libpng.so:${PORTSDIR}/graphics/png \ libsecret-1.so:${PORTSDIR}/security/libsecret \ libicutu.so:${PORTSDIR}/devel/icu \ libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup RUN_DEPENDS= geoclue>=0:${PORTSDIR}/net/geoclue PORTSCOUT= limitw:1,even USE_GSTREAMER1= yes USE_XORG= x11 xext ice USES= bison cmake compiler:c++11-lib gettext gmake gperf jpeg perl5 \ pkgconfig python:2 sqlite tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 gtk30 introspection:build libxml2 libxslt USE_GL= gl egl USE_PERL5= build USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS+= -DPORT=GTK \ -DUSE_LD_GOLD:BOOL=0 CONFIGURE_ENV+= XDG_CACHE_HOME=${WRKDIR} BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS_DEFINE= DEBUG FULLDEBUG DEBUG_DESC= Just enable debug symbols FULLDEBUG_DESC= Enable asserts and other debug support FULLDEBUG_CONFIGURE_ENABLE= debug DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release .include .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=0:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" .endif post-patch: @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ ${WRKSRC}/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp pre-configure: .if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-egl.pc) @${ECHO_CMD} "${PKGNAME}: Needs cairo with OPENGL support enabled." @${FALSE} .endif post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/jsc \ ${STAGEDIR}/${PREFIX}/bin/jsc-4 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-4.0/injected-bundle/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jsc-4 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/WebKit* .include Index: head/www/wwwoffle/Makefile =================================================================== --- head/www/wwwoffle/Makefile (revision 411989) +++ head/www/wwwoffle/Makefile (revision 411990) @@ -1,44 +1,44 @@ # $FreeBSD$ PORTNAME= wwwoffle PORTVERSION= 2.9i -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www ipv6 MASTER_SITES= http://www.gedanken.org.uk/software/wwwoffle/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Caching proxy server for HTTP and FTP designed for dial-up hosts LICENSE= GPLv2 LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls USES= perl5 gmake tar:tgz USE_RC_SUBR= ${PORTNAME}d # $SPOOL seems like a common name which could be used for other things, so # use $WWWOFFLE_SPOOL as the overriding setting. WWWOFFLE_SPOOL?= /var/spool/wwwoffle PLIST_SUB+= WWWOFFLE_SPOOL=${WWWOFFLE_SPOOL} HAS_CONFIGURE= yes LIBS+= -lmd CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc --with-ipv6 \ --with-gnutls=${LOCALBASE} \ --with-spooldir=${WWWOFFLE_SPOOL} \ --docdir=${DOCSDIR} \ --mandir=${MANPREFIX}/man SUB_FILES= pkg-message SUB_LIST= WWWOFFLE_SPOOL="${WWWOFFLE_SPOOL}" post-install: ${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl ${STAGEDIR}${WWWOFFLE_SPOOL} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}* ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}d post-stage: @${RM} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf .include Index: head/www/xombrero/Makefile =================================================================== --- head/www/xombrero/Makefile (revision 411989) +++ head/www/xombrero/Makefile (revision 411990) @@ -1,66 +1,66 @@ # Created by: Aldis Berjoza # $FreeBSD$ PORTNAME= xombrero PORTVERSION= 1.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/ MAINTAINER= zeising@FreeBSD.org COMMENT= Minimalists vi-like web browser based on webkit and GTK+ LICENSE= ISCL LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup USES= pkgconfig perl5 tar:tgz USE_PERL5= build INSTALLS_ICONS= yes BUILD_WRKSRC= ${WRKSRC}/freebsd OPTIONS_SINGLE= GTK OPTIONS_SINGLE_GTK=GTK2 GTK3 OPTIONS_DEFAULT=GTK3 SUB_FILES= xombrero .include .if ${PORT_OPTIONS:MGTK2} USE_GNOME= gtk20 LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 MAKE_ENV+= GTK_VERSION="gtk2" .else # GTK3 USE_GNOME= gtk30 LIB_DEPENDS+= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 MAKE_ENV+= GTK_VERSION="gtk3" .endif post-patch: @cd ${WRKSRC}; ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|# ssl_ca_file|ssl_ca_file|' \ -e 's|/etc/ssl/cert.pem|${LOCALBASE}/share/certs/ca-root-nss.crt|' \ unix.c xombrero.conf do-install: ${INSTALL_SCRIPT} ${WRKDIR}/xombrero ${STAGEDIR}${PREFIX}/bin/xombrero ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/xombrero ${STAGEDIR}${PREFIX}/bin/xombrero-bin ${INSTALL_MAN} ${WRKSRC}/xombrero.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .for i in 16 32 48 64 128 ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps ${INSTALL_DATA} ${WRKSRC}/xombreroicon${i}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps .endfor ${MKDIR} ${STAGEDIR}${DATADIR} .for i in hsts-preload style.css tld-rules ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_DATA} ${WRKSRC}/xombrero.desktop ${STAGEDIR}${PREFIX}/share/applications ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in favorites xombrero.conf ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR} .endfor ${INSTALL_SCRIPT} ${WRKSRC}/playflash.sh ${STAGEDIR}${EXAMPLESDIR} .include Index: head/x11/gnome-terminal/Makefile =================================================================== --- head/x11/gnome-terminal/Makefile (revision 411989) +++ head/x11/gnome-terminal/Makefile (revision 411990) @@ -1,62 +1,63 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= gnome-terminal PORTVERSION= 3.18.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal component for the GNOME 3 Desktop BUILD_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \ itstool:${PORTSDIR}/textproc/itstool \ appstream-builder:${PORTSDIR}/devel/appstream-glib \ vala:${PORTSDIR}/lang/vala LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid RUN_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas PORTSCOUT= limitw:1,even USES= cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz USE_GNOME= dconf gtk30 intlhack nautilus3 vte3 USE_XORG= sm ice GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip CPE_VENDOR= gnome GLIB_SCHEMAS= org.gnome.Terminal.gschema.xml OPTIONS_SUB= yes OPTIONS_DEFINE= MIGRATION SEARCHPROVIDER OPTIONS_DEFAULT= SEARCHPROVIDER SEARCHPROVIDER_DESC= Gnome-shell search provider SEARCHPROVIDER_CONFIGURE_ENABLE= search-provider SEARCHPROVIDER_BUILD_DEPENDS= gnome-shell:${PORTSDIR}/x11/gnome-shell SEARCHPROVIDER_RUN_DEPENDS= gnome-shell:${PORTSDIR}/x11/gnome-shell MIGRATION_CONFIGURE_ENABLE= migration MIGRATION_USE= GNOME=gconf2 MIGRATION_DESC= Profile migration to gsettings (pulls in gconf2) .include post-patch: @${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in \ ${WRKSRC}/configure ${WRKSRC}/config.h.in .if ${OSVERSION} < 1000000 @${REINPLACE_CMD} -e 's|-Wno-suggest-attribute=format||g ; \ s|-Wno-unused-but-set-variable||g' \ ${WRKSRC}/src/Makefile.in EXTRA_PATCHES+= ${FILESDIR}/extra-src_terminal-screen.c .endif post-install: .for i in ca cs de el es fi fr gl hu pt_BR ru @${RMDIR} ${STAGEDIR}${PREFIX}/share/help/${i}/gnome-terminal/figures .endfor .include Index: head/x11/sakura/Makefile =================================================================== --- head/x11/sakura/Makefile (revision 411989) +++ head/x11/sakura/Makefile (revision 411990) @@ -1,30 +1,31 @@ # Created by: chinsan # $FreeBSD$ PORTNAME= sakura PORTVERSION= 3.3.4 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= http://launchpadlibrarian.net/235602098/ MAINTAINER= danilo@FreeBSD.org COMMENT= Terminal emulator based on GTK and VTE LICENSE= GPLv2 OPTIONS_DEFINE= DOCS USE_GNOME= vte3 USES= cmake pkgconfig gettext tar:bzip2 LDFLAGS+= -lintl post-patch: @${REINPLACE_CMD} -e '/NOT MATCHES "Debug"/d ; \ /"-O2"/d ; \ 's,share/man,man,g' ; \ /FILES INSTALL/d' ${WRKSRC}/CMakeLists.txt post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} .include Index: head/x11-toolkits/gnustep-gui/Makefile =================================================================== --- head/x11-toolkits/gnustep-gui/Makefile (revision 411989) +++ head/x11-toolkits/gnustep-gui/Makefile (revision 411990) @@ -1,66 +1,66 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= gnustep-gui PORTVERSION= 0.24.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits gnustep MASTER_SITES= GNUSTEP/core MAINTAINER= theraven@FreeBSD.org COMMENT= GNUstep GUI library LICENSE_COMB= multi LICENSE= GPLv3 LGPL3 OPTIONS_DEFINE= DOCS CUPS ASPELL OPTIONS_DEFAULT= CUPS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html \ texi2pdf:${PORTSDIR}/print/texinfo LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile LIB_DEPENDS+= libao.so:${PORTSDIR}/audio/libao BUILD_DEPENDS+= ${LOCALBASE}/lib/libflite.a:${PORTSDIR}/audio/flite GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-jpeg-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-jpeg-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/lib USES= gnustep jpeg pkgconfig USE_GNUSTEP= base build USE_XORG= x11 xt EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.patch EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.speech.patch EXTRA_PATCHES+= ${FILESDIR}/AudioOutputSink.m.patch MAKE_FLAGS+= OPTFLAG="${CFLAGS}" PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell ASPELL_CONFIGURE_ENABLE= aspell USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} post-patch: ${REINPLACE_CMD} -e "s|libpng/png.h|png.h|" ${WRKSRC}/configure ${REINPLACE_CMD} -e "s|doc=no|doc=yes|" ${WRKSRC}/GNUmakefile pre-configure: .for file in config.guess config.sub install-sh @${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC} .endfor .include Index: head/x11-toolkits/gtk20/Makefile =================================================================== --- head/x11-toolkits/gtk20/Makefile (revision 411989) +++ head/x11-toolkits/gtk20/Makefile (revision 411990) @@ -1,73 +1,73 @@ # Created by: Vanilla I. Shu # $FreeBSD$ PORTNAME= gtk PORTVERSION= 2.24.29 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 2 DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (previous stable version) LICENSE= LGPL20 USES= tar:xz PORTSCOUT= limitw:0,even .if !defined(REFERENCE_PORT) RUN_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ python:${PORTSDIR}/lang/python USES+= gettext gmake libtool pathfix perl5 pkgconfig GNU_CONFIGURE= yes USE_GNOME= atk pango gdkpixbuf2 introspection:build \ gtk-update-icon-cache USE_LDCONFIG= yes USE_PERL5= build USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite CONFIGURE_ARGS= --with-xinput=yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip OPTIONS_DEFINE= CUPS DEBUG OPTIONS_DEFAULT=CUPS OPTIONS_SUB= yes CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups CUPS_CONFIGURE_ON= --enable-cups=auto CUPS_CONFIGURE_OFF= --disable-cups DEBUG_CONFIGURE_ON= --enable-debug=yes PLIST_SUB+= LIBGAILVER=18.0.1 LIBGVER=0.2400.29 post-patch: @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \ ${WRKSRC}/gtk/Makefile.in pre-configure: # .if !exists() evaluates too early before cairo has a chance to be installed @if ! pkg-config --exists cairo-xlib; then \ ${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \ ${FALSE}; \ fi post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/modules @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/modules .include .endif Index: head/x11-toolkits/gtk30/Makefile =================================================================== --- head/x11-toolkits/gtk30/Makefile (revision 411989) +++ head/x11-toolkits/gtk30/Makefile (revision 411990) @@ -1,101 +1,101 @@ # Created by: Vanilla I. Shu # $FreeBSD$ # Please keep gtk30 in sync with the following x11-themes ports: # adwaita-icon-theme, gnome-themes-standard and mate-themes PORTNAME= gtk PORTVERSION= 3.18.8 -PORTREVISION?= 1 +PORTREVISION?= 3 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LICENSE= LGPL20 USES= tar:xz .if defined(REFERENCE_PORT) PORTSCOUT= ignore:1 .else PORTSCOUT= limit:1,even BUILD_DEPENDS+= at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk LIB_DEPENDS= libepoxy.so:${PORTSDIR}/graphics/libepoxy RUN_DEPENDS+= hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme \ adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \ at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= atk gdkpixbuf2 introspection:build pango #gtk-update-icon-cache USES+= gettext gmake gnome libtool pathfix perl5 pkgconfig USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite CONFIGURE_ARGS= --enable-x11-backend \ --disable-wayland-backend \ --enable-introspection CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LIBS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes INSTALL_TARGET= install-strip LIBVERSION= 0.1800.8 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ org.gtk.Settings.ColorChooser.gschema.xml \ org.gtk.Settings.Debug.gschema.xml \ org.gtk.Settings.FileChooser.gschema.xml OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY OPTIONS_DEFAULT=CUPS COLORD BROADWAY OPTIONS_SUB= yes BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets. BROADWAY_CONFIGURE_ENABLE= broadway-backend COLORD_DESC= Color profile support COLORD_LIB_DEPENDS= libcolord.so:${PORTSDIR}/graphics/colord COLORD_CONFIGURE_ENABLE=colord CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups CUPS_CONFIGURE_ENABLE= cups CLOUDPRINT_DESC= Cloud printing support CLOUDPRINT_CONFIGURE_ENABLE= cloudprint CLOUDPRINT_LIB_DEPENDS= librest-0.7.so:${PORTSDIR}/devel/librest \ libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib DEBUG_CONFIGURE_ENABLE=debug post-patch: @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure pre-configure: # .if !exists() evaluates too early before cairo has a chance to be installed @if ! pkg-config --exists cairo-xlib; then \ ${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \ ${FALSE}; \ fi pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/engines @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders ${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-3.0.1 \ ${STAGEDIR}${PREFIX}/man/man1 .include .endif Index: head/x11-toolkits/nucleo/Makefile =================================================================== --- head/x11-toolkits/nucleo/Makefile (revision 411989) +++ head/x11-toolkits/nucleo/Makefile (revision 411990) @@ -1,71 +1,71 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= nucleo PORTVERSION= 0.7.6 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/ MAINTAINER= ports@FreeBSD.org COMMENT= Toolkit to explore video and human-computer interaction LICENSE= LGPL21 LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 USES= gmake jpeg libtool pathfix pkgconfig shebangfix tar:bzip2 USE_GL= glu GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-opencv USE_LDCONFIG= yes INSTALL_TARGET= install-strip SHEBANG_FILES= docs/MacOSX/nBundle.in CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= FFMPEG GD GNUTLS QT4 OPTIONS_RADIO= DNSSD OPTIONS_RADIO_DNSSD= AVAHI MDNSRESPONDER OPTIONS_SUB= yes DNSSD_DESC= Service discovery AVAHI_LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/avahi-libdns AVAHI_CPPFLAGS= -I${LOCALBASE}/include/avahi-compat-libdns_sd FFMPEG_DESC= Build FFmpeg plugin FFMPEG_LIB_DEPENDS= libavformat.so:${PORTSDIR}/multimedia/ffmpeg FFMPEG_CONFIGURE_OFF= --without-ffmpeg GD_DESC= Build GD plugin GD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd QT4_DESC= Build Qt 4 plugin GD_CONFIGURE_OFF= --without-gd GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_OFF= --without-gnutls MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/mDNSResponder QT4_USE= QT4=moc_build,corelib QT4_CONFIGURE_OFF= --without-qt QT4_MAKE_ARGS= QT4MOC="${MOC}" .include .if ! ${PORT_OPTIONS:MAVAHI} && ! ${PORT_OPTIONS:MMDNSRESPONDER} CONFIGURE_ARGS+= --without-dns-sd .endif .if ${PORT_OPTIONS:MQT4} QT_NONSTANDARD= yes .endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/nucleo .include Index: head/x11-toolkits/vte3/Makefile =================================================================== --- head/x11-toolkits/vte3/Makefile (revision 411989) +++ head/x11-toolkits/vte3/Makefile (revision 411990) @@ -1,55 +1,56 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= vte PORTVERSION= 0.42.4 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 3 DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal widget with improved accessibility and I18N support BUILD_DEPENDS+= vapigen:${PORTSDIR}/lang/vala \ bash:${PORTSDIR}/shells/bash LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls PORTSCOUT= limitw:1,even USES= bison compiler:c++0x gettext gmake gnome libtool pathfix \ pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME?= gtk30 intltool referencehack introspection:build CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-introspection \ --disable-static \ --disable-Bsymbolic INSTALL_TARGET= install-strip PLIST_SUB= VERSION=2.91 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 || ${OPSYS} == DragonFly LIBS+= -lz .endif post-patch: @${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \ ${WRKSRC}/src/Makefile.in # zlib.pc only is available on 10.1-R and newer. .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 || ${OPSYS} == DragonFly @${REINPLACE_CMD} -e 's|gio-unix-2.0 zlib|gio-unix-2.0|g' \ ${WRKSRC}/configure .endif # borrowed osversion from bsd.ssp.mk .if ${OSVERSION} < 1000036 && ${ARCH} == i386 @${REINPLACE_CMD} -e 's|-fstack-protector-strong||g; \ s|-fstack-protector||g' \ ${WRKSRC}/configure .endif .include