diff --git a/archivers/fpc-paszlib/Makefile b/archivers/fpc-paszlib/Makefile index 6136ecd4c5e..7f9594c2513 100644 --- a/archivers/fpc-paszlib/Makefile +++ b/archivers/fpc-paszlib/Makefile @@ -1,7 +1,7 @@ # Created by: John Merryweather Cooper # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers devel PKGNAMESUFFIX= -paszlib @@ -9,7 +9,6 @@ MAINTAINER= freebsd-fpc@FreeBSD.org COMMENT= Free Pascal unit for native compression IO USE_FPC= hash -USE_FPC_RUN= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile index 1b9e8986019..9d81294d971 100644 --- a/astro/gpsbabel/Makefile +++ b/astro/gpsbabel/Makefile @@ -3,6 +3,7 @@ PORTNAME= gpsbabel PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= astro geography MASTER_SITES= https://secure.ohos.nl/downloads/ \ LOCAL/glebius @@ -13,20 +14,41 @@ COMMENT= GPS file translating tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre - -USE_AUTOTOOLS= autoconf -GNU_CONFIGURE= yes - -USES= gettext -USE_QT4= corelib linguist_build qmake_build -USE_GNOME= glib20 - -PLIST_FILES= bin/gpsbabel - CONFLICTS= gpsbabel14-[0-9]* -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gpsbabel +USE_QT4= corelib qmake_build +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-zlib=system + +OPTIONS_DEFINE= GUI +OPTIONS_SUB= GUI + +GUI_ALL_TARGET= gui +GUI_USE= QT4=gui,xml,network,webkit +GUI_USE+= QT4=linguisttools_build,moc_build,rcc_build,uic_build + +.include + +.if ${PORT_OPTIONS:MGUI} +MAKE_JOBS_UNSAFE= yes +.endif + +post-patch: + @${REINPLACE_CMD} '/langPath_ = / \ + s|QApplication::applicationDirPath()|"${DATADIR}"|' \ + ${WRKSRC}/gui/mainwindow.cc + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/ +.if ${PORT_OPTIONS:MGUI} + ${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe-bin \ + ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \ + ${STAGEDIR}${PREFIX}/share/applications/ + ${MKDIR} ${STAGEDIR}${DATADIR}/translations + ${INSTALL_DATA} ${WRKSRC}/gui/*.qm ${STAGEDIR}${DATADIR}/translations/ + ${INSTALL_DATA} ${WRKSRC}/gui/images/appicon.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/gpsbabel.png +.endif .include diff --git a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc b/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc index 3de10b4cf7d..74929c33aa4 100644 --- a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc +++ b/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc @@ -1,5 +1,5 @@ ---- jeeps/gpslibusb.cc.orig 2014-09-16 05:49:59.000000000 +0200 -+++ jeeps/gpslibusb.cc 2015-03-14 19:33:11.690407708 +0100 +--- jeeps/gpslibusb.cc.orig 2014-09-16 03:49:59 UTC ++++ jeeps/gpslibusb.cc @@ -20,7 +20,8 @@ */ diff --git a/astro/gpsbabel/pkg-plist b/astro/gpsbabel/pkg-plist new file mode 100644 index 00000000000..0301fdec4a2 --- /dev/null +++ b/astro/gpsbabel/pkg-plist @@ -0,0 +1,12 @@ +bin/gpsbabel +%%GUI%%bin/gpsbabelfe-bin +%%GUI%%share/applications/gpsbabel.desktop +%%GUI%%%%DATADIR%%/translations/gpsbabel.qm +%%GUI%%%%DATADIR%%/translations/gpsbabelfe.qm +%%GUI%%%%DATADIR%%/translations/gpsbabelfe_de.qm +%%GUI%%%%DATADIR%%/translations/gpsbabelfe_es.qm +%%GUI%%%%DATADIR%%/translations/gpsbabelfe_fr.qm +%%GUI%%%%DATADIR%%/translations/gpsbabelfe_hu.qm +%%GUI%%%%DATADIR%%/translations/gpsbabelfe_it.qm +%%GUI%%%%DATADIR%%/translations/gpsbabelfe_ru.qm +%%GUI%%share/pixmaps/gpsbabel.png diff --git a/astro/p5-Astro-PAL/Makefile b/astro/p5-Astro-PAL/Makefile index f0aa8992f9e..4b17ca3022f 100644 --- a/astro/p5-Astro-PAL/Makefile +++ b/astro/p5-Astro-PAL/Makefile @@ -3,7 +3,7 @@ PORTNAME= Astro-PAL PORTVERSION= 1.07 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -18,4 +18,7 @@ TEST_DEPENDS= p5-Test-Number-Delta>=1:${PORTSDIR}/devel/p5-Test-Number-Delta USE_PERL5= modbuild USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Astro/PAL/PAL.so + .include diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile index 1b424b7ab44..870643b15c9 100644 --- a/audio/amarok-kde4/Makefile +++ b/audio/amarok-kde4/Makefile @@ -22,8 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${P RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator \ ${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:${PORTSDIR}/net/kio-upnp-ms -LATEST_LINK= ${PORTNAME}-kde4 - USE_KDE4= kdelibs kdeprefix libkcddb libkcompactdisc \ nepomuk-core runtime automoc4 strigi USE_MYSQL= embedded diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 32b84e1739d..ce616919812 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -32,8 +32,6 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} INSTALL_TARGET= install-strip -LATEST_LINK= jack - OPTIONS_DEFINE= ALSA DOXYGEN READLINE OPTIONS_DEFAULT=READLINE OPTIONS_SUB= yes diff --git a/audio/lua51-mpd/Makefile b/audio/lua51-mpd/Makefile index abd83953aa3..e21bf6de973 100644 --- a/audio/lua51-mpd/Makefile +++ b/audio/lua51-mpd/Makefile @@ -12,7 +12,7 @@ COMMENT= Lua library for musicpd RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket OPTIONS_DEFINE= DOCS -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} GH_ACCOUNT= silentbicycle GH_PROJECT= lua-mpd diff --git a/audio/mous/Makefile b/audio/mous/Makefile index 44d701ae0b1..22ff08a5617 100644 --- a/audio/mous/Makefile +++ b/audio/mous/Makefile @@ -3,7 +3,7 @@ PORTNAME= mous PORTVERSION= 1.1a -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://cloud.github.com/downloads/bsdelf/mous/ @@ -14,6 +14,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= cmake +USE_LDCONFIG= yes OPTIONS_DEFINE= ALSA ASSEMBLY FAAC FAAD FLAC LAME AO CUE MAC4DECODER \ MACDECODER MPG123 NCURSES OSS QT4 SDK TAGLIB VORBIS \ @@ -81,7 +82,8 @@ OSS_CMAKE_ON= -DWithPluginOssRenderer=1 OSS_CMAKE_OFF= -DWithPluginOssRenderer=0 QT4_DESC= QT4 frontend -QT4_USE= QT4=gui,linguist,moc_build,qmake_build,rcc_build,uic_build +QT4_USE= QT4=corelib,gui,linguisttools_build +QT4_USE+= QT4=qmake_build,moc_build,rcc_build,uic_build QT4_CMAKE_ON= -DWithFrontendQt=1 QT4_CMAKE_OFF= -DWithFrontendQt=0 diff --git a/audio/mous/files/patch-CMakeLists.txt b/audio/mous/files/patch-CMakeLists.txt index a0aaf22051b..16fac8bbd56 100644 --- a/audio/mous/files/patch-CMakeLists.txt +++ b/audio/mous/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2012-06-15 04:46:40.000000000 +0200 -+++ CMakeLists.txt 2012-07-18 17:04:03.462575000 +0200 -@@ -292,7 +292,7 @@ +--- CMakeLists.txt.orig 2012-06-28 14:58:11 UTC ++++ CMakeLists.txt +@@ -306,7 +306,7 @@ if(WithFrontendQt) RUNTIME DESTINATION bin) install( CODE "file(GLOB TRANSLATION_FILES \"${PROJECT_BINARY_DIR}/*.qm\")" @@ -9,7 +9,7 @@ ) endif() -@@ -307,7 +307,7 @@ +@@ -321,7 +321,7 @@ install( ) file(GLOB RESOURCE_FILES "${MOUS_SOURCE_DIR}/resource/*") diff --git a/audio/mous/files/patch-contrib__ffmpeg-strip-wma__common.h b/audio/mous/files/patch-contrib__ffmpeg-strip-wma__common.h index 9d7b40052a8..74fc198e38e 100644 --- a/audio/mous/files/patch-contrib__ffmpeg-strip-wma__common.h +++ b/audio/mous/files/patch-contrib__ffmpeg-strip-wma__common.h @@ -1,6 +1,6 @@ ---- ./contrib/ffmpeg-strip-wma/common.h.orig 2014-07-02 10:52:02.000000000 -0400 -+++ ./contrib/ffmpeg-strip-wma/common.h 2014-07-02 10:52:39.000000000 -0400 -@@ -1150,11 +1150,6 @@ +--- contrib/ffmpeg-strip-wma/common.h.orig 2012-06-28 14:58:11 UTC ++++ contrib/ffmpeg-strip-wma/common.h +@@ -1150,11 +1150,6 @@ if(256*256*256*64%(tcount+tskip_count)== #define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d) diff --git a/audio/py-mpd2/Makefile b/audio/py-mpd2/Makefile index 5a0f528d31c..391b7a912cf 100644 --- a/audio/py-mpd2/Makefile +++ b/audio/py-mpd2/Makefile @@ -23,7 +23,6 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS EXAMPLES DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile index 1559d82d46d..c43a6b38146 100644 --- a/audio/qmpdclient/Makefile +++ b/audio/qmpdclient/Makefile @@ -13,7 +13,7 @@ COMMENT= Easy to use musicpd client written in Qt4 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:bzip2 qmake +USES= qmake tar:bzip2 USE_QT4= moc_build rcc_build uic_build \ corelib gui network xml xmlpatterns INSTALLS_ICONS= yes @@ -23,24 +23,17 @@ OPTIONS_DEFINE= DBUS NLS DEBUG DATADIR= ${PREFIX}/share/QMPDClient WRKSRC= ${WRKDIR}/${PORTNAME} +OPTIONS_SUB= NLS + +NLS_USE= QT4=linguisttools_build + +DBUS_QMAKE_ON= CONFIG+=qdbus +DBUS_USE= QT4=dbus + +DEBUG_QMAKE_ON= CONFIG+=debug + .include -.if ! ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="@comment " -.else -USE_QT4+= linguist_build -PLIST_SUB+= NLS="" -.endif - -.if ${PORT_OPTIONS:MDBUS} -USE_QT4+= dbus -QMAKE_ARGS+= "CONFIG+=qdbus" -.endif - -.if ${PORT_OPTIONS:MDEBUG} -QMAKE_ARGS+= "CONFIG+=debug" -.endif - post-patch: .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e '/INSTALLS += translations/d' \ diff --git a/audio/qmpdclient/files/patch-qmpdclient.desktop b/audio/qmpdclient/files/patch-qmpdclient.desktop index e8913adaeba..ba599a1e03e 100644 --- a/audio/qmpdclient/files/patch-qmpdclient.desktop +++ b/audio/qmpdclient/files/patch-qmpdclient.desktop @@ -1,6 +1,6 @@ ---- qmpdclient.desktop.orig 2011-02-04 14:22:08.000000000 +0300 -+++ qmpdclient.desktop 2011-03-25 13:43:51.000000000 +0300 -@@ -4,6 +4,6 @@ +--- qmpdclient.desktop.orig 2011-06-08 09:16:26 UTC ++++ qmpdclient.desktop +@@ -4,6 +4,6 @@ Name=QMPDClient GenericName=Qt4 based MPD client Comment=A nicer MPD client Exec=qmpdclient diff --git a/audio/qmpdclient/files/patch-qmpdclient.pro b/audio/qmpdclient/files/patch-qmpdclient.pro index 3c5363ec198..ab5fdc8050f 100644 --- a/audio/qmpdclient/files/patch-qmpdclient.pro +++ b/audio/qmpdclient/files/patch-qmpdclient.pro @@ -1,6 +1,6 @@ ---- qmpdclient.pro.orig 2011-06-08 13:16:26.000000000 +0400 -+++ qmpdclient.pro 2011-09-21 14:18:07.000000000 +0400 -@@ -3,7 +3,7 @@ +--- qmpdclient.pro.orig 2011-06-08 09:16:26 UTC ++++ qmpdclient.pro +@@ -3,7 +3,7 @@ PREFIX = /usr/local # Most people need not muck about below here #!contains(QT_MAJOR_VERSION, 4):error(QMPDClient requires Qt 4) @@ -9,7 +9,7 @@ # addition ldflags for release build QMAKE_LFLAGS_RELEASE += -O2 -g0 -s -@@ -212,16 +212,15 @@ +@@ -212,16 +212,15 @@ unix { SOURCES += src/qmpdclient_x11.cpp LIBS += -lX11 # Check for dbus support @@ -28,7 +28,7 @@ SOURCES += src/notifications_nodbus.cpp } } -@@ -253,6 +252,7 @@ +@@ -253,6 +252,7 @@ unix { translations.commands = lrelease $$TRANSLATIONS translations.files = lang/cs_CZ.qm lang/de_DE.qm lang/es_ES.qm lang/fr_FR.qm lang/it_IT.qm lang/nl_NL.qm lang/nn_NO.qm lang/no_NO.qm lang/pt_BR.qm lang/ru_RU.qm lang/sv_SE.qm lang/tr_TR.qm lang/uk_UA.qm lang/zh_CN.qm lang/zh_TW.qm translations.path = $$PREFIX/share/QMPDClient/translations diff --git a/biology/ruby-bio/Makefile b/biology/ruby-bio/Makefile index fea988732e7..8a9cb18e58b 100644 --- a/biology/ruby-bio/Makefile +++ b/biology/ruby-bio/Makefile @@ -16,8 +16,6 @@ OPTIONS_DEFINE= XMLPARSER BDB4 MYSQL PGSQL DOCS XMLPARSER_DESC= xmlparser support for faster Blast processing BDB4_DESC= bdb4 support for faster flat file indexing -OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options - USES= shebangfix USE_RUBY= yes USE_RUBY_SETUP= yes diff --git a/biology/ugene/Makefile b/biology/ugene/Makefile index 69eec02a86d..55aab14861c 100644 --- a/biology/ugene/Makefile +++ b/biology/ugene/Makefile @@ -3,6 +3,7 @@ PORTNAME= ugene DISTVERSION= 1.17.0 +PORTREVISION= 1 CATEGORIES= biology science MASTER_SITES= http://ugene.unipro.ru/downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} QueryDesigner_UserManual.pdf \ @@ -17,10 +18,10 @@ LICENSE= GPLv2 RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USES= execinfo qmake +USES= desktop-file-utils execinfo qmake USE_GL= glu USE_QT4= corelib gui network script webkit xml \ - linguist_build moc_build qmake_build qtestlib_build \ + linguisttools_build moc_build qmake_build qtestlib_build \ rcc_build scripttools_build uic_build \ imageformats_run USE_XORG= xtst diff --git a/chinese/eric6/distinfo b/chinese/eric6/distinfo index 4b56c39e76e..0137958c24c 100644 --- a/chinese/eric6/distinfo +++ b/chinese/eric6/distinfo @@ -1,2 +1,2 @@ -SHA256 (eric6-i18n-zh_CN.GB2312-6.0.5.tar.gz) = 6275f3bc827717babb15ee6f442a21fc5d779865bf8eeb38e9fd0e741bd70abf -SIZE (eric6-i18n-zh_CN.GB2312-6.0.5.tar.gz) = 447183 +SHA256 (eric6-i18n-zh_CN.GB2312-6.0.8.tar.gz) = 95d8179d8ba7c176ee31e6aae11cbec4cbb348c7636d4ded21002677d74ed683 +SIZE (eric6-i18n-zh_CN.GB2312-6.0.8.tar.gz) = 447235 diff --git a/chinese/joe/Makefile b/chinese/joe/Makefile index 696be5cfb9e..9a960854746 100644 --- a/chinese/joe/Makefile +++ b/chinese/joe/Makefile @@ -9,8 +9,6 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org -LATEST_LINK= ${PKGNAMEPREFIX}joe - DEPRECATED= The difference with editors/joe is too trivial to warrant a separate port EXPIRATION_DATE=2015-09-27 diff --git a/chinese/p5-Encode-CNMap/Makefile b/chinese/p5-Encode-CNMap/Makefile index 416c5196d07..0d01e2039e9 100644 --- a/chinese/p5-Encode-CNMap/Makefile +++ b/chinese/p5-Encode-CNMap/Makefile @@ -3,7 +3,7 @@ PORTNAME= Encode-CNMap PORTVERSION= 0.32 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -17,4 +17,7 @@ LICENSE_COMB= dual USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Encode/CNMap/CNMap.so + .include diff --git a/chinese/p5-cconv/Makefile b/chinese/p5-cconv/Makefile index 5051944c0e5..282b4049ea2 100644 --- a/chinese/p5-cconv/Makefile +++ b/chinese/p5-cconv/Makefile @@ -4,7 +4,7 @@ PORTNAME= cconv PORTVERSION= 0.6.1 DISTVERSIONPREFIX= perl- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese converters perl5 MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= p5- @@ -20,4 +20,7 @@ CFLAGS+= -I${LOCALBASE}/include USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/cconv/cconv.so + .include diff --git a/chinese/phpbb3-tw/Makefile b/chinese/phpbb3-tw/Makefile index 07b9614fd61..ea22a32f7ea 100644 --- a/chinese/phpbb3-tw/Makefile +++ b/chinese/phpbb3-tw/Makefile @@ -15,8 +15,6 @@ COMMENT= The Traditional Chinese version of phpBB3 CONFLICTS= phpbb-tw-[0-2]* phpbb-devel-[0-3]* phpbb-[0-3]* -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX} - USES= zip # The phpBB3 port supports a number of variables that may be tweaked at build diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile index 89c4aa759b7..46a53934813 100644 --- a/comms/chirp/Makefile +++ b/comms/chirp/Makefile @@ -2,7 +2,7 @@ PORTNAME= chirp PORTVERSION= 0.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms hamradio MASTER_SITES= http://chirp.danplanet.com/download/${PORTVERSION}/ \ LOCAL/db @@ -12,9 +12,10 @@ COMMENT= Free, open-source tool for programming your amateur radio LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2 \ +BUILD_DEPENDS= ${CHIRP_DEPENDS} +RUN_DEPENDS= ${CHIRP_DEPENDS} +CHIRP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2 \ ${PYTHON_PKGNAMEPREFIX}serial>0:${PORTSDIR}/comms/py-serial -RUN_DEPENDS= ${BUILD_DEPENDS} USES= desktop-file-utils gettext python USE_PYTHON= distutils diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile index 941c8139d1f..50fcd13bbdc 100644 --- a/comms/cqrlog/Makefile +++ b/comms/cqrlog/Makefile @@ -27,6 +27,7 @@ ALL_TARGET= ${PORTNAME} LAZARUS_VER= 1.4.2 LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} +USE_FPC= fcl-net OPTIONS_SINGLE= LCL OPTIONS_SINGLE_LCL= GTK2 QT4 diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 37c1e67ee84..a54c3fc7e42 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -35,7 +35,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= cmake:outsource iconv perl5 python:2.7 shebangfix SHEBANG_FILES= grc/freedesktop/grc_setup_freedesktop.in -CMAKE_ENV+= LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1" +CONFIGURE_ENV+= LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1" CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0" CMAKE_ARGS+= -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \ -DICONV_LIB:STRING="X${ICONV_LIB}" \ diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile index 06d04ba7c7a..f7cec3174ee 100644 --- a/comms/syncterm/Makefile +++ b/comms/syncterm/Makefile @@ -12,7 +12,7 @@ COMMENT= ANSI-BBS terminal which supports telnet, rlogin, and SSH LICENSE= GPLv2 WRKSRC= ${WRKDIR}/syncterm-${PORTVERSION}/src/syncterm -USES= gmake tar:tgz perl5 +USES= gmake perl5 tar:tgz USE_PERL5= build MAKEFILE= GNUmakefile PLIST_FILES= bin/syncterm \ @@ -20,6 +20,7 @@ PLIST_FILES= bin/syncterm \ share/applications/syncterm.desktop \ share/icons/hicolor/64x64/apps/syncterm.png +NO_CCACHE= yes DISABLE_MAKE_JOBS= yes MAKE_ARGS+= WITHOUT_PORTAUDIO=yes MAKE_ARGS+= -C ${WRKSRC} diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile index decd72fd5d8..7cd0e7ff68d 100644 --- a/comms/wsjt/Makefile +++ b/comms/wsjt/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= wsjt -VERSION= 9.1 -PORTREVISION= 11 DISTVERSION= ${VERSION}.r${SVN_REV} +PORTREVISION= 12 CATEGORIES= comms hamradio MASTER_SITES= LOCAL/db DISTNAME= wsjt-r${SVN_REV} @@ -11,32 +10,43 @@ DISTNAME= wsjt-r${SVN_REV} MAINTAINER= hamradio@FreeBSD.org COMMENT= Weak signal ham radio communication package -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow +LICENSE= GPLv3 + LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 \ libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ libportaudio.so:${PORTSDIR}/audio/portaudio -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \ +WSJT_DEPENDS= ${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \ + ${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \ + ${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \ ${PYNUMPY} +BUILD_DEPENDS= ${WSJT_DEPENDS} +RUN_DEPENDS= ${LINUXBASE}/bin/kvasd:${PORTSDIR}/comms/kvasd \ + ${WSJT_DEPENDS} USE_GCC= yes -USES= fortran gmake python tar:bzip2 +USES= autoreconf fortran gmake python:3.3+ tar:bzip2 +SHEBANG_FILES= ${WRKSRC}/wsjt GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-gfortran --prefix=${STAGEDIR}${LOCALBASE} \ - --with-portaudio-include-dir=${LOCALBASE}/include/ \ - --with-portaudio-lib-dir=${LOCALBASE}/lib/ +CONFIGURE_ARGS= --prefix=${STAGEDIR}${LOCALBASE} \ + --with-python=${PYTHON_CMD} \ + --with-gfortran=${FC} \ + --with-portaudio-include-dir=${LOCALBASE}/include \ + --with-portaudio-lib-dir=${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib # Adding this breaks configure #LDFLAGS+= -shared +VERSION= 9.1 PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ VERSION=${VERSION} .include -.if defined(BOOTSTRAP) -SVN_REV!= svn info http://svn.code.sf.net/p/wsjt/code/trunk/ | ${GREP} Revision | cut -d' ' -f2 +.if defined(BOOTSTRAP) || defined(SVN_FETCH) +#portlint freaks over this but it's only for dev. so ignore. +FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion +SVN_REV!= svn info http://svn.code.sf.net/p/wsjt/wsjt/ | ${GREP} Revision | cut -d' ' -f2 .else .include "Makefile.svn_rev" .endif @@ -47,32 +57,46 @@ FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion do-fetch: ${MKDIR} ${WRKDIR} svn export -r ${SVN_REV} \ - http://svn.code.sf.net/p/wsjt/code/trunk ${WRKDIR}/wsjt-r${SVN_REV} + http://svn.code.sf.net/p/wsjt/wsjt/trunk ${WRKDIR}/wsjt-r${SVN_REV} cd ${WRKDIR};rm -f ${DISTNAME}/*.a ${DISTNAME}/*.lib ${DISTNAME}/*.dll;\ tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME} - echo "SVN_REV= ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev + ${ECHO_CMD} "SVN_REV= ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev .if ${USER} == db scp ${DISTDIR}/${DISTNAME}.tar.bz2 \ freefall.freebsd.org:public_distfiles/ .endif .endif -pre-patch: - @${CP} ${FILESDIR}/configure ${WRKSRC} -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for d in ${WRKSRC}/WSJT_Quick_Reference.pdf ${WRKSRC}/WSJT_Source_Code.txt \ - ${WRKSRC}/WSJT_User_600.pdf ${WRKSRC}/UpdateHistory.txt \ - ${WRKSRC}/WSJT_Source_Code.txt ${WRKSRC}/LICENSE.TXT - ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} +do-install: + ${MKDIR} ${STAGEDIR}${DATADIR} + ${CP} ${FILESDIR}/wsjt ${WRKSRC} + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/wsjt + ${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|' \ + ${WRKSRC}/wsjt + ${INSTALL_SCRIPT} ${WRKSRC}/wsjt ${STAGEDIR}${LOCALBASE}/bin + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + ${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/wsjt/WsjtMod +.for d in ${WRKSRC}/WsjtMod/Audio.so ${WRKSRC}/WsjtMod/__init__.py \ + ${WRKSRC}/WsjtMod/astro.py ${WRKSRC}/WsjtMod/g.py \ + ${WRKSRC}/WsjtMod/go.py ${WRKSRC}/WsjtMod/options.py \ + ${WRKSRC}/WsjtMod/palettes.py ${WRKSRC}/WsjtMod/smeter.py \ + ${WRKSRC}/WsjtMod/specjt.py + ${INSTALL_DATA} ${WRKSRC}${d} ${STAGEDIR}${LOCALBASE}/lib/wsjt/WsjtMod +.endfor +.for d in ${WRKSRC}/CALL3.TXT ${WRKSRC}/dmet_10_-1_3.dat \ + ${WRKSRC}/dmet_10_0_3.dat ${WRKSRC}/dmet_20_-2_2.dat \ + ${WRKSRC}/dmet_20_-3_2.dat ${WRCSRC}/wsjtrc ${WRCSRC}/wsjt.py \ + ${WRKSRC}/Pmw.py ${WRKSRC}/PmwColor.py ${WRKSRC}/PmwBlt.py + ${INSTALL_DATA} ${WRKSRC}${d} ${STAGEDIR}${DATADIR} .endfor - do-build: (cd ${WRKSRC};${GMAKE}) -post-stage: - (cd ${STAGEDIR}${PREFIX} \ - && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) +post-configure: + echo ZZZ post-configure + ${REINPLACE_CMD} -e 's|f2py|f2py-${PYTHON_VER}|' \ + ${WRKSRC}/Makefile .include diff --git a/comms/wsjt/Makefile.svn_rev b/comms/wsjt/Makefile.svn_rev index ca63d73fe43..3812ea094e0 100644 --- a/comms/wsjt/Makefile.svn_rev +++ b/comms/wsjt/Makefile.svn_rev @@ -1 +1 @@ -SVN_REV= 2511 +SVN_REV= 5745 diff --git a/comms/wsjt/distinfo b/comms/wsjt/distinfo index cee9af0bed9..c6783bc37f2 100644 --- a/comms/wsjt/distinfo +++ b/comms/wsjt/distinfo @@ -1,2 +1,2 @@ -SHA256 (wsjt-r2511.tar.bz2) = 3724fd976c1c7449a486b821018c4014d5a6b316c657118ac30dc120706e9b9b -SIZE (wsjt-r2511.tar.bz2) = 2208647 +SHA256 (wsjt-r5745.tar.bz2) = 96aeff70903d7ace9e094f739fd25c5453b6211663d75f10d5fb38c8728e72d3 +SIZE (wsjt-r5745.tar.bz2) = 3262114 diff --git a/comms/wsjt/files/configure b/comms/wsjt/files/configure deleted file mode 100644 index ad38915aa64..00000000000 --- a/comms/wsjt/files/configure +++ /dev/null @@ -1,6094 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wsjt 7.04. -# -# $Id: configure.ac 1322 2009-08-18 21:19:47Z va3db $ -# -# -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -# -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes -else - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi - done;; - esac - as_found=false -done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } -IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 -fi - - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -test -n "$DJDIR" || exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= - -# Identity of this package. -PACKAGE_NAME='wsjt' -PACKAGE_TARNAME='wsjt' -PACKAGE_VERSION='7.04' -PACKAGE_STRING='wsjt 7.04' -PACKAGE_BUGREPORT='' -PACKAGE_URL='' - -ac_default_prefix="/usr/local" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='LTLIBOBJS -LIBOBJS -PREFIX -CLOBBER -OS -VERSION -F2PY -PYTHON -TEST -LD -AR -SED -LN -MV -CP -RM -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -SET_MAKE -EGREP -GREP -CPP -PORTAUDIO_LIBDIR -PORTAUDIO_INCLUDE -FCV -FC -FC_LIB_PATH -GFORTRAN -G95 -ac_ct_F77 -FFLAGS -F77 -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_g95 -enable_gfortran -with_portaudio_include_dir -with_portaudio_lib_dir -enable_clobber -enable_assert -' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -F77 -FFLAGS -CPP' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures wsjt 7.04 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/wsjt] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of wsjt 7.04:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-g95 Use G95 compiler if available. - --enable-gfortran Use gfortran compiler if available. - --enable-clobber Don't preserve old binaries on make install - --enable-assert Enable assert(). - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-portaudio-include-dir= - path to portaudio include files - --with-portaudio-lib-dir= - path to portaudio lib files - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags - CPP C preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to the package provider. -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -wsjt configure 7.04 -generated by GNU Autoconf 2.69 - -Copyright (C) 2012 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. - -$Id: configure.ac 1322 2009-08-18 21:19:47Z va3db $ -_ACEOF - exit -fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_compile - -# ac_fn_f77_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_f77_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_f77_try_compile - -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by wsjt $as_me 7.04, which was -generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - $as_echo "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - $as_echo "## ----------------- ## -## Output variables. ## -## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## -## File substitutions. ## -## ------------------- ##" - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - $as_echo "## ----------- ## -## confdefs.h. ## -## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -$as_echo "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -fail=0 - - - -OLD_CFLAGS="$CFLAGS" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_F77+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 -$as_echo "$F77" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$F77" && break - done -fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_F77+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_F77="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_F77" && break -done - - if test "x$ac_ct_F77" = x; then - F77="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - F77=$ac_ct_F77 - fi -fi - - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -if ${ac_cv_f77_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat > conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif - - end -_ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } -ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} -ac_save_FFLAGS=$FFLAGS -FFLAGS= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } -if ${ac_cv_prog_f77_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - FFLAGS=-g -cat > conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : - ac_cv_prog_f77_g=yes -else - ac_cv_prog_f77_g=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - fi -else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi -fi - -if test $ac_compiler_gnu = yes; then - G77=yes -else - G77= -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -CFLAGS="$OLD_CFLAGS" - -CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" -LDFLAGS="-L/usr/local/lib ${LDFLAGS}" -LIBS=" -lpthread ${LIBS}" -FFLAGS_GFORTRAN="${FFLAGS} -fno-range-check -ffixed-line-length-none\ - -Wall -fbounds-check -fno-second-underscore -fPIC" -FFLAGS_G95="${FFLAGS} -Wall -Wno-precision-loss -fbounds-check -fno-second-underscore -fPIC" -#-Wall -Wno-precision-loss -fbounds-check -fno-second-underscore -fPIC - - - - -# Check whether --enable-g95 was given. -if test "${enable_g95+set}" = set; then : - enableval=$enable_g95; g95=$enableval -else - g95=no -fi - - -# Check whether --enable-gfortran was given. -if test "${enable_gfortran+set}" = set; then : - enableval=$enable_gfortran; gfortran=$enableval -else - gfortran=no -fi - - - -FCV="" - -if test -n ${FC} ; then - gfortran_name_part=`echo ${FC} | cut -c 1-8` - if test ${gfortran_name_part} = "gfortran" ; then - gfortran_name=${FC} - FC_LIB_PATH=`${FC} -print-file-name=` - g95=no - gfortran=yes - FFLAGS="${FFLAGS_GFORTRAN}" - FCV="gnu95" - else - unset ${FC} - fi -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s" >&5 -$as_echo_n "checking uname -s... " >&6; } -case `uname -s` in - CYGWIN*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cygwin" >&5 -$as_echo "Cygwin" >&6; } - CYGWIN=yes - ;; - SunOS*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: SunOS or Solaris" >&5 -$as_echo "SunOS or Solaris" >&6; } - -$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - - ;; - FreeBSD*) - if test -z ${gfortran_name} ; then - gfortran_name=`grep FC: /usr/ports/Mk/bsd.gcc.mk | head -1 |awk '{print $2}'` - fi - FCV_G95="g95" - ;; - *) - FCV_G95="g95" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; -esac - - -if test -z $gfortran_name ; then - gfortran_name="gfortran" -fi - -# Extract the first word of "g95", so it can be a program name with args. -set dummy g95; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_G95+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $G95 in - [\\/]* | ?:[\\/]*) - ac_cv_path_G95="$G95" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_G95="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -G95=$ac_cv_path_G95 -if test -n "$G95"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $G95" >&5 -$as_echo "$G95" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "${gfortran_name}", so it can be a program name with args. -set dummy ${gfortran_name}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GFORTRAN+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GFORTRAN in - [\\/]* | ?:[\\/]*) - ac_cv_path_GFORTRAN="$GFORTRAN" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GFORTRAN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GFORTRAN=$ac_cv_path_GFORTRAN -if test -n "$GFORTRAN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GFORTRAN" >&5 -$as_echo "$GFORTRAN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - -if test ! -z ${GFORTRAN} ; then - echo "*** gfortran compiler found at ${GFORTRAN}" - if test "${gfortran}" = yes; then - FC_LIB_PATH=`${GFORTRAN} -print-file-name=` - FC=`basename ${GFORTRAN}` - g95=no - FFLAGS="${FFLAGS_GFORTRAN}" - FCV="gnu95" - fi -else - echo "*** No gfortran compiler found" -fi - -if test ! -z ${G95} ; then - echo "*** g95 compiler found at ${G95}" - if test "${g95}" = yes; then - FC_LIB_PATH=`${G95} -print-file-name=` - FC=`basename ${G95}` - gfortran=no - FFLAGS="${FFLAGS_G95}" - FCV=${FCV_G95} - fi -else - echo "*** No g95 compiler found" -fi - -if test -z ${FC} ; then - if test ! -z ${GFORTRAN} ; then - if test "${g95}" = yes; then - echo "You enabled g95, but no g95 compiler found, defaulting to gfortran instead" - fi - FC_LIB_PATH=`${GFORTRAN} -print-file-name=` - FC=`basename ${GFORTRAN}` - g95=no - gfortran=yes - FFLAGS="${FFLAGS_GFORTRAN}" - FCV="gnu95" - elif test ! -z $G95 ; then - if test "${gfortran}" = yes; then - echo "You enabled gfortran, but no gfortran compiler found, defaulting to g95 instead" - fi - FC_LIB_PATH=`${G95} -print-file-name=` - FC=`basename ${G95}` - g95=yes - gfortran=no - FFLAGS="${FFLAGS_G95}" - FCV=${FCV_G95} - fi -fi - - -cat >>confdefs.h <<_ACEOF -#define FC_LIB_PATH "${FC_LIB_PATH}" -_ACEOF - -FC_LIB_PATH="${FC_LIB_PATH}" - - -cat >>confdefs.h <<_ACEOF -#define FC "${FC}" -_ACEOF - -FC="${FC}" - -FCV="${FCV}" - - - - - - -HAS_PORTAUDIO_H=0 -HAS_PORTAUDIO_LIB=0 -HAS_PORTAUDIO=0 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a v19 portaudio " >&5 -$as_echo_n "checking for a v19 portaudio ... " >&6; } - -portaudio_lib_dir="/usr/lib" -portaudio_include_dir="/usr/include" - - -# Check whether --with-portaudio-include-dir was given. -if test "${with_portaudio_include_dir+set}" = set; then : - withval=$with_portaudio_include_dir; portaudio_include_dir=$with_portaudio_include_dir -fi - - - -# Check whether --with-portaudio-lib-dir was given. -if test "${with_portaudio_lib_dir+set}" = set; then : - withval=$with_portaudio_lib_dir; portaudio_lib_dir=$with_portaudio_lib_dir -fi - - -if test -e ${portaudio_include_dir}/portaudio.h; then - HAS_PORTAUDIO_H=1 -fi - -if test -e ${portaudio_lib_dir}/libportaudio.so \ - -o -e ${portaudio_lib_dir}/libportaudio.a;then - HAS_PORTAUDIO_LIB=1 -fi - -if test ${HAS_PORTAUDIO_H} -eq 1 -a ${HAS_PORTAUDIO_LIB} -eq 1; then - LDFLAGS="-L${portaudio_lib_dir} ${LDFLAGS}" - LIBS="${LIBS} -lportaudio" - CPPFLAGS="-I${portaudio_include_dir} ${CPPFLAGS}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Pa_GetVersion in -lportaudio" >&5 -$as_echo_n "checking for Pa_GetVersion in -lportaudio... " >&6; } -if ${ac_cv_lib_portaudio_Pa_GetVersion+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lportaudio $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char Pa_GetVersion (); -int -main () -{ -return Pa_GetVersion (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_portaudio_Pa_GetVersion=yes -else - ac_cv_lib_portaudio_Pa_GetVersion=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_portaudio_Pa_GetVersion" >&5 -$as_echo "$ac_cv_lib_portaudio_Pa_GetVersion" >&6; } -if test "x$ac_cv_lib_portaudio_Pa_GetVersion" = xyes; then : - \ - HAS_PORTAUDIO_VERSION=1 -else - HAS_PORTAUDIO_VERSION=0 -fi - - if test ${HAS_PORTAUDIO_VERSION} -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: This is likely portaudio v18; you need portaudio v19" >&5 -$as_echo "This is likely portaudio v18; you need portaudio v19" >&6; } - else - HAS_PORTAUDIO=1 - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: portaudio not found trying FreeBSD paths " >&5 -$as_echo "portaudio not found trying FreeBSD paths " >&6; } - portaudio_lib_dir="/usr/local/lib/portaudio2" - portaudio_include_dir="/usr/local/include/portaudio2" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a v19 portaudio in FreeBSD paths." >&5 -$as_echo_n "checking for a v19 portaudio in FreeBSD paths.... " >&6; } - HAS_PORTAUDIO_H=0 - HAS_PORTAUDIO_LIB=0 - - if test -e ${portaudio_include_dir}/portaudio.h; then - HAS_PORTAUDIO_H=1 - fi - - if test -e ${portaudio_lib_dir}/libportaudio.so \ - -o -e ${portaudio_lib_dir}/libportaudio.a;then - HAS_PORTAUDIO_LIB=1 - fi - - if test ${HAS_PORTAUDIO_H} -eq 1 -a ${HAS_PORTAUDIO_LIB} -eq 1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found portaudio in FreeBSD paths, double checking it is v19 " >&5 -$as_echo "found portaudio in FreeBSD paths, double checking it is v19 " >&6; } - LDFLAGS="-L${portaudio_lib_dir} ${LDFLAGS}" - LIBS="${LIBS} -lportaudio" - CPPFLAGS="-I${portaudio_include_dir} ${CPPFLAGS}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Pa_GetVersion in -lportaudio" >&5 -$as_echo_n "checking for Pa_GetVersion in -lportaudio... " >&6; } -if ${ac_cv_lib_portaudio_Pa_GetVersion+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lportaudio $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char Pa_GetVersion (); -int -main () -{ -return Pa_GetVersion (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_portaudio_Pa_GetVersion=yes -else - ac_cv_lib_portaudio_Pa_GetVersion=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_portaudio_Pa_GetVersion" >&5 -$as_echo "$ac_cv_lib_portaudio_Pa_GetVersion" >&6; } -if test "x$ac_cv_lib_portaudio_Pa_GetVersion" = xyes; then : - \ - HAS_PORTAUDIO_VERSION=1 -else - HAS_PORTAUDIO_VERSION=0 -fi - - if test ${HAS_PORTAUDIO_VERSION} -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: How did you end up with a portaudio v18 here?" >&5 -$as_echo "How did you end up with a portaudio v18 here?" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found v19" >&5 -$as_echo "found v19" >&6; } - HAS_PORTAUDIO=1 - HAS_PORTAUDIO_H=1 - fi - fi -fi - -PORTAUDIO_INCLUDE="-I${portaudio_include_dir}" - -PORTAUDIO_LIBDIR="-L${portaudio_lib_dir}" - - - - -if test "$ac_cv_c_compiler_gnu" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC is Apple GCC" >&5 -$as_echo_n "checking if $CC is Apple GCC... " >&6; } - - if expr "`$CC -v 2>&1 | tail -1`" : ".*Apple" >/dev/null; then - AppleGCC=yes - else - AppleGCC=no - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AppleGCC" >&5 -$as_echo "$AppleGCC" >&6; } - - CFLAGS="$CFLAGS -Wall -O0" -fi - -if test "$ac_cv_prog_cc_g" = yes; then - CFLAGS="$CFLAGS -g" -fi - -if test ! -z "$CFLAGS"; then - CFLAGS="$CFLAGS $CFLAGS" -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 -$as_echo_n "checking for library containing strerror... " >&6; } -if ${ac_cv_search_strerror+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char strerror (); -int -main () -{ -return strerror (); - ; - return 0; -} -_ACEOF -for ac_lib in '' cposix; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_strerror=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_strerror+:} false; then : - break -fi -done -if ${ac_cv_search_strerror+:} false; then : - -else - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 -$as_echo "$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -if test $ac_cv_c_compiler_gnu = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 -$as_echo_n "checking whether $CC needs -traditional... " >&6; } -if ${ac_cv_prog_gcc_traditional+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_pattern="Autoconf.*'x'" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : - ac_cv_prog_gcc_traditional=yes -else - ac_cv_prog_gcc_traditional=no -fi -rm -f conftest* - - - if test $ac_cv_prog_gcc_traditional = no; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -Autoconf TCGETA -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : - ac_cv_prog_gcc_traditional=yes -fi -rm -f conftest* - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 -$as_echo "$ac_cv_prog_gcc_traditional" >&6; } - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_RM+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $RM in - [\\/]* | ?:[\\/]*) - ac_cv_path_RM="$RM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -RM=$ac_cv_path_RM -if test -n "$RM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5 -$as_echo "$RM" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "cp", so it can be a program name with args. -set dummy cp; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_CP+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $CP in - [\\/]* | ?:[\\/]*) - ac_cv_path_CP="$CP" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -CP=$ac_cv_path_CP -if test -n "$CP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5 -$as_echo "$CP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "mv", so it can be a program name with args. -set dummy mv; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MV+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MV in - [\\/]* | ?:[\\/]*) - ac_cv_path_MV="$MV" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -MV=$ac_cv_path_MV -if test -n "$MV"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5 -$as_echo "$MV" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "ln", so it can be a program name with args. -set dummy ln; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LN+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $LN in - [\\/]* | ?:[\\/]*) - ac_cv_path_LN="$LN" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -LN=$ac_cv_path_LN -if test -n "$LN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5 -$as_echo "$LN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "sed", so it can be a program name with args. -set dummy sed; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $SED in - [\\/]* | ?:[\\/]*) - ac_cv_path_SED="$SED" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -SED=$ac_cv_path_SED -if test -n "$SED"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 -$as_echo "$SED" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $AR in - [\\/]* | ?:[\\/]*) - ac_cv_path_AR="$AR" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -AR=$ac_cv_path_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "ld", so it can be a program name with args. -set dummy ld; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $LD in - [\\/]* | ?:[\\/]*) - ac_cv_path_LD="$LD" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -LD=$ac_cv_path_LD -if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "test", so it can be a program name with args. -set dummy test; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_TEST+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $TEST in - [\\/]* | ?:[\\/]*) - ac_cv_path_TEST="$TEST" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_TEST="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_TEST" && ac_cv_path_TEST="test" - ;; -esac -fi -TEST=$ac_cv_path_TEST -if test -n "$TEST"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST" >&5 -$as_echo "$TEST" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "python", so it can be a program name with args. -set dummy python; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PYTHON=$ac_cv_path_PYTHON -if test -n "$PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -$as_echo "$PYTHON" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "f2py", so it can be a program name with args. -set dummy f2py; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_F2PY+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $F2PY in - [\\/]* | ?:[\\/]*) - ac_cv_path_F2PY="$F2PY" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_F2PY="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -F2PY=$ac_cv_path_F2PY -if test -n "$F2PY"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F2PY" >&5 -$as_echo "$F2PY" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -VERSION="${version}" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OS" >&5 -$as_echo_n "checking OS... " >&6; } -OS=`uname` -OS="${OS}" - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in inttypes.h stdint.h sys/resource.h sys/param.h errno.h \ -sys/syslog.h stddef.h libgen.h sys/wait.h wait.h stdio.h termios.h \ -sys/resource.h linux/ppdev.h dev/ppbus/ppi.h sys/stat.h fcntl.h sys/ioctl.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if ${ac_cv_header_time+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi - - -ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default" -if test "x$ac_cv_header_fftw3_h" = xyes; then : - HAS_FFTW3_H=1 -else - HAS_FFTW3_H=0 -fi - - -ac_fn_c_check_header_mongrel "$LINENO" "samplerate.h" "ac_cv_header_samplerate_h" "$ac_includes_default" -if test "x$ac_cv_header_samplerate_h" = xyes; then : - HAS_SAMPLERATE_H=1 -else - HAS_SAMPLERATE_H=0 -fi - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether string.h and strings.h may both be included" >&5 -$as_echo_n "checking whether string.h and strings.h may both be included... " >&6; } -if ${gcc_cv_header_string+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gcc_cv_header_string=yes -else - gcc_cv_header_string=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_header_string" >&5 -$as_echo "$gcc_cv_header_string" >&6; } - -if test "$gcc_cv_header_string" = "yes"; then - -$as_echo "#define STRING_WITH_STRINGS 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sfftw_destroy_plan_ in -lfftw3f" >&5 -$as_echo_n "checking for sfftw_destroy_plan_ in -lfftw3f... " >&6; } -if ${ac_cv_lib_fftw3f_sfftw_destroy_plan_+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfftw3f $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sfftw_destroy_plan_ (); -int -main () -{ -return sfftw_destroy_plan_ (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_fftw3f_sfftw_destroy_plan_=yes -else - ac_cv_lib_fftw3f_sfftw_destroy_plan_=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3f_sfftw_destroy_plan_" >&5 -$as_echo "$ac_cv_lib_fftw3f_sfftw_destroy_plan_" >&6; } -if test "x$ac_cv_lib_fftw3f_sfftw_destroy_plan_" = xyes; then : - \ - HAS_FFTW3FLIBS=1 -else - HAS_FFTW3FLIBS=0 -fi - - - -ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default" -if test "x$ac_cv_header_stdarg_h" = xyes; then : - -else - as_fn_error $? "** stdarg.h could not be found - wsjt will not compile without it **" "$LINENO" 5 -fi - - - - -# Check whether --enable-clobber was given. -if test "${enable_clobber+set}" = set; then : - enableval=$enable_clobber; clobber=$enableval -else - clobber=no -fi - - -if test "$clobber" = yes; then - CLOBBER=yes - -fi - -# Check whether --enable-assert was given. -if test "${enable_assert+set}" = set; then : - enableval=$enable_assert; assert=$enableval -else - assert=no -fi - - -if test "$assert" = no; then - -$as_echo "#define NDEBUG 1" >>confdefs.h - -fi - -if test "$prefix" = "NONE"; then - prefix=${ac_default_prefix} -else - - - prefix=`echo ${ac_default_prefix} | sed 's/\/$//'` -fi - - - -if test -z $FC ; then - fail=1 - echo "You need g95 or gfortran to compile this program!" -fi - -if test $HAS_FFTW3_H -eq 0; then - fail=1 - echo "You need to install the fftw3 libraries" -fi - -if test $HAS_SAMPLERATE_H -eq 0; then - fail=1 - echo "You need to install the samplerate library" -else - $as_echo "#define HAS_SAMPLERATE_H 1" >>confdefs.h - - LIBS="${LIBS} -lsamplerate" -fi - -if test $HAS_PORTAUDIO -eq 1; then - $as_echo "#define HAS_PORTAUDIO 1" >>confdefs.h - - $as_echo "#define HAS_PORTAUDIO_H 1" >>confdefs.h - - $as_echo "#define HAS_PORTAUDIO_LIB 1" >>confdefs.h - -else - fail=1 - echo "This program needs portaudio v19 to compile." - echo "Please use --with-portaudio-include-dir= and" - echo " --with-portaudio-lib-dir= to set the paths." -fi - -if test $HAS_FFTW3_H -eq 1; then - $as_echo "#define HAS_FFTW3_H 1" >>confdefs.h - -else - fail=1 - echo "You are missing the fftw3.h include file" -fi - -if test $HAS_FFTW3FLIBS -eq 1; then - LIBS="${LIBS} -lfftw3f" - $as_echo "#define HAS_FFTW3FLIBS 1" >>confdefs.h - -else - fail=1 - echo "You are missing the fortran shim libs in libfftw3." -fi - -if test "$F2PY" = ""; then - echo "You are missing f2py, trying local copy." - F2PY="python f2py.py"; -fi - -if test $fail -eq 1; then - as_fn_error $? "Please check error messages and install missing packages." "$LINENO" 5 -fi - -PREFIX="${prefix}" - -CPPFLAGS="${CPPFLAGS}" - -LDFLAGS="${LDFLAGS}" - -LIBS="${LIBS}" - - - -F2PY="${F2PY}" - -ac_config_files="$ac_config_files Makefile" - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -:mline -/\\$/{ - N - s,\\\n,, - b mline -} -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` - - -ac_libobjs= -ac_ltlibobjs= -U= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: "${CONFIG_STATUS=./config.status}" -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false - -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by wsjt $as_me 7.04, which was -generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. - -Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - -Configuration files: -$config_files - -Report bugs to the package provider." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" -ac_cs_version="\\ -wsjt config.status 7.04 -configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - -Copyright (C) 2012 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -test -n "\$AWK" || AWK=awk -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= ac_tmp= - trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// -s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" - - -eval set X " :F $CONFIG_FILES " -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} - - rm -f "$ac_tmp/stdin" - case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - - - - esac - -done # for ac_tag - - -as_fn_exit 0 -_ACEOF -ac_clean_files=$ac_clean_files_save - -test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi - - -echo -echo "***************" - - -if test $g95 = "yes"; then - echo "Using g95 as fortran compiler."; -elif test $gfortran = "yes"; then - echo "Using gfortran as fortran compiler."; -fi - -echo - -echo "Compiling $PACKAGE_NAME $version" -echo - -echo "Installing into: $prefix" - -echo diff --git a/comms/wsjt/files/patch-Makefile.in b/comms/wsjt/files/patch-Makefile.in index 452e35f9324..c5a5fca1720 100644 --- a/comms/wsjt/files/patch-Makefile.in +++ b/comms/wsjt/files/patch-Makefile.in @@ -1,30 +1,40 @@ ---- Makefile.in.orig 2011-04-22 13:00:35.000000000 -0400 -+++ Makefile.in 2014-07-29 11:40:12.000000000 -0400 -@@ -6,7 +6,7 @@ - LDFLAGS = @LDFLAGS@ - LIBS += @LIBS@ - CPPFLAGS = @CPPFLAGS@ --CFLAGS = @CFLAGS@ -+CFLAGS = "@PORTAUDIO_INCLUDE@ @CFLAGS@" - PREFIX = @PREFIX@ - # WSJT specific C flags - CFLAGS += -DBIGSYM=1 -fPIC -@@ -148,12 +148,12 @@ +--- Makefile.in.orig 2015-01-08 17:33:18 UTC ++++ Makefile.in +@@ -6,7 +6,13 @@ + # Prerequisites: Python 3.x, numpy-1.8.1, PIL, Pmw-2.0.0+ - install: WsjtMod/Audio.so - ${RM} -rf build/ -- ${PYTHON} setup.py install -- ${MKDIR} -p ${PREFIX}/share/wsjt -- ${INSTALL} -m 0644 CALL3.TXT ${PREFIX}/share/wsjt/ -- ${INSTALL} -m 0644 wsjtrc ${PREFIX}/share/wsjt/ -- ${INSTALL} -m 0644 dmet_*.dat ${PREFIX}/share/wsjt/ -- ${INSTALL} wsjt ${PREFIX}/bin -+ ${PYTHON} setup.py install --prefix=${DESTDIR}${PREFIX} -+ ${MKDIR} -p ${DESTDIR}${PREFIX}/share/wsjt -+ ${INSTALL} -m 0644 CALL3.TXT ${DESTDIR}${PREFIX}/share/wsjt/ -+ ${INSTALL} -m 0644 wsjtrc ${DESTDIR}${PREFIX}/share/wsjt/ -+ ${INSTALL} -m 0644 dmet_*.dat ${DESTDIR}${PREFIX}/share/wsjt/ -+ ${INSTALL} wsjt ${DESTDIR}${PREFIX}/bin + MV ?= mv ++ ++# Compiler Information + CC ?= @CC@ ++FC := @FC@ ++FCV := @FCV@ ++FC_LIB_PATH = @FC_LIB_PATH@ ++ + MKDIR ?= mkdir + RM ?= @RM@ + INSTALL = install +@@ -51,7 +57,7 @@ FC = @FC@ + FCV = @FCV@ + FC_LIB_PATH += @FC_LIB_PATH@ - deb: wsjt.py WsjtMod/Audio.so WsjtMod/g.py WsjtMod/__init__.py \ - WsjtMod/options.py WsjtMod/palettes.py WsjtMod/PmwBlt.py \ +-LDFLAGS += -L${FC_LIB_PATH} ++#LDFLAGS += "-L${FC_LIB_PATH}" + + OBJS1 = a2d.o abc441.o alignmsg.o ana932.o analytic.o astro.o \ + avecho.o avemsg4.o avemsg65.o avemsg6m.o avesp2.o azdist.o \ +@@ -97,12 +103,11 @@ F2PYSRCS = ftn_init.f90 ftn_quit.f90 aud + azdist0.f90 astro0.f90 chkt0.f90 + + WsjtMod/Audio.so: libjt.a ${F2PYSRCS} +- ${F2PY} -c -I. --fcompiler=gnu95 --f77exec=gfortran --f90exec=gfortran \ +- --opt="-cpp -fbounds-check -O2" ${LDFLAGS} \ ++ ${F2PY} -c -I. --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \ ++ --opt="-cpp -fbounds-check" ${LDFLAGS} \ + ${LIBS} libjt.a -m Audio ftn_init.f90 ftn_quit.f90 \ + audio_init.f90 spec.f90 getfile.f90 azdist0.f90 \ + astro0.f90 chkt0.f90 +- + ${MV} Audio*.so WsjtMod/Audio.so + + .PHONY : clean diff --git a/comms/wsjt/files/patch-WsjtMod_specjt.py b/comms/wsjt/files/patch-WsjtMod_specjt.py deleted file mode 100644 index b2466f35832..00000000000 --- a/comms/wsjt/files/patch-WsjtMod_specjt.py +++ /dev/null @@ -1,45 +0,0 @@ ---- WsjtMod/specjt.py.orig 2011-09-13 12:56:59.000000000 -0700 -+++ WsjtMod/specjt.py 2015-01-09 04:04:37.000000000 -0800 -@@ -11,13 +11,9 @@ - import cPickle - import tkMessageBox - --try: -- from numpy.oldnumeric import zeros, multiarray --# print "specjt importing from numpy" --except: -- from Numeric import zeros, multiarray --# print "specjt importing from Numeric" --import Image, ImageTk, ImageDraw -+from numpy import zeros -+from numpy.core import multiarray -+from PIL import Image, ImageTk, ImageDraw - from palettes import colormapblue, colormapgray0, colormapHot, \ - colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette - #import wsjt #Is this OK to do? -@@ -76,7 +72,7 @@ - ttot=0.0 - - c=Canvas() --a=zeros(225000,'s') -+a=zeros(225000,'uint16') - im=Image.new('P',(750,300)) - line0=Image.new('P',(750,1)) #Image fragment for top line of waterfall - draw=ImageDraw.Draw(im) -@@ -330,11 +326,14 @@ - except: - print "Images did not match, continuing anyway." - for i in range(n): -- line0.putdata(a[750*i:750*(i+1)]) #One row of pixels to line0 -+ for j in range(0, 749): -+ line0.putpixel((j,0), a[750*i+j]) - im.paste(line0,(0,i)) #Paste in new top line - nscroll=nscroll+n - else: #A scale factor has changed -- im.putdata(a) #Compute whole new image -+ for i in range(0, 300): -+ for j in range(0, 749): -+ im.putpixel((j,i), a[750*i+j]) - b0=brightness #Save scale values - c0=contrast - logm0=logm diff --git a/comms/wsjt/files/patch-aclocal.m4 b/comms/wsjt/files/patch-aclocal.m4 index 00b3d962461..05244debdde 100644 --- a/comms/wsjt/files/patch-aclocal.m4 +++ b/comms/wsjt/files/patch-aclocal.m4 @@ -1,10 +1,44 @@ ---- aclocal.m4.orig 2014-07-28 21:23:20.000000000 -0400 -+++ aclocal.m4 2014-07-28 21:26:51.000000000 -0400 -@@ -212,4 +212,7 @@ +--- aclocal.m4.orig 2009-05-17 12:27:34 UTC ++++ aclocal.m4 +@@ -175,41 +175,6 @@ if test $[{HAS_PORTAUDIO_H}] -eq 1 -a $[ + else + HAS_PORTAUDIO=1 fi +-else +- AC_MSG_RESULT([portaudio not found trying FreeBSD paths ]) +- portaudio_lib_dir="/usr/local/lib/portaudio2" +- portaudio_include_dir="/usr/local/include/portaudio2" +-dnl +-dnl Try again to make sure portaudio dirs are valid +-dnl +- AC_MSG_CHECKING([for a v19 portaudio in FreeBSD paths.]) +- HAS_PORTAUDIO_H=0 +- HAS_PORTAUDIO_LIB=0 +- +- if test -e $[{portaudio_include_dir}]/portaudio.h; then +- HAS_PORTAUDIO_H=1 +- fi +- +- if test -e $[{portaudio_lib_dir}]/libportaudio.so \ +- -o -e $[{portaudio_lib_dir}]/libportaudio.a;then +- HAS_PORTAUDIO_LIB=1 +- fi +- +- if test $[{HAS_PORTAUDIO_H}] -eq 1 -a $[{HAS_PORTAUDIO_LIB}] -eq 1; then +- AC_MSG_RESULT([found portaudio in FreeBSD paths, double checking it is v19 ]) +- LDFLAGS="-L$[{portaudio_lib_dir}] $[{LDFLAGS}]" +- LIBS="$[{LIBS}] -lportaudio" +- CPPFLAGS="-I$[{portaudio_include_dir}] $[{CPPFLAGS}]" +- AC_CHECK_LIB(portaudio, Pa_GetVersion, \ +- [HAS_PORTAUDIO_VERSION=1], [HAS_PORTAUDIO_VERSION=0]) +- if test $[{HAS_PORTAUDIO_VERSION}] -eq 0; then +- AC_MSG_RESULT([How did you end up with a portaudio v18 here?]) +- else +- AC_MSG_RESULT([found v19]) +- HAS_PORTAUDIO=1 +- HAS_PORTAUDIO_H=1 +- fi +- fi fi -+AC_SUBST([PORTAUDIO_INCLUDE], ["-I${portaudio_include_dir}"]) -+AC_SUBST([PORTAUDIO_LIBDIR], ["-L${portaudio_lib_dir}"]) -+ ])dnl }}} diff --git a/comms/wsjt/files/patch-wsjt b/comms/wsjt/files/patch-wsjt deleted file mode 100644 index af0d4ce67e7..00000000000 --- a/comms/wsjt/files/patch-wsjt +++ /dev/null @@ -1,15 +0,0 @@ ---- wsjt.orig 2014-07-29 12:03:47.000000000 -0400 -+++ wsjt 2014-07-29 12:03:40.000000000 -0400 -@@ -1,5 +1,5 @@ - #!/bin/sh --if [ -e /usr/local/bin/python ] ; then -+if [ -e /usr/local/bin/python2 ] ; then - LOCALBASE=/usr/local/ - else - LOCALBASE=/usr/ -@@ -16,4 +16,4 @@ - cp -f ${LOCALBASE}/share/wsjt/dmet_10_-1_3.dat ~/.wsjt - fi - cd ~/.wsjt --python ${LOCALBASE}/bin/wsjt.py -+python2 ${LOCALBASE}/bin/wsjt.py diff --git a/comms/wsjt/files/patch-wsjt.py b/comms/wsjt/files/patch-wsjt.py deleted file mode 100644 index 795b9c41ea6..00000000000 --- a/comms/wsjt/files/patch-wsjt.py +++ /dev/null @@ -1,19 +0,0 @@ ---- wsjt.py.orig 2012-01-26 12:01:08.000000000 -0500 -+++ wsjt.py 2014-12-15 21:21:29.000000000 -0500 -@@ -10,14 +10,9 @@ - import os,time - from WsjtMod import Audio - from math import log10 --try: -- from numpy.oldnumeric import zeros --# print "importing from numpy" --except: -- from Numeric import zeros --# print "importing from Numeric" -+from numpy import zeros - import dircache --import Image,ImageTk #, ImageDraw -+from PIL import Image, ImageTk #, ImageDraw - from WsjtMod.palettes import colormapblue, colormapgray0, colormapHot, \ - colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette - from types import * diff --git a/comms/wsjt/files/wsjt b/comms/wsjt/files/wsjt new file mode 100644 index 00000000000..21a9d340565 --- /dev/null +++ b/comms/wsjt/files/wsjt @@ -0,0 +1,61 @@ +#!/bin/sh +#------------------------------------------------------------------------------- +# This file is part of the WSJT application, Weak Signal Propogation Reporter +# +# File Name: wsjt.sh +# Description: Shell script wrapper to update or copy files from system install +# +# Copyright (C) 2001-2014 Joseph Taylor, K1JT +# License: GNU GPL v3 +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 3 of the License, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +# Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +#------------------------------------------------------------------------------- + +set -e + +copyur() { + for f in $1/*;do + if [ ! -e `basename $f` ]; then + if [ ! -d $f ]; then + cp $f . + fi + elif [ $f -nt `basename $f` ]; then + if [ ! -d `basename $f` ]; then + cp $f . + fi + fi + done +} + +# set dir's +_HOMEDIR="/home/$USER/.wsjt" +export PATH=$PATH:/compat/linux/bin + +# update out of date files +if [ -e $_HOMEDIR ] ; then + cd $_HOMEDIR + copyur %%LOCALBASE%%/share/wsjt + cd $_HOMEDIR/WsjtMod + copyur %%LOCALBASE%%/lib/wsjt/WsjtMod + cd $_HOMEDIR +else +# if _HOMEDIR does not exist make it + mkdir $_HOMEDIR + cp -R %%LOCALBASE%%/share/wsjt/* $_HOMEDIR cp -R %%LOCALBASE%%/lib/wsjt/* $_HOMEDIR +fi + +cd $_HOMEDIR +%%PYTHON%% -O wsjt.py diff --git a/comms/wsjt/pkg-plist b/comms/wsjt/pkg-plist index 769e0099c82..8aecea754ed 100644 --- a/comms/wsjt/pkg-plist +++ b/comms/wsjt/pkg-plist @@ -1,37 +1,75 @@ bin/wsjt -bin/wsjt.py %%DATADIR%%/CALL3.TXT %%DATADIR%%/dmet_10_-1_3.dat %%DATADIR%%/dmet_10_0_3.dat %%DATADIR%%/dmet_20_-2_2.dat %%DATADIR%%/dmet_20_-3_2.dat +%%DATADIR%%/Pmw.py +%%DATADIR%%/PmwBlt.py +%%DATADIR%%/PmwColor.py +%%DATADIR%%/wsjt.py %%DATADIR%%/wsjtrc -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT -%%PORTDOCS%%%%DOCSDIR%%/UpdateHistory.txt -%%PORTDOCS%%%%DOCSDIR%%/WSJT_Quick_Reference.pdf -%%PORTDOCS%%%%DOCSDIR%%/WSJT_Source_Code.txt -%%PORTDOCS%%%%DOCSDIR%%/WSJT_User_600.pdf -%%PYTHON_SITELIBDIR%%/WsjtMod/Audio.so -%%PYTHON_SITELIBDIR%%/WsjtMod/__init__.py -%%PYTHON_SITELIBDIR%%/WsjtMod/__init__.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/Pmw.py -%%PYTHON_SITELIBDIR%%/WsjtMod/Pmw.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/PmwBlt.py -%%PYTHON_SITELIBDIR%%/WsjtMod/PmwBlt.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/PmwColor.py -%%PYTHON_SITELIBDIR%%/WsjtMod/PmwColor.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/astro.py -%%PYTHON_SITELIBDIR%%/WsjtMod/astro.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/g.py -%%PYTHON_SITELIBDIR%%/WsjtMod/g.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/go.py -%%PYTHON_SITELIBDIR%%/WsjtMod/go.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/options.py -%%PYTHON_SITELIBDIR%%/WsjtMod/options.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/palettes.py -%%PYTHON_SITELIBDIR%%/WsjtMod/palettes.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/smeter.py -%%PYTHON_SITELIBDIR%%/WsjtMod/smeter.pyc -%%PYTHON_SITELIBDIR%%/WsjtMod/specjt.py -%%PYTHON_SITELIBDIR%%/WsjtMod/specjt.pyc -%%PYTHON_SITELIBDIR%%/Wsjt-WSJT.Version.%%VERSION%%_.by.K1JT-py%%PYVER%%.egg-info +%%PORTDOCS%%%%DOCSDIR%%/common/communication.adoc +%%PORTDOCS%%%%DOCSDIR%%/common/license.adoc +%%PORTDOCS%%%%DOCSDIR%%/common/links.adoc +%%PORTDOCS%%%%DOCSDIR%%/theme/wsjt/wsjt.css +%%PORTDOCS%%%%DOCSDIR%%/user_guide/acknowledgments.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/astrodata.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/compiling.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/controls.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/coop_programs.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/echo.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/faq.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/files.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/AstroData.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/BandMenu.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/DecodeMenu.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/FileMenu.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/HelpMenu.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/KeyboardShortcuts.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/MainButtons.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/Main_Center.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/Main_Left.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/Main_Right.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/ModeMenu.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/MouseCommands.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SaveMenu.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SetupMenu.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SpecJT_Controls.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/SpecJT_DL7UAE.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/StatusBar.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/VK7MO_10GHz.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/VK7MO_10GHz_2.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/ViewMenu.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/WhatMessage.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/console.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/echo.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/jt4_Templates.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/jt65.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/jt6m.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/options.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/prefixes.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/images/wsjt9.7_main.png +%%PORTDOCS%%%%DOCSDIR%%/user_guide/implementation.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/installation.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/installed-files.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/introduction.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/make-qso.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/measure.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/protocols.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/setup.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/system-requirements.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/tutorial.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/utilities.adoc +%%PORTDOCS%%%%DOCSDIR%%/user_guide/wsjt-main.adoc +%%PORTDOCS%%%%DOCSDIR%%/wsjt-jtsdk2.conf +%%PORTDOCS%%%%DOCSDIR%%/wsjt.conf.in +lib/wsjt/WsjtMod/Audio.so +lib/wsjt/WsjtMod/__init__.py +lib/wsjt/WsjtMod/astro.py +lib/wsjt/WsjtMod/g.py +lib/wsjt/WsjtMod/go.py +lib/wsjt/WsjtMod/options.py +lib/wsjt/WsjtMod/palettes.py +lib/wsjt/WsjtMod/smeter.py +lib/wsjt/WsjtMod/specjt.py diff --git a/converters/p5-LaTeXML/Makefile b/converters/p5-LaTeXML/Makefile index 386282db841..ee0966d8e32 100644 --- a/converters/p5-LaTeXML/Makefile +++ b/converters/p5-LaTeXML/Makefile @@ -3,6 +3,7 @@ PORTNAME= LaTeXML PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= converters perl5 MASTER_SITES= http://dlmf.nist.gov/LaTeXML/releases/ PKGNAMEPREFIX= p5- @@ -33,8 +34,7 @@ USE_PERL5= configure USE_TEX= kpathsea NO_BUILD= yes -DOCS= Changes INSTALL MANIFEST README manual.pdf -PORTDOCS= * +PORTDOCS= Changes INSTALL MANIFEST README manual.pdf OPTIONS_DEFINE= DOCS @@ -47,7 +47,7 @@ post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include diff --git a/converters/p5-LaTeXML/pkg-descr b/converters/p5-LaTeXML/pkg-descr index 602fece235a..8de08476f73 100644 --- a/converters/p5-LaTeXML/pkg-descr +++ b/converters/p5-LaTeXML/pkg-descr @@ -1,6 +1,6 @@ -LaTeXML is a TeX and LaTeX to XML/HTML/MathML converter. -From XML it can generate various flavors of HTML. -MathML and ePub, with other formats under development. +LaTeXML is a TeX and LaTeX to XML/HTML/MathML converter. From XML it +can generate various flavors of HTML. MathML and ePub, with other +formats under development. See the included manual.pdf for an documentation. diff --git a/databases/elixir-calecto/Makefile b/databases/elixir-calecto/Makefile index 1f3cf2bfc98..7fb7d929063 100644 --- a/databases/elixir-calecto/Makefile +++ b/databases/elixir-calecto/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= calecto -PORTVERSION= 0.3.6 +PORTVERSION= 0.3.8 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= elixir- diff --git a/databases/elixir-calecto/distinfo b/databases/elixir-calecto/distinfo index 533ccb6b901..b1d6166d3be 100644 --- a/databases/elixir-calecto/distinfo +++ b/databases/elixir-calecto/distinfo @@ -1,2 +1,2 @@ -SHA256 (lau-calecto-v0.3.6_GH0.tar.gz) = bd4378edd7456979058d284050ec2f95aba0f363233be6ef61d695efdab52f62 -SIZE (lau-calecto-v0.3.6_GH0.tar.gz) = 7695 +SHA256 (lau-calecto-v0.3.8_GH0.tar.gz) = 19bf13aad80ae620e9b13a38041bc7668decb053695f31915f2509b02ed9e6f0 +SIZE (lau-calecto-v0.3.8_GH0.tar.gz) = 9566 diff --git a/databases/elixir-calecto/pkg-plist b/databases/elixir-calecto/pkg-plist index 4f2c17c9035..e857eeb0335 100644 --- a/databases/elixir-calecto/pkg-plist +++ b/databases/elixir-calecto/pkg-plist @@ -4,6 +4,7 @@ lib/elixir/lib/calecto/ebin/Elixir.Calecto.DateTimeUTC.beam lib/elixir/lib/calecto/ebin/Elixir.Calecto.Model.beam lib/elixir/lib/calecto/ebin/Elixir.Calecto.NaiveDateTime.beam lib/elixir/lib/calecto/ebin/Elixir.Calecto.Time.beam +lib/elixir/lib/calecto/ebin/Elixir.Calecto.Utils.beam lib/elixir/lib/calecto/ebin/Elixir.Calecto.beam lib/elixir/lib/calecto/ebin/Elixir.Mix.Tasks.Calecto.AddTypeMigration.beam lib/elixir/lib/calecto/ebin/calecto.app @@ -14,5 +15,6 @@ lib/elixir/lib/calecto/lib/calecto/date_time_utc.ex lib/elixir/lib/calecto/lib/calecto/model.ex lib/elixir/lib/calecto/lib/calecto/naive_date_time.ex lib/elixir/lib/calecto/lib/calecto/time.ex +lib/elixir/lib/calecto/lib/calecto/utils.ex lib/elixir/lib/calecto/lib/mix/tasks/calecto.add_type_migration.ex %%PORTDOCS%%%%DOCSDIR%%/README.md diff --git a/databases/elixir-ecto/Makefile b/databases/elixir-ecto/Makefile index afcfa7daaed..f12aad62511 100644 --- a/databases/elixir-ecto/Makefile +++ b/databases/elixir-ecto/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ecto -PORTVERSION= 0.14.3 +PORTVERSION= 0.16.0 DISTVERSIONPREFIX= v CATEGORIES= databases PKGNAMEPREFIX= elixir- @@ -15,10 +15,26 @@ USES= elixir USE_GITHUB= yes GH_ACCOUNT= elixir-lang +OPTIONS_DEFINE= POSTGREX MARIAEX +OPTIONS_SUB= yes +POSTGREX_DESC= PostgreSQL adapter support +MARIAEX_DESC= MySQL adapter support + MIX_BUILD_NAME= shared MIX_BUILD_DEPS= devel/elixir-decimal \ devel/elixir-poison \ devel/erlang-poolboy + +.include + +.if ${PORT_OPTIONS:MPOSTGREX} +MIX_BUILD_DEPS+=databases/elixir-postgrex +.endif + +.if ${PORT_OPTIONS:MMARIAEX} +MIX_BUILD_DEPS+=databases/elixir-mariaex +.endif + MIX_RUN_DEPS:= ${MIX_BUILD_DEPS} MIX_REWRITE= yes diff --git a/databases/elixir-ecto/distinfo b/databases/elixir-ecto/distinfo index 57282adc956..98cd6acd5de 100644 --- a/databases/elixir-ecto/distinfo +++ b/databases/elixir-ecto/distinfo @@ -1,2 +1,2 @@ -SHA256 (elixir-lang-ecto-v0.14.3_GH0.tar.gz) = e23bcdb7a31505ae5fdb18b83ce612d3632680aee8859bbb76eb5d61f51e6dfe -SIZE (elixir-lang-ecto-v0.14.3_GH0.tar.gz) = 191285 +SHA256 (elixir-lang-ecto-v0.16.0_GH0.tar.gz) = 05ebfd64bdc30aa7470389129ca03d4977d627e9fa49f699d065286303a3224c +SIZE (elixir-lang-ecto-v0.16.0_GH0.tar.gz) = 208076 diff --git a/databases/elixir-ecto/pkg-plist b/databases/elixir-ecto/pkg-plist index 5d695b06d24..8ff4942113d 100644 --- a/databases/elixir-ecto/pkg-plist +++ b/databases/elixir-ecto/pkg-plist @@ -3,7 +3,10 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Storage.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Transaction.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Connection.beam +%%MARIAEX%%lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.MySQL.Connection.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.MySQL.beam +%%POSTGREX%%lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Postgres.Connection.beam +%%POSTGREX%%lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Postgres.DateTime.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Postgres.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Query.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Sandbox.beam @@ -15,9 +18,11 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.NotLoaded.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.CastError.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.ChangeError.beam +lib/elixir/lib/ecto/ebin/Elixir.Ecto.Changeset.Relation.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Changeset.beam +lib/elixir/lib/ecto/ebin/Elixir.Ecto.ConstraintError.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Date.beam -lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.Util.beam +lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.Utils.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Embedded.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.InvalidChangesetError.beam @@ -31,7 +36,6 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Table.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.MigrationError.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migrator.beam -lib/elixir/lib/ecto/ebin/Elixir.Ecto.MissingPrimaryKeyError.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Autogenerate.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Callbacks.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Dependent.beam @@ -39,7 +43,8 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.OptimisticLock.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.Timestamps.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Model.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.MultipleResultsError.beam -lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyError.beam +lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyFieldError.beam +lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyValueError.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoResultsError.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pool.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.Poolboy.Worker.beam @@ -48,6 +53,7 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.CoDel.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.Timeout.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.Worker.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Pools.SojournBroker.beam +lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.API.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Distinct.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Filter.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.From.beam @@ -74,10 +80,10 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Ecto.Query.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Tuple.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Assoc.beam -lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Config.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Model.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Preloader.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Queryable.beam +lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Supervisor.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Schema.Metadata.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Schema.beam @@ -86,11 +92,13 @@ lib/elixir/lib/ecto/ebin/Elixir.Ecto.Storage.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Time.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.Type.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.UUID.beam +lib/elixir/lib/ecto/ebin/Elixir.Ecto.UnmachedRelationError.beam lib/elixir/lib/ecto/ebin/Elixir.Ecto.beam lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Association.NotLoaded.beam lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Date.beam lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.DateTime.beam lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Query.beam +lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Schema.Metadata.beam lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Time.beam lib/elixir/lib/ecto/ebin/Elixir.Mix.Ecto.beam lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Create.beam @@ -123,6 +131,7 @@ lib/elixir/lib/ecto/lib/ecto/adapters/sql/query.ex lib/elixir/lib/ecto/lib/ecto/adapters/sql/sandbox.ex lib/elixir/lib/ecto/lib/ecto/association.ex lib/elixir/lib/ecto/lib/ecto/changeset.ex +lib/elixir/lib/ecto/lib/ecto/changeset/relation.ex lib/elixir/lib/ecto/lib/ecto/datetime.ex lib/elixir/lib/ecto/lib/ecto/embedded.ex lib/elixir/lib/ecto/lib/ecto/exceptions.ex @@ -146,6 +155,7 @@ lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker/codel.ex lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker/timeout.ex lib/elixir/lib/ecto/lib/ecto/pools/sojourn_broker/worker.ex lib/elixir/lib/ecto/lib/ecto/query.ex +lib/elixir/lib/ecto/lib/ecto/query/api.ex lib/elixir/lib/ecto/lib/ecto/query/builder.ex lib/elixir/lib/ecto/lib/ecto/query/builder/distinct.ex lib/elixir/lib/ecto/lib/ecto/query/builder/filter.ex @@ -163,10 +173,10 @@ lib/elixir/lib/ecto/lib/ecto/query/planner.ex lib/elixir/lib/ecto/lib/ecto/queryable.ex lib/elixir/lib/ecto/lib/ecto/repo.ex lib/elixir/lib/ecto/lib/ecto/repo/assoc.ex -lib/elixir/lib/ecto/lib/ecto/repo/config.ex lib/elixir/lib/ecto/lib/ecto/repo/model.ex lib/elixir/lib/ecto/lib/ecto/repo/preloader.ex lib/elixir/lib/ecto/lib/ecto/repo/queryable.ex +lib/elixir/lib/ecto/lib/ecto/repo/supervisor.ex lib/elixir/lib/ecto/lib/ecto/schema.ex lib/elixir/lib/ecto/lib/ecto/storage.ex lib/elixir/lib/ecto/lib/ecto/type.ex diff --git a/databases/elixir-ecto_migrate/Makefile b/databases/elixir-ecto_migrate/Makefile index c20eaebca7d..f68d068bb33 100644 --- a/databases/elixir-ecto_migrate/Makefile +++ b/databases/elixir-ecto_migrate/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ecto_migrate -PORTVERSION= 0.5.0 +PORTVERSION= 0.6.1 DISTVERSIONPREFIX= v CATEGORIES= databases PKGNAMEPREFIX= elixir- diff --git a/databases/elixir-ecto_migrate/distinfo b/databases/elixir-ecto_migrate/distinfo index b3c73ed2feb..bc30112dbf6 100644 --- a/databases/elixir-ecto_migrate/distinfo +++ b/databases/elixir-ecto_migrate/distinfo @@ -1,2 +1,2 @@ -SHA256 (xerions-ecto_migrate-v0.5.0_GH0.tar.gz) = bb714cef6a1b12edd5fedb90a6878bb4ca9240c71e02a6379b85e950f7a9dea4 -SIZE (xerions-ecto_migrate-v0.5.0_GH0.tar.gz) = 7540 +SHA256 (xerions-ecto_migrate-v0.6.1_GH0.tar.gz) = f93e19f7c1de8333804342ef29da6e2658030bb8dcbbe5f14e7de62bac26a205 +SIZE (xerions-ecto_migrate-v0.6.1_GH0.tar.gz) = 7701 diff --git a/databases/elixir-geo/Makefile b/databases/elixir-geo/Makefile index b83faaab985..5a65b42efc4 100644 --- a/databases/elixir-geo/Makefile +++ b/databases/elixir-geo/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= geo -PORTVERSION= 0.15.1 +PORTVERSION= 0.15.2 DISTVERSIONPREFIX= v CATEGORIES= databases PKGNAMEPREFIX= elixir- diff --git a/databases/elixir-geo/distinfo b/databases/elixir-geo/distinfo index fce9dd0d8b3..79e25c38de5 100644 --- a/databases/elixir-geo/distinfo +++ b/databases/elixir-geo/distinfo @@ -1,2 +1,2 @@ -SHA256 (bryanjos-geo-v0.15.1_GH0.tar.gz) = b30b0acf719f90df2e5fdb2ed15565f2b9ff17eff2ab5e278dc2e8c4f92f8059 -SIZE (bryanjos-geo-v0.15.1_GH0.tar.gz) = 15311 +SHA256 (bryanjos-geo-v0.15.2_GH0.tar.gz) = 25b0d3725b2fd2f70fca6a64b49f7dcfc819c9d733c2fab9f6814200fcac98bc +SIZE (bryanjos-geo-v0.15.2_GH0.tar.gz) = 15564 diff --git a/databases/elixir-mariaex/Makefile b/databases/elixir-mariaex/Makefile index 1c3c1f9d066..f4239bb41e2 100644 --- a/databases/elixir-mariaex/Makefile +++ b/databases/elixir-mariaex/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mariaex -PORTVERSION= 0.4.2 +PORTVERSION= 0.4.3 DISTVERSIONPREFIX= v CATEGORIES= databases PKGNAMEPREFIX= elixir- @@ -17,5 +17,6 @@ GH_ACCOUNT= xerions MIX_BUILD_DEPS= devel/elixir-decimal MIX_RUN_DEPS:= ${MIX_BUILD_DEPS} +MIX_REWRITE= yes .include diff --git a/databases/elixir-mariaex/distinfo b/databases/elixir-mariaex/distinfo index a7acdea3b20..955dc227a6e 100644 --- a/databases/elixir-mariaex/distinfo +++ b/databases/elixir-mariaex/distinfo @@ -1,2 +1,2 @@ -SHA256 (xerions-mariaex-v0.4.2_GH0.tar.gz) = cfc4e017f0f7466a5db53e1d2711f22b33a27ac8447cdab4b59a01ed2cbce2b5 -SIZE (xerions-mariaex-v0.4.2_GH0.tar.gz) = 17277 +SHA256 (xerions-mariaex-v0.4.3_GH0.tar.gz) = e31e65e200f522fd66f7f12853b83ae1cc174867b53609b9e4e9c872094f98c2 +SIZE (xerions-mariaex-v0.4.3_GH0.tar.gz) = 17643 diff --git a/databases/elixir-mariaex/files/patch-mix.exs b/databases/elixir-mariaex/files/patch-mix.exs deleted file mode 100644 index e47d1f2c880..00000000000 --- a/databases/elixir-mariaex/files/patch-mix.exs +++ /dev/null @@ -1,11 +0,0 @@ ---- mix.exs.orig 2015-07-02 11:00:37 UTC -+++ mix.exs -@@ -18,7 +18,7 @@ defmodule Mariaex.Mixfile do - end - - defp deps do -- [{:decimal, "~> 1.0"}] -+ [] - end - - defp description do diff --git a/databases/fpc-fpindexer/Makefile b/databases/fpc-fpindexer/Makefile index e92af6b0efd..34745c319e6 100644 --- a/databases/fpc-fpindexer/Makefile +++ b/databases/fpc-fpindexer/Makefile @@ -1,14 +1,14 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases lang PKGNAMESUFFIX= -fpindexer MAINTAINER= freebsd-fpc@FreeBSD.org COMMENT= Database indexer with database/flat file backend -USE_FPC= chm fcl-base fcl-db +USE_FPC= chm fcl-base fcl-db fcl-xml ibase sqlite MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/databases/jdbm2/Makefile b/databases/jdbm2/Makefile index bc37c828b19..fd9510f5b5c 100644 --- a/databases/jdbm2/Makefile +++ b/databases/jdbm2/Makefile @@ -19,7 +19,6 @@ JAVA_VERSION= 1.6+ NO_BUILD= yes PROJECTHOST= jdbm2 -LATEST_LINK= jdbm2 PORTDOCS= * PORTEXAMPLES= * diff --git a/databases/luasql-mysql/Makefile b/databases/luasql-mysql/Makefile index 7601c8f48c6..02155f6348b 100644 --- a/databases/luasql-mysql/Makefile +++ b/databases/luasql-mysql/Makefile @@ -53,7 +53,6 @@ MAKE_ARGS+= DRIVER_LIBS="-L ${LOCALBASE}/lib -lsqlite3" \ IGNORE= unknown or unsupported luasql driver .endif -LATEST_LINK= ${PORTNAME}-${LUASQL_DRIVER} PLIST_SUB+= LUASQL_DRIVER=${LUASQL_DRIVER} do-install: diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile index b248f685f61..8eb84de84f0 100644 --- a/databases/mariadb-client/Makefile +++ b/databases/mariadb-client/Makefile @@ -4,8 +4,6 @@ PORTNAME= mariadb PORTREVISION= 7 PKGNAMESUFFIX= 53-client -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - COMMENT= Database client - drop-in replacement for MySQL MASTERDIR= ${.CURDIR}/../mariadb-server diff --git a/databases/mariadb-scripts/Makefile b/databases/mariadb-scripts/Makefile index f13f806569f..effc8eec3a6 100644 --- a/databases/mariadb-scripts/Makefile +++ b/databases/mariadb-scripts/Makefile @@ -7,7 +7,6 @@ COMMENT= Scripts for mariadb - drop-in replacement for MySQL LICENSE= GPLv2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} USES= perl5 MASTERDIR= ${.CURDIR}/../mariadb-server diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile index 87ff39e2a3c..288cc93aa1f 100644 --- a/databases/mariadb-server/Makefile +++ b/databases/mariadb-server/Makefile @@ -20,8 +20,6 @@ COMMENT= Database server - drop-in replacement for MySQL LICENSE= GPLv2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - CONFLICTS?= mariadb5[4-9]-server-* \ mariadb1[0-9][0-9]-server-* \ mysql*-server-* \ diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 7e7bc6909df..445d9cd96e2 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -21,7 +21,6 @@ LICENSE= GPLv2 SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake execinfo gmake shebangfix cpe USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile index 0e4820139fb..d58f0042e64 100644 --- a/databases/p5-BDB/Makefile +++ b/databases/p5-BDB/Makefile @@ -3,7 +3,7 @@ PORTNAME= BDB PORTVERSION= 1.90 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MLEHMANN @@ -30,4 +30,7 @@ USES= perl5 post-patch: @${REINPLACE_CMD} -e '18 s|-ldb|-l${BDB_LIB_NAME}|' ${WRKSRC}/Makefile.PL +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/BDB/BDB.so + .include diff --git a/databases/p5-Dancer-Plugin-Database-Core/Makefile b/databases/p5-Dancer-Plugin-Database-Core/Makefile index e0a9f1e41e3..1c5615f5184 100644 --- a/databases/p5-Dancer-Plugin-Database-Core/Makefile +++ b/databases/p5-Dancer-Plugin-Database-Core/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Dancer-Plugin-Database-Core -PORTVERSION= 0.11 +PORTVERSION= 0.12 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/databases/p5-Dancer-Plugin-Database-Core/distinfo b/databases/p5-Dancer-Plugin-Database-Core/distinfo index 81cd25a62fb..502aaf35951 100644 --- a/databases/p5-Dancer-Plugin-Database-Core/distinfo +++ b/databases/p5-Dancer-Plugin-Database-Core/distinfo @@ -1,2 +1,2 @@ -SHA256 (Dancer-Plugin-Database-Core-0.11.tar.gz) = 511e99b7501eacb082334e8ba5a5f9152af6d14bd4947eef6c872e27b65eaf20 -SIZE (Dancer-Plugin-Database-Core-0.11.tar.gz) = 15460 +SHA256 (Dancer-Plugin-Database-Core-0.12.tar.gz) = 7b9bae84d4cacb11fa9eae6ffc441c16511867e79d958d828b492b836ac2dad1 +SIZE (Dancer-Plugin-Database-Core-0.12.tar.gz) = 15625 diff --git a/databases/p5-Search-Xapian/Makefile b/databases/p5-Search-Xapian/Makefile index 91b21cb1883..4e52413c074 100644 --- a/databases/p5-Search-Xapian/Makefile +++ b/databases/p5-Search-Xapian/Makefile @@ -3,6 +3,7 @@ PORTNAME= Search-Xapian PORTVERSION= 1.2.21.0 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION:R}/ \ LOCAL/sunpoet \ @@ -29,4 +30,7 @@ USES= perl5 post-patch: @${REINPLACE_CMD} -e 's|^if (defined $$builddir) {|if (0) {|' ${WRKSRC}/Makefile.PL +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Search/Xapian/Xapian.so + .include diff --git a/databases/pear-DoctrineDBAL/Makefile b/databases/pear-DoctrineDBAL/Makefile index 7246a48d70d..678e040c1bf 100644 --- a/databases/pear-DoctrineDBAL/Makefile +++ b/databases/pear-DoctrineDBAL/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/deve ${PEARDIR}/Doctrine/Common/Version.php:${PORTSDIR}/databases/pear-DoctrineCommon \ ${PEARDIR}/Symfony/Component/Console/Application.php:${PORTSDIR}/devel/pear-Symfony_Component_Console -OPTIONSFILE?= ${PORT_DBDIR}/pear-${PORTNAME}/options OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE OPTIONS_DEFAULT=MYSQL diff --git a/databases/proftpd-mod_sql_mysql/Makefile b/databases/proftpd-mod_sql_mysql/Makefile index 5703130a577..bb2f521ae0d 100644 --- a/databases/proftpd-mod_sql_mysql/Makefile +++ b/databases/proftpd-mod_sql_mysql/Makefile @@ -12,7 +12,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd USE_MYSQL= yes diff --git a/databases/proftpd-mod_sql_odbc/Makefile b/databases/proftpd-mod_sql_odbc/Makefile index aba7dde4713..c56916c9bb1 100644 --- a/databases/proftpd-mod_sql_odbc/Makefile +++ b/databases/proftpd-mod_sql_odbc/Makefile @@ -14,7 +14,6 @@ LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd CONFIGURE_ARGS= LIBS=-liodbc \ diff --git a/databases/proftpd-mod_sql_sqlite/Makefile b/databases/proftpd-mod_sql_sqlite/Makefile index 1c351f5ac5b..94d50d485d2 100644 --- a/databases/proftpd-mod_sql_sqlite/Makefile +++ b/databases/proftpd-mod_sql_sqlite/Makefile @@ -13,7 +13,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd USE_SQLITE= yes diff --git a/databases/proftpd-mod_sql_tds/Makefile b/databases/proftpd-mod_sql_tds/Makefile index edafb84ccb8..a9c1c4d1aac 100644 --- a/databases/proftpd-mod_sql_tds/Makefile +++ b/databases/proftpd-mod_sql_tds/Makefile @@ -14,7 +14,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile index 48490979592..ffe2f47b405 100644 --- a/databases/py-MySQLdb/Makefile +++ b/databases/py-MySQLdb/Makefile @@ -23,7 +23,6 @@ PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}1-${PORTNAME}-${PORTVERSION} -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= DOCS MYSQLCLIENT_R OPTIONS_DEFAULT= MYSQLCLIENT_R MYSQLCLIENT_R_DESC= Use libmysqlclient_r (thread safe) diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile index 76df2a55142..c040aa4057d 100644 --- a/databases/py-pyPgSQL/Makefile +++ b/databases/py-pyPgSQL/Makefile @@ -25,9 +25,6 @@ OPTIONS_DEFINE= BYTEA_CONN EXAMPLES DOCS OPTIONS_DEFAULT= BYTEA_CONN BYTEA_CONN_DESC= Apply Bytea connection patch -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - .include .if ${PORT_OPTIONS:MBYTEA_CONN} diff --git a/databases/py-sqlalchemy-devel/Makefile b/databases/py-sqlalchemy-devel/Makefile index 44ac7be2d69..bbae74f2c7a 100644 --- a/databases/py-sqlalchemy-devel/Makefile +++ b/databases/py-sqlalchemy-devel/Makefile @@ -32,9 +32,6 @@ OPTIONS_DEFAULT= SQLITE SYBASE_DESC= Sybase backend TESTS_DESC= Include nose for unit tests -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>0:${PORTSDIR}/databases/py-mssql PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2 SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile index 8d1758631e0..0625198afcb 100644 --- a/databases/py-sqlalchemy/Makefile +++ b/databases/py-sqlalchemy/Makefile @@ -32,9 +32,6 @@ MSSQL_DESC= MS SQL Server backend TESTS_DESC= Include nose for unit tests SYBASE_DESC= Sybase backend -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - .include DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile index d8d6260a689..00960afa2ad 100644 --- a/databases/py-sqlalchemy06/Makefile +++ b/databases/py-sqlalchemy06/Makefile @@ -18,9 +18,6 @@ LICENSE= MIT USES= python USE_PYTHON= distutils autoplist -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - OPTIONS_DEFINE= CEXTENSIONS DOCS EXAMPLES NOSE OPTIONS_MULTI= BACKEND diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile index 8e8861f2d3b..fa372a4bb18 100644 --- a/databases/ruby-bdb/Makefile +++ b/databases/ruby-bdb/Makefile @@ -20,7 +20,6 @@ LICENSE= RUBY USE_BDB= yes OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/databases/rubygem-activerecord/Makefile b/databases/rubygem-activerecord/Makefile index 5454360d40a..ba05e059b06 100644 --- a/databases/rubygem-activerecord/Makefile +++ b/databases/rubygem-activerecord/Makefile @@ -26,7 +26,6 @@ OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 MYSQL_DESC= Use native MySQL bindings PGSQL_DESC= Use native PostgreSQL bindings SQLITE3_DESC= Use native SQLite3 bindings -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options GEM_ENV+= LANG=en_US.UTF-8 diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile index 35032fb6c35..307ffffeb21 100644 --- a/databases/sqliteman/Makefile +++ b/databases/sqliteman/Makefile @@ -14,7 +14,6 @@ LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 USES= cmake USE_SQLITE= yes -CMAKE_ENV+= QMAKESPEC=${QMAKESPEC} USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql GNU_CONFIGURE= yes diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile index dda341a64a1..278e512f8f8 100644 --- a/databases/squirrel-sql/Makefile +++ b/databases/squirrel-sql/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} SUB_FILES= squirrel-sql -DATADIR= ${PREFIX}/share/java/${UNIQUENAME} +DATADIR= ${PREFIX}/share/java/${PKGBASE} DESKTOP_ENTRIES="Squirrel-SQL Client" \ "${COMMENT}" \ diff --git a/databases/tora/Makefile b/databases/tora/Makefile index 057ff5dcfe1..bb6b263acaf 100644 --- a/databases/tora/Makefile +++ b/databases/tora/Makefile @@ -3,7 +3,7 @@ PORTNAME= tora PORTVERSION= 2.1.3 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SF @@ -21,7 +21,7 @@ OPTIONS_DEFINE= PGSQL MYSQL DOCS OPTIONS_DEFINE_i386= ORACLE OPTIONS_DEFAULT= PGSQL MYSQL -USE_QT4= gui corelib sql xml network linguist moc_build uic_build rcc_build +USE_QT4= corelib gui sql xml network moc_build uic_build rcc_build USES= autoreconf gmake libtool makeinfo GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pcre=${LOCALBASE} @@ -30,29 +30,20 @@ INSTALL_TARGET= install-strip PREFIX2FIX= doc/help/preferences.texi doc/help/preferences.html -.include +DOCS_USES= makeinfo +DOCS_INFO= tora -.if ${PORT_OPTIONS:MDOCS} -USES+= makeinfo -INFO= tora -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin -.endif - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin -.endif - -.if ${PORT_OPTIONS:MORACLE} -BUILD_DEPENDS+= ${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client -RUN_DEPENDS+= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client +MYSQL_RUN_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin +PGSQL_RUN_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin ORACLE_HOME?= ${LOCALBASE}/oracle8-client ORACLE_VER= 8i # Client version -CONFIGURE_ARGS+= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu} -.endif + +ORACLE_BUILD_DEPENDS= ${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client +ORACLE_RUN_DEPENDS= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client +ORACLE_CONFIGURE_ON= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu} + +.include post-patch: .if ${PORT_OPTIONS:MDOCS} diff --git a/databases/tora/files/patch-config_m4_oracle.m4 b/databases/tora/files/patch-config_m4_oracle.m4 index 7264b7f6ad3..e092d415367 100644 --- a/databases/tora/files/patch-config_m4_oracle.m4 +++ b/databases/tora/files/patch-config_m4_oracle.m4 @@ -1,6 +1,6 @@ ---- config/m4/oracle.m4.orig 2008-05-14 19:07:34.000000000 +0200 -+++ config/m4/oracle.m4 2009-05-07 19:15:56.463399933 +0200 -@@ -113,6 +113,11 @@ +--- config/m4/oracle.m4.orig 2009-10-23 16:19:57 UTC ++++ config/m4/oracle.m4 +@@ -113,6 +113,11 @@ Please install the instant client sdk pa ora_cflags="$ora_cflags -I$dir" echo "adding -I$dir" >&AS_MESSAGE_LOG_FD() fi diff --git a/databases/tora/files/patch-configure b/databases/tora/files/patch-configure index cb13f9ef093..72c7cafde46 100644 --- a/databases/tora/files/patch-configure +++ b/databases/tora/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2008-11-03 21:33:32.000000000 +0100 -+++ configure 2009-05-07 19:58:09.238375523 +0200 -@@ -25140,6 +25140,11 @@ +--- configure.orig 2010-09-19 17:15:52 UTC ++++ configure +@@ -17436,6 +17436,11 @@ Please install the instant client sdk pa ora_cflags="$ora_cflags -I$dir" echo "adding -I$dir" >&5 fi diff --git a/databases/tora/files/patch-configure.ac b/databases/tora/files/patch-configure.ac index a535ca377e2..b6bcd800128 100644 --- a/databases/tora/files/patch-configure.ac +++ b/databases/tora/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2008-09-14 23:54:41.000000000 +0200 -+++ configure.ac 2009-05-07 19:16:01.329388208 +0200 -@@ -54,6 +54,9 @@ +--- configure.ac.orig 2010-06-06 19:50:46 UTC ++++ configure.ac +@@ -57,6 +57,9 @@ TORA_CHECK_QSCINTILLA AX_PATH_LIB_PCRE AM_PATH_CPPUNIT([1.10.2], found_cppunit=yes) AM_CONDITIONAL([CPPUNIT], [test "x$found_cppunit" = "xyes"]) diff --git a/databases/tora/files/patch-doc_Makefile.am b/databases/tora/files/patch-doc_Makefile.am index c9a22de3f3e..f115e3847aa 100644 --- a/databases/tora/files/patch-doc_Makefile.am +++ b/databases/tora/files/patch-doc_Makefile.am @@ -1,6 +1,6 @@ ---- doc/Makefile.am.orig 2008-07-30 15:50:50.000000000 +0200 -+++ doc/Makefile.am 2009-05-10 18:04:15.478423171 +0200 -@@ -3,19 +3,20 @@ +--- doc/Makefile.am.orig 2009-10-23 16:19:55 UTC ++++ doc/Makefile.am +@@ -3,19 +3,20 @@ EXTRA_DIST = help dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/databases/tora/files/patch-doc_help_tora.texi b/databases/tora/files/patch-doc_help_tora.texi index 2822f16a42b..7d70d486085 100644 --- a/databases/tora/files/patch-doc_help_tora.texi +++ b/databases/tora/files/patch-doc_help_tora.texi @@ -1,5 +1,5 @@ ---- doc/help/tora.texi.orig 2008-09-14 23:54:41.000000000 +0200 -+++ doc/help/tora.texi 2009-05-07 21:36:32.058998814 +0200 +--- doc/help/tora.texi.orig 2010-07-18 10:48:45 UTC ++++ doc/help/tora.texi @@ -7,6 +7,10 @@ @c @image{images/tora_manual} @c %**end of header @@ -9,5 +9,5 @@ +@end direntry + @copying - This manual is for TOra, version 1.4.0. + This manual is for TOra, version 2.1.3+. @end copying diff --git a/databases/tora/files/patch-src_Makefile.am b/databases/tora/files/patch-src_Makefile.am index 7076bdce42a..1e590020cfe 100644 --- a/databases/tora/files/patch-src_Makefile.am +++ b/databases/tora/files/patch-src_Makefile.am @@ -1,6 +1,6 @@ ---- src/Makefile.am.orig 2010-09-19 20:07:44.000000000 +0200 -+++ src/Makefile.am 2010-11-01 23:01:57.000000000 +0100 -@@ -37,7 +37,7 @@ +--- src/Makefile.am.orig 2010-09-19 18:07:44 UTC ++++ src/Makefile.am +@@ -37,7 +37,7 @@ AM_LDFLAGS = $(PCRE_LIBS) \ # fix for annoying automake naming problems. tora_CXXFLAGS = $(AM_CXXFLAGS) @@ -9,7 +9,7 @@ if HAVE_ORACLE EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp tooraclesetting.h \ -@@ -439,6 +439,7 @@ +@@ -439,6 +439,7 @@ BUILT_SOURCES = \ moc_tobrowserdblinkswidget.cpp \ moc_tobrowserdirectorieswidget.cpp \ moc_toresultgrants.cpp \ diff --git a/databases/tora/files/patch-src_toextract.cpp b/databases/tora/files/patch-src_toextract.cpp index 0a82005e59a..f04073f1c2f 100644 --- a/databases/tora/files/patch-src_toextract.cpp +++ b/databases/tora/files/patch-src_toextract.cpp @@ -1,4 +1,4 @@ ---- src/toextract.cpp.orig 2010-02-02 18:25:43.000000000 +0000 +--- src/toextract.cpp.orig 2010-02-02 18:25:43 UTC +++ src/toextract.cpp @@ -39,6 +39,7 @@ * diff --git a/databases/tora/files/patch-src_toextract.h b/databases/tora/files/patch-src_toextract.h index 1c4d9d6068c..8f99c16c3e9 100644 --- a/databases/tora/files/patch-src_toextract.h +++ b/databases/tora/files/patch-src_toextract.h @@ -1,16 +1,18 @@ ---- src/toextract.h 2010-02-02 13:25:43.000000000 -0500 -+++ src/toextract.h 2015-03-08 20:14:45.000000000 -0400 -@@ -783,5 +783,5 @@ +--- src/toextract.h.orig 2010-02-02 18:25:43 UTC ++++ src/toextract.h +@@ -782,13 +782,13 @@ public: + } /** Implement sort order based only on Order field. */ - bool operator <(const columnInfo &inf) + bool operator <(const columnInfo &inf) const { return Order < inf.Order; -@@ -789,5 +789,5 @@ + } /** Implement sort order based only on Order field. */ - bool operator ==(const columnInfo &inf) + bool operator ==(const columnInfo &inf) const { return Order == inf.Order; + } diff --git a/databases/tora/files/patch-src_tooracleconnection.cpp b/databases/tora/files/patch-src_tooracleconnection.cpp index 35b2808ff8f..19e9168d3ca 100644 --- a/databases/tora/files/patch-src_tooracleconnection.cpp +++ b/databases/tora/files/patch-src_tooracleconnection.cpp @@ -1,6 +1,6 @@ ---- src/tooracleconnection.cpp.orig 2008-10-29 16:59:11.000000000 +0100 -+++ src/tooracleconnection.cpp 2009-05-07 19:16:09.390371657 +0200 -@@ -57,7 +57,6 @@ +--- src/tooracleconnection.cpp.orig 2010-09-19 09:27:38 UTC ++++ src/tooracleconnection.cpp +@@ -58,7 +58,6 @@ #define OTL_STL #define OTL_EXCEPTION_ENABLE_ERROR_OFFSET diff --git a/databases/tora/files/patch-src_topiechart.h b/databases/tora/files/patch-src_topiechart.h index 31a384d9647..52d2b2477be 100644 --- a/databases/tora/files/patch-src_topiechart.h +++ b/databases/tora/files/patch-src_topiechart.h @@ -1,5 +1,5 @@ ---- ./src/topiechart.h.orig 2009-10-23 18:19:33.000000000 +0200 -+++ ./src/topiechart.h 2014-07-21 19:25:58.000000000 +0200 +--- src/topiechart.h.orig 2009-10-23 16:19:33 UTC ++++ src/topiechart.h @@ -44,6 +44,7 @@ #include "config.h" diff --git a/databases/tora/files/patch-src_toreport.cpp b/databases/tora/files/patch-src_toreport.cpp index 71f91c04ab3..9b9e4b32364 100644 --- a/databases/tora/files/patch-src_toreport.cpp +++ b/databases/tora/files/patch-src_toreport.cpp @@ -1,4 +1,4 @@ ---- src/toreport.cpp.orig 2010-01-14 16:39:02.000000000 +0000 +--- src/toreport.cpp.orig 2010-01-14 16:39:02 UTC +++ src/toreport.cpp @@ -39,6 +39,7 @@ * diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile index ef1e1b41c5d..be046f704be 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -2,7 +2,7 @@ PORTNAME= cairo-dock-plugins PORTVERSION= 3.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MAINTAINER= fidaj@ukr.net diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile index 81ad8a0ea9d..a3aaf8cc64a 100644 --- a/deskutils/cdcat/Makefile +++ b/deskutils/cdcat/Makefile @@ -23,7 +23,7 @@ CONFIGURE_WRKSRC= ${WRKSRC}/src BUILD_WRKSRC= ${CONFIGURE_WRKSRC} USES= libtool qmake:norecursive tar:bzip2 -USE_QT4= corelib gui xml linguist_build moc_build uic_build +USE_QT4= corelib gui xml linguisttools_build moc_build uic_build QMAKE_ARGS= LIBS+="${LOCALBASE}/lib/libcryptopp.a" \ LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \ DEFINES+="MEDIAINFO_STATIC" \ diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile index e98c18716f4..99190f0441e 100644 --- a/deskutils/gworkspace-gwmetadata/Makefile +++ b/deskutils/gworkspace-gwmetadata/Makefile @@ -22,7 +22,6 @@ USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} USE_SQLITE= yes LDFLAGS+= -lpthread -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata CONFIGURE_ARGS+= --with-sqlite-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-sqlite-library=${LOCALBASE}/lib diff --git a/deskutils/ladon/Makefile b/deskutils/ladon/Makefile index accf76a1995..cab86361b7c 100644 --- a/deskutils/ladon/Makefile +++ b/deskutils/ladon/Makefile @@ -10,6 +10,8 @@ COMMENT= Utility to process many files in parallel LICENSE= MIT +BROKEN= does not build + BUILD_DEPENDS= npm>0:${PORTSDIR}/www/npm RUN_DEPENDS= npm>0:${PORTSDIR}/www/npm diff --git a/deskutils/nemo-extensions/Makefile b/deskutils/nemo-extensions/Makefile index acde675969d..15d49a32757 100644 --- a/deskutils/nemo-extensions/Makefile +++ b/deskutils/nemo-extensions/Makefile @@ -3,7 +3,7 @@ PORTNAME= nemo-extensions PORTVERSION= 2.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome DIST_SUBDIR= gnome3 @@ -13,9 +13,6 @@ COMMENT= File manager extensions for the Cinnamon desktop BUILD_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \ gtkdocize:${PORTSDIR}/textproc/gtk-doc \ rst2html:${PORTSDIR}/textproc/py-docutils \ - automake>=0:${PORTSDIR}/devel/automake \ - autoconf>=0:${PORTSDIR}/devel/autoconf \ - libtool:${PORTSDIR}/devel/libtool \ gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ @@ -28,21 +25,19 @@ LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ libevdocument3.so:${PORTSDIR}/graphics/evince \ libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \ libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \ - libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5 \ - libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 + libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5 RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas -BROKEN_FreeBSD_9= does not build - USE_GITHUB= yes GH_ACCOUNT= linuxmint GH_TAGNAME= 6c8ec3a USE_GNOME= gconf2 gnomeprefix gnomedocutils gtksourceview3 intlhack \ introspection:build libxml2 pygtk2 -USES= gettext gmake libtool pathfix pkgconfig shebangfix -SHEBANG_FILES= nemo-dropbox/dropbox.in +USES= autoreconf:build gettext gmake libtool pathfix pkgconfig \ + shebangfix +SHEBANG_FILES= nemo-dropbox/dropbox.in INSTALLS_ICONS= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -56,6 +51,8 @@ post-patch: @${REINPLACE_CMD} -e 's|AM_GNU_GETTEXT_VERSION(\[0.17\])||g ;\ s|AM_GNU_GETTEXT(\[external\])||g' \ ${WRKSRC}/nemo-preview/configure.ac + @${REINPLACE_CMD} -e 's|webkitgtk-3.0||' \ + ${WRKSRC}/nemo-preview/configure.ac do-configure: .for i in ${NON_AUTO_EXTENSIONS} diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile index 0cfdc861f39..71069719d38 100644 --- a/deskutils/parcellite/Makefile +++ b/deskutils/parcellite/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= parcellite -PORTVERSION= 1.1.7 -PORTREVISION= 1 +PORTVERSION= 1.1.9 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -12,37 +11,52 @@ MAINTAINER= koalative@gmail.com COMMENT= Lightweight GTK+ clipboard manager LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser - -USES= gettext-tools gmake pkgconfig +USES= pkgconfig GNU_CONFIGURE= yes -USE_GNOME= gtk20 intltool +USE_GNOME= glib20 gtk20 pango +USE_XORG= x11 +CONFIGURE_ARGS+=--disable-appindicator PORTDOCS= AUTHORS ChangeLog README +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib LIBS+= -lgio-2.0 -OPTIONS_DEFINE= DOCS NLS +OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext-runtime +NLS_USES= gmake gettext +NLS_USE= GNOME=intltool +NLS_USES_OFF= autoreconf +NLS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extrapatch-configure.ac NLS_LIBS= -lintl SUB_FILES= pkg-message -.include - -post-patch: - @${REINPLACE_CMD} -e 's|"/proc/|"/compat/linux/proc/|; \ - s|"/proc"|"/compat/linux/proc"|' \ - ${WRKSRC}/src/utils.c -.if ${PORT_OPTIONS:MNLS} +post-patch-NLS-on: @${REINPLACE_CMD} -e 's|$$(DATADIRNAME)/locale|share/locale|' \ ${WRKSRC}/po/Makefile.in.in -.endif + +post-patch-NLS-off: + @${REINPLACE_CMD} -e 's|@INTLTOOL_DESKTOP_RULE@||' \ + ${WRKSRC}/data/Makefile.am + @${REINPLACE_CMD} -e 's|_Name|Name|' -e 's|_Comment|Comment|' \ + ${WRKSRC}/data/parcellite-startup.desktop.in \ + ${WRKSRC}/data/parcellite.desktop.in + +post-patch: + @${REINPLACE_CMD} -e 's|/proc|/compat/linux/proc|g' \ + ${WRKSRC}/src/utils.c + +pre-build-NLS-off: + @${REINPLACE_CMD} -e '/SUBDIRS = /s| po||' ${WRKSRC}/Makefile + ${MV} ${WRKSRC}/data/parcellite-startup.desktop.in \ + ${WRKSRC}/data/parcellite-startup.desktop + ${MV} ${WRKSRC}/data/parcellite.desktop.in \ + ${WRKSRC}/data/parcellite.desktop post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/deskutils/parcellite/distinfo b/deskutils/parcellite/distinfo index a1a76d3b74c..47bd3b3aa0f 100644 --- a/deskutils/parcellite/distinfo +++ b/deskutils/parcellite/distinfo @@ -1,2 +1,2 @@ -SHA256 (parcellite-1.1.7.tar.gz) = 870f3789f247b200a609cb6dbefa42204779b2575a9dafa5b90828d2fce05f5f -SIZE (parcellite-1.1.7.tar.gz) = 723826 +SHA256 (parcellite-1.1.9.tar.gz) = cba89585082eebbe848ac1c0023cc71a0184c0db24ebc5f8a21039e46d7f11d4 +SIZE (parcellite-1.1.9.tar.gz) = 720177 diff --git a/deskutils/parcellite/files/extrapatch-configure.ac b/deskutils/parcellite/files/extrapatch-configure.ac new file mode 100644 index 00000000000..084dc3c2507 --- /dev/null +++ b/deskutils/parcellite/files/extrapatch-configure.ac @@ -0,0 +1,162 @@ +--- configure.ac.orig 2014-10-01 14:43:09 UTC ++++ configure.ac +@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) + +-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN" +-AM_GLIB_GNU_GETTEXT() +-AC_PROG_INTLTOOL([0.23]) +- + parcellitelocaledir='${prefix}/${DATADIRNAME}/locale' + AC_SUBST(parcellitelocaledir) + +-AM_GNU_GETTEXT([external]) +- + # ------------------------------------------------------------------------------- + # Main settings. + # ------------------------------------------------------------------------------- +@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon + # ------------------------------------------------------------------------------- + # Checks for header files. + # ------------------------------------------------------------------------------- +-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h]) ++AC_CHECK_HEADERS([stdlib.h string.h pthread.h]) + + # ------------------------------------------------------------------------------- + # Checks for typedefs, structures, and compiler characteristics. +--- configure.ac.orig 2014-10-01 14:43:09 UTC ++++ configure.ac +@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) + +-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN" +-AM_GLIB_GNU_GETTEXT() +-AC_PROG_INTLTOOL([0.23]) +- + parcellitelocaledir='${prefix}/${DATADIRNAME}/locale' + AC_SUBST(parcellitelocaledir) + +-AM_GNU_GETTEXT([external]) +- + # ------------------------------------------------------------------------------- + # Main settings. + # ------------------------------------------------------------------------------- +@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon + # ------------------------------------------------------------------------------- + # Checks for header files. + # ------------------------------------------------------------------------------- +-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h]) ++AC_CHECK_HEADERS([stdlib.h string.h pthread.h]) + + # ------------------------------------------------------------------------------- + # Checks for typedefs, structures, and compiler characteristics. +--- configure.ac.orig 2014-10-01 14:43:09 UTC ++++ configure.ac +@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) + +-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN" +-AM_GLIB_GNU_GETTEXT() +-AC_PROG_INTLTOOL([0.23]) +- + parcellitelocaledir='${prefix}/${DATADIRNAME}/locale' + AC_SUBST(parcellitelocaledir) + +-AM_GNU_GETTEXT([external]) +- + # ------------------------------------------------------------------------------- + # Main settings. + # ------------------------------------------------------------------------------- +@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon + # ------------------------------------------------------------------------------- + # Checks for header files. + # ------------------------------------------------------------------------------- +-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h]) ++AC_CHECK_HEADERS([stdlib.h string.h pthread.h]) + + # ------------------------------------------------------------------------------- + # Checks for typedefs, structures, and compiler characteristics. +--- configure.ac.orig 2014-10-01 14:43:09 UTC ++++ configure.ac +@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) + +-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN" +-AM_GLIB_GNU_GETTEXT() +-AC_PROG_INTLTOOL([0.23]) +- + parcellitelocaledir='${prefix}/${DATADIRNAME}/locale' + AC_SUBST(parcellitelocaledir) + +-AM_GNU_GETTEXT([external]) +- + # ------------------------------------------------------------------------------- + # Main settings. + # ------------------------------------------------------------------------------- +@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon + # ------------------------------------------------------------------------------- + # Checks for header files. + # ------------------------------------------------------------------------------- +-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h]) ++AC_CHECK_HEADERS([stdlib.h string.h pthread.h]) + + # ------------------------------------------------------------------------------- + # Checks for typedefs, structures, and compiler characteristics. +--- configure.ac.orig 2014-10-01 14:43:09 UTC ++++ configure.ac +@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) + +-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN" +-AM_GLIB_GNU_GETTEXT() +-AC_PROG_INTLTOOL([0.23]) +- + parcellitelocaledir='${prefix}/${DATADIRNAME}/locale' + AC_SUBST(parcellitelocaledir) + +-AM_GNU_GETTEXT([external]) +- + # ------------------------------------------------------------------------------- + # Main settings. + # ------------------------------------------------------------------------------- +@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon + # ------------------------------------------------------------------------------- + # Checks for header files. + # ------------------------------------------------------------------------------- +-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h]) ++AC_CHECK_HEADERS([stdlib.h string.h pthread.h]) + + # ------------------------------------------------------------------------------- + # Checks for typedefs, structures, and compiler characteristics. +--- configure.ac.orig 2014-10-01 14:43:09 UTC ++++ configure.ac +@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) + +-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN" +-AM_GLIB_GNU_GETTEXT() +-AC_PROG_INTLTOOL([0.23]) +- + parcellitelocaledir='${prefix}/${DATADIRNAME}/locale' + AC_SUBST(parcellitelocaledir) + +-AM_GNU_GETTEXT([external]) +- + # ------------------------------------------------------------------------------- + # Main settings. + # ------------------------------------------------------------------------------- +@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon + # ------------------------------------------------------------------------------- + # Checks for header files. + # ------------------------------------------------------------------------------- +-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h]) ++AC_CHECK_HEADERS([stdlib.h string.h pthread.h]) + + # ------------------------------------------------------------------------------- + # Checks for typedefs, structures, and compiler characteristics. diff --git a/deskutils/parcellite/files/patch-src__main.c b/deskutils/parcellite/files/patch-src__main.c deleted file mode 100644 index 20cb98a441b..00000000000 --- a/deskutils/parcellite/files/patch-src__main.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/main.c.orig 2013-10-15 19:39:04.000000000 +0200 -+++ ./src/main.c 2013-12-31 15:12:54.000000000 +0100 -@@ -2097,6 +2097,7 @@ - } - clip_lock= g_mutex_new(); - hist_lock= g_mutex_new(); -+ g_mutex_trylock(clip_lock); - g_mutex_unlock(clip_lock); - - show_icon=!get_pref_int32("no_icon"); diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile index 0332f921b6d..75ecff363f0 100644 --- a/deskutils/plan/Makefile +++ b/deskutils/plan/Makefile @@ -19,11 +19,6 @@ MAKE_ENV+= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR} OPTIONS_DEFINE= DOCS -.include -.if ${OSVERSION} > 900006 -EXTRA_PATCHES= ${PATCHDIR}/utmpx-src-daemon.c -.endif - do-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @@ -53,4 +48,4 @@ post-install: @${MKDIR} ${STAGEDIR}${DATADIR}/netplan.dir .endif -.include +.include diff --git a/deskutils/plan/files/utmpx-src-daemon.c b/deskutils/plan/files/patch-utmpx-src-daemon.c similarity index 100% rename from deskutils/plan/files/utmpx-src-daemon.c rename to deskutils/plan/files/patch-utmpx-src-daemon.c diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile index d6ae838b845..552a6ff66f5 100644 --- a/deskutils/taskwarrior/Makefile +++ b/deskutils/taskwarrior/Makefile @@ -3,6 +3,7 @@ PORTNAME= taskwarrior PORTVERSION= 2.4.4 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://taskwarrior.org/download/ DISTNAME= task-${PORTVERSION} @@ -33,7 +34,8 @@ USES= cmake:outsource shebangfix SHEBANG_FILES= scripts/*/*.pl \ scripts/*/*.rb \ scripts/*/*.py \ - doc/rc/refresh + doc/rc/refresh \ + scripts/bash/context CMAKE_ARGS+= -DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \ -DTASK_MAN1DIR:STRING=man/man1 \ -DTASK_MAN5DIR:STRING=man/man5 diff --git a/devel/Makefile b/devel/Makefile index a8eceb5f79f..f831c950b01 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -296,6 +296,7 @@ SUBDIR += cproto SUBDIR += cpuflags SUBDIR += critcl + SUBDIR += cs-eric6 SUBDIR += cscope SUBDIR += cscout SUBDIR += csmith @@ -435,6 +436,7 @@ SUBDIR += elixir-inflex SUBDIR += elixir-lager_logger SUBDIR += elixir-msgpax + SUBDIR += elixir-paratize SUBDIR += elixir-plug SUBDIR += elixir-poison SUBDIR += elixir-quantum @@ -483,6 +485,7 @@ SUBDIR += erlang-sbroker SUBDIR += erlang-ssl_verify_hostname SUBDIR += erlang-syslog + SUBDIR += es-eric6 SUBDIR += etcd SUBDIR += etcdctl SUBDIR += etl @@ -987,6 +990,7 @@ SUBDIR += ipython SUBDIR += ireport SUBDIR += isl + SUBDIR += it-eric6 SUBDIR += itext SUBDIR += jakarta-commons-configuration SUBDIR += jakarta-commons-daemon @@ -5099,6 +5103,7 @@ SUBDIR += tokamak SUBDIR += tortoisehg SUBDIR += tpasm + SUBDIR += tr-eric6 SUBDIR += trac-bitten SUBDIR += tradcpp SUBDIR += trio diff --git a/devel/boost-docs/pkg-plist b/devel/boost-docs/pkg-plist index 5ece1406451..9fc5a518fb6 100644 --- a/devel/boost-docs/pkg-plist +++ b/devel/boost-docs/pkg-plist @@ -18152,3 +18152,4 @@ %%DOCSDIR%%/tools/regression/xsl_reports/xsl/v2/html/summary_developer_legend.html %%DOCSDIR%%/tools/regression/xsl_reports/xsl/v2/html/summary_user_legend.html %%DOCSDIR%%/tools/release/index.html +@comment @dir %%DOCSDIR%%/libs/geometry/doc/src/examples/ranges diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index a37b1925cfd..817ff1e0252 100644 --- a/devel/ccache/Makefile +++ b/devel/ccache/Makefile @@ -3,7 +3,7 @@ PORTNAME= ccache PORTVERSION= 3.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery @@ -52,7 +52,7 @@ GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 CCACHE_COMPILERS+= cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|} .if ${PORT_OPTIONS:MCLANGLINK} -CLANG_COMPILERS+= 31 32 33 34 35 36 -devel +CLANG_COMPILERS+= 31 32 33 34 35 36 37 -devel CCACHE_COMPILERS+= clang clang++ ${CLANG_COMPILERS:S|^|clang|} ${CLANG_COMPILERS:S|^|clang++|} .endif diff --git a/devel/cl-asdf/bsd.cl-asdf.mk b/devel/cl-asdf/bsd.cl-asdf.mk index 5af2d0c5f2d..5f291a9e929 100644 --- a/devel/cl-asdf/bsd.cl-asdf.mk +++ b/devel/cl-asdf/bsd.cl-asdf.mk @@ -8,7 +8,7 @@ # CL_LIBDIR_REL - Common Lisp library directory, relative to LOCALBASE or PREFIX # ASDF_PATHNAME - Where to install compiled FASL files (depends on FASL_DIR_REL) # ASDF_REGISTRY - Path to ASDF registry -# DOCSDIR - DOCSDIR using UNIQUENAME (to account for optional cl- PKGNAMEPREFIX) +# DOCSDIR - DOCSDIR using PKGBASE (to account for optional cl- PKGNAMEPREFIX) # EXAMPLESDIR - Same as above, for EXAMPLESDIR # FASL_DIR_REL - Relative path to compiled FASL files; depends on FASL_TARGET # FASL_TARGET - Platform for building FASL files (currently "sbcl" or "clisp") @@ -32,8 +32,8 @@ FASL_PATHNAME= ${PREFIX}/${CL_LIBDIR_REL}/${PORTNAME}/${FASL_DIR_REL} ASDF_REGISTRY= ${PREFIX}/${CL_LIBDIR_REL}/system-registry # Include PKGNAMEPREFIX in DOCSDIR and EXAMPLESDIR -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} .if defined(FASL_TARGET) FASL_DIR_REL= ${FASL_TARGET}fasl diff --git a/devel/cs-eric6/Makefile b/devel/cs-eric6/Makefile new file mode 100644 index 00000000000..df66f1786df --- /dev/null +++ b/devel/cs-eric6/Makefile @@ -0,0 +1,7 @@ +# Created by: Boris Samorodov +# $FreeBSD$ + +CATEGORIES= devel python +I18N_LANG= cs + +.include "${.CURDIR}/../../devel/eric6/Makefile.inc" diff --git a/devel/cs-eric6/distinfo b/devel/cs-eric6/distinfo new file mode 100644 index 00000000000..af33d4ed45b --- /dev/null +++ b/devel/cs-eric6/distinfo @@ -0,0 +1,2 @@ +SHA256 (eric6-i18n-cs-6.0.8.tar.gz) = 33e9e37ae489ee1a254ff40f52f0021a7ad74f1299a54a56caca6fb722928941 +SIZE (eric6-i18n-cs-6.0.8.tar.gz) = 556529 diff --git a/devel/distel/Makefile b/devel/distel/Makefile index 717b90e5cd1..7fe164b834f 100644 --- a/devel/distel/Makefile +++ b/devel/distel/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= distel -PORTVERSION= 4.0.7 +PORTVERSION= 4.1.0 CATEGORIES= devel elisp MAINTAINER= olgeni@FreeBSD.org diff --git a/devel/distel/distinfo b/devel/distel/distinfo index 3baa0b390df..851f556b8df 100644 --- a/devel/distel/distinfo +++ b/devel/distel/distinfo @@ -1,2 +1,2 @@ -SHA256 (massemanet-distel-4.0.7_GH0.tar.gz) = 9d7d683d3ef4ca016056796af8047f639572a750d645827690564a15dc8579e0 -SIZE (massemanet-distel-4.0.7_GH0.tar.gz) = 213672 +SHA256 (massemanet-distel-4.1.0_GH0.tar.gz) = 6321e25c9bd7ec9edcb5e1474f570c321dd09d710b9e0fc085f76f56eadb2dd9 +SIZE (massemanet-distel-4.1.0_GH0.tar.gz) = 213828 diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 0715a407890..fe45b418b1e 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -4,6 +4,7 @@ PORTNAME= doxygen PORTVERSION= 1.8.10 PORTEPOCH= 2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ http://ftp.stack.nl/pub/users/dimitri/ @@ -15,7 +16,7 @@ COMMENT= Documentation system for C, C++, and other languages LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= bison cmake:outsource iconv python:2 +USES= bison cmake:outsource iconv python:2 shebangfix ALL_TARGET= all CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} REINPLACE_ARGS= -i '' @@ -61,4 +62,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex .endif +post-patch: + @${REINPLACE_CMD} -e '/PERL_PATH/ s|${perl_OLD_CMD}|${perl_CMD}|' \ + ${WRKSRC}/src/config.xml + .include diff --git a/devel/elixir-calendar/Makefile b/devel/elixir-calendar/Makefile index b66950a25a3..f7bb77e3b2f 100644 --- a/devel/elixir-calendar/Makefile +++ b/devel/elixir-calendar/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= calendar -PORTVERSION= 0.8.0 +PORTVERSION= 0.9.0 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-calendar/distinfo b/devel/elixir-calendar/distinfo index b1c5391d264..1ebceb7a956 100644 --- a/devel/elixir-calendar/distinfo +++ b/devel/elixir-calendar/distinfo @@ -1,2 +1,2 @@ -SHA256 (lau-calendar-v0.8.0_GH0.tar.gz) = b001f1634fb2f0eb446507f90cb2f0ae772086a0b16764fc48da5e0ac506d28d -SIZE (lau-calendar-v0.8.0_GH0.tar.gz) = 33422 +SHA256 (lau-calendar-v0.9.0_GH0.tar.gz) = 9087166d6b0c278db9cd3f4e03d8fa4989b7bc0397cb77ace7f8c57ddf404051 +SIZE (lau-calendar-v0.9.0_GH0.tar.gz) = 33976 diff --git a/devel/elixir-calendar/pkg-plist b/devel/elixir-calendar/pkg-plist index 18b905989d7..3bf28abc673 100644 --- a/devel/elixir-calendar/pkg-plist +++ b/devel/elixir-calendar/pkg-plist @@ -26,8 +26,6 @@ lib/elixir/lib/calendar/ebin/Elixir.Calendar.Strftime.beam lib/elixir/lib/calendar/ebin/Elixir.Calendar.Time.beam lib/elixir/lib/calendar/ebin/Elixir.Calendar.TimeZoneData.beam lib/elixir/lib/calendar/ebin/Elixir.Calendar.beam -lib/elixir/lib/calendar/ebin/Elixir.Range.Iterator.Calendar.Date.beam -lib/elixir/lib/calendar/ebin/Elixir.Range.Iterator.Calendar.Time.beam lib/elixir/lib/calendar/ebin/calendar.app lib/elixir/lib/calendar/lib/calendar.ex lib/elixir/lib/calendar/lib/calendar/ambiguous_date_time.ex diff --git a/devel/elixir-combine/Makefile b/devel/elixir-combine/Makefile index 4e54501cbd6..ce6a457097f 100644 --- a/devel/elixir-combine/Makefile +++ b/devel/elixir-combine/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= combine -PORTVERSION= 0.3.1 +PORTVERSION= 0.5.2 CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-combine/distinfo b/devel/elixir-combine/distinfo index 13e0f4bf97a..de105670ae5 100644 --- a/devel/elixir-combine/distinfo +++ b/devel/elixir-combine/distinfo @@ -1,2 +1,2 @@ -SHA256 (bitwalker-combine-0.3.1_GH0.tar.gz) = 74e3c91e276a05478068747d2a018d4dbca8cea9051e4987cc25d577bd80b837 -SIZE (bitwalker-combine-0.3.1_GH0.tar.gz) = 11354 +SHA256 (bitwalker-combine-0.5.2_GH0.tar.gz) = 92603f3edfd1c54ec7d8fa2dddb6f7d499e8019b13edc0803e042dd2f56e70a6 +SIZE (bitwalker-combine-0.5.2_GH0.tar.gz) = 63819 diff --git a/devel/elixir-combine/pkg-plist b/devel/elixir-combine/pkg-plist index ade294bb806..0b4b02ccdbb 100644 --- a/devel/elixir-combine/pkg-plist +++ b/devel/elixir-combine/pkg-plist @@ -1,6 +1,7 @@ lib/elixir/lib/combine/ebin/Elixir.Combine.Helpers.beam lib/elixir/lib/combine/ebin/Elixir.Combine.ParserState.beam lib/elixir/lib/combine/ebin/Elixir.Combine.Parsers.Base.beam +lib/elixir/lib/combine/ebin/Elixir.Combine.Parsers.Binary.beam lib/elixir/lib/combine/ebin/Elixir.Combine.Parsers.Text.beam lib/elixir/lib/combine/ebin/Elixir.Combine.beam lib/elixir/lib/combine/ebin/combine.app @@ -8,5 +9,6 @@ lib/elixir/lib/combine/lib/combine.ex lib/elixir/lib/combine/lib/combine/helpers.ex lib/elixir/lib/combine/lib/combine/parser_state.ex lib/elixir/lib/combine/lib/combine/parsers/base.ex +lib/elixir/lib/combine/lib/combine/parsers/binary.ex lib/elixir/lib/combine/lib/combine/parsers/text.ex %%PORTDOCS%%%%DOCSDIR%%/README.md diff --git a/devel/elixir-conform/Makefile b/devel/elixir-conform/Makefile index 948f49cca33..a820bde69f1 100644 --- a/devel/elixir-conform/Makefile +++ b/devel/elixir-conform/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= conform -PORTVERSION= 0.15.0 +PORTVERSION= 0.17.0 CATEGORIES= devel PKGNAMEPREFIX= elixir- @@ -17,5 +17,6 @@ GH_ACCOUNT= bitwalker MIX_BUILD_DEPS= devel/erlang-neotoma MIX_RUN_DEPS:= ${MIX_BUILD_DEPS} +MIX_REWRITE= yes .include diff --git a/devel/elixir-conform/distinfo b/devel/elixir-conform/distinfo index fdf9375274e..76d4ffec9b7 100644 --- a/devel/elixir-conform/distinfo +++ b/devel/elixir-conform/distinfo @@ -1,2 +1,2 @@ -SHA256 (bitwalker-conform-0.15.0_GH0.tar.gz) = 9d086cc1dfa2ad263a9afdb92b766d92e89b54365dffb400c4433406b1d44dc0 -SIZE (bitwalker-conform-0.15.0_GH0.tar.gz) = 32063 +SHA256 (bitwalker-conform-0.17.0_GH0.tar.gz) = 36f35f95ca042bf5d3bcbf7244d449f536051ce3070d5e8b136684be9eb51213 +SIZE (bitwalker-conform-0.17.0_GH0.tar.gz) = 34955 diff --git a/devel/elixir-conform/files/patch-mix.exs b/devel/elixir-conform/files/patch-mix.exs index 6bcd8b79780..024851d6b3b 100644 --- a/devel/elixir-conform/files/patch-mix.exs +++ b/devel/elixir-conform/files/patch-mix.exs @@ -1,10 +1,12 @@ ---- mix.exs.orig 2015-06-29 10:03:33 UTC +--- mix.exs.orig 2015-08-18 14:59:08 UTC +++ mix.exs -@@ -25,7 +25,6 @@ defmodule Conform.Mixfile do - defp compilers(true), do: [:peg, :erlang, :elixir, :app] +@@ -26,9 +26,6 @@ defmodule Conform.Mixfile do defp compilers(_), do: nil -- defp deps(true), do: [{:neotoma, github: "seancribbs/neotoma"}] + defp deps(true), do: [ +- {:neotoma, "~> 1.7.3"}, +- {:ex_doc, "~> 0.7", only: [:docs, :dev]}, +- {:earmark, "~> 0.1", only: [:docs, :dev]} + ] defp deps(_), do: [] - defp description, do: "Easy release configuration for Elixir apps." diff --git a/devel/elixir-conform/pkg-plist b/devel/elixir-conform/pkg-plist index 930c47345e5..2cd57b1f82b 100644 --- a/devel/elixir-conform/pkg-plist +++ b/devel/elixir-conform/pkg-plist @@ -1,10 +1,13 @@ lib/elixir/lib/conform/ebin/Elixir.Conform.Config.beam lib/elixir/lib/conform/ebin/Elixir.Conform.Options.beam +lib/elixir/lib/conform/ebin/Elixir.Conform.Parse.ParseError.beam lib/elixir/lib/conform/ebin/Elixir.Conform.Parse.beam lib/elixir/lib/conform/ebin/Elixir.Conform.Schema.SchemaError.beam lib/elixir/lib/conform/ebin/Elixir.Conform.Schema.beam lib/elixir/lib/conform/ebin/Elixir.Conform.Translate.TranslateError.beam lib/elixir/lib/conform/ebin/Elixir.Conform.Translate.beam +lib/elixir/lib/conform/ebin/Elixir.Conform.Type.beam +lib/elixir/lib/conform/ebin/Elixir.Conform.Types.Enum.beam lib/elixir/lib/conform/ebin/Elixir.Conform.Utils.Code.beam lib/elixir/lib/conform/ebin/Elixir.Conform.Utils.beam lib/elixir/lib/conform/ebin/Elixir.Conform.beam @@ -20,6 +23,8 @@ lib/elixir/lib/conform/lib/conform/config.ex lib/elixir/lib/conform/lib/conform/parse.ex lib/elixir/lib/conform/lib/conform/schema.ex lib/elixir/lib/conform/lib/conform/translate.ex +lib/elixir/lib/conform/lib/conform/type.ex +lib/elixir/lib/conform/lib/conform/types/enum.ex lib/elixir/lib/conform/lib/conform/utils/code.ex lib/elixir/lib/conform/lib/conform/utils/utils.ex lib/elixir/lib/conform/lib/mix/tasks/conform.archive.ex diff --git a/devel/elixir-estree/Makefile b/devel/elixir-estree/Makefile index 0f1d386801b..69fa0cb682b 100644 --- a/devel/elixir-estree/Makefile +++ b/devel/elixir-estree/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= elixir-estree -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/elixir-estree/distinfo b/devel/elixir-estree/distinfo index 4468efe2274..5b60d0ebc17 100644 --- a/devel/elixir-estree/distinfo +++ b/devel/elixir-estree/distinfo @@ -1,2 +1,2 @@ -SHA256 (bryanjos-elixir-estree-v2.0.0_GH0.tar.gz) = 8eac36c273b3930533df4a39af97158c96d94347b23402e615805492564b38e9 -SIZE (bryanjos-elixir-estree-v2.0.0_GH0.tar.gz) = 15515 +SHA256 (bryanjos-elixir-estree-v2.0.1_GH0.tar.gz) = 33e02722e1982af8434cc069c0cbe298973b2d2bf0f581ae7f4dd90655d9fa01 +SIZE (bryanjos-elixir-estree-v2.0.1_GH0.tar.gz) = 15807 diff --git a/devel/elixir-exprotobuf/Makefile b/devel/elixir-exprotobuf/Makefile index 490c79355a5..88f25e22056 100644 --- a/devel/elixir-exprotobuf/Makefile +++ b/devel/elixir-exprotobuf/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= exprotobuf -PORTVERSION= 0.10.2 +PORTVERSION= 0.11.0 CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-exprotobuf/distinfo b/devel/elixir-exprotobuf/distinfo index 3753c1a4d16..14cce282b7a 100644 --- a/devel/elixir-exprotobuf/distinfo +++ b/devel/elixir-exprotobuf/distinfo @@ -1,2 +1,2 @@ -SHA256 (bitwalker-exprotobuf-0.10.2_GH0.tar.gz) = 833e21e03173086b83ed4ee3549307e00d3ae67f5c2162db2260b3d3ab0e2e39 -SIZE (bitwalker-exprotobuf-0.10.2_GH0.tar.gz) = 16429 +SHA256 (bitwalker-exprotobuf-0.11.0_GH0.tar.gz) = 5c59d7159281b109c29e44b5cf20418b2fc6e8555665b6fd1657b34db5620c6a +SIZE (bitwalker-exprotobuf-0.11.0_GH0.tar.gz) = 17016 diff --git a/devel/elixir-exrm/Makefile b/devel/elixir-exrm/Makefile index db3024cfd12..043d907aa1f 100644 --- a/devel/elixir-exrm/Makefile +++ b/devel/elixir-exrm/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= exrm -PORTVERSION= 0.18.5 +PORTVERSION= 0.19.2 CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-exrm/distinfo b/devel/elixir-exrm/distinfo index e31bbd4f275..934c8b05d63 100644 --- a/devel/elixir-exrm/distinfo +++ b/devel/elixir-exrm/distinfo @@ -1,2 +1,2 @@ -SHA256 (bitwalker-exrm-0.18.5_GH0.tar.gz) = 5c9b445ff16293664c3bd327c4c35ae327731f169430f3193bf27ad94f3df771 -SIZE (bitwalker-exrm-0.18.5_GH0.tar.gz) = 43079 +SHA256 (bitwalker-exrm-0.19.2_GH0.tar.gz) = a3b0eea4a80713261c6f4dfed7e8b922c59291b95a336202710bb2ebc105521f +SIZE (bitwalker-exrm-0.19.2_GH0.tar.gz) = 46590 diff --git a/devel/elixir-exrm/files/patch-mix.exs b/devel/elixir-exrm/files/patch-mix.exs index 5021d18974a..0d4fb1efce6 100644 --- a/devel/elixir-exrm/files/patch-mix.exs +++ b/devel/elixir-exrm/files/patch-mix.exs @@ -1,13 +1,14 @@ ---- mix.exs.orig 2015-06-30 19:58:41 UTC +--- mix.exs.orig 2015-08-18 15:22:09 UTC +++ mix.exs -@@ -13,10 +13,7 @@ defmodule ReleaseManager.Mixfile do +@@ -14,11 +14,7 @@ defmodule ReleaseManager.Mixfile do def application, do: [] def deps do -- [{:conform, "~> 0.14.5"}, +- [{:conform, "~> 0.16.0"}, - {:relx, "~> 3.1.0" }, - {:earmark, "~> 0.1", only: :dev}, -- {:ex_doc, "~> 0.5", only: :dev}] +- {:ex_doc, "~> 0.5", only: :dev}, +- {:coverex, "~> 1.4.1", only: :test}] + [] end diff --git a/devel/elixir-exrm/pkg-plist b/devel/elixir-exrm/pkg-plist index 2da696e9d07..d953ae42d13 100644 --- a/devel/elixir-exrm/pkg-plist +++ b/devel/elixir-exrm/pkg-plist @@ -3,6 +3,7 @@ lib/elixir/lib/exrm/ebin/Elixir.Mix.Tasks.Release.Plugins.beam lib/elixir/lib/exrm/ebin/Elixir.Mix.Tasks.Release.beam lib/elixir/lib/exrm/ebin/Elixir.ReleaseManager.Appups.beam lib/elixir/lib/exrm/ebin/Elixir.ReleaseManager.Config.beam +lib/elixir/lib/exrm/ebin/Elixir.ReleaseManager.Plugin.Appups.beam lib/elixir/lib/exrm/ebin/Elixir.ReleaseManager.Plugin.Conform.beam lib/elixir/lib/exrm/ebin/Elixir.ReleaseManager.Plugin.Consolidation.beam lib/elixir/lib/exrm/ebin/Elixir.ReleaseManager.Plugin.beam @@ -11,6 +12,7 @@ lib/elixir/lib/exrm/ebin/exrm.app lib/elixir/lib/exrm/lib/exrm/appups.ex lib/elixir/lib/exrm/lib/exrm/config.ex lib/elixir/lib/exrm/lib/exrm/plugin.ex +lib/elixir/lib/exrm/lib/exrm/plugins/appups.ex lib/elixir/lib/exrm/lib/exrm/plugins/conform.ex lib/elixir/lib/exrm/lib/exrm/plugins/consolidation.ex lib/elixir/lib/exrm/lib/exrm/utils.ex @@ -19,6 +21,9 @@ lib/elixir/lib/exrm/lib/mix/tasks/release.ex lib/elixir/lib/exrm/lib/mix/tasks/release.plugins.ex lib/elixir/lib/exrm/priv/rel/files/boot lib/elixir/lib/exrm/priv/rel/files/boot.bat +lib/elixir/lib/exrm/priv/rel/files/boot_shim +lib/elixir/lib/exrm/priv/rel/files/boot_shim.bat +lib/elixir/lib/exrm/priv/rel/files/install_upgrade.escript lib/elixir/lib/exrm/priv/rel/files/nodetool lib/elixir/lib/exrm/priv/rel/files/release_definition.txt lib/elixir/lib/exrm/priv/rel/files/sys.config diff --git a/devel/elixir-paratize/Makefile b/devel/elixir-paratize/Makefile new file mode 100644 index 00000000000..970196a7a93 --- /dev/null +++ b/devel/elixir-paratize/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= elixir-paratize +PORTVERSION= 2.1.0 +DISTVERSIONPREFIX= v +CATEGORIES= devel + +MAINTAINER= olgeni@FreeBSD.org +COMMENT= Parallel processing facilities for Elixir + +LICENSE= MIT + +USES= elixir +USE_GITHUB= yes +GH_ACCOUNT= seantanly + +ELIXIR_APP_NAME=paratize +MIX_REWRITE= yes + +.include diff --git a/devel/elixir-paratize/distinfo b/devel/elixir-paratize/distinfo new file mode 100644 index 00000000000..34b8e6175a4 --- /dev/null +++ b/devel/elixir-paratize/distinfo @@ -0,0 +1,2 @@ +SHA256 (seantanly-elixir-paratize-v2.1.0_GH0.tar.gz) = dabdf83fcde70988fc873d1130e9eec12e3fbcc5bc3b478221a0ccc9a9008cf1 +SIZE (seantanly-elixir-paratize-v2.1.0_GH0.tar.gz) = 324655 diff --git a/devel/elixir-paratize/pkg-descr b/devel/elixir-paratize/pkg-descr new file mode 100644 index 00000000000..7c33a40bcb9 --- /dev/null +++ b/devel/elixir-paratize/pkg-descr @@ -0,0 +1,4 @@ +Elixir library providing some handy parallel processing facilities +that supports configuring number of workers and timeout. + +WWW: https://github.com/seantanly/elixir-paratize diff --git a/devel/elixir-paratize/pkg-plist b/devel/elixir-paratize/pkg-plist new file mode 100644 index 00000000000..e39fe442285 --- /dev/null +++ b/devel/elixir-paratize/pkg-plist @@ -0,0 +1,13 @@ +lib/elixir/lib/paratize/ebin/Elixir.Collectable.Paratize.TaskOptions.beam +lib/elixir/lib/paratize/ebin/Elixir.Paratize.Base.beam +lib/elixir/lib/paratize/ebin/Elixir.Paratize.Chunk.beam +lib/elixir/lib/paratize/ebin/Elixir.Paratize.Pool.beam +lib/elixir/lib/paratize/ebin/Elixir.Paratize.TaskOptions.beam +lib/elixir/lib/paratize/ebin/Elixir.Paratize.beam +lib/elixir/lib/paratize/ebin/paratize.app +lib/elixir/lib/paratize/lib/paratize.ex +lib/elixir/lib/paratize/lib/paratize/base.ex +lib/elixir/lib/paratize/lib/paratize/chunk.ex +lib/elixir/lib/paratize/lib/paratize/pool.ex +lib/elixir/lib/paratize/lib/paratize/task_options.ex +%%PORTDOCS%%%%DOCSDIR%%/README.md diff --git a/devel/elixir-plug/Makefile b/devel/elixir-plug/Makefile index c4db8e097a0..e6cceac7e9b 100644 --- a/devel/elixir-plug/Makefile +++ b/devel/elixir-plug/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= plug -PORTVERSION= 0.13.1 +PORTVERSION= 1.0.0 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-plug/distinfo b/devel/elixir-plug/distinfo index 1e96146347f..3289954fb30 100644 --- a/devel/elixir-plug/distinfo +++ b/devel/elixir-plug/distinfo @@ -1,2 +1,2 @@ -SHA256 (elixir-lang-plug-v0.13.1_GH0.tar.gz) = eaf82bdb8be79605597a15d3ea416dec130abf1d97806f917043d90ac4fbc49b -SIZE (elixir-lang-plug-v0.13.1_GH0.tar.gz) = 103627 +SHA256 (elixir-lang-plug-v1.0.0_GH0.tar.gz) = ff4f181afbb33be3d60202709eaf63022799a70716b8d047480977970d13bbab +SIZE (elixir-lang-plug-v1.0.0_GH0.tar.gz) = 104344 diff --git a/devel/elixir-timex/Makefile b/devel/elixir-timex/Makefile index 096f470773a..1e509114971 100644 --- a/devel/elixir-timex/Makefile +++ b/devel/elixir-timex/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= timex -PORTVERSION= 0.16.2 +PORTVERSION= 0.19.2 CATEGORIES= devel PKGNAMEPREFIX= elixir- @@ -14,7 +14,8 @@ USES= elixir USE_GITHUB= yes GH_ACCOUNT= bitwalker -MIX_BUILD_DEPS= devel/elixir-tzdata +MIX_BUILD_DEPS= devel/elixir-combine \ + devel/elixir-tzdata MIX_RUN_DEPS:= ${MIX_BUILD_DEPS} .include diff --git a/devel/elixir-timex/distinfo b/devel/elixir-timex/distinfo index e8a1fe2cda0..7f2c5bb69a5 100644 --- a/devel/elixir-timex/distinfo +++ b/devel/elixir-timex/distinfo @@ -1,2 +1,2 @@ -SHA256 (bitwalker-timex-0.16.2_GH0.tar.gz) = c06339035f6ea525763daaa10751c736215c57930762f7ae8aa06d47bdfba331 -SIZE (bitwalker-timex-0.16.2_GH0.tar.gz) = 70456 +SHA256 (bitwalker-timex-0.19.2_GH0.tar.gz) = 358d0c5391d5795e2dbe75e707d5b971772af2d71893829fa7ec095115f5784b +SIZE (bitwalker-timex-0.19.2_GH0.tar.gz) = 73648 diff --git a/devel/elixir-timex/pkg-plist b/devel/elixir-timex/pkg-plist index 2cb5979f048..af713bb3af9 100644 --- a/devel/elixir-timex/pkg-plist +++ b/devel/elixir-timex/pkg-plist @@ -1,29 +1,22 @@ -lib/elixir/lib/timex/ebin/Elixir.Access.Timex.DateTime.beam -lib/elixir/lib/timex/ebin/Elixir.Access.Timex.Format.DateTime.Directive.beam -lib/elixir/lib/timex/ebin/Elixir.Access.Timex.Parse.DateTime.ParserState.beam -lib/elixir/lib/timex/ebin/Elixir.Access.Timex.Parse.ZoneInfo.Parser.Header.beam -lib/elixir/lib/timex/ebin/Elixir.Access.Timex.Parse.ZoneInfo.Parser.LeapSecond.beam -lib/elixir/lib/timex/ebin/Elixir.Access.Timex.Parse.ZoneInfo.Parser.TransitionInfo.beam -lib/elixir/lib/timex/ebin/Elixir.Access.Timex.Parse.ZoneInfo.Parser.Zone.beam lib/elixir/lib/timex/ebin/Elixir.Timex.Date.Convert.Timex.DateTime.beam lib/elixir/lib/timex/ebin/Elixir.Timex.Date.Convert.beam lib/elixir/lib/timex/ebin/Elixir.Timex.Date.beam lib/elixir/lib/timex/ebin/Elixir.Timex.DateFormat.beam lib/elixir/lib/timex/ebin/Elixir.Timex.DateTime.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Directive.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Formats.Regex.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Formats.beam lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Formatter.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Formatters.DefaultFormatter.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Formatters.StrftimeFormatter.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Tokenizers.Default.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Tokenizers.Strftime.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Formatters.Default.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Format.DateTime.Formatters.Strftime.beam lib/elixir/lib/timex/ebin/Elixir.Timex.Format.FormatError.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Format.Time.TimeFormatter.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Format.Time.Formatter.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Format.Time.Formatters.Default.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Format.Time.Formatters.Humanized.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.Helpers.beam lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.Parser.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.ParserState.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.Parsers.DefaultParser.beam -lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.Parsers.StrftimeParser.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.Parsers.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.Tokenizer.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.Tokenizers.Default.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.Tokenizers.Directive.beam +lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.DateTime.Tokenizers.Strftime.beam lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.ParseError.beam lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.ZoneInfo.Parser.Header.beam lib/elixir/lib/timex/ebin/Elixir.Timex.Parse.ZoneInfo.Parser.LeapSecond.beam @@ -42,19 +35,20 @@ lib/elixir/lib/timex/lib/date/date.ex lib/elixir/lib/timex/lib/date/date_convert.ex lib/elixir/lib/timex/lib/date/date_format.ex lib/elixir/lib/timex/lib/date/datetime.ex -lib/elixir/lib/timex/lib/format/datetime/directive.ex -lib/elixir/lib/timex/lib/format/datetime/formats.ex lib/elixir/lib/timex/lib/format/datetime/formatter.ex lib/elixir/lib/timex/lib/format/datetime/formatters/default.ex lib/elixir/lib/timex/lib/format/datetime/formatters/strftime.ex -lib/elixir/lib/timex/lib/format/datetime/tokenizers/default.ex -lib/elixir/lib/timex/lib/format/datetime/tokenizers/strftime.ex lib/elixir/lib/timex/lib/format/format_error.ex -lib/elixir/lib/timex/lib/format/time/time_formatter.ex +lib/elixir/lib/timex/lib/format/time/formatter.ex +lib/elixir/lib/timex/lib/format/time/formatters/default.ex +lib/elixir/lib/timex/lib/format/time/formatters/humanized.ex +lib/elixir/lib/timex/lib/parse/datetime/helpers.ex lib/elixir/lib/timex/lib/parse/datetime/parser.ex -lib/elixir/lib/timex/lib/parse/datetime/parser_state.ex -lib/elixir/lib/timex/lib/parse/datetime/parsers/default.ex -lib/elixir/lib/timex/lib/parse/datetime/parsers/strftime.ex +lib/elixir/lib/timex/lib/parse/datetime/parsers.ex +lib/elixir/lib/timex/lib/parse/datetime/tokenizer.ex +lib/elixir/lib/timex/lib/parse/datetime/tokenizers/default.ex +lib/elixir/lib/timex/lib/parse/datetime/tokenizers/directive.ex +lib/elixir/lib/timex/lib/parse/datetime/tokenizers/strftime.ex lib/elixir/lib/timex/lib/parse/parse_error.ex lib/elixir/lib/timex/lib/parse/zoneinfo/parser.ex lib/elixir/lib/timex/lib/time/time.ex diff --git a/devel/elixir-tzdata/Makefile b/devel/elixir-tzdata/Makefile index 70a3be18fda..8f9d3b6f70e 100644 --- a/devel/elixir-tzdata/Makefile +++ b/devel/elixir-tzdata/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tzdata -PORTVERSION= 0.1.6 +PORTVERSION= 0.1.7 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- @@ -15,4 +15,6 @@ USES= elixir USE_GITHUB= yes GH_ACCOUNT= lau +MIX_REWRITE= yes + .include diff --git a/devel/elixir-tzdata/distinfo b/devel/elixir-tzdata/distinfo index 47a746d2e3d..eeef449488a 100644 --- a/devel/elixir-tzdata/distinfo +++ b/devel/elixir-tzdata/distinfo @@ -1,2 +1,2 @@ -SHA256 (lau-tzdata-v0.1.6_GH0.tar.gz) = 602d9796a244d543ec5147acacb30c9d15536f58e86c1edd657de5b73fe6533d -SIZE (lau-tzdata-v0.1.6_GH0.tar.gz) = 251076 +SHA256 (lau-tzdata-v0.1.7_GH0.tar.gz) = af6a719c2d738078f8e5d16056a2e30a2226502d141ecd3e9f62dc27ffd5c229 +SIZE (lau-tzdata-v0.1.7_GH0.tar.gz) = 251943 diff --git a/devel/elixir-tzdata/files/patch-mix.exs b/devel/elixir-tzdata/files/patch-mix.exs deleted file mode 100644 index e38e4d4cd00..00000000000 --- a/devel/elixir-tzdata/files/patch-mix.exs +++ /dev/null @@ -1,11 +0,0 @@ ---- mix.exs.orig 2015-07-02 22:52:47 UTC -+++ mix.exs -@@ -17,8 +17,6 @@ defmodule Tzdata.Mixfile do - - defp deps do - [ -- {:earmark, "~> 0.1", only: :dev}, -- {:ex_doc, "~> 0.7", only: :dev}, - ] - end - diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile index 9353e2b16ff..6ffec945d7d 100644 --- a/devel/eric6/Makefile +++ b/devel/eric6/Makefile @@ -20,6 +20,7 @@ PLIST_FILES= SUB_FILES= eric6.desktop OPTIONS_DEFINE= DOCS EXAMPLES EXTRA_PATCHES= +MASTERPORT= PORTDATA= * PORTDOCS= * diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc index d25e5d5bbd0..717b096fde4 100644 --- a/devel/eric6/Makefile.inc +++ b/devel/eric6/Makefile.inc @@ -6,7 +6,7 @@ # french/eric6, german/eric6, russian/eric6 PORTNAME= eric6 -PORTVERSION= 6.0.5 +PORTVERSION= 6.0.8 MASTER_SITES= SF/eric-ide/${PORTNAME}/stable/${PORTVERSION} DISTNAME?= ${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -27,6 +27,10 @@ NO_BUILD= yes PLIST_FILES?= %%DATADIR%%/i18n/${PORTNAME}_${I18N_LANG}.qm EXTRA_PATCHES?= ${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py +.if ! defined(MASTERPORT) +NO_ARCH= yes +.endif + do-install: @(cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_CMD}) diff --git a/devel/eric6/distinfo b/devel/eric6/distinfo index 826f317d6fa..7e1521ba22f 100644 --- a/devel/eric6/distinfo +++ b/devel/eric6/distinfo @@ -1,2 +1,2 @@ -SHA256 (eric6-6.0.5.tar.gz) = 7860a3309bcf3c68933031bfe83890014ed70e2b9072cb51757e8309279945e1 -SIZE (eric6-6.0.5.tar.gz) = 10621736 +SHA256 (eric6-6.0.8.tar.gz) = 459516a11ad8a55d6c033a987f66b2fa1250d5eb8d5b0aa95c3a3d546bf8aa86 +SIZE (eric6-6.0.8.tar.gz) = 10632491 diff --git a/devel/erlang-jsx/Makefile b/devel/erlang-jsx/Makefile index 99cc6a30954..3d008ba54e5 100644 --- a/devel/erlang-jsx/Makefile +++ b/devel/erlang-jsx/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jsx -PORTVERSION= 2.6.2 +PORTVERSION= 2.7.0 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= erlang- diff --git a/devel/erlang-jsx/distinfo b/devel/erlang-jsx/distinfo index 41488111ef2..521bea49c3e 100644 --- a/devel/erlang-jsx/distinfo +++ b/devel/erlang-jsx/distinfo @@ -1,2 +1,2 @@ -SHA256 (talentdeficit-jsx-v2.6.2_GH0.tar.gz) = 6334830027b4a7d26e6bce51dd3f71ad282067fa7ba672a5efae830c8adad940 -SIZE (talentdeficit-jsx-v2.6.2_GH0.tar.gz) = 40352 +SHA256 (talentdeficit-jsx-v2.7.0_GH0.tar.gz) = c2244285e4df2334ee9e1f41f893b75bb50049512dd425f9ae63ebbd28de3bb9 +SIZE (talentdeficit-jsx-v2.7.0_GH0.tar.gz) = 40982 diff --git a/devel/erlang-jsxd/Makefile b/devel/erlang-jsxd/Makefile index a75680fc605..ce338cb2d0d 100644 --- a/devel/erlang-jsxd/Makefile +++ b/devel/erlang-jsxd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jsxd -PORTVERSION= 0.1.9 +PORTVERSION= 0.1.10 CATEGORIES= devel PKGNAMEPREFIX= erlang- diff --git a/devel/erlang-jsxd/distinfo b/devel/erlang-jsxd/distinfo index ebbb20b080f..c9777f92559 100644 --- a/devel/erlang-jsxd/distinfo +++ b/devel/erlang-jsxd/distinfo @@ -1,2 +1,2 @@ -SHA256 (Licenser-jsxd-0.1.9_GH0.tar.gz) = 69303c008a746ff1b997c47feb56b5bc612facac2ff71dc8f61630de424a4dea -SIZE (Licenser-jsxd-0.1.9_GH0.tar.gz) = 143156 +SHA256 (Licenser-jsxd-0.1.10_GH0.tar.gz) = 2be2f4656ded010d05c1a525fe9d6eb3118f1ead2d389648a8d065671a8a2af3 +SIZE (Licenser-jsxd-0.1.10_GH0.tar.gz) = 143297 diff --git a/devel/erlang-neotoma/Makefile b/devel/erlang-neotoma/Makefile index 4e8221da7e2..f172feef0d9 100644 --- a/devel/erlang-neotoma/Makefile +++ b/devel/erlang-neotoma/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= neotoma -PORTVERSION= 1.7.2 -PORTREVISION= 1 +PORTVERSION= 1.7.3 CATEGORIES= devel PKGNAMEPREFIX= erlang- diff --git a/devel/erlang-neotoma/distinfo b/devel/erlang-neotoma/distinfo index 12ab3f31157..bf4116261c9 100644 --- a/devel/erlang-neotoma/distinfo +++ b/devel/erlang-neotoma/distinfo @@ -1,2 +1,2 @@ -SHA256 (seancribbs-neotoma-1.7.2_GH0.tar.gz) = 73c356991b9685e86cd142d3b09e808dc9ef300bd7261113a0463c74de81a6ea -SIZE (seancribbs-neotoma-1.7.2_GH0.tar.gz) = 181946 +SHA256 (seancribbs-neotoma-1.7.3_GH0.tar.gz) = 0da8b63b908ea207f44fe6f3435c0a7cb9c041e472b21063ec79409544e2ed69 +SIZE (seancribbs-neotoma-1.7.3_GH0.tar.gz) = 182343 diff --git a/devel/es-eric6/Makefile b/devel/es-eric6/Makefile new file mode 100644 index 00000000000..3eae50b12fa --- /dev/null +++ b/devel/es-eric6/Makefile @@ -0,0 +1,7 @@ +# Created by: Boris Samorodov +# $FreeBSD$ + +CATEGORIES= devel python +I18N_LANG= es + +.include "${.CURDIR}/../../devel/eric6/Makefile.inc" diff --git a/devel/es-eric6/distinfo b/devel/es-eric6/distinfo new file mode 100644 index 00000000000..32b328030fa --- /dev/null +++ b/devel/es-eric6/distinfo @@ -0,0 +1,2 @@ +SHA256 (eric6-i18n-es-6.0.8.tar.gz) = 3c258e595d820813e263097ef5089fe6bff4fa3a21dc8c36141eee3a9650e20b +SIZE (eric6-i18n-es-6.0.8.tar.gz) = 762868 diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile index 9c81b4c3684..c46ac92d35b 100644 --- a/devel/fpc-fcl-db/Makefile +++ b/devel/fpc-fcl-db/Makefile @@ -1,7 +1,7 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-db @@ -10,7 +10,6 @@ COMMENT= Free Pascal Component Library USE_FPC= dblib fcl-async fcl-base fcl-json fcl-xml hash ibase mysql odbc oracle paszlib postgres \ pthreads pxlib sqlite -USE_FPC_RUN= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile index 79fcac27b90..bf3e43e6c34 100644 --- a/devel/fpc-fcl-image/Makefile +++ b/devel/fpc-fcl-image/Makefile @@ -1,7 +1,7 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-image @@ -9,7 +9,6 @@ MAINTAINER= freebsd-fpc@FreeBSD.org COMMENT= Free Pascal Component Library USE_FPC= fcl-async fcl-base hash pasjpeg paszlib pthreads libpng -USE_FPC_RUN= yes MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/devel/fpc-fpmkunit/Makefile b/devel/fpc-fpmkunit/Makefile index a6e67ad6a74..8589048e251 100644 --- a/devel/fpc-fpmkunit/Makefile +++ b/devel/fpc-fpmkunit/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -fpmkunit MAINTAINER= freebsd-fpc@FreeBSD.org COMMENT= Free Pascal build system unit -USE_FPC= fcl-process paszlib +USE_FPC= fcl-process hash paszlib USE_FPC_RUN= yes MASTERDIR= ${.CURDIR}/../../lang/fpc diff --git a/devel/freeocl/Makefile b/devel/freeocl/Makefile index 94420852b45..06f3b17a145 100644 --- a/devel/freeocl/Makefile +++ b/devel/freeocl/Makefile @@ -25,7 +25,6 @@ USES= cmake compiler:c++11-lib USE_LDCONFIG= yes CXXFLAGS+= -pthread -std=gnu++0x -CMAKE_ENV+= FREEOCL_CXX_COMPILER="${CXX}" CFLAGS_i386= -msse diff --git a/devel/glib20-reference/bsd.gnome-reference.mk b/devel/glib20-reference/bsd.gnome-reference.mk index 6b9a50178ec..3312475b5cb 100644 --- a/devel/glib20-reference/bsd.gnome-reference.mk +++ b/devel/glib20-reference/bsd.gnome-reference.mk @@ -22,9 +22,6 @@ DISTNAME:= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MASTER_SITE_SUBDIR:= ${MASTER_SITE_SUBDIR} .endif PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-reference -.if defined(LATEST_LINK) -LATEST_LINK:= ${LATEST_LINK}-reference -.endif COMMENT= Programming reference for ${REFERENCE_PORT} diff --git a/devel/insight/Makefile b/devel/insight/Makefile index 4558797141b..12671cbe61c 100644 --- a/devel/insight/Makefile +++ b/devel/insight/Makefile @@ -6,8 +6,6 @@ PORTREVISION= 2 MAINTAINER= mi@aldan.algebra.com COMMENT= Gnu debugger with the Insight GUI front-end -LATEST_LINK= insight - MASTERDIR= ${.CURDIR:H}/gdb66 OPTIONS_SLAVE= INSIGHT CONFLICTS= gdb-[6-9]* diff --git a/devel/it-eric6/Makefile b/devel/it-eric6/Makefile new file mode 100644 index 00000000000..4004be0715c --- /dev/null +++ b/devel/it-eric6/Makefile @@ -0,0 +1,7 @@ +# Created by: Boris Samorodov +# $FreeBSD$ + +CATEGORIES= devel python +I18N_LANG= it + +.include "${.CURDIR}/../../devel/eric6/Makefile.inc" diff --git a/devel/it-eric6/distinfo b/devel/it-eric6/distinfo new file mode 100644 index 00000000000..942086802e0 --- /dev/null +++ b/devel/it-eric6/distinfo @@ -0,0 +1,2 @@ +SHA256 (eric6-i18n-it-6.0.8.tar.gz) = 77dce382bc10fbfcc17a626eca280a696fe7c431029de4f58fdf335203dec2cd +SIZE (eric6-i18n-it-6.0.8.tar.gz) = 630776 diff --git a/devel/lfcxml/Makefile b/devel/lfcxml/Makefile index b63db27b283..e133b8d775a 100644 --- a/devel/lfcxml/Makefile +++ b/devel/lfcxml/Makefile @@ -1,4 +1,3 @@ -# Created by: Kurt Jaeger # $FreeBSD$ PORTNAME= lfcxml @@ -7,7 +6,7 @@ PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.lemke-it.com/ -MAINTAINER= fbsd-ports@opsec.eu +MAINTAINER= pi@FreeBSD.org COMMENT= C++ XML library, used for databases/cego LICENSE= GPLv3 diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 86bb81df383..5f39dcfc5ed 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -15,7 +15,6 @@ COMMAND_PREFIX= cheri-unknown-freebsd- COMMAND_SUFFIX= DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 USE_LDCONFIG= ${LLVM_PREFIX}/lib diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 79d38fb78ad..8add55a06e9 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -14,7 +14,6 @@ LLVM_SUFFIX= -devel LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 USE_LDCONFIG= ${LLVM_PREFIX}/lib diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile index 6d205c2bbca..48c0979cac4 100644 --- a/devel/llvm33/Makefile +++ b/devel/llvm33/Makefile @@ -15,7 +15,6 @@ LLVM_SUFFIX= ${PORTVERSION:S/.//g} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= execinfo gmake perl5 GNU_CONFIGURE= yes diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile index 228db1d8327..c5473b1645c 100644 --- a/devel/llvm34/Makefile +++ b/devel/llvm34/Makefile @@ -15,7 +15,6 @@ LLVM_SUFFIX= ${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm-${PORTVERSION}.src diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile index 0d23e84cb30..f81baf5c9ce 100644 --- a/devel/llvm35/Makefile +++ b/devel/llvm35/Makefile @@ -15,7 +15,6 @@ LLVM_SUFFIX= ${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm-${DISTVERSION}.src diff --git a/devel/llvm36/Makefile b/devel/llvm36/Makefile index 1a556bed52c..3401ed52089 100644 --- a/devel/llvm36/Makefile +++ b/devel/llvm36/Makefile @@ -16,7 +16,6 @@ LLVM_RELEASE= ${PORTVERSION:C/([0-9]\.[0-9].[0-9]).*/\1/} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm-${DISTVERSION}.src diff --git a/devel/llvm37/Makefile b/devel/llvm37/Makefile index 132a23ba929..b0b85c6aef2 100644 --- a/devel/llvm37/Makefile +++ b/devel/llvm37/Makefile @@ -20,7 +20,6 @@ LLVM_SUFFIX= ${DISTVERSION:R:S/.//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz USE_LDCONFIG= ${LLVM_PREFIX}/lib diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile index abe78306ed3..1fda9f816cd 100644 --- a/devel/ocaml-camlp5/Makefile +++ b/devel/ocaml-camlp5/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= http://camlp5.gforge.inria.fr/distrib/src/ \ http://cristal.inria.fr/~ddr/camlp5/distrib/src/ \ http://pauillac.inria.fr/~ddr/camlp5/distrib/src/ PKGNAMEPREFIX= ocaml- -DIST_SUBDIR= ${UNIQUENAME} +DIST_SUBDIR= ${PKGBASE} PATCH_SITES= ${MASTER_SITES} diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile index cfa9e8f4c4d..dc126082e34 100644 --- a/devel/oniguruma/Makefile +++ b/devel/oniguruma/Makefile @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= BSDL Regular Expressions library compatible with POSIX/GNU/Perl WRKSRC= ${WRKDIR}/${PORTNAME} -NO_LATEST_LINK= yes CONFLICTS_INSTALL= oniguruma-4.* GNU_CONFIGURE= yes DOCS= HISTORY README doc/* diff --git a/devel/p5-B-Hooks-OP-Annotation/Makefile b/devel/p5-B-Hooks-OP-Annotation/Makefile index bcd3a1ea024..61ca8a456d5 100644 --- a/devel/p5-B-Hooks-OP-Annotation/Makefile +++ b/devel/p5-B-Hooks-OP-Annotation/Makefile @@ -3,7 +3,7 @@ PORTNAME= B-Hooks-OP-Annotation PORTVERSION= 0.44 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,4 +20,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/B/Hooks/OP/Annotation/Annotation.so + .include diff --git a/devel/p5-Cairo-GObject/Makefile b/devel/p5-Cairo-GObject/Makefile index b504bb2b289..073f24dce28 100644 --- a/devel/p5-Cairo-GObject/Makefile +++ b/devel/p5-Cairo-GObject/Makefile @@ -3,7 +3,7 @@ PORTNAME= Cairo-GObject PORTVERSION= 1.004 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel graphics perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:XAOC @@ -26,4 +26,7 @@ RUN_DEPENDS= cairo>=1.10.0:${PORTSDIR}/graphics/cairo \ USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cairo/GObject/GObject.so + .include diff --git a/devel/p5-Clone-More/Makefile b/devel/p5-Clone-More/Makefile index 33e901cbc1b..1e6278067d2 100644 --- a/devel/p5-Clone-More/Makefile +++ b/devel/p5-Clone-More/Makefile @@ -3,7 +3,7 @@ PORTNAME= Clone-More PORTVERSION= 0.90.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -18,4 +18,7 @@ USE_PERL5= configure USES= perl5 WRKSRC= ${WRKDIR}/${PORTNAME} +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Clone/More/More.so + .include diff --git a/devel/p5-Data-Clone/Makefile b/devel/p5-Data-Clone/Makefile index 87c542f4de5..55d52039f6c 100644 --- a/devel/p5-Data-Clone/Makefile +++ b/devel/p5-Data-Clone/Makefile @@ -3,7 +3,7 @@ PORTNAME= Data-Clone PORTVERSION= 0.004 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -26,4 +26,7 @@ USES= perl5 BUILD_DEPENDS+= p5-ExtUtils-ParseXS>=3.18:${PORTSDIR}/devel/p5-ExtUtils-ParseXS .endif +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Data/Clone/Clone.so + .include diff --git a/devel/p5-DateTime-Astro/Makefile b/devel/p5-DateTime-Astro/Makefile index c07254204fc..1e90aef18a0 100644 --- a/devel/p5-DateTime-Astro/Makefile +++ b/devel/p5-DateTime-Astro/Makefile @@ -3,7 +3,7 @@ PORTNAME= DateTime-Astro PORTVERSION= 1.00 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:DMAKI @@ -24,4 +24,7 @@ USES= gmake perl5 post-configure: @${REINPLACE_CMD} -e '/^INC = / s|$$| -I${LOCALBASE}/include|' ${WRKSRC}/Makefile +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DateTime/Astro/Astro.so + .include diff --git a/devel/p5-Devel-CallChecker/Makefile b/devel/p5-Devel-CallChecker/Makefile index e1060c9de6d..0339c9a6f2f 100644 --- a/devel/p5-Devel-CallChecker/Makefile +++ b/devel/p5-Devel-CallChecker/Makefile @@ -3,6 +3,7 @@ PORTNAME= Devel-CallChecker PORTVERSION= 0.007 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -21,4 +22,7 @@ TEST_DEPENDS= p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \ USE_PERL5= modbuild USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Devel/CallChecker/CallChecker.so + .include diff --git a/devel/p5-Devel-PartialDump/Makefile b/devel/p5-Devel-PartialDump/Makefile index 6922d63cd02..67dd26dac45 100644 --- a/devel/p5-Devel-PartialDump/Makefile +++ b/devel/p5-Devel-PartialDump/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Devel-PartialDump -PORTVERSION= 0.17 -PORTREVISION= 1 +PORTVERSION= 0.18 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,8 +19,9 @@ BUILD_DEPENDS= p5-Class-Tiny>=0:${PORTSDIR}/devel/p5-Class-Tiny \ RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn +NO_ARCH= yes USES= perl5 -USE_PERL5= modbuildtiny +USE_PERL5= configure .include diff --git a/devel/p5-Devel-PartialDump/distinfo b/devel/p5-Devel-PartialDump/distinfo index 7b0df79e378..6e1967f7ad6 100644 --- a/devel/p5-Devel-PartialDump/distinfo +++ b/devel/p5-Devel-PartialDump/distinfo @@ -1,2 +1,2 @@ -SHA256 (Devel-PartialDump-0.17.tar.gz) = d6f1378743e7227b6d6be76ff75462b82496f40cf284365310d7938e8cc2235b -SIZE (Devel-PartialDump-0.17.tar.gz) = 27588 +SHA256 (Devel-PartialDump-0.18.tar.gz) = 7814bf578cbae5add970071033b35850fc5158b9b11fcbdd469040127d843344 +SIZE (Devel-PartialDump-0.18.tar.gz) = 30047 diff --git a/devel/p5-Devel-PartialDump/pkg-plist b/devel/p5-Devel-PartialDump/pkg-plist index 673aa97b8e3..621849563c6 100644 --- a/devel/p5-Devel-PartialDump/pkg-plist +++ b/devel/p5-Devel-PartialDump/pkg-plist @@ -1,2 +1,2 @@ -%%PERL5_MAN3%%/Devel::PartialDump.3.gz %%SITE_PERL%%/Devel/PartialDump.pm +%%PERL5_MAN3%%/Devel::PartialDump.3.gz diff --git a/devel/p5-Hash-NoRef/Makefile b/devel/p5-Hash-NoRef/Makefile index c3f0e265c04..482a841288d 100644 --- a/devel/p5-Hash-NoRef/Makefile +++ b/devel/p5-Hash-NoRef/Makefile @@ -3,7 +3,7 @@ PORTNAME= Hash-NoRef PORTVERSION= 0.03 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,4 +14,7 @@ COMMENT= HASH that store values without increase the reference count USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Hash/NoRef/NoRef.so + .include diff --git a/devel/p5-Hash-Util-FieldHash-Compat/Makefile b/devel/p5-Hash-Util-FieldHash-Compat/Makefile index e0881c928da..55d53f57fdc 100644 --- a/devel/p5-Hash-Util-FieldHash-Compat/Makefile +++ b/devel/p5-Hash-Util-FieldHash-Compat/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Hash-Util-FieldHash-Compat -PORTVERSION= 0.08 -PORTREVISION= 2 +PORTVERSION= 0.09 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,8 +13,9 @@ COMMENT= Use Hash::Util::FieldHash or ties, depending on availability LICENSE= ART10 GPLv1 LICENSE_COMB= dual -BUILD_DEPENDS= p5-Tie-RefHash-Weak>=0.08:${PORTSDIR}/devel/p5-Tie-RefHash-Weak -RUN_DEPENDS:= ${BUILD_DEPENDS} +BUILD_DEPENDS= p5-Module-Metadata>=1.000027:${PORTSDIR}/devel/p5-Module-Metadata \ + p5-Tie-RefHash-Weak>=0.08:${PORTSDIR}/devel/p5-Tie-RefHash-Weak +RUN_DEPENDS= p5-Tie-RefHash-Weak>=0.08:${PORTSDIR}/devel/p5-Tie-RefHash-Weak NO_ARCH= yes USES= perl5 diff --git a/devel/p5-Hash-Util-FieldHash-Compat/distinfo b/devel/p5-Hash-Util-FieldHash-Compat/distinfo index a9b86a6a2eb..1cab32f6845 100644 --- a/devel/p5-Hash-Util-FieldHash-Compat/distinfo +++ b/devel/p5-Hash-Util-FieldHash-Compat/distinfo @@ -1,2 +1,2 @@ -SHA256 (Hash-Util-FieldHash-Compat-0.08.tar.gz) = ade00f8b01450729c9aa67c3528580213f4223ca4831c9c7ad55b6abcc2ef4d5 -SIZE (Hash-Util-FieldHash-Compat-0.08.tar.gz) = 23064 +SHA256 (Hash-Util-FieldHash-Compat-0.09.tar.gz) = 68b6492c877d27e3ead88037d40561e1abda2fcda877cf8587c201fb7ac4e529 +SIZE (Hash-Util-FieldHash-Compat-0.09.tar.gz) = 26907 diff --git a/devel/p5-Lexical-Import/Makefile b/devel/p5-Lexical-Import/Makefile index 9923ba01c14..852297eb4f3 100644 --- a/devel/p5-Lexical-Import/Makefile +++ b/devel/p5-Lexical-Import/Makefile @@ -3,7 +3,7 @@ PORTNAME= Lexical-Import PORTVERSION= 0.002 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -21,4 +21,7 @@ TEST_DEPENDS= p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \ USE_PERL5= modbuild USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Lexical/Import/Import.so + .include diff --git a/devel/p5-Log-Any-App/Makefile b/devel/p5-Log-Any-App/Makefile index 69c307d7ac3..8792c8b366f 100644 --- a/devel/p5-Log-Any-App/Makefile +++ b/devel/p5-Log-Any-App/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Log-Any-App -PORTVERSION= 0.48 +PORTVERSION= 0.49 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -18,6 +18,7 @@ BUILD_DEPENDS= p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \ p5-IO-Socket-UNIX-Util>=0:${PORTSDIR}/net/p5-IO-Socket-UNIX-Util \ p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \ p5-Log-Any-Adapter-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Any-Adapter-Log4perl \ + p5-Log-Any-IfLOG>=0:${PORTSDIR}/devel/p5-Log-Any-IfLOG \ p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \ p5-Log-Dispatch-ArrayWithLimits>=0:${PORTSDIR}/devel/p5-Log-Dispatch-ArrayWithLimits \ p5-Log-Dispatch-Dir>=0.08:${PORTSDIR}/devel/p5-Log-Dispatch-Dir \ diff --git a/devel/p5-Log-Any-App/distinfo b/devel/p5-Log-Any-App/distinfo index 39ddabf0f0a..283968b6de6 100644 --- a/devel/p5-Log-Any-App/distinfo +++ b/devel/p5-Log-Any-App/distinfo @@ -1,2 +1,2 @@ -SHA256 (Log-Any-App-0.48.tar.gz) = 9c1d54713c72194515e2806ffe09e7f07b2367501897c108e10dfe7d517681fd -SIZE (Log-Any-App-0.48.tar.gz) = 48585 +SHA256 (Log-Any-App-0.49.tar.gz) = 4673ad7cbec5a178f5d48b2d55dcb23d164f4ba909f19c0a7038636b78f64663 +SIZE (Log-Any-App-0.49.tar.gz) = 48732 diff --git a/devel/p5-Log-Any-IfLOG/Makefile b/devel/p5-Log-Any-IfLOG/Makefile index 3dcda0d4fe4..cf02c926a2a 100644 --- a/devel/p5-Log-Any-IfLOG/Makefile +++ b/devel/p5-Log-Any-IfLOG/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Log-Any-IfLOG -PORTVERSION= 0.05 +PORTVERSION= 0.07 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -16,6 +16,7 @@ LICENSE_COMB= dual BUILD_DEPENDS= p5-Log-Any>=0:${PORTSDIR}/devel/p5-Log-Any RUN_DEPENDS:= ${BUILD_DEPENDS} +NO_ARCH= yes USE_PERL5= configure USES= perl5 diff --git a/devel/p5-Log-Any-IfLOG/distinfo b/devel/p5-Log-Any-IfLOG/distinfo index 98e8af7c68e..f255d3a4075 100644 --- a/devel/p5-Log-Any-IfLOG/distinfo +++ b/devel/p5-Log-Any-IfLOG/distinfo @@ -1,2 +1,2 @@ -SHA256 (Log-Any-IfLOG-0.05.tar.gz) = 7208cda405e051a9200deb058701c7f73ddc4c72a2d2a921025fb4bedc3d08d0 -SIZE (Log-Any-IfLOG-0.05.tar.gz) = 14341 +SHA256 (Log-Any-IfLOG-0.07.tar.gz) = b3ee52a29264fe37461be3b3589e9bee5dda78dee31ab42fab6327ed02b4e8ed +SIZE (Log-Any-IfLOG-0.07.tar.gz) = 14638 diff --git a/devel/p5-MooseX-AttributeHelpers/Makefile b/devel/p5-MooseX-AttributeHelpers/Makefile index 41d2932da30..7c41f807dd5 100644 --- a/devel/p5-MooseX-AttributeHelpers/Makefile +++ b/devel/p5-MooseX-AttributeHelpers/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-AttributeHelpers -PORTVERSION= 0.23 -PORTREVISION= 1 +PORTVERSION= 0.24 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,14 +10,15 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Extend your attribute interfaces +LICENSE= ART10 GPLv1 +LICENSE_COMB= dual + BUILD_DEPENDS= p5-Moose>=0.56:${PORTSDIR}/devel/p5-Moose RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception +NO_ARCH= yes USES= perl5 -USE_PERL5= configure - -post-extract: - @${REINPLACE_CMD} -i '' '/build_requires/d' ${WRKSRC}/Makefile.PL +USE_PERL5= modbuildtiny .include diff --git a/devel/p5-MooseX-AttributeHelpers/distinfo b/devel/p5-MooseX-AttributeHelpers/distinfo index 574e6db74d9..c262fec07d6 100644 --- a/devel/p5-MooseX-AttributeHelpers/distinfo +++ b/devel/p5-MooseX-AttributeHelpers/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-AttributeHelpers-0.23.tar.gz) = 3f63f60d94d840a309d9137f78605e15f07c977fd15a4f4b55bd47b65ed52be1 -SIZE (MooseX-AttributeHelpers-0.23.tar.gz) = 38659 +SHA256 (MooseX-AttributeHelpers-0.24.tar.gz) = b891c2ea9bbad10bc6aba4ddd94511c6e8c8eae9395a770090a330ece68613c4 +SIZE (MooseX-AttributeHelpers-0.24.tar.gz) = 51799 diff --git a/devel/p5-MooseX-Daemonize/Makefile b/devel/p5-MooseX-Daemonize/Makefile index 6eaaf12398b..deb52762e62 100644 --- a/devel/p5-MooseX-Daemonize/Makefile +++ b/devel/p5-MooseX-Daemonize/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Daemonize -PORTVERSION= 0.19 +PORTVERSION= 0.20 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -22,6 +22,7 @@ BUILD_DEPENDS+= p5-Devel-CheckOS>=1.63:${PORTSDIR}/devel/p5-Devel-CheckOS DEPRECATED= Deprecated by upstream, use devel/p5-Daemon-Control instead +NO_ARCH= yes USES= perl5 USE_PERL5= modbuildtiny diff --git a/devel/p5-MooseX-Daemonize/distinfo b/devel/p5-MooseX-Daemonize/distinfo index 2392ffbf01f..16f8356b767 100644 --- a/devel/p5-MooseX-Daemonize/distinfo +++ b/devel/p5-MooseX-Daemonize/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Daemonize-0.19.tar.gz) = c7b60cf0fa17df05eac7c4c85c62d0629dc47c5c5e809fe5bae8ab1d6ec20413 -SIZE (MooseX-Daemonize-0.19.tar.gz) = 40543 +SHA256 (MooseX-Daemonize-0.20.tar.gz) = 664f3ff98b184150e910d05dccda98678bc2d1111b33d818b574b8f4fcc40a1f +SIZE (MooseX-Daemonize-0.20.tar.gz) = 44089 diff --git a/devel/p5-MooseX-Daemonize/pkg-plist b/devel/p5-MooseX-Daemonize/pkg-plist index 5c128f04921..fdf719df75c 100644 --- a/devel/p5-MooseX-Daemonize/pkg-plist +++ b/devel/p5-MooseX-Daemonize/pkg-plist @@ -1,12 +1,12 @@ -%%PERL5_MAN3%%/MooseX::Daemonize.3.gz -%%PERL5_MAN3%%/MooseX::Daemonize::Core.3.gz -%%PERL5_MAN3%%/MooseX::Daemonize::Pid.3.gz -%%PERL5_MAN3%%/MooseX::Daemonize::Pid::File.3.gz -%%PERL5_MAN3%%/MooseX::Daemonize::WithPidFile.3.gz -%%PERL5_MAN3%%/Test::MooseX::Daemonize.3.gz %%SITE_PERL%%/MooseX/Daemonize.pm %%SITE_PERL%%/MooseX/Daemonize/Core.pm %%SITE_PERL%%/MooseX/Daemonize/Pid.pm %%SITE_PERL%%/MooseX/Daemonize/Pid/File.pm %%SITE_PERL%%/MooseX/Daemonize/WithPidFile.pm %%SITE_PERL%%/Test/MooseX/Daemonize.pm +%%PERL5_MAN3%%/MooseX::Daemonize.3.gz +%%PERL5_MAN3%%/MooseX::Daemonize::Core.3.gz +%%PERL5_MAN3%%/MooseX::Daemonize::Pid.3.gz +%%PERL5_MAN3%%/MooseX::Daemonize::Pid::File.3.gz +%%PERL5_MAN3%%/MooseX::Daemonize::WithPidFile.3.gz +%%PERL5_MAN3%%/Test::MooseX::Daemonize.3.gz diff --git a/devel/p5-MooseX-Declare/Makefile b/devel/p5-MooseX-Declare/Makefile index a83d2433b0e..69d2c88b002 100644 --- a/devel/p5-MooseX-Declare/Makefile +++ b/devel/p5-MooseX-Declare/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Declare -PORTVERSION= 0.42 +PORTVERSION= 0.43 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,17 +13,18 @@ COMMENT= Declarative syntax for Moose LICENSE= ART10 GPLv1 LICENSE_COMB= dual -BUILD_DEPENDS= p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \ +BUILD_DEPENDS= p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \ + p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \ + p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \ p5-MooseX-Method-Signatures>=0.36:${PORTSDIR}/devel/p5-MooseX-Method-Signatures \ p5-MooseX-Role-Parameterized>=0.12:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \ p5-MooseX-Types>=0.20:${PORTSDIR}/devel/p5-MooseX-Types \ - p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \ - p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \ - p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \ p5-Parse-Method-Signatures>=0:${PORTSDIR}/devel/p5-Parse-Method-Signatures \ + p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \ + p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \ p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \ - p5-namespace-clean>=0.11:${PORTSDIR}/devel/p5-namespace-clean \ - p5-namespace-autoclean>=0.09:${PORTSDIR}/devel/p5-namespace-autoclean + p5-namespace-autoclean>=0.16:${PORTSDIR}/devel/p5-namespace-autoclean \ + p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal diff --git a/devel/p5-MooseX-Declare/distinfo b/devel/p5-MooseX-Declare/distinfo index 8971166a6a8..90e1705b869 100644 --- a/devel/p5-MooseX-Declare/distinfo +++ b/devel/p5-MooseX-Declare/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Declare-0.42.tar.gz) = ebe989532e8a85cd3282ef3a87da3570d6ddf6a0a20ebf37ea8c535179ed06dd -SIZE (MooseX-Declare-0.42.tar.gz) = 59947 +SHA256 (MooseX-Declare-0.43.tar.gz) = 3e0d811c60f8df8e486f5d49b5d485b60293b0b1aad64efd6a51b5fbb9075773 +SIZE (MooseX-Declare-0.43.tar.gz) = 60478 diff --git a/devel/p5-MooseX-MethodAttributes/Makefile b/devel/p5-MooseX-MethodAttributes/Makefile index 5598bc151e3..6daf2aa99a5 100644 --- a/devel/p5-MooseX-MethodAttributes/Makefile +++ b/devel/p5-MooseX-MethodAttributes/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-MethodAttributes -PORTVERSION= 0.29 -PORTREVISION= 1 +PORTVERSION= 0.30 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -22,6 +21,7 @@ TEST_DEPENDS= p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-P p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \ p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires +NO_ARCH= yes USES= perl5 USE_PERL5= modbuildtiny diff --git a/devel/p5-MooseX-MethodAttributes/distinfo b/devel/p5-MooseX-MethodAttributes/distinfo index f838cfab803..b3160c9d00d 100644 --- a/devel/p5-MooseX-MethodAttributes/distinfo +++ b/devel/p5-MooseX-MethodAttributes/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-MethodAttributes-0.29.tar.gz) = b3410314f02d0466a0789651dfee857e3c46a3b83dd483e47fd535f58e89e3df -SIZE (MooseX-MethodAttributes-0.29.tar.gz) = 33301 +SHA256 (MooseX-MethodAttributes-0.30.tar.gz) = b9010f8309668000d630595ae251170ddcfad642d468efea0afda55eb1e53239 +SIZE (MooseX-MethodAttributes-0.30.tar.gz) = 41590 diff --git a/devel/p5-MooseX-MethodAttributes/pkg-plist b/devel/p5-MooseX-MethodAttributes/pkg-plist index 6d402211698..80cf95b9bce 100644 --- a/devel/p5-MooseX-MethodAttributes/pkg-plist +++ b/devel/p5-MooseX-MethodAttributes/pkg-plist @@ -1,16 +1,3 @@ -%%PERL5_MAN3%%/MooseX::MethodAttributes.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Inheritable.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::AttrContainer.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::AttrContainer::Inheritable.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Class.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Map.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Method.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Method::MaybeWrapped.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Method::Wrapped.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Role.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Role::Application.3.gz -%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Role::Application::Summation.3.gz %%SITE_PERL%%/MooseX/MethodAttributes.pm %%SITE_PERL%%/MooseX/MethodAttributes/Inheritable.pm %%SITE_PERL%%/MooseX/MethodAttributes/Role.pm @@ -24,3 +11,16 @@ %%SITE_PERL%%/MooseX/MethodAttributes/Role/Meta/Role.pm %%SITE_PERL%%/MooseX/MethodAttributes/Role/Meta/Role/Application.pm %%SITE_PERL%%/MooseX/MethodAttributes/Role/Meta/Role/Application/Summation.pm +%%PERL5_MAN3%%/MooseX::MethodAttributes.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Inheritable.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::AttrContainer.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::AttrContainer::Inheritable.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Class.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Map.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Method.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Method::MaybeWrapped.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Method::Wrapped.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Role.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Role::Application.3.gz +%%PERL5_MAN3%%/MooseX::MethodAttributes::Role::Meta::Role::Application::Summation.3.gz diff --git a/devel/p5-MooseX-Traits/Makefile b/devel/p5-MooseX-Traits/Makefile index 10e566270b4..c34f4fa6819 100644 --- a/devel/p5-MooseX-Traits/Makefile +++ b/devel/p5-MooseX-Traits/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Traits -PORTVERSION= 0.12 -PORTREVISION= 1 +PORTVERSION= 0.13 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -23,6 +22,7 @@ TEST_DEPENDS= p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-P p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \ p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires +NO_ARCH= yes USES= perl5 USE_PERL5= modbuildtiny diff --git a/devel/p5-MooseX-Traits/distinfo b/devel/p5-MooseX-Traits/distinfo index fa7f7a781f7..cc3c63222fc 100644 --- a/devel/p5-MooseX-Traits/distinfo +++ b/devel/p5-MooseX-Traits/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Traits-0.12.tar.gz) = f779379d52c520b2edd25a7901e0066e65a6a0dcc0f8b9e2ba02717d2f59dfc8 -SIZE (MooseX-Traits-0.12.tar.gz) = 25520 +SHA256 (MooseX-Traits-0.13.tar.gz) = 74afe0c4faf4e3b97c57f289437caa60becca34cd5821f489dd4cc9da4fbe29a +SIZE (MooseX-Traits-0.13.tar.gz) = 31688 diff --git a/devel/p5-MooseX-Traits/pkg-plist b/devel/p5-MooseX-Traits/pkg-plist index 7d8ec134d67..c345e1e9b4b 100644 --- a/devel/p5-MooseX-Traits/pkg-plist +++ b/devel/p5-MooseX-Traits/pkg-plist @@ -1,4 +1,4 @@ -%%PERL5_MAN3%%/MooseX::Traits.3.gz -%%PERL5_MAN3%%/MooseX::Traits::Util.3.gz %%SITE_PERL%%/MooseX/Traits.pm %%SITE_PERL%%/MooseX/Traits/Util.pm +%%PERL5_MAN3%%/MooseX::Traits.3.gz +%%PERL5_MAN3%%/MooseX::Traits::Util.3.gz diff --git a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile index ffff947e5c1..943ebf893c5 100644 --- a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile +++ b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Types-DateTime-MoreCoercions -PORTVERSION= 0.14 -PORTREVISION= 1 +PORTVERSION= 0.15 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,10 +19,11 @@ BUILD_DEPENDS= p5-DateTime>=0.43.02:${PORTSDIR}/devel/p5-DateTime \ p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \ p5-MooseX-Types-DateTime>=0.06:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \ p5-Time-Duration-Parse>=0.06:${PORTSDIR}/devel/p5-Time-Duration-Parse \ - p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean + p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal +NO_ARCH= yes USE_PERL5= modbuildtiny USES= perl5 diff --git a/devel/p5-MooseX-Types-DateTime-MoreCoercions/distinfo b/devel/p5-MooseX-Types-DateTime-MoreCoercions/distinfo index 41f741a3894..a380cd3f4a6 100644 --- a/devel/p5-MooseX-Types-DateTime-MoreCoercions/distinfo +++ b/devel/p5-MooseX-Types-DateTime-MoreCoercions/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Types-DateTime-MoreCoercions-0.14.tar.gz) = b69938735c84f30dcb0f0bb877a692085b9554aec81a047791eceeea8cb60821 -SIZE (MooseX-Types-DateTime-MoreCoercions-0.14.tar.gz) = 26534 +SHA256 (MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz) = 21bb3a597719888edb6ceaa132418d5cf92ecb92a50cce37b94259a55e0e3796 +SIZE (MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz) = 29824 diff --git a/devel/p5-MooseX-Types-DateTime/Makefile b/devel/p5-MooseX-Types-DateTime/Makefile index a40819f1b67..93f89b79501 100644 --- a/devel/p5-MooseX-Types-DateTime/Makefile +++ b/devel/p5-MooseX-Types-DateTime/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Types-DateTime -PORTVERSION= 0.10 -PORTREVISION= 1 +PORTVERSION= 0.11 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:ETHER @@ -20,7 +19,7 @@ BUILD_DEPENDS= p5-DateTime>=0.43.02:${PORTSDIR}/devel/p5-DateTime \ p5-DateTime-TimeZone>=0.95:${PORTSDIR}/devel/p5-DateTime-TimeZone \ p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \ p5-MooseX-Types>=0.30:${PORTSDIR}/devel/p5-MooseX-Types \ - p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean + p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal diff --git a/devel/p5-MooseX-Types-DateTime/distinfo b/devel/p5-MooseX-Types-DateTime/distinfo index 3b53bfa6dc6..c0252f98224 100644 --- a/devel/p5-MooseX-Types-DateTime/distinfo +++ b/devel/p5-MooseX-Types-DateTime/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Types-DateTime-0.10.tar.gz) = 806d952bae63d592decd4c77f5bf0cc204d20f3b328b28ec1057480c7a36e60e -SIZE (MooseX-Types-DateTime-0.10.tar.gz) = 23493 +SHA256 (MooseX-Types-DateTime-0.11.tar.gz) = e9e4e2c8cbc5c5a623ba47a4950506e8f83c1846c0e2933e30adb393b06a892b +SIZE (MooseX-Types-DateTime-0.11.tar.gz) = 30044 diff --git a/devel/p5-MooseX-Types-Path-Class/Makefile b/devel/p5-MooseX-Types-Path-Class/Makefile index 03ee15bcb2e..dbc27a0a768 100644 --- a/devel/p5-MooseX-Types-Path-Class/Makefile +++ b/devel/p5-MooseX-Types-Path-Class/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Types-Path-Class -PORTVERSION= 0.07 +PORTVERSION= 0.08 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-MooseX-Types-Path-Class/distinfo b/devel/p5-MooseX-Types-Path-Class/distinfo index 55b5c415964..e51490023b0 100644 --- a/devel/p5-MooseX-Types-Path-Class/distinfo +++ b/devel/p5-MooseX-Types-Path-Class/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Types-Path-Class-0.07.tar.gz) = 48ed549ee71bf0e67a31b2ce7f5248c5ea54fd2643d8a847503c4705ac595851 -SIZE (MooseX-Types-Path-Class-0.07.tar.gz) = 26645 +SHA256 (MooseX-Types-Path-Class-0.08.tar.gz) = 38c55c0723d2533b0b16b41eda78adbe71194f3b7588a3b3f7ec71b2768664b7 +SIZE (MooseX-Types-Path-Class-0.08.tar.gz) = 28203 diff --git a/devel/p5-MooseX-Types-Path-Class/pkg-plist b/devel/p5-MooseX-Types-Path-Class/pkg-plist index 28299f2845d..86596606ab8 100644 --- a/devel/p5-MooseX-Types-Path-Class/pkg-plist +++ b/devel/p5-MooseX-Types-Path-Class/pkg-plist @@ -1,2 +1,2 @@ -%%PERL5_MAN3%%/MooseX::Types::Path::Class.3.gz %%SITE_PERL%%/MooseX/Types/Path/Class.pm +%%PERL5_MAN3%%/MooseX::Types::Path::Class.3.gz diff --git a/devel/p5-MooseX-Types-Set-Object/Makefile b/devel/p5-MooseX-Types-Set-Object/Makefile index 88198cdab17..4fed07b6a03 100644 --- a/devel/p5-MooseX-Types-Set-Object/Makefile +++ b/devel/p5-MooseX-Types-Set-Object/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Types-Set-Object -PORTVERSION= 0.04 -PORTREVISION= 1 +PORTVERSION= 0.05 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,6 +19,7 @@ BUILD_DEPENDS= p5-Moose>=0.50:${PORTSDIR}/devel/p5-Moose \ RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal +NO_ARCH= yes USE_PERL5= modbuildtiny USES= perl5 diff --git a/devel/p5-MooseX-Types-Set-Object/distinfo b/devel/p5-MooseX-Types-Set-Object/distinfo index 4a48e1e75d8..d5e309ae1c8 100644 --- a/devel/p5-MooseX-Types-Set-Object/distinfo +++ b/devel/p5-MooseX-Types-Set-Object/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Types-Set-Object-0.04.tar.gz) = f1b20427c60333b15e4e97a9ff69aba8f1bd7f7ed2f73f63a7c4d34e514a6ac0 -SIZE (MooseX-Types-Set-Object-0.04.tar.gz) = 21567 +SHA256 (MooseX-Types-Set-Object-0.05.tar.gz) = 107522b6133255f7bb8b5f61d902dc26800196c2390111b1aff2cde12dffefb8 +SIZE (MooseX-Types-Set-Object-0.05.tar.gz) = 28136 diff --git a/devel/p5-MooseX-Types-Structured/Makefile b/devel/p5-MooseX-Types-Structured/Makefile index d744375795a..39af2527957 100644 --- a/devel/p5-MooseX-Types-Structured/Makefile +++ b/devel/p5-MooseX-Types-Structured/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Types-Structured -PORTVERSION= 0.33 +PORTVERSION= 0.34 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -17,13 +17,14 @@ BUILD_DEPENDS= p5-Devel-PartialDump>=0.13:${PORTSDIR}/devel/p5-Devel-PartialDump p5-Moose>=1.08:${PORTSDIR}/devel/p5-Moose \ p5-MooseX-Types>=0.22:${PORTSDIR}/devel/p5-MooseX-Types \ p5-Sub-Exporter>=0.982:${PORTSDIR}/devel/p5-Sub-Exporter \ - p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean + p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \ p5-MooseX-Types-DateTime>=0:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \ p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \ p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires +NO_ARCH= yes USES= perl5 USE_PERL5= modbuildtiny diff --git a/devel/p5-MooseX-Types-Structured/distinfo b/devel/p5-MooseX-Types-Structured/distinfo index 1edff9ebf82..031fb889f15 100644 --- a/devel/p5-MooseX-Types-Structured/distinfo +++ b/devel/p5-MooseX-Types-Structured/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Types-Structured-0.33.tar.gz) = 572b38db1049350aa1eb8d919a1a6f3951d9712c1a2fcfef301a556deed44795 -SIZE (MooseX-Types-Structured-0.33.tar.gz) = 58533 +SHA256 (MooseX-Types-Structured-0.34.tar.gz) = 8354edf5c5799eed7181d50c4ebfca21ed3b98ae89547438783a92e9c01dd38b +SIZE (MooseX-Types-Structured-0.34.tar.gz) = 59358 diff --git a/devel/p5-MooseX-Types-URI/Makefile b/devel/p5-MooseX-Types-URI/Makefile index bfe429a65a5..f22f4a9d332 100644 --- a/devel/p5-MooseX-Types-URI/Makefile +++ b/devel/p5-MooseX-Types-URI/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Types-URI -PORTVERSION= 0.07 -PORTREVISION= 1 +PORTVERSION= 0.08 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,14 +13,15 @@ COMMENT= URI related types and coercions for Moose LICENSE= ART10 GPLv1 LICENSE_COMB= dual -BUILD_DEPENDS= p5-Moose>=0.40:${PORTSDIR}/devel/p5-Moose \ - p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \ +BUILD_DEPENDS= p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \ + p5-MooseX-Types>=0.40:${PORTSDIR}/devel/p5-MooseX-Types \ p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \ p5-URI>=0:${PORTSDIR}/net/p5-URI \ p5-URI-FromHash>=0:${PORTSDIR}/net/p5-URI-FromHash \ p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean RUN_DEPENDS:= ${BUILD_DEPENDS} +NO_ARCH= yes USE_PERL5= modbuildtiny USES= perl5 diff --git a/devel/p5-MooseX-Types-URI/distinfo b/devel/p5-MooseX-Types-URI/distinfo index 4d17cabeb7d..dc06d5127cd 100644 --- a/devel/p5-MooseX-Types-URI/distinfo +++ b/devel/p5-MooseX-Types-URI/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Types-URI-0.07.tar.gz) = b07657e05170fa4c68dbf580227a2daadb7aae49bfb8969024348026884177c6 -SIZE (MooseX-Types-URI-0.07.tar.gz) = 25384 +SHA256 (MooseX-Types-URI-0.08.tar.gz) = d310d20fa361fe2dff758236df87949cc7bf98e5cf3a7c79115365eccde6ccc1 +SIZE (MooseX-Types-URI-0.08.tar.gz) = 29511 diff --git a/devel/p5-MooseX-Types/Makefile b/devel/p5-MooseX-Types/Makefile index 64cfd64f949..d94298a9613 100644 --- a/devel/p5-MooseX-Types/Makefile +++ b/devel/p5-MooseX-Types/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Types -PORTVERSION= 0.45 +PORTVERSION= 0.46 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:ETHER @@ -18,9 +18,10 @@ BUILD_DEPENDS= p5-Carp-Clan>=6.00:${PORTSDIR}/devel/p5-Carp-Clan \ p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \ p5-Moose>=1.06:${PORTSDIR}/devel/p5-Moose \ p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \ + p5-Sub-Exporter-ForMethods>=0.100052:${PORTSDIR}/devel/p5-Sub-Exporter-ForMethods \ p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \ p5-namespace-autoclean>=0.08:${PORTSDIR}/devel/p5-namespace-autoclean \ - p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean + p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \ p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires diff --git a/devel/p5-MooseX-Types/distinfo b/devel/p5-MooseX-Types/distinfo index a95996d397b..95ad31e86f1 100644 --- a/devel/p5-MooseX-Types/distinfo +++ b/devel/p5-MooseX-Types/distinfo @@ -1,2 +1,2 @@ -SHA256 (MooseX-Types-0.45.tar.gz) = d01ff4a3db78e1150101b4b63569e4bce3ced3b5b0024c52c87575e0820609c7 -SIZE (MooseX-Types-0.45.tar.gz) = 52335 +SHA256 (MooseX-Types-0.46.tar.gz) = e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a +SIZE (MooseX-Types-0.46.tar.gz) = 54112 diff --git a/devel/p5-PerlIO-Layers/Makefile b/devel/p5-PerlIO-Layers/Makefile index 1e37f4abe0e..58e0707921b 100644 --- a/devel/p5-PerlIO-Layers/Makefile +++ b/devel/p5-PerlIO-Layers/Makefile @@ -3,7 +3,7 @@ PORTNAME= PerlIO-Layers PORTVERSION= 0.011 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -17,4 +17,7 @@ LICENSE_COMB= dual USE_PERL5= modbuild USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PerlIO/Layers/Layers.so + .include diff --git a/devel/p5-PerlIO-Util/Makefile b/devel/p5-PerlIO-Util/Makefile index 69e2482b1ba..c6151b985d7 100644 --- a/devel/p5-PerlIO-Util/Makefile +++ b/devel/p5-PerlIO-Util/Makefile @@ -3,7 +3,7 @@ PORTNAME= PerlIO-Util PORTVERSION= 0.72 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,4 +14,7 @@ COMMENT= Selection of general PerlIO utilities USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PerlIO/Util/Util.so + .include diff --git a/devel/p5-PerlIO-utf8_strict/Makefile b/devel/p5-PerlIO-utf8_strict/Makefile index 7be906b3c10..930dc602c80 100644 --- a/devel/p5-PerlIO-utf8_strict/Makefile +++ b/devel/p5-PerlIO-utf8_strict/Makefile @@ -3,6 +3,7 @@ PORTNAME= PerlIO-utf8_strict PORTVERSION= 0.006 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -18,4 +19,7 @@ TEST_DEPENDS= p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PerlIO/utf8_strict/utf8_strict.so + .include diff --git a/devel/p5-Pod-Coverage-Moose/Makefile b/devel/p5-Pod-Coverage-Moose/Makefile index 1f4c991743b..170a38761fc 100644 --- a/devel/p5-Pod-Coverage-Moose/Makefile +++ b/devel/p5-Pod-Coverage-Moose/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Pod-Coverage-Moose -PORTVERSION= 0.05 -PORTREVISION= 1 +PORTVERSION= 0.06 CATEGORIES= devel textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,14 +13,15 @@ COMMENT= Pod::Coverage extension for Moose LICENSE= ART10 GPLv1 LICENSE_COMB= dual -BUILD_DEPENDS= p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \ +BUILD_DEPENDS= p5-Moose>=2.1300:${PORTSDIR}/devel/p5-Moose \ p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \ - p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean + p5-namespace-autoclean>=0.08:${PORTSDIR}/devel/p5-namespace-autoclean RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \ p5-MooseX-Role-WithOverloading>=0:${PORTSDIR}/devel/p5-MooseX-Role-WithOverloading \ p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires +NO_ARCH= yes USES= perl5 USE_PERL5= modbuildtiny diff --git a/devel/p5-Pod-Coverage-Moose/distinfo b/devel/p5-Pod-Coverage-Moose/distinfo index 1869d6171e7..ad26cd5c156 100644 --- a/devel/p5-Pod-Coverage-Moose/distinfo +++ b/devel/p5-Pod-Coverage-Moose/distinfo @@ -1,2 +1,2 @@ -SHA256 (Pod-Coverage-Moose-0.05.tar.gz) = 86db8471d362481803bd439f0c0a2fe63c013c200745264e0b1b1acf8ba1d68b -SIZE (Pod-Coverage-Moose-0.05.tar.gz) = 23263 +SHA256 (Pod-Coverage-Moose-0.06.tar.gz) = 80492cd529ad2236e46b1074a33fd1c890d1c3dd7578c5afdff578b448931a10 +SIZE (Pod-Coverage-Moose-0.06.tar.gz) = 30152 diff --git a/devel/p5-Pod-Coverage-Moose/pkg-plist b/devel/p5-Pod-Coverage-Moose/pkg-plist index d51d25c7826..ca9f700fb86 100644 --- a/devel/p5-Pod-Coverage-Moose/pkg-plist +++ b/devel/p5-Pod-Coverage-Moose/pkg-plist @@ -1,2 +1,2 @@ -%%PERL5_MAN3%%/Pod::Coverage::Moose.3.gz %%SITE_PERL%%/Pod/Coverage/Moose.pm +%%PERL5_MAN3%%/Pod::Coverage::Moose.3.gz diff --git a/devel/p5-Readonly-XS/Makefile b/devel/p5-Readonly-XS/Makefile index 8d87c71159b..9611e9b3dfa 100644 --- a/devel/p5-Readonly-XS/Makefile +++ b/devel/p5-Readonly-XS/Makefile @@ -3,7 +3,7 @@ PORTNAME= Readonly-XS PORTVERSION= 1.05 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,4 +20,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Readonly/XS/XS.so + .include diff --git a/devel/p5-Sentinel/Makefile b/devel/p5-Sentinel/Makefile index c156725141c..e9f32a1c597 100644 --- a/devel/p5-Sentinel/Makefile +++ b/devel/p5-Sentinel/Makefile @@ -3,7 +3,7 @@ PORTNAME= Sentinel PORTVERSION= 0.05 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:PEVANS @@ -21,4 +21,7 @@ TEST_DEPENDS= p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \ USE_PERL5= modbuild USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Sentinel/Sentinel.so + .include diff --git a/devel/p5-Taint-Util/Makefile b/devel/p5-Taint-Util/Makefile index bcb5063fb77..596a5b373a9 100644 --- a/devel/p5-Taint-Util/Makefile +++ b/devel/p5-Taint-Util/Makefile @@ -3,7 +3,7 @@ PORTNAME= Taint-Util PORTVERSION= 0.08 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,4 +14,7 @@ COMMENT= Test for and flip the taint flag without regex matches or eval USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Taint/Util/Util.so + .include diff --git a/devel/p5-Test-LeakTrace/Makefile b/devel/p5-Test-LeakTrace/Makefile index babeb59f40d..70afb62f1b0 100644 --- a/devel/p5-Test-LeakTrace/Makefile +++ b/devel/p5-Test-LeakTrace/Makefile @@ -3,7 +3,7 @@ PORTNAME= Test-LeakTrace PORTVERSION= 0.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,4 +14,7 @@ COMMENT= Traces memory leaks USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Test/LeakTrace/LeakTrace.so + .include diff --git a/devel/p5-Thrift-XS/Makefile b/devel/p5-Thrift-XS/Makefile index 80e1aa3764e..7dae18e7fb8 100644 --- a/devel/p5-Thrift-XS/Makefile +++ b/devel/p5-Thrift-XS/Makefile @@ -3,7 +3,7 @@ PORTNAME= Thrift-XS PORTVERSION= 1.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:AGRUNDMA @@ -25,4 +25,7 @@ TEST_DEPENDS= p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \ USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Thrift/XS/XS.so + .include diff --git a/devel/p5-XS-Object-Magic/Makefile b/devel/p5-XS-Object-Magic/Makefile index cae1d14b89a..f452a7b98ea 100644 --- a/devel/p5-XS-Object-Magic/Makefile +++ b/devel/p5-XS-Object-Magic/Makefile @@ -3,7 +3,7 @@ PORTNAME= XS-Object-Magic PORTVERSION= 0.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:FLORA @@ -24,4 +24,7 @@ USES= perl5 TEST_DEPENDS+= p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple .endif +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/XS/Object/Magic/Magic.so + .include diff --git a/devel/p5-true/Makefile b/devel/p5-true/Makefile index 57448b16052..f256de536b7 100644 --- a/devel/p5-true/Makefile +++ b/devel/p5-true/Makefile @@ -3,7 +3,7 @@ PORTNAME= true PORTVERSION= 0.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CHOCOLATE @@ -23,4 +23,7 @@ RUN_DEPENDS= p5-B-Hooks-OP-Annotation>=0.43:${PORTSDIR}/devel/p5-B-Hooks-OP-Anno USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/true/true.so + .include diff --git a/devel/php-memoize/Makefile b/devel/php-memoize/Makefile index e035775d00f..a34e7431a48 100644 --- a/devel/php-memoize/Makefile +++ b/devel/php-memoize/Makefile @@ -1,19 +1,17 @@ # Created by: Gasol Wu # $FreeBSD$ -PORTNAME= memoize +PORTNAME= php-memoize PORTVERSION= 0.2.0b1 DISTVERSIONPREFIX= v PORTREVISION= 2 CATEGORIES= devel -PKGNAMEPREFIX= php- MAINTAINER= gasol.wu@gmail.com COMMENT= PHP extension which transparently caches PHP functions USE_GITHUB= yes GH_ACCOUNT= arraypad -GH_PROJECT= ${UNIQUENAME} USE_PHP= yes USE_PHPEXT= yes diff --git a/devel/py-funcparserlib/Makefile b/devel/py-funcparserlib/Makefile index 0caa5c50f30..f947752a814 100644 --- a/devel/py-funcparserlib/Makefile +++ b/devel/py-funcparserlib/Makefile @@ -17,7 +17,7 @@ USES= python USE_PYTHON= distutils autoplist PORTDOCS= README doc -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile index cf3f0c3f847..c583120ec19 100644 --- a/devel/py-gdata/Makefile +++ b/devel/py-gdata/Makefile @@ -23,8 +23,6 @@ GMPY_DESC= Multiprecision arithmetic M2CRYPTO_DESC= Cryptography and SSL toolkit PYCRYPTO_DESC= Cryptography toolkit -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options - EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .include diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile index a36e430feb1..83a816c9c97 100644 --- a/devel/py-ice/Makefile +++ b/devel/py-ice/Makefile @@ -29,8 +29,6 @@ MAKE_ENV+= PYTHON_VERSION=${PYTHON_VERSION} LIB_VRS= ${PORTVERSION:S|.||g:C|[0-9]$||} PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}" -# bypass infrastructure bug (taken from www/py-django) -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DEBUG TESTS OPTIONS_DEFAULT=TESTS TESTS_DESC= Run tests diff --git a/devel/py-itools/Makefile b/devel/py-itools/Makefile index 926e18d49ea..05e67695543 100644 --- a/devel/py-itools/Makefile +++ b/devel/py-itools/Makefile @@ -3,7 +3,7 @@ PORTNAME= itools PORTVERSION= 0.75.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,10 +17,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/include/poppler/goo/gtypes.h:${PORTSDIR}/graphics/poppler \ ${LOCALBASE}/include/git2.h:${PORTSDIR}/devel/libgit2 \ ${PYTHON_PKGNAMEPREFIX}reportlab2>=2.3:${PORTSDIR}/print/py-reportlab2 \ + ${PYTHON_PKGNAMEPREFIX}pygit2>0:${PORTSDIR}/devel/py-pygit2 \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \ + ${PYTHON_PKGNAMEPREFIX}xlrd>0:${PORTSDIR}/textproc/py-xlrd \ + ${PYTHON_PKGNAMEPREFIX}magic>0:${PORTSDIR}/devel/py-magic \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx \ ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \ ${PYTHON_PKGNAMEPREFIX}gobject>=2.16.1:${PORTSDIR}/devel/py-gobject \ - python:${PORTSDIR}/lang/python + ${LOCALBASE}/bin/git:${PORTSDIR}/devel/git \ + xapian-bindings>1.0.8:${PORTSDIR}/databases/xapian-bindings RUN_DEPENDS:= ${BUILD_DEPENDS} LIB_DEPENDS= libglib-2.0.so:${PORTSDIR}/devel/glib20 \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ @@ -32,10 +38,11 @@ LDFLAGS+= -L${LOCALBASE}/lib USES= gettext-tools:run pkgconfig python:2.7+ USE_PYTHON= autoplist distutils -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS EXAMPLES -PORTDOCS= INSTALL.txt LICENSE.txt MANIFEST README.rst RELEASE-0.75.0 \ +PORTDOCS= INSTALL.txt MANIFEST README.rst RELEASE-0.75.0 \ RELEASE-0.75.1 RELEASE-0.75.2 UPGRADE-0.75.0 +PORTEXAMPLES= * .include @@ -49,6 +56,11 @@ post-install: cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/docs/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} +.endif + regression-test: build cd ${WRKSRC}/test && ${PYTHON_CMD} test.py diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile index 3b617a64c76..cd761a48046 100644 --- a/devel/py-jsonrpclib/Makefile +++ b/devel/py-jsonrpclib/Makefile @@ -16,7 +16,6 @@ LICENSE= APACHE20 USES= python:2 USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= CJSON CJSON_DESC= Use cjson instead of json or simplejson diff --git a/devel/py-memoryprofiler/Makefile b/devel/py-memoryprofiler/Makefile index 24cc034b72c..078dfb5cc06 100644 --- a/devel/py-memoryprofiler/Makefile +++ b/devel/py-memoryprofiler/Makefile @@ -17,8 +17,6 @@ OPTIONS_DEFINE= PSUTIL PSUTIL_DESC= Use psutil for better performance PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:${PORTSDIR}/sysutils/py-psutil -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options - USES= python USE_PYTHON= distutils autoplist diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index 664d83c8e0c..94c655d39e6 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -28,7 +28,6 @@ QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \ diff --git a/devel/py-qt4/bsd.pyqt.mk b/devel/py-qt4/bsd.pyqt.mk index 259ac4381a2..bc3e7ddcfd4 100644 --- a/devel/py-qt4/bsd.pyqt.mk +++ b/devel/py-qt4/bsd.pyqt.mk @@ -98,7 +98,6 @@ USES+= python QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. PATCHDIR= ${.CURDIR}/../../devel/py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ARGS+=-b ${PREFIX}/bin \ diff --git a/devel/py-rauth/Makefile b/devel/py-rauth/Makefile index c8361c71b98..ee28723db2d 100644 --- a/devel/py-rauth/Makefile +++ b/devel/py-rauth/Makefile @@ -20,7 +20,6 @@ TEST_DEPENDS:= ${RUN_DEPENDS} \ OPTIONS_DEFINE= TESTS TESTS_DESC= Install tools for unit testing -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options USE_GITHUB= yes GH_ACCOUNT= litl diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile index 277bf511752..327df88fcdb 100644 --- a/devel/py-tables/Makefile +++ b/devel/py-tables/Makefile @@ -30,7 +30,6 @@ PLIST_FILES= bin/pt2to3 bin/ptdump bin/ptrepack bin/pttree OPTIONS_DEFINE= PYREX DOCS EXAMPLES PYREX_DESC= Use code generated by Pyrex to build PYREX_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options .include diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile index 87596e221b8..c3566b470df 100644 --- a/devel/py-twisted/Makefile +++ b/devel/py-twisted/Makefile @@ -15,8 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:${PORTSDIR}/deve USES= metaport python:2 -# Bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS OPTIONS_DEFAULT=CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS CONCH_DESC= SSH and SFTP protocol diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile index 2bcda12b66d..1caaad0e8ca 100644 --- a/devel/py-urwid/Makefile +++ b/devel/py-urwid/Makefile @@ -12,8 +12,6 @@ COMMENT= Curses-based user interface library for Python LICENSE= LGPL21 -# Bypass ports infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= EXAMPLES USES= python diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile index 1850cedd2f6..40aeb476eed 100644 --- a/devel/py-watchdog/Makefile +++ b/devel/py-watchdog/Makefile @@ -22,7 +22,6 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} GH_ACCOUNT= gorakhargosh -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS PORTDOCS= * diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile index ab2452d226e..5eed7f8e6e3 100644 --- a/devel/py-wheel/Makefile +++ b/devel/py-wheel/Makefile @@ -14,7 +14,6 @@ COMMENT= Built-package format for Python LICENSE= MIT OPTIONS_DEFINE= PIP SIGNATURE -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options PIP_DESC= Use pip to install wheels PIP_RUN_DEPENDS= pip:${PORTSDIR}/devel/py-pip diff --git a/devel/qca-qt5/Makefile b/devel/qca-qt5/Makefile index 4c3ae8f47ed..8bfbec62fe1 100644 --- a/devel/qca-qt5/Makefile +++ b/devel/qca-qt5/Makefile @@ -19,7 +19,7 @@ CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT5_BUILD=yes \ -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \ -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man \ -DQCA_SUFFIX=qt5 -CMAKE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt +CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt USE_LDCONFIG= yes USE_QT5= buildtools_build core network qmake_build diff --git a/devel/qca/Makefile b/devel/qca/Makefile index 0b831460223..7ecbf294d35 100644 --- a/devel/qca/Makefile +++ b/devel/qca/Makefile @@ -18,7 +18,7 @@ CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT4_BUILD=yes \ -DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \ -DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \ -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man -CMAKE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt +CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt USE_LDCONFIG= yes USE_QT4= corelib moc_build qmake_build rcc_build diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile index df1a0006782..2983574d4f2 100644 --- a/devel/ruby-build/Makefile +++ b/devel/ruby-build/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ruby-build -PORTVERSION= 20150803 +PORTVERSION= 20150818 DISTVERSIONPREFIX= v CATEGORIES= devel ruby diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo index ad0bc3db404..37d340cdf54 100644 --- a/devel/ruby-build/distinfo +++ b/devel/ruby-build/distinfo @@ -1,2 +1,2 @@ -SHA256 (sstephenson-ruby-build-v20150803_GH0.tar.gz) = 1759ee60c369c559403d1381b83452ca81cf62427de55bc32bce7b0a8e9b6990 -SIZE (sstephenson-ruby-build-v20150803_GH0.tar.gz) = 40370 +SHA256 (sstephenson-ruby-build-v20150818_GH0.tar.gz) = 692df6287b172d12adbc13b58074075f8c6df7807a4b30e33baf74e3c528f9ae +SIZE (sstephenson-ruby-build-v20150818_GH0.tar.gz) = 40585 diff --git a/devel/ruby-langscan/Makefile b/devel/ruby-langscan/Makefile index 085fb203633..425dc9c8f4e 100644 --- a/devel/ruby-langscan/Makefile +++ b/devel/ruby-langscan/Makefile @@ -30,7 +30,6 @@ PORTDOCS= ChangeLog NEWS README DOCSDIR= ${RUBY_MODDOCDIR} OPTIONS_DEFINE= DOCS -OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options CFLAGS+= -fPIC diff --git a/devel/rubygem-app_config/Makefile b/devel/rubygem-app_config/Makefile index 24e174639a0..454a62fb50d 100644 --- a/devel/rubygem-app_config/Makefile +++ b/devel/rubygem-app_config/Makefile @@ -15,7 +15,6 @@ OPTIONS_DEFAULT= SQLITE3 MONGO_DESC= mongo backend support SQLITE3_DESC= sqlite3 backend support -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options .include diff --git a/devel/rubygem-byebug/Makefile b/devel/rubygem-byebug/Makefile index ed868f3d203..ca60453bd5c 100644 --- a/devel/rubygem-byebug/Makefile +++ b/devel/rubygem-byebug/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= byebug -PORTVERSION= 5.0.0 +PORTVERSION= 6.0.0 CATEGORIES= devel ruby MASTER_SITES= RG @@ -11,8 +11,6 @@ COMMENT= Ruby 2 debugger LICENSE= BSD2CLAUSE -RUN_DEPENDS= rubygem-columnize>=0.9.0:${PORTSDIR}/devel/rubygem-columnize - USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes diff --git a/devel/rubygem-byebug/distinfo b/devel/rubygem-byebug/distinfo index 763f3629440..8e85bf8656a 100644 --- a/devel/rubygem-byebug/distinfo +++ b/devel/rubygem-byebug/distinfo @@ -1,2 +1,2 @@ -SHA256 (rubygem/byebug-5.0.0.gem) = 1e8966fc8e68eb321358ecc9b3b4799c3ee4e00844df3d5962d81c38407f987c -SIZE (rubygem/byebug-5.0.0.gem) = 77312 +SHA256 (rubygem/byebug-6.0.0.gem) = 2ed194553bd276c6b68ca0646e5813be94ef0ac89c9e84ff7ece88fed7f39202 +SIZE (rubygem/byebug-6.0.0.gem) = 76288 diff --git a/devel/rubygem-caesars/Makefile b/devel/rubygem-caesars/Makefile index 42085c046b6..e9d938e2ee0 100644 --- a/devel/rubygem-caesars/Makefile +++ b/devel/rubygem-caesars/Makefile @@ -3,6 +3,7 @@ PORTNAME= caesars PORTVERSION= 0.7.4 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -14,5 +15,7 @@ NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= bin/example .include diff --git a/devel/rubygem-mercenary/Makefile b/devel/rubygem-mercenary/Makefile index f86d3d6da38..25e23d35d99 100644 --- a/devel/rubygem-mercenary/Makefile +++ b/devel/rubygem-mercenary/Makefile @@ -3,6 +3,7 @@ PORTNAME= mercenary PORTVERSION= 0.3.5 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -15,5 +16,7 @@ NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= script/console script/examples .include diff --git a/devel/rubygem-msgpack/Makefile b/devel/rubygem-msgpack/Makefile index 4eb739cc87b..65653ab2b1f 100644 --- a/devel/rubygem-msgpack/Makefile +++ b/devel/rubygem-msgpack/Makefile @@ -1,15 +1,21 @@ # $FreeBSD$ PORTNAME= msgpack -PORTVERSION= 0.5.5 +PORTVERSION= 0.5.12 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= kuriyama@FreeBSD.org COMMENT= Gems for MessagePack +LICENSE= APACHE20 + USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +STRIPDIR= ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} + +post-install: + ${FIND} ${STRIPDIR} -type f \( -name '*.o' -o -name '*.so' \) | ${XARGS} ${STRIP_CMD} .include diff --git a/devel/rubygem-msgpack/distinfo b/devel/rubygem-msgpack/distinfo index 7743a02db61..be2b554e95e 100644 --- a/devel/rubygem-msgpack/distinfo +++ b/devel/rubygem-msgpack/distinfo @@ -1,2 +1,2 @@ -SHA256 (rubygem/msgpack-0.5.5.gem) = 937f07f9e3d9ec6393c4cfd6128196c43374d8e2940c51d13d71c626b1dd1eec -SIZE (rubygem/msgpack-0.5.5.gem) = 36864 +SHA256 (rubygem/msgpack-0.5.12.gem) = 423dc261bd9db477965d867b425a399bf9afab4a49e671d4f0eafb3fbdecaa26 +SIZE (rubygem/msgpack-0.5.12.gem) = 57344 diff --git a/devel/rubygem-multi_test/Makefile b/devel/rubygem-multi_test/Makefile index ce25887ab4f..06865c427e2 100644 --- a/devel/rubygem-multi_test/Makefile +++ b/devel/rubygem-multi_test/Makefile @@ -2,6 +2,7 @@ PORTNAME= multi_test PORTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -15,5 +16,7 @@ NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= test/all test/run .include diff --git a/devel/rubygem-rubyinline/Makefile b/devel/rubygem-rubyinline/Makefile index 10f45fcdcd4..08db5f3da6b 100644 --- a/devel/rubygem-rubyinline/Makefile +++ b/devel/rubygem-rubyinline/Makefile @@ -3,6 +3,7 @@ PORTNAME= rubyinline PORTVERSION= 3.12.4 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG DISTNAME= RubyInline-${PORTVERSION} @@ -21,5 +22,8 @@ NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= tutorial/example1.rb \ + tutorial/example2.rb .include diff --git a/devel/rubygem-shoulda-matchers/Makefile b/devel/rubygem-shoulda-matchers/Makefile index 1f80aed8ebd..261d4cb4e16 100644 --- a/devel/rubygem-shoulda-matchers/Makefile +++ b/devel/rubygem-shoulda-matchers/Makefile @@ -3,6 +3,7 @@ PORTNAME= shoulda-matchers PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -18,5 +19,9 @@ NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= script/install_gems_in_all_appraisals \ + script/run_all_tests \ + script/update_gem_in_all_appraisals .include diff --git a/devel/skalibs/Makefile b/devel/skalibs/Makefile index c7c804898db..f6494df3fc2 100644 --- a/devel/skalibs/Makefile +++ b/devel/skalibs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= skalibs -PORTVERSION= 2.3.6.0 +PORTVERSION= 2.3.6.1 CATEGORIES= devel MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/ @@ -18,7 +18,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-default-path=${PREFIX}/bin:/usr/bin:/bin DOCS= AUTHORS COPYING INSTALL README doc/*.html -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libskarnet.so.${PORTVERSION} diff --git a/devel/skalibs/distinfo b/devel/skalibs/distinfo index 3dfc5fddced..2db4bdda38f 100644 --- a/devel/skalibs/distinfo +++ b/devel/skalibs/distinfo @@ -1,2 +1,2 @@ -SHA256 (skalibs-2.3.6.0.tar.gz) = ce38a9a6d206789b9e782d2846946429d1765974fdd77270c5bdefe24ca613a1 -SIZE (skalibs-2.3.6.0.tar.gz) = 209496 +SHA256 (skalibs-2.3.6.1.tar.gz) = bf35cb9698b15becb5c527a48e9cca0523c6e215540c19add8f8588852c2cd63 +SIZE (skalibs-2.3.6.1.tar.gz) = 209677 diff --git a/devel/skalibs/pkg-plist b/devel/skalibs/pkg-plist index d3062132636..875079981b4 100644 --- a/devel/skalibs/pkg-plist +++ b/devel/skalibs/pkg-plist @@ -87,7 +87,7 @@ lib/libskarnet.so lib/libskarnet.so.2 lib/libskarnet.so.2.3 lib/libskarnet.so.2.3.6 -lib/libskarnet.so.2.3.6.0 +lib/libskarnet.so.2.3.6.1 lib/skalibs/libskarnet.a lib/skalibs/sysdeps/rt.lib lib/skalibs/sysdeps/socket.lib diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile index 6702d84baa1..6b3676c28dd 100644 --- a/devel/subcommander2/Makefile +++ b/devel/subcommander2/Makefile @@ -16,7 +16,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libsvn_client-1.so:${PORTSDIR}/devel/subversion -LATEST_LINK= subcommander2 CONFLICTS= subcommander-1.* WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E} diff --git a/devel/subversion-static/Makefile b/devel/subversion-static/Makefile index 9250f442f30..891b799cbea 100644 --- a/devel/subversion-static/Makefile +++ b/devel/subversion-static/Makefile @@ -3,7 +3,6 @@ PKGNAMESUFFIX= -static CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} OPTIONS_EXCLUDE= ${OPTIONS_DEFINE} OPTIONS_SLAVE= FREEBSD_TEMPLATE P4_STYLE_MARKERS SERF STATIC diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 4fc34b3861a..648b980e435 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -28,7 +28,6 @@ CONFIGURE_ARGS+= --without-swig \ .if defined(SVN_BUILD_ADDONS) CONFLICTS_BUILD+= ${PORTNAME}-1.[^8].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion -OPTIONSFILE= ${PORT_DBDIR}/subversion/options OPTIONS_NAME= devel_subversion .endif diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common index 829b582ed30..7de904f74ce 100644 --- a/devel/subversion17/Makefile.common +++ b/devel/subversion17/Makefile.common @@ -31,7 +31,6 @@ CONFIGURE_ARGS+= --without-swig \ .if defined(SVN_BUILD_BINDINGS) CONFLICTS_BUILD+= ${PORTNAME}-1.[^7].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion17 -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_NAME= devel_subversion17 .endif diff --git a/devel/tr-eric6/Makefile b/devel/tr-eric6/Makefile new file mode 100644 index 00000000000..0533109ad22 --- /dev/null +++ b/devel/tr-eric6/Makefile @@ -0,0 +1,7 @@ +# Created by: Boris Samorodov +# $FreeBSD$ + +CATEGORIES= devel python +I18N_LANG= tr + +.include "${.CURDIR}/../../devel/eric6/Makefile.inc" diff --git a/devel/tr-eric6/distinfo b/devel/tr-eric6/distinfo new file mode 100644 index 00000000000..c99e00b117a --- /dev/null +++ b/devel/tr-eric6/distinfo @@ -0,0 +1,2 @@ +SHA256 (eric6-i18n-tr-6.0.8.tar.gz) = 5597ff617e956822f42ec018965d8ece48a7b117d8b29801a21d62eace2732b8 +SIZE (eric6-i18n-tr-6.0.8.tar.gz) = 482425 diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile index d2edf953339..5acac16218b 100644 --- a/dns/samba-nsupdate/Makefile +++ b/dns/samba-nsupdate/Makefile @@ -41,8 +41,8 @@ OPTIONS_DEFINE= IPV6 SIGCHASE_CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1" IPV6_CONFIGURE_ON= --enable-ipv6 -PLIST_FILES= bin/${UNIQUENAME} \ - man/man1/${UNIQUENAME}.1.gz +PLIST_FILES= bin/${PKGBASE} \ + man/man1/${PKGBASE}.1.gz .include @@ -76,11 +76,11 @@ post-patch: -e 's|^.*check confgen ||' \ ${WRKSRC}/bin/Makefile.in @${REINPLACE_CMD} \ - -e 's|${PORTNAME}|${UNIQUENAME}|g' \ + -e 's|${PORTNAME}|${PKGBASE}|g' \ ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 do-install: - ${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${UNIQUENAME}.1 - ${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${UNIQUENAME} + ${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1 + ${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE} .include diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile index 14064d2f344..48f29e02cc2 100644 --- a/dns/unbound/Makefile +++ b/dns/unbound/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= unbound -PORTVERSION= 1.5.3 -PORTREVISION= 2 +PORTVERSION= 1.5.4 CATEGORIES= dns MASTER_SITES= http://unbound.net/downloads/ @@ -30,14 +29,14 @@ PORTDOCS= CREDITS Changelog FEATURES LICENSE README README.svn \ ietf67-design-02.pdf requirements.txt PLIST_SUB+= PYTHON=${PYTHON} MUNIN=${MUNIN} -OPTIONS_DEFINE= THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT FILTER_AAAA +OPTIONS_DEFINE= THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT OPTIONS_DEFAULT=THREADS ECDSA LIBEVENT_DESC= Build against libevent GOST_DESC= Enable GOST support (requires OpenSSL >= 1.0) ECDSA_DESC= Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0) MUNIN_DESC= Install Munin plugin -FILTER_AAAA_DESC= Build with AAAA filter functionality (contrib) +#FILTER_AAAA_DESC= Build with AAAA filter functionality (contrib) .include diff --git a/dns/unbound/distinfo b/dns/unbound/distinfo index c8c47dfe809..970f9b2a429 100644 --- a/dns/unbound/distinfo +++ b/dns/unbound/distinfo @@ -1,2 +1,2 @@ -SHA256 (unbound-1.5.3.tar.gz) = 76bdc875ed4d1d3f8e4cfe960e6df78ee5c6c7c18abac11331cf93a7ae129eca -SIZE (unbound-1.5.3.tar.gz) = 4821300 +SHA256 (unbound-1.5.4.tar.gz) = a1e1c1a578cf8447cb51f6033714035736a0f04444854a983123c094cc6fb137 +SIZE (unbound-1.5.4.tar.gz) = 4844273 diff --git a/dns/unbound/pkg-plist b/dns/unbound/pkg-plist index a208f982486..83c9222cc32 100644 --- a/dns/unbound/pkg-plist +++ b/dns/unbound/pkg-plist @@ -1,6 +1,6 @@ etc/unbound/unbound.conf.sample include/unbound.h -lib/libunbound.so.2.3.6 +lib/libunbound.so.2.3.7 lib/libunbound.so.2 lib/libunbound.so lib/libunbound.a diff --git a/dns/yadifa/Makefile b/dns/yadifa/Makefile index 1163be25dee..2a2b8fda43d 100644 --- a/dns/yadifa/Makefile +++ b/dns/yadifa/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= yadifa -PORTVERSION= 2.1.0 -DISTVERSIONSUFFIX= -5055 +PORTVERSION= 2.1.2 +DISTVERSIONSUFFIX= -5426 CATEGORIES= dns ipv6 MASTER_SITES= http://cdn.yadifa.eu/sites/default/files/releases/ LOCAL/mat/yadifa diff --git a/dns/yadifa/distinfo b/dns/yadifa/distinfo index 54df174d521..0b5f014a2a4 100644 --- a/dns/yadifa/distinfo +++ b/dns/yadifa/distinfo @@ -1,2 +1,2 @@ -SHA256 (yadifa-2.1.0-5055.tar.gz) = b63d34f8051b4d8d0371b414707f4856f5f866460e096c5785d7d8b25a05a1b3 -SIZE (yadifa-2.1.0-5055.tar.gz) = 3458049 +SHA256 (yadifa-2.1.2-5426.tar.gz) = 8837affda15379282e2fd32b4b0dfc0997dd1ee68af095879a93f222562a7e0c +SIZE (yadifa-2.1.2-5426.tar.gz) = 3454802 diff --git a/dns/yadifa/pkg-plist b/dns/yadifa/pkg-plist index 1d1c3d82c81..545b60fa17b 100644 --- a/dns/yadifa/pkg-plist +++ b/dns/yadifa/pkg-plist @@ -43,7 +43,6 @@ include/dnscore/empty-input-stream.h include/dnscore/fdtools.h include/dnscore/file_input_stream.h include/dnscore/file_output_stream.h -include/dnscore/filter_input_stream.h include/dnscore/fingerprint.h include/dnscore/format.h include/dnscore/host_address.h @@ -66,7 +65,7 @@ include/dnscore/message_verify_rrsig.h include/dnscore/mt_output_stream.h include/dnscore/mutex.h include/dnscore/network.h -%%NSID%%include/dnscore/nsid.h +include/dnscore/nsid.h include/dnscore/output_stream.h include/dnscore/pace.h include/dnscore/packet_reader.h @@ -186,7 +185,6 @@ include/dnslg/config-resolver.h include/dnslg/dns.h include/dnslg/dnslg-config-features.h include/dnslg/resolv-conf.h -include/dnslg/resolv.h include/dnszone/dnszone-config-features.h include/dnszone/dnszone-config.h include/dnszone/dnszone.h diff --git a/editors/2bsd-vi/Makefile b/editors/2bsd-vi/Makefile index 73aa44fa5ca..fbd6f6e7c7f 100644 --- a/editors/2bsd-vi/Makefile +++ b/editors/2bsd-vi/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= tar:bzip2 -PRESERVEDIR= /var/preserve/${UNIQUENAME} +PRESERVEDIR= /var/preserve/${PKGBASE} PLIST_SUB= PRESERVEDIR="${PRESERVEDIR}" post-extract: .SILENT diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile index 6e417144331..7b15c768cf9 100644 --- a/editors/emacs-nox11/Makefile +++ b/editors/emacs-nox11/Makefile @@ -10,6 +10,5 @@ OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \ EMACS_NO_X11_SLAVE= yes MASTERDIR= ${.CURDIR}/../emacs -LATEST_LINK= emacs-nox11 .include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus-lcl-gtk2/Makefile b/editors/lazarus-lcl-gtk2/Makefile index c3649c37c6a..1605bf65a7b 100644 --- a/editors/lazarus-lcl-gtk2/Makefile +++ b/editors/lazarus-lcl-gtk2/Makefile @@ -1,15 +1,15 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -lcl-gtk2 COMMENT= Lazarus components library - GTK2 backend BUILD_DEPENDS= ${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units -USE_FPC= cairo gtk2 x11 -USE_FPC_RUN= yes +USE_FPC= cairo fcl-base fcl-db fcl-image fcl-process fcl-res fcl-registry \ + fcl-xml gtk2 pasjpeg x11 LCL_INTERFACE= gtk2 diff --git a/editors/lazarus-lcl-qt/Makefile b/editors/lazarus-lcl-qt/Makefile index 9ddcd491d94..b0bf338c9d6 100644 --- a/editors/lazarus-lcl-qt/Makefile +++ b/editors/lazarus-lcl-qt/Makefile @@ -1,7 +1,7 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -lcl-qt COMMENT= Lazarus components library - QT backend @@ -9,7 +9,6 @@ COMMENT= Lazarus components library - QT backend BUILD_DEPENDS= ${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units USE_FPC= x11 -USE_FPC_RUN= yes LCL_INTERFACE= qt diff --git a/editors/lazarus-lcl-units/Makefile b/editors/lazarus-lcl-units/Makefile index 73af43b9f2d..476df2069c8 100644 --- a/editors/lazarus-lcl-units/Makefile +++ b/editors/lazarus-lcl-units/Makefile @@ -1,13 +1,13 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -lcl-units COMMENT= Lazarus components library units -USE_FPC= fcl-base fcl-db fcl-image fcl-process fcl-registry fcl-xml iconvenc fcl-res -USE_FPC_RUN= yes +USE_FPC= fcl-base fcl-db fcl-image fcl-json fcl-process fcl-registry \ + fcl-res fcl-xml iconvenc pasjpeg LCL_INTERFACE= # diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index a95e9c1268c..84f4c8ebfdd 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -4,7 +4,7 @@ PORTNAME= lazarus PORTVERSION= 1.4.2 DISTVERSIONSUFFIX= -0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION:S/.0//} \ LOCAL/acm/freepascal @@ -20,9 +20,9 @@ ONLY_FOR_ARCHS= i386 amd64 USES= gmake USE_GNOME= # -USE_FPC?= cairo fcl-base fcl-db fcl-fpcunit fcl-image fcl-process fcl-registry \ - fcl-res fcl-xml gtk2 iconvenc numlib pasjpeg x11 -USE_FPC_RUN= yes +USE_FPC?= cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-process \ + fcl-registry fcl-res fcl-xml gtk2 ibase iconvenc mysql numlib odbc oracle \ + pasjpeg postgres sqlite x11 OPT?= "-Sgic " MAKE_ENV= OPT=${OPT} diff --git a/editors/libreoffice-i18n/Makefile b/editors/libreoffice-i18n/Makefile index 8bc63965818..0cae59c2801 100644 --- a/editors/libreoffice-i18n/Makefile +++ b/editors/libreoffice-i18n/Makefile @@ -2,7 +2,6 @@ .include "${.CURDIR}/../libreoffice/Makefile.common" PORTREVISION= 0 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PKGNAMESUFFIX= -i18n DISTFILES= #none MASTER_SITES= #none diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 59c345b0a42..3e8ec17aff5 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -111,8 +111,6 @@ AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} -NO_LATEST_LINK= yes - ONLY_FOR_ARCHS= i386 amd64 USE_GL= gl glu diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 876638ffcc8..538019a063d 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -123,8 +123,6 @@ AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} -NO_LATEST_LINK= yes - ONLY_FOR_ARCHS= i386 amd64 USE_GL= gl glu diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile index e7240cef0c0..1e8f3c02de7 100644 --- a/emulators/generator-cbiere/Makefile +++ b/emulators/generator-cbiere/Makefile @@ -19,14 +19,14 @@ USES= gmake jpeg tar:bzip2 USE_GNOME= gtk12 USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${UNIQUENAME}/ \ +CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}/ \ --with-gtk MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PLIST_FILES= bin/${UNIQUENAME}-gtk +PLIST_FILES= bin/${PORTNAME}-gtk OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL OPTIONS_DEFINE_i386= RAZE diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 8da6f49a53c..53f9eabf30b 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -28,7 +28,7 @@ CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \ EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ - --exclude libdata/ldconfig32/${UNIQUENAME} \ + --exclude libdata/ldconfig32/${PKGNAMEPREFIX}${PORTNAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/i386-wine/Makefile.inc b/emulators/i386-wine/Makefile.inc index 82aa02cb180..6e429a901b3 100644 --- a/emulators/i386-wine/Makefile.inc +++ b/emulators/i386-wine/Makefile.inc @@ -28,7 +28,7 @@ CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \ EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ - --exclude libdata/ldconfig32/${UNIQUENAME} \ + --exclude libdata/ldconfig32/${PKGNAMEPREFIX}-${PORTNAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile index 498ae318949..d48d0a48179 100644 --- a/emulators/linux_base-c6/Makefile +++ b/emulators/linux_base-c6/Makefile @@ -175,7 +175,6 @@ FALLBACK_ELF_MIB= kern.fallback_elf_brand .if (${ARCH} == "amd64") . if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} != "c6_64" -LATEST_LINK:= ${PKGBASE:C/linux/linux32/} ARCH= i386 . endif .endif diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile index 8915809c6ce..22454de93b5 100644 --- a/emulators/linux_base-f10/Makefile +++ b/emulators/linux_base-f10/Makefile @@ -146,7 +146,6 @@ FALLBACK_ELF_MIB= kern.fallback_elf_brand .endif .if (${ARCH} == "amd64") -LATEST_LINK:= ${PKGBASE:C/linux/linux32/} ARCH= i386 .endif diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile index 5414931e856..5b6682bc231 100644 --- a/emulators/mupen64plus-core/Makefile +++ b/emulators/mupen64plus-core/Makefile @@ -24,7 +24,6 @@ ONLY_FOR_ARCHS= i386 amd64 OPTFLAGS= # MAKE_ENV+= OPTFLAGS="${OPTFLAGS}" -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options .include "${.CURDIR}/../mupen64plus-core/Makefile.common" .include diff --git a/emulators/q4wine/Makefile b/emulators/q4wine/Makefile index 9479eed527d..9d53f2741be 100644 --- a/emulators/q4wine/Makefile +++ b/emulators/q4wine/Makefile @@ -3,7 +3,7 @@ PORTNAME= q4wine DISTVERSION= 1.1-r2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION:S/.r/-r/}/ @@ -11,6 +11,7 @@ MAINTAINER= koalative@gmail.com COMMENT= QT4 front-end for WINE LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= icotool:${PORTSDIR}/graphics/icoutils RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo \ @@ -20,11 +21,10 @@ RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo \ USES= cmake desktop-file-utils CMAKE_ARGS+= -DMANPAGE_ENTRY_PATH=${MANPREFIX}/man -USE_GCC= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_QT4= qmake_build rcc_build moc_build uic_build \ - linguist_build corelib gui sql network + linguisttools_build corelib gui sql sql-sqlite3_run network ONLY_FOR_ARCHS= i386 amd64 PORTDOCS= AUTHORS ChangeLog README TODO @@ -34,11 +34,9 @@ OPTIONS_DEFAULT= DBUS OPTIONS_SUB= yes -NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext - DBUS_CMAKE_ON= -DWITH_DBUS:BOOL=ON DBUS_CMAKE_OFF= -DWITH_DBUS:BOOL=OFF +DBUS_USE= QT4=dbus .include @@ -46,10 +44,6 @@ DBUS_CMAKE_OFF= -DWITH_DBUS:BOOL=OFF RUN_DEPENDS+= wine:${PORTSDIR}/emulators/wine-devel .endif -.if ${PORT_OPTIONS:MDBUS} -USE_QT4+= dbus -.endif - post-patch: @${REINPLACE_CMD} -e 's|/share/man|/man|' \ ${WRKSRC}/src/CMakeLists.txt diff --git a/emulators/q4wine/files/patch-src_q4wine-gui_process.cpp b/emulators/q4wine/files/patch-src_q4wine-gui_process.cpp new file mode 100644 index 00000000000..73264d956d2 --- /dev/null +++ b/emulators/q4wine/files/patch-src_q4wine-gui_process.cpp @@ -0,0 +1,11 @@ +--- src/q4wine-gui/process.cpp.orig 2015-07-24 20:19:50 UTC ++++ src/q4wine-gui/process.cpp +@@ -16,6 +16,8 @@ + * * + ***************************************************************************/ + ++#include ++ + #include "process.h" + + Process::Process (QStringList args, QString exec, QString dir, QString info, QString caption, bool showErr, QStringList env, QWidget * parent, Qt::WFlags f) diff --git a/emulators/tpm-emulator/Makefile b/emulators/tpm-emulator/Makefile index e58345e54bd..f11e90ee965 100644 --- a/emulators/tpm-emulator/Makefile +++ b/emulators/tpm-emulator/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trousers-tddl-[0-9]* USES= cmake:outsource USE_RC_SUBR= tpmd -CMAKE_ENV= PREFIX="${PREFIX}" +CONFIGURE_ENV= PREFIX="${PREFIX}" CMAKE_ARGS= -DTPM_INCLUDE_DIRS:STRING="${LOCALBASE}/include" \ -DTPM_LIBRARY_DIRS:STRING="${LOCALBASE}/lib" USE_LDCONFIG= yes diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 6992d2e3630..e982b6a41ec 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -22,7 +22,6 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxguest vboxservice diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index 789dcad63bd..ae30d444bd1 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -22,7 +22,6 @@ CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox USES= cpe kmod tar:bzip2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxnet diff --git a/finance/ledgersmb12/Makefile b/finance/ledgersmb12/Makefile index 50b4622c67d..a121fe52350 100644 --- a/finance/ledgersmb12/Makefile +++ b/finance/ledgersmb12/Makefile @@ -15,8 +15,6 @@ BUILD_DEPENDS= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \ p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std RUN_DEPENDS:= ${BUILD_DEPENDS} -LATEST_LINK= ledgersmb12 - WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes NO_ARCH= yes diff --git a/french/eric6/distinfo b/french/eric6/distinfo index 21f369d5177..cd76882aa3f 100644 --- a/french/eric6/distinfo +++ b/french/eric6/distinfo @@ -1,2 +1,2 @@ -SHA256 (eric6-i18n-fr-6.0.5.tar.gz) = e89ee4bf7425a443cf1cbd428e9ddf268576f951b5339060b57764bc2b8fb586 -SIZE (eric6-i18n-fr-6.0.5.tar.gz) = 504325 +SHA256 (eric6-i18n-fr-6.0.8.tar.gz) = a61fdd707dc4b14327166164ff81c538eadeee72cf76c9b6f500a73f9b0a4c82 +SIZE (eric6-i18n-fr-6.0.8.tar.gz) = 504396 diff --git a/ftp/curl-hiphop/Makefile b/ftp/curl-hiphop/Makefile index 1ee9655e78a..e774a60beba 100644 --- a/ftp/curl-hiphop/Makefile +++ b/ftp/curl-hiphop/Makefile @@ -15,7 +15,6 @@ EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-hiphop GNU_CONFIGURE_PREFIX= ${PREFIX}/${HIPHOP_DIR}/ext CONFIGURE_ARGS+= --disable-shared --enable-static PLIST_SUB+= HIPHOP_DIR="${HIPHOP_DIR}" -LATEST_LINK= curl-hiphop PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr diff --git a/ftp/proftpd-mod_geoip/Makefile b/ftp/proftpd-mod_geoip/Makefile index 3033e60192c..c721531d9fd 100644 --- a/ftp/proftpd-mod_geoip/Makefile +++ b/ftp/proftpd-mod_geoip/Makefile @@ -14,7 +14,6 @@ LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd INCLUDEDIRS= ${LOCALBASE}/include diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile index fef29f7ceed..135e6a2a3b5 100644 --- a/ftp/py-pyftpdlib/Makefile +++ b/ftp/py-pyftpdlib/Makefile @@ -21,9 +21,6 @@ OPTIONS_DEFAULT= SENDFILE OPENSSL SENDFILE_DESC= Enable sendfile(2) support OPENSSL_DESC= Enable FTP over SSL/TLS (RFC4217) -# Workaround ports infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - SENDFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysendfile>0:${PORTSDIR}/net/py-pysendfile OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl diff --git a/games/doom-data/Makefile b/games/doom-data/Makefile index bd78d4b3631..8022fa1762f 100644 --- a/games/doom-data/Makefile +++ b/games/doom-data/Makefile @@ -28,7 +28,6 @@ STRIFE_DESC= Install Strife shareware data SUB_FILES= pkg-message -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${DMDIR} DOOM_DISTFILES= doom1.wad.bz2 diff --git a/games/ioquake3-devel-server/Makefile b/games/ioquake3-devel-server/Makefile index 894b994d48a..d06495ee799 100644 --- a/games/ioquake3-devel-server/Makefile +++ b/games/ioquake3-devel-server/Makefile @@ -7,7 +7,6 @@ PKGNAMESUFFIX= -server MAINTAINER= kamikaze@bsdforen.de COMMENT= Ioquake3 development snapshot dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER GAMELIBS diff --git a/games/ioquake3-server/Makefile b/games/ioquake3-server/Makefile index 15775367537..f1b6f93d2b4 100644 --- a/games/ioquake3-server/Makefile +++ b/games/ioquake3-server/Makefile @@ -7,7 +7,6 @@ PKGNAMESUFFIX= -server MAINTAINER= kamikaze@bsdforen.de COMMENT= Ioquake3 dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER GAMELIBS diff --git a/games/iourbanterror-server/Makefile b/games/iourbanterror-server/Makefile index 51a1eb2d1a2..3ecc8365390 100644 --- a/games/iourbanterror-server/Makefile +++ b/games/iourbanterror-server/Makefile @@ -7,7 +7,6 @@ PKGNAMESUFFIX= -server MAINTAINER= kamikaze@bsdforen.de COMMENT= Urban Terror dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile index 5563c6bdd9a..a60eb0f2840 100644 --- a/games/linux-quake3/Makefile +++ b/games/linux-quake3/Makefile @@ -35,7 +35,6 @@ PUNKBUSTER_DESC= Install PunkBuster SMP_DESC= Install SMP (threaded) client PLIST_SUB+= LIBDIR="libexec/${PKGNAMEPREFIX}${PORTNAME}" -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} LIBDIR= ${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME} Q3DATAFILE= linuxq3apoint-1.32b-3.x86.run diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile index 019ae679027..68c585f04b5 100644 --- a/games/nethack33/Makefile +++ b/games/nethack33/Makefile @@ -12,7 +12,6 @@ MAINTAINER= glewis@FreeBSD.org COMMENT= Dungeon explorin', slashin', hackin' game WRKSRC= ${WRKDIR}/${TRUEPORTNAME}-${PORTVERSION} -LATEST_LINK= ${TRUEPORTNAME}33${PKGNAMESUFFIX} USES= gmake tar:tgz MAKE_ENV= GRAPHICS="${GRAPHICS}" diff --git a/games/openarena-server/Makefile b/games/openarena-server/Makefile index f2c5baa8955..9c8c5a3b231 100644 --- a/games/openarena-server/Makefile +++ b/games/openarena-server/Makefile @@ -7,7 +7,6 @@ PKGNAMESUFFIX= -server MAINTAINER= kamikaze@bsdforen.de COMMENT= OpenArena dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER diff --git a/games/opengfx/Makefile b/games/opengfx/Makefile index 0babdc57b93..5ad69a7aa99 100644 --- a/games/opengfx/Makefile +++ b/games/opengfx/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= opengfx -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.2 CATEGORIES= games MASTER_SITES= http://hu.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \ http://us.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \ @@ -16,7 +16,6 @@ LICENSE= GPLv2 USES= zip NO_BUILD= yes -LATEST_LINK= openttd-${PORTNAME} # upstream zipped a tar file, unpack it. post-extract: diff --git a/games/opengfx/distinfo b/games/opengfx/distinfo index a2793bf4533..f1b85f93237 100644 --- a/games/opengfx/distinfo +++ b/games/opengfx/distinfo @@ -1,2 +1,2 @@ -SHA256 (opengfx-0.5.0-all.zip) = 440cd0ad40f17c180bf1a339fad5a06c9cdc0a4e680dd1f8d5e4aa720d4b531a -SIZE (opengfx-0.5.0-all.zip) = 3468612 +SHA256 (opengfx-0.5.2-all.zip) = 19be61f1cb04cbb3cb9602f0b8eb6e6f56ecbefbfdd6e0e03f9579e5a5c1cbc8 +SIZE (opengfx-0.5.2-all.zip) = 3547661 diff --git a/games/opensfx/Makefile b/games/opensfx/Makefile index 6b599a60cd4..a4c15b3b603 100644 --- a/games/opensfx/Makefile +++ b/games/opensfx/Makefile @@ -20,7 +20,6 @@ LICENSE_PERMS= auto-accept USES= zip NO_BUILD= yes -LATEST_LINK= openttd-${PORTNAME} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/openttd/baseset/opensfx diff --git a/games/opensonic/Makefile b/games/opensonic/Makefile index e02f18ed17a..a2e7b7c62e0 100644 --- a/games/opensonic/Makefile +++ b/games/opensonic/Makefile @@ -24,7 +24,7 @@ DESKTOP_ENTRIES="${PORTNAME}" \ false USES= cmake -CMAKE_ENV+= _ALLEGRO_LIBS="`allegro-config --libs`" \ +CONFIGURE_ENV+= _ALLEGRO_LIBS="`allegro-config --libs`" \ _ALLEGRO_VERSION="`allegro-config --version`" CFLAGS+= -I${LOCALBASE}/include diff --git a/games/quake-source/Makefile b/games/quake-source/Makefile index fa5c9d98ace..dee28e5eb6f 100644 --- a/games/quake-source/Makefile +++ b/games/quake-source/Makefile @@ -16,8 +16,6 @@ COMMENT= Quake game source code NO_BUILD= yes NO_WRKSUBDIR= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} - OPTIONS_DEFINE= QUAKEWORLD OPTIONS_DEFAULT= QUAKEWORLD diff --git a/games/quake2-3zb2/Makefile b/games/quake2-3zb2/Makefile index b5f68a6cab3..87344c5399a 100644 --- a/games/quake2-3zb2/Makefile +++ b/games/quake2-3zb2/Makefile @@ -21,7 +21,7 @@ DOS2UNIX_FILES= *.[ch] NO_WRKSUBDIR= yes SUB_FILES= pkg-message -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= ROUTES DOCS OPTIONS_DEFAULT= ROUTES diff --git a/games/quake2-ctf/Makefile b/games/quake2-ctf/Makefile index 623da296713..97515a823d7 100644 --- a/games/quake2-ctf/Makefile +++ b/games/quake2-ctf/Makefile @@ -17,8 +17,7 @@ USES= dos2unix zip:infozip DOS2UNIX_FILES= ../../../ctf/readme.txt ../../../ctf/server.cfg WRKSRC= ${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} CTF_DATA= q2ctf150.zip CTF_SRC= quake2-r0.16.2.tar.gz diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile index d90f2b6b029..907a1285217 100644 --- a/games/quake2-data/Makefile +++ b/games/quake2-data/Makefile @@ -16,9 +16,8 @@ COMMENT= Quake II data files USES= zip:infozip NO_WRKSUBDIR= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${Q2DIR} -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} Q2_DEMO= q2-314-demo-x86.exe Q2_SRC= q2src${PORTVERSION:S|.||}.shar.Z diff --git a/games/quake2-extras/Makefile b/games/quake2-extras/Makefile index b47ff12b341..edfffa9aaf3 100644 --- a/games/quake2-extras/Makefile +++ b/games/quake2-extras/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://offload1.icculus.org/quake2/files/:retex \ http://www-personal.umich.edu/~jimw/q2/aq2_install/:models PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX} DISTFILES= # -DIST_SUBDIR= ${LATEST_LINK} +DIST_SUBDIR= ${PKGBASE} EXTRACT_ONLY= # MAINTAINER= danfe@FreeBSD.org @@ -19,8 +19,6 @@ COMMENT= Quake II extras (high quality textures and skins) USES= zip NO_WRKSUBDIR= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} - RETEX_PAKS= 10 11 12 13 14 16 17 19 RETEX_FULL= all_q2_textures_07_17_2006zip SKINS= models.zip diff --git a/games/quake2-lights/Makefile b/games/quake2-lights/Makefile index de8f6db6a4f..95e71394592 100644 --- a/games/quake2-lights/Makefile +++ b/games/quake2-lights/Makefile @@ -19,7 +19,7 @@ NO_WRKSUBDIR= yes BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}/src ALL_TARGET= release -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS diff --git a/games/quake2-matrix/Makefile b/games/quake2-matrix/Makefile index 8abba9ef4f9..bfdc416ab2c 100644 --- a/games/quake2-matrix/Makefile +++ b/games/quake2-matrix/Makefile @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/MatrixFixSource ALL_TARGET= release -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS diff --git a/games/quake2-psychomod/Makefile b/games/quake2-psychomod/Makefile index 3e93f1d5d9e..15fed79654b 100644 --- a/games/quake2-psychomod/Makefile +++ b/games/quake2-psychomod/Makefile @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= release -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS diff --git a/games/quake2-source/Makefile b/games/quake2-source/Makefile index 037fb918de6..951496e2b0b 100644 --- a/games/quake2-source/Makefile +++ b/games/quake2-source/Makefile @@ -25,8 +25,6 @@ XATRIX_DESC= Reckoning (Xatrix) mission pack source OPTIONS_SUB= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} - DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} .include diff --git a/games/quake2-zaero/Makefile b/games/quake2-zaero/Makefile index d2c1662cef1..06902ef39ca 100644 --- a/games/quake2-zaero/Makefile +++ b/games/quake2-zaero/Makefile @@ -17,7 +17,7 @@ USES= dos2unix zip DOS2UNIX_FILES= *.[ch] NO_WRKSUBDIR= yes -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DEMO DM_MAPS DOCS OPTIONS_SUB= yes diff --git a/games/sea-defender/Makefile b/games/sea-defender/Makefile index 9a5e94b7208..710d1681d48 100644 --- a/games/sea-defender/Makefile +++ b/games/sea-defender/Makefile @@ -5,7 +5,7 @@ PORTNAME= sea-defender PORTVERSION= 0.9 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= http://mirror.amdmi3.ru/distfiles/:DEFAULT,icon \ +MASTER_SITES= http://mirror.amdmi3.ru/distfiles/:icon \ SF/nemysisfreebsdp/:icon DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}.png:icon @@ -44,8 +44,6 @@ DESKTOP_ENTRIES="Sea Defender" \ OPTIONS_DEFINE= DOCS -.include - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sea ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/games/tuxpaint-fonts/Makefile b/games/tuxpaint-fonts/Makefile index ce23d06a591..591f18051da 100644 --- a/games/tuxpaint-fonts/Makefile +++ b/games/tuxpaint-fonts/Makefile @@ -42,9 +42,6 @@ ${l:tu}_DESC= ${l:S/_/ /} fonts MASTER_SITES+= SF/${PORTNAME}/${PORTNAME}-fonts/${${l:tu}_DISTNAME}:${l:tu} .endfor -# Do not use the same OPTIONS directory as "games/tuxpaint". -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - .include # Set DISTFILES and PLIST_FILES according to OPTIONS. diff --git a/games/warmux/Makefile b/games/warmux/Makefile index 6d5c4206015..467415a1065 100644 --- a/games/warmux/Makefile +++ b/games/warmux/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \ CONFLICTS_INSTALL= wormux-* GNU_CONFIGURE= yes +CONFIGURE_ENV= cxx_present=yes USES= dos2unix gmake pkgconfig tar:bzip2 USE_SDL= sdl image mixer ttf gfx net DOS2UNIX_GLOB= fixed_class.h diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile index 14022a43520..d3109537c71 100644 --- a/games/xpilot-ng-server/Makefile +++ b/games/xpilot-ng-server/Makefile @@ -23,8 +23,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --program-prefix="" -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PKGFILESUFFIX= ${PKGNAMESUFFIX:S/-/./} DESCR= ${PKGDIR}/pkg-descr${PKGFILESUFFIX} PLIST= ${PKGDIR}/pkg-plist${PKGFILESUFFIX} diff --git a/german/eric6/distinfo b/german/eric6/distinfo index 34f06950ec4..8f50d24039a 100644 --- a/german/eric6/distinfo +++ b/german/eric6/distinfo @@ -1,2 +1,2 @@ -SHA256 (eric6-i18n-de-6.0.5.tar.gz) = dc41a38fa7374cff8d0caf33c0027646a558ea5e42c9bd089f8ec7140b98e32e -SIZE (eric6-i18n-de-6.0.5.tar.gz) = 761069 +SHA256 (eric6-i18n-de-6.0.8.tar.gz) = 257264ed308219a7d83fe016be06c986bdd5f97b790879e4e44a772f6099db80 +SIZE (eric6-i18n-de-6.0.8.tar.gz) = 761116 diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile index 6b14e5849f8..e4a5c2f33ad 100644 --- a/graphics/cegui/Makefile +++ b/graphics/cegui/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo WRKSRC= ${WRKDIR}/${DISTNAME:S/2b/2/} -CMAKE_ENV+= TOLUA_INC="${LUA_INCDIR}" +CONFIGURE_ENV+= TOLUA_INC="${LUA_INCDIR}" CMAKE_ARGS= -DCEGUI_SAMPLES_ENABLED:BOOL=OFF \ -DCEGUI_BUILD_TESTS=OFF USE_LDCONFIG= yes diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile index 41b3e68b838..72d9ddaf531 100644 --- a/graphics/fpc-rsvg/Makefile +++ b/graphics/fpc-rsvg/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -rsvg MAINTAINER= freebsd-fpc@FreeBSD.org COMMENT= Free Pascal interface to librsvg2 library -USE_FPC= gtk2 +USE_FPC= cairo fcl-image gtk2 x11 MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//:S/^/lib/} diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile index 9230406dab0..e4fa4963f4f 100644 --- a/graphics/freeimage/Makefile +++ b/graphics/freeimage/Makefile @@ -3,6 +3,9 @@ PORTNAME= freeimage PORTVERSION= 3.16.0 +# Version 3.17.0 is available, but does not build on i386 (and probably +# other 32-bit arches) without some not-quite-trivial patching. If one +# decides to update the port, please make sure 32-bit builds are tested! CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Source%20Distribution/${PORTVERSION} DISTNAME= FreeImage${PORTVERSION:S/.//g} diff --git a/graphics/frei0r-plugins/Makefile b/graphics/frei0r-plugins/Makefile index ab127fa94f0..56b75f76d4e 100644 --- a/graphics/frei0r-plugins/Makefile +++ b/graphics/frei0r-plugins/Makefile @@ -8,9 +8,6 @@ EXTRACT_ONLY= # empty COMMENT= Frei0r meta-port -# Required in order to avoid conflicts with graphics/frei0r's OPTIONS. -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - RUN_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r MASTERDIR= ${.CURDIR}/../frei0r diff --git a/graphics/jgraph/Makefile b/graphics/jgraph/Makefile index d7174dd4f8a..30c54f24817 100644 --- a/graphics/jgraph/Makefile +++ b/graphics/jgraph/Makefile @@ -11,7 +11,6 @@ DISTFILES= ${PORTNAME}.shar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Generates postscript graphs -NO_LATEST_LINK= yes EXTRACT_CMD= uncompress EXTRACT_BEFORE_ARGS= -c EXTRACT_AFTER_ARGS= | ${SH} diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index 84507f4d28d..6a5d701aaa7 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -15,8 +15,6 @@ COMMENT= C++ wrapper for libgnomecanvas library LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -LATEST_LINK= libgnomecanvasmm26 - USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 USE_GNOME= libgnomecanvas GNU_CONFIGURE= yes diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile index b8af75b4c86..9373e53859a 100644 --- a/graphics/luxrender/Makefile +++ b/graphics/luxrender/Makefile @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= luxrender -PORTVERSION= 1.3.1 -PORTREVISION= 4 +DISTVERSION= 1.4 CATEGORIES= graphics -MASTER_SITES= http://src.luxrender.net/lux/get/ \ - http://src.luxrender.net/luxrays/get/:lr -DISTFILES= v${PORTVERSION:S/.//g}${EXTRACT_SUFX} \ - luxrender_v${PORTVERSION}${EXTRACT_SUFX}:lr +MASTER_SITES= https://bitbucket.org/luxrender/lux/get/ \ + https://bitbucket.org/luxrender/luxrays/get/:lr +DISTFILES= v${DISTVERSION:C/[.-]//g}${EXTRACT_SUFX} \ + ${PORTNAME}_v${DISTVERSION:S/-//}${EXTRACT_SUFX}:lr DIST_SUBDIR= ${PORTNAME} MAINTAINER= danfe@FreeBSD.org @@ -19,33 +18,31 @@ LICENSE= GPLv3 LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libfreeimage.so:${PORTSDIR}/graphics/freeimage \ - libpng.so:${PORTSDIR}/graphics/png \ - libIlmImf.so:${PORTSDIR}/graphics/OpenEXR -.if !exists(/usr/include/execinfo.h) -LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -.endif + libOpenImageIO.so:${PORTSDIR}/graphics/openimageio ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses SSE extensions -USES= bison cmake tar:bzip2 +USES= bison cmake execinfo python:version tar:bzip2 USE_GL= glut glew WRKSRC= ${WRKDIR}/luxrender-lux-${LUX_REV} LUXRAYS_WRKSRC= ${WRKDIR}/luxrender-luxrays-${LUXRAYS_REV} -CMAKE_ARGS= -DLUXRAYS_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ +CMAKE_ARGS= -DLUXCORE_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ + -DLUXCORE_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxcore.a" \ + -DLUXRAYS_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ -DLUXRAYS_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxrays.a" \ -DSLG_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ -DSLG_LIBRARY:PATH="${LUXRAYS_WRKSRC}/lib/libsmallluxgpu.a" \ -DLUXRAYS_DISABLE_OPENCL:BOOL=ON -LUX_REV= d0b0e20c47cc -LUXRAYS_REV= 7459cd8a9583 +LUX_REV= dfd211d6faa0 +LUXRAYS_REV= 7c7127ee1fa4 OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 -X11_DESC= Build GUI executable (Qt4-based) +X11_DESC= Build GUI executable (requires Qt 4) X11_USE= QT4=moc_build,qmake_build,rcc_build,uic_build,corelib,gui X11_PLIST_FILES= bin/luxrender @@ -56,9 +53,13 @@ post-patch: ${WRKSRC}/shapes/mikktspace/weldmesh.c @${REINPLACE_CMD} -e '/^set(Boost_USE_STATIC_LIBS/s,ON,OFF,' \ ${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake +# Avoid picking up Python 3.x bits if they're installed + @${REINPLACE_CMD} -e 's,PythonLibs,& ${PYTHON_VER} EXACT REQUIRED,' \ + ${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake \ + ${WRKSRC}/cmake/pylux.cmake pre-configure: - cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} \ + cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ ${CMAKE_ARGS} . ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} -C ${LUXRAYS_WRKSRC} diff --git a/graphics/luxrender/distinfo b/graphics/luxrender/distinfo index e3716a709a2..21b9a50c419 100644 --- a/graphics/luxrender/distinfo +++ b/graphics/luxrender/distinfo @@ -1,4 +1,4 @@ -SHA256 (luxrender/v131.tar.bz2) = b38fb83e0e9a8bc09587ac78de688f9a79fbbe9e2e20ff5822bc72a24bb230fd -SIZE (luxrender/v131.tar.bz2) = 2541070 -SHA256 (luxrender/luxrender_v1.3.1.tar.bz2) = bae72176f33e4c307cba3f03c332024b6c46ea5d88251e14f5c748a6b0626bc5 -SIZE (luxrender/luxrender_v1.3.1.tar.bz2) = 44433304 +SHA256 (luxrender/v14.tar.bz2) = 87389167496037e22cbf420efd610474d6a02395c4f4e4a39e2bd50453676b0b +SIZE (luxrender/v14.tar.bz2) = 2642639 +SHA256 (luxrender/luxrender_v1.4.tar.bz2) = 8229a814807fed2810eefd4a5ba051e7b05a4b30862ee066a3c205d6bd730205 +SIZE (luxrender/luxrender_v1.4.tar.bz2) = 26682611 diff --git a/graphics/luxrender/files/patch-CMakeLists.txt b/graphics/luxrender/files/patch-CMakeLists.txt index 1cea51b134b..1fba01bbd1c 100644 --- a/graphics/luxrender/files/patch-CMakeLists.txt +++ b/graphics/luxrender/files/patch-CMakeLists.txt @@ -1,14 +1,5 @@ --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -179,7 +179,7 @@ IF(NOT APPLE AND NOT WIN32) - STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _mach_x86_64 ${MACHINE}) - IF (_mach_x86_64) - SET(ARCH_X86_64 1) -- SET(LIB_SUFFIX 64) -+ #SET(LIB_SUFFIX 64) - #jromang - Hack to avoid boost bug on x64 Ubuntu 8.10 and Fedora 10 (http://www.luxrender.net/mantis/view.php?id=433) - ADD_DEFINITIONS(-DBOOST_NO_INTRINSIC_INT64_T) - ENDIF (_mach_x86_64) @@ -298,7 +298,7 @@ ELSEIF(MSVC) ELSE(APPLE) # Dade - default compiler options diff --git a/graphics/luxrender/files/patch-gcc42-fixes b/graphics/luxrender/files/patch-gcc42-fixes index 54a59afc741..7648ae07fd0 100644 --- a/graphics/luxrender/files/patch-gcc42-fixes +++ b/graphics/luxrender/files/patch-gcc42-fixes @@ -1,3 +1,19 @@ +--- ../luxrender-luxrays-7c7127ee1fa4/include/luxrays/core/geometry/frame.h.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/include/luxrays/core/geometry/frame.h +@@ -46,11 +46,11 @@ public: + SetFromZ(z); + } + +- Frame(const Normal &z) { ++ Frame(const luxrays::Normal &z) { + SetFromZ(Vector(z)); + } + +- void SetFromZ(const Normal &z) { ++ void SetFromZ(const luxrays::Normal &z) { + SetFromZ(Vector(z)); + } + --- textures/bilerp.h.orig +++ textures/bilerp.h @@ -39,7 +39,7 @@ public: diff --git a/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake b/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake index 74c02cfb6c2..06026047e64 100644 --- a/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake +++ b/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake @@ -1,14 +1,15 @@ ---- ../luxrender-luxrays-7459cd8a9583/cmake/PlatformSpecific.cmake.orig -+++ ../luxrender-luxrays-7459cd8a9583/cmake/PlatformSpecific.cmake -@@ -106,18 +106,17 @@ ENDIF(MSVC) +--- ../luxrender-luxrays-7c7127ee1fa4/cmake/PlatformSpecific.cmake.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/cmake/PlatformSpecific.cmake +@@ -138,18 +138,17 @@ ENDIF(MSVC) -IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) +#IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) # Update if necessary - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse") IF(NOT CYGWIN) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") diff --git a/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h b/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h new file mode 100644 index 00000000000..5682d834aed --- /dev/null +++ b/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h @@ -0,0 +1,20 @@ +--- ../luxrender-luxrays-7c7127ee1fa4/include/luxcore/luxcore.h.orig 2015-01-20 22:45:32.000000000 +0000 ++++ ../luxrender-luxrays-7c7127ee1fa4/include/luxcore/luxcore.h +@@ -63,7 +63,7 @@ + */ + namespace luxcore { + +-CPP_EXPORT CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler ++extern CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler + + #define LC_LOG(a) { if (luxcore::LuxCore_LogHandler) { std::stringstream _LUXCORE_LOG_LOCAL_SS; _LUXCORE_LOG_LOCAL_SS << a; luxcore::LuxCore_LogHandler(_LUXCORE_LOG_LOCAL_SS.str().c_str()); } } + +@@ -603,7 +603,7 @@ public: + * + * \return the default Properties. + */ +- static const luxrays::Properties &GetDefaultProperties(); ++ const luxrays::Properties &GetDefaultProperties(); + + friend class RenderSession; + diff --git a/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt index 365228d9051..8b82dec7289 100644 --- a/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt +++ b/graphics/luxrender/files/patch-luxrays-samples-benchsimple-CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../luxrender-luxrays-7459cd8a9583/samples/benchsimple/CMakeLists.txt.orig -+++ ../luxrender-luxrays-7459cd8a9583/samples/benchsimple/CMakeLists.txt +--- ../luxrender-luxrays-7c7127ee1fa4/samples/benchsimple/CMakeLists.txt.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/samples/benchsimple/CMakeLists.txt @@ -19,8 +19,10 @@ # LuxRays website: http://www.luxrender.net # ########################################################################### @@ -11,4 +11,4 @@ add_executable(benchsimple benchsimple.cpp) -target_link_libraries(benchsimple luxrays) -+target_link_libraries(benchsimple luxrays ${CMAKE_THREAD_LIBS_INIT}) ++target_link_libraries(benchsimple luxrays ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt new file mode 100644 index 00000000000..79099952acd --- /dev/null +++ b/graphics/luxrender/files/patch-luxrays-samples-luxcoredemo-CMakeLists.txt @@ -0,0 +1,16 @@ +--- ../luxrender-luxrays-7c7127ee1fa4/samples/luxcoredemo/CMakeLists.txt.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/samples/luxcoredemo/CMakeLists.txt +@@ -22,10 +22,12 @@ + # + ################################################################################ + ++find_package(Threads) ++ + set(LUXCORELIBDEMO_SRCS + luxcoredemo.cpp + ) + + add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS}) + +-TARGET_LINK_LIBRARIES(luxcoredemo luxcore smallluxgpu luxrays ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) ++TARGET_LINK_LIBRARIES(luxcoredemo luxcore smallluxgpu luxrays ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt new file mode 100644 index 00000000000..d26f96765c6 --- /dev/null +++ b/graphics/luxrender/files/patch-luxrays-samples-luxcorescenedemo-CMakeLists.txt @@ -0,0 +1,16 @@ +--- ../luxrender-luxrays-7c7127ee1fa4/samples/luxcorescenedemo/CMakeLists.txt.orig 2015-01-20 22:45:32 UTC ++++ ../luxrender-luxrays-7c7127ee1fa4/samples/luxcorescenedemo/CMakeLists.txt +@@ -22,10 +22,12 @@ + # + ################################################################################ + ++find_package(Threads) ++ + set(LUXCORESCENEDEMO_SRCS + luxcorescenedemo.cpp + ) + + add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS}) + +-TARGET_LINK_LIBRARIES(luxcorescenedemo luxcore smallluxgpu luxrays ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) ++TARGET_LINK_LIBRARIES(luxcorescenedemo luxcore smallluxgpu luxrays ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/graphics/luxrender/files/patch-luxrays-samples-slglibdemo-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-slglibdemo-CMakeLists.txt deleted file mode 100644 index 7ec194181b3..00000000000 --- a/graphics/luxrender/files/patch-luxrays-samples-slglibdemo-CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- ../luxrender-luxrays-7459cd8a9583/samples/slglibdemo/CMakeLists.txt.orig -+++ ../luxrender-luxrays-7459cd8a9583/samples/slglibdemo/CMakeLists.txt -@@ -25,10 +25,12 @@ - # - ############################################################################# - -+find_package(Threads) -+ - set(SLGLIBDEMO_SRCS - slglibdemo.cpp - ) - - add_executable(slg4libdemo ${SLGLIBDEMO_SRCS}) - --TARGET_LINK_LIBRARIES(slg4libdemo smallluxgpu luxrays) -+TARGET_LINK_LIBRARIES(slg4libdemo smallluxgpu luxrays ${CMAKE_THREAD_LIBS_INIT}) diff --git a/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt index a179ae1fd05..06569f21524 100644 --- a/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt +++ b/graphics/luxrender/files/patch-luxrays-samples-smallluxgpu4-CMakeLists.txt @@ -1,5 +1,5 @@ ---- ../luxrender-luxrays-7459cd8a9583/samples/smallluxgpu4/CMakeLists.txt.orig -+++ ../luxrender-luxrays-7459cd8a9583/samples/smallluxgpu4/CMakeLists.txt +--- ../luxrender-luxrays-7c7127ee1fa4/samples/smallluxgpu4/CMakeLists.txt.orig ++++ ../luxrender-luxrays-7c7127ee1fa4/samples/smallluxgpu4/CMakeLists.txt @@ -25,6 +25,8 @@ # ############################################################################# @@ -13,8 +13,8 @@ add_executable(slg4 ${SMALLLUXGPU_SRCS}) --TARGET_LINK_LIBRARIES(slg4 smallluxgpu luxrays ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY}) -+TARGET_LINK_LIBRARIES(slg4 smallluxgpu luxrays ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} -lexecinfo) +-TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) ++TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lexecinfo) # This instructs FREEGLUT to emit a pragma for the static version SET_TARGET_PROPERTIES(slg4 PROPERTIES COMPILE_DEFINITIONS FREEGLUT_STATIC) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index f12498fd389..acc1e369958 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -243,7 +243,7 @@ CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=On . for module in apps python stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off . endfor -CMAKE_ENV+= JAVA_HOME="${JAVA_HOME}" +CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" INSTALL_WRKSRC= ${WRKSRC}/modules/java .else LIB_DEPENDS+= libopencv_core.so:${PORTSDIR}/graphics/opencv-core diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index c6621a4f7b8..1a464c4fcaf 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -86,7 +86,6 @@ CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \ USE_GL= glew USE_QT4= corelib gui opengl qmake_build moc_build rcc_build uic_build CMAKE_ARGS+= -DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON -CMAKE_ENV+= QTDIR=${QT_PREFIX} QT_INCLUDES=${QT_INCDIR} .else CMAKE_ARGS+= -DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF .endif diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile index c43d2828c42..7a840f4d847 100644 --- a/graphics/opennurbs/Makefile +++ b/graphics/opennurbs/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= opennurbs -PORTVERSION= 20121024 +PORTVERSION= 20130711 PORTREVISION= 3 CATEGORIES= graphics -MASTER_SITES= http://files.na.mcneel.com/opennurbs/5.0/2012-10-24/ +MASTER_SITES= http://files.na.mcneel.com/opennurbs/5.0/2013-07-11/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= fernando.apesteguia@gmail.com diff --git a/graphics/opennurbs/distinfo b/graphics/opennurbs/distinfo index 7f823649de6..76261720127 100644 --- a/graphics/opennurbs/distinfo +++ b/graphics/opennurbs/distinfo @@ -1,2 +1,2 @@ -SHA256 (opennurbs_20121024.zip) = 8788d1c18a02ceeb4fede5cff46fafa9e9423741aa83cb8bcacebc7a53b76744 -SIZE (opennurbs_20121024.zip) = 1781061 +SHA256 (opennurbs_20130711.zip) = 5cb9ff879c94c63145526a188f9ddc8c522f35cd82d8726ad49ed64a63d6e05a +SIZE (opennurbs_20130711.zip) = 1807257 diff --git a/graphics/opennurbs/files/patch-opennurbs-memory.c b/graphics/opennurbs/files/patch-opennurbs-memory.c deleted file mode 100644 index 72e31bdf9b4..00000000000 --- a/graphics/opennurbs/files/patch-opennurbs-memory.c +++ /dev/null @@ -1,21 +0,0 @@ ---- opennurbs_memory.c.orig 2012-10-25 18:07:39.000000000 +0200 -+++ opennurbs_memory.c 2012-10-25 18:08:08.000000000 +0200 -@@ -14,6 +14,8 @@ - //////////////////////////////////////////////////////////////// - */ - -+#include -+ - #include "opennurbs_system.h" - #include "opennurbs_defines.h" - #include "opennurbs_memory.h" -@@ -113,8 +115,7 @@ - // platform, then report it to the support - // contact on http://opennurbs.org and - // the code will be added in the next release. -- ON_ERROR("onmsize not implemented on this compiler or platform.") -- sz = 0; -+ sz = malloc_usable_size( (void*)memblock ); - #endif - } - diff --git a/graphics/opennurbs/files/patch-opennurbs-system.h b/graphics/opennurbs/files/patch-opennurbs__system.h similarity index 58% rename from graphics/opennurbs/files/patch-opennurbs-system.h rename to graphics/opennurbs/files/patch-opennurbs__system.h index e6e7f35809c..cdd74a4ff80 100644 --- a/graphics/opennurbs/files/patch-opennurbs-system.h +++ b/graphics/opennurbs/files/patch-opennurbs__system.h @@ -1,6 +1,6 @@ ---- opennurbs_system.h.orig 2012-10-24 23:45:37.000000000 +0200 -+++ opennurbs_system.h 2012-10-24 23:45:37.000000000 +0200 -@@ -219,11 +219,6 @@ +--- opennurbs_system.h.orig 2015-08-14 13:19:05 UTC ++++ opennurbs_system.h +@@ -219,11 +219,7 @@ #include #include @@ -9,6 +9,7 @@ -#else -#include -#endif ++#include #include #include #include diff --git a/graphics/opennurbs/pkg-plist b/graphics/opennurbs/pkg-plist index 46533dddfc4..7f1f0fb3dc0 100644 --- a/graphics/opennurbs/pkg-plist +++ b/graphics/opennurbs/pkg-plist @@ -68,6 +68,7 @@ include/openNURBS/opennurbs_object_history.h include/openNURBS/opennurbs_objref.h include/openNURBS/opennurbs_offsetsurface.h include/openNURBS/opennurbs_optimize.h +include/openNURBS/opennurbs_photogrammetry.h include/openNURBS/opennurbs_plane.h include/openNURBS/opennurbs_planesurface.h include/openNURBS/opennurbs_pluginlist.h @@ -80,6 +81,7 @@ include/openNURBS/opennurbs_polyedgecurve.h include/openNURBS/opennurbs_polyline.h include/openNURBS/opennurbs_polylinecurve.h include/openNURBS/opennurbs_qsort_template.h +include/openNURBS/opennurbs_quaternion.h include/openNURBS/opennurbs_rand.h include/openNURBS/opennurbs_rendering.h include/openNURBS/opennurbs_revsurface.h diff --git a/graphics/py-aafigure/Makefile b/graphics/py-aafigure/Makefile index ff7e741f1b8..837e777ce57 100644 --- a/graphics/py-aafigure/Makefile +++ b/graphics/py-aafigure/Makefile @@ -19,8 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \ USES= python USE_PYTHON= distutils autoplist -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.txt PORTEXAMPLES= * diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile index 5d475bc0e8a..038da04c09c 100644 --- a/graphics/py-actdiag/Makefile +++ b/graphics/py-actdiag/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \ USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= README.rst OPTIONS_DEFINE= DOCS diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile index 076a5274438..57186a2e2b2 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -17,8 +17,6 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \ ${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib \ ${PKGNAMEPREFIX}webcolors>=0:${PORTSDIR}/graphics/py-webcolors -UNIQUENAME= py-${PORTNAME} - USES= python USE_PYTHON= autoplist distutils diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index e4dfed9e4aa..79adbd76fad 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -16,8 +16,6 @@ COMMENT= The Python Imaging Library LIB_DEPENDS= liblcms.so:${PORTSDIR}/graphics/lcms \ libfreetype.so:${PORTSDIR}/print/freetype2 -UNIQUENAME= py-${PORTNAME} - USES= jpeg python DIST_SUBDIR= python USE_PYTHON= distutils autoplist concurrent diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile index d849d674dc7..95ffafa7c37 100644 --- a/graphics/py-nwdiag/Makefile +++ b/graphics/py-nwdiag/Makefile @@ -20,8 +20,8 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \ USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.rst PORTEXAMPLES= * diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index ac030c4da68..54c87f17f49 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -19,7 +19,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= TKINTER OPTIONS_DEFAULT= TKINTER TKINTER_DESC= Build with tkinter for X support -OPTIONSFILE?= ${PORT_DBDIR}/${PORTNAME}/options USES= dos2unix python USE_GL= glut diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile index b0f701a6c4d..8875d42a006 100644 --- a/graphics/py-seqdiag/Makefile +++ b/graphics/py-seqdiag/Makefile @@ -20,8 +20,8 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \ USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.rst PORTEXAMPLES= * diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index 82eb79a5b4e..fa4b2d314ce 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -20,7 +20,6 @@ USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DJANGO PDF WORD DJANGO_DESC= Enable Django PDF_DESC= PDF Thumbnails diff --git a/graphics/py-webcolors/Makefile b/graphics/py-webcolors/Makefile index 8e1faeae81c..324d03687f4 100644 --- a/graphics/py-webcolors/Makefile +++ b/graphics/py-webcolors/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE USES= python USE_PYTHON= distutils autoplist -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= README OPTIONS_DEFINE= DOCS diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile index 6fb643daca2..54895a8862e 100644 --- a/graphics/quat-gui/Makefile +++ b/graphics/quat-gui/Makefile @@ -18,8 +18,6 @@ LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - USE_XORG= xext USE_GL= gl glut GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ CONFIGURE_ARGS= --datadir=${PREFIX}/share/doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= * PLIST_FILES= bin/quat @@ -51,7 +49,7 @@ post-patch: ${WRKSRC}/gui/Makefile.in @${REINPLACE_CMD} -e \ 's||| ; \ - s|/doc/quat/|/doc/${UNIQUENAME}/|' \ + s|/doc/quat/|/doc/${PKGBASE}/|' \ ${WRKSRC}/gui/MainWindow.cxx # disable data file installation since distfile does not do # The Right Thing(TM) @@ -60,7 +58,7 @@ post-patch: s|^(SUBDIRS.*)doc|\1|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ - 's|@PACKAGE@|${UNIQUENAME}|' \ + 's|@PACKAGE@|${PKGBASE}|' \ ${WRKSRC}/doc/Makefile.in post-install: diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 76db7b2d761..9fb6f1ec512 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -29,7 +29,7 @@ USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include -fPIC CXXFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS+= -lpthread -L${LOCALBASE}/lib -CMAKE_ENV= CFLAGS="${CFLAGS}" \ +CONFIGURE_ENV= CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ -DCREDITSDIR="${DOCSDIR}" \ diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index f7f0f307995..0372807453f 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -3,6 +3,7 @@ PORTNAME= ufraw PORTVERSION= 0.22 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/ufraw/pkg-plist b/graphics/ufraw/pkg-plist index 2267926e102..dbcee6d26c0 100644 --- a/graphics/ufraw/pkg-plist +++ b/graphics/ufraw/pkg-plist @@ -3,6 +3,7 @@ bin/ufraw-batch bin/ufraw-dcraw %%GIMP%%libexec/gimp/2.2/plug-ins/ufraw-gimp man/man1/ufraw.1.gz +share/appdata/ufraw.appdata.xml share/applications/ufraw.desktop share/locale/ca/LC_MESSAGES/ufraw.mo share/locale/cs/LC_MESSAGES/ufraw.mo diff --git a/irc/cwirc/Makefile b/irc/cwirc/Makefile index dcdbf06f5bc..a8b4a88d062 100644 --- a/irc/cwirc/Makefile +++ b/irc/cwirc/Makefile @@ -5,10 +5,10 @@ PORTNAME= cwirc PORTVERSION= 2.0.0 PORTREVISION= 5 CATEGORIES= irc comms hamradio -MASTER_SITES= http://users.skynet.be/ppc/cwirc/download/ \ +MASTER_SITES= http://myspace.voo.be/pcoupard/cwirc/download/ \ LOCAL/db -MAINTAINER= db@FreeBSD.org +MAINTAINER= hamradio@FreeBSD.org COMMENT= X-Chat Morse plugin LICENSE= GPLv2 @@ -17,21 +17,19 @@ BUILD_DEPENDS= xchat:${PORTSDIR}/irc/xchat USES= pkgconfig -OPTIONS_DEFINE= DOCS - post-patch: @${CP} ${FILESDIR}/Makefile ${WRKSRC} @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ - -e 's|%%STAGEDIR%%|${STAGEDIR}|' ${WRKSRC}/Makefile + -e 's|%%STAGEDIR%%|${STAGEDIR}|' ${WRKSRC}/Makefile post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in COPYING LISEZMOI README RELEASE_NOTES - @${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR} .endfor - @${MKDIR} ${STAGEDIR}${DOCSDIR}/schematics + ${MKDIR} ${STAGEDIR}${DOCSDIR}/schematics .for f in cw_oscillator.jpg rs232_key_connection.jpg - @${INSTALL_DATA} ${WRKSRC}/schematics/$f ${STAGEDIR}${DOCSDIR}/schematics + ${INSTALL_DATA} ${WRKSRC}/schematics/$f ${STAGEDIR}${DOCSDIR}/schematics .endfor .include diff --git a/irc/cwirc/files/Makefile b/irc/cwirc/files/Makefile index f332072e451..89cc2127585 100644 --- a/irc/cwirc/files/Makefile +++ b/irc/cwirc/files/Makefile @@ -17,9 +17,11 @@ # # $FreeBSD$ TARGET_OS=FREEBSD -PLUGIN_INSTALL_DIRECTORY=%%STAGEDIR%%%%PREFIX%%/lib/xchat/plugins -FRONTEND_INSTALL_DIRECTORY=%%STAGEDIR%%%%PREFIX%%/bin -CWIRC_EXTENSIONS_DIRECTORY=%%STAGEDIR%%%%PREFIX%%/share/cwirc/extensions +STAGEDIR=%%STAGEDIR%% +PREFIX=%%PREFIX%% +PLUGIN_INSTALL_DIRECTORY=${PREFIX}/lib/xchat/plugins +FRONTEND_INSTALL_DIRECTORY=${PREFIX}/bin +CWIRC_EXTENSIONS_DIRECTORY=${PREFIX}/share/cwirc/extensions #EXTRA_LDFLAGS= # Use these with Debian GNU/Linux for example @@ -74,11 +76,11 @@ all: missing_settings \ install: missing_settings \ $(PLUGIN) \ $(FRONTEND) - $(MKDIR) -p $(PLUGIN_INSTALL_DIRECTORY) - $(MKDIR) -p $(CWIRC_EXTENSIONS_DIRECTORY) - $(CP) $(PLUGIN) $(PLUGIN_INSTALL_DIRECTORY) - $(MKDIR) -p $(FRONTEND_INSTALL_DIRECTORY) - $(CP) $(FRONTEND) $(FRONTEND_INSTALL_DIRECTORY) + $(MKDIR) -p $(STAGEDIR)$(PLUGIN_INSTALL_DIRECTORY) + $(MKDIR) -p $(STAGEDIR)$(CWIRC_EXTENSIONS_DIRECTORY) + $(CP) $(PLUGIN) $(STAGEDIR)$(PLUGIN_INSTALL_DIRECTORY) + $(MKDIR) -p $(STAGEDIR)$(FRONTEND_INSTALL_DIRECTORY) + $(CP) $(FRONTEND) $(STAGEDIR)$(FRONTEND_INSTALL_DIRECTORY) uninstall: missing_settings $(RM) -f $(PLUGIN_INSTALL_DIRECTORY)/$(PLUGIN) diff --git a/irc/cwirc/pkg-descr b/irc/cwirc/pkg-descr index 910ad95fba4..d2f962a7b1f 100644 --- a/irc/cwirc/pkg-descr +++ b/irc/cwirc/pkg-descr @@ -8,4 +8,4 @@ straight or iambic key connected to a serial port, or using the mouse buttons, and the sound is played through the soundcard, or through an external sounder. -WWW: http://users.skynet.be/ppc/cwirc/ +WWW: http://myspace.voo.be/pcoupard/cwirc diff --git a/irc/cwirc/pkg-plist b/irc/cwirc/pkg-plist index 3b1b0c7a9ec..e70f9fcbcaf 100644 --- a/irc/cwirc/pkg-plist +++ b/irc/cwirc/pkg-plist @@ -1,8 +1,8 @@ bin/cwirc_frontend lib/xchat/plugins/cwirc.so -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/LISEZMOI -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/schematics/cw_oscillator.jpg -%%PORTDOCS%%%%DOCSDIR%%/schematics/rs232_key_connection.jpg +%%DOCSDIR%%/COPYING +%%DOCSDIR%%/LISEZMOI +%%DOCSDIR%%/README +%%DOCSDIR%%/RELEASE_NOTES +%%DOCSDIR%%/schematics/cw_oscillator.jpg +%%DOCSDIR%%/schematics/rs232_key_connection.jpg diff --git a/irc/py-gozerbot/Makefile b/irc/py-gozerbot/Makefile index 82d366e3da1..3a4efae53b1 100644 --- a/irc/py-gozerbot/Makefile +++ b/irc/py-gozerbot/Makefile @@ -19,7 +19,6 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= XMPP MYSQL DOCS XMPP_DESC= Jabber functions MYSQL_DESC= Mysql functions -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options RUN_DEPENDS+= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile index b457ead6f7d..c5362174b3d 100644 --- a/irc/unreal/Makefile +++ b/irc/unreal/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= Unreal -PORTVERSION= 3.2.10.4 -PORTREVISION= 2 +PORTVERSION= 3.2.10.5 +PORTREVISION= 0 CATEGORIES= irc ipv6 MASTER_SITES= http://www.unrealircd.com/downloads/ DISTNAME= ${PORTNAME}${PORTVERSION} diff --git a/irc/unreal/distinfo b/irc/unreal/distinfo index 99cfcaddeeb..e9b593f2d34 100644 --- a/irc/unreal/distinfo +++ b/irc/unreal/distinfo @@ -1,2 +1,2 @@ -SHA256 (Unreal3.2.10.4.tar.gz) = 5041b67745d0bd2072cf9b74c07853085b8b5b07330263f0986bdc56eda98aa8 -SIZE (Unreal3.2.10.4.tar.gz) = 3540227 +SHA256 (Unreal3.2.10.5.tar.gz) = fd1482356763dce30144ad425704e5d6527195acf564a02419006004c8c632fd +SIZE (Unreal3.2.10.5.tar.gz) = 3537602 diff --git a/irc/unreal/files/patch-configure.ac b/irc/unreal/files/patch-configure.ac deleted file mode 100644 index b3d30486b1f..00000000000 --- a/irc/unreal/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2014-07-26 15:42:10 UTC -+++ configure.ac -@@ -93,6 +93,8 @@ AC_CHECK_LIB(socket, socket, - AC_CHECK_LIB(nsl, inet_ntoa, - [IRCDLIBS="$IRCDLIBS-lnsl " - INETLIB="-lnsl"]) -+AC_CHECK_LIB(crypto, RAND_egd, -+ AC_DEFINE(HAVE_RAND_EGD, 1, [Define if the libcrypto has RAND_egd])) - - AC_SUBST(IRCDLIBS) - AC_SUBST(MKPASSWDLIBS) diff --git a/irc/unreal/files/patch-include_dynconf.h b/irc/unreal/files/patch-include_dynconf.h deleted file mode 100644 index bb4a435fe26..00000000000 --- a/irc/unreal/files/patch-include_dynconf.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/dynconf.h.orig 2014-07-26 15:42:10 UTC -+++ include/dynconf.h -@@ -204,7 +204,11 @@ extern MODVAR aConfiguration iConf; - #define SHOWCONNECTINFO iConf.show_connect_info - #define OPER_ONLY_STATS iConf.oper_only_stats - #define ANTI_SPAM_QUIT_MSG_TIME iConf.anti_spam_quit_message_time -+#ifdef HAVE_RAND_EGD - #define USE_EGD iConf.use_egd -+#else -+#define USE_EGD 0 -+#endif - #define EGD_PATH iConf.egd_path - - #define ircnetwork iConf.network.x_ircnetwork diff --git a/irc/unreal/files/patch-src_random.c b/irc/unreal/files/patch-src_random.c deleted file mode 100644 index f780f0e8d46..00000000000 --- a/irc/unreal/files/patch-src_random.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/random.c.orig 2014-07-26 15:42:10 UTC -+++ src/random.c -@@ -163,7 +163,7 @@ unsigned char mdbuf[16]; - void init_random() - { - struct { --#ifdef USE_SSL -+#if defined(USE_SSL) - char egd[32]; /* from EGD */ - #endif - #ifndef _WIN32 -@@ -187,7 +187,7 @@ MEMORYSTATUS mstat; - - /* Grab non-OS specific "random" data */ - #ifdef USE_SSL -- #if OPENSSL_VERSION_NUMBER >= 0x000907000 -+ #if OPENSSL_VERSION_NUMBER >= 0x000907000 && defined(HAVE_RAND_EGD) - if (EGD_PATH) { - n = RAND_query_egd_bytes(EGD_PATH, rdat.egd, sizeof(rdat.egd)); - } diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile index 913d68edbfa..8f0ba908606 100644 --- a/japanese/monafonts/Makefile +++ b/japanese/monafonts/Makefile @@ -3,7 +3,7 @@ PORTNAME= monafonts PORTVERSION= 2.90 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= SF/monafont/monafont/monafont-${PORTVERSION} diff --git a/japanese/monafonts/pkg-descr b/japanese/monafonts/pkg-descr index 847349458aa..595b31d1152 100644 --- a/japanese/monafonts/pkg-descr +++ b/japanese/monafonts/pkg-descr @@ -3,6 +3,6 @@ Japanese Windows font. This is named after ASCII art 'mona' used in '2 channel', notorious huge Web BBS. Bitmap font is installed the following directory tree: - ${LOCALBASE}/share/fonts/monafont/ + ${LOCALBASE}/share/fonts/monafonts/ WWW: http://monafont.sourceforge.net/ diff --git a/japanese/monafonts/pkg-install b/japanese/monafonts/pkg-install index 2551f63b15d..cc365f4c262 100644 --- a/japanese/monafonts/pkg-install +++ b/japanese/monafonts/pkg-install @@ -4,7 +4,7 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0 fi -FONTDIR=${PKG_PREFIX}/share/fonts/monafont +FONTDIR=${PKG_PREFIX}/share/fonts/monafonts grepv() { awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 @@ -79,8 +79,9 @@ cp fonts.alias fonts.alias.orig rm -f fonts.alias.orig ${TMPFILE} echo "**********************************************************" -echo "You should restart X server or do 'xset fp rehash' command" -echo "to enable this update." +echo "Please add ${FONTDIR}" +echo "to your font path in /etc/X11/xorg.conf." +echo "You should restart X server to enable this update." echo "**********************************************************" exit 0 diff --git a/japanese/p5-MeCab/Makefile b/japanese/p5-MeCab/Makefile index a2c15dbc3cd..9a999f8f263 100644 --- a/japanese/p5-MeCab/Makefile +++ b/japanese/p5-MeCab/Makefile @@ -21,7 +21,6 @@ USES= perl5 USE_PERL5= configure OPTIONS_DEFINE= EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/ja-p5-${PORTNAME}/options .include diff --git a/japanese/ruby-mecab/Makefile b/japanese/ruby-mecab/Makefile index 6d5331b628b..010202d347d 100644 --- a/japanese/ruby-mecab/Makefile +++ b/japanese/ruby-mecab/Makefile @@ -22,7 +22,6 @@ USE_RUBY_EXTCONF= yes INSTALL_TARGET= site-install OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/ja-ruby-${PORTNAME}/options .include diff --git a/java/netty/Makefile b/java/netty/Makefile index 0f6fc251856..354c6ffe5ec 100644 --- a/java/netty/Makefile +++ b/java/netty/Makefile @@ -17,8 +17,8 @@ USES= cpe tar:bzip2 CPE_VENDOR= netty_project JAVA_VERSION= 1.6+ NO_BUILD= yes -DATADIR= ${PREFIX}/share/${UNIQUENAME} -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DATADIR= ${PREFIX}/share/${PKGBASE} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.Final PLIST_FILES= %%JAVAJARDIR%%/netty-${PORTVERSION}.jar \ diff --git a/java/openjdk6-jre/Makefile b/java/openjdk6-jre/Makefile index 65624f4bb35..5bc91065cad 100644 --- a/java/openjdk6-jre/Makefile +++ b/java/openjdk6-jre/Makefile @@ -7,6 +7,5 @@ COMMENT= Oracle's Java 6 Runtime Environment under the GPL v2 BUILD_JRE= yes MASTERDIR= ${.CURDIR}/../openjdk6 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} .include "${MASTERDIR}/Makefile" diff --git a/java/openjdk7-jre/Makefile b/java/openjdk7-jre/Makefile index 52c032962a8..e52fd2626cc 100644 --- a/java/openjdk7-jre/Makefile +++ b/java/openjdk7-jre/Makefile @@ -5,8 +5,6 @@ PKGNAMESUFFIX= -jre MAINTAINER= java@FreeBSD.org COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} -LATEST_LINK= openjdk7${PKGNAMESUFFIX} - BUILD_JRE= yes MASTERDIR= ${.CURDIR}/../openjdk7 diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 8958bbec6e2..9d9cde9f5c5 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -58,8 +58,6 @@ JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src- ANT_VERSION= 1.9.4 ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin -LATEST_LINK?= openjdk7 - LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 diff --git a/lang/alchemist.el/Makefile b/lang/alchemist.el/Makefile index 17ded8386ce..edf75c07e87 100644 --- a/lang/alchemist.el/Makefile +++ b/lang/alchemist.el/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= alchemist.el -PORTVERSION= 1.3.1 +PORTVERSION= 1.4.0 DISTVERSIONPREFIX= v CATEGORIES= lang diff --git a/lang/alchemist.el/distinfo b/lang/alchemist.el/distinfo index 909c7947fa5..d93448ea7c3 100644 --- a/lang/alchemist.el/distinfo +++ b/lang/alchemist.el/distinfo @@ -1,2 +1,2 @@ -SHA256 (tonini-alchemist.el-v1.3.1_GH0.tar.gz) = 81ad6c650eedc74d8637b305fbc57dda0dbc02fcd2ef2a5326cffdc49369e04b -SIZE (tonini-alchemist.el-v1.3.1_GH0.tar.gz) = 1714259 +SHA256 (tonini-alchemist.el-v1.4.0_GH0.tar.gz) = a054134e4e7b48c67e1919d447fc99b4894d506be74a1dc5ee8054a276f8fec3 +SIZE (tonini-alchemist.el-v1.4.0_GH0.tar.gz) = 1718209 diff --git a/lang/alchemist.el/pkg-plist b/lang/alchemist.el/pkg-plist index ce4a5601116..9912dd42c13 100644 --- a/lang/alchemist.el/pkg-plist +++ b/lang/alchemist.el/pkg-plist @@ -16,12 +16,14 @@ %%EMACS_SITE_LISPDIR%%/alchemist-project.el %%EMACS_SITE_LISPDIR%%/alchemist-refcard.el %%EMACS_SITE_LISPDIR%%/alchemist-report.el +%%EMACS_SITE_LISPDIR%%/alchemist-scope.el %%EMACS_SITE_LISPDIR%%/alchemist-server.el %%EMACS_SITE_LISPDIR%%/alchemist-test-mode.el %%EMACS_SITE_LISPDIR%%/alchemist-utils.el %%EMACS_SITE_LISPDIR%%/alchemist.el %%EMACS_SITE_LISPDIR%%/server/case.exs %%EMACS_SITE_LISPDIR%%/server/completer.exs +%%EMACS_SITE_LISPDIR%%/server/documentation.exs %%EMACS_SITE_LISPDIR%%/server/informant.exs %%EMACS_SITE_LISPDIR%%/server/run.exs %%EMACS_SITE_LISPDIR%%/server/server.exs diff --git a/lang/duktape/Makefile b/lang/duktape/Makefile index ff9e2f90011..f52d04f0660 100644 --- a/lang/duktape/Makefile +++ b/lang/duktape/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= duktape -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.3 CATEGORIES= lang devel MASTER_SITES= http://duktape.org/ diff --git a/lang/duktape/distinfo b/lang/duktape/distinfo index fffb9a20184..939b18c6c4c 100644 --- a/lang/duktape/distinfo +++ b/lang/duktape/distinfo @@ -1,2 +1,2 @@ -SHA256 (duktape-1.2.2.tar.xz) = c3aaee02439d0b76cd38ba9fb6bb36e338b14764e3cd28d1fff27ef3f4cf9631 -SIZE (duktape-1.2.2.tar.xz) = 514160 +SHA256 (duktape-1.2.3.tar.xz) = 3c065a0cc4e0264ba01e4c35bc9cb06ff20a695186e69cec9acb6e7c0948e033 +SIZE (duktape-1.2.3.tar.xz) = 514152 diff --git a/lang/elixir-mode.el/Makefile b/lang/elixir-mode.el/Makefile index 9dbc500b09f..19a2d56d18a 100644 --- a/lang/elixir-mode.el/Makefile +++ b/lang/elixir-mode.el/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= elixir-mode.el -PORTVERSION= 2.2.5 +PORTVERSION= 2.2.6 DISTVERSIONPREFIX= v CATEGORIES= lang diff --git a/lang/elixir-mode.el/distinfo b/lang/elixir-mode.el/distinfo index 8f6173662f7..6d009a8020c 100644 --- a/lang/elixir-mode.el/distinfo +++ b/lang/elixir-mode.el/distinfo @@ -1,2 +1,2 @@ -SHA256 (elixir-lang-emacs-elixir-v2.2.5_GH0.tar.gz) = 951ef1601e48cef30eac9e48db4df1a50a4d465f1fe8988b80de7a1e29b8bb8e -SIZE (elixir-lang-emacs-elixir-v2.2.5_GH0.tar.gz) = 26815 +SHA256 (elixir-lang-emacs-elixir-v2.2.6_GH0.tar.gz) = f81e698f4e6bec4ccd7481f676e87dfffae02b9a545ad68369f63c5c270b804b +SIZE (elixir-lang-emacs-elixir-v2.2.6_GH0.tar.gz) = 24953 diff --git a/lang/elixir-mode.el/pkg-plist b/lang/elixir-mode.el/pkg-plist index 9ccaeecf8c5..d6abf0ac6af 100644 --- a/lang/elixir-mode.el/pkg-plist +++ b/lang/elixir-mode.el/pkg-plist @@ -1,6 +1,5 @@ %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md %%PORTDOCS%%%%DOCSDIR%%/README.md -%%EMACS_SITE_LISPDIR%%/elixir-deprecated.el %%EMACS_SITE_LISPDIR%%/elixir-mode.el %%EMACS_SITE_LISPDIR%%/elixir-smie.el diff --git a/lang/execline/Makefile b/lang/execline/Makefile index 473bf18d165..28ccb36ec8e 100644 --- a/lang/execline/Makefile +++ b/lang/execline/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= execline -PORTVERSION= 2.1.3.0 +PORTVERSION= 2.1.3.1 CATEGORIES= lang shells MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/ @@ -11,7 +11,7 @@ COMMENT= Lightweight non-interactive sh(1)-like scripting language LICENSE= ISCL -BUILD_DEPENDS= skalibs>=2.3.6.0:${PORTSDIR}/devel/skalibs +BUILD_DEPENDS= skalibs>=2.3.6.1:${PORTSDIR}/devel/skalibs CONFLICTS_INSTALL= ImageMagick-* # bin/import @@ -21,6 +21,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-sysdeps=${LOCALBASE}/lib/skalibs/sysdeps \ --with-lib=${LOCALBASE}/lib/skalibs \ + --with-dynlib=${LOCALBASE}/lib \ --with-include=${LOCALBASE}/include \ --enable-shared diff --git a/lang/execline/distinfo b/lang/execline/distinfo index 6cc97dac11b..0dac02826ea 100644 --- a/lang/execline/distinfo +++ b/lang/execline/distinfo @@ -1,2 +1,2 @@ -SHA256 (execline-2.1.3.0.tar.gz) = 572448cf236ce7a17f8666b4bb05f3319fe6b559d7f89b797659886bdf21e54f -SIZE (execline-2.1.3.0.tar.gz) = 78287 +SHA256 (execline-2.1.3.1.tar.gz) = 7291d7c0e40f9706fc223abe290bb07a71fcf5fceec079a715e7d25bd2700236 +SIZE (execline-2.1.3.1.tar.gz) = 78584 diff --git a/lang/execline/pkg-plist b/lang/execline/pkg-plist index 7cb0f36c8ba..268babb2821 100644 --- a/lang/execline/pkg-plist +++ b/lang/execline/pkg-plist @@ -49,7 +49,7 @@ lib/libexecline.so lib/libexecline.so.2 lib/libexecline.so.2.1 lib/libexecline.so.2.1.3 -lib/libexecline.so.2.1.3.0 +lib/libexecline.so.2.1.3.1 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/INSTALL diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile index 91b4010181f..6daa31f3976 100644 --- a/lang/fpc-units/Makefile +++ b/lang/fpc-units/Makefile @@ -96,8 +96,6 @@ X11_DESC= Interface to X windows server XFORMS_DESC= Interface to X-Forms ZLIB_DESC= Interface to the zlib compression library -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} - OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \ FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \ FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPINDEXER \ diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 001fbc1603e..2edffbfe9e4 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -26,8 +26,6 @@ USES= gmake iconv ONLY_FOR_ARCHS= i386 amd64 BOOTVER= 2.6.4 -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options - OPT?=-CX FPCSRCDIR= ${PORTNAME}-${PORTVERSION} diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index afb8010eb55..aefa5579291 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -26,7 +26,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif CPE_VENDOR= gnu -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 76b1cdff436..7db86eab7d8 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -27,7 +27,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CONFLICTS= gcc-4.7.* CPE_VENDOR= gnu -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index f92da2e06ab..2739fb9c12c 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -26,7 +26,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CONFLICTS= gcc-4.8.* CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile index fe96f092bc4..d1dd3c13cf5 100644 --- a/lang/gcc49/Makefile +++ b/lang/gcc49/Makefile @@ -25,7 +25,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of diff --git a/lang/gcc5-devel/Makefile b/lang/gcc5-devel/Makefile index 545b4181526..95aeb72b434 100644 --- a/lang/gcc5-devel/Makefile +++ b/lang/gcc5-devel/Makefile @@ -25,7 +25,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile index 58c283c985c..e18894e4836 100644 --- a/lang/gcc5/Makefile +++ b/lang/gcc5/Makefile @@ -26,7 +26,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile index 872e9b01c60..656f59226b3 100644 --- a/lang/gcc6-devel/Makefile +++ b/lang/gcc6-devel/Makefile @@ -25,7 +25,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of diff --git a/lang/nbc/Makefile b/lang/nbc/Makefile index fed2b042774..5f782b87d26 100644 --- a/lang/nbc/Makefile +++ b/lang/nbc/Makefile @@ -5,7 +5,7 @@ PORTNAME= nbc PORTVERSION= 1.2.1.r4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang MASTER_SITES= SF/bricxcc/NBC_NXC/NBC%20release%20${PORTVERSION:S/.r/%20r/} DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -23,7 +23,7 @@ ROBOCTL_DESC= Include roboctl to communicate with the NXT ROBOCTL_RUN_DEPENDS= legoctl:${PORTSDIR}/devel/roboctl USES= dos2unix gmake tar:tgz -USE_FPC= fcl-base fcl-image +USE_FPC= fcl-base fcl-image hash pasjpeg paszlib PLIST_FILES= bin/nbc \ include/nbc/NXCDefs.h \ diff --git a/lang/p5-Marpa-XS/Makefile b/lang/p5-Marpa-XS/Makefile index 1cc67f41df2..814e1092111 100644 --- a/lang/p5-Marpa-XS/Makefile +++ b/lang/p5-Marpa-XS/Makefile @@ -3,7 +3,7 @@ PORTNAME= Marpa-XS PORTVERSION= 1.008000 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang textproc perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:JKEGL @@ -24,4 +24,7 @@ TEST_DEPENDS= p5-Test-Weaken>=3.004000:${PORTSDIR}/devel/p5-Test-Weaken USE_PERL5= modbuild USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Marpa/XS/XS.so + .include diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index cca4e373c71..93aef0e535f 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -28,7 +28,7 @@ CONFLICTS_INSTALL= perl5.*-* USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.23.1-188-gd29663d +GH_TAGNAME= v5.23.1-198-g0ba9d88 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo index 63c8b44b759..9b98e53381a 100644 --- a/lang/perl5-devel/distinfo +++ b/lang/perl5-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (perl/perl-5.23.1-188_GH0.tar.gz) = a849cdba435526e8dd50ddfa0f10da08f78ae3f58501f49e9855cb52b23bd4ab -SIZE (perl/perl-5.23.1-188_GH0.tar.gz) = 17510264 +SHA256 (perl/perl-5.23.1-198_GH0.tar.gz) = 8565594bf5624ce5031aa5681ac40a5cffd2fdec7f2040b70e73118b87b0c27d +SIZE (perl/perl-5.23.1-198_GH0.tar.gz) = 17509150 diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 24285244b19..c7a7c0055c8 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -13,8 +13,6 @@ COMMENT= PHP Scripting Language LICENSE= PHP301 -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 93fda0c6da4..7ad85e7faff 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -13,8 +13,6 @@ COMMENT= PHP Scripting Language LICENSE= PHP301 -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile index c5409cadbf3..b7123a54901 100644 --- a/lang/py-mx-base/Makefile +++ b/lang/py-mx-base/Makefile @@ -21,7 +21,6 @@ USE_PYTHON= distutils PYDISTUTILS_PKGNAME= egenix-mx-base PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}-nspkg.pth -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= DOCS ZOPE EXAMPLES ZOPE_USES= zope diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile index fafe9df0921..a641622b4ee 100644 --- a/lang/ruby20/Makefile +++ b/lang/ruby20/Makefile @@ -45,8 +45,6 @@ USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes -NO_LATEST_LINK= yes - OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES RDOC OPTIONS_DEFAULT= RDOC LIBEDIT OPTIONS_SINGLE= EDIT diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile index 4faab73c62d..483e500c638 100644 --- a/lang/ruby21/Makefile +++ b/lang/ruby21/Makefile @@ -44,7 +44,6 @@ RUBY_VER= 2.1 USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes -NO_LATEST_LINK= yes OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES RDOC OPTIONS_DEFAULT= RDOC LIBEDIT diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile index 140f5502946..49b92f46874 100644 --- a/lang/ruby22/Makefile +++ b/lang/ruby22/Makefile @@ -44,7 +44,6 @@ RUBY_VER= 2.2 USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes -NO_LATEST_LINK= yes OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES RDOC OPTIONS_DEFAULT= RDOC LIBEDIT diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index f62e3c9a50d..742f602ccfd 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TCL_VER= 8.4 SHORT_TCL_VER= ${TCL_VER:S/8./8/} -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} MAKE_ENV= SHORT_TCL_VER="${SHORT_TCL_VER}" \ MAN_SUFFIX=.${MAN_SUFFIX} \ diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index 6697ee76e0a..9a5839ea31b 100644 --- a/lang/tcl86/Makefile +++ b/lang/tcl86/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TCL_VER= ${PORTVERSION:R} SHORT_TCL_VER= ${TCL_VER:S/.//} -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} MAKE_ENV= SHORT_TCL_VER=${SHORT_TCL_VER} \ MAN_SUFFIX=.${MAN_SUFFIX} \ diff --git a/mail/addresses-goodies/Makefile b/mail/addresses-goodies/Makefile index e3a5d927916..fc9b1170434 100644 --- a/mail/addresses-goodies/Makefile +++ b/mail/addresses-goodies/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= libInspector.so:${PORTSDIR}/deskutils/gworkspace \ libAddresses.so:${PORTSDIR}/mail/addresses USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}/Goodies post-patch: diff --git a/mail/findmaildirs/Makefile b/mail/findmaildirs/Makefile index cb5e84b8e7f..196b2ee4fae 100644 --- a/mail/findmaildirs/Makefile +++ b/mail/findmaildirs/Makefile @@ -4,7 +4,6 @@ PORTNAME= findmaildirs PORTVERSION= 0.2 CATEGORIES= mail -MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple utility to create list of maildirs for mutt diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile index 0d1abb94c20..5da8a5c9a9b 100644 --- a/mail/p5-IMAP-Admin/Makefile +++ b/mail/p5-IMAP-Admin/Makefile @@ -14,7 +14,7 @@ COMMENT= Perl module for basic IMAP server administration USES= perl5 USE_PERL5= configure -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} OPTIONS_DEFINE= EXAMPLES diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index 6a6665f67c2..9469526f49d 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -14,7 +14,6 @@ COMMENT= Secure, performance, tiny POP3 daemon ALL_TARGET= popa3d PLIST= ${WRKDIR}/.PLIST.more CFLAGS+= -DPREFIX=${PREFIX} -UNIQUENAME= ${.CURDIR:T} OPTIONS_DEFINE= SMTP_AFTER_POP3 STANDALONE_POP3 SETPROCTITLE DOCS NO_OPTIONS_SORT=yes diff --git a/mail/postfix-policyd-spf-python/Makefile b/mail/postfix-policyd-spf-python/Makefile index a0d94960fd6..928e39928f6 100644 --- a/mail/postfix-policyd-spf-python/Makefile +++ b/mail/postfix-policyd-spf-python/Makefile @@ -33,7 +33,6 @@ SUB_FILES= pkg-message SUB_LIST= PYTHON_CMD=${PYTHON_CMD} OPTIONS_DEFINE= DOCS -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options post-patch: @${MV} ${WRKSRC}/policyd-spf.conf ${WRKSRC}/policyd-spf.conf.sample diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile index 2cae97036bb..8ecbfd78902 100644 --- a/mail/qmail-ldap/Makefile +++ b/mail/qmail-ldap/Makefile @@ -26,6 +26,5 @@ LDAP_PATCH_DATE= 20120221 MASTERDIR= ${.CURDIR}/../qmail DESCR= ${.CURDIR}/pkg-descr PATCHDIR= ${.CURDIR}/files -LATEST_LINK= ${PORTNAME}-ldap .include "${MASTERDIR}/Makefile" diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile index bd6d2c3842c..5f3a6e91ea3 100644 --- a/mail/qmail-mysql/Makefile +++ b/mail/qmail-mysql/Makefile @@ -19,6 +19,5 @@ USE_MYSQL= yes MASTERDIR= ${.CURDIR}/../qmail DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} .include "${MASTERDIR}/Makefile" diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile index b99541f3716..04cc017c9dc 100644 --- a/mail/qmail-spamcontrol/Makefile +++ b/mail/qmail-spamcontrol/Makefile @@ -22,7 +22,6 @@ EXTRA_PATCHES+= ${MASTERDIR}/files/patch-install.c \ QMAIL_DIST= ${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX} SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}.tgz SPAMCONTROL_VERSION= 2731 -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} SLAVE_SPAMCONTROL= yes diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile index d41896a9541..dbf05ab82af 100644 --- a/mail/qmail-tls/Makefile +++ b/mail/qmail-tls/Makefile @@ -20,6 +20,5 @@ USE_OPENSSL= yes # Local overrides MASTERDIR= ${.CURDIR}/../qmail DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} .include "${MASTERDIR}/Makefile" diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile index dbf13d0696b..84127ab3471 100644 --- a/mail/wanderlust-devel/Makefile +++ b/mail/wanderlust-devel/Makefile @@ -21,7 +21,6 @@ GH_TAGNAME= 5e741ba SNAPDATE= 20141209 CONFLICTS= wanderlust-*-2.14.* -NO_LATEST_LINK= yes OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT=DOCS EXAMPLES diff --git a/math/aspcud/Makefile b/math/aspcud/Makefile index 299d8107902..b78acdee75c 100644 --- a/math/aspcud/Makefile +++ b/math/aspcud/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= aspcud -PORTVERSION= 1.9.0 +PORTVERSION= 1.9.1 DISTVERSIONSUFFIX= -source CATEGORIES= math ports-mgmt sysutils MASTER_SITES= SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION} @@ -15,8 +15,8 @@ LICENSE= GPLv3 BUILD_DEPENDS= re2c:${PORTSDIR}/devel/re2c LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= gringo:${PORTSDIR}/math/gringo \ - clasp:${PORTSDIR}/math/clasp \ - bash:${PORTSDIR}/shells/bash + clasp:${PORTSDIR}/math/clasp \ + bash:${PORTSDIR}/shells/bash USES= compiler:c++11-lang cmake:outsource python:run diff --git a/math/aspcud/distinfo b/math/aspcud/distinfo index 691e6e60fd2..042de06d995 100644 --- a/math/aspcud/distinfo +++ b/math/aspcud/distinfo @@ -1,2 +1,2 @@ -SHA256 (aspcud-1.9.0-source.tar.gz) = e38c0a5c2622a7ba6f0ae0e575f11b47ff126f44d188e0b43ea2ccc676192009 -SIZE (aspcud-1.9.0-source.tar.gz) = 110360 +SHA256 (aspcud-1.9.1-source.tar.gz) = e0e917a9a6c5ff080a411ff25d1174e0d4118bb6759c3fe976e2e3cca15e5827 +SIZE (aspcud-1.9.1-source.tar.gz) = 69922404 diff --git a/math/clasp/Makefile b/math/clasp/Makefile index 6e108b04cc1..26e4b9e206b 100644 --- a/math/clasp/Makefile +++ b/math/clasp/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= clasp -PORTVERSION= 3.1.0 +PORTVERSION= 3.1.3 CATEGORIES= math devel MASTER_SITES= SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION} EXTRACT_SUFX= -source.tar.gz diff --git a/math/clasp/distinfo b/math/clasp/distinfo index cb7b3ccbc26..5873f31e549 100644 --- a/math/clasp/distinfo +++ b/math/clasp/distinfo @@ -1,2 +1,2 @@ -SHA256 (clasp-3.1.0-source.tar.gz) = 7715980aa808a5edac1d8d8a61ff2f2bb595d97e237beb687f1a62a13c531bdc -SIZE (clasp-3.1.0-source.tar.gz) = 515019 +SHA256 (clasp-3.1.3-source.tar.gz) = f08684eadfa5ae5efa5c06439edc361b775fc55b7c1a9ca862eda8f5bf7e5f1f +SIZE (clasp-3.1.3-source.tar.gz) = 520291 diff --git a/math/clasp/files/patch-libprogram_opts__src__string_convert.cpp b/math/clasp/files/patch-libprogram_opts__src__string_convert.cpp deleted file mode 100644 index d2a78301f8a..00000000000 --- a/math/clasp/files/patch-libprogram_opts__src__string_convert.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- ./libprogram_opts/src/string_convert.cpp.orig 2014-08-12 18:47:21.000000000 +0300 -+++ ./libprogram_opts/src/string_convert.cpp 2014-08-27 14:59:59.000000000 +0300 -@@ -94,7 +94,7 @@ - err = (char*)x+2; - } - else if (*x != '-') { -- out = std::strtoul(x, &err, detectBase(x)); -+ out = strtoul(x, &err, detectBase(x)); - if (out == ULONG_MAX && errno == ERANGE) { err = (char*)x; } - } - else { err = (char*)x; } -@@ -191,7 +191,7 @@ - if (t) { out = temp; return t; } - if (empty(x, errPos) || *x == '-') { return 0; } - char* err; -- out = std::strtoull(x, &err, detectBase(x)); -+ out = strtoull(x, &err, detectBase(x)); - return parsed(err != x, err, errPos); - } - std::string& xconvert(std::string& out, long long x) { diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile index b3ed5782912..47a8fb01c75 100644 --- a/math/eigen3/Makefile +++ b/math/eigen3/Makefile @@ -2,6 +2,7 @@ PORTNAME= eigen PORTVERSION= 3.2.2 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://bitbucket.org/${PORTNAME}/${PORTNAME}/get/ DISTNAME= ${PORTVERSION} @@ -14,7 +15,7 @@ LICENSE= LGPL21 MPL LICENSE_COMB= multi USES= cmake:outsource tar:bzip2 -CMAKE_ENV+= PKG_CONFIG_LIBDIR="${LOCALBASE}/libdata" +CONFIGURE_ENV+= PKG_CONFIG_LIBDIR="${PREFIX}/libdata" NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-1306d75b4a21 diff --git a/math/gringo/Makefile b/math/gringo/Makefile index 5395da7b398..f6d8fa3d1ae 100644 --- a/math/gringo/Makefile +++ b/math/gringo/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= gringo -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.2 DISTVERSIONSUFFIX= -source -PORTREVISION= 1 CATEGORIES= math devel MASTER_SITES= SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION} @@ -19,8 +18,9 @@ USES= scons bison compiler:c++11-lang MAKE_ARGS+= ${MAKE_ENV} CXXFLAGS+= -std=c++11 +MAKE_ENV+= WITH_LUA=no -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} bin/clingo .include @@ -29,6 +29,7 @@ USE_GCC= yes .endif do-install: - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/debug/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/debug/clingo ${STAGEDIR}${PREFIX}/bin/clingo .include diff --git a/math/gringo/distinfo b/math/gringo/distinfo index 75d4abb11ee..ea91f342d51 100644 --- a/math/gringo/distinfo +++ b/math/gringo/distinfo @@ -1,2 +1,2 @@ -SHA256 (gringo-4.4.0-source.tar.gz) = 49b2ddc78f568a12530c780a29bb7f57b656556f0840c5e9ada4f207913dde5e -SIZE (gringo-4.4.0-source.tar.gz) = 1482711 +SHA256 (gringo-4.5.2-source.tar.gz) = 36d86321c54499cabf498dac0923b39e43c7a248919224a11c2d15e4ecec9d65 +SIZE (gringo-4.5.2-source.tar.gz) = 1674048 diff --git a/math/gringo/files/patch-SConscript b/math/gringo/files/patch-SConscript new file mode 100644 index 00000000000..ca548bd49f6 --- /dev/null +++ b/math/gringo/files/patch-SConscript @@ -0,0 +1,11 @@ +--- SConscript.orig 2015-08-17 12:39:49 UTC ++++ SConscript +@@ -202,7 +202,7 @@ if env['WITH_LUA'] == "auto": + if conf.CheckWithPkgConfig("lua", ["lua", "lua5.1", "lua-5.1", "lua5.2", "lua-5.2", "lua5.3", "lua-5.3"]): + with_lua = True + DEFS["WITH_LUA"] = 1 +-elif env['WITH_LUA']: ++elif env['WITH_LUA'] != "no": + if not conf.CheckLibs("lua", env['WITH_LUA'], "lua.hpp"): + failure = True + else: diff --git a/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp b/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp deleted file mode 100644 index d2a78301f8a..00000000000 --- a/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- ./libprogram_opts/src/string_convert.cpp.orig 2014-08-12 18:47:21.000000000 +0300 -+++ ./libprogram_opts/src/string_convert.cpp 2014-08-27 14:59:59.000000000 +0300 -@@ -94,7 +94,7 @@ - err = (char*)x+2; - } - else if (*x != '-') { -- out = std::strtoul(x, &err, detectBase(x)); -+ out = strtoul(x, &err, detectBase(x)); - if (out == ULONG_MAX && errno == ERANGE) { err = (char*)x; } - } - else { err = (char*)x; } -@@ -191,7 +191,7 @@ - if (t) { out = temp; return t; } - if (empty(x, errPos) || *x == '-') { return 0; } - char* err; -- out = std::strtoull(x, &err, detectBase(x)); -+ out = strtoull(x, &err, detectBase(x)); - return parsed(err != x, err, errPos); - } - std::string& xconvert(std::string& out, long long x) { diff --git a/math/metis/Makefile b/math/metis/Makefile index 8d7b397a4d8..04034d29d2d 100644 --- a/math/metis/Makefile +++ b/math/metis/Makefile @@ -91,7 +91,7 @@ do-configure: .for o in SHARED STATIC #PROFILE .if ${PORT_OPTIONS:M${o}} @${PRINTF} "\n\nConfiguring ${o}:\n\n\n" - @cd ${WRKSRC_${o}}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} \ + @cd ${WRKSRC_${o}}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ ${CMAKE_ARGS:C|${CFLAGS}|& ${${o}_FLAGS}|g} ${CMAKE_ARGS_${o}} \ -DGKLIB_PATH="${WRKSRC_${o}}/GKlib" ${CMAKE_SOURCE_PATH} .endif diff --git a/math/octave-forge-fpl/Makefile b/math/octave-forge-fpl/Makefile index dfd02afc943..6f1482ddff1 100644 --- a/math/octave-forge-fpl/Makefile +++ b/math/octave-forge-fpl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-fpl -PORTVERSION= 1.3.4 -PORTREVISION= 4 +PORTVERSION= 1.3.5 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-fpl/distinfo b/math/octave-forge-fpl/distinfo index fce0d9e4ef9..b561e36c10a 100644 --- a/math/octave-forge-fpl/distinfo +++ b/math/octave-forge-fpl/distinfo @@ -1,2 +1,2 @@ -SHA256 (octave-forge/fpl-1.3.4.tar.gz) = ac8532c8b58524f31c4d4bda703596926b94e04d53016b41db276bcbac83c2a1 -SIZE (octave-forge/fpl-1.3.4.tar.gz) = 45873 +SHA256 (octave-forge/fpl-1.3.5.tar.gz) = da13b8044e0ffb91f488427c4d3f3fdefb8d208753f572ef4d3b53972c547731 +SIZE (octave-forge/fpl-1.3.5.tar.gz) = 19317 diff --git a/math/p5-Math-BigInt-GMP/Makefile b/math/p5-Math-BigInt-GMP/Makefile index 430bbc2987f..da24977dd52 100644 --- a/math/p5-Math-BigInt-GMP/Makefile +++ b/math/p5-Math-BigInt-GMP/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Math-BigInt-GMP -PORTVERSION= 1.38 -PORTREVISION= 1 +PORTVERSION= 1.39 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -27,4 +26,7 @@ post-patch: -e "if (/'LIBS'/) { print qq!'INC' => '-I${LOCALBASE}/include',!; }" \ ${WRKSRC}/Makefile.PL +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/BigInt/GMP/GMP.so + .include diff --git a/math/p5-Math-BigInt-GMP/distinfo b/math/p5-Math-BigInt-GMP/distinfo index 6a67925a376..6ac5d78b9de 100644 --- a/math/p5-Math-BigInt-GMP/distinfo +++ b/math/p5-Math-BigInt-GMP/distinfo @@ -1,2 +1,2 @@ -SHA256 (Math-BigInt-GMP-1.38.tar.gz) = 1ad0cac911a08f150c5e5a8286aec20de21c863bd27b8f002456cff11e086f15 -SIZE (Math-BigInt-GMP-1.38.tar.gz) = 55585 +SHA256 (Math-BigInt-GMP-1.39.tar.gz) = d3d7ce4cfdd21ad829b069bf102a872555075b4f02ee4c28b468c11364cfa0b3 +SIZE (Math-BigInt-GMP-1.39.tar.gz) = 55689 diff --git a/math/p5-Math-BigInt-GMP/pkg-plist b/math/p5-Math-BigInt-GMP/pkg-plist index 92e09dd9170..6d6bd96aa67 100644 --- a/math/p5-Math-BigInt-GMP/pkg-plist +++ b/math/p5-Math-BigInt-GMP/pkg-plist @@ -1,3 +1,3 @@ -%%PERL5_MAN3%%/Math::BigInt::GMP.3.gz %%SITE_ARCH%%/Math/BigInt/GMP.pm %%SITE_ARCH%%/auto/Math/BigInt/GMP/GMP.so +%%PERL5_MAN3%%/Math::BigInt::GMP.3.gz diff --git a/math/p5-Math-CDF/Makefile b/math/p5-Math-CDF/Makefile index 29b8ce6b2cd..e904444db3d 100644 --- a/math/p5-Math-CDF/Makefile +++ b/math/p5-Math-CDF/Makefile @@ -3,7 +3,7 @@ PORTNAME= Math-CDF PORTVERSION= 0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,4 +14,7 @@ COMMENT= Generate probabilities and quantiles USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/CDF/CDF.so + .include diff --git a/math/p5-Math-GMP/Makefile b/math/p5-Math-GMP/Makefile index 5fec4dcac5f..48a081ea5d8 100644 --- a/math/p5-Math-GMP/Makefile +++ b/math/p5-Math-GMP/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Math-GMP -PORTVERSION= 2.10 +PORTVERSION= 2.11 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/math/p5-Math-GMP/distinfo b/math/p5-Math-GMP/distinfo index 6e061801a21..e7bf7ca2b05 100644 --- a/math/p5-Math-GMP/distinfo +++ b/math/p5-Math-GMP/distinfo @@ -1,2 +1,2 @@ -SHA256 (Math-GMP-2.10.tar.gz) = 40bc8895ac6ba4c3f26f6c26da7af72c3ffc3400811e267bc6b57a477d6f2749 -SIZE (Math-GMP-2.10.tar.gz) = 30226 +SHA256 (Math-GMP-2.11.tar.gz) = 4d535c110bf443638fc2f83da7cb120ea5da91cbf9e3e476584b02c81ac82cda +SIZE (Math-GMP-2.11.tar.gz) = 31178 diff --git a/math/p5-Math-GSL/Makefile b/math/p5-Math-GSL/Makefile index c19e06d1007..8fc269fb784 100644 --- a/math/p5-Math-GSL/Makefile +++ b/math/p5-Math-GSL/Makefile @@ -3,6 +3,7 @@ PORTNAME= Math-GSL PORTVERSION= 0.35 +PORTREVISION= 1 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -23,6 +24,9 @@ TEST_DEPENDS= p5-Test-Class>=0.12:${PORTSDIR}/devel/p5-Test-Class \ USE_PERL5= modbuild USES= perl5 -BROKEN_sparc64= Does not compile on sparc64 +BROKEN_sparc64= does not compile on sparc64 + +post-install: + ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/GSL/ -name "*.so" | ${XARGS} -J % ${STRIP_CMD} % .include diff --git a/math/p5-Math-Prime-XS/Makefile b/math/p5-Math-Prime-XS/Makefile index 53797b8713c..77988dc296d 100644 --- a/math/p5-Math-Prime-XS/Makefile +++ b/math/p5-Math-Prime-XS/Makefile @@ -3,7 +3,7 @@ PORTNAME= Math-Prime-XS PORTVERSION= 0.26 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -23,4 +23,7 @@ TEST_DEPENDS= p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \ USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/Prime/XS/XS.so + .include diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index bdf1d6d4d22..3c15c38e5a7 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -32,7 +32,6 @@ TKAGGBACKEND_DESC= TKAgg backend support WXAGGBACKEND_DESC= WXAgg backend support PORTEXAMPLES= * -UNIQUENAME= ${PORTNAME} .include diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile index c2b45992e64..b4def8e0617 100644 --- a/math/py-symeig/Makefile +++ b/math/py-symeig/Makefile @@ -16,9 +16,6 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} -LATEST_LINK= py-${PORTNAME} -OPTIONSFILE= ${PORT_DBDIR}/py-numpy/options - USES= fortran python:2 USE_PYTHON= distutils autoplist diff --git a/math/sage/Makefile b/math/sage/Makefile index 2caa071ec15..63a7e7f5f01 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -48,8 +48,6 @@ MAKE_ENV+= SAGE_PORT=yes \ SAGE_FAT_BINARY=yes \ PERL=${PERL} -LATEST_LINK= sage-math # Conflicts with graphics/sage. - # The following is needed for the lapack subpackage. MAKE_ARGS+= ARCH="${AR}" diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile index 8bb5c3966d6..312d89639ed 100644 --- a/math/scalapack/Makefile +++ b/math/scalapack/Makefile @@ -112,7 +112,7 @@ post-build: ${RM} -rf ${WRKSRC}/CMakeFiles ${WRKSRC}/CMakeCache.txt ${CP} -p ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile (cd ${WRKSRC} && \ - ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH}) + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH}) (cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET}) post-install: diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 44ec24d3d0c..923c1c9aa90 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -7,7 +7,6 @@ PORTREVISION= 5 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${PORTVERSION:R}/ PKGNAMESUFFIX= 5 -UNIQUENAME= ${PKGBASE} MAINTAINER= ports@FreeBSD.org COMMENT= The Visualization Toolkit diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile index d5e7a3ae80d..ca5f28fa1d6 100644 --- a/math/vtk6/Makefile +++ b/math/vtk6/Makefile @@ -23,8 +23,6 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ # TODO # * VTK Groups -UNIQUENAME= ${PKGBASE} - CONFLICTS= vtk-4* USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} USE_XORG= xt diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile index 3221cdbd17c..43cbff15319 100644 --- a/misc/e2fsprogs-libuuid/Makefile +++ b/misc/e2fsprogs-libuuid/Makefile @@ -12,7 +12,6 @@ CONFLICTS= ossp-uuid-[0-9]* CONFIGURE_ARGS= --enable-elf-shlibs OPTIONS_EXCLUDE= NLS -OPTIONSFILE= # works around optionsNG trouble MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/uuid USE_LDCONFIG= yes diff --git a/misc/nut/Makefile b/misc/nut/Makefile index 21c317bfc0d..a2d8a0fb988 100644 --- a/misc/nut/Makefile +++ b/misc/nut/Makefile @@ -3,6 +3,7 @@ PORTNAME= nut PORTVERSION= 20.1 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= SF PKGNAMEPREFIX= health- @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= CREDITS README nut.html OPTIONS_DEFINE= FLTK DOCS diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index 82ca562ca12..21e9266570c 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -18,8 +18,6 @@ LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \ libexempi.so:${PORTSDIR}/textproc/exempi \ libqjson.so:${PORTSDIR}/devel/qjson -LATEST_LINK= ${PORTNAME}-kde4 - USE_KDE4= kdelibs kdeprefix libksane pimlibs \ automoc4 qimageblitz libkcddb libkcompactdisc USE_QT4= qmake_build moc_build uic_build rcc_build diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile index 79d49a21da9..91bd56556b7 100644 --- a/misc/terraform/Makefile +++ b/misc/terraform/Makefile @@ -3,11 +3,11 @@ PORTNAME= terraform PORTVERSION= 0.9.5 -PORTREVISION= 1 DISTVERSIONPREFIX= src- -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc gnome MASTER_SITES= GOOGLE_CODE +PKGNAMEPREFIX= gnome- MAINTAINER= ports@FreeBSD.org COMMENT= Interactive height field generation and manipulation program @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libtrio.a:${PORTSDIR}/devel/trio WRKSRC= ${WRKDIR}/${PORTNAME} -USES= autoreconf pathfix gettext gmake pkgconfig tar:tgz +USES= autoreconf gettext gmake pathfix pkgconfig tar:tgz USE_GCC= yes USE_GNOME= libgnomeprintui libgnomeui GNU_CONFIGURE= yes diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile index 8e87e18734d..2c8ed90c34a 100644 --- a/misc/xfce4-weather-plugin/Makefile +++ b/misc/xfce4-weather-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-weather-plugin PORTVERSION= 0.8.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc xfce geography MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile index b1aeb3f9e64..715f66e3d3f 100644 --- a/multimedia/gstreamer-qt4/Makefile +++ b/multimedia/gstreamer-qt4/Makefile @@ -12,8 +12,6 @@ DISTNAME= qt-${PORTNAME}-${PORTVERSION} MAINTAINER= fluffy@FreeBSD.org COMMENT= Qt4 bindings for GStreamer multimedia library -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs USES= bison cmake gmake pkgconfig tar:bzip2 diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile index ea300caa250..ab2857886bc 100644 --- a/multimedia/kplayer-kde4/Makefile +++ b/multimedia/kplayer-kde4/Makefile @@ -12,8 +12,6 @@ COMMENT= Movie player based on mplayer RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer -LATEST_LINK= ${PORTNAME}-kde4 - USES= cmake gettext tar:bzip2 USE_QT4= corelib qmake_build moc_build rcc_build uic_build USE_KDE4= kdeprefix kdelibs automoc4 diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 16815fda9ce..0357b8cb813 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -4,7 +4,7 @@ PORTNAME= mpv PORTVERSION= 0.9.2 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= http://ftp.waf.io/pub/release/:1 \ @@ -17,10 +17,7 @@ COMMENT= Free and open-source general-purpose video player LICENSE= GPLv2 -LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ - libass.so:${PORTSDIR}/multimedia/libass \ - libdvdread.so:${PORTSDIR}/multimedia/libdvdread \ - libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav +LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg BUILD_DEPENDS= rst2man:${PORTSDIR}/textproc/py-docutils USE_GITHUB= yes @@ -33,7 +30,7 @@ USE_XORG= x11 xv xxf86vm USE_LDCONFIG= yes INSTALLS_ICONS= yes -CPPFLAGS+= -I.. -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include +CPPFLAGS+= -I.. -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --prefix=${PREFIX} \ @@ -45,25 +42,38 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-alsa \ --disable-pdf -OPTIONS_DEFINE= BS2B DOCS ENCA LADSPA LCMS2 LIBGUESS LUAJIT ZSH +OPTIONS_DEFINE= ASS BS2B DOCS ENCA LADSPA LCMS2 \ + LIBGUESS LUAJIT ZSH +OPTIONS_DEFAULT= ASS DVDREAD DVDNAV OPTIONS_GROUP= IN VO AO -OPTIONS_GROUP_IN= CDIO LIBBLURAY V4L YTDL SMB +OPTIONS_GROUP_IN= CDIO DVDREAD DVDNAV LIBBLURAY V4L SMB OPTIONS_GROUP_VO= CACA OPENGL VAAPI VDPAU XINERAMA OPTIONS_GROUP_AO= JACK PULSEAUDIO OPTIONS_SUB= yes +ASS_DESC= ASS/SSA subtitle and OSD rendering BS2B_DESC= Enable Bauer Stereophonic-to-Binaural DSP support +DVDREAD_DESC= DVD Playback support +DVDNAV_DESC= DVD menu navigation ENCA_DESC= Enable encoding detection support LIBGUESS_DESC= Enable high-speed character set detection support LUAJIT_DESC= Use LuaJIT instead of Lua -YTDL_DESC= Install youtube-dl IN_DESC= Input VO_DESC= Video Output AO_DESC= Audio Output +ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass +ASS_CONFIGURE_ENABLE= libass + BS2B_LIB_DEPENDS= libbs2b.so:${PORTSDIR}/audio/libbs2b BS2B_CONFIGURE_ENABLE= libbs2b +DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread +DVDREAD_CONFIGURE_ENABLE= dvdread + +DVDNAV_LIB_DEPENDS= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav +DVDNAV_CONFIGURE_ENABLE= dvdnav + ENCA_LIB_DEPENDS= libenca.so:${PORTSDIR}/converters/enca ENCA_CONFIGURE_ENABLE= enca @@ -96,8 +106,6 @@ V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedi V4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l V4L_CONFIGURE_ENABLE= tv-v4l2 -YTDL_BUILD_DEPENDS= ${LOCALBASE}/bin/youtube-dl:${PORTSDIR}/www/youtube_dl - SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient SMB_CONFIGURE_ENABLE= libsmbclient diff --git a/multimedia/spotify-websocket-api/Makefile b/multimedia/spotify-websocket-api/Makefile index 70bbfbaf298..dd47129204f 100644 --- a/multimedia/spotify-websocket-api/Makefile +++ b/multimedia/spotify-websocket-api/Makefile @@ -25,7 +25,6 @@ USES= python shebangfix SHEBANG_FILES= spotify_web/spotify.py ${CLIENTFILES} USE_PYTHON= autoplist concurrent distutils -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= EXAMPLES PORTEXAMPLES= blocking.py nonblocking.py decode_mercury.py play.py \ diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index ab1dc0224c4..61f6fd18531 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.2.1 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ diff --git a/multimedia/vlc/files/patch-vendor-00-ce91452 b/multimedia/vlc/files/patch-vendor-00-ce91452 new file mode 100644 index 00000000000..fa5a6a92a31 --- /dev/null +++ b/multimedia/vlc/files/patch-vendor-00-ce91452 @@ -0,0 +1,29 @@ +From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie +Date: Mon, 3 Aug 2015 15:17:32 +0200 +Subject: [PATCH] demux: mp4: correctly match release function + +Signed-off-by: Jean-Baptiste Kempf +--- + modules/demux/mp4/libmp4.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git modules/demux/mp4/libmp4.c modules/demux/mp4/libmp4.c +index 331262b..f220e51 100644 +--- modules/demux/mp4/libmp4.c ++++ modules/demux/mp4/libmp4.c +@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box ) + { + for( i_index = 0; ; i_index++ ) + { ++ if ( MP4_Box_Function[i_index].i_parent && ++ p_box->p_father && ++ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent ) ++ continue; ++ + if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )|| + ( MP4_Box_Function[i_index].i_type == 0 ) ) + { +-- +1.7.10.4 + diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile index 3970c0e8558..f7650c940cd 100644 --- a/net-im/kmess-kde4/Makefile +++ b/net-im/kmess-kde4/Makefile @@ -12,8 +12,6 @@ COMMENT= MSN Messenger client for KDE LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca -LATEST_LINK= ${PORTNAME}-kde4 - USE_GNOME= libxml2 libxslt USE_KDE4= kdeprefix kdelibs libkonq automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile index a9418d8c011..c22ad2dc1f7 100644 --- a/net-im/py-xmpppy-yahoo/Makefile +++ b/net-im/py-xmpppy-yahoo/Makefile @@ -26,10 +26,10 @@ FILES= adhoc.py config.py jep0133.py roomlist.py xmlconfig.py \ FILES_CURPHOO= YahooMD5.py __init__.py cpformat.py md5crypt.py pysha.py yahoo_fn.py PFILES= ${FILES:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/.} \ ${FILES_CURPHOO:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/curphoo/.} -PLIST_FILES= ${PFILES} ${PFILES:S.$.c.} ${PFILES:S.$.o.} etc/${UNIQUENAME:S.-._.}.conf.sample +PLIST_FILES= ${PFILES} ${PFILES:S.$.c.} ${PFILES:S.$.o.} etc/${PKGBASE:S.-._.}.conf.sample SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} BINDIR=${PYTHON_SITELIBDIR}/xmpp/yahoo \ JABBER_USER=${JABBER_USER} -USE_RC_SUBR= ${UNIQUENAME:S/-/_/} +USE_RC_SUBR= ${PKGBASE:S/-/_/} DDIR= ${PYTHON_SITELIBDIR}/xmpp/yahoo .include @@ -45,7 +45,7 @@ SUB_LIST+= JABBER_REQUIRE=jabberd post-patch: @${GREP} -lr '/usr/bin/env python' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin/env python|${PYTHON_CMD}|" - @${REINPLACE_CMD} -e "s|/etc/pyyimt.conf.xml|${PREFIX}/etc/${UNIQUENAME:S.-._.}.conf|" \ + @${REINPLACE_CMD} -e "s|/etc/pyyimt.conf.xml|${PREFIX}/etc/${PKGBASE:S.-._.}.conf|" \ -e 's|pid = ""|pid = "/var/jabberd/pid/PyYIMt.pid"|g' \ -e 's|spoolFile = "user.dbm"|spoolFile = "/var/spool/jabberd/yahoouser.dbm"|g' \ ${WRKSRC}/config.py @@ -60,7 +60,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/yahoo.py ${STAGEDIR}${DDIR}/ @${MKDIR} ${STAGEDIR}${DDIR}/curphoo ${INSTALL_DATA} ${FILES_CURPHOO:S.^.${WRKSRC}/curphoo/.} ${STAGEDIR}${DDIR}/curphoo/ - ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/${UNIQUENAME:S.-._.}.conf.sample + ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/${PKGBASE:S.-._.}.conf.sample ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR} ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR} @${CHMOD} -R a-w ${STAGEDIR}${DDIR} diff --git a/net-mgmt/icli/Makefile b/net-mgmt/icli/Makefile index 36b59c5a40f..dd00c596cbd 100644 --- a/net-mgmt/icli/Makefile +++ b/net-mgmt/icli/Makefile @@ -2,7 +2,7 @@ PORTNAME= icli DISTVERSION= 0.47 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt perl5 MASTER_SITES= http://finalrewind.org/projects/icli/ @@ -16,7 +16,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \ p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \ - icinga:${PORTSDIR}/net-mgmt/icinga + icinga:${PORTSDIR}/net-mgmt/icinga-core ICINGADIR?= /var/spool/icinga diff --git a/net-mgmt/netustad/Makefile b/net-mgmt/netustad/Makefile index e71e7177139..71de0c440e8 100644 --- a/net-mgmt/netustad/Makefile +++ b/net-mgmt/netustad/Makefile @@ -19,8 +19,6 @@ OPTIONS_DEFINE= SSL NLS DOCS OPTIONS_DEFAULT=SSL SSL_DESC= Use netUstad with SSL support -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - SSL_USE= OPENSSL=yes SSL_CONFIGURE_WITH= ssl diff --git a/net-mgmt/pnp-icinga/Makefile b/net-mgmt/pnp-icinga/Makefile index 4ae3b46fef3..ae20ea165ba 100644 --- a/net-mgmt/pnp-icinga/Makefile +++ b/net-mgmt/pnp-icinga/Makefile @@ -8,7 +8,7 @@ COMMENT= Icinga performance data collector and grapher MASTERDIR= ${.CURDIR}/../pnp RUN_DEPENDS= ${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \ - icinga:${PORTSDIR}/net-mgmt/icinga + ${LOCALBASE}/www/icinga/main.html:${PORTSDIR}/net-mgmt/icinga-classicweb NAGIOSDIR?= /var/spool/icinga NAGIOSHTMURL?= /icinga diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile index ef7704c2887..f64b5eb83d7 100644 --- a/net-mgmt/pnp/Makefile +++ b/net-mgmt/pnp/Makefile @@ -3,7 +3,7 @@ PORTNAME= pnp PORTVERSION= 0.6.25 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= SF/pnp4nagios/PNP-0.6 DISTNAME= pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile index 6422d0ba1a8..e0bfdd0203c 100644 --- a/net-mgmt/zabbix2-agent/Makefile +++ b/net-mgmt/zabbix2-agent/Makefile @@ -9,7 +9,6 @@ MASTERDIR= ${.CURDIR}/../zabbix2-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 diff --git a/net-mgmt/zabbix2-frontend/Makefile b/net-mgmt/zabbix2-frontend/Makefile index 2cf34a1f9ca..0796a67114a 100644 --- a/net-mgmt/zabbix2-frontend/Makefile +++ b/net-mgmt/zabbix2-frontend/Makefile @@ -15,7 +15,6 @@ USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap WANT_PHP_WEB= yes -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile index 3656a003c3b..28114ab8eb2 100644 --- a/net-mgmt/zabbix2-server/Makefile +++ b/net-mgmt/zabbix2-server/Makefile @@ -65,8 +65,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options - OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL UNIXODBC OPTIONS_SUB= yes diff --git a/net-mgmt/zabbix22-agent/Makefile b/net-mgmt/zabbix22-agent/Makefile index 908623e40de..f29c5db0d7a 100644 --- a/net-mgmt/zabbix22-agent/Makefile +++ b/net-mgmt/zabbix22-agent/Makefile @@ -9,7 +9,6 @@ MASTERDIR= ${.CURDIR}/../zabbix22-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 diff --git a/net-mgmt/zabbix22-frontend/Makefile b/net-mgmt/zabbix22-frontend/Makefile index 5b5ef0ac025..694d61c2858 100644 --- a/net-mgmt/zabbix22-frontend/Makefile +++ b/net-mgmt/zabbix22-frontend/Makefile @@ -15,7 +15,6 @@ USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap WANT_PHP_WEB= yes -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile index 8bd9ad1ff4f..c87487d17fe 100644 --- a/net-mgmt/zabbix22-server/Makefile +++ b/net-mgmt/zabbix22-server/Makefile @@ -66,8 +66,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options - OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW LIBXML2 OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL UNIXODBC OPTIONS_SUB= yes diff --git a/net-mgmt/zabbix24-agent/Makefile b/net-mgmt/zabbix24-agent/Makefile index 369acf6adac..8c9253f14bd 100644 --- a/net-mgmt/zabbix24-agent/Makefile +++ b/net-mgmt/zabbix24-agent/Makefile @@ -8,7 +8,6 @@ PKGNAMESUFFIX= -agent MASTERDIR= ${.CURDIR}/../zabbix24-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 diff --git a/net-mgmt/zabbix24-frontend/Makefile b/net-mgmt/zabbix24-frontend/Makefile index 15245013622..6233b00316d 100644 --- a/net-mgmt/zabbix24-frontend/Makefile +++ b/net-mgmt/zabbix24-frontend/Makefile @@ -15,7 +15,6 @@ USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap WANT_PHP_WEB= yes -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend diff --git a/net-mgmt/zabbix24-server/Makefile b/net-mgmt/zabbix24-server/Makefile index 40d2f0027a7..c538fe7c14b 100644 --- a/net-mgmt/zabbix24-server/Makefile +++ b/net-mgmt/zabbix24-server/Makefile @@ -67,7 +67,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \ LIBXML2 OPTIONS_DEFAULT= IPV6 FPING JABBER CURL UNIXODBC MYSQL SSH diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile index 821f4b9835a..ab1ef51a292 100644 --- a/net-p2p/libtorrent-rasterbar/Makefile +++ b/net-p2p/libtorrent-rasterbar/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= libtorrent-rasterbar -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.6 CATEGORIES?= net-p2p ipv6 -MASTER_SITES= SF/${PORTNAME:S/-rasterbar//}/${PORTNAME:S/-rasterbar//}/ +MASTER_SITES= https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/ MAINTAINER= ports@FreeBSD.org COMMENT?= C++ library implementing a BitTorrent client diff --git a/net-p2p/libtorrent-rasterbar/distinfo b/net-p2p/libtorrent-rasterbar/distinfo index 58465798a4d..002a80ea0d6 100644 --- a/net-p2p/libtorrent-rasterbar/distinfo +++ b/net-p2p/libtorrent-rasterbar/distinfo @@ -1,2 +1,2 @@ -SHA256 (libtorrent-rasterbar-1.0.4.tar.gz) = 1f567823133b1493b9717afc8334eed691bf0ab452d4a2e0f644989f13ce9db0 -SIZE (libtorrent-rasterbar-1.0.4.tar.gz) = 3297242 +SHA256 (libtorrent-rasterbar-1.0.6.tar.gz) = c97de804b77f44591801631aca3869567671df2d3e2afe7f5453d8db2478fd61 +SIZE (libtorrent-rasterbar-1.0.6.tar.gz) = 3307491 diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile index 6fab443dc80..ab61a56a539 100644 --- a/net-p2p/qbittorrent/Makefile +++ b/net-p2p/qbittorrent/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qbittorrent -PORTVERSION= 3.2.0 +PORTVERSION= 3.2.3 DISTVERSIONPREFIX= release- CATEGORIES= net-p2p ipv6 @@ -44,17 +44,17 @@ CONFIGURE_ENV+= zlib_CFLAGS=-I/usr/include CONFIGURE_ENV+= zlib_LIBS=-lz CONFIGURE_ARGS+= CXXFLAGS=-DBOOST_ASIO_DYN_LINK +GNU_CONFIGURE= yes USE_OPENSSL= yes +post-patch: + ${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/bin/qmake-qt4,' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} + .include -do-configure: -.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no" - @cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} \ - ./configure --prefix=${PREFIX} ${CONFIGURE_ARGS} -.else - @cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} \ - ./configure --prefix=${PREFIX} ${CONFIGURE_ARGS} --disable-gui +.if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} != "no" +CONFIGURE_ARGS+= --disable-gui .endif post-install: diff --git a/net-p2p/qbittorrent/distinfo b/net-p2p/qbittorrent/distinfo index 9bd7ca43861..04a812e2df6 100644 --- a/net-p2p/qbittorrent/distinfo +++ b/net-p2p/qbittorrent/distinfo @@ -1,2 +1,2 @@ -SHA256 (qBittorrent-qBittorrent-release-3.2.0_GH0.tar.xz) = 1ca59b532c36c1c4e5b87ddfb13789104ecfbf79cd09afc3b05a5871011d0a75 -SIZE (qBittorrent-qBittorrent-release-3.2.0_GH0.tar.xz) = 4467597 +SHA256 (qBittorrent-qBittorrent-release-3.2.3_GH0.tar.xz) = 816d611a0af50c469f52946c94b88c003f908ee031ee0e55a45273e4c64897c5 +SIZE (qBittorrent-qBittorrent-release-3.2.3_GH0.tar.xz) = 4601930 diff --git a/net-p2p/qbittorrent/files/patch-configure b/net-p2p/qbittorrent/files/patch-configure index 596e5583a7a..4a55e94bd1b 100644 --- a/net-p2p/qbittorrent/files/patch-configure +++ b/net-p2p/qbittorrent/files/patch-configure @@ -1,22 +1,11 @@ ---- configure.orig 2015-05-10 01:20:19 UTC -+++ configure -@@ -4263,7 +4263,7 @@ fi - # Detect OS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is FreeBSD" >&5 - $as_echo_n "checking whether OS is FreeBSD... " >&6; } --if test "x$host_os" = "x*FreeBSD*"; then : -+if expr "$host_os" : ".*freebsd.*" > /dev/null; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - LIBS="-lexecinfo $LIBS" -@@ -5808,8 +5808,8 @@ extract() { - return 1 +--- configure 2015-08-02 13:18:04 UTC ++++ configure 2015-08-19 00:00:14 -0400 +@@ -5809,7 +5809,7 @@ fi -- # Convert " -" to "\n" if not between quotes -- string=$(echo " $*" | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g") -+ # Convert " -" to "\n" if not between quotes and remove possible leading white spaces -+ string=$(echo " $*" | tr ' -' '\n' | $SED -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[:space:]*//') + # Convert " -" to "\n" if not between quotes and remove possible leading white spaces +- string=$(echo " $*" | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[:space:]*//') ++ string=$(echo " $*" | tr ' -' '\n' | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[:space:]*//') SAVEIFS=$IFS IFS=$(printf "\n\b") for i in $string; do diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile index ecf7bfc4433..c0f4b279274 100644 --- a/net-p2p/transmission-remote-gui/Makefile +++ b/net-p2p/transmission-remote-gui/Makefile @@ -3,7 +3,7 @@ PORTNAME= transmission-remote-gui PORTVERSION= 5.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-p2p MASTER_SITES= GOOGLE_CODE DISTNAME= transgui-${PORTVERSION}-src @@ -17,7 +17,7 @@ RUN_DEPENDS= transmission-daemon:${PORTSDIR}/net-p2p/transmission-daemon PROJECTHOST= transmisson-remote-gui -USE_FPC= fcl-net +USE_FPC= cairo fcl-base fcl-image fcl-net fcl-process hash pasjpeg paszlib x11 USES= iconv zip USE_GNOME= # diff --git a/net/beanstalkd/Makefile b/net/beanstalkd/Makefile index 3854f08916f..d8eca26f262 100644 --- a/net/beanstalkd/Makefile +++ b/net/beanstalkd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= beanstalkd -PORTVERSION= 1.9 +PORTVERSION= 1.10 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/beanstalkd/distinfo b/net/beanstalkd/distinfo index db751ba2cbf..0589ca515a7 100644 --- a/net/beanstalkd/distinfo +++ b/net/beanstalkd/distinfo @@ -1,2 +1,2 @@ -SHA256 (kr-beanstalkd-v1.9_GH0.tar.gz) = 158e6d6090c0afac7ee17b9f22713506b3e870dc04a738517282e2e262afb9eb -SIZE (kr-beanstalkd-v1.9_GH0.tar.gz) = 63794 +SHA256 (kr-beanstalkd-v1.10_GH0.tar.gz) = 923b1e195e168c2a91adcc75371231c26dcf23868ed3e0403cd4b1d662a52d59 +SIZE (kr-beanstalkd-v1.10_GH0.tar.gz) = 66243 diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 83390041070..946f1fd7233 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -80,11 +80,7 @@ RADIUS_GROUP= freeradius USERS= ${RADIUS_USER} GROUPS= ${RADIUS_GROUP} -.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MKERBEROS) -${UNIQUENAME}_SET+= KERBEROS -.endif - -.if ${PORT_OPTIONS:MKERBEROS} +.if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL} .if ${PORT_OPTIONS:MHEIMDAL} .if ${PORT_OPTIONS:MHEIMDAL_PORT} LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/heimdal diff --git a/net/hping-devel/Makefile b/net/hping-devel/Makefile index 0c6353fa935..2795bd3d6a0 100644 --- a/net/hping-devel/Makefile +++ b/net/hping-devel/Makefile @@ -13,7 +13,6 @@ COMMENT= Network auditing tool LIB_DEPENDS= libtcl84.so:${PORTSDIR}/lang/tcl84 -NO_LATEST_LINK= yes CONFLICTS= hping-[0-9]* GNU_CONFIGURE= yes diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile index 0211674451d..ee4cc584e6d 100644 --- a/net/isc-dhcp41-server/Makefile +++ b/net/isc-dhcp41-server/Makefile @@ -23,8 +23,6 @@ PORTREVISION_RELAY= 5 SUBSYS?= server WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile index 0f6909c0879..a6c77dab76b 100644 --- a/net/isc-dhcp43-server/Makefile +++ b/net/isc-dhcp43-server/Makefile @@ -25,8 +25,6 @@ PORTREVISION_RELAY= 0 SUBSYS?= server #WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile index b6c6e5ce2fc..be1cf49a2b9 100644 --- a/net/ldapscripts/Makefile +++ b/net/ldapscripts/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ldapscripts -PORTVERSION= 2.0.5 -PORTREVISION= 2 +PORTVERSION= 2.0.6 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ http://contribs.martymac.org/ldapscripts/ diff --git a/net/ldapscripts/distinfo b/net/ldapscripts/distinfo index aec023c7b16..def0f00be4d 100644 --- a/net/ldapscripts/distinfo +++ b/net/ldapscripts/distinfo @@ -1,2 +1,2 @@ -SHA256 (ldapscripts-2.0.5.tgz) = c0d658453fbafa8c5fb59338f4448e5964fa43172adf155940f6732fc7883352 -SIZE (ldapscripts-2.0.5.tgz) = 36040 +SHA256 (ldapscripts-2.0.6.tgz) = ff2e14d8fa16cc349a8b3caee34645cc7f207e4b0cc2631eb8eee1496e27af8e +SIZE (ldapscripts-2.0.6.tgz) = 37200 diff --git a/net/mosh/Makefile b/net/mosh/Makefile index 29243b1460e..7d139faf0d2 100644 --- a/net/mosh/Makefile +++ b/net/mosh/Makefile @@ -23,8 +23,6 @@ INSTALL_TARGET= install-strip USE_OPENSSL= yes USES= autoreconf:autoconf perl5 pkgconfig -LATEST_LINK= mosh-term - CONFLICTS_INSTALL= mosh-0.[2-9].* PLIST_FILES= bin/mosh bin/mosh-server bin/mosh-client \ diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile index ed32d0ed0bb..8caf697e158 100644 --- a/net/openmpi/Makefile +++ b/net/openmpi/Makefile @@ -24,7 +24,7 @@ USES= fortran gmake libtool:keepla perl5 pkgconfig tar:bzip2 USE_PERL5= build MPIBASE?= mpi -MPIDIR?= ${MPIBASE}/${UNIQUENAME} +MPIDIR?= ${MPIBASE}/${PKGBASE} PLIST_SUB+= MPIBASE=${MPIBASE} PLIST_SUB+= MPIDIR=${MPIDIR} diff --git a/net/p5-MaxMind-DB-Writer/Makefile b/net/p5-MaxMind-DB-Writer/Makefile index be9e433fc6b..975a3a25312 100644 --- a/net/p5-MaxMind-DB-Writer/Makefile +++ b/net/p5-MaxMind-DB-Writer/Makefile @@ -3,6 +3,7 @@ PORTNAME= MaxMind-DB-Writer PORTVERSION= 0.100004 +PORTREVISION= 1 CATEGORIES= net perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MAXMIND @@ -40,4 +41,7 @@ TEST_DEPENDS= p5-Data-Printer>=0:${PORTSDIR}/devel/p5-Data-Printer \ USE_PERL5= modbuild USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/MaxMind/DB/Writer/Tree/Tree.so + .include diff --git a/net/proftpd-mod_ldap/Makefile b/net/proftpd-mod_ldap/Makefile index 82271e0b6b0..77ba0f09c5a 100644 --- a/net/proftpd-mod_ldap/Makefile +++ b/net/proftpd-mod_ldap/Makefile @@ -13,7 +13,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd USE_OPENLDAP= yes diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile index 2377d29588e..cbdb66fa136 100644 --- a/net/py-gntp/Makefile +++ b/net/py-gntp/Makefile @@ -14,7 +14,6 @@ LICENSE= MIT GH_ACCOUNT= kfdm -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS USE_GITHUB= yes diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile index 59cc89c043e..dd21a70d105 100644 --- a/net/py-pynsq/Makefile +++ b/net/py-pynsq/Makefile @@ -20,7 +20,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:${PORTSDIR}/www/py-tornado \ OPTIONS_DEFINE= TESTS TESTS_DESC= Install tools to run test suite -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options USES= python USE_PYTHON= distutils autoplist diff --git a/net/quiterss/Makefile b/net/quiterss/Makefile index 9a87c9f2a59..0962837f151 100644 --- a/net/quiterss/Makefile +++ b/net/quiterss/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= quiterss -PORTVERSION= 0.17.6 +PORTVERSION= 0.18.2 CATEGORIES= net MASTER_SITES= http://quiterss.org/files/${PORTVERSION}/ DISTNAME= QuiteRSS-${PORTVERSION}-src @@ -11,11 +11,37 @@ MAINTAINER= coder@tuxfamily.org COMMENT= Open-source cross-platform RSS/Atom news feeds reader LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -USES= desktop-file-utils pkgconfig qmake:outsource tar:bzip2 +NO_WRKSUBDIR= yes + +USES= desktop-file-utils pkgconfig qmake:outsource USE_SQLITE= yes -USE_QT4= designer moc_build linguist_build moc_build rcc_build \ - uic_build gui network phonon INSTALLS_ICONS= yes +OPTIONS_DEFINE= DEBUG +OPTIONS_SINGLE= GUI +OPTIONS_SINGLE_GUI= QT4 QT5 +OPTIONS_DEFAULT= QT5 + +QT4_USE= QT4=moc_build,rcc_build,uic_build,linguisttools_build +QT4_USE+= QT4=corelib,gui,network,xml,webkit,phonon,sql,sql-sqlite3_run + +QT5_USE= QT5=buildtools_build,linguisttools_build,core,xml,gui,widgets +QT5_USE+= QT5=network,multimedia,printsupport,webkit,sql,sql-sqlite3_run + +post-patch-DEBUG-on: + @${REINPLACE_CMD} 's|debug_and_release|debug|' \ + ${WRKSRC}/QuiteRSS.pro + +post-patch-DEBUG-off: + @${REINPLACE_CMD} 's|debug_and_release|release|' \ + ${WRKSRC}/QuiteRSS.pro + +post-patch: + @${REINPLACE_CMD} 's|$$$$\[QT_INSTALL_BINS\]/lrelease|${LRELEASE}|' \ + ${WRKSRC}/lang/lang.pri + @${REINPLACE_CMD} 's|$$$$PREFIX/share/quiterss|${DATADIR}|' \ + ${WRKSRC}/QuiteRSS.pro + .include diff --git a/net/quiterss/distinfo b/net/quiterss/distinfo index 2dc67d28a1c..0e80b8645b6 100644 --- a/net/quiterss/distinfo +++ b/net/quiterss/distinfo @@ -1,2 +1,2 @@ -SHA256 (QuiteRSS-0.17.6-src.tar.bz2) = b14c715755ff6a1a4fa39b1d3efae893835fde07a23e69275fc12fa742cc8e7d -SIZE (QuiteRSS-0.17.6-src.tar.bz2) = 3832771 +SHA256 (QuiteRSS-0.18.2-src.tar.gz) = d335529541d2824d66c941b68a34425929402d9c95716446a55ac0ceb777d18d +SIZE (QuiteRSS-0.18.2-src.tar.gz) = 3061272 diff --git a/net/quiterss/files/patch-lang-lang.pri b/net/quiterss/files/patch-lang-lang.pri deleted file mode 100644 index ee3e84ddb21..00000000000 --- a/net/quiterss/files/patch-lang-lang.pri +++ /dev/null @@ -1,11 +0,0 @@ ---- lang/lang.pri.orig 2014-08-03 13:51:31.078727306 +0200 -+++ lang/lang.pri 2014-08-03 13:52:13.465776471 +0200 -@@ -14,7 +14,7 @@ - - isEmpty(QMAKE_LRELEASE) { - Q_OS_WIN:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe -- else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease -+ else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt4 - } - - updateqm.input = TRANSLATIONS diff --git a/net/quiterss/pkg-plist b/net/quiterss/pkg-plist index d4aa20d4a82..995b7a916ec 100644 --- a/net/quiterss/pkg-plist +++ b/net/quiterss/pkg-plist @@ -1,4 +1,4 @@ -%%QT_BINDIR%%/quiterss +bin/quiterss share/applications/quiterss.desktop share/icons/hicolor/128x128/apps/quiterss.png share/icons/hicolor/16x16/apps/quiterss.png @@ -7,44 +7,44 @@ share/icons/hicolor/32x32/apps/quiterss.png share/icons/hicolor/48x48/apps/quiterss.png share/icons/hicolor/64x64/apps/quiterss.png share/pixmaps/quiterss.png -share/quiterss/lang/quiterss_ar.qm -share/quiterss/lang/quiterss_bg.qm -share/quiterss/lang/quiterss_cs.qm -share/quiterss/lang/quiterss_de.qm -share/quiterss/lang/quiterss_el_GR.qm -share/quiterss/lang/quiterss_es.qm -share/quiterss/lang/quiterss_fa.qm -share/quiterss/lang/quiterss_fi.qm -share/quiterss/lang/quiterss_fr.qm -share/quiterss/lang/quiterss_gl.qm -share/quiterss/lang/quiterss_hi.qm -share/quiterss/lang/quiterss_hu.qm -share/quiterss/lang/quiterss_it.qm -share/quiterss/lang/quiterss_ja.qm -share/quiterss/lang/quiterss_ko.qm -share/quiterss/lang/quiterss_lt.qm -share/quiterss/lang/quiterss_nl.qm -share/quiterss/lang/quiterss_pl.qm -share/quiterss/lang/quiterss_pt_BR.qm -share/quiterss/lang/quiterss_pt_PT.qm -share/quiterss/lang/quiterss_ro_RO.qm -share/quiterss/lang/quiterss_ru.qm -share/quiterss/lang/quiterss_sk.qm -share/quiterss/lang/quiterss_sr.qm -share/quiterss/lang/quiterss_sv.qm -share/quiterss/lang/quiterss_tg_TJ.qm -share/quiterss/lang/quiterss_tr.qm -share/quiterss/lang/quiterss_uk.qm -share/quiterss/lang/quiterss_vi.qm -share/quiterss/lang/quiterss_zh_CN.qm -share/quiterss/lang/quiterss_zh_TW.qm -share/quiterss/sound/notification.wav -share/quiterss/style/Rstyle_v1.2.css -share/quiterss/style/gray.qss -share/quiterss/style/green.qss -share/quiterss/style/news.css -share/quiterss/style/orange.qss -share/quiterss/style/pink.qss -share/quiterss/style/purple.qss -share/quiterss/style/system.qss -share/quiterss/style/system2.qss +%%DATADIR%%/lang/quiterss_ar.qm +%%DATADIR%%/lang/quiterss_bg.qm +%%DATADIR%%/lang/quiterss_cs.qm +%%DATADIR%%/lang/quiterss_de.qm +%%DATADIR%%/lang/quiterss_el_GR.qm +%%DATADIR%%/lang/quiterss_es.qm +%%DATADIR%%/lang/quiterss_fa.qm +%%DATADIR%%/lang/quiterss_fi.qm +%%DATADIR%%/lang/quiterss_fr.qm +%%DATADIR%%/lang/quiterss_gl.qm +%%DATADIR%%/lang/quiterss_hi.qm +%%DATADIR%%/lang/quiterss_hu.qm +%%DATADIR%%/lang/quiterss_it.qm +%%DATADIR%%/lang/quiterss_ja.qm +%%DATADIR%%/lang/quiterss_ko.qm +%%DATADIR%%/lang/quiterss_lt.qm +%%DATADIR%%/lang/quiterss_nl.qm +%%DATADIR%%/lang/quiterss_pl.qm +%%DATADIR%%/lang/quiterss_pt_BR.qm +%%DATADIR%%/lang/quiterss_pt_PT.qm +%%DATADIR%%/lang/quiterss_ro_RO.qm +%%DATADIR%%/lang/quiterss_ru.qm +%%DATADIR%%/lang/quiterss_sk.qm +%%DATADIR%%/lang/quiterss_sr.qm +%%DATADIR%%/lang/quiterss_sv.qm +%%DATADIR%%/lang/quiterss_tg_TJ.qm +%%DATADIR%%/lang/quiterss_tr.qm +%%DATADIR%%/lang/quiterss_uk.qm +%%DATADIR%%/lang/quiterss_vi.qm +%%DATADIR%%/lang/quiterss_zh_CN.qm +%%DATADIR%%/lang/quiterss_zh_TW.qm +%%DATADIR%%/sound/notification.wav +%%DATADIR%%/style/Rstyle_v1.2.css +%%DATADIR%%/style/gray.qss +%%DATADIR%%/style/green.qss +%%DATADIR%%/style/news.css +%%DATADIR%%/style/orange.qss +%%DATADIR%%/style/pink.qss +%%DATADIR%%/style/purple.qss +%%DATADIR%%/style/system.qss +%%DATADIR%%/style/system2.qss diff --git a/net/rubygem-packetfu/Makefile b/net/rubygem-packetfu/Makefile index 3ece43f343f..9403e920478 100644 --- a/net/rubygem-packetfu/Makefile +++ b/net/rubygem-packetfu/Makefile @@ -2,6 +2,7 @@ PORTNAME= packetfu PORTVERSION= 1.1.10 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG @@ -15,5 +16,7 @@ NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST=yes +USES= shebangfix +SHEBANG_FILES= test/func_lldp.rb .include diff --git a/net/samba36/Makefile b/net/samba36/Makefile index feb64d8dd3b..b5dd735dd1f 100644 --- a/net/samba36/Makefile +++ b/net/samba36/Makefile @@ -22,7 +22,6 @@ SAMBA_BASENAME= samba CPE_VENDOR= samba CPE_PRODUCT= samba -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME}/source3 diff --git a/news/inn/Makefile b/news/inn/Makefile index 2e9121154eb..a50448a1a4d 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -17,8 +17,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_RC_SUBR= innd SUB_FILES= pkg-install -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - USES= cpe gmake perl5 uidfix CPE_VENDOR= isc diff --git a/news/py-pynzb/Makefile b/news/py-pynzb/Makefile index f1ec2b42984..28fe44e425e 100644 --- a/news/py-pynzb/Makefile +++ b/news/py-pynzb/Makefile @@ -16,7 +16,6 @@ LICENSE= BSD3CLAUSE USES= python USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= LXML LXML_DESC= Add support for py-lxml LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:${PORTSDIR}/devel/py-lxml diff --git a/ports-mgmt/freebsd-bugzilla-cli/Makefile b/ports-mgmt/freebsd-bugzilla-cli/Makefile index 18679d74e71..c1ab6a5bf85 100644 --- a/ports-mgmt/freebsd-bugzilla-cli/Makefile +++ b/ports-mgmt/freebsd-bugzilla-cli/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-bugzilla-cli -PORTVERSION= 0.12.0 +PORTVERSION= 0.13.0 CATEGORIES= ports-mgmt MAINTAINER= pgollucci@FreeBSD.org diff --git a/ports-mgmt/freebsd-bugzilla-cli/distinfo b/ports-mgmt/freebsd-bugzilla-cli/distinfo index 1161bc3df53..12367b07701 100644 --- a/ports-mgmt/freebsd-bugzilla-cli/distinfo +++ b/ports-mgmt/freebsd-bugzilla-cli/distinfo @@ -1,2 +1,2 @@ -SHA256 (pgollucci-freebsd-bugzilla-cli-0.12.0_GH0.tar.gz) = 022f55c4342164b9308b42f4d54d9f5aa4fd7ba04ad47d771723df0bb6070241 -SIZE (pgollucci-freebsd-bugzilla-cli-0.12.0_GH0.tar.gz) = 14148 +SHA256 (pgollucci-freebsd-bugzilla-cli-0.13.0_GH0.tar.gz) = 07073a3c7edc0e73f095b94e7c3a1dbe1ba64bd6955df2d2e5bffa003173492b +SIZE (pgollucci-freebsd-bugzilla-cli-0.13.0_GH0.tar.gz) = 15004 diff --git a/ports-mgmt/freebsd-bugzilla-cli/pkg-plist b/ports-mgmt/freebsd-bugzilla-cli/pkg-plist index 0165d99c791..3ce2ab3b9de 100644 --- a/ports-mgmt/freebsd-bugzilla-cli/pkg-plist +++ b/ports-mgmt/freebsd-bugzilla-cli/pkg-plist @@ -1,6 +1,7 @@ %%DATADIR%%/_util.sh %%DATADIR%%/_version.sh %%DATADIR%%/attach.sh +%%DATADIR%%/claim.sh %%DATADIR%%/close.sh %%DATADIR%%/comment.sh %%DATADIR%%/edit.sh diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 3f9f351b16f..8b5a3e4fee0 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.5.99.7 +DISTVERSION= 1.5.99.8 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ @@ -34,12 +34,10 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .if defined(WITH_PKG) .if ${WITH_PKG} != devel -NO_LATEST_LINK= yes . if !defined(PACKAGE_BUILDING) IGNORE= WITH_PKG is not defined to 'devel', this version is the devel one . endif .else -LATEST_LINK= pkg PKGNAMESUFFIX= #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= @@ -67,8 +65,6 @@ pre-everything:: .endif .endif -.else -LATEST_LINK= pkg-devel .endif .undef INSTALLS_DEPENDS diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo index eee96a3bf9b..4b7267352cb 100644 --- a/ports-mgmt/pkg-devel/distinfo +++ b/ports-mgmt/pkg-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.5.99.7.tar.xz) = 0ff01edc771bc340aa2d1788332a416a59a6c25dba19eb5d9dcbb65e220ec56b -SIZE (pkg-1.5.99.7.tar.xz) = 1894664 +SHA256 (pkg-1.5.99.8.tar.xz) = f495c50fd9507270023e8ccf9d626e95de7e603bfc0381f94e4a7b900c1b6d8a +SIZE (pkg-1.5.99.8.tar.xz) = 1918896 diff --git a/portuguese/eric6/distinfo b/portuguese/eric6/distinfo index 62e6c4f485d..56476572d2f 100644 --- a/portuguese/eric6/distinfo +++ b/portuguese/eric6/distinfo @@ -1,2 +1,2 @@ -SHA256 (eric6-i18n-pt-6.0.5.tar.gz) = 4cbac0d9ad733914659399982c6ee6f19ba2f6e1f75f9a3520c68641340b4bf4 -SIZE (eric6-i18n-pt-6.0.5.tar.gz) = 427230 +SHA256 (eric6-i18n-pt-6.0.8.tar.gz) = cf7f6eac2342d3da3af552c3554403383f189238249136a6f09bfb99880bff84 +SIZE (eric6-i18n-pt-6.0.8.tar.gz) = 427141 diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 6f8ec53bdcb..d3a66acbb7b 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -20,8 +20,6 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ CONFLICTS= LPRng-[0-9]* -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - USES+= cpe gmake iconv pkgconfig tar:bzip2 CPE_VENDOR= apple DESTDIRNAME= DSTROOT @@ -53,7 +51,6 @@ CUPSSYSGRP= wheel GROUPS= cups USERS= cups -# UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included OPTIONS_SUB= yes .if defined(CUPS_CLIENT) PORTREVISION= 2 diff --git a/print/py-pollyreports/Makefile b/print/py-pollyreports/Makefile index 3cae0676efb..9c4220760c9 100644 --- a/print/py-pollyreports/Makefile +++ b/print/py-pollyreports/Makefile @@ -15,7 +15,6 @@ LICENSE= BSD2CLAUSE USES= python:2 USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= REPORTLAB REPORTLAB_DESC= Install Reportlab2 diff --git a/russian/eric6/distinfo b/russian/eric6/distinfo index 19f01d426a6..e55b84f54be 100644 --- a/russian/eric6/distinfo +++ b/russian/eric6/distinfo @@ -1,2 +1,2 @@ -SHA256 (eric6-i18n-ru-6.0.5.tar.gz) = 5631223eb0aafbc632db647e832648d4c19b1c45666219111e6578bb6ea8104f -SIZE (eric6-i18n-ru-6.0.5.tar.gz) = 785401 +SHA256 (eric6-i18n-ru-6.0.8.tar.gz) = dd2552de753b344fb2c3f33343412ab1cf2216910c6a0accbdfe566727038dc1 +SIZE (eric6-i18n-ru-6.0.8.tar.gz) = 785429 diff --git a/science/cdo/Makefile b/science/cdo/Makefile index a07e10c58f6..2670df8ec84 100644 --- a/science/cdo/Makefile +++ b/science/cdo/Makefile @@ -16,6 +16,8 @@ LICENSE= GPLv2 OPTIONS_DEFINE= CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS OPTIONS_DEFAULT=CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS OPTIONS_SUB= yes +HDF5_IMPLIES= SZIP +NETCDF_IMPLIES= HDF5 PORTSCOUT= site:https://code.zmaw.de/projects/cdo/files @@ -55,16 +57,6 @@ UDUNITS_CONFIGURE_OFF= --without-udunits2 UDUNITS_CONFIGURE_ON= --with-udunits2=${LOCALBASE} UDUNITS_LIB_DEPENDS= libudunits2.so:${PORTSDIR}/science/udunits -.include - -.if ${PORT_OPTIONS:MHDF5} && !${PORT_OPTIONS:MSZIP} -IGNORE= HDF5 option requires SZIP option -.endif - -.if ${PORT_OPTIONS:MNETCDF} && !${PORT_OPTIONS:MHDF5} -IGNORE= NETCDF option requires HDF5 option -.endif - .include .if ${ARCH} != "sparc64" diff --git a/science/gsmc/Makefile b/science/gsmc/Makefile index c100b23dc1d..19be670ccde 100644 --- a/science/gsmc/Makefile +++ b/science/gsmc/Makefile @@ -7,12 +7,15 @@ PORTREVISION= 4 CATEGORIES= science hamradio MASTER_SITES= http://www.qsl.net/ik5nax/ -MAINTAINER= db@FreeBSD.org +MAINTAINER= hamradio@FreeBSD.org COMMENT= Smith chart program for impedance matching +LICENSE= GPLv2 + USE_GNOME= gtk20 GNU_CONFIGURE= yes USES= autoreconf gmake pkgconfig +PLIST_FILES= bin/gsmc man/man1/gsmc.1.gz post-patch: @${REINPLACE_CMD} '/^LIBS=/s/$$/ -lm/' ${WRKSRC}/Makefile.am diff --git a/science/gsmc/files/patch-configure.ac b/science/gsmc/files/patch-configure.ac index 568ddf480e5..9a7f0be60a2 100644 --- a/science/gsmc/files/patch-configure.ac +++ b/science/gsmc/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2004-07-28 04:34:01.000000000 -0400 -+++ configure.ac 2009-08-14 20:51:30.000000000 -0400 -@@ -9,7 +9,9 @@ +--- configure.ac.orig 2004-07-28 08:34:01 UTC ++++ configure.ac +@@ -9,7 +9,9 @@ AM_INIT_AUTOMAKE(gsmc, 1.0, ik5nax@amsat # Checks for programs. AC_PROG_CC pkg_modules="gtk+-2.0" diff --git a/science/gsmc/pkg-plist b/science/gsmc/pkg-plist deleted file mode 100644 index abf318e617d..00000000000 --- a/science/gsmc/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/gsmc -man/man1/gsmc.1.gz diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile index 00f647af512..4278a660ed5 100644 --- a/science/netcdf/Makefile +++ b/science/netcdf/Makefile @@ -36,15 +36,12 @@ DAP_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl DOXYGEN_BUILD_DEPENDS= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen DOXYGEN_CONFIGURE_OFF= --disable-doxygen DOXYGEN_CONFIGURE_ON= --enable-doxygen +DOXYGEN_PORTDOCS= * SZIP_LIB_DEPENDS= libsz.so:${PORTSDIR}/science/szip SZIP_LIBS= -lsz .include -.if ${PORT_OPTIONS:MDOXYGEN} -PORTDOCS= * -.endif - post-patch: @${REINPLACE_CMD} -e 's|-ldl ||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|mmap|_&|g' ${WRKSRC}/nc_test/tst_diskless.c ${WRKSRC}/nc_test/tst_diskless3.c diff --git a/science/orthanc-postgresql/Makefile b/science/orthanc-postgresql/Makefile index 7b81f3a19f5..d6386d12745 100644 --- a/science/orthanc-postgresql/Makefile +++ b/science/orthanc-postgresql/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= orthanc-portgresql -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= science graphics MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/plugin-postgresql/ DISTNAME= OrthancPostgreSQL-${PORTVERSION} diff --git a/science/orthanc-postgresql/distinfo b/science/orthanc-postgresql/distinfo index b0d1370e86a..3b8bfba03c2 100644 --- a/science/orthanc-postgresql/distinfo +++ b/science/orthanc-postgresql/distinfo @@ -1,2 +1,2 @@ -SHA256 (orthanc/OrthancPostgreSQL-1.1.tar.gz) = f68d98a1f282ad31ac3fde2ff11449db840a5daf8a9605f3a9d5678691bd9b84 -SIZE (orthanc/OrthancPostgreSQL-1.1.tar.gz) = 56750 +SHA256 (orthanc/OrthancPostgreSQL-1.2.tar.gz) = 629bf07a7365d9570b340f336cc2367b30fe6244d32ca881d7a3a0ea9802e8a9 +SIZE (orthanc/OrthancPostgreSQL-1.2.tar.gz) = 81424 diff --git a/science/orthanc-postgresql/files/patch-CMakeLists.txt b/science/orthanc-postgresql/files/patch-CMakeLists.txt deleted file mode 100644 index 9ba3de08daf..00000000000 --- a/science/orthanc-postgresql/files/patch-CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ ---- CMakeLists.txt.orig 2015-07-03 09:22:49 UTC -+++ CMakeLists.txt -@@ -32,6 +32,7 @@ set(USE_SYSTEM_JSONCPP ON CACHE BOOL "Us - set(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost") - set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test") - set(USE_SYSTEM_LIBPQ ON CACHE BOOL "Use the system version of the PostgreSQL client library") -+set(BUILD_UNIT_TESTS ON CACHE BOOL "Build UnitTests") - - # Distribution-specific settings - set(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") -@@ -47,7 +48,10 @@ include(${CMAKE_SOURCE_DIR}/Resources/CM - include(${CMAKE_SOURCE_DIR}/Resources/CMake/BoostConfiguration.cmake) - include(${CMAKE_SOURCE_DIR}/Resources/CMake/PostgreSQLConfiguration.cmake) - include(${CMAKE_SOURCE_DIR}/Resources/CMake/JsonCppConfiguration.cmake) --include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake) -+ -+if (BUILD_UNIT_TESTS) -+ include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake) -+endif() - - - # Check that the Orthanc SDK headers are available or download them -@@ -123,14 +127,21 @@ set_target_properties(OrthancPostgreSQLI - SOVERSION ${ORTHANC_POSTGRESQL_VERSION} - ) - -+install( -+ TARGETS OrthancPostgreSQLStorage OrthancPostgreSQLIndex -+ RUNTIME DESTINATION lib # Destination for Windows -+ LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux -+) - --add_executable(UnitTests -- ${CORE_SOURCES} -- ${GTEST_SOURCES} -- ${AUTOGENERATED_SOURCES} -- ${CMAKE_SOURCE_DIR}/IndexPlugin/PostgreSQLWrapper.cpp -- ${CMAKE_SOURCE_DIR}/StoragePlugin/PostgreSQLStorageArea.cpp -- ${CMAKE_SOURCE_DIR}/UnitTestsSources/UnitTestsMain.cpp -- ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLTests.cpp -- ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLWrapperTests.cpp -- ) -+if (BUILD_UNIT_TESTS) -+ add_executable(UnitTests -+ ${CORE_SOURCES} -+ ${GTEST_SOURCES} -+ ${AUTOGENERATED_SOURCES} -+ ${CMAKE_SOURCE_DIR}/IndexPlugin/PostgreSQLWrapper.cpp -+ ${CMAKE_SOURCE_DIR}/StoragePlugin/PostgreSQLStorageArea.cpp -+ ${CMAKE_SOURCE_DIR}/UnitTestsSources/UnitTestsMain.cpp -+ ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLTests.cpp -+ ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLWrapperTests.cpp -+ ) -+endif() diff --git a/science/orthanc-webviewer/Makefile b/science/orthanc-webviewer/Makefile index 59edb8c409e..e63854fd7ab 100644 --- a/science/orthanc-webviewer/Makefile +++ b/science/orthanc-webviewer/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= orthanc-webviewer -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= science graphics MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/plugin-webviewer/:main \ http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/WebViewer/:thirdparty diff --git a/science/orthanc-webviewer/distinfo b/science/orthanc-webviewer/distinfo index c4a9f368612..70b980e0407 100644 --- a/science/orthanc-webviewer/distinfo +++ b/science/orthanc-webviewer/distinfo @@ -1,5 +1,5 @@ -SHA256 (orthanc/OrthancWebViewer-1.1.tar.gz) = 052482f3d40839c780b0a5bd8f160b9b1991fbe3945a7b28dbbf38d1577978da -SIZE (orthanc/OrthancWebViewer-1.1.tar.gz) = 139582 +SHA256 (orthanc/OrthancWebViewer-1.2.tar.gz) = bbb992b1f70eddbc92b64e815d40c464f329f39e62c86ccad15875276f447a95 +SIZE (orthanc/OrthancWebViewer-1.2.tar.gz) = 148939 SHA256 (orthanc/jsPanel-2.3.3-fixed.zip) = 958a15c7009efbb865da62b5850a3a39661c62696e38b151c7f988f4ac445595 SIZE (orthanc/jsPanel-2.3.3-fixed.zip) = 826542 SHA256 (orthanc/cornerstone-0.7.1.zip) = 2133390dda5b9444b6535bb78163a493a2f0a2a6929d5cbc082034c9b1eb36a9 diff --git a/science/pulseview/Makefile b/science/pulseview/Makefile index 1d3ae03ad3b..a1f59f215e7 100644 --- a/science/pulseview/Makefile +++ b/science/pulseview/Makefile @@ -11,6 +11,7 @@ MAINTAINER= uffe@uffe.org COMMENT= GUI client that supports various hardware logic analyzers LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libsigrok.so:${PORTSDIR}/devel/libsigrok \ @@ -18,7 +19,8 @@ LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ USES= cmake gmake pkgconfig USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build -CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man +CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ + -DDISABLE_WERROR:BOOL=TRUE PLIST_FILES= bin/pulseview man/man1/pulseview.1.gz MAKE_JOBS_UNSAFE=yes diff --git a/science/pulseview/files/patch-pv_data_signaldata.cpp b/science/pulseview/files/patch-pv_data_signaldata.cpp index 174fa0894a7..cf9c36bba0c 100644 --- a/science/pulseview/files/patch-pv_data_signaldata.cpp +++ b/science/pulseview/files/patch-pv_data_signaldata.cpp @@ -1,4 +1,4 @@ ---- pv/data/signaldata.cpp.orig 2014-05-06 21:43:51.000000000 +0000 +--- pv/data/signaldata.cpp.orig 2014-05-06 21:43:51 UTC +++ pv/data/signaldata.cpp @@ -29,6 +29,10 @@ SignalData::SignalData() : { diff --git a/science/pulseview/files/patch-pv_data_signaldata.h b/science/pulseview/files/patch-pv_data_signaldata.h index e08a85ff062..709ffc2ad77 100644 --- a/science/pulseview/files/patch-pv_data_signaldata.h +++ b/science/pulseview/files/patch-pv_data_signaldata.h @@ -1,4 +1,4 @@ ---- pv/data/signaldata.h.orig 2014-05-06 21:43:51.000000000 +0000 +--- pv/data/signaldata.h.orig 2014-05-06 21:43:51 UTC +++ pv/data/signaldata.h @@ -30,6 +30,7 @@ class SignalData { diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile index 1da2b44dec5..2662c64a36a 100644 --- a/science/py-mdp/Makefile +++ b/science/py-mdp/Makefile @@ -19,8 +19,6 @@ RUN_DEPENDS= ${PYNUMPY} USES= python USE_PYTHON= distutils autoplist -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options - OPTIONS_DEFINE= LIBSVM PP SCIPY LIBSVM_DESC= Provide the LibSVMClassifier node diff --git a/security/botan110/Makefile b/security/botan110/Makefile index f697f532729..a21bf0ca341 100644 --- a/security/botan110/Makefile +++ b/security/botan110/Makefile @@ -14,8 +14,6 @@ COMMENT= Portable, easy to use, and efficient C++ crypto library LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/doc/license.txt -LATEST_LINK= botan${PKGNAMESUFFIX} - OPTIONS_DEFINE= SSL GMP ECC DOCS OPTIONS_DEFAULT= SSL GMP ECC ECC_DESC= ECC support diff --git a/security/gag/Makefile b/security/gag/Makefile index 8a0c62b1cdb..1b0a5d34c3b 100644 --- a/security/gag/Makefile +++ b/security/gag/Makefile @@ -11,8 +11,6 @@ EXTRACT_SUFX= .tar MAINTAINER= ports@FreeBSD.org COMMENT= Stacheldraht (DOS attack) agent detector -LATEST_LINK= gag-sickenscan - ALL_TARGET= gag PORTDOCS= README diff --git a/security/keepass/Makefile b/security/keepass/Makefile index 1c88cef4667..3383dcb72fb 100644 --- a/security/keepass/Makefile +++ b/security/keepass/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= keepass -PORTVERSION= 2.29 +PORTVERSION= 2.30 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/KeePass%202.x/${PORTVERSION} DISTNAME= KeePass-${PORTVERSION}-Source diff --git a/security/keepass/distinfo b/security/keepass/distinfo index 9194cd819fe..e4c8a45762e 100644 --- a/security/keepass/distinfo +++ b/security/keepass/distinfo @@ -1,2 +1,2 @@ -SHA256 (KeePass-2.29-Source.zip) = b5582eb96611726a70b523c156c89dfb83ae80ce051a4f57bb0b7a6fbf023a14 -SIZE (KeePass-2.29-Source.zip) = 4762221 +SHA256 (KeePass-2.30-Source.zip) = 4a3c3c217bc05b13bf903612b89a09b67ed1df68fdecd83324f2ef372313e9e4 +SIZE (KeePass-2.30-Source.zip) = 4767753 diff --git a/security/krb5-111/Makefile b/security/krb5-111/Makefile index 49228edc313..a3c6d02c723 100644 --- a/security/krb5-111/Makefile +++ b/security/krb5-111/Makefile @@ -25,7 +25,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* krb5-maint-112-* -LATEST_LINK= ${PORTNAME}-111 KERBEROSV_URL= http://web.mit.edu/kerberos/ USES= cpe gettext gmake perl5 gssapi:bootstrap,mit USE_PERL5= build diff --git a/security/krb5-112/Makefile b/security/krb5-112/Makefile index ed222b40e11..f4a3a3b8cd3 100644 --- a/security/krb5-112/Makefile +++ b/security/krb5-112/Makefile @@ -22,7 +22,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* krb5-maint-111-* -LATEST_LINK= ${PORTNAME}-112 KERBEROSV_URL= http://web.mit.edu/kerberos/ USE_PERL5= build USE_LDCONFIG= yes diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index f79ac94277f..08e48588f43 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -18,7 +18,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ CONFLICTS= krb4-[0-9]* krb5-1.[0-7].* heimdal-[0-9]* srp-[0-9]* -LATEST_LINK= ${PORTNAME}-1 KERBEROSV_URL= http://web.mit.edu/kerberos/ USE_OPENSSL= yes USES= gmake perl5 gssapi:mit diff --git a/security/openssh-portable-devel/Makefile b/security/openssh-portable-devel/Makefile index 6d0637d577e..71ce2839732 100644 --- a/security/openssh-portable-devel/Makefile +++ b/security/openssh-portable-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openssh -DISTVERSION= 20150727 +DISTVERSION= 20150817 PORTREVISION= 0 CATEGORIES= security ipv6 MASTER_SITES= http://www.mindrot.org/openssh_snap/ \ @@ -63,9 +63,9 @@ HPN_CONFIGURE_WITH= hpn NONECIPHER_CONFIGURE_WITH= nonecipher # See http://www.roumenpetrov.info/openssh/ -X509_VERSION= 8.4 +X509_VERSION= 8.5 X509_PATCH_SITES= http://www.roumenpetrov.info/openssh/x509-${X509_VERSION}/:x509 -X509_PATCHFILES= ${PORTNAME}-6.9p1+x509-${X509_VERSION}.diff.gz:-p1:x509 +X509_PATCHFILES= ${PORTNAME}-7.0p1+x509-${X509_VERSION}.diff.gz:-p1:x509 # See https://bugzilla.mindrot.org/show_bug.cgi?id=2016 # and https://bugzilla.mindrot.org/show_bug.cgi?id=1604 diff --git a/security/openssh-portable-devel/distinfo b/security/openssh-portable-devel/distinfo index df01fd0b0f5..7b5a4d1c2d4 100644 --- a/security/openssh-portable-devel/distinfo +++ b/security/openssh-portable-devel/distinfo @@ -1,6 +1,6 @@ -SHA256 (openssh-SNAP-20150727.tar.gz) = 56b9494352c2b0dcd81935c02bcca9a0d65399fe3cf894e07cce3fa05cdd3742 -SIZE (openssh-SNAP-20150727.tar.gz) = 1470849 +SHA256 (openssh-SNAP-20150817.tar.gz) = 0f4f39387ced6ea56be8cf95f0a27a7905a75456d268ba17d8cead08cbd7befc +SIZE (openssh-SNAP-20150817.tar.gz) = 1473182 SHA256 (openssh-6.8p1-sctp-2573.patch.gz) = 0348713ad4cb4463e90cf5202ed41c8f726d7d604f3f93922a9aa55b86abf04a SIZE (openssh-6.8p1-sctp-2573.patch.gz) = 8531 -SHA256 (openssh-6.9p1+x509-8.4.diff.gz) = 0ed8bfff0d2ecd9f3791ae1f168ca3270bb66d7ab7bc0a8ff2d61d2ab829c3fb -SIZE (openssh-6.9p1+x509-8.4.diff.gz) = 425687 +SHA256 (openssh-7.0p1+x509-8.5.diff.gz) = 6000557f1ddae06aff8837d440d93342a923fada571fec59fc5dedf388fb5f9e +SIZE (openssh-7.0p1+x509-8.5.diff.gz) = 411960 diff --git a/security/openssh-portable-devel/files/extra-patch-hpn b/security/openssh-portable-devel/files/extra-patch-hpn index 429f387335b..2155fd45ab2 100644 --- a/security/openssh-portable-devel/files/extra-patch-hpn +++ b/security/openssh-portable-devel/files/extra-patch-hpn @@ -447,9 +447,9 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o echo "" ---- work.clean/openssh-6.8p1/kex.c 2015-03-17 00:49:20.000000000 -0500 -+++ work/openssh-6.8p1/kex.c 2015-04-03 17:06:44.032682000 -0500 -@@ -587,6 +587,13 @@ +--- work.clean/openssh-6.8p1/kex.c.orig 2015-08-11 01:57:29.000000000 -0700 ++++ work.clean/openssh-6.8p1/kex.c 2015-08-17 17:02:06.770901000 -0700 +@@ -652,6 +652,13 @@ kex_choose_conf(struct ssh *ssh) int nenc, nmac, ncomp; u_int mode, ctos, need, dh_need, authlen; int r, first_kex_follows; @@ -463,10 +463,10 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o if ((r = kex_buf2prop(kex->my, NULL, &my)) != 0 || (r = kex_buf2prop(kex->peer, &first_kex_follows, &peer)) != 0) -@@ -635,6 +642,17 @@ - if ((r = choose_comp(&newkeys->comp, cprop[ncomp], - sprop[ncomp])) != 0) +@@ -709,6 +716,17 @@ kex_choose_conf(struct ssh *ssh) + peer[ncomp] = NULL; goto out; + } +#ifdef NONE_CIPHER_ENABLED + debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name); + if (strcmp(newkeys->enc.name, "none") == 0) { @@ -1199,9 +1199,9 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o debug("Authentication succeeded (%s).", authctxt.method->name); } ---- work.clean/openssh-6.8p1/sshd.c.orig 2015-03-17 00:49:20.000000000 -0500 -+++ work/openssh-6.8p1/sshd.c 2015-05-06 13:29:02.129507000 -0500 -@@ -430,8 +430,13 @@ sshd_exchange_identification(int sock_in +--- work.clean/openssh-6.8p1/sshd.c.orig 2015-08-17 17:01:06.925269000 -0700 ++++ work.clean/openssh-6.8p1/sshd.c 2015-08-17 17:05:40.008253000 -0700 +@@ -438,8 +438,13 @@ sshd_exchange_identification(int sock_in minor = PROTOCOL_MINOR_1; } @@ -1216,7 +1216,7 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o *options.version_addendum == '\0' ? "" : " ", options.version_addendum, newline); -@@ -1149,6 +1154,10 @@ server_listen(void) +@@ -1162,6 +1167,10 @@ server_listen(void) int ret, listen_sock, on = 1; struct addrinfo *ai; char ntop[NI_MAXHOST], strport[NI_MAXSERV]; @@ -1227,7 +1227,7 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o for (ai = options.listen_addrs; ai; ai = ai->ai_next) { if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) -@@ -1189,6 +1198,13 @@ server_listen(void) +@@ -1202,6 +1211,13 @@ server_listen(void) debug("Bind to port %s on %s.", strport, ntop); @@ -1241,9 +1241,9 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o /* Bind the socket to the desired port. */ if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) < 0) { error("Bind to port %s on %s failed: %.200s.", -@@ -2132,6 +2148,11 @@ main(int ac, char **av) - remote_ip, remote_port, - get_local_ipaddr(sock_in), get_local_port()); +@@ -2130,6 +2146,11 @@ main(int ac, char **av) + cleanup_exit(255); + } +#ifdef HPN_ENABLED + /* set the HPN options for the child */ @@ -1251,21 +1251,23 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o +#endif + /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is -@@ -2531,6 +2552,12 @@ do_ssh2_kex(void) - if (options.ciphers != NULL) { - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; + * We use get_canonical_hostname with usedns = 0 instead of + * get_remote_ipaddr here so IP options will be checked. +@@ -2564,6 +2585,14 @@ do_ssh2_kex(void) + struct kex *kex; + int r; + +#ifdef NONE_CIPHER_ENABLED -+ } else if (options.none_enabled == 1) { ++ if (options.none_enabled == 1) { + debug ("WARNING: None cipher enabled"); + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_ENCRYPT_INCLUDE_NONE; ++ } +#endif - } - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); ++ + myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( + options.kex_algorithms); + myproposal[PROPOSAL_ENC_ALGS_CTOS] = compat_cipher_proposal( --- work.clean/openssh-6.8p1/sshd_config 2015-04-01 22:07:18.248858000 -0500 +++ work/openssh-6.8p1/sshd_config 2015-04-01 22:16:49.932279000 -0500 @@ -127,6 +127,20 @@ diff --git a/security/proftpd-mod_clamav/Makefile b/security/proftpd-mod_clamav/Makefile index 5f37ea2fa35..3dfd166b6e6 100644 --- a/security/proftpd-mod_clamav/Makefile +++ b/security/proftpd-mod_clamav/Makefile @@ -14,7 +14,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd GH_TAGNAME= v${DISTVERSION} diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile index 985cc51367b..f5b305351c8 100644 --- a/security/py-itsdangerous/Makefile +++ b/security/py-itsdangerous/Makefile @@ -15,7 +15,6 @@ LICENSE= BSD3CLAUSE USES= python USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= JSON JSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:${PORTSDIR}/devel/py-simplejson diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile index 03c0e98c771..a02842f859f 100644 --- a/security/py-keyring/Makefile +++ b/security/py-keyring/Makefile @@ -15,8 +15,6 @@ LICENSE= PSFL BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner -LATEST_LINK= py-${PORTNAME} - USES= python zip USE_PYTHON= distutils autoplist diff --git a/security/rubygem-net-ssh/Makefile b/security/rubygem-net-ssh/Makefile index 1d17b46b44a..099cb74b279 100644 --- a/security/rubygem-net-ssh/Makefile +++ b/security/rubygem-net-ssh/Makefile @@ -4,6 +4,7 @@ PORTNAME= net-ssh PORTVERSION= 2.9.2 PORTEPOCH= 2 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG @@ -14,14 +15,16 @@ LICENSE= MIT OPTIONS_DEFINE= PROMPT_PASSPHRASES OPTIONS_DEFAULT=PROMPT_PASSPHRASES -OPTIONSFILE?= ${PORT_DBDIR}/rubygem-${PORTNAME}/options PROMPT_PASSPHRASES_DESC= Prompt for passphrases on keys PORTSCOUT= skipv:2.10.0 +NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= support/ssh_tunnel_bug.rb PROMPT_PASSPHRASES_RUN_DEPENDS= rubygem-ruby-termios>=0:${PORTSDIR}/comms/rubygem-ruby-termios diff --git a/security/rubygem-razorback-scriptNugget/Makefile b/security/rubygem-razorback-scriptNugget/Makefile index f6d624a2ff2..77d4c1c1350 100644 --- a/security/rubygem-razorback-scriptNugget/Makefile +++ b/security/rubygem-razorback-scriptNugget/Makefile @@ -3,6 +3,7 @@ PORTNAME= razorback-scriptNugget PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= SF/razorbacktm/Bindings DISTNAME= scriptNugget-ruby-${PORTVERSION} @@ -16,5 +17,7 @@ NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= lib/razorback.rb .include diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile index 1db80afd9e7..922134bf4a9 100644 --- a/security/shibboleth2-sp/Makefile +++ b/security/shibboleth2-sp/Makefile @@ -19,8 +19,6 @@ MAKE_ENV= NOKEYGEN=YES USE_LDCONFIG= yes USE_RC_SUBR= shibboleth-sp -LATEST_LINK= shibboleth2-sp - USERS= shibd GROUPS= shibd diff --git a/security/ssdeep/Makefile b/security/ssdeep/Makefile index 2c926fe2e53..82fe741b913 100644 --- a/security/ssdeep/Makefile +++ b/security/ssdeep/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ssdeep -PORTVERSION= 2.12 +PORTVERSION= 2.13 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/security/ssdeep/distinfo b/security/ssdeep/distinfo index e7124cc4dbf..32c086e2d4c 100644 --- a/security/ssdeep/distinfo +++ b/security/ssdeep/distinfo @@ -1,2 +1,2 @@ -SHA256 (ssdeep-2.12.tar.gz) = 89049e87adfd16b51bd8601d01cf02251df7513c4e0eb12576541bcb2e1e4bde -SIZE (ssdeep-2.12.tar.gz) = 375241 +SHA256 (ssdeep-2.13.tar.gz) = 6e4ca94457cb50ff3343d4dd585473817a461a55a666da1c5a74667924f0f8c5 +SIZE (ssdeep-2.13.tar.gz) = 380712 diff --git a/security/ssdeep/pkg-plist b/security/ssdeep/pkg-plist index 8cbb014895a..6896be1e06b 100644 --- a/security/ssdeep/pkg-plist +++ b/security/ssdeep/pkg-plist @@ -4,5 +4,5 @@ include/fuzzy.h lib/libfuzzy.a lib/libfuzzy.so lib/libfuzzy.so.2 -lib/libfuzzy.so.2.0.0 +lib/libfuzzy.so.2.1.0 man/man1/ssdeep.1.gz diff --git a/sysutils/Makefile b/sysutils/Makefile index d5c5490d680..fe05d7fb64c 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -849,6 +849,7 @@ SUBDIR += rubygem-fluent-plugin-file-alternative SUBDIR += rubygem-fluent-plugin-tail-asis SUBDIR += rubygem-fluentd + SUBDIR += rubygem-fluentd010 SUBDIR += rubygem-fssm SUBDIR += rubygem-god SUBDIR += rubygem-guard diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile index 20cbd7e4e32..2b6ce7b6651 100644 --- a/sysutils/backuppc-devel/Makefile +++ b/sysutils/backuppc-devel/Makefile @@ -15,8 +15,6 @@ COMMENT= Multi-platform backup to disk-based storage LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -LATEST_LINK= ${PORTNAME}-devel - RUN_DEPENDS= p5-File-Listing>=0:${PORTSDIR}/sysutils/p5-File-Listing \ p5-BackupPC-XS>=0.30:${PORTSDIR}/sysutils/p5-BackupPC-XS diff --git a/sysutils/bacula-docs/Makefile b/sysutils/bacula-docs/Makefile index dbde6cf49b5..fb945913167 100644 --- a/sysutils/bacula-docs/Makefile +++ b/sysutils/bacula-docs/Makefile @@ -13,8 +13,6 @@ COMMENT= Bacula document set NO_BUILD= yes -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PORTDOCS= *.pdf do-install: diff --git a/sysutils/bacula5-docs/Makefile b/sysutils/bacula5-docs/Makefile index a3eae3fc9ae..03ac1c93450 100644 --- a/sysutils/bacula5-docs/Makefile +++ b/sysutils/bacula5-docs/Makefile @@ -15,8 +15,6 @@ COMMENT= Bacula document set NO_BUILD= yes -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PORTDOCS= *.pdf do-install: diff --git a/sysutils/bareos-docs/Makefile b/sysutils/bareos-docs/Makefile index 026ddccbe93..c1aa6e34ecd 100644 --- a/sysutils/bareos-docs/Makefile +++ b/sysutils/bareos-docs/Makefile @@ -13,8 +13,6 @@ COMMENT= Bareos document set (PDF) NO_BUILD= yes -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PORTDOCS= *.pdf do-extract: diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile index ec3946e7b53..e8075463e9a 100644 --- a/sysutils/boxbackup-devel/Makefile +++ b/sysutils/boxbackup-devel/Makefile @@ -17,8 +17,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE-DUAL.txt SVNVERSION= 0.11_trunk_2979 -NO_LATEST_LINK= yes - USES= perl5 tar:tgz USE_OPENSSL= yes GNU_CONFIGURE= yes diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile index 5f409547bfa..72d442e1711 100644 --- a/sysutils/cdrtools-devel/Makefile +++ b/sysutils/cdrtools-devel/Makefile @@ -49,7 +49,6 @@ SICONVTABLES= cp10000 cp10006 cp10007 cp10029 cp10079 cp10081 cp1250 \ iso8859-16 iso8859-2 iso8859-3 iso8859-4 iso8859-5 \ iso8859-6 iso8859-7 iso8859-8 iso8859-9 koi8-r koi8-u -NO_LATEST_LINK= yes USES= gmake tar:bzip2 #CFLAGS+= -DSOURCE_MODIFIED WRKSRC= ${WRKDIR}/${DISTNAME:C/a(.+)$//} diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile index 9ffad5701eb..00b55479155 100644 --- a/sysutils/cfengine32/Makefile +++ b/sysutils/cfengine32/Makefile @@ -14,7 +14,6 @@ MAINTAINER= cy@FreeBSD.org COMMENT= Systems administration tool for networks CPE_VENDOR= gnu -LATEST_LINK= cfengine32 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} CONFLICTS= cfengine-[2]* cfengine-3.[345]* cfengine-devel-* diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile index a2014228fb3..da6ba321bee 100644 --- a/sysutils/cfengine34/Makefile +++ b/sysutils/cfengine34/Makefile @@ -14,7 +14,6 @@ CPE_VENDOR= gnu .if !defined(MASTERDIR) PKGNAMESUFFIX= 34 -LATEST_LINK= cfengine34 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/cfengine36/Makefile b/sysutils/cfengine36/Makefile index f9981e862dc..7b29b105846 100644 --- a/sysutils/cfengine36/Makefile +++ b/sysutils/cfengine36/Makefile @@ -17,7 +17,6 @@ CPE_VENDOR= gnu .if !defined(MASTERDIR) PKGNAMESUFFIX= 36 -LATEST_LINK= cfengine36 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/cfengine37/Makefile b/sysutils/cfengine37/Makefile index f8484256dac..a13b4451f00 100644 --- a/sysutils/cfengine37/Makefile +++ b/sysutils/cfengine37/Makefile @@ -18,7 +18,6 @@ CPE_VENDOR= gnu .if !defined(MASTERDIR) PKGNAMESUFFIX= 37 -LATEST_LINK= cfengine37 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile index 0bd8f20c5aa..0d812a8524c 100644 --- a/sysutils/knutclient-kde4/Makefile +++ b/sysutils/knutclient-kde4/Makefile @@ -18,6 +18,5 @@ CONFLICTS= knutclient-0.* USES= cmake gettext USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build -LATEST_LINK= knutclient-kde4 .include diff --git a/sysutils/mate-power-manager/Makefile b/sysutils/mate-power-manager/Makefile index bb9ffcad4cd..060905d08b7 100644 --- a/sysutils/mate-power-manager/Makefile +++ b/sysutils/mate-power-manager/Makefile @@ -3,7 +3,7 @@ PORTNAME= mate-power-manager PORTVERSION= 1.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils mate MASTER_SITES= MATE DIST_SUBDIR= mate diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile index 586beb92196..f2dc32a995a 100644 --- a/sysutils/osquery/Makefile +++ b/sysutils/osquery/Makefile @@ -29,7 +29,7 @@ LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs \ libicuuc.so:${PORTSDIR}/devel/icu USES= cmake:outsource gmake libtool python:build compiler:c++11-lib -CMAKE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \ +CONFIGURE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \ SKIP_TESTS="yes" CC="${CC}" CXX="${CXX}" CMAKE_ARGS+= -DFREEBSD=awesome -DCMAKE_SYSTEM_NAME="FreeBSD" BLDDIR= ${WRKDIR}/.build/${PORTNAME} diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile index fa132bad00b..35630910da9 100644 --- a/sysutils/pear-Log/Makefile +++ b/sysutils/pear-Log/Makefile @@ -13,7 +13,6 @@ LICENSE= MIT USES= pear USE_PHP= yes -LATEST_LINK= pear-Log OPTIONS_DEFINE= PEAR_DB PEAR_MDB2 PEAR_MAIL PEAR_SQLITE PEAR_DB_DESC= PEAR::DB support PEAR_MDB2_DESC= PEAR::MDB2 support diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile index 1a916fe8789..3ff388bb076 100644 --- a/sysutils/py-supervisor/Makefile +++ b/sysutils/py-supervisor/Makefile @@ -18,7 +18,6 @@ TEST_DEPENDS:= ${RUN_DEPENDS} \ OPTIONS_DEFINE= TESTS TESTS_DESC= Install mock for running unit tests -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options .include diff --git a/sysutils/qpxtool/Makefile b/sysutils/qpxtool/Makefile index e1f64c01bbc..635e690b088 100644 --- a/sysutils/qpxtool/Makefile +++ b/sysutils/qpxtool/Makefile @@ -3,26 +3,42 @@ PORTNAME= qpxtool PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION:C/\.[^.]*$/.x/}/${DISTVERSION} MAINTAINER= horia@racoviceanu.com COMMENT= GUI for testing CD/DVD quality and transfer rate +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png USES= gmake tar:bzip2 -USE_QT4= qmake_build moc_build rcc_build linguist_build corelib gui network sql +USE_QT4= qmake_build moc_build rcc_build linguisttools_build \ + corelib gui network sql QT_NONSTANDARD= yes HAS_CONFIGURE= yes CONFIGURE_ENV= PREFIX=${PREFIX} USE_LDCONFIG= yes +OPTIONS_GROUP= DB +OPTIONS_GROUP_DB= SQLITE MYSQL PGSQL +OPTIONS_DEFAULT= SQLITE + +SQLITE_USE= QT4=sql-sqlite3_run +MYSQL_USE= QT4=sql-mysql_run +PGSQL_USE= QT4=sql-pgsql_run + post-configure: @${REINPLACE_CMD} -e 's|$$(QMAKE4)|& ${QMAKE_AGRS}|' \ ${WRKSRC}/gui/Makefile @${REINPLACE_CMD} -e 's|S_ISBLK|S_ISCHR|' \ ${WRKSRC}/lib/qpxtransport/qpx_mmc.cpp +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \ + ${STAGEDIR}${PREFIX}/sbin/pxfw + .include diff --git a/sysutils/qpxtool/files/patch-configure b/sysutils/qpxtool/files/patch-configure index d2cb2cd66fe..c37715f9823 100644 --- a/sysutils/qpxtool/files/patch-configure +++ b/sysutils/qpxtool/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2010-03-27 19:25:38.000000000 +0300 -+++ configure 2010-04-25 07:56:54.000000000 +0400 -@@ -13,10 +13,10 @@ +--- configure.orig 2012-12-04 12:06:33 UTC ++++ configure +@@ -13,10 +13,10 @@ OSLIBS_INET="" OSLIBS_DL="" OSLIBS_THREAD="" @@ -15,7 +15,7 @@ __enable_debug=no __enable_png=yes __enable_gui=yes -@@ -261,8 +261,8 @@ +@@ -344,8 +344,8 @@ LPNG_LIB = $lpng_ldflags " >> Makefile @@ -26,7 +26,7 @@ if test "$__enable_debug" = "yes" ; then echo "# additional debug options" >> Makefile -@@ -407,7 +407,7 @@ +@@ -491,7 +491,7 @@ else fi fi fi @@ -35,7 +35,7 @@ echo " clean: Makefile.qmake -@@ -765,7 +765,7 @@ +@@ -846,7 +846,7 @@ case "$OSL" in __libdir=$__prefix/lib __plugindir=$__libdir/qpxtool __incdir=$__prefix/include diff --git a/sysutils/rubygem-fluentd/Makefile b/sysutils/rubygem-fluentd/Makefile index 56d89d337a6..bafe8bbfada 100644 --- a/sysutils/rubygem-fluentd/Makefile +++ b/sysutils/rubygem-fluentd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= fluentd -PORTVERSION= 0.10.61 +PORTVERSION= 0.12.14 CATEGORIES= sysutils rubygems MASTER_SITES= RG @@ -11,12 +11,13 @@ COMMENT= Fluent event collector LICENSE= APACHE20 RUN_DEPENDS= \ - rubygem-cool.io>=1.1.1:${PORTSDIR}/devel/rubygem-cool.io \ - rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \ + rubygem-msgpack>=0.5.11:${PORTSDIR}/devel/rubygem-msgpack \ rubygem-json>=1.4.3:${PORTSDIR}/devel/rubygem-json \ - rubygem-msgpack>=0.5.4:${PORTSDIR}/devel/rubygem-msgpack \ + rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby \ + rubygem-cool.io>=1.2.2:${PORTSDIR}/devel/rubygem-cool.io \ + rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \ rubygem-sigdump>=0.2.2:${PORTSDIR}/devel/rubygem-sigdump \ - rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby + rubygem-tzinfo>=1.0.0:${PORTSDIR}/devel/rubygem-tzinfo USE_RUBY= yes USE_RUBYGEMS= yes @@ -29,9 +30,16 @@ USERS= fluentd GROUPS= fluentd SUB_LIST+= USER=${USERS} GROUP=${GROUPS} RUBY=${RUBY} NO_ARCH= YES +NO_LATEST_LINK= YES + +.include + +.if ${RUBY_VER} == 2.0 +RUN_DEPENDS+= rubygem-string-scrub>=0.0.3:${PORTSDIR}/textproc/rubygem-string-scrub +.endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fluentd/plugin ${CP} ${WRKSRC}/fluent.conf.sample ${STAGEDIR}${PREFIX}/etc/fluentd/ -.include +.include diff --git a/sysutils/rubygem-fluentd/distinfo b/sysutils/rubygem-fluentd/distinfo index 5004e751695..6d615a09628 100644 --- a/sysutils/rubygem-fluentd/distinfo +++ b/sysutils/rubygem-fluentd/distinfo @@ -1,2 +1,2 @@ -SHA256 (rubygem/fluentd-0.10.61.gem) = fc139cfe712a2288750553582601159de968d6269a38d46c5e72be573a8c77ad -SIZE (rubygem/fluentd-0.10.61.gem) = 124416 +SHA256 (rubygem/fluentd-0.12.14.gem) = f941eb3fb233330b933773d72123e03547b8229c650e96a3eb1b536bc3b327b2 +SIZE (rubygem/fluentd-0.12.14.gem) = 157184 diff --git a/sysutils/rubygem-fluentd010/Makefile b/sysutils/rubygem-fluentd010/Makefile new file mode 100644 index 00000000000..d1aa9f9fcd3 --- /dev/null +++ b/sysutils/rubygem-fluentd010/Makefile @@ -0,0 +1,38 @@ +# $FreeBSD$ + +PORTNAME= fluentd +PORTVERSION= 0.10.61 +CATEGORIES= sysutils rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 010 + +MAINTAINER= kuriyama@FreeBSD.org +COMMENT= Fluent event collector + +LICENSE= APACHE20 + +RUN_DEPENDS= \ + rubygem-cool.io>=1.1.1:${PORTSDIR}/devel/rubygem-cool.io \ + rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \ + rubygem-json>=1.4.3:${PORTSDIR}/devel/rubygem-json \ + rubygem-msgpack>=0.5.4:${PORTSDIR}/devel/rubygem-msgpack \ + rubygem-sigdump>=0.2.2:${PORTSDIR}/devel/rubygem-sigdump \ + rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby + +USE_RUBY= yes +USE_RUBYGEMS= yes +PLIST_FILES= bin/fluent-cat bin/fluent-debug bin/fluent-gem bin/fluentd \ + "@sample etc/fluentd/fluent.conf.sample" +PLIST_DIRS= etc/fluentd/plugin +RUBYGEM_AUTOPLIST= yes +USE_RC_SUBR= fluentd +USERS= fluentd +GROUPS= fluentd +SUB_LIST+= USER=${USERS} GROUP=${GROUPS} RUBY=${RUBY} +NO_ARCH= YES + +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fluentd/plugin + ${CP} ${WRKSRC}/fluent.conf.sample ${STAGEDIR}${PREFIX}/etc/fluentd/ + +.include diff --git a/sysutils/rubygem-fluentd010/distinfo b/sysutils/rubygem-fluentd010/distinfo new file mode 100644 index 00000000000..5004e751695 --- /dev/null +++ b/sysutils/rubygem-fluentd010/distinfo @@ -0,0 +1,2 @@ +SHA256 (rubygem/fluentd-0.10.61.gem) = fc139cfe712a2288750553582601159de968d6269a38d46c5e72be573a8c77ad +SIZE (rubygem/fluentd-0.10.61.gem) = 124416 diff --git a/sysutils/rubygem-fluentd010/files/fluentd.in b/sysutils/rubygem-fluentd010/files/fluentd.in new file mode 100644 index 00000000000..11a62b6229f --- /dev/null +++ b/sysutils/rubygem-fluentd010/files/fluentd.in @@ -0,0 +1,47 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: fluentd +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# fluentd_enable (bool): Set to NO by default. +# Set it to YES to enable fluentd. +# fluentd_config (path): Set to %%PREFIX%%/etc/fluentd/fluent.conf +# by default. +# fluentd_flags (str): Set to "" by default. + +. /etc/rc.subr + +name=fluentd +rcvar=fluentd_enable +extra_commands="init" + +load_rc_config $name + +: ${fluentd_enable:="NO"} +: ${fluentd_config="%%PREFIX%%/etc/fluentd/fluent.conf"} +: ${fluentd_dir="%%PREFIX%%/etc/fluentd"} +: ${fluentd_user="%%USER%%"} +: ${fluentd_group="%%GROUP%%"} +: ${fluentd_flags:=""} + +start_precmd="fluentd_start_precmd" + +command=%%PREFIX%%/bin/${name} +pidfile=/var/run/${name}/${name}.pid +command_interpreter=%%RUBY%% + +command_args="-d $pidfile -c $fluentd_config" + +fluentd_start_precmd() +{ + install -d -o ${fluentd_user} -g ${fluentd_group} -m 775 ${fluentd_dir} + install -d -o ${fluentd_user} -g ${fluentd_group} -m 775 /var/run/fluentd +} + +run_rc_command "$1" diff --git a/sysutils/rubygem-fluentd010/files/patch-fluent.conf.sample b/sysutils/rubygem-fluentd010/files/patch-fluent.conf.sample new file mode 100644 index 00000000000..108810ee190 --- /dev/null +++ b/sysutils/rubygem-fluentd010/files/patch-fluent.conf.sample @@ -0,0 +1,103 @@ +--- ./fluent.conf.sample.orig 2014-08-25 20:24:21 UTC ++++ ./fluent.conf.sample +@@ -0,0 +1,100 @@ ++ ++## built-in TCP input ++## $ echo | fluent-cat ++ ++ type forward ++ ++ ++## built-in UNIX socket input ++# ++# type unix ++# ++ ++# HTTP input ++# http://localhost:8888/?json= ++ ++ type http ++ port 8888 ++ ++ ++## File input ++## read apache logs with tag=apache.access ++# ++# type tail ++# format apache ++# path /var/log/httpd-access.log ++# tag apache.access ++# ++ ++# Listen HTTP for monitoring ++# http://localhost:24220/api/plugins ++# http://localhost:24220/api/plugins?type=TYPE ++# http://localhost:24220/api/plugins?tag=MYTAG ++ ++ type monitor_agent ++ port 24220 ++ ++ ++# Listen DRb for debug ++ ++ type debug_agent ++ bind 127.0.0.1 ++ port 24230 ++ ++ ++ ++## match tag=apache.access and write to file ++# ++# type file ++# path /var/log/fluent/access ++# ++ ++## match tag=debug.** and dump to console ++ ++ type stdout ++ ++ ++# match tag=system.** and forward to another fluent server ++ ++ type forward ++ ++ host 192.168.0.11 ++ ++ ++ ++ host 192.168.0.12 ++ ++ ++ ++ ++## match tag=myapp.** and forward and write to file ++# ++# type copy ++# ++# type forward ++# buffer_type file ++# buffer_path /var/log/fluent/myapp-forward ++# retry_limit 50 ++# flush_interval 10s ++# ++# host 192.168.0.13 ++# ++# ++# ++# type file ++# path /var/log/fluent/myapp ++# ++# ++ ++## match fluent's internal events ++# ++# type null ++# ++ ++## match not matched logs and write to file ++# ++# type file ++# path /var/log/fluent/else ++# compress gz ++# ++ diff --git a/sysutils/rubygem-fluentd010/pkg-descr b/sysutils/rubygem-fluentd010/pkg-descr new file mode 100644 index 00000000000..925fe6de04b --- /dev/null +++ b/sysutils/rubygem-fluentd010/pkg-descr @@ -0,0 +1,5 @@ +Fluentd is a log collector daemon written in Ruby. Fluentd receives +logs as JSON streams, buffers them, and sends them to other systems +like MySQL, MongoDB, or even other instances of Fluentd. + +WWW: http://fluentd.org/ diff --git a/sysutils/s6/Makefile b/sysutils/s6/Makefile index 8a3cca27a29..8affe3ee660 100644 --- a/sysutils/s6/Makefile +++ b/sysutils/s6/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= s6 -PORTVERSION= 2.1.6.0 +PORTVERSION= 2.2.0.1 CATEGORIES= sysutils MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/ @@ -11,8 +11,8 @@ COMMENT= skarnet.org supervision suite LICENSE= ISCL -BUILD_DEPENDS= skalibs>=2.3.5.1:${PORTSDIR}/devel/skalibs \ - execline>=2.1.2.2:${PORTSDIR}/lang/execline +BUILD_DEPENDS= skalibs>=2.3.6.1:${PORTSDIR}/devel/skalibs \ + execline>=2.1.3.1:${PORTSDIR}/lang/execline RUN_DEPENDS= execlineb:${PORTSDIR}/lang/execline USES= gmake @@ -26,6 +26,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-default-path=${LOCALBASE}/bin:/usr/bin:/bin \ --with-include=${LOCALBASE}/include \ + --with-dynlib=${LOCALBASE}/lib \ --with-lib=${LOCALBASE}/lib/skalibs \ --with-lib=${LOCALBASE}/lib/execline \ --enable-shared diff --git a/sysutils/s6/distinfo b/sysutils/s6/distinfo index 9c458872058..7d2f37e5cdf 100644 --- a/sysutils/s6/distinfo +++ b/sysutils/s6/distinfo @@ -1,2 +1,2 @@ -SHA256 (s6-2.1.6.0.tar.gz) = a4e977253fbe130788b721ae51a70680b71f4dfe3c02ebb1db0472e21548d467 -SIZE (s6-2.1.6.0.tar.gz) = 191362 +SHA256 (s6-2.2.0.1.tar.gz) = 32334d8a3138346370bf4f2cddb56236bd420414cd20ff9abfa4e058619bee71 +SIZE (s6-2.2.0.1.tar.gz) = 191576 diff --git a/sysutils/s6/pkg-plist b/sysutils/s6/pkg-plist index 234de0d4508..d58e19530b6 100644 --- a/sysutils/s6/pkg-plist +++ b/sysutils/s6/pkg-plist @@ -34,7 +34,6 @@ bin/s6-ipcserver-socketbinder bin/s6-ipcserverd bin/s6-log bin/s6-mkfifodir -bin/s6-notifywhenup bin/s6-setlock bin/s6-setsid bin/s6-softlimit @@ -68,9 +67,9 @@ include/s6/s6.h include/s6/s6lock.h lib/libs6.so lib/libs6.so.2 -lib/libs6.so.2.1 -lib/libs6.so.2.1.6 -lib/libs6.so.2.1.6.0 +lib/libs6.so.2.2 +lib/libs6.so.2.2.0 +lib/libs6.so.2.2.0.1 lib/s6/libs6.a libexec/s6lockd-helper sbin/s6-applyuidgid @@ -122,7 +121,6 @@ sbin/s6-setuidgid %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserverd.html %%PORTDOCS%%%%DOCSDIR%%/s6-log.html %%PORTDOCS%%%%DOCSDIR%%/s6-mkfifodir.html -%%PORTDOCS%%%%DOCSDIR%%/s6-notifywhenup.html %%PORTDOCS%%%%DOCSDIR%%/s6-setlock.html %%PORTDOCS%%%%DOCSDIR%%/s6-setsid.html %%PORTDOCS%%%%DOCSDIR%%/s6-setuidgid.html diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile index 56407da8295..a8d4c1248ff 100644 --- a/sysutils/syslog-ng-devel/Makefile +++ b/sysutils/syslog-ng-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= syslog-ng -PORTVERSION= 3.7.0a2 -PORTREVISION= 1 +PORTVERSION= 3.7.1 PKGNAMESUFFIX= -devel CATEGORIES= sysutils DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/) @@ -24,8 +23,8 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION) MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS OPENSSL -OPTIONS_DEFAULT= OPENSSL JSON +OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON +OPTIONS_DEFAULT= JSON TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support SPOOF_DESC= Build with spoof source support @@ -34,6 +33,8 @@ SMTP_DESC= Build with SMTP support JSON_DESC= Build with JSON-C support GEOIP_DESC= Build with GeoIP support REDIS_DESC= Build with Redis support +JAVA_DESC= Build with Java support (and modules, like Elastic) +PYTHON_DESC= Build with Python 2.7 support USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes @@ -41,27 +42,21 @@ USE_RC_SUBR= syslog-ng GNU_CONFIGURE= yes USE_GNOME= glib20 SUB_FILES= pkg-message +USE_OPENSSL= yes +WITH_OPENSSL_PORT= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ - --enable-dynamic-linking \ - --enable-debug \ + --enable-dynamic-linking --enable-manpages \ --datadir=${PREFIX}/share/syslog-ng/ + BROKEN_sparc64= Does not compile on sparc64: gcc core dump .include -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes -CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" -PLIST_FILES+= lib/syslog-ng/libafsocket-tls.so -.else -CONFIGURE_ARGS+= --disable-ssl -.endif .if ${PORT_OPTIONS:MTCP_WRAPPERS} CONFIGURE_ARGS+= --enable-tcp-wrapper @@ -89,7 +84,7 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= --enable-geoip LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP CONFIGURE_ENV+= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP" -PLIST_FILES+= lib/syslog-ng/libtfgeoip.so +PLIST_FILES+= lib/syslog-ng/libgeoip-plugin.so .else CONFIGURE_ARGS+= --disable-geoip .endif @@ -128,6 +123,32 @@ PLIST_FILES+= lib/syslog-ng/libjson-plugin.so CONFIGURE_ARGS+= --disable-json .endif +.if ${PORT_OPTIONS:MJAVA} +CONFIGURE_ARGS+= --enable-java +USE_JAVA= yes +BUILD_DEPENDS= gradle:${PORTSDIR}/devel/gradle +PLIST_FILES+= lib/syslog-ng/libmod-java.so \ + lib/syslog-ng/java-modules/syslog-ng-core.jar \ + lib/syslog-ng/java-modules/log4j-1.2.16.jar \ + lib/syslog-ng/java-modules/elastic.jar \ + lib/syslog-ng/java-modules/http.jar \ + lib/syslog-ng/java-modules/kafka.jar \ + lib/syslog-ng/java-modules/java-modules.jar \ + lib/syslog-ng/java-modules/hdfs.jar \ + lib/syslog-ng/java-modules/syslog-ng-common.jar \ + lib/syslog-ng/java-modules/dummy.jar +.else +CONFIGURE_ARGS+= --disable-java +.endif + +.if ${PORT_OPTIONS:MPYTHON} +CONFIGURE_ARGS+= --enable-python --with-python=2.7 +USES+= python:2.7 +PLIST_FILES+= lib/syslog-ng/libmod-python.so +.else +CONFIGURE_ARGS+= --disable-python +.endif + .include .if ${OSVERSION} < 900000 diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo index 4b70253b9d4..f42705074a1 100644 --- a/sysutils/syslog-ng-devel/distinfo +++ b/sysutils/syslog-ng-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (syslog-ng-3.7.0alpha2.tar.gz) = a4ff3cf20a77d6e895f8213f75c82715f3330a46f2d4e4505ff201ea7dfb9e9a -SIZE (syslog-ng-3.7.0alpha2.tar.gz) = 3211822 +SHA256 (syslog-ng-3.7.1.tar.gz) = 4c19841b9079b377cd814b1e6ebbf273af41d04d51c648f4c31f19bfadc20220 +SIZE (syslog-ng-3.7.1.tar.gz) = 3509575 diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample index 7fa32733ffd..337677ed652 100644 --- a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample @@ -1,4 +1,4 @@ -@version:3.6 +@version:3.7 @include "scl.conf" # diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist index 5d9a1bab781..afe008e0153 100644 --- a/sysutils/syslog-ng-devel/pkg-plist +++ b/sysutils/syslog-ng-devel/pkg-plist @@ -2,55 +2,177 @@ @sample etc/scl.conf.sample etc/syslog-ng.conf.dist @sample etc/syslog-ng.conf.sample -bin/loggen bin/pdbtool +bin/loggen bin/update-patterndb -include/syslog-ng/ack_tracker.h -include/syslog-ng/afinter.h -include/syslog-ng/alarms.h -include/syslog-ng/apphook.h -include/syslog-ng/atomic.h -include/syslog-ng/block-ref-parser.h -include/syslog-ng/bookmark.h -include/syslog-ng/cache.h -include/syslog-ng/cfg-args.h -include/syslog-ng/cfg-grammar.h -include/syslog-ng/cfg-lexer-subst.h -include/syslog-ng/cfg-lexer.h -include/syslog-ng/cfg-parser.h -include/syslog-ng/cfg-tree.h -include/syslog-ng/cfg.h -include/syslog-ng/children.h +include/syslog-ng/ivykis/iv_avl.h +include/syslog-ng/ivykis/iv_event.h +include/syslog-ng/ivykis/iv_event_raw.h +include/syslog-ng/ivykis/iv_list.h +include/syslog-ng/ivykis/iv_thread.h +include/syslog-ng/ivykis/iv_tls.h +include/syslog-ng/ivykis/iv_work.h +include/syslog-ng/ivykis/iv_fd_pump.h +include/syslog-ng/ivykis/iv_popen.h +include/syslog-ng/ivykis/iv_signal.h +include/syslog-ng/ivykis/iv_wait.h +include/syslog-ng/ivykis/iv.h include/syslog-ng/compat/compat.h include/syslog-ng/compat/getutent.h include/syslog-ng/compat/glib.h include/syslog-ng/compat/lfs.h include/syslog-ng/compat/pio.h -include/syslog-ng/compat/time.h include/syslog-ng/compat/socket.h include/syslog-ng/compat/string.h -include/syslog-ng/control/control-server.h +include/syslog-ng/compat/time.h include/syslog-ng/control/control.h +include/syslog-ng/control/control-server.h +include/syslog-ng/debugger/debugger.h +include/syslog-ng/debugger/tracer.h +include/syslog-ng/debugger/debugger-main.h +include/syslog-ng/filter/filter-expr.h +include/syslog-ng/filter/filter-op.h +include/syslog-ng/filter/filter-cmp.h +include/syslog-ng/filter/filter-in-list.h +include/syslog-ng/filter/filter-tags.h +include/syslog-ng/filter/filter-netmask.h +include/syslog-ng/filter/filter-netmask6.h +include/syslog-ng/filter/filter-call.h +include/syslog-ng/filter/filter-re.h +include/syslog-ng/filter/filter-pri.h +include/syslog-ng/filter/filter-pipe.h +include/syslog-ng/filter/filter-expr-parser.h +include/syslog-ng/libtest/testutils.h +include/syslog-ng/libtest/msg_parse_lib.h +include/syslog-ng/libtest/template_lib.h +include/syslog-ng/libtest/proto_lib.h +include/syslog-ng/libtest/persist_lib.h +include/syslog-ng/libtest/mock-transport.h +include/syslog-ng/logproto/logproto-client.h +include/syslog-ng/logproto/logproto-server.h +include/syslog-ng/logproto/logproto-buffered-server.h +include/syslog-ng/logproto/logproto-dgram-server.h +include/syslog-ng/logproto/logproto-framed-client.h +include/syslog-ng/logproto/logproto-framed-server.h +include/syslog-ng/logproto/logproto-text-client.h +include/syslog-ng/logproto/logproto-text-server.h +include/syslog-ng/logproto/logproto-indented-multiline-server.h +include/syslog-ng/logproto/logproto-regexp-multiline-server.h +include/syslog-ng/logproto/logproto-record-server.h +include/syslog-ng/logproto/logproto-builtins.h +include/syslog-ng/logproto/logproto.h +include/syslog-ng/parser/parser-expr.h +include/syslog-ng/parser/parser-expr-parser.h +include/syslog-ng/afinter.h +include/syslog-ng/alarms.h +include/syslog-ng/apphook.h +include/syslog-ng/atomic.h +include/syslog-ng/block-ref-parser.h +include/syslog-ng/cache.h +include/syslog-ng/cfg.h +include/syslog-ng/cfg-grammar.h +include/syslog-ng/cfg-lexer.h +include/syslog-ng/cfg-lexer-subst.h +include/syslog-ng/cfg-args.h +include/syslog-ng/cfg-parser.h +include/syslog-ng/cfg-tree.h +include/syslog-ng/children.h include/syslog-ng/crypto.h include/syslog-ng/dnscache.h +include/syslog-ng/misc.h include/syslog-ng/driver.h include/syslog-ng/file-perms.h -include/syslog-ng/filter/filter-call.h -include/syslog-ng/filter/filter-cmp.h -include/syslog-ng/filter/filter-expr-parser.h -include/syslog-ng/filter/filter-expr.h -include/syslog-ng/filter/filter-in-list.h -include/syslog-ng/filter/filter-netmask.h -include/syslog-ng/filter/filter-op.h -include/syslog-ng/filter/filter-pipe.h -include/syslog-ng/filter/filter-pri.h -include/syslog-ng/filter/filter-re.h -include/syslog-ng/filter/filter-tags.h include/syslog-ng/gprocess.h include/syslog-ng/gsockaddr.h include/syslog-ng/gsocket.h -include/syslog-ng/host-resolve.h include/syslog-ng/hostname.h +include/syslog-ng/host-resolve.h +include/syslog-ng/logmatcher.h +include/syslog-ng/logmpx.h +include/syslog-ng/logmsg.h +include/syslog-ng/logpipe.h +include/syslog-ng/logqueue-fifo.h +include/syslog-ng/logqueue.h +include/syslog-ng/logreader.h +include/syslog-ng/logsource.h +include/syslog-ng/logstamp.h +include/syslog-ng/logthrdestdrv.h +include/syslog-ng/logwriter.h +include/syslog-ng/mainloop.h +include/syslog-ng/mainloop-call.h +include/syslog-ng/mainloop-worker.h +include/syslog-ng/mainloop-io-worker.h +include/syslog-ng/module-config.h +include/syslog-ng/memtrace.h +include/syslog-ng/messages.h +include/syslog-ng/ml-batched-timer.h +include/syslog-ng/msg-format.h +include/syslog-ng/nvtable.h +include/syslog-ng/parse-number.h +include/syslog-ng/pathutils.h +include/syslog-ng/persist-state.h +include/syslog-ng/persistable-state-header.h +include/syslog-ng/persistable-state-presenter.h +include/syslog-ng/plugin.h +include/syslog-ng/plugin-types.h +include/syslog-ng/poll-events.h +include/syslog-ng/poll-fd-events.h +include/syslog-ng/pragma-parser.h +include/syslog-ng/presented-persistable-state.h +include/syslog-ng/reloc.h +include/syslog-ng/rcptid.h +include/syslog-ng/run-id.h +include/syslog-ng/scratch-buffers.h +include/syslog-ng/serialize.h +include/syslog-ng/service-management.h +include/syslog-ng/stringutils.h +include/syslog-ng/str-format.h +include/syslog-ng/syslog-names.h +include/syslog-ng/syslog-ng.h +include/syslog-ng/tags.h +include/syslog-ng/timeutils.h +include/syslog-ng/tls-support.h +include/syslog-ng/thread-utils.h +include/syslog-ng/tlscontext.h +include/syslog-ng/type-hinting.h +include/syslog-ng/uuid.h +include/syslog-ng/utf8utils.h +include/syslog-ng/value-pairs.h +include/syslog-ng/vptransform.h +include/syslog-ng/versioning.h +include/syslog-ng/bookmark.h +include/syslog-ng/ringbuffer.h +include/syslog-ng/ack_tracker.h +include/syslog-ng/host-id.h +include/syslog-ng/rewrite/rewrite-expr.h +include/syslog-ng/rewrite/rewrite-set-tag.h +include/syslog-ng/rewrite/rewrite-set.h +include/syslog-ng/rewrite/rewrite-subst.h +include/syslog-ng/rewrite/rewrite-expr-parser.h +include/syslog-ng/rewrite/rewrite-groupset.h +include/syslog-ng/stats/stats.h +include/syslog-ng/stats/stats-counter.h +include/syslog-ng/stats/stats-cluster.h +include/syslog-ng/stats/stats-csv.h +include/syslog-ng/stats/stats-log.h +include/syslog-ng/stats/stats-registry.h +include/syslog-ng/stats/stats-syslog.h +include/syslog-ng/template/templates.h +include/syslog-ng/template/macros.h +include/syslog-ng/template/function.h +include/syslog-ng/template/simple-function.h +include/syslog-ng/template/repr.h +include/syslog-ng/template/compiler.h +include/syslog-ng/template/user-function.h +include/syslog-ng/template/escaping.h +include/syslog-ng/template/common-template-typedefs.h +include/syslog-ng/transport/logtransport.h +include/syslog-ng/transport/transport-aux-data.h +include/syslog-ng/transport/transport-tls.h +include/syslog-ng/transport/transport-file.h +include/syslog-ng/transport/transport-pipe.h +include/syslog-ng/transport/transport-device.h +include/syslog-ng/transport/transport-socket.h include/syslog-ng/iv.h include/syslog-ng/iv_avl.h include/syslog-ng/iv_event.h @@ -64,143 +186,28 @@ include/syslog-ng/iv_thread.h include/syslog-ng/iv_tls.h include/syslog-ng/iv_wait.h include/syslog-ng/iv_work.h -include/syslog-ng/ivykis/iv.h -include/syslog-ng/ivykis/iv_avl.h -include/syslog-ng/ivykis/iv_event.h -include/syslog-ng/ivykis/iv_event_raw.h -include/syslog-ng/ivykis/iv_fd_pump.h -include/syslog-ng/ivykis/iv_list.h -include/syslog-ng/ivykis/iv_popen.h -include/syslog-ng/ivykis/iv_signal.h -include/syslog-ng/ivykis/iv_thread.h -include/syslog-ng/ivykis/iv_tls.h -include/syslog-ng/ivykis/iv_wait.h -include/syslog-ng/ivykis/iv_work.h -include/syslog-ng/libtest/mock-transport.h -include/syslog-ng/libtest/msg_parse_lib.h -include/syslog-ng/libtest/persist_lib.h -include/syslog-ng/libtest/proto_lib.h -include/syslog-ng/libtest/template_lib.h -include/syslog-ng/libtest/testutils.h -include/syslog-ng/logmatcher.h -include/syslog-ng/logmpx.h -include/syslog-ng/logmsg.h -include/syslog-ng/logpipe.h -include/syslog-ng/logproto/logproto-buffered-server.h -include/syslog-ng/logproto/logproto-builtins.h -include/syslog-ng/logproto/logproto-client.h -include/syslog-ng/logproto/logproto-dgram-server.h -include/syslog-ng/logproto/logproto-framed-client.h -include/syslog-ng/logproto/logproto-framed-server.h -include/syslog-ng/logproto/logproto-indented-multiline-server.h -include/syslog-ng/logproto/logproto-record-server.h -include/syslog-ng/logproto/logproto-regexp-multiline-server.h -include/syslog-ng/logproto/logproto-server.h -include/syslog-ng/logproto/logproto-text-client.h -include/syslog-ng/logproto/logproto-text-server.h -include/syslog-ng/logproto/logproto.h -include/syslog-ng/logqueue-fifo.h -include/syslog-ng/logqueue.h -include/syslog-ng/logreader.h -include/syslog-ng/logsource.h -include/syslog-ng/logstamp.h -include/syslog-ng/logthrdestdrv.h -include/syslog-ng/logwriter.h -include/syslog-ng/mainloop-call.h -include/syslog-ng/mainloop-io-worker.h -include/syslog-ng/mainloop-worker.h -include/syslog-ng/mainloop.h -include/syslog-ng/memtrace.h -include/syslog-ng/messages.h -include/syslog-ng/misc.h -include/syslog-ng/ml-batched-timer.h -include/syslog-ng/msg-format.h -include/syslog-ng/nvtable.h -include/syslog-ng/parse-number.h -include/syslog-ng/parser/parser-expr-parser.h -include/syslog-ng/parser/parser-expr.h -include/syslog-ng/pathutils.h -include/syslog-ng/persist-state.h -include/syslog-ng/persistable-state-header.h -include/syslog-ng/persistable-state-presenter.h -include/syslog-ng/plugin-types.h -include/syslog-ng/plugin.h -include/syslog-ng/poll-events.h -include/syslog-ng/poll-fd-events.h -include/syslog-ng/pragma-parser.h -include/syslog-ng/presented-persistable-state.h -include/syslog-ng/rcptid.h -include/syslog-ng/reloc.h -include/syslog-ng/rewrite/rewrite-expr-parser.h -include/syslog-ng/rewrite/rewrite-expr.h -include/syslog-ng/rewrite/rewrite-groupset.h -include/syslog-ng/rewrite/rewrite-set-tag.h -include/syslog-ng/rewrite/rewrite-set.h -include/syslog-ng/rewrite/rewrite-subst.h -include/syslog-ng/ringbuffer.h -include/syslog-ng/run-id.h -include/syslog-ng/scratch-buffers.h -include/syslog-ng/serialize.h -include/syslog-ng/service-management.h -include/syslog-ng/stats/stats-cluster.h -include/syslog-ng/stats/stats-counter.h -include/syslog-ng/stats/stats-csv.h -include/syslog-ng/stats/stats-log.h -include/syslog-ng/stats/stats-registry.h -include/syslog-ng/stats/stats-syslog.h -include/syslog-ng/stats/stats.h -include/syslog-ng/str-format.h -include/syslog-ng/syslog-names.h -include/syslog-ng/syslog-ng.h -include/syslog-ng/tags.h -include/syslog-ng/template/common-template-typedefs.h -include/syslog-ng/template/compiler.h -include/syslog-ng/template/escaping.h -include/syslog-ng/template/function.h -include/syslog-ng/template/macros.h -include/syslog-ng/template/repr.h -include/syslog-ng/template/simple-function.h -include/syslog-ng/template/templates.h -include/syslog-ng/template/user-function.h -include/syslog-ng/thread-utils.h -include/syslog-ng/timeutils.h -include/syslog-ng/tls-support.h -include/syslog-ng/tlscontext.h -include/syslog-ng/transport/logtransport.h -include/syslog-ng/transport/transport-aux-data.h -include/syslog-ng/transport/transport-device.h -include/syslog-ng/transport/transport-file.h -include/syslog-ng/transport/transport-pipe.h -include/syslog-ng/transport/transport-socket.h -include/syslog-ng/transport/transport-tls.h -include/syslog-ng/type-hinting.h -include/syslog-ng/uuid.h -include/syslog-ng/value-pairs.h -include/syslog-ng/versioning.h -include/syslog-ng/vptransform.h lib/libsyslog-ng-3.7.so.0.0.0 -lib/libsyslog-ng.so lib/libsyslog-ng-3.7.so.0 -lib/syslog-ng/libafamqp.so -lib/syslog-ng/libaffile.so -lib/syslog-ng/libafmongodb.so -lib/syslog-ng/libafprog.so -lib/syslog-ng/libafsocket-notls.so -lib/syslog-ng/libafsocket.so -lib/syslog-ng/libafstomp.so -lib/syslog-ng/libafuser.so -lib/syslog-ng/libbasicfuncs.so -lib/syslog-ng/libconfgen.so -lib/syslog-ng/libcryptofuncs.so -lib/syslog-ng/libcsvparser.so -lib/syslog-ng/libdbparser.so -lib/syslog-ng/libgraphite.so -lib/syslog-ng/liblinux-kmsg-format.so -lib/syslog-ng/libpseudofile.so -lib/syslog-ng/libsyslog-ng-crypto.so -lib/syslog-ng/libsyslogformat.so -lib/syslog-ng/libsystem-source.so +lib/libsyslog-ng.so lib/syslog-ng/libtest/libsyslog-ng-test.a +lib/syslog-ng/libsyslogformat.so +lib/syslog-ng/libafsocket.so +lib/syslog-ng/libaffile.so +lib/syslog-ng/libafprog.so +lib/syslog-ng/libafuser.so +lib/syslog-ng/libafamqp.so +lib/syslog-ng/libafmongodb.so +lib/syslog-ng/libcsvparser.so +lib/syslog-ng/libconfgen.so +lib/syslog-ng/libsystem-source.so +lib/syslog-ng/liblinux-kmsg-format.so +lib/syslog-ng/libbasicfuncs.so +lib/syslog-ng/libcryptofuncs.so +lib/syslog-ng/libdbparser.so +lib/syslog-ng/libafstomp.so +lib/syslog-ng/libpseudofile.so +lib/syslog-ng/libgraphite.so +lib/syslog-ng/libkvformat.so libdata/pkgconfig/syslog-ng.pc libdata/pkgconfig/syslog-ng-test.pc man/man1/loggen.1.gz @@ -210,19 +217,19 @@ man/man5/syslog-ng.conf.5.gz man/man8/syslog-ng.8.gz sbin/syslog-ng sbin/syslog-ng-ctl -share/syslog-ng/include/scl/cim/template.conf +share/syslog-ng/include/scl/system/plugin.conf +share/syslog-ng/include/scl/pacct/plugin.conf +share/syslog-ng/include/scl/syslogconf/plugin.conf +share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk +share/syslog-ng/include/scl/syslogconf/README +share/syslog-ng/include/scl/rewrite/cc-mask.conf +share/syslog-ng/include/scl/nodejs/plugin.conf share/syslog-ng/include/scl/graphite/plugin.conf share/syslog-ng/include/scl/graphite/README -share/syslog-ng/include/scl/nodejs/plugin.conf -share/syslog-ng/include/scl/pacct/plugin.conf +share/syslog-ng/include/scl/cim/template.conf share/syslog-ng/include/scl/solaris/plugin.conf -share/syslog-ng/include/scl/syslogconf/README -share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk -share/syslog-ng/include/scl/syslogconf/plugin.conf -share/syslog-ng/include/scl/system/plugin.conf -share/syslog-ng/include/scl/rewrite/cc-mask.conf -share/syslog-ng/tools/cfg-grammar.y share/syslog-ng/tools/lex-rules.am +share/syslog-ng/tools/cfg-grammar.y share/syslog-ng/tools/merge-grammar.pl share/syslog-ng/tools/system-expand share/syslog-ng/xsd/patterndb-1.xsd diff --git a/sysutils/ufs_copy/Makefile b/sysutils/ufs_copy/Makefile index 3528d79abe7..5788feef52c 100644 --- a/sysutils/ufs_copy/Makefile +++ b/sysutils/ufs_copy/Makefile @@ -3,7 +3,7 @@ PORTNAME= ufs_copy PORTVERSION= 20060921 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://people.freebsd.org/~simokawa/ufs/ DISTNAME= ufs-${PORTVERSION} diff --git a/sysutils/ufs_copy/files/patch-ufs_copy.c b/sysutils/ufs_copy/files/patch-ufs_copy.c index 318f6818b2b..2cec6e306ce 100644 --- a/sysutils/ufs_copy/files/patch-ufs_copy.c +++ b/sysutils/ufs_copy/files/patch-ufs_copy.c @@ -1,5 +1,5 @@ --- ufs_copy.c.orig 2006-09-21 15:28:09.000000000 +0900 -+++ ufs_copy.c 2007-12-27 23:28:55.000000000 +0900 ++++ ufs_copy.c 2015-08-17 11:45:07.797947000 +0900 @@ -111,9 +111,11 @@ main(int argc, char *argv[]) { @@ -58,3 +58,13 @@ fprintf(stderr, "done\n"); else fprintf(stderr, "failed\n"); +@@ -262,6 +289,9 @@ + } + } + bcopy(&src, &dst, sizeof(dst)); ++#if __FreeBSD_version >= 900011 ++ dst.d_sbcsum = NULL; ++#endif + dst.d_name = dst_path; + dst.d_fd = open(dst_path, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR ); + if (dst.d_fd < 0) { diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index 711bf6569fc..db35da71e0e 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= xen -PKGNAMESUFFIX= -tools -PORTVERSION= 4.5.0 -PORTREVISION= 9 +PORTVERSION= 4.5.1 CATEGORIES= sysutils emulators MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ \ http://code.coreboot.org/p/seabios/downloads/get/:seabios +PKGNAMESUFFIX= -tools MAINTAINER= bapt@FreeBSD.org COMMENT= Xen management tool, based on LibXenlight @@ -14,13 +13,13 @@ COMMENT= Xen management tool, based on LibXenlight LICENSE= GPLv2 LGPL3 LICENSE_COMB= multi -OPTIONS_DEFINE= DOCS - LIB_DEPENDS= libyajl.so:${PORTSDIR}/devel/yajl \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ libpixman-1.so:${PORTSDIR}/x11/pixman BUILD_DEPENDS= dev86>0:${PORTSDIR}/devel/dev86 +OPTIONS_DEFINE= DOCS + ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than amd64" @@ -30,8 +29,9 @@ DISTFILES+= ${DISTNAME}.tar.gz \ WRKSRC= ${WRKDIR}/xen-${PORTVERSION} -USES= cpe gmake perl5 python shebangfix libtool pkgconfig +USES= cpe gmake libtool perl5 pkgconfig python shebangfix USE_GNOME= glib20 +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= HOSTCC="${CC}" CC="${CC}" \ ac_cv_path_BASH=${TRUE} \ @@ -47,10 +47,7 @@ QEMU_ARGS= --disable-gtk \ --disable-curl \ --cxx=c++ -EXTRA_PATCHES= ${FILESDIR}/xsa119-unstable.patch:-p1 \ - ${FILESDIR}/xsa125.patch:-p1 \ - ${FILESDIR}/xsa137.patch:-p1 \ - ${FILESDIR}/0001-libelf-fix-elf_parse_bsdsyms-call.patch:-p1 \ +EXTRA_PATCHES= ${FILESDIR}/xsa137.patch:-p1 \ ${FILESDIR}/0002-libxc-fix-xc_dom_load_elf_symtab.patch:-p1 CONFIGURE_ARGS+= --with-extra-qemuu-configure-args="${QEMU_ARGS}" @@ -63,7 +60,7 @@ INSTALL_TARGET= install-tools install-docs .include .if ${OPSYS} != FreeBSD -IGNORE= Only supported on FreeBSD +IGNORE= only supported on FreeBSD .endif post-extract: @@ -80,11 +77,11 @@ post-patch: ${WRKSRC}/docs/man/* @for p in ${FILESDIR}/*qemut*.patch; do \ ${ECHO_CMD} "====> Applying $${p##*/}" ; \ - patch -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen-traditional ; \ + ${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen-traditional ; \ done @for p in ${FILESDIR}/*qemuu*.patch; do \ ${ECHO_CMD} "====> Applying $${p##*/}" ; \ - patch -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \ + ${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \ done post-install: diff --git a/sysutils/xen-tools/distinfo b/sysutils/xen-tools/distinfo index c1f31aeabb2..b89ed9e1923 100644 --- a/sysutils/xen-tools/distinfo +++ b/sysutils/xen-tools/distinfo @@ -1,4 +1,4 @@ -SHA256 (xen-4.5.0.tar.gz) = 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b -SIZE (xen-4.5.0.tar.gz) = 18404933 +SHA256 (xen-4.5.1.tar.gz) = 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 +SIZE (xen-4.5.1.tar.gz) = 18410400 SHA256 (seabios-1.8.1.tar.gz) = 283bd848f5ce9d4bc52add973a856347e02c9ce89a9e6bc92c99359b87c9871d SIZE (seabios-1.8.1.tar.gz) = 537712 diff --git a/sysutils/xen-tools/files/0001-libelf-fix-elf_parse_bsdsyms-call.patch b/sysutils/xen-tools/files/0001-libelf-fix-elf_parse_bsdsyms-call.patch deleted file mode 100644 index ddab05badae..00000000000 --- a/sysutils/xen-tools/files/0001-libelf-fix-elf_parse_bsdsyms-call.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c2da83662498a5cd66512c684a0af178228f9d5a Mon Sep 17 00:00:00 2001 -From: Roger Pau Monne -Date: Thu, 11 Jun 2015 17:08:26 +0200 -Subject: [PATCH 1/2] libelf: fix elf_parse_bsdsyms call -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -elf_parse_bsdsyms expects the second paramater to be a physical address, not -a virtual one. - -Signed-off-by: Roger Pau Monné -Cc: Ian Campbell -Cc: Ian Jackson -Cc: Jan Beulich -Cc: Tim Deegan ---- - xen/common/libelf/libelf-dominfo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c -index 6120dd4..86403b9 100644 ---- a/xen/common/libelf/libelf-dominfo.c -+++ b/xen/common/libelf/libelf-dominfo.c -@@ -438,7 +438,7 @@ static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, - - if ( parms->bsd_symtab ) - { -- elf_parse_bsdsyms(elf, parms->virt_kend); -+ elf_parse_bsdsyms(elf, elf->pend); - if ( elf->bsd_symtab_pend ) - parms->virt_kend = elf->bsd_symtab_pend + parms->virt_offset; - } --- -1.9.5 (Apple Git-50.3) - diff --git a/sysutils/xen-tools/files/xsa119-unstable.patch b/sysutils/xen-tools/files/xsa119-unstable.patch deleted file mode 100644 index f696eb5b6eb..00000000000 --- a/sysutils/xen-tools/files/xsa119-unstable.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f433bfafbaf7d8a41c4c27aa3e8e78b1ab900b69 Mon Sep 17 00:00:00 2001 -From: Ian Campbell -Date: Fri, 20 Feb 2015 14:41:09 +0000 -Subject: [PATCH] tools: libxl: Explicitly disable graphics backends on qemu - cmdline - -By default qemu will try to create some sort of backend for the -emulated VGA device, either SDL or VNC. - -However when the user specifies sdl=0 and vnc=0 in their configuration -libxl was not explicitly disabling either backend, which could lead to -one unexpectedly running. - -If either sdl=1 or vnc=1 is configured then both before and after this -change only the backends which are explicitly enabled are configured, -i.e. this issue only occurs when all backends are supposed to have -been disabled. - -This affects qemu-xen and qemu-xen-traditional differently. - -If qemu-xen was compiled with SDL support then this would result in an -SDL window being opened if $DISPLAY is valid, or a failure to start -the guest if not. Passing "-display none" to qemu before any further --sdl options disables this default behaviour and ensures that SDL is -only started if the libxl configuration demands it. - -If qemu-xen was compiled without SDL support then qemu would instead -start a VNC server listening on ::1 (IPv6 localhost) or 127.0.0.1 -(IPv4 localhost) with IPv6 preferred if available. Explicitly pass -"-vnc none" when vnc is not enabled in the libxl configuration to -remove this possibility. - -qemu-xen-traditional would never start a vnc backend unless asked. -However by default it will start an SDL backend, the way to disable -this is to pass a -vnc option. In other words passing "-vnc none" will -disable both vnc and sdl by default. sdl can then be reenabled if -configured by subsequent use of the -sdl option. - -Tested with both qemu-xen and qemu-xen-traditional built with SDL -support and: - xl cr # defaults - xl cr sdl=0 vnc=0 - xl cr sdl=1 vnc=0 - xl cr sdl=0 vnc=1 - xl cr sdl=0 vnc=0 vga=\"none\" - xl cr sdl=0 vnc=0 nographic=1 -with both valid and invalid $DISPLAY. - -This is XSA-119. - -Reported-by: Sander Eikelenboom -Signed-off-by: Ian Campbell -Acked-by: Ian Jackson ---- - tools/libxl/libxl_dm.c | 21 +++++++++++++++++++-- - 1 file changed, 19 insertions(+), 2 deletions(-) - -diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c -index 8599a6a..3b918c6 100644 ---- a/tools/libxl/libxl_dm.c -+++ b/tools/libxl/libxl_dm.c -@@ -180,7 +180,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, - if (libxl_defbool_val(vnc->findunused)) { - flexarray_append(dm_args, "-vncunused"); - } -- } -+ } else -+ /* -+ * VNC is not enabled by default by qemu-xen-traditional, -+ * however passing -vnc none causes SDL to not be -+ * (unexpectedly) enabled by default. This is overridden by -+ * explicitly passing -sdl below as required. -+ */ -+ flexarray_append_pair(dm_args, "-vnc", "none"); - - if (sdl) { - flexarray_append(dm_args, "-sdl"); -@@ -522,7 +529,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, - } - - flexarray_append(dm_args, vncarg); -- } -+ } else -+ /* -+ * Ensure that by default no vnc server is created. -+ */ -+ flexarray_append_pair(dm_args, "-vnc", "none"); -+ -+ /* -+ * Ensure that by default no display backend is created. Further -+ * options given below might then enable more. -+ */ -+ flexarray_append_pair(dm_args, "-display", "none"); - - if (sdl) { - flexarray_append(dm_args, "-sdl"); --- -2.1.4 - diff --git a/sysutils/xen-tools/files/xsa125.patch b/sysutils/xen-tools/files/xsa125.patch deleted file mode 100644 index ad5dbb31c20..00000000000 --- a/sysutils/xen-tools/files/xsa125.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 98670acc98cad5aee0e0714694a64d3b96675c36 Mon Sep 17 00:00:00 2001 -From: Konrad Rzeszutek Wilk -Date: Wed, 19 Nov 2014 12:57:11 -0500 -Subject: [PATCH] Limit XEN_DOMCTL_memory_mapping hypercall to only process up - to 64 GFNs (or less) - -Said hypercall for large BARs can take quite a while. As such -we can require that the hypercall MUST break up the request -in smaller values. - -Another approach is to add preemption to it - whether we do the -preemption using hypercall_create_continuation or returning -EAGAIN to userspace (and have it re-invocate the call) - either -way the issue we cannot easily solve is that in 'map_mmio_regions' -if we encounter an error we MUST call 'unmap_mmio_regions' for the -whole BAR region. - -Since the preemption would re-use input fields such as nr_mfns, -first_gfn, first_mfn - we would lose the original values - -and only undo what was done in the current round (i.e. ignoring -anything that was done prior to earlier preemptions). - -Unless we re-used the return value as 'EAGAIN|nr_mfns_done<<10' but -that puts a limit (since the return value is a long) on the amount -of nr_mfns that can provided. - -This patch sidesteps this problem by: - - Setting an hard limit of nr_mfns having to be 64 or less. - - Toolstack adjusts correspondingly to the nr_mfn limit. - - If the there is an error when adding the toolstack will call the - remove operation to remove the whole region. - -The need to break this hypercall down is for large BARs can take -more than the guest (initial domain usually) time-slice. This has -the negative result in that the guest is locked out for a long -duration and is unable to act on any pending events. - -We also augment the code to return zero if nr_mfns instead -of trying to the hypercall. - -Suggested-by: Jan Beulich -Acked-by: Jan Beulich -Signed-off-by: Konrad Rzeszutek Wilk -Acked-by: Ian Campbell ---- -[v50: Simplify loop] -[v51: If max_batch_sz 1 (or less) we would return zero. Fix that] -[v52: Handle nr_mfns being zero] -[v53: Fix up return value] ---- - tools/libxc/xc_domain.c | 46 +++++++++++++++++++++++++++++++++++++++++---- - xen/common/domctl.c | 5 +++++ - xen/include/public/domctl.h | 1 + - 3 files changed, 48 insertions(+), 4 deletions(-) - -diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c -index 845d1d7..bba7672 100644 ---- a/tools/libxc/xc_domain.c -+++ b/tools/libxc/xc_domain.c -@@ -1988,6 +1988,8 @@ int xc_domain_memory_mapping( - { - DECLARE_DOMCTL; - xc_dominfo_t info; -+ int ret = 0, err; -+ unsigned long done = 0, nr, max_batch_sz; - - if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 || - info.domid != domid ) -@@ -1998,14 +2000,50 @@ int xc_domain_memory_mapping( - if ( !xc_core_arch_auto_translated_physmap(&info) ) - return 0; - -+ if ( !nr_mfns ) -+ return 0; -+ - domctl.cmd = XEN_DOMCTL_memory_mapping; - domctl.domain = domid; -- domctl.u.memory_mapping.first_gfn = first_gfn; -- domctl.u.memory_mapping.first_mfn = first_mfn; -- domctl.u.memory_mapping.nr_mfns = nr_mfns; - domctl.u.memory_mapping.add_mapping = add_mapping; -+ max_batch_sz = nr_mfns; -+ do -+ { -+ nr = min(nr_mfns - done, max_batch_sz); -+ domctl.u.memory_mapping.nr_mfns = nr; -+ domctl.u.memory_mapping.first_gfn = first_gfn + done; -+ domctl.u.memory_mapping.first_mfn = first_mfn + done; -+ err = do_domctl(xch, &domctl); -+ if ( err && errno == E2BIG ) -+ { -+ if ( max_batch_sz <= 1 ) -+ break; -+ max_batch_sz >>= 1; -+ continue; -+ } -+ /* Save the first error... */ -+ if ( !ret ) -+ ret = err; -+ /* .. and ignore the rest of them when removing. */ -+ if ( err && add_mapping != DPCI_REMOVE_MAPPING ) -+ break; - -- return do_domctl(xch, &domctl); -+ done += nr; -+ } while ( done < nr_mfns ); -+ -+ /* -+ * Undo what we have done unless unmapping, by unmapping the entire region. -+ * Errors here are ignored. -+ */ -+ if ( ret && add_mapping != DPCI_REMOVE_MAPPING ) -+ xc_domain_memory_mapping(xch, domid, first_gfn, first_mfn, nr_mfns, -+ DPCI_REMOVE_MAPPING); -+ -+ /* We might get E2BIG so many times that we never advance. */ -+ if ( !done && !ret ) -+ ret = -1; -+ -+ return ret; - } - - int xc_domain_ioport_mapping( -diff --git a/xen/common/domctl.c b/xen/common/domctl.c -index d396cc4..c2e60a7 100644 ---- a/xen/common/domctl.c -+++ b/xen/common/domctl.c -@@ -1027,6 +1027,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) - (gfn + nr_mfns - 1) < gfn ) /* wrap? */ - break; - -+ ret = -E2BIG; -+ /* Must break hypercall up as this could take a while. */ -+ if ( nr_mfns > 64 ) -+ break; -+ - ret = -EPERM; - if ( !iomem_access_permitted(current->domain, mfn, mfn_end) || - !iomem_access_permitted(d, mfn, mfn_end) ) -diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h -index ca0e51e..0c9f474 100644 ---- a/xen/include/public/domctl.h -+++ b/xen/include/public/domctl.h -@@ -543,6 +543,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_bind_pt_irq_t); - - - /* Bind machine I/O address range -> HVM address range. */ -+/* If this returns -E2BIG lower nr_mfns value. */ - /* XEN_DOMCTL_memory_mapping */ - #define DPCI_ADD_MAPPING 1 - #define DPCI_REMOVE_MAPPING 0 --- -2.1.0 - diff --git a/sysutils/xen-tools/files/xsa126-qemut.patch b/sysutils/xen-tools/files/xsa126-qemut.patch deleted file mode 100644 index 599ff172e48..00000000000 --- a/sysutils/xen-tools/files/xsa126-qemut.patch +++ /dev/null @@ -1,151 +0,0 @@ -xen: limit guest control of PCI command register - -Otherwise the guest can abuse that control to cause e.g. PCIe -Unsupported Request responses (by disabling memory and/or I/O decoding -and subsequently causing [CPU side] accesses to the respective address -ranges), which (depending on system configuration) may be fatal to the -host. - -This is CVE-2015-2756 / XSA-126. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini -Acked-by: Ian Campbell - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -172,9 +172,6 @@ static int pt_word_reg_read(struct pt_de - static int pt_long_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint32_t *value, uint32_t valid_mask); --static int pt_cmd_reg_read(struct pt_dev *ptdev, -- struct pt_reg_tbl *cfg_entry, -- uint16_t *value, uint16_t valid_mask); - static int pt_bar_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint32_t *value, uint32_t valid_mask); -@@ -286,9 +283,9 @@ static struct pt_reg_info_tbl pt_emu_reg - .size = 2, - .init_val = 0x0000, - .ro_mask = 0xF880, -- .emu_mask = 0x0740, -+ .emu_mask = 0x0743, - .init = pt_common_reg_init, -- .u.w.read = pt_cmd_reg_read, -+ .u.w.read = pt_word_reg_read, - .u.w.write = pt_cmd_reg_write, - .u.w.restore = pt_cmd_reg_restore, - }, -@@ -1905,7 +1902,7 @@ static int pt_dev_is_virtfn(struct pci_d - return rc; - } - --static int pt_register_regions(struct pt_dev *assigned_device) -+static int pt_register_regions(struct pt_dev *assigned_device, uint16_t *cmd) - { - int i = 0; - uint32_t bar_data = 0; -@@ -1925,17 +1922,26 @@ static int pt_register_regions(struct pt - - /* Register current region */ - if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_IO ) -+ { - pci_register_io_region((PCIDevice *)assigned_device, i, - (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_IO, - pt_ioport_map); -+ *cmd |= PCI_COMMAND_IO; -+ } - else if ( pci_dev->base_addr[i] & PCI_ADDRESS_SPACE_MEM_PREFETCH ) -+ { - pci_register_io_region((PCIDevice *)assigned_device, i, - (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM_PREFETCH, - pt_iomem_map); -+ *cmd |= PCI_COMMAND_MEMORY; -+ } - else -+ { - pci_register_io_region((PCIDevice *)assigned_device, i, - (uint32_t)pci_dev->size[i], PCI_ADDRESS_SPACE_MEM, - pt_iomem_map); -+ *cmd |= PCI_COMMAND_MEMORY; -+ } - - PT_LOG("IO region registered (size=0x%08x base_addr=0x%08x)\n", - (uint32_t)(pci_dev->size[i]), -@@ -3263,27 +3269,6 @@ static int pt_long_reg_read(struct pt_de - return 0; - } - --/* read Command register */ --static int pt_cmd_reg_read(struct pt_dev *ptdev, -- struct pt_reg_tbl *cfg_entry, -- uint16_t *value, uint16_t valid_mask) --{ -- struct pt_reg_info_tbl *reg = cfg_entry->reg; -- uint16_t valid_emu_mask = 0; -- uint16_t emu_mask = reg->emu_mask; -- -- if ( ptdev->is_virtfn ) -- emu_mask |= PCI_COMMAND_MEMORY; -- if ( pt_is_iomul(ptdev) ) -- emu_mask |= PCI_COMMAND_IO; -- -- /* emulate word register */ -- valid_emu_mask = emu_mask & valid_mask; -- *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); -- -- return 0; --} -- - /* read BAR */ - static int pt_bar_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, -@@ -3418,19 +3403,13 @@ static int pt_cmd_reg_write(struct pt_de - uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; - uint16_t wr_value = *value; -- uint16_t emu_mask = reg->emu_mask; -- -- if ( ptdev->is_virtfn ) -- emu_mask |= PCI_COMMAND_MEMORY; -- if ( pt_is_iomul(ptdev) ) -- emu_mask |= PCI_COMMAND_IO; - - /* modify emulate register */ - writable_mask = ~reg->ro_mask & valid_mask; - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~emu_mask & valid_mask; -+ throughable_mask = ~reg->emu_mask & valid_mask; - - if (*value & PCI_COMMAND_DISABLE_INTx) - { -@@ -4211,6 +4190,7 @@ static struct pt_dev * register_real_dev - struct pt_dev *assigned_device = NULL; - struct pci_dev *pci_dev; - uint8_t e_device, e_intx; -+ uint16_t cmd = 0; - char *key, *val; - int msi_translate, power_mgmt; - -@@ -4300,7 +4280,7 @@ static struct pt_dev * register_real_dev - assigned_device->dev.config[i] = pci_read_byte(pci_dev, i); - - /* Handle real device's MMIO/PIO BARs */ -- pt_register_regions(assigned_device); -+ pt_register_regions(assigned_device, &cmd); - - /* Setup VGA bios for passthroughed gfx */ - if ( setup_vga_pt(assigned_device) < 0 ) -@@ -4378,6 +4358,10 @@ static struct pt_dev * register_real_dev - } - - out: -+ if (cmd) -+ pci_write_word(pci_dev, PCI_COMMAND, -+ *(uint16_t *)(&assigned_device->dev.config[PCI_COMMAND]) | cmd); -+ - PT_LOG("Real physical device %02x:%02x.%x registered successfuly!\n" - "IRQ type = %s\n", r_bus, r_dev, r_func, - assigned_device->msi_trans_en? "MSI-INTx":"INTx"); diff --git a/sysutils/xen-tools/files/xsa126-qemuu.patch b/sysutils/xen-tools/files/xsa126-qemuu.patch deleted file mode 100644 index 21805a43be5..00000000000 --- a/sysutils/xen-tools/files/xsa126-qemuu.patch +++ /dev/null @@ -1,128 +0,0 @@ -xen: limit guest control of PCI command register - -Otherwise the guest can abuse that control to cause e.g. PCIe -Unsupported Request responses (by disabling memory and/or I/O decoding -and subsequently causing [CPU side] accesses to the respective address -ranges), which (depending on system configuration) may be fatal to the -host. - -This is CVE-2015-2756 / XSA-126. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini -Acked-by: Ian Campbell - ---- a/hw/xen/xen_pt.c -+++ b/hw/xen/xen_pt.c -@@ -388,7 +388,7 @@ static const MemoryRegionOps ops = { - .write = xen_pt_bar_write, - }; - --static int xen_pt_register_regions(XenPCIPassthroughState *s) -+static int xen_pt_register_regions(XenPCIPassthroughState *s, uint16_t *cmd) - { - int i = 0; - XenHostPCIDevice *d = &s->real_device; -@@ -406,6 +406,7 @@ static int xen_pt_register_regions(XenPC - - if (r->type & XEN_HOST_PCI_REGION_TYPE_IO) { - type = PCI_BASE_ADDRESS_SPACE_IO; -+ *cmd |= PCI_COMMAND_IO; - } else { - type = PCI_BASE_ADDRESS_SPACE_MEMORY; - if (r->type & XEN_HOST_PCI_REGION_TYPE_PREFETCH) { -@@ -414,6 +415,7 @@ static int xen_pt_register_regions(XenPC - if (r->type & XEN_HOST_PCI_REGION_TYPE_MEM_64) { - type |= PCI_BASE_ADDRESS_MEM_TYPE_64; - } -+ *cmd |= PCI_COMMAND_MEMORY; - } - - memory_region_init_io(&s->bar[i], OBJECT(s), &ops, &s->dev, -@@ -638,6 +640,7 @@ static int xen_pt_initfn(PCIDevice *d) - XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d); - int rc = 0; - uint8_t machine_irq = 0; -+ uint16_t cmd = 0; - int pirq = XEN_PT_UNASSIGNED_PIRQ; - - /* register real device */ -@@ -672,7 +675,7 @@ static int xen_pt_initfn(PCIDevice *d) - s->io_listener = xen_pt_io_listener; - - /* Handle real device's MMIO/PIO BARs */ -- xen_pt_register_regions(s); -+ xen_pt_register_regions(s, &cmd); - - /* reinitialize each config register to be emulated */ - if (xen_pt_config_init(s)) { -@@ -736,6 +739,11 @@ static int xen_pt_initfn(PCIDevice *d) - } - - out: -+ if (cmd) { -+ xen_host_pci_set_word(&s->real_device, PCI_COMMAND, -+ pci_get_word(d->config + PCI_COMMAND) | cmd); -+ } -+ - memory_listener_register(&s->memory_listener, &address_space_memory); - memory_listener_register(&s->io_listener, &address_space_io); - XEN_PT_LOG(d, ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -286,23 +286,6 @@ static int xen_pt_irqpin_reg_init(XenPCI - } - - /* Command register */ --static int xen_pt_cmd_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, -- uint16_t *value, uint16_t valid_mask) --{ -- XenPTRegInfo *reg = cfg_entry->reg; -- uint16_t valid_emu_mask = 0; -- uint16_t emu_mask = reg->emu_mask; -- -- if (s->is_virtfn) { -- emu_mask |= PCI_COMMAND_MEMORY; -- } -- -- /* emulate word register */ -- valid_emu_mask = emu_mask & valid_mask; -- *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); -- -- return 0; --} - static int xen_pt_cmd_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, - uint16_t *val, uint16_t dev_value, - uint16_t valid_mask) -@@ -310,18 +293,13 @@ static int xen_pt_cmd_reg_write(XenPCIPa - XenPTRegInfo *reg = cfg_entry->reg; - uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; -- uint16_t emu_mask = reg->emu_mask; -- -- if (s->is_virtfn) { -- emu_mask |= PCI_COMMAND_MEMORY; -- } - - /* modify emulate register */ - writable_mask = ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~emu_mask & valid_mask; -+ throughable_mask = ~reg->emu_mask & valid_mask; - - if (*val & PCI_COMMAND_INTX_DISABLE) { - throughable_mask |= PCI_COMMAND_INTX_DISABLE; -@@ -605,9 +583,9 @@ static XenPTRegInfo xen_pt_emu_reg_heade - .size = 2, - .init_val = 0x0000, - .ro_mask = 0xF880, -- .emu_mask = 0x0740, -+ .emu_mask = 0x0743, - .init = xen_pt_common_reg_init, -- .u.w.read = xen_pt_cmd_reg_read, -+ .u.w.read = xen_pt_word_reg_read, - .u.w.write = xen_pt_cmd_reg_write, - }, - /* Capabilities Pointer reg */ diff --git a/sysutils/xen-tools/files/xsa128-qemut.patch b/sysutils/xen-tools/files/xsa128-qemut.patch deleted file mode 100644 index 7530690bdfc..00000000000 --- a/sysutils/xen-tools/files/xsa128-qemut.patch +++ /dev/null @@ -1,125 +0,0 @@ -xen: properly gate host writes of modified PCI CFG contents - -The old logic didn't work as intended when an access spanned multiple -fields (for example a 32-bit access to the location of the MSI Message -Data field with the high 16 bits not being covered by any known field). -Remove it and derive which fields not to write to from the accessed -fields' emulation masks: When they're all ones, there's no point in -doing any host write. - -This fixes a secondary issue at once: We obviously shouldn't make any -host write attempt when already the host read failed. - -This is XSA-128. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -454,7 +454,7 @@ static struct pt_reg_info_tbl pt_emu_reg - .offset = PCI_INTEL_OPREGION, - .size = 4, - .init_val = 0, -- .no_wb = 1, -+ .emu_mask = 0xFFFFFFFF, - .u.dw.read = pt_intel_opregion_read, - .u.dw.write = pt_intel_opregion_write, - .u.dw.restore = NULL, -@@ -657,7 +657,6 @@ static struct pt_reg_info_tbl pt_emu_reg - .init_val = 0x00000000, - .ro_mask = 0x00000003, - .emu_mask = 0xFFFFFFFF, -- .no_wb = 1, - .init = pt_common_reg_init, - .u.dw.read = pt_long_reg_read, - .u.dw.write = pt_msgaddr32_reg_write, -@@ -670,7 +669,6 @@ static struct pt_reg_info_tbl pt_emu_reg - .init_val = 0x00000000, - .ro_mask = 0x00000000, - .emu_mask = 0xFFFFFFFF, -- .no_wb = 1, - .init = pt_msgaddr64_reg_init, - .u.dw.read = pt_long_reg_read, - .u.dw.write = pt_msgaddr64_reg_write, -@@ -683,7 +681,6 @@ static struct pt_reg_info_tbl pt_emu_reg - .init_val = 0x0000, - .ro_mask = 0x0000, - .emu_mask = 0xFFFF, -- .no_wb = 1, - .init = pt_msgdata_reg_init, - .u.w.read = pt_word_reg_read, - .u.w.write = pt_msgdata_reg_write, -@@ -696,7 +693,6 @@ static struct pt_reg_info_tbl pt_emu_reg - .init_val = 0x0000, - .ro_mask = 0x0000, - .emu_mask = 0xFFFF, -- .no_wb = 1, - .init = pt_msgdata_reg_init, - .u.w.read = pt_word_reg_read, - .u.w.write = pt_msgdata_reg_write, -@@ -1524,7 +1520,7 @@ static void pt_pci_write_config(PCIDevic - uint32_t find_addr = address; - uint32_t real_offset = 0; - uint32_t valid_mask = 0xFFFFFFFF; -- uint32_t read_val = 0; -+ uint32_t read_val = 0, wb_mask; - uint8_t *ptr_val = NULL; - int emul_len = 0; - int index = 0; -@@ -1597,7 +1593,10 @@ static void pt_pci_write_config(PCIDevic - { - PT_LOG("Error: pci_read_block failed. return value[%d].\n", ret); - memset((uint8_t *)&read_val, 0xff, len); -+ wb_mask = 0; - } -+ else -+ wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); - - /* pass directly to libpci for passthrough type register group */ - if (reg_grp_entry == NULL) -@@ -1620,6 +1619,11 @@ static void pt_pci_write_config(PCIDevic - valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); - valid_mask <<= ((find_addr - real_offset) << 3); - ptr_val = ((uint8_t *)&val + (real_offset & 3)); -+ if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { -+ wb_mask &= ~((reg->emu_mask -+ >> ((find_addr - real_offset) << 3)) -+ << ((len - emul_len) << 3)); -+ } - - /* do emulation depend on register size */ - switch (reg->size) { -@@ -1677,8 +1681,19 @@ static void pt_pci_write_config(PCIDevic - val >>= ((address & 3) << 3); - - out: -- if (!(reg && reg->no_wb)) { /* unknown regs are passed through */ -- ret = pci_write_block(pci_dev, address, (uint8_t *)&val, len); -+ for (index = 0; wb_mask; index += len) { -+ /* unknown regs are passed through */ -+ while (!(wb_mask & 0xff)) { -+ index++; -+ wb_mask >>= 8; -+ } -+ len = 0; -+ do { -+ len++; -+ wb_mask >>= 8; -+ } while (wb_mask & 0xff); -+ ret = pci_write_block(pci_dev, address + index, -+ (uint8_t *)&val + index, len); - - if (!ret) - PT_LOG("Error: pci_write_block failed. return value[%d].\n", ret); ---- a/hw/pass-through.h -+++ b/hw/pass-through.h -@@ -372,8 +372,6 @@ struct pt_reg_info_tbl { - uint32_t ro_mask; - /* reg emulate field mask (ON:emu, OFF:passthrough) */ - uint32_t emu_mask; -- /* no write back allowed */ -- uint32_t no_wb; - /* emul reg initialize method */ - conf_reg_init init; - union { diff --git a/sysutils/xen-tools/files/xsa128-qemuu.patch b/sysutils/xen-tools/files/xsa128-qemuu.patch deleted file mode 100644 index d551c6244a7..00000000000 --- a/sysutils/xen-tools/files/xsa128-qemuu.patch +++ /dev/null @@ -1,118 +0,0 @@ -xen: properly gate host writes of modified PCI CFG contents - -The old logic didn't work as intended when an access spanned multiple -fields (for example a 32-bit access to the location of the MSI Message -Data field with the high 16 bits not being covered by any known field). -Remove it and derive which fields not to write to from the accessed -fields' emulation masks: When they're all ones, there's no point in -doing any host write. - -This fixes a secondary issue at once: We obviously shouldn't make any -host write attempt when already the host read failed. - -This is XSA-128. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/xen/xen_pt.c -+++ b/hw/xen/xen_pt.c -@@ -234,7 +234,7 @@ static void xen_pt_pci_write_config(PCID - int index = 0; - XenPTRegGroup *reg_grp_entry = NULL; - int rc = 0; -- uint32_t read_val = 0; -+ uint32_t read_val = 0, wb_mask; - int emul_len = 0; - XenPTReg *reg_entry = NULL; - uint32_t find_addr = addr; -@@ -271,6 +271,9 @@ static void xen_pt_pci_write_config(PCID - if (rc < 0) { - XEN_PT_ERR(d, "pci_read_block failed. return value: %d.\n", rc); - memset(&read_val, 0xff, len); -+ wb_mask = 0; -+ } else { -+ wb_mask = 0xFFFFFFFF >> ((4 - len) << 3); - } - - /* pass directly to the real device for passthrough type register group */ -@@ -298,6 +301,11 @@ static void xen_pt_pci_write_config(PCID - - valid_mask <<= (find_addr - real_offset) << 3; - ptr_val = (uint8_t *)&val + (real_offset & 3); -+ if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { -+ wb_mask &= ~((reg->emu_mask -+ >> ((find_addr - real_offset) << 3)) -+ << ((len - emul_len) << 3)); -+ } - - /* do emulation based on register size */ - switch (reg->size) { -@@ -350,10 +358,19 @@ static void xen_pt_pci_write_config(PCID - memory_region_transaction_commit(); - - out: -- if (!(reg && reg->no_wb)) { -+ for (index = 0; wb_mask; index += len) { - /* unknown regs are passed through */ -- rc = xen_host_pci_set_block(&s->real_device, addr, -- (uint8_t *)&val, len); -+ while (!(wb_mask & 0xff)) { -+ index++; -+ wb_mask >>= 8; -+ } -+ len = 0; -+ do { -+ len++; -+ wb_mask >>= 8; -+ } while (wb_mask & 0xff); -+ rc = xen_host_pci_set_block(&s->real_device, addr + index, -+ (uint8_t *)&val + index, len); - - if (rc < 0) { - XEN_PT_ERR(d, "pci_write_block failed. return value: %d.\n", rc); ---- a/hw/xen/xen_pt.h -+++ b/hw/xen/xen_pt.h -@@ -105,8 +105,6 @@ struct XenPTRegInfo { - uint32_t ro_mask; - /* reg emulate field mask (ON:emu, OFF:passthrough) */ - uint32_t emu_mask; -- /* no write back allowed */ -- uint32_t no_wb; - xen_pt_conf_reg_init init; - /* read/write function pointer - * for double_word/word/byte size */ ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -1281,7 +1281,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] - .init_val = 0x00000000, - .ro_mask = 0x00000003, - .emu_mask = 0xFFFFFFFF, -- .no_wb = 1, - .init = xen_pt_common_reg_init, - .u.dw.read = xen_pt_long_reg_read, - .u.dw.write = xen_pt_msgaddr32_reg_write, -@@ -1293,7 +1292,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] - .init_val = 0x00000000, - .ro_mask = 0x00000000, - .emu_mask = 0xFFFFFFFF, -- .no_wb = 1, - .init = xen_pt_msgaddr64_reg_init, - .u.dw.read = xen_pt_long_reg_read, - .u.dw.write = xen_pt_msgaddr64_reg_write, -@@ -1305,7 +1303,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] - .init_val = 0x0000, - .ro_mask = 0x0000, - .emu_mask = 0xFFFF, -- .no_wb = 1, - .init = xen_pt_msgdata_reg_init, - .u.w.read = xen_pt_word_reg_read, - .u.w.write = xen_pt_msgdata_reg_write, -@@ -1317,7 +1314,6 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] - .init_val = 0x0000, - .ro_mask = 0x0000, - .emu_mask = 0xFFFF, -- .no_wb = 1, - .init = xen_pt_msgdata_reg_init, - .u.w.read = xen_pt_word_reg_read, - .u.w.write = xen_pt_msgdata_reg_write, diff --git a/sysutils/xen-tools/files/xsa129-qemut.patch b/sysutils/xen-tools/files/xsa129-qemut.patch deleted file mode 100644 index 005efa5dd83..00000000000 --- a/sysutils/xen-tools/files/xsa129-qemut.patch +++ /dev/null @@ -1,142 +0,0 @@ -xen: don't allow guest to control MSI mask register - -It's being used by the hypervisor. For now simply mimic a device not -capable of masking, and fully emulate any accesses a guest may issue -nevertheless as simple reads/writes without side effects. - -This is XSA-129. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -147,6 +147,10 @@ static uint32_t pt_msgaddr64_reg_init(st - struct pt_reg_info_tbl *reg, uint32_t real_offset); - static uint32_t pt_msgdata_reg_init(struct pt_dev *ptdev, - struct pt_reg_info_tbl *reg, uint32_t real_offset); -+static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, -+ struct pt_reg_info_tbl *reg, uint32_t real_offset); -+static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, -+ struct pt_reg_info_tbl *reg, uint32_t real_offset); - static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, - struct pt_reg_info_tbl *reg, uint32_t real_offset); - static uint32_t pt_header_type_reg_init(struct pt_dev *ptdev, -@@ -644,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg - .size = 2, - .init_val = 0x0000, - .ro_mask = 0xFF8E, -- .emu_mask = 0x007F, -+ .emu_mask = 0x017F, - .init = pt_msgctrl_reg_init, - .u.w.read = pt_word_reg_read, - .u.w.write = pt_msgctrl_reg_write, -@@ -698,6 +702,50 @@ static struct pt_reg_info_tbl pt_emu_reg - .u.w.write = pt_msgdata_reg_write, - .u.w.restore = NULL, - }, -+ /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ -+ { -+ .offset = PCI_MSI_MASK_32, -+ .size = 4, -+ .init_val = 0x00000000, -+ .ro_mask = 0xFFFFFFFF, -+ .emu_mask = 0xFFFFFFFF, -+ .init = pt_mask_reg_init, -+ .u.dw.read = pt_long_reg_read, -+ .u.dw.write = pt_long_reg_write, -+ }, -+ /* Mask reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ -+ { -+ .offset = PCI_MSI_MASK_64, -+ .size = 4, -+ .init_val = 0x00000000, -+ .ro_mask = 0xFFFFFFFF, -+ .emu_mask = 0xFFFFFFFF, -+ .init = pt_mask_reg_init, -+ .u.dw.read = pt_long_reg_read, -+ .u.dw.write = pt_long_reg_write, -+ }, -+ /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 32-bit devices) */ -+ { -+ .offset = PCI_MSI_MASK_32 + 4, -+ .size = 4, -+ .init_val = 0x00000000, -+ .ro_mask = 0xFFFFFFFF, -+ .emu_mask = 0x00000000, -+ .init = pt_pending_reg_init, -+ .u.dw.read = pt_long_reg_read, -+ .u.dw.write = pt_long_reg_write, -+ }, -+ /* Pending reg (if PCI_MSI_FLAGS_MASK_BIT set, for 64-bit devices) */ -+ { -+ .offset = PCI_MSI_MASK_64 + 4, -+ .size = 4, -+ .init_val = 0x00000000, -+ .ro_mask = 0xFFFFFFFF, -+ .emu_mask = 0x00000000, -+ .init = pt_pending_reg_init, -+ .u.dw.read = pt_long_reg_read, -+ .u.dw.write = pt_long_reg_write, -+ }, - { - .size = 0, - }, -@@ -3023,6 +3071,42 @@ static uint32_t pt_msgdata_reg_init(stru - return PT_INVALID_REG; - } - -+/* this function will be called twice (for 32 bit and 64 bit type) */ -+/* initialize Mask register */ -+static uint32_t pt_mask_reg_init(struct pt_dev *ptdev, -+ struct pt_reg_info_tbl *reg, uint32_t real_offset) -+{ -+ uint32_t flags = ptdev->msi->flags; -+ uint32_t offset = reg->offset; -+ -+ if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) -+ return PT_INVALID_REG; -+ -+ if (offset == (flags & PCI_MSI_FLAGS_64BIT ? -+ PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) -+ return reg->init_val; -+ -+ return PT_INVALID_REG; -+} -+ -+/* this function will be called twice (for 32 bit and 64 bit type) */ -+/* initialize Pending register */ -+static uint32_t pt_pending_reg_init(struct pt_dev *ptdev, -+ struct pt_reg_info_tbl *reg, uint32_t real_offset) -+{ -+ uint32_t flags = ptdev->msi->flags; -+ uint32_t offset = reg->offset; -+ -+ if (!(flags & PCI_MSI_FLAGS_MASK_BIT)) -+ return PT_INVALID_REG; -+ -+ if (offset == (flags & PCI_MSI_FLAGS_64BIT ? -+ PCI_MSI_MASK_64 + 4 : PCI_MSI_MASK_32 + 4)) -+ return reg->init_val; -+ -+ return PT_INVALID_REG; -+} -+ - /* initialize Message Control register for MSI-X */ - static uint32_t pt_msixctrl_reg_init(struct pt_dev *ptdev, - struct pt_reg_info_tbl *reg, uint32_t real_offset) ---- a/hw/pass-through.h -+++ b/hw/pass-through.h -@@ -84,6 +84,12 @@ - #define PCI_MSI_FLAGS_MASK_BIT 0x0100 - #endif - -+#ifndef PCI_MSI_MASK_32 -+/* interrupt masking register */ -+#define PCI_MSI_MASK_32 12 -+#define PCI_MSI_MASK_64 16 -+#endif -+ - #ifndef PCI_EXP_TYPE_PCIE_BRIDGE - /* PCI/PCI-X to PCIE Bridge */ - #define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 diff --git a/sysutils/xen-tools/files/xsa129-qemuu.patch b/sysutils/xen-tools/files/xsa129-qemuu.patch deleted file mode 100644 index 96715a68d37..00000000000 --- a/sysutils/xen-tools/files/xsa129-qemuu.patch +++ /dev/null @@ -1,172 +0,0 @@ -xen: don't allow guest to control MSI mask register - -It's being used by the hypervisor. For now simply mimic a device not -capable of masking, and fully emulate any accesses a guest may issue -nevertheless as simple reads/writes without side effects. - -This is XSA-129. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/pci/msi.c -+++ b/hw/pci/msi.c -@@ -21,10 +21,6 @@ - #include "hw/pci/msi.h" - #include "qemu/range.h" - --/* Eventually those constants should go to Linux pci_regs.h */ --#define PCI_MSI_PENDING_32 0x10 --#define PCI_MSI_PENDING_64 0x14 -- - /* PCI_MSI_ADDRESS_LO */ - #define PCI_MSI_ADDRESS_LO_MASK (~0x3) - ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -1018,13 +1018,9 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] - */ - - /* Helper */ --static bool xen_pt_msgdata_check_type(uint32_t offset, uint16_t flags) --{ -- /* check the offset whether matches the type or not */ -- bool is_32 = (offset == PCI_MSI_DATA_32) && !(flags & PCI_MSI_FLAGS_64BIT); -- bool is_64 = (offset == PCI_MSI_DATA_64) && (flags & PCI_MSI_FLAGS_64BIT); -- return is_32 || is_64; --} -+#define xen_pt_msi_check_type(offset, flags, what) \ -+ ((offset) == ((flags) & PCI_MSI_FLAGS_64BIT ? \ -+ PCI_MSI_##what##_64 : PCI_MSI_##what##_32)) - - /* Message Control register */ - static int xen_pt_msgctrl_reg_init(XenPCIPassthroughState *s, -@@ -1136,7 +1132,45 @@ static int xen_pt_msgdata_reg_init(XenPC - uint32_t offset = reg->offset; - - /* check the offset whether matches the type or not */ -- if (xen_pt_msgdata_check_type(offset, flags)) { -+ if (xen_pt_msi_check_type(offset, flags, DATA)) { -+ *data = reg->init_val; -+ } else { -+ *data = XEN_PT_INVALID_REG; -+ } -+ return 0; -+} -+ -+/* this function will be called twice (for 32 bit and 64 bit type) */ -+/* initialize Mask register */ -+static int xen_pt_mask_reg_init(XenPCIPassthroughState *s, -+ XenPTRegInfo *reg, uint32_t real_offset, -+ uint32_t *data) -+{ -+ uint32_t flags = s->msi->flags; -+ -+ /* check the offset whether matches the type or not */ -+ if (!(flags & PCI_MSI_FLAGS_MASKBIT)) { -+ *data = XEN_PT_INVALID_REG; -+ } else if (xen_pt_msi_check_type(reg->offset, flags, MASK)) { -+ *data = reg->init_val; -+ } else { -+ *data = XEN_PT_INVALID_REG; -+ } -+ return 0; -+} -+ -+/* this function will be called twice (for 32 bit and 64 bit type) */ -+/* initialize Pending register */ -+static int xen_pt_pending_reg_init(XenPCIPassthroughState *s, -+ XenPTRegInfo *reg, uint32_t real_offset, -+ uint32_t *data) -+{ -+ uint32_t flags = s->msi->flags; -+ -+ /* check the offset whether matches the type or not */ -+ if (!(flags & PCI_MSI_FLAGS_MASKBIT)) { -+ *data = XEN_PT_INVALID_REG; -+ } else if (xen_pt_msi_check_type(reg->offset, flags, PENDING)) { - *data = reg->init_val; - } else { - *data = XEN_PT_INVALID_REG; -@@ -1224,7 +1258,7 @@ static int xen_pt_msgdata_reg_write(XenP - uint32_t offset = reg->offset; - - /* check the offset whether matches the type or not */ -- if (!xen_pt_msgdata_check_type(offset, msi->flags)) { -+ if (!xen_pt_msi_check_type(offset, msi->flags, DATA)) { - /* exit I/O emulator */ - XEN_PT_ERR(&s->dev, "the offset does not match the 32/64 bit type!\n"); - return -1; -@@ -1269,7 +1303,7 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] - .size = 2, - .init_val = 0x0000, - .ro_mask = 0xFF8E, -- .emu_mask = 0x007F, -+ .emu_mask = 0x017F, - .init = xen_pt_msgctrl_reg_init, - .u.w.read = xen_pt_word_reg_read, - .u.w.write = xen_pt_msgctrl_reg_write, -@@ -1318,6 +1352,50 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] - .u.w.read = xen_pt_word_reg_read, - .u.w.write = xen_pt_msgdata_reg_write, - }, -+ /* Mask reg (if PCI_MSI_FLAGS_MASKBIT set, for 32-bit devices) */ -+ { -+ .offset = PCI_MSI_MASK_32, -+ .size = 4, -+ .init_val = 0x00000000, -+ .ro_mask = 0xFFFFFFFF, -+ .emu_mask = 0xFFFFFFFF, -+ .init = xen_pt_mask_reg_init, -+ .u.dw.read = xen_pt_long_reg_read, -+ .u.dw.write = xen_pt_long_reg_write, -+ }, -+ /* Mask reg (if PCI_MSI_FLAGS_MASKBIT set, for 64-bit devices) */ -+ { -+ .offset = PCI_MSI_MASK_64, -+ .size = 4, -+ .init_val = 0x00000000, -+ .ro_mask = 0xFFFFFFFF, -+ .emu_mask = 0xFFFFFFFF, -+ .init = xen_pt_mask_reg_init, -+ .u.dw.read = xen_pt_long_reg_read, -+ .u.dw.write = xen_pt_long_reg_write, -+ }, -+ /* Pending reg (if PCI_MSI_FLAGS_MASKBIT set, for 32-bit devices) */ -+ { -+ .offset = PCI_MSI_MASK_32 + 4, -+ .size = 4, -+ .init_val = 0x00000000, -+ .ro_mask = 0xFFFFFFFF, -+ .emu_mask = 0x00000000, -+ .init = xen_pt_pending_reg_init, -+ .u.dw.read = xen_pt_long_reg_read, -+ .u.dw.write = xen_pt_long_reg_write, -+ }, -+ /* Pending reg (if PCI_MSI_FLAGS_MASKBIT set, for 64-bit devices) */ -+ { -+ .offset = PCI_MSI_MASK_64 + 4, -+ .size = 4, -+ .init_val = 0x00000000, -+ .ro_mask = 0xFFFFFFFF, -+ .emu_mask = 0x00000000, -+ .init = xen_pt_pending_reg_init, -+ .u.dw.read = xen_pt_long_reg_read, -+ .u.dw.write = xen_pt_long_reg_write, -+ }, - { - .size = 0, - }, ---- a/include/hw/pci/pci_regs.h -+++ b/include/hw/pci/pci_regs.h -@@ -298,8 +298,10 @@ - #define PCI_MSI_ADDRESS_HI 8 /* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */ - #define PCI_MSI_DATA_32 8 /* 16 bits of data for 32-bit devices */ - #define PCI_MSI_MASK_32 12 /* Mask bits register for 32-bit devices */ -+#define PCI_MSI_PENDING_32 16 /* Pending bits register for 32-bit devices */ - #define PCI_MSI_DATA_64 12 /* 16 bits of data for 64-bit devices */ - #define PCI_MSI_MASK_64 16 /* Mask bits register for 64-bit devices */ -+#define PCI_MSI_PENDING_64 20 /* Pending bits register for 32-bit devices */ - - /* MSI-X registers */ - #define PCI_MSIX_FLAGS 2 diff --git a/sysutils/xen-tools/files/xsa130-qemut.patch b/sysutils/xen-tools/files/xsa130-qemut.patch deleted file mode 100644 index 75af778b017..00000000000 --- a/sysutils/xen-tools/files/xsa130-qemut.patch +++ /dev/null @@ -1,21 +0,0 @@ -xen/MSI-X: disable logging by default - -... to avoid allowing the guest to cause the control domain's disk to -fill. - -This is XSA-130. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/pass-through.h -+++ b/hw/pass-through.h -@@ -27,7 +27,7 @@ - #include "qemu-timer.h" - - /* Log acesss */ --#define PT_LOGGING_ENABLED -+/* #define PT_LOGGING_ENABLED */ - - /* Print errors even if logging is disabled */ - #define PT_ERR(_f, _a...) fprintf(logfile, "%s: " _f, __func__, ##_a) diff --git a/sysutils/xen-tools/files/xsa130-qemuu.patch b/sysutils/xen-tools/files/xsa130-qemuu.patch deleted file mode 100644 index c2f35bd0b90..00000000000 --- a/sysutils/xen-tools/files/xsa130-qemuu.patch +++ /dev/null @@ -1,71 +0,0 @@ -xen/MSI-X: limit error messages resulting from bad guest behavior - -... to avoid allowing the guest to cause the control domain's disk to -fill. - -The first message in pci_msix_write() can simply be deleted, as this -is indeed bad guest behavior, but such out of bounds writes don't -really need to be logged. - -The second one is more problematic, as there guest behavior may only -appear to be wrong: For one, the old logic didn't take the mask-all bit -into account. And then this shouldn't depend on host device state (i.e. -the host may have masked the entry without the guest having done so). -Plus these writes shouldn't be dropped even when an entry is unmasked. -Instead, if they can't be made take effect right away, they should take -effect on the next unmasking or enabling operation - the specification -explicitly describes such caching behavior. Until we can validly drop -the message (implementing such caching/latching behavior), issue the -message just once per MSI-X table entry. - -Note that the log message in pci_msix_read() similar to the one being -removed here is not an issue: "addr" being of unsigned type, and the -maximum size of the MSI-X table being 32k, entry_nr simply can't be -negative and hence the conditonal guarding issuing of the message will -never be true. - -This is XSA-130. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/xen/xen_pt.h -+++ b/hw/xen/xen_pt.h -@@ -175,6 +175,7 @@ typedef struct XenPTMSIXEntry { - uint32_t data; - uint32_t vector_ctrl; - bool updated; /* indicate whether MSI ADDR or DATA is updated */ -+ bool warned; /* avoid issuing (bogus) warning more than once */ - } XenPTMSIXEntry; - typedef struct XenPTMSIX { - uint32_t ctrl_offset; ---- a/hw/xen/xen_pt_msi.c -+++ b/hw/xen/xen_pt_msi.c -@@ -434,11 +434,10 @@ static void pci_msix_write(void *opaque, - XenPCIPassthroughState *s = opaque; - XenPTMSIX *msix = s->msix; - XenPTMSIXEntry *entry; -- int entry_nr, offset; -+ unsigned int entry_nr, offset; - - entry_nr = addr / PCI_MSIX_ENTRY_SIZE; -- if (entry_nr < 0 || entry_nr >= msix->total_entries) { -- XEN_PT_ERR(&s->dev, "asked MSI-X entry '%i' invalid!\n", entry_nr); -+ if (entry_nr >= msix->total_entries) { - return; - } - entry = &msix->msix_entry[entry_nr]; -@@ -460,8 +459,11 @@ static void pci_msix_write(void *opaque, - + PCI_MSIX_ENTRY_VECTOR_CTRL; - - if (msix->enabled && !(*vec_ctrl & PCI_MSIX_ENTRY_CTRL_MASKBIT)) { -- XEN_PT_ERR(&s->dev, "Can't update msix entry %d since MSI-X is" -- " already enabled.\n", entry_nr); -+ if (!entry->warned) { -+ entry->warned = true; -+ XEN_PT_ERR(&s->dev, "Can't update msix entry %d since MSI-X is" -+ " already enabled.\n", entry_nr); -+ } - return; - } - diff --git a/sysutils/xen-tools/files/xsa131-qemut-1.patch b/sysutils/xen-tools/files/xsa131-qemut-1.patch deleted file mode 100644 index 3bfe2369826..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemut-1.patch +++ /dev/null @@ -1,60 +0,0 @@ -xen/MSI: don't open-code pass-through of enable bit modifications - -Without this the actual XSA-131 fix would cause the enable bit to not -get set anymore (due to the write back getting suppressed there based -on the OR of emu_mask, ro_mask, and res_mask). - -Note that the fiddling with the enable bit shouldn't really be done by -qemu, but making this work right (via libxc and the hypervisor) will -require more extensive changes, which can be postponed until after the -security issue got addressed. - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Acked-by: Stefano Stabellini - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -648,7 +648,7 @@ static struct pt_reg_info_tbl pt_emu_reg - .size = 2, - .init_val = 0x0000, - .ro_mask = 0xFF8E, -- .emu_mask = 0x017F, -+ .emu_mask = 0x017E, - .init = pt_msgctrl_reg_init, - .u.w.read = pt_word_reg_read, - .u.w.write = pt_msgctrl_reg_write, -@@ -3901,6 +3901,9 @@ static int pt_msgctrl_reg_write(struct p - - /* modify emulate register */ - writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; -+ /* also emulate MSI_ENABLE bit for MSI-INTx translation */ -+ if (ptdev->msi_trans_en) -+ writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - /* update the msi_info too */ - ptdev->msi->flags |= cfg_entry->data & -@@ -3909,6 +3912,9 @@ static int pt_msgctrl_reg_write(struct p - /* create value for writing to I/O device register */ - val = *value; - throughable_mask = ~reg->emu_mask & valid_mask; -+ /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ -+ if (ptdev->msi_trans_en) -+ throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); - - /* update MSI */ -@@ -3952,12 +3958,6 @@ static int pt_msgctrl_reg_write(struct p - } - } - -- /* pass through MSI_ENABLE bit when no MSI-INTx translation */ -- if (!ptdev->msi_trans_en) { -- *value &= ~PCI_MSI_FLAGS_ENABLE; -- *value |= val & PCI_MSI_FLAGS_ENABLE; -- } -- - return 0; - } - diff --git a/sysutils/xen-tools/files/xsa131-qemut-2.patch b/sysutils/xen-tools/files/xsa131-qemut-2.patch deleted file mode 100644 index cb2c7b9b209..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemut-2.patch +++ /dev/null @@ -1,140 +0,0 @@ -xen/pt: consolidate PM capability emu_mask - -There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing -PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local -emu_mask variable - we can have the same effect by setting the field -descriptor's emu_mask member suitably right away. Note that -xen_pt_pmcsr_reg_write() is being retained in order to allow later -patches to be less intrusive. - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Acked-by: Stefano Stabellini -Acked-by: Ian Campbell - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -179,9 +179,6 @@ static int pt_long_reg_read(struct pt_de - static int pt_bar_reg_read(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint32_t *value, uint32_t valid_mask); --static int pt_pmcsr_reg_read(struct pt_dev *ptdev, -- struct pt_reg_tbl *cfg_entry, -- uint16_t *value, uint16_t valid_mask); - static int pt_byte_reg_write(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, - uint8_t *value, uint8_t dev_value, uint8_t valid_mask); -@@ -494,7 +491,7 @@ static struct pt_reg_info_tbl pt_emu_reg - .u.w.write = pt_word_reg_write, - .u.w.restore = NULL, - }, -- /* PCI Power Management Control/Status reg */ -+ /* PCI Power Management Control/Status reg (->power_mgmt on) */ - { - .offset = PCI_PM_CTRL, - .size = 2, -@@ -502,7 +499,19 @@ static struct pt_reg_info_tbl pt_emu_reg - .ro_mask = 0xE1FC, - .emu_mask = 0x8100, - .init = pt_pmcsr_reg_init, -- .u.w.read = pt_pmcsr_reg_read, -+ .u.w.read = pt_word_reg_read, -+ .u.w.write = pt_pmcsr_reg_write, -+ .u.w.restore = pt_pmcsr_reg_restore, -+ }, -+ /* PCI Power Management Control/Status reg (->power_mgmt off) */ -+ { -+ .offset = PCI_PM_CTRL, -+ .size = 2, -+ .init_val = 0x0008, -+ .ro_mask = 0xE1FC, -+ .emu_mask = 0x810B, -+ .init = pt_pmcsr_reg_init, -+ .u.w.read = pt_word_reg_read, - .u.w.write = pt_pmcsr_reg_write, - .u.w.restore = pt_pmcsr_reg_restore, - }, -@@ -2919,6 +2928,7 @@ static uint32_t pt_pmc_reg_init(struct p - return reg->init_val; - } - -+/* this function will be called twice (for ->power_mgmt on and off cases) */ - /* initialize PCI Power Management Control/Status register */ - static uint32_t pt_pmcsr_reg_init(struct pt_dev *ptdev, - struct pt_reg_info_tbl *reg, uint32_t real_offset) -@@ -2926,8 +2936,23 @@ static uint32_t pt_pmcsr_reg_init(struct - PCIDevice *d = &ptdev->dev; - uint16_t cap_ver = 0; - -- if (!ptdev->power_mgmt) -- return reg->init_val; -+ switch (reg->emu_mask & (PCI_PM_CTRL_STATE_MASK | -+ PCI_PM_CTRL_NO_SOFT_RESET)) -+ { -+ case 0: -+ if (!ptdev->power_mgmt) -+ return PT_INVALID_REG; -+ break; -+ case PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET: -+ if (!ptdev->power_mgmt) -+ return reg->init_val; -+ return PT_INVALID_REG; -+ default: -+ /* exit I/O emulator */ -+ PT_LOG("Internal error: Invalid PMCSR emulation mask %04x." -+ " I/O emulator exit.\n", reg->emu_mask); -+ exit(1); -+ } - - /* check PCI Power Management support version */ - cap_ver = ptdev->pm_state->pmc_field & PCI_PM_CAP_VER_MASK; -@@ -3417,24 +3442,6 @@ static int pt_bar_reg_read(struct pt_dev - } - - --/* read Power Management Control/Status register */ --static int pt_pmcsr_reg_read(struct pt_dev *ptdev, -- struct pt_reg_tbl *cfg_entry, -- uint16_t *value, uint16_t valid_mask) --{ -- struct pt_reg_info_tbl *reg = cfg_entry->reg; -- uint16_t valid_emu_mask = reg->emu_mask; -- -- if (!ptdev->power_mgmt) -- valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; -- -- valid_emu_mask = valid_emu_mask & valid_mask ; -- *value = PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); -- -- return 0; --} -- -- - /* write byte size emulate register */ - static int pt_byte_reg_write(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, -@@ -3768,21 +3775,17 @@ static int pt_pmcsr_reg_write(struct pt_ - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - PCIDevice *d = &ptdev->dev; -- uint16_t emu_mask = reg->emu_mask; - uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; - struct pt_pm_info *pm_state = ptdev->pm_state; - uint16_t read_val = 0; - -- if (!ptdev->power_mgmt) -- emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; -- - /* modify emulate register */ -- writable_mask = emu_mask & ~reg->ro_mask & valid_mask; -+ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~emu_mask & valid_mask; -+ throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); - - if (!ptdev->power_mgmt) diff --git a/sysutils/xen-tools/files/xsa131-qemut-3.patch b/sysutils/xen-tools/files/xsa131-qemut-3.patch deleted file mode 100644 index a50b2392b7a..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemut-3.patch +++ /dev/null @@ -1,22 +0,0 @@ -xen/pt: correctly handle PM status bit - -xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C -nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -3786,7 +3786,8 @@ static int pt_pmcsr_reg_write(struct pt_ - - /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; -- *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); -+ *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, -+ throughable_mask); - - if (!ptdev->power_mgmt) - return 0; diff --git a/sysutils/xen-tools/files/xsa131-qemut-4.patch b/sysutils/xen-tools/files/xsa131-qemut-4.patch deleted file mode 100644 index 95a7f517003..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemut-4.patch +++ /dev/null @@ -1,266 +0,0 @@ -xen/pt: split out calculation of throughable mask in PCI config space handling - -This is just to avoid having to adjust that calculation later in -multiple places. - -Note that including ->ro_mask in get_throughable_mask()'s calculation -is only an apparent (i.e. benign) behavioral change: For r/o fields it -doesn't matter > whether they get passed through - either the same flag -is also set in emu_mask (then there's no change at all) or the field is -r/o in hardware (and hence a write won't change it anyway). - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Acked-by: Stefano Stabellini -Reviewed-by: Anthony PERARD - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -3442,6 +3442,15 @@ static int pt_bar_reg_read(struct pt_dev - } - - -+static uint32_t get_throughable_mask(const struct pt_dev *ptdev, -+ const struct pt_reg_info_tbl *reg, -+ uint32_t valid_mask) -+{ -+ uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); -+ -+ return throughable_mask & valid_mask; -+} -+ - /* write byte size emulate register */ - static int pt_byte_reg_write(struct pt_dev *ptdev, - struct pt_reg_tbl *cfg_entry, -@@ -3449,14 +3458,13 @@ static int pt_byte_reg_write(struct pt_d - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint8_t writable_mask = 0; -- uint8_t throughable_mask = 0; -+ uint8_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); - - /* modify emulate register */ - writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); - - return 0; -@@ -3469,14 +3477,13 @@ static int pt_word_reg_write(struct pt_d - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); - - /* modify emulate register */ - writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); - - return 0; -@@ -3489,14 +3496,13 @@ static int pt_long_reg_write(struct pt_d - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; -+ uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); - - /* modify emulate register */ - writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); - - return 0; -@@ -3509,7 +3515,7 @@ static int pt_cmd_reg_write(struct pt_de - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); - uint16_t wr_value = *value; - - /* modify emulate register */ -@@ -3517,8 +3523,6 @@ static int pt_cmd_reg_write(struct pt_de - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; -- - if (*value & PCI_COMMAND_DISABLE_INTx) - { - if (ptdev->msi_trans_en) -@@ -3564,7 +3568,6 @@ static int pt_bar_reg_write(struct pt_de - PCIDevice *d = (PCIDevice *)&ptdev->dev; - PCIIORegion *r; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; - uint32_t bar_emu_mask = 0; - uint32_t bar_ro_mask = 0; - uint32_t new_addr, last_addr; -@@ -3691,8 +3694,7 @@ static int pt_bar_reg_write(struct pt_de - - exit: - /* create value for writing to I/O device register */ -- throughable_mask = ~bar_emu_mask & valid_mask; -- *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); -+ *value = PT_MERGE_VALUE(*value, dev_value, 0); - - /* After BAR reg update, we need to remap BAR*/ - reg_grp_entry = pt_find_reg_grp(ptdev, PCI_COMMAND); -@@ -3719,9 +3721,8 @@ static int pt_exp_rom_bar_reg_write(stru - PCIDevice *d = (PCIDevice *)&ptdev->dev; - PCIIORegion *r; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; -+ uint32_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); - uint32_t r_size = 0; -- uint32_t bar_emu_mask = 0; - uint32_t bar_ro_mask = 0; - - r = &d->io_regions[PCI_ROM_SLOT]; -@@ -3731,7 +3732,6 @@ static int pt_exp_rom_bar_reg_write(stru - PT_GET_EMUL_SIZE(base->bar_flag, r_size); - - /* set emulate mask and read-only mask */ -- bar_emu_mask = reg->emu_mask; - bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; - - /* modify emulate register */ -@@ -3751,7 +3751,6 @@ static int pt_exp_rom_bar_reg_write(stru - r->addr = cfg_entry->data; - - /* create value for writing to I/O device register */ -- throughable_mask = ~bar_emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); - - /* After BAR reg update, we need to remap BAR*/ -@@ -3776,7 +3775,7 @@ static int pt_pmcsr_reg_write(struct pt_ - struct pt_reg_info_tbl *reg = cfg_entry->reg; - PCIDevice *d = &ptdev->dev; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); - struct pt_pm_info *pm_state = ptdev->pm_state; - uint16_t read_val = 0; - -@@ -3785,7 +3784,6 @@ static int pt_pmcsr_reg_write(struct pt_ - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value & ~PCI_PM_CTRL_PME_STATUS, - throughable_mask); - -@@ -3894,7 +3892,7 @@ static int pt_msgctrl_reg_write(struct p - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); - uint16_t old_ctrl = cfg_entry->data; - PCIDevice *pd = (PCIDevice *)ptdev; - uint16_t val; -@@ -3906,8 +3904,10 @@ static int pt_msgctrl_reg_write(struct p - /* modify emulate register */ - writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - /* also emulate MSI_ENABLE bit for MSI-INTx translation */ -- if (ptdev->msi_trans_en) -+ if (ptdev->msi_trans_en) { - writable_mask |= PCI_MSI_FLAGS_ENABLE & valid_mask; -+ throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; -+ } - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - /* update the msi_info too */ - ptdev->msi->flags |= cfg_entry->data & -@@ -3915,10 +3915,6 @@ static int pt_msgctrl_reg_write(struct p - - /* create value for writing to I/O device register */ - val = *value; -- throughable_mask = ~reg->emu_mask & valid_mask; -- /* don't pass through MSI_ENABLE bit for MSI-INTx translation */ -- if (ptdev->msi_trans_en) -- throughable_mask &= ~PCI_MSI_FLAGS_ENABLE; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); - - /* update MSI */ -@@ -3972,7 +3968,6 @@ static int pt_msgaddr32_reg_write(struct - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; - uint32_t old_addr = cfg_entry->data; - - /* modify emulate register */ -@@ -3982,8 +3977,7 @@ static int pt_msgaddr32_reg_write(struct - ptdev->msi->addr_lo = cfg_entry->data; - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; -- *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); -+ *value = PT_MERGE_VALUE(*value, dev_value, 0); - - /* update MSI */ - if (cfg_entry->data != old_addr) -@@ -4002,7 +3996,6 @@ static int pt_msgaddr64_reg_write(struct - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; - uint32_t old_addr = cfg_entry->data; - - /* check whether the type is 64 bit or not */ -@@ -4020,8 +4013,7 @@ static int pt_msgaddr64_reg_write(struct - ptdev->msi->addr_hi = cfg_entry->data; - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; -- *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); -+ *value = PT_MERGE_VALUE(*value, dev_value, 0); - - /* update MSI */ - if (cfg_entry->data != old_addr) -@@ -4041,7 +4033,6 @@ static int pt_msgdata_reg_write(struct p - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; - uint16_t old_data = cfg_entry->data; - uint32_t flags = ptdev->msi->flags; - uint32_t offset = reg->offset; -@@ -4062,8 +4053,7 @@ static int pt_msgdata_reg_write(struct p - ptdev->msi->data = cfg_entry->data; - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; -- *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); -+ *value = PT_MERGE_VALUE(*value, dev_value, 0); - - /* update MSI */ - if (cfg_entry->data != old_data) -@@ -4082,7 +4072,7 @@ static int pt_msixctrl_reg_write(struct - { - struct pt_reg_info_tbl *reg = cfg_entry->reg; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(ptdev, reg, valid_mask); - uint16_t old_ctrl = cfg_entry->data; - - /* modify emulate register */ -@@ -4090,7 +4080,6 @@ static int pt_msixctrl_reg_write(struct - cfg_entry->data = PT_MERGE_VALUE(*value, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *value = PT_MERGE_VALUE(*value, dev_value, throughable_mask); - - /* update MSI-X */ diff --git a/sysutils/xen-tools/files/xsa131-qemut-5.patch b/sysutils/xen-tools/files/xsa131-qemut-5.patch deleted file mode 100644 index fb5c4d403d8..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemut-5.patch +++ /dev/null @@ -1,22 +0,0 @@ -xen/pt: mark all PCIe capability bits read-only - -xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- -only to avoid unintended write-back (just a precaution, the field ought -to be read-only in hardware). - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -577,7 +577,7 @@ static struct pt_reg_info_tbl pt_emu_reg - .offset = PCI_EXP_DEVCAP, - .size = 4, - .init_val = 0x00000000, -- .ro_mask = 0x1FFCFFFF, -+ .ro_mask = 0xFFFFFFFF, - .emu_mask = 0x10000000, - .init = pt_common_reg_init, - .u.dw.read = pt_long_reg_read, diff --git a/sysutils/xen-tools/files/xsa131-qemut-6.patch b/sysutils/xen-tools/files/xsa131-qemut-6.patch deleted file mode 100644 index 02d175d424e..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemut-6.patch +++ /dev/null @@ -1,85 +0,0 @@ -xen/pt: mark reserved bits in PCI config space fields - -The adjustments are solely to make the subsequent patches work right -(and hence make the patch set consistent), namely if permissive mode -(introduced by the last patch) gets used (as both reserved registers -and reserved fields must be similarly protected from guest access in -default mode, but the guest should be allowed access to them in -permissive mode). - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -283,7 +283,7 @@ static struct pt_reg_info_tbl pt_emu_reg - .offset = PCI_COMMAND, - .size = 2, - .init_val = 0x0000, -- .ro_mask = 0xF880, -+ .res_mask = 0xF880, - .emu_mask = 0x0743, - .init = pt_common_reg_init, - .u.w.read = pt_word_reg_read, -@@ -310,7 +310,8 @@ static struct pt_reg_info_tbl pt_emu_reg - .offset = PCI_STATUS, - .size = 2, - .init_val = 0x0000, -- .ro_mask = 0x06FF, -+ .res_mask = 0x0007, -+ .ro_mask = 0x06F8, - .emu_mask = 0x0010, - .init = pt_status_reg_init, - .u.w.read = pt_word_reg_read, -@@ -496,7 +497,8 @@ static struct pt_reg_info_tbl pt_emu_reg - .offset = PCI_PM_CTRL, - .size = 2, - .init_val = 0x0008, -- .ro_mask = 0xE1FC, -+ .res_mask = 0x00F0, -+ .ro_mask = 0xE10C, - .emu_mask = 0x8100, - .init = pt_pmcsr_reg_init, - .u.w.read = pt_word_reg_read, -@@ -508,7 +510,8 @@ static struct pt_reg_info_tbl pt_emu_reg - .offset = PCI_PM_CTRL, - .size = 2, - .init_val = 0x0008, -- .ro_mask = 0xE1FC, -+ .res_mask = 0x00F0, -+ .ro_mask = 0xE10C, - .emu_mask = 0x810B, - .init = pt_pmcsr_reg_init, - .u.w.read = pt_word_reg_read, -@@ -656,7 +659,8 @@ static struct pt_reg_info_tbl pt_emu_reg - .offset = PCI_MSI_FLAGS, // 2 - .size = 2, - .init_val = 0x0000, -- .ro_mask = 0xFF8E, -+ .res_mask = 0xFE00, -+ .ro_mask = 0x018E, - .emu_mask = 0x017E, - .init = pt_msgctrl_reg_init, - .u.w.read = pt_word_reg_read, -@@ -779,7 +783,8 @@ static struct pt_reg_info_tbl pt_emu_reg - .offset = PCI_MSI_FLAGS, // 2 - .size = 2, - .init_val = 0x0000, -- .ro_mask = 0x3FFF, -+ .res_mask = 0x3800, -+ .ro_mask = 0x07FF, - .emu_mask = 0x0000, - .init = pt_msixctrl_reg_init, - .u.w.read = pt_word_reg_read, ---- a/hw/pass-through.h -+++ b/hw/pass-through.h -@@ -376,6 +376,8 @@ struct pt_reg_info_tbl { - uint32_t size; - /* reg initial value */ - uint32_t init_val; -+ /* reg reserved field mask (ON:reserved, OFF:defined) */ -+ uint32_t res_mask; - /* reg read only field mask (ON:RO/ROS, OFF:other) */ - uint32_t ro_mask; - /* reg emulate field mask (ON:emu, OFF:passthrough) */ diff --git a/sysutils/xen-tools/files/xsa131-qemut-7.patch b/sysutils/xen-tools/files/xsa131-qemut-7.patch deleted file mode 100644 index b2430b5143a..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemut-7.patch +++ /dev/null @@ -1,81 +0,0 @@ -xen/pt: add a few PCI config space field descriptions - -Since the next patch will turn all not explicitly described fields -read-only by default, those fields that have guest writable bits need -to be given explicit descriptors. - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -538,6 +538,16 @@ static struct pt_reg_info_tbl pt_emu_reg - .u.b.restore = NULL, - }, - { -+ .offset = PCI_VPD_ADDR, -+ .size = 2, -+ .ro_mask = 0x0003, -+ .emu_mask = 0x0003, -+ .init = pt_common_reg_init, -+ .u.w.read = pt_word_reg_read, -+ .u.w.write = pt_word_reg_write, -+ .u.w.restore = pt_word_reg_restore, -+ }, -+ { - .size = 0, - }, - }; -@@ -599,6 +609,17 @@ static struct pt_reg_info_tbl pt_emu_reg - .u.w.write = pt_word_reg_write, - .u.w.restore = pt_word_reg_restore, - }, -+ /* Device Status reg */ -+ { -+ .offset = PCI_EXP_DEVSTA, -+ .size = 2, -+ .res_mask = 0xFFC0, -+ .ro_mask = 0x0030, -+ .init = pt_common_reg_init, -+ .u.w.read = pt_word_reg_read, -+ .u.w.write = pt_word_reg_write, -+ .u.w.restore = pt_word_reg_restore, -+ }, - /* Link Control reg */ - { - .offset = PCI_EXP_LNKCTL, -@@ -611,6 +632,16 @@ static struct pt_reg_info_tbl pt_emu_reg - .u.w.write = pt_word_reg_write, - .u.w.restore = pt_word_reg_restore, - }, -+ /* Link Status reg */ -+ { -+ .offset = PCI_EXP_LNKSTA, -+ .size = 2, -+ .ro_mask = 0x3FFF, -+ .init = pt_common_reg_init, -+ .u.w.read = pt_word_reg_read, -+ .u.w.write = pt_word_reg_write, -+ .u.w.restore = pt_word_reg_restore, -+ }, - /* Device Control 2 reg */ - { - .offset = 0x28, ---- a/hw/pass-through.h -+++ b/hw/pass-through.h -@@ -105,6 +105,14 @@ - #define PCI_EXP_TYPE_ROOT_EC 0xa - #endif - -+#ifndef PCI_VPD_ADDR -+/* Vital Product Data */ -+#define PCI_VPD_ADDR 2 /* Address to access (15 bits!) */ -+#define PCI_VPD_ADDR_MASK 0x7fff /* Address mask */ -+#define PCI_VPD_ADDR_F 0x8000 /* Write 0, 1 indicates completion */ -+#define PCI_VPD_DATA 4 /* 32-bits of data returned here */ -+#endif -+ - #ifndef PCI_ERR_UNCOR_MASK - /* Uncorrectable Error Mask */ - #define PCI_ERR_UNCOR_MASK 8 diff --git a/sysutils/xen-tools/files/xsa131-qemut-8.patch b/sysutils/xen-tools/files/xsa131-qemut-8.patch deleted file mode 100644 index 875ae9646f5..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemut-8.patch +++ /dev/null @@ -1,139 +0,0 @@ -xen/pt: unknown PCI config space fields should be read-only - -... by default. Add a per-device "permissive" mode similar to pciback's -to allow restoring previous behavior (and hence break security again, -i.e. should be used only for trusted guests). - -This is part of XSA-131. - -Signed-off-by: Jan Beulich -Acked-by: Stefano Stabellini -Reviewed-by: Anthony PERARD ) - ---- a/hw/pass-through.c -+++ b/hw/pass-through.c -@@ -1613,10 +1613,10 @@ static void pt_pci_write_config(PCIDevic - uint32_t find_addr = address; - uint32_t real_offset = 0; - uint32_t valid_mask = 0xFFFFFFFF; -- uint32_t read_val = 0, wb_mask; -+ uint32_t read_val = 0, wb_mask, wp_mask; - uint8_t *ptr_val = NULL; - int emul_len = 0; -- int index = 0; -+ int index = 0, wp_flag = 0; - int ret = 0; - - #ifdef PT_DEBUG_PCI_CONFIG_ACCESS -@@ -1695,7 +1695,14 @@ static void pt_pci_write_config(PCIDevic - - /* pass directly to libpci for passthrough type register group */ - if (reg_grp_entry == NULL) -+ { -+ if (!assigned_device->permissive) -+ { -+ wb_mask = 0; -+ wp_flag = 1; -+ } - goto out; -+ } - - /* adjust the read and write value to appropriate CFC-CFF window */ - read_val <<= ((address & 3) << 3); -@@ -1714,11 +1721,12 @@ static void pt_pci_write_config(PCIDevic - valid_mask = (0xFFFFFFFF >> ((4 - emul_len) << 3)); - valid_mask <<= ((find_addr - real_offset) << 3); - ptr_val = ((uint8_t *)&val + (real_offset & 3)); -- if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { -- wb_mask &= ~((reg->emu_mask -- >> ((find_addr - real_offset) << 3)) -+ wp_mask = reg->emu_mask | reg->ro_mask; -+ if (!assigned_device->permissive) -+ wp_mask |= reg->res_mask; -+ if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) -+ wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) - << ((len - emul_len) << 3)); -- } - - /* do emulation depend on register size */ - switch (reg->size) { -@@ -1767,6 +1775,16 @@ static void pt_pci_write_config(PCIDevic - /* nothing to do with passthrough type register, - * continue to find next byte - */ -+ if (!assigned_device->permissive) -+ { -+ wb_mask &= ~(0xff << ((len - emul_len) << 3)); -+ /* Unused BARs will make it here, but we don't want to issue -+ * warnings for writes to them (bogus writes get dealt with -+ * above). -+ */ -+ if (index < 0) -+ wp_flag = 1; -+ } - emul_len--; - find_addr++; - } -@@ -1776,6 +1794,15 @@ static void pt_pci_write_config(PCIDevic - val >>= ((address & 3) << 3); - - out: -+ if (wp_flag && !assigned_device->permissive_warned) -+ { -+ assigned_device->permissive_warned = 1; -+ PT_LOG("Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", -+ addr, len * 2, wb_mask); -+ PT_LOG("If device %02x:%02x.%o doesn't work, try enabling permissive\n", -+ pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); -+ PT_LOG("mode (unsafe) and if it helps report the problem to xen-devel\n"); -+ } - for (index = 0; wb_mask; index += len) { - /* unknown regs are passed through */ - while (!(wb_mask & 0xff)) { -@@ -3484,6 +3511,9 @@ static uint32_t get_throughable_mask(con - { - uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); - -+ if (!ptdev->permissive) -+ throughable_mask &= ~reg->res_mask; -+ - return throughable_mask & valid_mask; - } - -@@ -4322,7 +4352,7 @@ static struct pt_dev * register_real_dev - uint8_t e_device, e_intx; - uint16_t cmd = 0; - char *key, *val; -- int msi_translate, power_mgmt; -+ int msi_translate, power_mgmt, permissive = 0; - - PT_LOG("Assigning real physical device %02x:%02x.%x ...\n", - r_bus, r_dev, r_func); -@@ -4366,6 +4396,8 @@ static struct pt_dev * register_real_dev - else - PT_LOG("Error: unrecognized value for msitranslate=\n"); - } -+ else if (strcmp(key, "permissive") == 0) -+ permissive = 1; - else if (strcmp(key, "power_mgmt") == 0) - { - if (strcmp(val, "0") == 0) -@@ -4403,6 +4435,7 @@ static struct pt_dev * register_real_dev - assigned_device->msi_trans_cap = msi_translate; - assigned_device->power_mgmt = power_mgmt; - assigned_device->is_virtfn = pt_dev_is_virtfn(pci_dev); -+ assigned_device->permissive = permissive; - pt_iomul_init(assigned_device, r_bus, r_dev, r_func); - - /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ ---- a/hw/pass-through.h -+++ b/hw/pass-through.h -@@ -242,6 +242,8 @@ struct pt_dev { - unsigned power_mgmt:1; - struct pt_pm_info *pm_state; /* PM virtualization */ - unsigned is_virtfn:1; -+ unsigned permissive:1; -+ unsigned permissive_warned:1; - - /* io port multiplexing */ - #define PCI_IOMUL_INVALID_FD (-1) diff --git a/sysutils/xen-tools/files/xsa131-qemuu-1.patch b/sysutils/xen-tools/files/xsa131-qemuu-1.patch deleted file mode 100644 index ece230bb381..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemuu-1.patch +++ /dev/null @@ -1,60 +0,0 @@ -xen/MSI: don't open-code pass-through of enable bit modifications - -Without this the actual XSA-131 fix would cause the enable bit to not -get set anymore (due to the write back getting suppressed there based -on the OR of emu_mask, ro_mask, and res_mask). - -Note that the fiddling with the enable bit shouldn't really be done by -qemu, but making this work right (via libxc and the hypervisor) will -require more extensive changes, which can be postponed until after the -security issue got addressed. - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Acked-by: Stefano Stabellini - ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -1059,7 +1059,6 @@ static int xen_pt_msgctrl_reg_write(XenP - XenPTMSI *msi = s->msi; - uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; -- uint16_t raw_val; - - /* Currently no support for multi-vector */ - if (*val & PCI_MSI_FLAGS_QSIZE) { -@@ -1072,12 +1071,11 @@ static int xen_pt_msgctrl_reg_write(XenP - msi->flags |= cfg_entry->data & ~PCI_MSI_FLAGS_ENABLE; - - /* create value for writing to I/O device register */ -- raw_val = *val; - throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); - - /* update MSI */ -- if (raw_val & PCI_MSI_FLAGS_ENABLE) { -+ if (*val & PCI_MSI_FLAGS_ENABLE) { - /* setup MSI pirq for the first time */ - if (!msi->initialized) { - /* Init physical one */ -@@ -1105,10 +1103,6 @@ static int xen_pt_msgctrl_reg_write(XenP - xen_pt_msi_disable(s); - } - -- /* pass through MSI_ENABLE bit */ -- *val &= ~PCI_MSI_FLAGS_ENABLE; -- *val |= raw_val & PCI_MSI_FLAGS_ENABLE; -- - return 0; - } - -@@ -1311,7 +1305,7 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] - .size = 2, - .init_val = 0x0000, - .ro_mask = 0xFF8E, -- .emu_mask = 0x017F, -+ .emu_mask = 0x017E, - .init = xen_pt_msgctrl_reg_init, - .u.w.read = xen_pt_word_reg_read, - .u.w.write = xen_pt_msgctrl_reg_write, diff --git a/sysutils/xen-tools/files/xsa131-qemuu-2.patch b/sysutils/xen-tools/files/xsa131-qemuu-2.patch deleted file mode 100644 index fc547f493e1..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemuu-2.patch +++ /dev/null @@ -1,70 +0,0 @@ -xen/pt: consolidate PM capability emu_mask - -There's no point in xen_pt_pmcsr_reg_{read,write}() each ORing -PCI_PM_CTRL_STATE_MASK and PCI_PM_CTRL_NO_SOFT_RESET into a local -emu_mask variable - we can have the same effect by setting the field -descriptor's emu_mask member suitably right away. Note that -xen_pt_pmcsr_reg_write() is being retained in order to allow later -patches to be less intrusive. - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Acked-by: Stefano Stabellini -Acked-by: Ian Campbell - ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -935,38 +935,21 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[ - * Power Management Capability - */ - --/* read Power Management Control/Status register */ --static int xen_pt_pmcsr_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, -- uint16_t *value, uint16_t valid_mask) --{ -- XenPTRegInfo *reg = cfg_entry->reg; -- uint16_t valid_emu_mask = reg->emu_mask; -- -- valid_emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; -- -- valid_emu_mask = valid_emu_mask & valid_mask; -- *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); -- -- return 0; --} - /* write Power Management Control/Status register */ - static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, - XenPTReg *cfg_entry, uint16_t *val, - uint16_t dev_value, uint16_t valid_mask) - { - XenPTRegInfo *reg = cfg_entry->reg; -- uint16_t emu_mask = reg->emu_mask; - uint16_t writable_mask = 0; - uint16_t throughable_mask = 0; - -- emu_mask |= PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_NO_SOFT_RESET; -- - /* modify emulate register */ -- writable_mask = emu_mask & ~reg->ro_mask & valid_mask; -+ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~emu_mask & valid_mask; -+ throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); - - return 0; -@@ -1002,9 +985,9 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] - .size = 2, - .init_val = 0x0008, - .ro_mask = 0xE1FC, -- .emu_mask = 0x8100, -+ .emu_mask = 0x810B, - .init = xen_pt_common_reg_init, -- .u.w.read = xen_pt_pmcsr_reg_read, -+ .u.w.read = xen_pt_word_reg_read, - .u.w.write = xen_pt_pmcsr_reg_write, - }, - { diff --git a/sysutils/xen-tools/files/xsa131-qemuu-3.patch b/sysutils/xen-tools/files/xsa131-qemuu-3.patch deleted file mode 100644 index f62a4f80450..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemuu-3.patch +++ /dev/null @@ -1,22 +0,0 @@ -xen/pt: correctly handle PM status bit - -xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C -nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS). - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -950,7 +950,8 @@ static int xen_pt_pmcsr_reg_write(XenPCI - - /* create value for writing to I/O device register */ - throughable_mask = ~reg->emu_mask & valid_mask; -- *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); -+ *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS, -+ throughable_mask); - - return 0; - } diff --git a/sysutils/xen-tools/files/xsa131-qemuu-4.patch b/sysutils/xen-tools/files/xsa131-qemuu-4.patch deleted file mode 100644 index c36669beeeb..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemuu-4.patch +++ /dev/null @@ -1,248 +0,0 @@ -xen/pt: split out calculation of throughable mask in PCI config space handling - -This is just to avoid having to adjust that calculation later in -multiple places. - -Note that including ->ro_mask in get_throughable_mask()'s calculation -is only an apparent (i.e. benign) behavioral change: For r/o fields it -doesn't matter > whether they get passed through - either the same flag -is also set in emu_mask (then there's no change at all) or the field is -r/o in hardware (and hence a write won't change it anyway). - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Acked-by: Stefano Stabellini -Reviewed-by: Anthony PERARD - ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -95,6 +95,14 @@ XenPTReg *xen_pt_find_reg(XenPTRegGroup - return NULL; - } - -+static uint32_t get_throughable_mask(const XenPCIPassthroughState *s, -+ const XenPTRegInfo *reg, -+ uint32_t valid_mask) -+{ -+ uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); -+ -+ return throughable_mask & valid_mask; -+} - - /**************** - * general register functions -@@ -157,14 +165,13 @@ static int xen_pt_byte_reg_write(XenPCIP - { - XenPTRegInfo *reg = cfg_entry->reg; - uint8_t writable_mask = 0; -- uint8_t throughable_mask = 0; -+ uint8_t throughable_mask = get_throughable_mask(s, reg, valid_mask); - - /* modify emulate register */ - writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); - - return 0; -@@ -175,14 +182,13 @@ static int xen_pt_word_reg_write(XenPCIP - { - XenPTRegInfo *reg = cfg_entry->reg; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); - - /* modify emulate register */ - writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); - - return 0; -@@ -193,14 +199,13 @@ static int xen_pt_long_reg_write(XenPCIP - { - XenPTRegInfo *reg = cfg_entry->reg; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; -+ uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); - - /* modify emulate register */ - writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); - - return 0; -@@ -292,15 +297,13 @@ static int xen_pt_cmd_reg_write(XenPCIPa - { - XenPTRegInfo *reg = cfg_entry->reg; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); - - /* modify emulate register */ - writable_mask = ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; -- - if (*val & PCI_COMMAND_INTX_DISABLE) { - throughable_mask |= PCI_COMMAND_INTX_DISABLE; - } else { -@@ -456,7 +459,6 @@ static int xen_pt_bar_reg_write(XenPCIPa - PCIDevice *d = &s->dev; - const PCIIORegion *r; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; - uint32_t bar_emu_mask = 0; - uint32_t bar_ro_mask = 0; - uint32_t r_size = 0; -@@ -513,8 +515,7 @@ static int xen_pt_bar_reg_write(XenPCIPa - } - - /* create value for writing to I/O device register */ -- throughable_mask = ~bar_emu_mask & valid_mask; -- *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); -+ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); - - return 0; - } -@@ -528,9 +529,8 @@ static int xen_pt_exp_rom_bar_reg_write( - XenPTRegion *base = NULL; - PCIDevice *d = (PCIDevice *)&s->dev; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; -+ uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); - pcibus_t r_size = 0; -- uint32_t bar_emu_mask = 0; - uint32_t bar_ro_mask = 0; - - r_size = d->io_regions[PCI_ROM_SLOT].size; -@@ -539,7 +539,6 @@ static int xen_pt_exp_rom_bar_reg_write( - r_size = xen_pt_get_emul_size(base->bar_flag, r_size); - - /* set emulate mask and read-only mask */ -- bar_emu_mask = reg->emu_mask; - bar_ro_mask = (reg->ro_mask | (r_size - 1)) & ~PCI_ROM_ADDRESS_ENABLE; - - /* modify emulate register */ -@@ -547,7 +546,6 @@ static int xen_pt_exp_rom_bar_reg_write( - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~bar_emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); - - return 0; -@@ -942,14 +940,13 @@ static int xen_pt_pmcsr_reg_write(XenPCI - { - XenPTRegInfo *reg = cfg_entry->reg; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); - - /* modify emulate register */ - writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS, - throughable_mask); - -@@ -1042,7 +1039,7 @@ static int xen_pt_msgctrl_reg_write(XenP - XenPTRegInfo *reg = cfg_entry->reg; - XenPTMSI *msi = s->msi; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); - - /* Currently no support for multi-vector */ - if (*val & PCI_MSI_FLAGS_QSIZE) { -@@ -1055,7 +1052,6 @@ static int xen_pt_msgctrl_reg_write(XenP - msi->flags |= cfg_entry->data & ~PCI_MSI_FLAGS_ENABLE; - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); - - /* update MSI */ -@@ -1171,7 +1167,6 @@ static int xen_pt_msgaddr32_reg_write(Xe - { - XenPTRegInfo *reg = cfg_entry->reg; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; - uint32_t old_addr = cfg_entry->data; - - /* modify emulate register */ -@@ -1180,8 +1175,7 @@ static int xen_pt_msgaddr32_reg_write(Xe - s->msi->addr_lo = cfg_entry->data; - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; -- *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); -+ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); - - /* update MSI */ - if (cfg_entry->data != old_addr) { -@@ -1199,7 +1193,6 @@ static int xen_pt_msgaddr64_reg_write(Xe - { - XenPTRegInfo *reg = cfg_entry->reg; - uint32_t writable_mask = 0; -- uint32_t throughable_mask = 0; - uint32_t old_addr = cfg_entry->data; - - /* check whether the type is 64 bit or not */ -@@ -1216,8 +1209,7 @@ static int xen_pt_msgaddr64_reg_write(Xe - s->msi->addr_hi = cfg_entry->data; - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; -- *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); -+ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); - - /* update MSI */ - if (cfg_entry->data != old_addr) { -@@ -1239,7 +1231,6 @@ static int xen_pt_msgdata_reg_write(XenP - XenPTRegInfo *reg = cfg_entry->reg; - XenPTMSI *msi = s->msi; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; - uint16_t old_data = cfg_entry->data; - uint32_t offset = reg->offset; - -@@ -1257,8 +1248,7 @@ static int xen_pt_msgdata_reg_write(XenP - msi->data = cfg_entry->data; - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; -- *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); -+ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); - - /* update MSI */ - if (cfg_entry->data != old_data) { -@@ -1420,7 +1410,7 @@ static int xen_pt_msixctrl_reg_write(Xen - { - XenPTRegInfo *reg = cfg_entry->reg; - uint16_t writable_mask = 0; -- uint16_t throughable_mask = 0; -+ uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); - int debug_msix_enabled_old; - - /* modify emulate register */ -@@ -1428,7 +1418,6 @@ static int xen_pt_msixctrl_reg_write(Xen - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - - /* create value for writing to I/O device register */ -- throughable_mask = ~reg->emu_mask & valid_mask; - *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); - - /* update MSI-X */ diff --git a/sysutils/xen-tools/files/xsa131-qemuu-5.patch b/sysutils/xen-tools/files/xsa131-qemuu-5.patch deleted file mode 100644 index aed87c638a9..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemuu-5.patch +++ /dev/null @@ -1,22 +0,0 @@ -xen/pt: mark all PCIe capability bits read-only - -xen_pt_emu_reg_pcie[]'s PCI_EXP_DEVCAP needs to cover all bits as read- -only to avoid unintended write-back (just a precaution, the field ought -to be read-only in hardware). - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich -Reviewed-by: Stefano Stabellini - ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -873,7 +873,7 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[ - .offset = PCI_EXP_DEVCAP, - .size = 4, - .init_val = 0x00000000, -- .ro_mask = 0x1FFCFFFF, -+ .ro_mask = 0xFFFFFFFF, - .emu_mask = 0x10000000, - .init = xen_pt_common_reg_init, - .u.dw.read = xen_pt_long_reg_read, diff --git a/sysutils/xen-tools/files/xsa131-qemuu-6.patch b/sysutils/xen-tools/files/xsa131-qemuu-6.patch deleted file mode 100644 index 98313d07275..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemuu-6.patch +++ /dev/null @@ -1,75 +0,0 @@ -xen/pt: mark reserved bits in PCI config space fields - -The adjustments are solely to make the subsequent patches work right -(and hence make the patch set consistent), namely if permissive mode -(introduced by the last patch) gets used (as both reserved registers -and reserved fields must be similarly protected from guest access in -default mode, but the guest should be allowed access to them in -permissive mode). - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich - ---- a/hw/xen/xen_pt.h -+++ b/hw/xen/xen_pt.h -@@ -101,6 +101,8 @@ struct XenPTRegInfo { - uint32_t offset; - uint32_t size; - uint32_t init_val; -+ /* reg reserved field mask (ON:reserved, OFF:defined) */ -+ uint32_t res_mask; - /* reg read only field mask (ON:RO/ROS, OFF:other) */ - uint32_t ro_mask; - /* reg emulate field mask (ON:emu, OFF:passthrough) */ ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -580,7 +580,7 @@ static XenPTRegInfo xen_pt_emu_reg_heade - .offset = PCI_COMMAND, - .size = 2, - .init_val = 0x0000, -- .ro_mask = 0xF880, -+ .res_mask = 0xF880, - .emu_mask = 0x0743, - .init = xen_pt_common_reg_init, - .u.w.read = xen_pt_word_reg_read, -@@ -605,7 +605,8 @@ static XenPTRegInfo xen_pt_emu_reg_heade - .offset = PCI_STATUS, - .size = 2, - .init_val = 0x0000, -- .ro_mask = 0x06FF, -+ .res_mask = 0x0007, -+ .ro_mask = 0x06F8, - .emu_mask = 0x0010, - .init = xen_pt_status_reg_init, - .u.w.read = xen_pt_word_reg_read, -@@ -982,7 +983,8 @@ static XenPTRegInfo xen_pt_emu_reg_pm[] - .offset = PCI_PM_CTRL, - .size = 2, - .init_val = 0x0008, -- .ro_mask = 0xE1FC, -+ .res_mask = 0x00F0, -+ .ro_mask = 0xE10C, - .emu_mask = 0x810B, - .init = xen_pt_common_reg_init, - .u.w.read = xen_pt_word_reg_read, -@@ -1278,7 +1280,8 @@ static XenPTRegInfo xen_pt_emu_reg_msi[] - .offset = PCI_MSI_FLAGS, - .size = 2, - .init_val = 0x0000, -- .ro_mask = 0xFF8E, -+ .res_mask = 0xFE00, -+ .ro_mask = 0x018E, - .emu_mask = 0x017E, - .init = xen_pt_msgctrl_reg_init, - .u.w.read = xen_pt_word_reg_read, -@@ -1456,7 +1459,8 @@ static XenPTRegInfo xen_pt_emu_reg_msix[ - .offset = PCI_MSI_FLAGS, - .size = 2, - .init_val = 0x0000, -- .ro_mask = 0x3FFF, -+ .res_mask = 0x3800, -+ .ro_mask = 0x07FF, - .emu_mask = 0x0000, - .init = xen_pt_msixctrl_reg_init, - .u.w.read = xen_pt_word_reg_read, diff --git a/sysutils/xen-tools/files/xsa131-qemuu-7.patch b/sysutils/xen-tools/files/xsa131-qemuu-7.patch deleted file mode 100644 index fa27fec8447..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemuu-7.patch +++ /dev/null @@ -1,70 +0,0 @@ -xen/pt: add a few PCI config space field descriptions - -Since the next patch will turn all not explicitly described fields -read-only by default, those fields that have guest writable bits need -to be given explicit descriptors. - -This is a preparatory patch for XSA-131. - -Signed-off-by: Jan Beulich ---- -Notes: -- blindly allowing all VPD reads may still be a problem (out of bounds - addresses aren't allowed, but the spec doesn't say what the effect - would be) ==> also an issue in pciback? -- Vendor Specific cap regs aren't in the table (will become r/o by - default with this change) -- many PCIe cap regs aren't in the table (will again become r/o) -- same for PM cap regs at offsets 6 and 7 - ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -756,6 +756,15 @@ static XenPTRegInfo xen_pt_emu_reg_vpd[] - .u.b.write = xen_pt_byte_reg_write, - }, - { -+ .offset = PCI_VPD_ADDR, -+ .size = 2, -+ .ro_mask = 0x0003, -+ .emu_mask = 0x0003, -+ .init = xen_pt_common_reg_init, -+ .u.w.read = xen_pt_word_reg_read, -+ .u.w.write = xen_pt_word_reg_write, -+ }, -+ { - .size = 0, - }, - }; -@@ -891,6 +900,16 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[ - .u.w.read = xen_pt_word_reg_read, - .u.w.write = xen_pt_word_reg_write, - }, -+ /* Device Status reg */ -+ { -+ .offset = PCI_EXP_DEVSTA, -+ .size = 2, -+ .res_mask = 0xFFC0, -+ .ro_mask = 0x0030, -+ .init = xen_pt_common_reg_init, -+ .u.w.read = xen_pt_word_reg_read, -+ .u.w.write = xen_pt_word_reg_write, -+ }, - /* Link Control reg */ - { - .offset = PCI_EXP_LNKCTL, -@@ -902,6 +921,15 @@ static XenPTRegInfo xen_pt_emu_reg_pcie[ - .u.w.read = xen_pt_word_reg_read, - .u.w.write = xen_pt_word_reg_write, - }, -+ /* Link Status reg */ -+ { -+ .offset = PCI_EXP_LNKSTA, -+ .size = 2, -+ .ro_mask = 0x3FFF, -+ .init = xen_pt_common_reg_init, -+ .u.w.read = xen_pt_word_reg_read, -+ .u.w.write = xen_pt_word_reg_write, -+ }, - /* Device Control 2 reg */ - { - .offset = 0x28, diff --git a/sysutils/xen-tools/files/xsa131-qemuu-8.patch b/sysutils/xen-tools/files/xsa131-qemuu-8.patch deleted file mode 100644 index 9537baf27d5..00000000000 --- a/sysutils/xen-tools/files/xsa131-qemuu-8.patch +++ /dev/null @@ -1,122 +0,0 @@ -xen/pt: unknown PCI config space fields should be read-only - -... by default. Add a per-device "permissive" mode similar to pciback's -to allow restoring previous behavior (and hence break security again, -i.e. should be used only for trusted guests). - -This is part of XSA-131. - -Signed-off-by: Jan Beulich -Acked-by: Stefano Stabellini -Reviewed-by: Anthony PERARD ) ---- -Notes: -- What purpose does xen_pt_header_type_reg_init() serve (with .emu_mask - being zero)? -- In the qemu-trad case no equivalent logic to that setting/using - direct_pci_{msi_translate,power_mgmt} is being added, as that logic - seems broken (setting globals from device 0 xenstore settings). - ---- a/hw/xen/xen_pt.c -+++ b/hw/xen/xen_pt.c -@@ -239,6 +239,7 @@ static void xen_pt_pci_write_config(PCID - XenPTReg *reg_entry = NULL; - uint32_t find_addr = addr; - XenPTRegInfo *reg = NULL; -+ bool wp_flag = false; - - if (xen_pt_pci_config_access_check(d, addr, len)) { - return; -@@ -280,6 +281,10 @@ static void xen_pt_pci_write_config(PCID - - /* pass directly to the real device for passthrough type register group */ - if (reg_grp_entry == NULL) { -+ if (!s->permissive) { -+ wb_mask = 0; -+ wp_flag = true; -+ } - goto out; - } - -@@ -300,12 +305,15 @@ static void xen_pt_pci_write_config(PCID - uint32_t real_offset = reg_grp_entry->base_offset + reg->offset; - uint32_t valid_mask = 0xFFFFFFFF >> ((4 - emul_len) << 3); - uint8_t *ptr_val = NULL; -+ uint32_t wp_mask = reg->emu_mask | reg->ro_mask; - - valid_mask <<= (find_addr - real_offset) << 3; - ptr_val = (uint8_t *)&val + (real_offset & 3); -- if (reg->emu_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { -- wb_mask &= ~((reg->emu_mask -- >> ((find_addr - real_offset) << 3)) -+ if (!s->permissive) { -+ wp_mask |= reg->res_mask; -+ } -+ if (wp_mask == (0xFFFFFFFF >> ((4 - reg->size) << 3))) { -+ wb_mask &= ~((wp_mask >> ((find_addr - real_offset) << 3)) - << ((len - emul_len) << 3)); - } - -@@ -349,6 +357,16 @@ static void xen_pt_pci_write_config(PCID - } else { - /* nothing to do with passthrough type register, - * continue to find next byte */ -+ if (!s->permissive) { -+ wb_mask &= ~(0xff << ((len - emul_len) << 3)); -+ /* Unused BARs will make it here, but we don't want to issue -+ * warnings for writes to them (bogus writes get dealt with -+ * above). -+ */ -+ if (index < 0) { -+ wp_flag = true; -+ } -+ } - emul_len--; - find_addr++; - } -@@ -360,6 +378,13 @@ static void xen_pt_pci_write_config(PCID - memory_region_transaction_commit(); - - out: -+ if (wp_flag && !s->permissive_warned) { -+ s->permissive_warned = true; -+ xen_pt_log(d, "Write-back to unknown field 0x%02x (partially) inhibited (0x%0*x)\n", -+ addr, len * 2, wb_mask); -+ xen_pt_log(d, "If the device doesn't work, try enabling permissive mode\n"); -+ xen_pt_log(d, "(unsafe) and if it helps report the problem to xen-devel\n"); -+ } - for (index = 0; wb_mask; index += len) { - /* unknown regs are passed through */ - while (!(wb_mask & 0xff)) { -@@ -821,6 +846,7 @@ static void xen_pt_unregister_device(PCI - - static Property xen_pci_passthrough_properties[] = { - DEFINE_PROP_PCI_HOST_DEVADDR("hostaddr", XenPCIPassthroughState, hostaddr), -+ DEFINE_PROP_BOOL("permissive", XenPCIPassthroughState, permissive, false), - DEFINE_PROP_END_OF_LIST(), - }; - ---- a/hw/xen/xen_pt.h -+++ b/hw/xen/xen_pt.h -@@ -197,6 +197,8 @@ struct XenPCIPassthroughState { - - PCIHostDeviceAddress hostaddr; - bool is_virtfn; -+ bool permissive; -+ bool permissive_warned; - XenHostPCIDevice real_device; - XenPTRegion bases[PCI_NUM_REGIONS]; /* Access regions */ - QLIST_HEAD(, XenPTRegGroup) reg_grps; ---- a/hw/xen/xen_pt_config_init.c -+++ b/hw/xen/xen_pt_config_init.c -@@ -101,6 +101,10 @@ static uint32_t get_throughable_mask(con - { - uint32_t throughable_mask = ~(reg->emu_mask | reg->ro_mask); - -+ if (!s->permissive) { -+ throughable_mask &= ~reg->res_mask; -+ } -+ - return throughable_mask & valid_mask; - } - diff --git a/sysutils/xen-tools/files/xsa133-qemut.patch b/sysutils/xen-tools/files/xsa133-qemut.patch deleted file mode 100644 index e1b77117df1..00000000000 --- a/sysutils/xen-tools/files/xsa133-qemut.patch +++ /dev/null @@ -1,80 +0,0 @@ -From ac7ddbe342d7aa2303c39ca731cc6229dbbd739b Mon Sep 17 00:00:00 2001 -From: Petr Matousek -Date: Wed, 6 May 2015 09:48:59 +0200 -Subject: [PATCH] fdc: force the fifo access to be in bounds of the allocated buffer - -During processing of certain commands such as FD_CMD_READ_ID and -FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could -get out of bounds leading to memory corruption with values coming -from the guest. - -Fix this by making sure that the index is always bounded by the -allocated memory. - -This is CVE-2015-3456. - -Signed-off-by: Petr Matousek -Reviewed-by: John Snow ---- - hw/fdc.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/hw/fdc.c b/hw/fdc.c -index b00a4ec..aba02e4 100644 ---- a/hw/fdc.c -+++ b/hw/fdc.c -@@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) - { - fdrive_t *cur_drv; - uint32_t retval = 0; -- int pos; -+ uint32_t pos; - - cur_drv = get_cur_drv(fdctrl); - fdctrl->dsr &= ~FD_DSR_PWRDOWN; -@@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) - return 0; - } - pos = fdctrl->data_pos; -+ pos %= FD_SECTOR_LEN; - if (fdctrl->msr & FD_MSR_NONDMA) { -- pos %= FD_SECTOR_LEN; - if (pos == 0) { - if (fdctrl->data_pos != 0) - if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { -@@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) - static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) - { - fdrive_t *cur_drv = get_cur_drv(fdctrl); -+ uint32_t pos; - -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { -+ pos = fdctrl->data_pos - 1; -+ pos %= FD_SECTOR_LEN; -+ if (fdctrl->fifo[pos] & 0x80) { - /* Command parameters done */ -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { -+ if (fdctrl->fifo[pos] & 0x40) { - fdctrl->fifo[0] = fdctrl->fifo[1]; - fdctrl->fifo[2] = 0; - fdctrl->fifo[3] = 0; -@@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; - static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) - { - fdrive_t *cur_drv; -- int pos; -+ uint32_t pos; - - /* Reset mode */ - if (!(fdctrl->dor & FD_DOR_nRESET)) { -@@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) - } - - FLOPPY_DPRINTF("%s: %02x\n", __func__, value); -- fdctrl->fifo[fdctrl->data_pos++] = value; -+ pos = fdctrl->data_pos++; -+ pos %= FD_SECTOR_LEN; -+ fdctrl->fifo[pos] = value; - if (fdctrl->data_pos == fdctrl->data_len) { - /* We now have all parameters - * and will be able to treat the command diff --git a/sysutils/xen-tools/files/xsa133-qemuu.patch b/sysutils/xen-tools/files/xsa133-qemuu.patch deleted file mode 100644 index 95f3dcc21e5..00000000000 --- a/sysutils/xen-tools/files/xsa133-qemuu.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ac7ddbe342d7aa2303c39ca731cc6229dbbd739b Mon Sep 17 00:00:00 2001 -From: Petr Matousek -Date: Wed, 6 May 2015 09:48:59 +0200 -Subject: [PATCH] fdc: force the fifo access to be in bounds of the allocated buffer - -During processing of certain commands such as FD_CMD_READ_ID and -FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could -get out of bounds leading to memory corruption with values coming -from the guest. - -Fix this by making sure that the index is always bounded by the -allocated memory. - -This is CVE-2015-3456. - -Signed-off-by: Petr Matousek -Reviewed-by: John Snow ---- - hw/block/fdc.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/hw/block/fdc.c b/hw/block/fdc.c -index f72a392..d8a8edd 100644 ---- a/hw/block/fdc.c -+++ b/hw/block/fdc.c -@@ -1497,7 +1497,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) - { - FDrive *cur_drv; - uint32_t retval = 0; -- int pos; -+ uint32_t pos; - - cur_drv = get_cur_drv(fdctrl); - fdctrl->dsr &= ~FD_DSR_PWRDOWN; -@@ -1506,8 +1506,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) - return 0; - } - pos = fdctrl->data_pos; -+ pos %= FD_SECTOR_LEN; - if (fdctrl->msr & FD_MSR_NONDMA) { -- pos %= FD_SECTOR_LEN; - if (pos == 0) { - if (fdctrl->data_pos != 0) - if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { -@@ -1852,10 +1852,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int direction) - static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int direction) - { - FDrive *cur_drv = get_cur_drv(fdctrl); -+ uint32_t pos; - -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { -+ pos = fdctrl->data_pos - 1; -+ pos %= FD_SECTOR_LEN; -+ if (fdctrl->fifo[pos] & 0x80) { - /* Command parameters done */ -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { -+ if (fdctrl->fifo[pos] & 0x40) { - fdctrl->fifo[0] = fdctrl->fifo[1]; - fdctrl->fifo[2] = 0; - fdctrl->fifo[3] = 0; -@@ -1955,7 +1958,7 @@ static uint8_t command_to_handler[256]; - static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) - { - FDrive *cur_drv; -- int pos; -+ uint32_t pos; - - /* Reset mode */ - if (!(fdctrl->dor & FD_DOR_nRESET)) { -@@ -2004,7 +2007,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) - } - - FLOPPY_DPRINTF("%s: %02x\n", __func__, value); -- fdctrl->fifo[fdctrl->data_pos++] = value; -+ pos = fdctrl->data_pos++; -+ pos %= FD_SECTOR_LEN; -+ fdctrl->fifo[pos] = value; - if (fdctrl->data_pos == fdctrl->data_len) { - /* We now have all parameters - * and will be able to treat the command --- -2.1.0 - - diff --git a/sysutils/xen-tools/files/xsa135-qemuu-4.5-1.patch b/sysutils/xen-tools/files/xsa135-qemuu-4.5-1.patch deleted file mode 100644 index 31b161026f1..00000000000 --- a/sysutils/xen-tools/files/xsa135-qemuu-4.5-1.patch +++ /dev/null @@ -1,94 +0,0 @@ -pcnet: fix Negative array index read - -From: Gonglei - -s->xmit_pos maybe assigned to a negative value (-1), -but in this branch variable s->xmit_pos as an index to -array s->buffer. Let's add a check for s->xmit_pos. - -upstream-commit-id: 7b50d00911ddd6d56a766ac5671e47304c20a21b - -Signed-off-by: Gonglei -Signed-off-by: Paolo Bonzini -Reviewed-by: Jason Wang -Reviewed-by: Jason Wang -Signed-off-by: Stefan Hajnoczi - -diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c -index d344c15..f409b92 100644 ---- a/hw/net/pcnet.c -+++ b/hw/net/pcnet.c -@@ -1212,7 +1212,7 @@ static void pcnet_transmit(PCNetState *s) - hwaddr xmit_cxda = 0; - int count = CSR_XMTRL(s)-1; - int add_crc = 0; -- -+ int bcnt; - s->xmit_pos = -1; - - if (!CSR_TXON(s)) { -@@ -1247,35 +1247,40 @@ static void pcnet_transmit(PCNetState *s) - s->xmit_pos = -1; - goto txdone; - } -+ -+ if (s->xmit_pos < 0) { -+ goto txdone; -+ } -+ -+ bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); -+ s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), -+ s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); -+ s->xmit_pos += bcnt; -+ - if (!GET_FIELD(tmd.status, TMDS, ENP)) { -- int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); -- s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), -- s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); -- s->xmit_pos += bcnt; -- } else if (s->xmit_pos >= 0) { -- int bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); -- s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), -- s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); -- s->xmit_pos += bcnt; -+ goto txdone; -+ } -+ - #ifdef PCNET_DEBUG -- printf("pcnet_transmit size=%d\n", s->xmit_pos); -+ printf("pcnet_transmit size=%d\n", s->xmit_pos); - #endif -- if (CSR_LOOP(s)) { -- if (BCR_SWSTYLE(s) == 1) -- add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); -- s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; -- pcnet_receive(qemu_get_queue(s->nic), s->buffer, s->xmit_pos); -- s->looptest = 0; -- } else -- if (s->nic) -- qemu_send_packet(qemu_get_queue(s->nic), s->buffer, -- s->xmit_pos); -- -- s->csr[0] &= ~0x0008; /* clear TDMD */ -- s->csr[4] |= 0x0004; /* set TXSTRT */ -- s->xmit_pos = -1; -+ if (CSR_LOOP(s)) { -+ if (BCR_SWSTYLE(s) == 1) -+ add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); -+ s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; -+ pcnet_receive(qemu_get_queue(s->nic), s->buffer, s->xmit_pos); -+ s->looptest = 0; -+ } else { -+ if (s->nic) { -+ qemu_send_packet(qemu_get_queue(s->nic), s->buffer, -+ s->xmit_pos); -+ } - } - -+ s->csr[0] &= ~0x0008; /* clear TDMD */ -+ s->csr[4] |= 0x0004; /* set TXSTRT */ -+ s->xmit_pos = -1; -+ - txdone: - SET_FIELD(&tmd.status, TMDS, OWN, 0); - TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); diff --git a/sysutils/xen-tools/files/xsa135-qemuu-4.5-2.patch b/sysutils/xen-tools/files/xsa135-qemuu-4.5-2.patch deleted file mode 100644 index 4fe7df5440f..00000000000 --- a/sysutils/xen-tools/files/xsa135-qemuu-4.5-2.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2630672ab22255de252f877709851c0557a1c647 Mon Sep 17 00:00:00 2001 -From: Petr Matousek -Date: Sun, 24 May 2015 10:53:44 +0200 -Subject: [PATCH] pcnet: force the buffer access to be in bounds during tx - -4096 is the maximum length per TMD and it is also currently the size of -the relay buffer pcnet driver uses for sending the packet data to QEMU -for further processing. With packet spanning multiple TMDs it can -happen that the overall packet size will be bigger than sizeof(buffer), -which results in memory corruption. - -Fix this by only allowing to queue maximum sizeof(buffer) bytes. - -This is CVE-2015-3209. - -Signed-off-by: Petr Matousek -Reported-by: Matt Tait -Reviewed-by: Peter Maydell -Reviewed-by: Stefan Hajnoczi ---- - hw/net/pcnet.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c -index bdfd38f..6d32e4c 100644 ---- a/hw/net/pcnet.c -+++ b/hw/net/pcnet.c -@@ -1241,6 +1241,14 @@ static void pcnet_transmit(PCNetState *s) - } - - bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); -+ -+ /* if multi-tmd packet outsizes s->buffer then skip it silently. -+ Note: this is not what real hw does */ -+ if (s->xmit_pos + bcnt > sizeof(s->buffer)) { -+ s->xmit_pos = -1; -+ goto txdone; -+ } -+ - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), - s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); - s->xmit_pos += bcnt; --- -2.1.0 - diff --git a/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch b/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch new file mode 100644 index 00000000000..70ea0661d43 --- /dev/null +++ b/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch @@ -0,0 +1,38 @@ +pci_piix3_xen_ide_unplug should completely unhook the unplugged +IDEDevice from the corresponding BlockBackend, otherwise the next call +to release_drive will try to detach the drive again. + +Suggested-by: Kevin Wolf +Signed-off-by: Stefano Stabellini +--- + hw/ide/piix.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/hw/ide/piix.c b/hw/ide/piix.c +index 40757eb..0524dce 100644 +--- a/hw/ide/piix.c ++++ b/hw/ide/piix.c +@@ -172,6 +172,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) + PCIIDEState *pci_ide; + DriveInfo *di; + int i = 0; ++ IDEDevice *idedev; + + pci_ide = PCI_IDE(dev); + +@@ -184,6 +185,12 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) + } + bdrv_close(di->bdrv); + pci_ide->bus[di->bus].ifs[di->unit].bs = NULL; ++ if (!(i % 2)) { ++ idedev = pci_ide->bus[di->bus].master; ++ } else { ++ idedev = pci_ide->bus[di->bus].slave; ++ } ++ idedev->conf.bs = NULL; + drive_put_ref(di); + } + } +-- +2.1.4 + diff --git a/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch b/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch new file mode 100644 index 00000000000..043d1893579 --- /dev/null +++ b/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch @@ -0,0 +1,82 @@ +From 5e0c290415b9d57077a86e70c8e6a058868334d3 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:16:58 +0100 +Subject: [PATCH 1/7] rtl8139: avoid nested ifs in IP header parsing + +Transmit offload needs to parse packet headers. If header fields have +unexpected values the offload processing is skipped. + +The code currently uses nested ifs because there is relatively little +input validation. The next patches will add missing input validation +and a goto label is more appropriate to avoid deep if statement nesting. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 41 ++++++++++++++++++++++------------------- + 1 file changed, 22 insertions(+), 19 deletions(-) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index 5f0197c..91ba33b 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2174,28 +2174,30 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + size_t eth_payload_len = 0; + + int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); +- if (proto == ETH_P_IP) ++ if (proto != ETH_P_IP) + { +- DPRINTF("+++ C+ mode has IP packet\n"); +- +- /* not aligned */ +- eth_payload_data = saved_buffer + ETH_HLEN; +- eth_payload_len = saved_size - ETH_HLEN; +- +- ip = (ip_header*)eth_payload_data; +- +- if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { +- DPRINTF("+++ C+ mode packet has bad IP version %d " +- "expected %d\n", IP_HEADER_VERSION(ip), +- IP_HEADER_VERSION_4); +- ip = NULL; +- } else { +- hlen = IP_HEADER_LENGTH(ip); +- ip_protocol = ip->ip_p; +- ip_data_len = be16_to_cpu(ip->ip_len) - hlen; +- } ++ goto skip_offload; + } + ++ DPRINTF("+++ C+ mode has IP packet\n"); ++ ++ /* not aligned */ ++ eth_payload_data = saved_buffer + ETH_HLEN; ++ eth_payload_len = saved_size - ETH_HLEN; ++ ++ ip = (ip_header*)eth_payload_data; ++ ++ if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { ++ DPRINTF("+++ C+ mode packet has bad IP version %d " ++ "expected %d\n", IP_HEADER_VERSION(ip), ++ IP_HEADER_VERSION_4); ++ goto skip_offload; ++ } ++ ++ hlen = IP_HEADER_LENGTH(ip); ++ ip_protocol = ip->ip_p; ++ ip_data_len = be16_to_cpu(ip->ip_len) - hlen; ++ + if (ip) + { + if (txdw0 & CP_TX_IPCS) +@@ -2391,6 +2393,7 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + } + } + ++skip_offload: + /* update tally counter */ + ++s->tally_counters.TxOk; + +-- +2.1.4 + diff --git a/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch b/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch new file mode 100644 index 00000000000..7a76a8a40d2 --- /dev/null +++ b/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch @@ -0,0 +1,373 @@ +From 2d7d80e8dc160904fa7276cc05da26c062a50066 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:16:59 +0100 +Subject: [PATCH 2/7] rtl8139: drop tautologous if (ip) {...} statement + +The previous patch stopped using the ip pointer as an indicator that the +IP header is present. When we reach the if (ip) {...} statement we know +ip is always non-NULL. + +Remove the if statement to reduce nesting. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 305 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 151 insertions(+), 154 deletions(-) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index 91ba33b..2f12d42 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2198,198 +2198,195 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + ip_protocol = ip->ip_p; + ip_data_len = be16_to_cpu(ip->ip_len) - hlen; + +- if (ip) ++ if (txdw0 & CP_TX_IPCS) + { +- if (txdw0 & CP_TX_IPCS) +- { +- DPRINTF("+++ C+ mode need IP checksum\n"); ++ DPRINTF("+++ C+ mode need IP checksum\n"); + +- if (hleneth_payload_len) {/* min header length */ +- /* bad packet header len */ +- /* or packet too short */ +- } +- else +- { +- ip->ip_sum = 0; +- ip->ip_sum = ip_checksum(ip, hlen); +- DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", +- hlen, ip->ip_sum); +- } ++ if (hleneth_payload_len) {/* min header length */ ++ /* bad packet header len */ ++ /* or packet too short */ + } +- +- if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) ++ else + { +- int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; ++ ip->ip_sum = 0; ++ ip->ip_sum = ip_checksum(ip, hlen); ++ DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", ++ hlen, ip->ip_sum); ++ } ++ } + +- DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " +- "frame data %d specified MSS=%d\n", ETH_MTU, +- ip_data_len, saved_size - ETH_HLEN, large_send_mss); ++ if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) ++ { ++ int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; + +- int tcp_send_offset = 0; +- int send_count = 0; ++ DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " ++ "frame data %d specified MSS=%d\n", ETH_MTU, ++ ip_data_len, saved_size - ETH_HLEN, large_send_mss); + +- /* maximum IP header length is 60 bytes */ +- uint8_t saved_ip_header[60]; ++ int tcp_send_offset = 0; ++ int send_count = 0; + +- /* save IP header template; data area is used in tcp checksum calculation */ +- memcpy(saved_ip_header, eth_payload_data, hlen); ++ /* maximum IP header length is 60 bytes */ ++ uint8_t saved_ip_header[60]; + +- /* a placeholder for checksum calculation routine in tcp case */ +- uint8_t *data_to_checksum = eth_payload_data + hlen - 12; +- // size_t data_to_checksum_len = eth_payload_len - hlen + 12; ++ /* save IP header template; data area is used in tcp checksum calculation */ ++ memcpy(saved_ip_header, eth_payload_data, hlen); + +- /* pointer to TCP header */ +- tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); ++ /* a placeholder for checksum calculation routine in tcp case */ ++ uint8_t *data_to_checksum = eth_payload_data + hlen - 12; ++ // size_t data_to_checksum_len = eth_payload_len - hlen + 12; + +- int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); ++ /* pointer to TCP header */ ++ tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); + +- /* ETH_MTU = ip header len + tcp header len + payload */ +- int tcp_data_len = ip_data_len - tcp_hlen; +- int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; ++ int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + +- DPRINTF("+++ C+ mode TSO IP data len %d TCP hlen %d TCP " +- "data len %d TCP chunk size %d\n", ip_data_len, +- tcp_hlen, tcp_data_len, tcp_chunk_size); ++ /* ETH_MTU = ip header len + tcp header len + payload */ ++ int tcp_data_len = ip_data_len - tcp_hlen; ++ int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; + +- /* note the cycle below overwrites IP header data, +- but restores it from saved_ip_header before sending packet */ ++ DPRINTF("+++ C+ mode TSO IP data len %d TCP hlen %d TCP " ++ "data len %d TCP chunk size %d\n", ip_data_len, ++ tcp_hlen, tcp_data_len, tcp_chunk_size); + +- int is_last_frame = 0; ++ /* note the cycle below overwrites IP header data, ++ but restores it from saved_ip_header before sending packet */ + +- for (tcp_send_offset = 0; tcp_send_offset < tcp_data_len; tcp_send_offset += tcp_chunk_size) +- { +- uint16_t chunk_size = tcp_chunk_size; +- +- /* check if this is the last frame */ +- if (tcp_send_offset + tcp_chunk_size >= tcp_data_len) +- { +- is_last_frame = 1; +- chunk_size = tcp_data_len - tcp_send_offset; +- } +- +- DPRINTF("+++ C+ mode TSO TCP seqno %08x\n", +- be32_to_cpu(p_tcp_hdr->th_seq)); +- +- /* add 4 TCP pseudoheader fields */ +- /* copy IP source and destination fields */ +- memcpy(data_to_checksum, saved_ip_header + 12, 8); +- +- DPRINTF("+++ C+ mode TSO calculating TCP checksum for " +- "packet with %d bytes data\n", tcp_hlen + +- chunk_size); +- +- if (tcp_send_offset) +- { +- memcpy((uint8_t*)p_tcp_hdr + tcp_hlen, (uint8_t*)p_tcp_hdr + tcp_hlen + tcp_send_offset, chunk_size); +- } +- +- /* keep PUSH and FIN flags only for the last frame */ +- if (!is_last_frame) +- { +- TCP_HEADER_CLEAR_FLAGS(p_tcp_hdr, TCP_FLAG_PUSH|TCP_FLAG_FIN); +- } +- +- /* recalculate TCP checksum */ +- ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; +- p_tcpip_hdr->zeros = 0; +- p_tcpip_hdr->ip_proto = IP_PROTO_TCP; +- p_tcpip_hdr->ip_payload = cpu_to_be16(tcp_hlen + chunk_size); +- +- p_tcp_hdr->th_sum = 0; +- +- int tcp_checksum = ip_checksum(data_to_checksum, tcp_hlen + chunk_size + 12); +- DPRINTF("+++ C+ mode TSO TCP checksum %04x\n", +- tcp_checksum); +- +- p_tcp_hdr->th_sum = tcp_checksum; +- +- /* restore IP header */ +- memcpy(eth_payload_data, saved_ip_header, hlen); +- +- /* set IP data length and recalculate IP checksum */ +- ip->ip_len = cpu_to_be16(hlen + tcp_hlen + chunk_size); +- +- /* increment IP id for subsequent frames */ +- ip->ip_id = cpu_to_be16(tcp_send_offset/tcp_chunk_size + be16_to_cpu(ip->ip_id)); +- +- ip->ip_sum = 0; +- ip->ip_sum = ip_checksum(eth_payload_data, hlen); +- DPRINTF("+++ C+ mode TSO IP header len=%d " +- "checksum=%04x\n", hlen, ip->ip_sum); +- +- int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size; +- DPRINTF("+++ C+ mode TSO transferring packet size " +- "%d\n", tso_send_size); +- rtl8139_transfer_frame(s, saved_buffer, tso_send_size, +- 0, (uint8_t *) dot1q_buffer); +- +- /* add transferred count to TCP sequence number */ +- p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq)); +- ++send_count; +- } ++ int is_last_frame = 0; + +- /* Stop sending this frame */ +- saved_size = 0; +- } +- else if (txdw0 & (CP_TX_TCPCS|CP_TX_UDPCS)) ++ for (tcp_send_offset = 0; tcp_send_offset < tcp_data_len; tcp_send_offset += tcp_chunk_size) + { +- DPRINTF("+++ C+ mode need TCP or UDP checksum\n"); ++ uint16_t chunk_size = tcp_chunk_size; + +- /* maximum IP header length is 60 bytes */ +- uint8_t saved_ip_header[60]; +- memcpy(saved_ip_header, eth_payload_data, hlen); ++ /* check if this is the last frame */ ++ if (tcp_send_offset + tcp_chunk_size >= tcp_data_len) ++ { ++ is_last_frame = 1; ++ chunk_size = tcp_data_len - tcp_send_offset; ++ } + +- uint8_t *data_to_checksum = eth_payload_data + hlen - 12; +- // size_t data_to_checksum_len = eth_payload_len - hlen + 12; ++ DPRINTF("+++ C+ mode TSO TCP seqno %08x\n", ++ be32_to_cpu(p_tcp_hdr->th_seq)); + + /* add 4 TCP pseudoheader fields */ + /* copy IP source and destination fields */ + memcpy(data_to_checksum, saved_ip_header + 12, 8); + +- if ((txdw0 & CP_TX_TCPCS) && ip_protocol == IP_PROTO_TCP) ++ DPRINTF("+++ C+ mode TSO calculating TCP checksum for " ++ "packet with %d bytes data\n", tcp_hlen + ++ chunk_size); ++ ++ if (tcp_send_offset) + { +- DPRINTF("+++ C+ mode calculating TCP checksum for " +- "packet with %d bytes data\n", ip_data_len); ++ memcpy((uint8_t*)p_tcp_hdr + tcp_hlen, (uint8_t*)p_tcp_hdr + tcp_hlen + tcp_send_offset, chunk_size); ++ } + +- ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; +- p_tcpip_hdr->zeros = 0; +- p_tcpip_hdr->ip_proto = IP_PROTO_TCP; +- p_tcpip_hdr->ip_payload = cpu_to_be16(ip_data_len); ++ /* keep PUSH and FIN flags only for the last frame */ ++ if (!is_last_frame) ++ { ++ TCP_HEADER_CLEAR_FLAGS(p_tcp_hdr, TCP_FLAG_PUSH|TCP_FLAG_FIN); ++ } + +- tcp_header* p_tcp_hdr = (tcp_header *) (data_to_checksum+12); ++ /* recalculate TCP checksum */ ++ ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; ++ p_tcpip_hdr->zeros = 0; ++ p_tcpip_hdr->ip_proto = IP_PROTO_TCP; ++ p_tcpip_hdr->ip_payload = cpu_to_be16(tcp_hlen + chunk_size); + +- p_tcp_hdr->th_sum = 0; ++ p_tcp_hdr->th_sum = 0; + +- int tcp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); +- DPRINTF("+++ C+ mode TCP checksum %04x\n", +- tcp_checksum); ++ int tcp_checksum = ip_checksum(data_to_checksum, tcp_hlen + chunk_size + 12); ++ DPRINTF("+++ C+ mode TSO TCP checksum %04x\n", ++ tcp_checksum); + +- p_tcp_hdr->th_sum = tcp_checksum; +- } +- else if ((txdw0 & CP_TX_UDPCS) && ip_protocol == IP_PROTO_UDP) +- { +- DPRINTF("+++ C+ mode calculating UDP checksum for " +- "packet with %d bytes data\n", ip_data_len); ++ p_tcp_hdr->th_sum = tcp_checksum; + +- ip_pseudo_header *p_udpip_hdr = (ip_pseudo_header *)data_to_checksum; +- p_udpip_hdr->zeros = 0; +- p_udpip_hdr->ip_proto = IP_PROTO_UDP; +- p_udpip_hdr->ip_payload = cpu_to_be16(ip_data_len); ++ /* restore IP header */ ++ memcpy(eth_payload_data, saved_ip_header, hlen); + +- udp_header *p_udp_hdr = (udp_header *) (data_to_checksum+12); ++ /* set IP data length and recalculate IP checksum */ ++ ip->ip_len = cpu_to_be16(hlen + tcp_hlen + chunk_size); + +- p_udp_hdr->uh_sum = 0; ++ /* increment IP id for subsequent frames */ ++ ip->ip_id = cpu_to_be16(tcp_send_offset/tcp_chunk_size + be16_to_cpu(ip->ip_id)); + +- int udp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); +- DPRINTF("+++ C+ mode UDP checksum %04x\n", +- udp_checksum); ++ ip->ip_sum = 0; ++ ip->ip_sum = ip_checksum(eth_payload_data, hlen); ++ DPRINTF("+++ C+ mode TSO IP header len=%d " ++ "checksum=%04x\n", hlen, ip->ip_sum); + +- p_udp_hdr->uh_sum = udp_checksum; +- } ++ int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size; ++ DPRINTF("+++ C+ mode TSO transferring packet size " ++ "%d\n", tso_send_size); ++ rtl8139_transfer_frame(s, saved_buffer, tso_send_size, ++ 0, (uint8_t *) dot1q_buffer); + +- /* restore IP header */ +- memcpy(eth_payload_data, saved_ip_header, hlen); ++ /* add transferred count to TCP sequence number */ ++ p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq)); ++ ++send_count; + } ++ ++ /* Stop sending this frame */ ++ saved_size = 0; ++ } ++ else if (txdw0 & (CP_TX_TCPCS|CP_TX_UDPCS)) ++ { ++ DPRINTF("+++ C+ mode need TCP or UDP checksum\n"); ++ ++ /* maximum IP header length is 60 bytes */ ++ uint8_t saved_ip_header[60]; ++ memcpy(saved_ip_header, eth_payload_data, hlen); ++ ++ uint8_t *data_to_checksum = eth_payload_data + hlen - 12; ++ // size_t data_to_checksum_len = eth_payload_len - hlen + 12; ++ ++ /* add 4 TCP pseudoheader fields */ ++ /* copy IP source and destination fields */ ++ memcpy(data_to_checksum, saved_ip_header + 12, 8); ++ ++ if ((txdw0 & CP_TX_TCPCS) && ip_protocol == IP_PROTO_TCP) ++ { ++ DPRINTF("+++ C+ mode calculating TCP checksum for " ++ "packet with %d bytes data\n", ip_data_len); ++ ++ ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; ++ p_tcpip_hdr->zeros = 0; ++ p_tcpip_hdr->ip_proto = IP_PROTO_TCP; ++ p_tcpip_hdr->ip_payload = cpu_to_be16(ip_data_len); ++ ++ tcp_header* p_tcp_hdr = (tcp_header *) (data_to_checksum+12); ++ ++ p_tcp_hdr->th_sum = 0; ++ ++ int tcp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); ++ DPRINTF("+++ C+ mode TCP checksum %04x\n", ++ tcp_checksum); ++ ++ p_tcp_hdr->th_sum = tcp_checksum; ++ } ++ else if ((txdw0 & CP_TX_UDPCS) && ip_protocol == IP_PROTO_UDP) ++ { ++ DPRINTF("+++ C+ mode calculating UDP checksum for " ++ "packet with %d bytes data\n", ip_data_len); ++ ++ ip_pseudo_header *p_udpip_hdr = (ip_pseudo_header *)data_to_checksum; ++ p_udpip_hdr->zeros = 0; ++ p_udpip_hdr->ip_proto = IP_PROTO_UDP; ++ p_udpip_hdr->ip_payload = cpu_to_be16(ip_data_len); ++ ++ udp_header *p_udp_hdr = (udp_header *) (data_to_checksum+12); ++ ++ p_udp_hdr->uh_sum = 0; ++ ++ int udp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); ++ DPRINTF("+++ C+ mode UDP checksum %04x\n", ++ udp_checksum); ++ ++ p_udp_hdr->uh_sum = udp_checksum; ++ } ++ ++ /* restore IP header */ ++ memcpy(eth_payload_data, saved_ip_header, hlen); + } + } + +-- +2.1.4 + diff --git a/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch b/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch new file mode 100644 index 00000000000..5676f465328 --- /dev/null +++ b/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch @@ -0,0 +1,39 @@ +From 043d28507ef7c5fdc34866f5e3b27a72bd0cd072 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:00 +0100 +Subject: [PATCH 3/7] rtl8139: skip offload on short Ethernet/IP header + +Transmit offload features access Ethernet and IP headers the packet. If +the packet is too short we must not attempt to access header fields: + + int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); + ... + eth_payload_data = saved_buffer + ETH_HLEN; + ... + ip = (ip_header*)eth_payload_data; + if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index 2f12d42..d377b6b 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2164,6 +2164,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + { + DPRINTF("+++ C+ mode offloaded task checksum\n"); + ++ /* Large enough for Ethernet and IP headers? */ ++ if (saved_size < ETH_HLEN + sizeof(ip_header)) { ++ goto skip_offload; ++ } ++ + /* ip packet header */ + ip_header *ip = NULL; + int hlen = 0; +-- +2.1.4 + diff --git a/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch b/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch new file mode 100644 index 00000000000..495d8d616b2 --- /dev/null +++ b/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch @@ -0,0 +1,53 @@ +From 5a75d242fe019d05b46ef9bc330a6892525c84a7 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:01 +0100 +Subject: [PATCH 4/7] rtl8139: check IP Header Length field + +The IP Header Length field was only checked in the IP checksum case, but +is used in other cases too. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index d377b6b..cd5ac05 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2200,6 +2200,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + } + + hlen = IP_HEADER_LENGTH(ip); ++ if (hlen < sizeof(ip_header) || hlen > eth_payload_len) { ++ goto skip_offload; ++ } ++ + ip_protocol = ip->ip_p; + ip_data_len = be16_to_cpu(ip->ip_len) - hlen; + +@@ -2207,17 +2211,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + { + DPRINTF("+++ C+ mode need IP checksum\n"); + +- if (hleneth_payload_len) {/* min header length */ +- /* bad packet header len */ +- /* or packet too short */ +- } +- else +- { +- ip->ip_sum = 0; +- ip->ip_sum = ip_checksum(ip, hlen); +- DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", +- hlen, ip->ip_sum); +- } ++ ip->ip_sum = 0; ++ ip->ip_sum = ip_checksum(ip, hlen); ++ DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", ++ hlen, ip->ip_sum); + } + + if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) +-- +2.1.4 + diff --git a/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch b/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch new file mode 100644 index 00000000000..e633ea6b2e0 --- /dev/null +++ b/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch @@ -0,0 +1,34 @@ +From 6c79ea275d72bc1fd88bdcf1e7d231b2c9c865de Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:02 +0100 +Subject: [PATCH 5/7] rtl8139: check IP Total Length field + +The IP Total Length field includes the IP header and data. Make sure it +is valid and does not exceed the Ethernet payload size. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index cd5ac05..ed2b23b 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2205,7 +2205,12 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + } + + ip_protocol = ip->ip_p; +- ip_data_len = be16_to_cpu(ip->ip_len) - hlen; ++ ++ ip_data_len = be16_to_cpu(ip->ip_len); ++ if (ip_data_len < hlen || ip_data_len > eth_payload_len) { ++ goto skip_offload; ++ } ++ ip_data_len -= hlen; + + if (txdw0 & CP_TX_IPCS) + { +-- +2.1.4 + diff --git a/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch b/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch new file mode 100644 index 00000000000..dd716a6d6dc --- /dev/null +++ b/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch @@ -0,0 +1,35 @@ +From 30aa7be430e7c982e9163f3bcc745d3aa57b6aa4 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:03 +0100 +Subject: [PATCH 6/7] rtl8139: skip offload on short TCP header + +TCP Large Segment Offload accesses the TCP header in the packet. If the +packet is too short we must not attempt to access header fields: + + tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); + int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index ed2b23b..c8f0df9 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2224,6 +2224,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + + if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) + { ++ /* Large enough for the TCP header? */ ++ if (ip_data_len < sizeof(tcp_header)) { ++ goto skip_offload; ++ } ++ + int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; + + DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " +-- +2.1.4 + diff --git a/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch b/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch new file mode 100644 index 00000000000..4c0ad799354 --- /dev/null +++ b/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch @@ -0,0 +1,32 @@ +From 9a084807bf6ca7c16d997a236d304111894a6539 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:04 +0100 +Subject: [PATCH 7/7] rtl8139: check TCP Data Offset field + +The TCP Data Offset field contains the length of the header. Make sure +it is valid and does not exceed the IP data length. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index c8f0df9..2df4a51 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2253,6 +2253,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + + int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + ++ /* Invalid TCP data offset? */ ++ if (tcp_hlen < sizeof(tcp_header) || tcp_hlen > ip_data_len) { ++ goto skip_offload; ++ } ++ + /* ETH_MTU = ip header len + tcp header len + payload */ + int tcp_data_len = ip_data_len - tcp_hlen; + int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; +-- +2.1.4 + diff --git a/sysutils/xen-tools/pkg-plist b/sysutils/xen-tools/pkg-plist index e0b4463a5c8..233db6b77f9 100644 --- a/sysutils/xen-tools/pkg-plist +++ b/sysutils/xen-tools/pkg-plist @@ -36,6 +36,7 @@ include/libxl_event.h include/libxl_json.h include/libxl_utils.h include/libxl_uuid.h +include/libxlutil.h include/xen/COPYING include/xen/arch-arm.h include/xen/arch-arm/hvm/save.h diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index 922d3ff60de..f2431281e7e 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-settings PORTVERSION= 4.12.0 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile index 824f4b0ff38..1d70e9cd127 100644 --- a/sysutils/xfce4-systemload-plugin/Makefile +++ b/sysutils/xfce4-systemload-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-systemload-plugin PORTVERSION= 1.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 diff --git a/textproc/Makefile b/textproc/Makefile index 5238d94da5a..7ec90ec49a9 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1428,6 +1428,7 @@ SUBDIR += rubygem-simplecov-html SUBDIR += rubygem-spreadsheet SUBDIR += rubygem-stamp + SUBDIR += rubygem-string-scrub SUBDIR += rubygem-syntax SUBDIR += rubygem-termcolor SUBDIR += rubygem-terminal-table diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile index ff66aaf7417..c71daadf77c 100644 --- a/textproc/apache-solr/Makefile +++ b/textproc/apache-solr/Makefile @@ -22,7 +22,6 @@ NO_ARCH= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" USE_JAVA= yes PORTEXAMPLES= * -LATEST_LINK= apache-solr USE_RC_SUBR= solr CPE_PRODUCT= solr diff --git a/textproc/cwtext/Makefile b/textproc/cwtext/Makefile index ea38ceb7ee8..3616bf42f94 100644 --- a/textproc/cwtext/Makefile +++ b/textproc/cwtext/Makefile @@ -6,19 +6,17 @@ PORTVERSION= 0.96 CATEGORIES= textproc hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} -MAINTAINER= db@FreeBSD.org +MAINTAINER= hamradio@FreeBSD.org COMMENT= Morse Code Generator +LICENSE= GPLv2 + USES= gmake python MAKEFILE= makefile ALL_TARGET= ALL -LICENSE= GPLv2 - -OPTIONS_DEFINE= DOCS - post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include diff --git a/textproc/cwtext/files/patch-pcm.c b/textproc/cwtext/files/patch-pcm.c index 310dda1dca4..00b5eb5574d 100644 --- a/textproc/cwtext/files/patch-pcm.c +++ b/textproc/cwtext/files/patch-pcm.c @@ -1,6 +1,6 @@ ---- pcm.c.orig 2011-06-30 18:51:13.000000000 -0400 -+++ pcm.c 2011-06-30 18:51:47.000000000 -0400 -@@ -60,7 +60,7 @@ +--- pcm.c.orig 2008-01-07 15:26:50 UTC ++++ pcm.c +@@ -60,7 +60,7 @@ int mStoSamples(int hVox, int time) { float samples; float fsr; diff --git a/textproc/cwtext/pkg-plist b/textproc/cwtext/pkg-plist index 591a577a5b2..029226bbb75 100644 --- a/textproc/cwtext/pkg-plist +++ b/textproc/cwtext/pkg-plist @@ -1,4 +1,4 @@ bin/cwmm bin/cwpcm bin/cwtext -%%PORTDOCS%%%%DOCSDIR%%/README +%%DOCSDIR%%/README diff --git a/textproc/elasticsearch-plugin-sql/Makefile b/textproc/elasticsearch-plugin-sql/Makefile index 57838f95b7d..faed24d6688 100644 --- a/textproc/elasticsearch-plugin-sql/Makefile +++ b/textproc/elasticsearch-plugin-sql/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sql -PORTVERSION= 1.3.4 +PORTVERSION= 1.3.5 CATEGORIES= textproc MASTER_SITES= http://github.com/NLPchina/elasticsearch-sql/releases/download/${PORTVERSION}/ PKGNAMEPREFIX= elasticsearch-plugin- @@ -15,8 +15,8 @@ LICENSE= APACHE20 RUN_DEPENDS= elasticsearch>=1.5.0:${PORTSDIR}/textproc/elasticsearch USES= zip - NO_BUILD= yes +PLIST_SUB+= VERSION="${PORTVERSION}" do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/sql diff --git a/textproc/elasticsearch-plugin-sql/distinfo b/textproc/elasticsearch-plugin-sql/distinfo index f027e510451..1d226540701 100644 --- a/textproc/elasticsearch-plugin-sql/distinfo +++ b/textproc/elasticsearch-plugin-sql/distinfo @@ -1,2 +1,2 @@ -SHA256 (elasticsearch-sql-1.3.4.zip) = 7587429e54de6d5204568995df4cecfaef66a6f443e4df71e46aa57c912c7a08 -SIZE (elasticsearch-sql-1.3.4.zip) = 1981110 +SHA256 (elasticsearch-sql-1.3.5.zip) = 30c1a59cf1365cbfe7293f55ee59bcd5272d21d5b1eab5a870fb7d1681ed5255 +SIZE (elasticsearch-sql-1.3.5.zip) = 1990753 diff --git a/textproc/elasticsearch-plugin-sql/pkg-plist b/textproc/elasticsearch-plugin-sql/pkg-plist index 170eeed5717..9d2066dde2d 100644 --- a/textproc/elasticsearch-plugin-sql/pkg-plist +++ b/textproc/elasticsearch-plugin-sql/pkg-plist @@ -415,4 +415,4 @@ lib/elasticsearch/plugins/sql/_site/vendor/jasmine-2.1.3/jasmine.js lib/elasticsearch/plugins/sql/_site/vendor/jasmine-2.1.3/jasmine_favicon.png lib/elasticsearch/plugins/sql/_site/vendor/jasmine-jquery/jasmine-jquery.js lib/elasticsearch/plugins/sql/_site/vendor/jquery/jquery-2.1.1.min.js -lib/elasticsearch/plugins/sql/elasticsearch-sql-1.3.4.jar +lib/elasticsearch/plugins/sql/elasticsearch-sql-%%VERSION%%.jar diff --git a/textproc/elixir-ex_doc/Makefile b/textproc/elixir-ex_doc/Makefile index 8033eb2e5bb..b379b0a47e5 100644 --- a/textproc/elixir-ex_doc/Makefile +++ b/textproc/elixir-ex_doc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ex_doc -PORTVERSION= 0.7.3 +PORTVERSION= 0.8.4 DISTVERSIONPREFIX= v CATEGORIES= textproc PKGNAMEPREFIX= elixir- diff --git a/textproc/elixir-ex_doc/distinfo b/textproc/elixir-ex_doc/distinfo index 4c8e6c19520..b18fef3c27e 100644 --- a/textproc/elixir-ex_doc/distinfo +++ b/textproc/elixir-ex_doc/distinfo @@ -1,2 +1,2 @@ -SHA256 (elixir-lang-ex_doc-v0.7.3_GH0.tar.gz) = 4593026621fa336a1b84ef248cbcb898d16da8f74f383bb38f10ddde5878893d -SIZE (elixir-lang-ex_doc-v0.7.3_GH0.tar.gz) = 73452 +SHA256 (elixir-lang-ex_doc-v0.8.4_GH0.tar.gz) = cafcfee9f8110cab994064ee06a6481d655e6e30f868d764289bf3c67fc290f9 +SIZE (elixir-lang-ex_doc-v0.8.4_GH0.tar.gz) = 352251 diff --git a/textproc/elixir-ex_doc/pkg-plist b/textproc/elixir-ex_doc/pkg-plist index caac7ce1075..ec39c66d080 100644 --- a/textproc/elixir-ex_doc/pkg-plist +++ b/textproc/elixir-ex_doc/pkg-plist @@ -20,21 +20,25 @@ lib/elixir/lib/ex_doc/lib/ex_doc/cli.ex lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html.ex lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/autolink.ex lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates.ex -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/css/elixir.css -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/css/full_list.css -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/css/style.css lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/detail_template.eex -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/index_template.eex -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/js/app.js -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/js/full_list.js -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/js/highlight.pack.js -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/js/jquery.js -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/list_item_template.eex -lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/list_template.eex +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/dist/app.css +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/dist/app.js +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/fonts/glyphicons-halflings-regular.eot +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/fonts/glyphicons-halflings-regular.svg +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/fonts/glyphicons-halflings-regular.ttf +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/fonts/glyphicons-halflings-regular.woff +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/fonts/glyphicons-halflings-regular.woff2 +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/footer_template.eex +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/head_template.eex lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/module_template.eex lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/overview_entry_template.eex lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/overview_template.eex lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/readme_template.eex +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/redirect_template.eex +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/sidebar_items_entry_template.eex +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/sidebar_items_keys_template.eex +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/sidebar_items_template.eex +lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/sidebar_template.eex lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/summary_template.eex lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/type_detail_template.eex lib/elixir/lib/ex_doc/lib/ex_doc/markdown.ex diff --git a/textproc/elixir-sweet_xml/Makefile b/textproc/elixir-sweet_xml/Makefile index 1e26f057e77..9e95a0236b6 100644 --- a/textproc/elixir-sweet_xml/Makefile +++ b/textproc/elixir-sweet_xml/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sweet_xml -PORTVERSION= 0.2.1 +PORTVERSION= 0.3.0 CATEGORIES= textproc PKGNAMEPREFIX= elixir- diff --git a/textproc/elixir-sweet_xml/distinfo b/textproc/elixir-sweet_xml/distinfo index 14c3c892153..06f0c0b184c 100644 --- a/textproc/elixir-sweet_xml/distinfo +++ b/textproc/elixir-sweet_xml/distinfo @@ -1,2 +1,2 @@ -SHA256 (gniquil-sweet_xml-0.2.1_GH0.tar.gz) = cec2c401bfe336d1151f3996f7d38b7afad527b7e1c6967f7dcbc40a668ad3f5 -SIZE (gniquil-sweet_xml-0.2.1_GH0.tar.gz) = 66589 +SHA256 (gniquil-sweet_xml-0.3.0_GH0.tar.gz) = 2cf57184936214c9f99da453eee6b0e6cac00f6deaf8537ae9f35d83686e145c +SIZE (gniquil-sweet_xml-0.3.0_GH0.tar.gz) = 67554 diff --git a/textproc/flip/Makefile b/textproc/flip/Makefile index 83f7f12cf1d..b7837500dcf 100644 --- a/textproc/flip/Makefile +++ b/textproc/flip/Makefile @@ -11,8 +11,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Convert text file line endings between Unix and DOS formats -NO_LATEST_LINK= yes - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} ALL_TARGET= bsd PLIST_FILES= bin/flip man/man1/flip.1.gz diff --git a/textproc/freexl/Makefile b/textproc/freexl/Makefile index c621a12fe32..a8e1b8ee019 100644 --- a/textproc/freexl/Makefile +++ b/textproc/freexl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freexl -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= textproc MASTER_SITES= http://www.gaia-gis.it/gaia-sins/freexl-sources/ diff --git a/textproc/freexl/distinfo b/textproc/freexl/distinfo index ab4bcbcd2d9..74d59dbcd54 100644 --- a/textproc/freexl/distinfo +++ b/textproc/freexl/distinfo @@ -1,2 +1,2 @@ -SHA256 (freexl-1.0.1.tar.gz) = df0127e1e23e9ac9a189c27880fb71207837e8cba93d21084356491c9934b89b -SIZE (freexl-1.0.1.tar.gz) = 933371 +SHA256 (freexl-1.0.2.tar.gz) = b39a4814a0f53f5e09a9192c41e3e51bd658843f770399023a963eb064f6409d +SIZE (freexl-1.0.2.tar.gz) = 939064 diff --git a/textproc/p5-CSS-Minifier-XS/Makefile b/textproc/p5-CSS-Minifier-XS/Makefile index b6b1a9a991f..fdfb93175d7 100644 --- a/textproc/p5-CSS-Minifier-XS/Makefile +++ b/textproc/p5-CSS-Minifier-XS/Makefile @@ -3,7 +3,7 @@ PORTNAME= CSS-Minifier-XS PORTVERSION= 0.09 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -21,4 +21,7 @@ TEST_DEPENDS= p5-CSS-Minifier>=0:${PORTSDIR}/textproc/p5-CSS-Minifier \ USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/CSS/Minifier/XS/XS.so + .include diff --git a/textproc/p5-JavaScript-Minifier-XS/Makefile b/textproc/p5-JavaScript-Minifier-XS/Makefile index df932f9ac16..7d23bfd54eb 100644 --- a/textproc/p5-JavaScript-Minifier-XS/Makefile +++ b/textproc/p5-JavaScript-Minifier-XS/Makefile @@ -3,6 +3,7 @@ PORTNAME= JavaScript-Minifier-XS PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= textproc www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,4 +21,7 @@ TEST_DEPENDS= p5-JavaScript-Minifier>=0:${PORTSDIR}/textproc/p5-JavaScript-Minif USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/JavaScript/Minifier/XS/XS.so + .include diff --git a/textproc/p5-Pod-Markdown/Makefile b/textproc/p5-Pod-Markdown/Makefile index 78f4580c0a7..fa27c6178fb 100644 --- a/textproc/p5-Pod-Markdown/Makefile +++ b/textproc/p5-Pod-Markdown/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Pod-Markdown -PORTVERSION= 2.002 +PORTVERSION= 3.000 CATEGORIES= textproc devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,6 +15,7 @@ LICENSE_COMB= dual TEST_DEPENDS= p5-Test-Difference>=0:${PORTSDIR}/devel/p5-Test-Differences +NO_ARCH= yes USES= perl5 USE_PERL5= configure diff --git a/textproc/p5-Pod-Markdown/distinfo b/textproc/p5-Pod-Markdown/distinfo index 9cbf8f9e80d..6d05029dcaf 100644 --- a/textproc/p5-Pod-Markdown/distinfo +++ b/textproc/p5-Pod-Markdown/distinfo @@ -1,2 +1,2 @@ -SHA256 (Pod-Markdown-2.002.tar.gz) = ef30a9bf2d356bb69d1a8bcf9de01723059e1d41879cab5aed09271dcbd50777 -SIZE (Pod-Markdown-2.002.tar.gz) = 43053 +SHA256 (Pod-Markdown-3.000.tar.gz) = 2972f5c8a93fce8bf422e900274530372ad6fcaef28b67bc4d982369494f46ee +SIZE (Pod-Markdown-3.000.tar.gz) = 54707 diff --git a/textproc/p5-Pod-Markdown/pkg-plist b/textproc/p5-Pod-Markdown/pkg-plist index 193fe1a0c69..438b96be63b 100644 --- a/textproc/p5-Pod-Markdown/pkg-plist +++ b/textproc/p5-Pod-Markdown/pkg-plist @@ -1,4 +1,6 @@ bin/pod2markdown %%SITE_PERL%%/Pod/Markdown.pm +%%SITE_PERL%%/Pod/Perldoc/ToMarkdown.pm %%PERL5_MAN3%%/Pod::Markdown.3.gz +%%PERL5_MAN3%%/Pod::Perldoc::ToMarkdown.3.gz man/man1/pod2markdown.1.gz diff --git a/textproc/p5-Search-Odeum/Makefile b/textproc/p5-Search-Odeum/Makefile index a439ad9449b..9e0199a1f43 100644 --- a/textproc/p5-Search-Odeum/Makefile +++ b/textproc/p5-Search-Odeum/Makefile @@ -3,7 +3,7 @@ PORTNAME= Search-Odeum PORTVERSION= 0.02 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,4 +20,7 @@ CFLAGS+= -I${LOCALBASE}/include USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Search/Odeum/Odeum.so + .include diff --git a/textproc/p5-Text-Reflow/Makefile b/textproc/p5-Text-Reflow/Makefile index 80351b4385a..de43e759b23 100644 --- a/textproc/p5-Text-Reflow/Makefile +++ b/textproc/p5-Text-Reflow/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Text-Reflow -PORTVERSION= 1.10 +PORTVERSION= 1.11 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-Text-Reflow/distinfo b/textproc/p5-Text-Reflow/distinfo index 79c294c5661..fe20810d018 100644 --- a/textproc/p5-Text-Reflow/distinfo +++ b/textproc/p5-Text-Reflow/distinfo @@ -1,2 +1,2 @@ -SHA256 (Text-Reflow-1.10.tar.gz) = efbb9d6774355f3c7aa111ce59cd21a6e2da940e4b49f4955cc1fcb5075c959b -SIZE (Text-Reflow-1.10.tar.gz) = 16026 +SHA256 (Text-Reflow-1.11.tar.gz) = 27558e399546aa7f968c8412b6289030a5cab5e23cd3e59e1f417563e67bbec0 +SIZE (Text-Reflow-1.11.tar.gz) = 16120 diff --git a/textproc/p5-Text-Soundex/Makefile b/textproc/p5-Text-Soundex/Makefile index ec128884a15..84c729ca866 100644 --- a/textproc/p5-Text-Soundex/Makefile +++ b/textproc/p5-Text-Soundex/Makefile @@ -3,6 +3,7 @@ PORTNAME= Text-Soundex PORTVERSION= 3.04 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,4 +14,7 @@ COMMENT= Implementation of the soundex algorithm USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Text/Soundex/Soundex.so + .include diff --git a/textproc/p5-XML-Canonical/Makefile b/textproc/p5-XML-Canonical/Makefile index 35541c98b97..b355ef6d32c 100644 --- a/textproc/p5-XML-Canonical/Makefile +++ b/textproc/p5-XML-Canonical/Makefile @@ -3,7 +3,7 @@ PORTNAME= XML-Canonical PORTVERSION= 0.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -21,4 +21,10 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PERL5= configure USES= perl5 pkgconfig +post-patch: + @${REINPLACE_CMD} -e '/die "VERSION" unless /d' ${WRKSRC}/Makefile.PL + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/XML/Canonical/Canonical.so + .include diff --git a/textproc/p5-XML-Canonical/files/patch-Makefile.PL b/textproc/p5-XML-Canonical/files/patch-Makefile.PL deleted file mode 100644 index 7ed1cee3b0a..00000000000 --- a/textproc/p5-XML-Canonical/files/patch-Makefile.PL +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.PL.orig Sun Jul 15 16:00:28 2007 -+++ Makefile.PL Sun Jul 15 16:00:31 2007 -@@ -17,7 +17,6 @@ - print "running gdome-config... "; - my $ver = backtick('gdome-config --version'); - my ($major, $minor, $point) = $ver =~ /(\d+).(\d+)\.(\d+)/g; -- die "VERSION" unless $major == 0 && $minor == 7 && $point == 1; - $config{LIBS} ||= backtick('gdome-config --libs'); - $config{INC} ||= backtick('gdome-config --cflags'); - print "ok\n"; diff --git a/textproc/p5-XML-CanonicalizeXML/Makefile b/textproc/p5-XML-CanonicalizeXML/Makefile index 6ffe232464c..397a0ebcc83 100644 --- a/textproc/p5-XML-CanonicalizeXML/Makefile +++ b/textproc/p5-XML-CanonicalizeXML/Makefile @@ -3,7 +3,7 @@ PORTNAME= XML-CanonicalizeXML PORTVERSION= 0.03 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -21,4 +21,7 @@ USES= perl5 MAKE_JOBS_UNSAFE= yes +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/XML/CanonicalizeXML/CanonicalizeXML.so + .include diff --git a/textproc/p5-YAML-LibYAML/Makefile b/textproc/p5-YAML-LibYAML/Makefile index ac497f7cff3..c41a83e0065 100644 --- a/textproc/p5-YAML-LibYAML/Makefile +++ b/textproc/p5-YAML-LibYAML/Makefile @@ -3,6 +3,7 @@ PORTNAME= YAML-LibYAML PORTVERSION= 0.59 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,8 +14,7 @@ COMMENT= Perl YAML Serialization using XS and libyaml LICENSE= ART10 GPLv1 LICENSE_COMB= dual -BUILD_DEPENDS= p5-Filter>=0:${PORTSDIR}/devel/p5-Filter -RUN_DEPENDS:= ${BUILD_DEPENDS} +TEST_DEPENDS= p5-Filter>=0:${PORTSDIR}/devel/p5-Filter USES= perl5 USE_PERL5= configure diff --git a/textproc/par/Makefile b/textproc/par/Makefile index 24142b1d589..2c3c6cc6135 100644 --- a/textproc/par/Makefile +++ b/textproc/par/Makefile @@ -4,6 +4,7 @@ PORTNAME= par PORTVERSION= 1.52 PORTREVISION= 1 +PKGNAMESUFFIX= _format CATEGORIES= textproc MASTER_SITES= http://www.nicemice.net/par/ DISTNAME= Par${PORTVERSION:S|.||} diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile index 80f24022a2c..e3bd3c83664 100644 --- a/textproc/py-genshi/Makefile +++ b/textproc/py-genshi/Makefile @@ -15,7 +15,6 @@ COMMENT= Python toolkit for stream-based generation of output for the web LICENSE= BSD3CLAUSE OPTIONS_DEFINE= BABEL -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options BABEL_DESC= I18n support through the Babel plugin USES= python diff --git a/textproc/ruby-xmlscan/Makefile b/textproc/ruby-xmlscan/Makefile index 1b246363675..9942e041de6 100644 --- a/textproc/ruby-xmlscan/Makefile +++ b/textproc/ruby-xmlscan/Makefile @@ -11,7 +11,6 @@ DIST_SUBDIR= ruby MAINTAINER= ruby@FreeBSD.org COMMENT= High-performance non-validating XML parser written in 100% pure Ruby -NO_LATEST_LINK= yes USE_RUBY= yes NO_BUILD= yes diff --git a/textproc/rubygem-jekyll-gist/Makefile b/textproc/rubygem-jekyll-gist/Makefile index 9f253f3c87f..e4d30c29504 100644 --- a/textproc/rubygem-jekyll-gist/Makefile +++ b/textproc/rubygem-jekyll-gist/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jekyll-gist -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-jekyll-gist/distinfo b/textproc/rubygem-jekyll-gist/distinfo index 38ca0c1a5d9..c30ba8d9e2d 100644 --- a/textproc/rubygem-jekyll-gist/distinfo +++ b/textproc/rubygem-jekyll-gist/distinfo @@ -1,2 +1,2 @@ -SHA256 (rubygem/jekyll-gist-1.3.0.gem) = b81400ecd5a296cb37b70386ba93dcd0b6c756dfd605eebc07bdd6b9923954c7 -SIZE (rubygem/jekyll-gist-1.3.0.gem) = 9216 +SHA256 (rubygem/jekyll-gist-1.3.1.gem) = 0f622221966b0a655fd0ad4189db22e9397457dd5e6fd281ddad9842b8a03549 +SIZE (rubygem/jekyll-gist-1.3.1.gem) = 9216 diff --git a/textproc/rubygem-loofah/Makefile b/textproc/rubygem-loofah/Makefile index 9ca555d4abc..7e252a31fd4 100644 --- a/textproc/rubygem-loofah/Makefile +++ b/textproc/rubygem-loofah/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= loofah -PORTVERSION= 2.0.2 +PORTVERSION= 2.0.3 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -13,6 +13,7 @@ LICENSE= MIT RUN_DEPENDS= rubygem-nokogiri>=1.5.9:${PORTSDIR}/textproc/rubygem-nokogiri +NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes diff --git a/textproc/rubygem-loofah/distinfo b/textproc/rubygem-loofah/distinfo index 9a2dad16fbb..5df6081169f 100644 --- a/textproc/rubygem-loofah/distinfo +++ b/textproc/rubygem-loofah/distinfo @@ -1,2 +1,2 @@ -SHA256 (rubygem/loofah-2.0.2.gem) = 1ab5fb9a1dca7b955e75d582f57d236de46430ab5c5b5a33987c04d3ec93ccc7 -SIZE (rubygem/loofah-2.0.2.gem) = 59392 +SHA256 (rubygem/loofah-2.0.3.gem) = 48c76e74f25229e0f492c2aaf770253fe44b162a0d18c2de1c59831b44d13781 +SIZE (rubygem/loofah-2.0.3.gem) = 60416 diff --git a/textproc/rubygem-string-scrub/Makefile b/textproc/rubygem-string-scrub/Makefile new file mode 100644 index 00000000000..a493e26ef23 --- /dev/null +++ b/textproc/rubygem-string-scrub/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= string-scrub +PORTVERSION= 0.0.5 +CATEGORIES= textproc rubygems +MASTER_SITES= RG + +MAINTAINER= kuriyama@FreeBSD.org +COMMENT= String\#scrub for Ruby 2.0.0 and 1.9.3 + +LICENSE= MIT + +NO_ARCH= yes + +USE_RUBY= yes +USE_RUBYGEMS= yes +RUBYGEM_AUTOPLIST= yes + +.include + +.if ${RUBY_VER} >= 2.1 +BROKEN= Needed for Ruby 1.9.x/2.0.x only +.endif + +.include diff --git a/textproc/rubygem-string-scrub/distinfo b/textproc/rubygem-string-scrub/distinfo new file mode 100644 index 00000000000..ab7fec48694 --- /dev/null +++ b/textproc/rubygem-string-scrub/distinfo @@ -0,0 +1,2 @@ +SHA256 (rubygem/string-scrub-0.0.5.gem) = 0f9d402148de9cb70b7d7b9a973ed40f4708ee581500573f46467c25fcc2c43b +SIZE (rubygem/string-scrub-0.0.5.gem) = 10240 diff --git a/textproc/rubygem-string-scrub/pkg-descr b/textproc/rubygem-string-scrub/pkg-descr new file mode 100644 index 00000000000..a59d4b54dfe --- /dev/null +++ b/textproc/rubygem-string-scrub/pkg-descr @@ -0,0 +1,3 @@ +String#scrub for Ruby 2.0.0 and 1.9.3. + +WWW: http://rubygems.org/gems/string-scrub/ diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile index 651e700a5d8..0700a4d158a 100644 --- a/textproc/sphinxsearch-devel/Makefile +++ b/textproc/sphinxsearch-devel/Makefile @@ -21,8 +21,6 @@ COMMENT= Sphinx Full-Text Search Engine LICENSE= GPLv2 -LATEST_LINK= sphinxsearch-devel - # If expat is present on the system and configure finds it, it will # unconditionally link the output binary against it. There's no way # of turning this off. So for consistency, make sure it's always on. diff --git a/www/Makefile b/www/Makefile index 63959d4a35b..202fcbed37a 100644 --- a/www/Makefile +++ b/www/Makefile @@ -571,6 +571,7 @@ SUBDIR += nspluginwrapper SUBDIR += ocaml-net SUBDIR += ocsigen + SUBDIR += offline-npm SUBDIR += ojs2 SUBDIR += ompload SUBDIR += opencart diff --git a/www/apache22-event-mpm/Makefile b/www/apache22-event-mpm/Makefile index f091cf4d636..0ccb8df31ae 100644 --- a/www/apache22-event-mpm/Makefile +++ b/www/apache22-event-mpm/Makefile @@ -6,7 +6,6 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= event -LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr PORT_OPTIONS+= CGID diff --git a/www/apache22-itk-mpm/Makefile b/www/apache22-itk-mpm/Makefile index eabd2c01ffa..baf840347f6 100644 --- a/www/apache22-itk-mpm/Makefile +++ b/www/apache22-itk-mpm/Makefile @@ -18,7 +18,6 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= itk -LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr MPM_ITK_VERSION?= 20110321-01 diff --git a/www/apache22-peruser-mpm/Makefile b/www/apache22-peruser-mpm/Makefile index 61ec2e00c4e..704fe5cd538 100644 --- a/www/apache22-peruser-mpm/Makefile +++ b/www/apache22-peruser-mpm/Makefile @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org WITH_MPM= peruser -LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch diff --git a/www/apache22-worker-mpm/Makefile b/www/apache22-worker-mpm/Makefile index 77792c19c23..05f5c773af7 100644 --- a/www/apache22-worker-mpm/Makefile +++ b/www/apache22-worker-mpm/Makefile @@ -6,7 +6,6 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= worker -LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr PORT_OPTIONS+= CGID diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules index 209956a263e..38c58ba3671 100644 --- a/www/apache22/Makefile.modules +++ b/www/apache22/Makefile.modules @@ -9,7 +9,7 @@ # Maintainer note for OPTION handling: # To set additional option use # PORT_OPTIONS+= -# To unset an OPTION, even the OPTION is set in OPTIONSFILE use +# To unset an OPTION, even the OPTION is set in OPTIONS_FILE use # WITHOUT_MODULES+= # Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected # if the OPTION is enabled by the user, therefore we calculate diff --git a/www/apache24/Makefile.modules b/www/apache24/Makefile.modules index d6a7484618a..051ffd6e4e3 100644 --- a/www/apache24/Makefile.modules +++ b/www/apache24/Makefile.modules @@ -9,7 +9,7 @@ # Maintainer note for OPTION handling: # To set additional option use # PORT_OPTIONS+= -# To unset an OPTION, even the OPTION is set in OPTIONSFILE use +# To unset an OPTION, even the OPTION is set in OPTIONS_FILE use # WITHOUT_MODULES+= # Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected # if the OPTION is enabled by the user, therefore we calculate diff --git a/www/arora/Makefile b/www/arora/Makefile index 0ed46596640..4f527a4708b 100644 --- a/www/arora/Makefile +++ b/www/arora/Makefile @@ -3,7 +3,7 @@ PORTNAME= arora PORTVERSION= 0.11.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= GOOGLE_CODE @@ -14,11 +14,11 @@ LICENSE= GPLv3 USES= desktop-file-utils qmake USE_QT4= network webkit moc_build uic_build rcc_build \ - imageformats_run gui script sql + sql-sqlite3_run imageformats_run gui script sql OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -NLS_USE= QT4=linguist_build +NLS_USE= QT4=linguisttools_build BROKEN_ia64= core dump on application startup diff --git a/www/autoindex2/Makefile b/www/autoindex2/Makefile index 01295171945..bf49a61e3fc 100644 --- a/www/autoindex2/Makefile +++ b/www/autoindex2/Makefile @@ -16,7 +16,6 @@ USES= dos2unix USE_PHP= session DEFAULT_VERSIONS+= php=5 CONFLICTS= AutoIndex-1* -LATEST_LINK= AutoIndex2 NO_BUILD= yes INSTALLDIR?= ${WWWDIR} diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index cd1e22265c8..86072257145 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -19,7 +19,6 @@ MAKE_ENV= JAVA_HOME=${JAVA_HOME} WRKSRC= ${WRKDIR}/${PDISTNAME} APP_NAME?= ${PORTNAME} APP_HOME?= ${PREFIX}/${APP_NAME} -LATEST_LINK= ${APP_NAME} PLIST= ${WRKDIR}/pkg-plist PDISTNAME= ${PORTNAME}-${PORTVERSION} PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile index e7dc9b9dc49..9d35fe69894 100644 --- a/www/dillo2/Makefile +++ b/www/dillo2/Makefile @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/libexec CONFLICTS= dillo-i18n-[0-9]* \ dillo-0* -LATEST_LINK= dillo2 OPTIONS_DEFINE= COOKIES HYPHENATION IPV6 SSL THREADS DOCS OPTIONS_DEFAULT= COOKIES HYPHENATION IPV6 SSL THREADS diff --git a/www/elixir-httpoison/Makefile b/www/elixir-httpoison/Makefile index 774ac2493be..d3b7af59b25 100644 --- a/www/elixir-httpoison/Makefile +++ b/www/elixir-httpoison/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= httpoison -PORTVERSION= 0.7.1 +PORTVERSION= 0.7.2 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= elixir- diff --git a/www/elixir-httpoison/distinfo b/www/elixir-httpoison/distinfo index 0916af935ef..e16b83c2bc8 100644 --- a/www/elixir-httpoison/distinfo +++ b/www/elixir-httpoison/distinfo @@ -1,2 +1,2 @@ -SHA256 (edgurgel-httpoison-v0.7.1_GH0.tar.gz) = 6f5335a9d0f4dec8ff62a3ed3cbb71b10e81398596eac8a735031ffaf2605413 -SIZE (edgurgel-httpoison-v0.7.1_GH0.tar.gz) = 13338 +SHA256 (edgurgel-httpoison-v0.7.2_GH0.tar.gz) = ffb264c68435ac24564b06febe6030936043194ac061dc16b2074b7ce6e8671d +SIZE (edgurgel-httpoison-v0.7.2_GH0.tar.gz) = 13641 diff --git a/www/elixir-maru/Makefile b/www/elixir-maru/Makefile index d1ef82b5914..899f821829e 100644 --- a/www/elixir-maru/Makefile +++ b/www/elixir-maru/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= maru -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.1 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= elixir- diff --git a/www/elixir-maru/distinfo b/www/elixir-maru/distinfo index 089323da224..6ec8c7390d5 100644 --- a/www/elixir-maru/distinfo +++ b/www/elixir-maru/distinfo @@ -1,2 +1,2 @@ -SHA256 (falood-maru-v0.5.0_GH0.tar.gz) = 9a8446154b79556ad389c056cc7ff528283e1f4faefaac0c625829c2ae82cb32 -SIZE (falood-maru-v0.5.0_GH0.tar.gz) = 15314 +SHA256 (falood-maru-v0.5.1_GH0.tar.gz) = 641e175bc939a47f29848373be55635d0d770762597caf99773b805e0076dc21 +SIZE (falood-maru-v0.5.1_GH0.tar.gz) = 16109 diff --git a/www/elixir-maru/pkg-plist b/www/elixir-maru/pkg-plist index d846243d174..724557a9ed8 100644 --- a/www/elixir-maru/pkg-plist +++ b/www/elixir-maru/pkg-plist @@ -22,6 +22,7 @@ lib/elixir/lib/maru/ebin/Elixir.Maru.ParamType.Map.beam lib/elixir/lib/maru/ebin/Elixir.Maru.ParamType.String.beam lib/elixir/lib/maru/ebin/Elixir.Maru.ParamType.Term.beam lib/elixir/lib/maru/ebin/Elixir.Maru.ParamType.beam +lib/elixir/lib/maru/ebin/Elixir.Maru.Plugs.Extend.beam lib/elixir/lib/maru/ebin/Elixir.Maru.Plugs.Forword.beam lib/elixir/lib/maru/ebin/Elixir.Maru.Plugs.NotFound.beam lib/elixir/lib/maru/ebin/Elixir.Maru.Plugs.Prepare.beam @@ -60,6 +61,7 @@ lib/elixir/lib/maru/lib/maru/helpers/params.ex lib/elixir/lib/maru/lib/maru/helpers/response.ex lib/elixir/lib/maru/lib/maru/middleware.ex lib/elixir/lib/maru/lib/maru/paramtype.ex +lib/elixir/lib/maru/lib/maru/plugs/extend.ex lib/elixir/lib/maru/lib/maru/plugs/forword.ex lib/elixir/lib/maru/lib/maru/plugs/notfound.ex lib/elixir/lib/maru/lib/maru/plugs/prepare.ex diff --git a/www/elixir-phoenix/Makefile b/www/elixir-phoenix/Makefile index 7ea5494b7c8..07819933f69 100644 --- a/www/elixir-phoenix/Makefile +++ b/www/elixir-phoenix/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= phoenix -PORTVERSION= 0.15.0 +PORTVERSION= 0.16.1 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= elixir- diff --git a/www/elixir-phoenix/distinfo b/www/elixir-phoenix/distinfo index 64ca077e825..2e60f1488af 100644 --- a/www/elixir-phoenix/distinfo +++ b/www/elixir-phoenix/distinfo @@ -1,2 +1,2 @@ -SHA256 (phoenixframework-phoenix-v0.15.0_GH0.tar.gz) = 5bf934cb725349e2f3662fc5bc4e8bf14d4a851ede105c102af620b7fb80c4ef -SIZE (phoenixframework-phoenix-v0.15.0_GH0.tar.gz) = 196000 +SHA256 (phoenixframework-phoenix-v0.16.1_GH0.tar.gz) = 161954e18b97c4d0f958dcbc85762d2156378ef2d22a7d7eafbcdcfe280a378c +SIZE (phoenixframework-phoenix-v0.16.1_GH0.tar.gz) = 199681 diff --git a/www/elixir-phoenix/pkg-plist b/www/elixir-phoenix/pkg-plist index 0a8c17de57a..e1d103a2e2e 100644 --- a/www/elixir-phoenix/pkg-plist +++ b/www/elixir-phoenix/pkg-plist @@ -5,11 +5,11 @@ lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Channel.beam lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Html.beam lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Json.beam lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Model.beam +lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Gen.Secret.beam lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.New.beam lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Routes.beam lib/elixir/lib/phoenix/ebin/Elixir.Mix.Tasks.Phoenix.Server.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Channel.Server.beam -lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Channel.Transport.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Channel.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.ChannelTest.NoopSerializer.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.ChannelTest.beam @@ -24,7 +24,7 @@ lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Controller.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Digester.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.Adapter.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.CowboyHandler.beam -lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.CowboyWebsocket.beam +lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.CowboyWebSocket.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.RenderErrors.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.Server.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Endpoint.Watcher.beam @@ -50,11 +50,10 @@ lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.Route.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.Scope.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Router.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Broadcast.beam -lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Helpers.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.InvalidMessageError.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Message.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Reply.beam -lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Router.beam +lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.Transport.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Socket.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Supervisor.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.EExEngine.beam @@ -63,6 +62,7 @@ lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.ExsEngine.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.HTML.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.UndefinedError.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Template.beam +lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Token.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPoll.Server.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPoll.Supervisor.beam lib/elixir/lib/phoenix/ebin/Elixir.Phoenix.Transports.LongPoll.beam @@ -111,6 +111,7 @@ lib/elixir/lib/phoenix/installer/templates/static/brunch/.gitignore lib/elixir/lib/phoenix/installer/templates/static/brunch/app.js lib/elixir/lib/phoenix/installer/templates/static/brunch/brunch-config.js lib/elixir/lib/phoenix/installer/templates/static/brunch/package.json +lib/elixir/lib/phoenix/installer/templates/static/brunch/socket.js lib/elixir/lib/phoenix/installer/templates/static/robots.txt lib/elixir/lib/phoenix/lib/mix/phoenix.ex lib/elixir/lib/phoenix/lib/mix/tasks/compile.phoenix.ex @@ -119,12 +120,12 @@ lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.channel.ex lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.html.ex lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.json.ex lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.model.ex +lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.gen.secret.ex lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.routes.ex lib/elixir/lib/phoenix/lib/mix/tasks/phoenix.server.ex lib/elixir/lib/phoenix/lib/phoenix.ex lib/elixir/lib/phoenix/lib/phoenix/channel.ex lib/elixir/lib/phoenix/lib/phoenix/channel/server.ex -lib/elixir/lib/phoenix/lib/phoenix/channel/transport.ex lib/elixir/lib/phoenix/lib/phoenix/code_reloader.ex lib/elixir/lib/phoenix/lib/phoenix/code_reloader/proxy.ex lib/elixir/lib/phoenix/lib/phoenix/code_reloader/server.ex @@ -154,8 +155,8 @@ lib/elixir/lib/phoenix/lib/phoenix/router/resource.ex lib/elixir/lib/phoenix/lib/phoenix/router/route.ex lib/elixir/lib/phoenix/lib/phoenix/router/scope.ex lib/elixir/lib/phoenix/lib/phoenix/socket.ex -lib/elixir/lib/phoenix/lib/phoenix/socket/helpers.ex -lib/elixir/lib/phoenix/lib/phoenix/socket/router.ex +lib/elixir/lib/phoenix/lib/phoenix/socket/message.ex +lib/elixir/lib/phoenix/lib/phoenix/socket/transport.ex lib/elixir/lib/phoenix/lib/phoenix/supervisor.ex lib/elixir/lib/phoenix/lib/phoenix/template.ex lib/elixir/lib/phoenix/lib/phoenix/template/eex_engine.ex @@ -164,9 +165,10 @@ lib/elixir/lib/phoenix/lib/phoenix/template/exs_engine.ex lib/elixir/lib/phoenix/lib/phoenix/template/html.ex lib/elixir/lib/phoenix/lib/phoenix/test/channel_test.ex lib/elixir/lib/phoenix/lib/phoenix/test/conn_test.ex +lib/elixir/lib/phoenix/lib/phoenix/token.ex lib/elixir/lib/phoenix/lib/phoenix/transports/long_poll.ex -lib/elixir/lib/phoenix/lib/phoenix/transports/long_poll/server.ex lib/elixir/lib/phoenix/lib/phoenix/transports/long_poll_serializer.ex +lib/elixir/lib/phoenix/lib/phoenix/transports/long_poll_server.ex lib/elixir/lib/phoenix/lib/phoenix/transports/serializer.ex lib/elixir/lib/phoenix/lib/phoenix/transports/websocket.ex lib/elixir/lib/phoenix/lib/phoenix/transports/websocket_serializer.ex @@ -174,21 +176,21 @@ lib/elixir/lib/phoenix/lib/phoenix/view.ex lib/elixir/lib/phoenix/priv/static/favicon.ico lib/elixir/lib/phoenix/priv/static/phoenix.js lib/elixir/lib/phoenix/priv/static/phoenix.png -lib/elixir/lib/phoenix/priv/templates/channel/channel.ex -lib/elixir/lib/phoenix/priv/templates/channel/channel_test.exs -lib/elixir/lib/phoenix/priv/templates/html/controller.ex -lib/elixir/lib/phoenix/priv/templates/html/controller_test.exs -lib/elixir/lib/phoenix/priv/templates/html/edit.html.eex -lib/elixir/lib/phoenix/priv/templates/html/form.html.eex -lib/elixir/lib/phoenix/priv/templates/html/index.html.eex -lib/elixir/lib/phoenix/priv/templates/html/new.html.eex -lib/elixir/lib/phoenix/priv/templates/html/show.html.eex -lib/elixir/lib/phoenix/priv/templates/html/view.ex -lib/elixir/lib/phoenix/priv/templates/json/changeset_view.ex -lib/elixir/lib/phoenix/priv/templates/json/controller.ex -lib/elixir/lib/phoenix/priv/templates/json/controller_test.exs -lib/elixir/lib/phoenix/priv/templates/json/view.ex -lib/elixir/lib/phoenix/priv/templates/model/migration.exs -lib/elixir/lib/phoenix/priv/templates/model/model.ex -lib/elixir/lib/phoenix/priv/templates/model/model_test.exs +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.channel/channel.ex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.channel/channel_test.exs +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.html/controller.ex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.html/controller_test.exs +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.html/edit.html.eex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.html/form.html.eex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.html/index.html.eex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.html/new.html.eex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.html/show.html.eex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.html/view.ex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.json/changeset_view.ex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.json/controller.ex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.json/controller_test.exs +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.json/view.ex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.model/migration.exs +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.model/model.ex +lib/elixir/lib/phoenix/priv/templates/phoenix.gen.model/model_test.exs %%PORTDOCS%%%%DOCSDIR%%/README.md diff --git a/www/elixir-phoenix_ecto/Makefile b/www/elixir-phoenix_ecto/Makefile index e106564a015..9560f36dcff 100644 --- a/www/elixir-phoenix_ecto/Makefile +++ b/www/elixir-phoenix_ecto/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= phoenix_ecto -PORTVERSION= 0.8.1 +PORTVERSION= 1.1.0 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= elixir- diff --git a/www/elixir-phoenix_ecto/distinfo b/www/elixir-phoenix_ecto/distinfo index 061cbaf74f5..bb6978b6c3a 100644 --- a/www/elixir-phoenix_ecto/distinfo +++ b/www/elixir-phoenix_ecto/distinfo @@ -1,2 +1,2 @@ -SHA256 (phoenixframework-phoenix_ecto-v0.8.1_GH0.tar.gz) = efd86912c347ce8867a46739f41cb14ac7a1cd30815b916eca1a892ec9a1c92c -SIZE (phoenixframework-phoenix_ecto-v0.8.1_GH0.tar.gz) = 7430 +SHA256 (phoenixframework-phoenix_ecto-v1.1.0_GH0.tar.gz) = 57e4aba1c6b5a721a94bcc8485b11615857b48a163932350d3ac3718cc9bc55a +SIZE (phoenixframework-phoenix_ecto-v1.1.0_GH0.tar.gz) = 8565 diff --git a/www/elixir-phoenix_html/Makefile b/www/elixir-phoenix_html/Makefile index 11d21fabb5c..f8ceac54bba 100644 --- a/www/elixir-phoenix_html/Makefile +++ b/www/elixir-phoenix_html/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= phoenix_html -PORTVERSION= 1.4.0 +PORTVERSION= 2.1.1 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= elixir- @@ -17,5 +17,6 @@ GH_ACCOUNT= phoenixframework MIX_BUILD_DEPS= devel/elixir-plug MIX_RUN_DEPS:= ${MIX_BUILD_DEPS} +MIX_REWRITE= yes .include diff --git a/www/elixir-phoenix_html/distinfo b/www/elixir-phoenix_html/distinfo index e0ac54417fe..082096db1e4 100644 --- a/www/elixir-phoenix_html/distinfo +++ b/www/elixir-phoenix_html/distinfo @@ -1,2 +1,2 @@ -SHA256 (phoenixframework-phoenix_html-v1.4.0_GH0.tar.gz) = 82158e2c8301a0eae3cfdfb1f765c8597770a029ce8bd064a8f015286a4a0143 -SIZE (phoenixframework-phoenix_html-v1.4.0_GH0.tar.gz) = 22356 +SHA256 (phoenixframework-phoenix_html-v2.1.1_GH0.tar.gz) = a1e1da9ee33ec1de54331ae56231b50797b4b085218769087c7b65467c9f523a +SIZE (phoenixframework-phoenix_html-v2.1.1_GH0.tar.gz) = 23964 diff --git a/www/elixir-phoenix_html/files/patch-mix.exs b/www/elixir-phoenix_html/files/patch-mix.exs deleted file mode 100644 index 6c578717d36..00000000000 --- a/www/elixir-phoenix_html/files/patch-mix.exs +++ /dev/null @@ -1,14 +0,0 @@ ---- mix.exs.orig 2015-07-02 15:30:23 UTC -+++ mix.exs -@@ -20,10 +20,6 @@ defmodule PhoenixHtml.Mixfile do - end - - defp deps do -- [{:plug, ">= 0.12.2 and < 2.0.0"}, -- -- # Docs dependencies -- {:earmark, "~> 0.1", only: :docs}, -- {:ex_doc, "~> 0.7.1", only: :docs}] -+ [] - end - end diff --git a/www/elixir-phoenix_html/pkg-plist b/www/elixir-phoenix_html/pkg-plist index 2711a6b8e9c..66e13b1dfd7 100644 --- a/www/elixir-phoenix_html/pkg-plist +++ b/www/elixir-phoenix_html/pkg-plist @@ -20,4 +20,5 @@ lib/elixir/lib/phoenix_html/lib/phoenix_html/form_data.ex lib/elixir/lib/phoenix_html/lib/phoenix_html/link.ex lib/elixir/lib/phoenix_html/lib/phoenix_html/safe.ex lib/elixir/lib/phoenix_html/lib/phoenix_html/tag.ex +lib/elixir/lib/phoenix_html/priv/static/phoenix_html.js %%PORTDOCS%%%%DOCSDIR%%/README.md diff --git a/www/erlang-cowboy/Makefile b/www/erlang-cowboy/Makefile index 84277ce69ec..0c1dc4b37e2 100644 --- a/www/erlang-cowboy/Makefile +++ b/www/erlang-cowboy/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cowboy -PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTVERSION= 1.0.3 CATEGORIES= www PKGNAMEPREFIX= erlang- diff --git a/www/erlang-cowboy/distinfo b/www/erlang-cowboy/distinfo index 2074b579805..24f235a3239 100644 --- a/www/erlang-cowboy/distinfo +++ b/www/erlang-cowboy/distinfo @@ -1,2 +1,2 @@ -SHA256 (ninenines-cowboy-1.0.2_GH0.tar.gz) = b6f88bf8e0f01edd5d811b43b9e3066f6b9bc4732e6e6033d6771f3a9c2bf51d -SIZE (ninenines-cowboy-1.0.2_GH0.tar.gz) = 4826037 +SHA256 (ninenines-cowboy-1.0.3_GH0.tar.gz) = 47a7fb28bab75eba280e54a8228fc650d069e4d1d80597ed56a86f9d35589b98 +SIZE (ninenines-cowboy-1.0.3_GH0.tar.gz) = 4827824 diff --git a/www/erlang-cowboy/files/patch-rebar.config b/www/erlang-cowboy/files/patch-rebar.config index 587d92fe95f..5a51a736ed8 100644 --- a/www/erlang-cowboy/files/patch-rebar.config +++ b/www/erlang-cowboy/files/patch-rebar.config @@ -1,7 +1,7 @@ ---- rebar.config.orig 2015-07-06 19:34:28 UTC +--- rebar.config.orig 2015-08-18 14:42:22 UTC +++ rebar.config @@ -1,4 +1,2 @@ {deps, [ -- {cowlib, ".*", {git, "git://github.com/ninenines/cowlib.git", "1.0.0"}}, -- {ranch, ".*", {git, "git://github.com/ninenines/ranch.git", "1.0.0"}} +- {cowlib, ".*", {git, "https://github.com/ninenines/cowlib.git", "1.0.0"}}, +- {ranch, ".*", {git, "https://github.com/ninenines/ranch.git", "1.0.0"}} ]}. diff --git a/www/erlang-hackney/Makefile b/www/erlang-hackney/Makefile index a0a950f5b6a..14f366acad1 100644 --- a/www/erlang-hackney/Makefile +++ b/www/erlang-hackney/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hackney -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 CATEGORIES= www PKGNAMEPREFIX= erlang- diff --git a/www/erlang-hackney/distinfo b/www/erlang-hackney/distinfo index f8a5e25bf57..31d7107c6ca 100644 --- a/www/erlang-hackney/distinfo +++ b/www/erlang-hackney/distinfo @@ -1,2 +1,2 @@ -SHA256 (benoitc-hackney-1.3.0_GH0.tar.gz) = 79d0439ac2e05718d9da8fde33b64cd664db5ba6817547da55f73dd773c4492a -SIZE (benoitc-hackney-1.3.0_GH0.tar.gz) = 772468 +SHA256 (benoitc-hackney-1.3.1_GH0.tar.gz) = cb5d822fdec3c26580908e7651cd2e7acabbc54b0f39fcfa1ce8af59ffac7956 +SIZE (benoitc-hackney-1.3.1_GH0.tar.gz) = 932790 diff --git a/www/erlang-ibrowse/Makefile b/www/erlang-ibrowse/Makefile index 6defb103e5a..05d0ef1cb8f 100644 --- a/www/erlang-ibrowse/Makefile +++ b/www/erlang-ibrowse/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= ibrowse -PORTVERSION= 4.1.1 +PORTVERSION= 4.1.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= erlang- diff --git a/www/erlang-ibrowse/distinfo b/www/erlang-ibrowse/distinfo index 3b489743413..e67e9004b79 100644 --- a/www/erlang-ibrowse/distinfo +++ b/www/erlang-ibrowse/distinfo @@ -1,2 +1,2 @@ -SHA256 (cmullaparthi-ibrowse-v4.1.1_GH0.tar.gz) = d54a89275ee1d58192ec1b41e88bf17a92ad7825b9231a283d55c8d0ae542574 -SIZE (cmullaparthi-ibrowse-v4.1.1_GH0.tar.gz) = 145295 +SHA256 (cmullaparthi-ibrowse-v4.1.2_GH0.tar.gz) = 16dbc4ad8386f374a7b0a46d7e22c1939994d636440bb34e65bc496254830100 +SIZE (cmullaparthi-ibrowse-v4.1.2_GH0.tar.gz) = 146415 diff --git a/www/fpc-fastcgi/Makefile b/www/fpc-fastcgi/Makefile index b9cc178c734..938fb759c7a 100644 --- a/www/fpc-fastcgi/Makefile +++ b/www/fpc-fastcgi/Makefile @@ -1,14 +1,14 @@ # Created by: Christopher Key # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www lang PKGNAMESUFFIX= -fastcgi MAINTAINER= freebsd-fpc@FreeBSD.org COMMENT= Free Pascal fastcgi unit -USE_FPC= fpmkunit +USE_FPC= fcl-process fpmkunit hash paszlib MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/www/free-sa-devel/Makefile b/www/free-sa-devel/Makefile index 23aa839372d..9bb34d7d480 100644 --- a/www/free-sa-devel/Makefile +++ b/www/free-sa-devel/Makefile @@ -14,7 +14,6 @@ COMMENT= Statistic analyzer for daemons log files similar to SARG LICENSE= GPLv3 CONFLICTS= free-sa-[0-9]* -LATEST_LINK= free-sa-devel WWWDIR?= ${PREFIX}/www/${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} diff --git a/www/gaeutilities/Makefile b/www/gaeutilities/Makefile index 5788bf528bb..ff720ac4623 100644 --- a/www/gaeutilities/Makefile +++ b/www/gaeutilities/Makefile @@ -17,7 +17,6 @@ USES= python:2 # same as www/google-appengine WRKSRC= ${WRKDIR}/joerussbowman-gaeutilities-ea3f7e1 -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS do-build: diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile index 5404117b5a9..600bb3dece3 100644 --- a/www/geronimo/Makefile +++ b/www/geronimo/Makefile @@ -50,7 +50,6 @@ PID_FILE= /var/run/${APP_SHORTNAME}.pid WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work WRKSRC= ${WRKDIR}/${DISTNAME:S/-bin//} JAR_FILE= bin/server.jar -LATEST_LINK= ${APP_SHORTNAME} PLIST_FILES= "@(${GERONIMO_USER},${GERONIMO_GROUP},) ${GERONIMO_OUT:S,^${PREFIX}/,,}" SUB_LIST= GERONIMO_HOME=${APP_HOME} \ diff --git a/www/h2o/Makefile b/www/h2o/Makefile index 77e5a47b6a7..2b65617148d 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= h2o -PORTVERSION= 1.4.2 +PORTVERSION= 1.4.3 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/h2o/distinfo b/www/h2o/distinfo index 1bef3f92adf..73495d09507 100644 --- a/www/h2o/distinfo +++ b/www/h2o/distinfo @@ -1,2 +1,2 @@ -SHA256 (h2o-h2o-v1.4.2_GH0.tar.gz) = 3024e6a8b704d119570551db2cbca701cb6c2fa7126336239044674ee02ea09c -SIZE (h2o-h2o-v1.4.2_GH0.tar.gz) = 4632490 +SHA256 (h2o-h2o-v1.4.3_GH0.tar.gz) = b41cdbadd2a345bc4a91295fd6faf39923c83beb00ad795f87fde69e2ba66f43 +SIZE (h2o-h2o-v1.4.3_GH0.tar.gz) = 4736127 diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile index 6950c22a546..ae2cf8c26bb 100644 --- a/www/linux-opera/Makefile +++ b/www/linux-opera/Makefile @@ -31,8 +31,8 @@ NO_BUILD= yes OPERA_VER?= 12.16 OPERA_BUILD?= 1860 -DATADIR= ${PREFIX}/share/${UNIQUENAME} -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DATADIR= ${PREFIX}/share/${PKGBASE} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} RENAME= opera lib/opera \ share/applications/opera-browser.desktop \ @@ -44,63 +44,63 @@ post-extract: @${MV} ${WRKSRC}/share/man ${WRKSRC}/man @for _r in ${RENAME}; do \ linux=`${ECHO_CMD} $${_r} | \ - ${SED} -e 's|opera|${UNIQUENAME}|g'`; \ + ${SED} -e 's|opera|${PKGBASE}|g'`; \ ${MV} ${WRKSRC}/$${_r} ${WRKSRC}/$${linux}; \ done; \ for _f in `find ${WRKSRC}/share/icons -type f | \ ${SED} -e 's|${WRKSRC}/||g'`; do \ linux=`${ECHO_CMD} $${_f} | \ - ${SED} -e 's|opera|${UNIQUENAME}|g'`; \ + ${SED} -e 's|opera|${PKGBASE}|g'`; \ ${MV} ${WRKSRC}/$${_f} ${WRKSRC}/$${linux}; \ done; \ for _l in `find ${WRKSRC}/share/icons -name opera-widget.png | \ ${SED} -e 's|/opera-widget\.png||g'`; do \ ${RM} $${_l}/opera-widget.png; \ cd $${_l}; \ - ${LN} -s ../mimetypes/${UNIQUENAME}-widget.png \ - $${_l}/${UNIQUENAME}-widget.png; \ + ${LN} -s ../mimetypes/${PKGBASE}-widget.png \ + $${_l}/${PKGBASE}-widget.png; \ done post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%LINUXBASE%%|${LINUXBASE}|g' \ - ${WRKSRC}/share/${UNIQUENAME}/defaults/pluginpath.ini - @${REINPLACE_CMD} -e '/man1/s|opera|${UNIQUENAME}|g ; \ + ${WRKSRC}/share/${PKGBASE}/defaults/pluginpath.ini + @${REINPLACE_CMD} -e '/man1/s|opera|${PKGBASE}|g ; \ /man1/s|1.gz|1|g ; /man1/s|share/||g ; \ - s|bin/opera|bin/${UNIQUENAME}|g ; \ + s|bin/opera|bin/${PKGBASE}|g ; \ s|name=$$(uname -s)|name=Linux|g ; \ - s|lib/opera|lib/${UNIQUENAME}|g ; \ - s|applications/opera|applications/${UNIQUENAME}|g ; \ - s|doc/opera|doc/${UNIQUENAME}|g ; \ - /hicolor/s|/opera|/${UNIQUENAME}|g ; \ - s|packages/opera|packages/${UNIQUENAME}|g ; \ - s|share/opera|share/${UNIQUENAME}|g ; \ + s|lib/opera|lib/${PKGBASE}|g ; \ + s|applications/opera|applications/${PKGBASE}|g ; \ + s|doc/opera|doc/${PKGBASE}|g ; \ + /hicolor/s|/opera|/${PKGBASE}|g ; \ + s|packages/opera|packages/${PKGBASE}|g ; \ + s|share/opera|share/${PKGBASE}|g ; \ s|PREFIX=/usr/local|PREFIX=${PREFIX}|g ; \ - /OPERA_PERSONALDIR/s|.opera|.${UNIQUENAME}|g ; \ - s|opera)|${UNIQUENAME})|g ; \ - s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \ + /OPERA_PERSONALDIR/s|.opera|.${PKGBASE}|g ; \ + s|opera)|${PKGBASE})|g ; \ + s|opera-widget-manager)|${PKGBASE}-widget-manager)|g ; \ s|^.*rmdir.*mime/packages.*||g ; \ s|^.*GX - bin/uninstall-opera@.*||g ; \ s|[$$]tempdir/damaged|${WRKSRC}/damaged|g ; \ s|PREFIX/bin/uninstall-opera|PREFIX/bin/disabled-opera|g' \ ${WRKSRC}/install @${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \ - /Exec/s|opera|${UNIQUENAME}|g ; \ - /Icon/s|opera|${UNIQUENAME}|g ; \ - /StartupWMClass/s|opera|${UNIQUENAME}|g ; \ + /Exec/s|opera|${PKGBASE}|g ; \ + /Icon/s|opera|${PKGBASE}|g ; \ + /StartupWMClass/s|opera|${PKGBASE}|g ; \ s|TryExec=.*||g ; /^$$/d' \ ${WRKSRC}/share/applications/*.desktop - @${REINPLACE_CMD} -e 's|lib/opera|lib/${UNIQUENAME}|g ; \ - s|doc/opera|doc/${UNIQUENAME}|g ; \ - s|share/opera|share/${UNIQUENAME}|g ; \ - s|opera-widget-manager|${UNIQUENAME}-widget-manager|g ; \ - s|opera (1)|${UNIQUENAME} (1)|g ; \ - s|\.opera@@|\.${UNIQUENAME}@@|g ; \ - s|B opera@@|B ${UNIQUENAME}@@|g ; \ - /standards-compliant/s|opera|${UNIQUENAME}|g' \ + @${REINPLACE_CMD} -e 's|lib/opera|lib/${PKGBASE}|g ; \ + s|doc/opera|doc/${PKGBASE}|g ; \ + s|share/opera|share/${PKGBASE}|g ; \ + s|opera-widget-manager|${PKGBASE}-widget-manager|g ; \ + s|opera (1)|${PKGBASE} (1)|g ; \ + s|\.opera@@|\.${PKGBASE}@@|g ; \ + s|B opera@@|B ${PKGBASE}@@|g ; \ + /standards-compliant/s|opera|${PKGBASE}|g' \ ${WRKSRC}/man/man1/*.1 - @${REINPLACE_CMD} -e '/ .if ${PORT_OPTIONS:MYOSHFUJI} diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile index 6470a4d6e03..ade86ef19e3 100644 --- a/www/mod_jk/Makefile +++ b/www/mod_jk/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mod_jk -PORTVERSION= 1.2.40 -PORTEPOCH?= 1 +PORTVERSION= 1.2.41 +PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= APACHE/tomcat/tomcat-connectors/jk/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo index 02dd3d793c2..0964f7f5403 100644 --- a/www/mod_jk/distinfo +++ b/www/mod_jk/distinfo @@ -1,2 +1,2 @@ -SHA256 (tomcat-connectors-1.2.40-src.tar.gz) = 895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d -SIZE (tomcat-connectors-1.2.40-src.tar.gz) = 1526449 +SHA256 (tomcat-connectors-1.2.41-src.tar.gz) = f193b02aeec71daab13fc5bbb99f13eca9d916b79a024f8035a65f39559bc7fd +SIZE (tomcat-connectors-1.2.41-src.tar.gz) = 1554935 diff --git a/www/mod_layout22/Makefile b/www/mod_layout22/Makefile index 7d86f83147a..8cb2bfd86e2 100644 --- a/www/mod_layout22/Makefile +++ b/www/mod_layout22/Makefile @@ -16,7 +16,6 @@ CONFLICTS= mod_layout-3.* mod_layout-4.* PORTSCOUT= limit:^5 USE_APACHE= 22 -LATEST_LINK= mod_layout22 MAKE_ARGS+= builddir=${WRKSRC} diff --git a/www/mod_macro22/Makefile b/www/mod_macro22/Makefile index cd0f197df34..96306788ebb 100644 --- a/www/mod_macro22/Makefile +++ b/www/mod_macro22/Makefile @@ -19,7 +19,6 @@ OPTIONS_DEFINE= DOCS .include USE_APACHE= 22 -LATEST_LINK= mod_macro22 AP_FAST_BUILD= yes AP_GENPLIST= yes PORTDOCS= ${PORTNAME}.html diff --git a/www/mod_myvhost/Makefile b/www/mod_myvhost/Makefile index 8b9a02da7de..f2418cd9cf0 100644 --- a/www/mod_myvhost/Makefile +++ b/www/mod_myvhost/Makefile @@ -15,7 +15,6 @@ LICENSE= APACHE20 MANUAL_PACKAGE_BUILD= needs apr and apache with DBD options enabled USE_APACHE= 22+ -UNIQUENAME= ${PORTNAME} PORTDOCS= changelog.html documentation.html download.html \ index.html my.css diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile index 6928266b346..c21c436d009 100644 --- a/www/mod_security/Makefile +++ b/www/mod_security/Makefile @@ -58,9 +58,6 @@ FUZZYHASH_LIB_DEPENDS= libfuzzy.so:${PORTSDIR}/security/ssdeep ETCDIR= ${PREFIX}/etc/modsecurity -# ap2x- prefix OPTIONSFILE fix -OPTIONSFILE= ${PORT_DBDIR}/www_mod_security/options - REINPLACE_ARGS= -i "" AP_EXTRAS+= -DWITH_LIBXML2 CONFIGURE_ARGS+=--with-apxs=${APXS} --with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} --with-curl=${LOCALBASE} diff --git a/www/nanoblogger/pkg-plist b/www/nanoblogger/pkg-plist index 7f7a6397f2e..fffc71c01b5 100644 --- a/www/nanoblogger/pkg-plist +++ b/www/nanoblogger/pkg-plist @@ -1,9 +1,5 @@ bin/nb @sample etc/nb.conf.sample -@dir share/nanoblogger/default/cache -@dir share/nanoblogger/default/plugins -@dir share/nanoblogger/plugins/entry/mod -@dir share/nanoblogger/plugins/page/mod %%DATADIR%%/default/articles/example.txt %%DATADIR%%/default/blog.conf %%DATADIR%%/default/data/cat_1.db @@ -87,3 +83,8 @@ bin/nb %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/copyright %%PORTDOCS%%%%DOCSDIR%%/html/nanoblogger.html +@dir %%DATADIR%%/plugins/page/mod +@dir %%DATADIR%%/plugins/entry/mod +@dir %%DATADIR%%/plugins/archive/category +@dir %%DATADIR%%/default/plugins +@dir %%DATADIR%%/default/cache diff --git a/www/offline-npm/Makefile b/www/offline-npm/Makefile new file mode 100644 index 00000000000..822c47f3c6e --- /dev/null +++ b/www/offline-npm/Makefile @@ -0,0 +1,30 @@ +# Created by: Carlos J Puga Medina +# $FreeBSD$ + +PORTNAME= offline-npm +PORTVERSION= 0.2.0 +DISTVERSIONPREFIX= v +CATEGORIES= www + +MAINTAINER= cpm@fbsd.es +COMMENT= Offline installation with npm install + +LICENSE= MIT + +BUILD_DEPENDS= npm>0:${PORTSDIR}/www/npm +RUN_DEPENDS= npm>0:${PORTSDIR}/www/npm + +USE_GITHUB= yes +GH_ACCOUNT= commenthol +GH_PROJECT= offline-npm + +NO_BUILD= yes + +do-install: + (cd ${STAGEDIR}${PREFIX}/lib && ${SETENV} \ + HOME=${WRKDIR} npm install ${WRKSRC}) + + # this is a dirty hack + ${LN} -s ${PREFIX}/lib/node_modules/.bin/offline-npm ${STAGEDIR}${PREFIX}/bin/offline-npm + +.include diff --git a/www/offline-npm/distinfo b/www/offline-npm/distinfo new file mode 100644 index 00000000000..b4ce3431d37 --- /dev/null +++ b/www/offline-npm/distinfo @@ -0,0 +1,2 @@ +SHA256 (commenthol-offline-npm-v0.2.0_GH0.tar.gz) = 250f1d3533f1a359292f69375db6e5ec21da325e0b5eeb68bb0413fc4cb25aa1 +SIZE (commenthol-offline-npm-v0.2.0_GH0.tar.gz) = 14182 diff --git a/www/offline-npm/pkg-descr b/www/offline-npm/pkg-descr new file mode 100644 index 00000000000..8b8aa687821 --- /dev/null +++ b/www/offline-npm/pkg-descr @@ -0,0 +1,10 @@ +Hassle-free npm pack including all dependencies for offline installation +with npm install + +Add offline-npm to your project to serve a npm compatible tgz file +which contains all dependencies for offline installation with npm install. + +Additionally you can use offline-npm -n to install packages from your +local npm cache directory (could be useful e.g. on travelling). + +WWW: https://github.com/commenthol/offline-npm diff --git a/www/offline-npm/pkg-plist b/www/offline-npm/pkg-plist new file mode 100644 index 00000000000..fb8728d0365 --- /dev/null +++ b/www/offline-npm/pkg-plist @@ -0,0 +1,12 @@ +bin/offline-npm +lib/node_modules/.bin/offline-npm +lib/node_modules/offline-npm/LICENSE +lib/node_modules/offline-npm/README.md +lib/node_modules/offline-npm/TUTORIAL.md +lib/node_modules/offline-npm/offline-npm.js +lib/node_modules/offline-npm/package.json +lib/node_modules/offline-npm/test/cli.mocha.js +lib/node_modules/offline-npm/test/mocha.opts +lib/node_modules/offline-npm/test/proxy.js +lib/node_modules/offline-npm/test/semver.mocha.js +lib/node_modules/offline-npm/test/test.sh diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile index fefc9ec0132..6cfc2c1cada 100644 --- a/www/p5-Apache-Clean2/Makefile +++ b/www/p5-Apache-Clean2/Makefile @@ -16,8 +16,6 @@ BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \ p5-HTML-Clean>=0.8:${PORTSDIR}/www/p5-HTML-Clean RUN_DEPENDS:= ${BUILD_DEPENDS} -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}2 - USES= perl5 USE_PERL5= configure USE_APACHE= 22+ diff --git a/www/p5-CGI-Cookie-Splitter/Makefile b/www/p5-CGI-Cookie-Splitter/Makefile index 1830a182899..d9bee40a3ab 100644 --- a/www/p5-CGI-Cookie-Splitter/Makefile +++ b/www/p5-CGI-Cookie-Splitter/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= CGI-Cookie-Splitter -PORTVERSION= 0.04 -PORTREVISION= 1 +PORTVERSION= 0.05 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,7 +13,8 @@ COMMENT= Split big cookies into smaller ones LICENSE= ART10 GPLv1 LICENSE_COMB= dual -BUILD_DEPENDS= p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple +BUILD_DEPENDS= p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple \ + p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 diff --git a/www/p5-CGI-Cookie-Splitter/distinfo b/www/p5-CGI-Cookie-Splitter/distinfo index a15f66ccbe9..d7ad3232dee 100644 --- a/www/p5-CGI-Cookie-Splitter/distinfo +++ b/www/p5-CGI-Cookie-Splitter/distinfo @@ -1,2 +1,2 @@ -SHA256 (CGI-Cookie-Splitter-0.04.tar.gz) = 61cfb8b11d4f651a10ba101eb8572d882851e6b47d867fbe63f3d486eb96ff8d -SIZE (CGI-Cookie-Splitter-0.04.tar.gz) = 23318 +SHA256 (CGI-Cookie-Splitter-0.05.tar.gz) = 6cd71a5215c160e981837729c5956a0a18c7efef7d6b26a1c5b92ef248cf469b +SIZE (CGI-Cookie-Splitter-0.05.tar.gz) = 26596 diff --git a/www/p5-CGI-XMLApplication/Makefile b/www/p5-CGI-XMLApplication/Makefile index a2a5c449e93..1be6cc82b14 100644 --- a/www/p5-CGI-XMLApplication/Makefile +++ b/www/p5-CGI-XMLApplication/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= CGI-XMLApplication -PORTVERSION= 1.1.4 +PORTVERSION= 1.1.5 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-CGI-XMLApplication/distinfo b/www/p5-CGI-XMLApplication/distinfo index a11e4e0797c..fc2a82ba63b 100644 --- a/www/p5-CGI-XMLApplication/distinfo +++ b/www/p5-CGI-XMLApplication/distinfo @@ -1,2 +1,2 @@ -SHA256 (CGI-XMLApplication-1.1.4.tar.gz) = c1db12f367bb5408027566a68501e974dbeb846bc13f4f53c0e4e38dd627b352 -SIZE (CGI-XMLApplication-1.1.4.tar.gz) = 22304 +SHA256 (CGI-XMLApplication-1.1.5.tar.gz) = d7a3ec738170a9fc46de595dc0ee82ae7ba7af06dc0ba85879205459cb9f6090 +SIZE (CGI-XMLApplication-1.1.5.tar.gz) = 22317 diff --git a/www/p5-Flickr-API/Makefile b/www/p5-Flickr-API/Makefile index 5a9edd9ddaa..f739fb26f7e 100644 --- a/www/p5-Flickr-API/Makefile +++ b/www/p5-Flickr-API/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Flickr-API -PORTVERSION= 1.17 +PORTVERSION= 1.18 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-Flickr-API/distinfo b/www/p5-Flickr-API/distinfo index d8aa49eebd8..c1aec2f1b7f 100644 --- a/www/p5-Flickr-API/distinfo +++ b/www/p5-Flickr-API/distinfo @@ -1,2 +1,2 @@ -SHA256 (Flickr-API-1.17.tar.gz) = 7e38bc83b351c64b63ab73d8f7801629a94a4c97d81bb1a5af002b2dbad852eb -SIZE (Flickr-API-1.17.tar.gz) = 27568 +SHA256 (Flickr-API-1.18.tar.gz) = 3dea27729b5f74b2aacc08946be0bf73e963937f08d2f6992230a41184c8bc70 +SIZE (Flickr-API-1.18.tar.gz) = 28984 diff --git a/www/p5-Flickr-API/pkg-plist b/www/p5-Flickr-API/pkg-plist index 32cf9be90da..80573515c8b 100644 --- a/www/p5-Flickr-API/pkg-plist +++ b/www/p5-Flickr-API/pkg-plist @@ -1,12 +1,18 @@ bin/flickr_dump_stored_config.pl bin/flickr_make_stored_config.pl %%SITE_PERL%%/Flickr/API.pm +%%SITE_PERL%%/Flickr/API/Cameras.pm +%%SITE_PERL%%/Flickr/API/People.pm %%SITE_PERL%%/Flickr/API/Reflection.pm %%SITE_PERL%%/Flickr/API/Request.pm %%SITE_PERL%%/Flickr/API/Response.pm +%%SITE_PERL%%/Flickr/Tools.pm %%PERL5_MAN3%%/Flickr::API.3.gz +%%PERL5_MAN3%%/Flickr::API::Cameras.3.gz +%%PERL5_MAN3%%/Flickr::API::People.3.gz %%PERL5_MAN3%%/Flickr::API::Reflection.3.gz %%PERL5_MAN3%%/Flickr::API::Request.3.gz %%PERL5_MAN3%%/Flickr::API::Response.3.gz +%%PERL5_MAN3%%/Flickr::Tools.3.gz man/man1/flickr_dump_stored_config.pl.1.gz man/man1/flickr_make_stored_config.pl.1.gz diff --git a/www/p5-Test-LWP-UserAgent/Makefile b/www/p5-Test-LWP-UserAgent/Makefile index a065ded8682..dc51c043889 100644 --- a/www/p5-Test-LWP-UserAgent/Makefile +++ b/www/p5-Test-LWP-UserAgent/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Test-LWP-UserAgent -PORTVERSION= 0.028 +PORTVERSION= 0.030 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-Test-LWP-UserAgent/distinfo b/www/p5-Test-LWP-UserAgent/distinfo index 10ee73e97b4..28ea4a5eec7 100644 --- a/www/p5-Test-LWP-UserAgent/distinfo +++ b/www/p5-Test-LWP-UserAgent/distinfo @@ -1,2 +1,2 @@ -SHA256 (Test-LWP-UserAgent-0.028.tar.gz) = 526f03863251f9a7b92e549f942c3c1b6ad0fd42e71bd3955fd321fa60293d0d -SIZE (Test-LWP-UserAgent-0.028.tar.gz) = 43956 +SHA256 (Test-LWP-UserAgent-0.030.tar.gz) = 2bdc18aaffba7c85528aa69d2be561e5ceb696cc087f262e048e5a780400b927 +SIZE (Test-LWP-UserAgent-0.030.tar.gz) = 45587 diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile index 87a8c628088..1d27970614a 100644 --- a/www/p5-WWW-Curl/Makefile +++ b/www/p5-WWW-Curl/Makefile @@ -3,7 +3,7 @@ PORTNAME= WWW-Curl PORTVERSION= 4.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ftp perl5 MASTER_SITES= CPAN \ http://curl.haxx.se/libcurl/perl/ @@ -22,4 +22,7 @@ TEST_DEPENDS= p5-Test-CPAN-Meta>=0:${PORTSDIR}/devel/p5-Test-CPAN-Meta \ USE_PERL5= configure USES= perl5 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/WWW/Curl/Curl.so + .include diff --git a/www/p5-Web-Query/Makefile b/www/p5-Web-Query/Makefile index 739f5d5d10a..59894ce5b34 100644 --- a/www/p5-Web-Query/Makefile +++ b/www/p5-Web-Query/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Web-Query -PORTVERSION= 0.26 -PORTREVISION= 1 +PORTVERSION= 0.28 CATEGORIES= www MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-Web-Query/distinfo b/www/p5-Web-Query/distinfo index c23a5b3f2e0..1371e59a627 100644 --- a/www/p5-Web-Query/distinfo +++ b/www/p5-Web-Query/distinfo @@ -1,2 +1,2 @@ -SHA256 (Web-Query-0.26.tar.gz) = d92476e31f4d6d79b912cc39e4cc365582771f1df22b6a2d6d2a24651522d628 -SIZE (Web-Query-0.26.tar.gz) = 22819 +SHA256 (Web-Query-0.28.tar.gz) = 38e6f577df74ad2bbe197a8c2956511fd9f48f190432f469e129307c3e851e27 +SIZE (Web-Query-0.28.tar.gz) = 24187 diff --git a/www/pear-HTTP_FloodControl/Makefile b/www/pear-HTTP_FloodControl/Makefile index e5142a200a1..3fae48adbf5 100644 --- a/www/pear-HTTP_FloodControl/Makefile +++ b/www/pear-HTTP_FloodControl/Makefile @@ -11,7 +11,6 @@ COMMENT= PEAR classes to detect and protect from attempts to flood a site BUILD_DEPENDS= ${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP RUN_DEPENDS= ${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP -LATEST_LINK= pear-HTTP_FloodControl DOCS= README LICENSE OPTIONS_DEFINE= PEAR_DB PEAR_MDB PEAR_MDB2 PEAR_DB_DESC= PEAR::DB support diff --git a/www/pelican/Makefile b/www/pelican/Makefile index b8a15d074fe..4b78cbc87fc 100644 --- a/www/pelican/Makefile +++ b/www/pelican/Makefile @@ -26,7 +26,6 @@ TEST_DEPENDS:= ${RUN_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \ OPTIONS_DEFINE= TEST -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options .include diff --git a/www/py-cssselect/Makefile b/www/py-cssselect/Makefile index eb0f372192e..f8185a8227c 100644 --- a/www/py-cssselect/Makefile +++ b/www/py-cssselect/Makefile @@ -14,7 +14,6 @@ COMMENT= Cssselect parses CSS3 Selectors and translates them to XPath 1.0 LICENSE= BSD3CLAUSE OPTIONS_DEFINE= DOCS -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USES= python USE_PYTHON= distutils autoplist diff --git a/www/py-cssutils/Makefile b/www/py-cssutils/Makefile index a394b92d66c..bbbee752ec6 100644 --- a/www/py-cssutils/Makefile +++ b/www/py-cssutils/Makefile @@ -15,7 +15,6 @@ COMMENT= CSS Cascading Style Sheets library for Python LICENSE= LGPL3 OPTIONS_DEFINE= EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USE_PYTHON= autoplist distutils USES= python zip diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile index d2232cae39a..b6f850dd8da 100644 --- a/www/py-django-cms/Makefile +++ b/www/py-django-cms/Makefile @@ -23,7 +23,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.7.3:${PORTSDIR}/databases/py-south USES= python:2 USE_PYTHON= autoplist distutils -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_MULTI= DATABASE OPTIONS_DEFAULT=SQLITE OPTIONS_MULTI_DATABASE=MYSQL PGSQL SQLITE diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile index 98ef62853af..93b25743be2 100644 --- a/www/py-django-photologue/Makefile +++ b/www/py-django-photologue/Makefile @@ -19,7 +19,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py- USES= python zip USE_PYTHON= autoplist distutils -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= TAGGING OPTIONS_DEFAULT= TAGGING diff --git a/www/py-python-digitalocean/Makefile b/www/py-python-digitalocean/Makefile index b4bcbdf6284..6c8d88ffec0 100644 --- a/www/py-python-digitalocean/Makefile +++ b/www/py-python-digitalocean/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= python-digitalocean -PORTVERSION= 1.3 +PORTVERSION= 1.6 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= skreuzer@exit2shell.com +MAINTAINER= skreuzer@FreeBSD.org COMMENT= API to manage digitalocean.com droplets LICENSE= GPLv3 diff --git a/www/py-python-digitalocean/distinfo b/www/py-python-digitalocean/distinfo index 9a1e890cf3e..27f03db1a4b 100644 --- a/www/py-python-digitalocean/distinfo +++ b/www/py-python-digitalocean/distinfo @@ -1,2 +1,2 @@ -SHA256 (python-digitalocean-1.3.tar.gz) = b662817ccba5c7e980f583ebf4a647d633ba9b9b8c4970ae53c2b13bb340bab5 -SIZE (python-digitalocean-1.3.tar.gz) = 10638 +SHA256 (python-digitalocean-1.6.tar.gz) = b919f142fb40e8b851a565d568fba1a767fb70e97ca843638c3dd6fc48efca66 +SIZE (python-digitalocean-1.6.tar.gz) = 11703 diff --git a/www/py-qp/Makefile b/www/py-qp/Makefile index 7ef58d9ed5c..6f1d73cf5fa 100644 --- a/www/py-qp/Makefile +++ b/www/py-qp/Makefile @@ -17,7 +17,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}durus>=0:${PORTSDIR}/devel/py-durus \ RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USE_PYTHON= distutils USES= python:2 diff --git a/www/py-qpy/Makefile b/www/py-qpy/Makefile index b857cbd3c8a..a04898b5e01 100644 --- a/www/py-qpy/Makefile +++ b/www/py-qpy/Makefile @@ -13,7 +13,6 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Generating safely-quoted html text from python code OPTIONS_DEFINE= DOCS -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USE_PYTHON= autoplist distutils USES= python:2 diff --git a/www/py-rhodecode/Makefile b/www/py-rhodecode/Makefile index 800641aa77d..4703d229ff4 100644 --- a/www/py-rhodecode/Makefile +++ b/www/py-rhodecode/Makefile @@ -44,7 +44,6 @@ USE_PYTHON= distutils autoplist USE_RC_SUBR= rhodecode SUB_FILES= pkg-message -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= LDAP GIT OPTIONS_DEFAULT= GIT diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile index b825f7a7e19..adbdc6ffdf2 100644 --- a/www/py-scrapy/Makefile +++ b/www/py-scrapy/Makefile @@ -23,7 +23,6 @@ USE_PYTHON= distutils autoplist OPTIONS_DEFINE= SSL OPTIONS_DEFAULT=SSL -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options .include diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile index a125f020766..3bde9dfcb90 100644 --- a/www/py-turbogears/Makefile +++ b/www/py-turbogears/Makefile @@ -27,7 +27,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.1.2:${PORTSDIR}/www/py-cherrypy USES= gettext python:2 USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= ELIXIR NOSE SQLOBJECT SQLALCHEMY OPTIONS_DEFAULT=SQLOBJECT ELIXIR_DESC= Use Elixir as plugin diff --git a/www/py-urlgrabber/Makefile b/www/py-urlgrabber/Makefile index c5b89ce4528..63ff73389a0 100644 --- a/www/py-urlgrabber/Makefile +++ b/www/py-urlgrabber/Makefile @@ -23,7 +23,6 @@ USE_PYTHON= distutils REINPLACE_ARGS= -i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},' DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS .include diff --git a/www/py-ws4py/Makefile b/www/py-ws4py/Makefile index 103f2e782ef..abb45e65ffc 100644 --- a/www/py-ws4py/Makefile +++ b/www/py-ws4py/Makefile @@ -17,7 +17,6 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= CHERRYPY GEVENT TORNADO OPTIONS_DEFAULT= CHERRYPY GEVENT CHERRYPY_DESC= CherryPy server support diff --git a/www/qupzilla-qt4/Makefile b/www/qupzilla-qt4/Makefile index 67676cf4a83..7663d0463ea 100644 --- a/www/qupzilla-qt4/Makefile +++ b/www/qupzilla-qt4/Makefile @@ -18,8 +18,10 @@ CONFLICTS= ${PORTNAME}-qt5* USES= desktop-file-utils execinfo pkgconfig qmake tar:xz USE_QT4= corelib gui network script sql webkit xml \ - linguist_build moc_build rcc_build uic_build \ + linguisttools_build moc_build rcc_build uic_build \ imageformats_run sql-sqlite3_run +USE_XORG= x11 +USE_OPENSSL= yes CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/ USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/www/qupzilla-qt4/files/patch-src__lib__3rdparty__processinfo.h b/www/qupzilla-qt4/files/patch-src__lib__3rdparty__processinfo.h index 5b4ece17f48..1eb22081140 100644 --- a/www/qupzilla-qt4/files/patch-src__lib__3rdparty__processinfo.h +++ b/www/qupzilla-qt4/files/patch-src__lib__3rdparty__processinfo.h @@ -1,12 +1,12 @@ ---- src/lib/3rdparty/processinfo.h.orig 2014-09-26 12:35:35.000000000 +0400 -+++ src/lib/3rdparty/processinfo.h 2014-09-26 23:04:10.000000000 +0400 +--- src/lib/3rdparty/processinfo.h.orig 2015-01-26 14:26:15 UTC ++++ src/lib/3rdparty/processinfo.h @@ -18,16 +18,12 @@ #ifndef PROCESSINFO_H #define PROCESSINFO_H -#include +#include "qzcommon.h" - + #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #include #endif @@ -17,4 +17,4 @@ - /* * Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5 - * written by user WitchCraft + * written by user WitchCraft diff --git a/www/qupzilla-qt5/Makefile b/www/qupzilla-qt5/Makefile index eeec93b6227..3acf92ac6e1 100644 --- a/www/qupzilla-qt5/Makefile +++ b/www/qupzilla-qt5/Makefile @@ -20,6 +20,8 @@ USES= desktop-file-utils execinfo pkgconfig qmake tar:xz USE_QT5= core concurrent gui network script webkit xml \ buildtools_build linguisttools_build \ imageformats_run sql-sqlite3_run +USE_XORG= x11 +USE_OPENSSL= yes CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/ USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/www/qupzilla-qt5/files/patch-src__lib__3rdparty__processinfo.h b/www/qupzilla-qt5/files/patch-src__lib__3rdparty__processinfo.h index 5b4ece17f48..1eb22081140 100644 --- a/www/qupzilla-qt5/files/patch-src__lib__3rdparty__processinfo.h +++ b/www/qupzilla-qt5/files/patch-src__lib__3rdparty__processinfo.h @@ -1,12 +1,12 @@ ---- src/lib/3rdparty/processinfo.h.orig 2014-09-26 12:35:35.000000000 +0400 -+++ src/lib/3rdparty/processinfo.h 2014-09-26 23:04:10.000000000 +0400 +--- src/lib/3rdparty/processinfo.h.orig 2015-01-26 14:26:15 UTC ++++ src/lib/3rdparty/processinfo.h @@ -18,16 +18,12 @@ #ifndef PROCESSINFO_H #define PROCESSINFO_H -#include +#include "qzcommon.h" - + #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #include #endif @@ -17,4 +17,4 @@ - /* * Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5 - * written by user WitchCraft + * written by user WitchCraft diff --git a/www/rubygem-puma/Makefile b/www/rubygem-puma/Makefile index 4387c535e7a..7411d41bcc7 100644 --- a/www/rubygem-puma/Makefile +++ b/www/rubygem-puma/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= puma -PORTVERSION= 2.13.0 +PORTVERSION= 2.13.2 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-puma/distinfo b/www/rubygem-puma/distinfo index 995b79b04b3..22d044817d1 100644 --- a/www/rubygem-puma/distinfo +++ b/www/rubygem-puma/distinfo @@ -1,2 +1,2 @@ -SHA256 (rubygem/puma-2.13.0.gem) = 9053627293e0859e33aa608f703667615d19db8416e6b22d941e58c2332dbc2a -SIZE (rubygem/puma-2.13.0.gem) = 96768 +SHA256 (rubygem/puma-2.13.2.gem) = 1bd6f6ef478fcc953f0862d37cd087450d9f74860b90ae6d3138e833d6dbcaa2 +SIZE (rubygem/puma-2.13.2.gem) = 96768 diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile index 46c75ac0dab..e6a5805485a 100644 --- a/www/rubygem-rails/Makefile +++ b/www/rubygem-rails/Makefile @@ -57,7 +57,6 @@ CPE_PRODUCT= ruby_on_rails OPTIONS_DEFINE= PASSENGER MEMCACHE_CLIENT PASSENGER_DESC= Passenger backend MEMCACHE_CLIENT_DESC= MemCache-Client support -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options MEMCACHE_CLIENT_RUN_DEPENDS= rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client PASSENGER_RUN_DEPENDS= rubygem-passenger>=2.2.15:${PORTSDIR}/www/rubygem-passenger diff --git a/www/rubygem-rails4/Makefile b/www/rubygem-rails4/Makefile index c02d3f22cc2..cac86ef3ecb 100644 --- a/www/rubygem-rails4/Makefile +++ b/www/rubygem-rails4/Makefile @@ -54,7 +54,6 @@ CPE_PRODUCT= ruby_on_rails OPTIONS_DEFINE= PASSENGER MEMCACHE_CLIENT PASSENGER_DESC= Passenger backend MEMCACHE_CLIENT_DESC= MemCache-Client support -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options MEMCACHE_CLIENT_RUN_DEPENDS= rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client PASSENGER_RUN_DEPENDS= rubygem-passenger>=2.2.15:${PORTSDIR}/www/rubygem-passenger diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile index 8c58a9ebf9b..ad067731a89 100644 --- a/www/tdiary/Makefile +++ b/www/tdiary/Makefile @@ -48,10 +48,10 @@ SUB_FILES= pkg-message tdiaryinst.rb SUB_LIST+= TDIARY_LANG=${TDIARY_LANG} \ TDIARY_SCRIPT=${TDIARY_SCRIPT} WRKSRC= ${WRKDIR}/${PORTNAME}-v${PORTVERSION}.1 -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -WWWDIR= ${PREFIX}/www/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +WWWDIR= ${PREFIX}/www/${PKGBASE} -TDIARY_SCRIPT= ${UNIQUENAME}-inst.rb +TDIARY_SCRIPT= ${PKGBASE}-inst.rb #TDIARY_LANG ja:Japanese en:English .if !defined(TDIARY_LANG) || ( defined(TDIARY_LANG) && ${TDIARY_LANG} != ja ) diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index 3fc7af4294f..c27616c2b0b 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -47,10 +47,10 @@ BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/cmake #../../../lib/libjavascriptcoregtk-4.0.so.18.0.8: undefined reference to `JSC::JSCell::structure() const' #c++: error: linker command failed with exit code 1 (use -v to see invocation) #Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/build.make:94: recipe for target 'bin/jsc' failed -# there is something in CMAKE_ENV that cause this ... but what. +# there is something in CONFIGURE_ENV that cause this ... but what. CMAKE_ARGS+= -DPORT=GTK -CMAKE_ENV+= XDG_CACHE_HOME=${WRKDIR} \ +CONFIGURE_ENV+= XDG_CACHE_HOME=${WRKDIR} \ CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ CC="${CC}" CXX="${CXX}" CPP="${CPP}" @@ -92,7 +92,7 @@ pre-configure: do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" \ - ${CMAKE_ENV} cmake -DPORT=GTK ${CMAKE_ARGS} + ${CONFIGURE_ENV} cmake -DPORT=GTK ${CMAKE_ARGS} post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/jsc \ diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi index 6a58675a169..81790907ebc 100644 --- a/www/xpi-adblock/Makefile.xpi +++ b/www/xpi-adblock/Makefile.xpi @@ -17,7 +17,6 @@ # MOZILLA_ADDONS/addons/${XPI_NUM} # or # MOZILLA_ADDONS/extensions/${XPI_DISTNAME} -# LATEST_LINK - Default: ${PKGBASE:S/_//g} # XPI_LIBDIR - Name of the directory to install extensions in. # Default: ${PREFIX}/lib/xpi # XPI_XPIDIR - Name of the directory to install extension's files in. @@ -70,7 +69,6 @@ PKGNAMEPREFIX?= xpi- EXTRACT_SUFX?= .xpi DISTNAME?= ${XPI_DISTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} DIST_SUBDIR?= xpi -LATEST_LINK?= ${PKGBASE:S/_//g} NO_BUILD= yes USES+= zip:infozip diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index f5cd9ddefed..2a6b70e9e31 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= doublecmd -PORTVERSION= 0.6.4 +PORTVERSION= 0.6.5 PORTREVISION= 1 CATEGORIES= x11-fm MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source @@ -22,6 +22,8 @@ ONLY_FOR_ARCHS= i386 amd64 PORTDOCS= * USES= dos2unix +USE_FPC= cairo fcl-base fcl-db fcl-image fcl-json fcl-process fcl-registry \ + fcl-xml hash iconvenc pasjpeg paszlib x11 DOS2UNIX_FILES= src/dmhelpmanager.pas WANT_GNOME= yes @@ -122,7 +124,7 @@ BUILD_MODE= NoDebug Full Optimizations .endif .if ${PORT_OPTIONS:MWFX_FTP} -USE_FPC= fcl-net +USE_FPC+= fcl-net .endif pre-patch: diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo index 1b2f23e3502..b1ef5fb0462 100644 --- a/x11-fm/doublecmd/distinfo +++ b/x11-fm/doublecmd/distinfo @@ -1,4 +1,4 @@ -SHA256 (doublecmd-0.6.4-src.tar.gz) = 2c18d0e89deed22bdd876e90bac0279204219dfe25a33372fee0f1a6997ebfca -SIZE (doublecmd-0.6.4-src.tar.gz) = 5997080 +SHA256 (doublecmd-0.6.5-src.tar.gz) = db3ecdfc0bd857d314b021b5fd9361e613844346e86311405e1f1d9a7fa89b36 +SIZE (doublecmd-0.6.5-src.tar.gz) = 6010719 SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39 SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996 diff --git a/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr b/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr index 04df69bc510..eac4ed696a7 100644 --- a/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr +++ b/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr @@ -1,6 +1,6 @@ ---- ./plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2013-03-10 11:26:35.000000000 +0100 -+++ ./plugins/wlx/WlxMplayer/src/wlxMplayer.lpr 2013-07-22 22:43:52.577214000 +0200 -@@ -258,7 +258,7 @@ +--- plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2013-03-10 10:26:35 UTC ++++ plugins/wlx/WlxMplayer/src/wlxMplayer.lpr +@@ -258,7 +258,7 @@ var sPlayerPath: String; p: TMPlayer; begin diff --git a/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas b/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas index b88c00d0d49..1bf2068673c 100644 --- a/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas +++ b/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas @@ -1,6 +1,6 @@ ---- ./src/dmhelpmanager.pas.orig 2013-06-30 19:27:17.154825000 +0200 -+++ ./src/dmhelpmanager.pas 2013-06-30 19:28:32.591981000 +0200 -@@ -69,11 +69,11 @@ +--- src/dmhelpmanager.pas.orig 2015-08-17 15:35:25 UTC ++++ src/dmhelpmanager.pas +@@ -69,11 +69,11 @@ begin else begin gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']); diff --git a/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas b/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas index 20048a131e9..ad4694e8a7f 100644 --- a/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas +++ b/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas @@ -1,6 +1,6 @@ ---- ./src/uGlobsPaths.pas.orig 2013-06-30 19:29:19.097919000 +0200 -+++ ./src/uGlobsPaths.pas 2013-06-30 19:22:37.387062000 +0200 -@@ -3,14 +3,15 @@ +--- src/uGlobsPaths.pas.orig 2015-08-17 15:35:25 UTC ++++ src/uGlobsPaths.pas +@@ -3,14 +3,15 @@ unit uGlobsPaths; interface var @@ -16,9 +16,9 @@ + gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files + procedure LoadPaths; + procedure UpdateEnvironmentVariable; - implementation -@@ -26,7 +27,7 @@ +@@ -32,7 +33,7 @@ end; procedure LoadPaths; begin OnGetApplicationName := @GetAppName; diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile index 826fcbcad0a..ec3bf7fb891 100644 --- a/x11-toolkits/fpc-gtk2/Makefile +++ b/x11-toolkits/fpc-gtk2/Makefile @@ -1,14 +1,14 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits lang PKGNAMESUFFIX= -gtk2 MAINTAINER= freebsd-fpc@FreeBSD.org COMMENT= Free Pascal interface to the GTK2 libraries -USE_FPC= cairo x11 fcl-image +USE_FPC= cairo fcl-base fcl-image hash pasjpeg paszlib x11 MASTERDIR= ${.CURDIR}/../../lang/fpc WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile index 6c7e9b8785e..eba8d1ce032 100644 --- a/x11-toolkits/py-gui/Makefile +++ b/x11-toolkits/py-gui/Makefile @@ -15,7 +15,6 @@ COMMENT= Cross-platform pythonic GUI API BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:${PORTSDIR}/devel/pyrex OPTIONS_DEFINE= DOCS EXAMPLES OPENGL -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USE_GNOME= pygtk2 USES= python diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 0cff9f30539..11f52fbbae2 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -41,7 +41,7 @@ CFLAGS+= -I${TCL_INCLUDEDIR} TK_VER= ${PORTVERSION:R} SHORT_TK_VER= ${TK_VER:S/.//} -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile index 279fbf55d7e..cbaf9c3d530 100644 --- a/x11-toolkits/tk85/Makefile +++ b/x11-toolkits/tk85/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --enable-shared \ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \ ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}" -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} INSTALL_TARGET= install @@ -73,7 +73,7 @@ PLIST_SUB+= MAN="" PLIST_SUB+= MAN="@comment " .endif -TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} +TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${PKGBASE} post-patch: ${REINPLACE_CMD} -e \ diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile index 7d420ca2e86..cad1f38697e 100644 --- a/x11-toolkits/tk86/Makefile +++ b/x11-toolkits/tk86/Makefile @@ -45,7 +45,7 @@ CFLAGS+= -I${TCL_INCLUDEDIR} \ TK_VER= ${PORTVERSION:R} SHORT_TK_VER= ${TK_VER:S/.//} -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index e078f7ad290..d0ee2e2618f 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= asclock:${PORTSDIR}/x11-clocks/asclock CONFLICTS?= afterstep-2* PORTSCOUT= limit:^1\.[0-9.]*$$ -NO_LATEST_LINK= yes USES= imake USE_XORG= xpm xext x11 diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile index ba0a774b84d..d7ecc1394e0 100644 --- a/x11-wm/fvwm/Makefile +++ b/x11-wm/fvwm/Makefile @@ -11,8 +11,6 @@ PKGNAMESUFFIX= 1${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= The fvwm window manager -NO_LATEST_LINK= yes - USES= imake USE_XORG= xbitmaps xpm xext x11 xmu diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index 710491e1205..5f285354b8f 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -17,7 +17,6 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 # Other ports this port cannot coexist with CONFLICTS?= fvwm-1.* fvwm-2.[457].* -NO_LATEST_LINK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-mandoc --without-gnome --disable-gtk diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index d890d26209a..a28c478d6ce 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-session PORTVERSION= 4.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 2574403fa00..deb186d7474 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -17,7 +17,6 @@ RUN_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \ gtk-xfce-engine>0:${PORTSDIR}/x11-themes/gtk-xfce-engine USES= metaport -LATEST_LINK= xfce4 OPTIONS_DEFINE= APPFINDER ICONS MIXER MOUSEPAD NOTIFY ORAGE PRINT SLIM SQUEEZE TERMINAL XPM OPTIONS_DEFAULT= APPFINDER ICONS MOUSEPAD NOTIFY ORAGE TERMINAL diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile index 00ab25d3185..8013a83decd 100644 --- a/x11/cinnamon-session/Makefile +++ b/x11/cinnamon-session/Makefile @@ -3,6 +3,7 @@ PORTNAME= cinnamon-session PORTVERSION= 2.4.3 +PORTREVISION= 1 CATEGORIES= x11 gnome DIST_SUBDIR= gnome3 diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile index 88df64dfd37..50d57e9ef62 100644 --- a/x11/mate-applets/Makefile +++ b/x11/mate-applets/Makefile @@ -3,6 +3,7 @@ PORTNAME= mate-applets PORTVERSION= 1.10.3 +PORTREVISION= 1 CATEGORIES= x11 mate MASTER_SITES= MATE DIST_SUBDIR= mate diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile index 936346f629d..f39002fe429 100644 --- a/x11/mate-session-manager/Makefile +++ b/x11/mate-session-manager/Makefile @@ -3,6 +3,7 @@ PORTNAME= mate-session-manager PORTVERSION= 1.10.2 +PORTREVISION= 1 CATEGORIES= x11 mate MASTER_SITES= MATE DIST_SUBDIR= mate diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index ac1f491fc3f..0268a92a84e 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mlterm -PORTVERSION= 3.4.5 +PORTVERSION= 3.5.0 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/01release/${PORTNAME}-${PORTVERSION} diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index 2f1b41f1815..f119174819d 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,2 +1,2 @@ -SHA256 (mlterm-3.4.5.tar.gz) = 7df146099e1d578caddaeb7e93459f96ca1e2381fcc51157a25fe00336072752 -SIZE (mlterm-3.4.5.tar.gz) = 3659801 +SHA256 (mlterm-3.5.0.tar.gz) = dedb211c52a8cdaa8891920da0a4f08f4b72f7b3514a5acb038b38419b24e4d3 +SIZE (mlterm-3.5.0.tar.gz) = 3707639 diff --git a/x11/mlterm/pkg-plist b/x11/mlterm/pkg-plist index fa0f5ac0217..99040bf5bde 100644 --- a/x11/mlterm/pkg-plist +++ b/x11/mlterm/pkg-plist @@ -23,7 +23,7 @@ lib/libkik.so.16.0.0 lib/libmkf.a lib/libmkf.so lib/libmkf.so.16 -lib/libmkf.so.16.0.0 +lib/libmkf.so.16.0.1 lib/libmlterm_core.a lib/libmlterm_core.so lib/libvte-mlterm.a diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile index 561c86a7186..dd1a67751dc 100644 --- a/x11/rsibreak-kde4/Makefile +++ b/x11/rsibreak-kde4/Makefile @@ -11,8 +11,6 @@ MASTER_SITES= LOCAL/crees/${PORTNAME} \ MAINTAINER= avg@icyb.net.ua COMMENT= KDE RSI prevention tool -LATEST_LINK= ${PORTNAME}-kde4 - USES= cmake gettext tar:bzip2 USE_QT4= qmake_build moc_build rcc_build uic_build USE_KDE4= kdeprefix kdelibs automoc4