Date: Sun, 25 Jan 2015 09:06:01 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-projects@freebsd.org Subject: svn commit: r377868 - in projects/rework-dependency-registration: Mk audio/denemo audio/jack audio/libebur128 audio/libgroove audio/listener audio/mhwaveedit audio/mixxx audio/musescore audio/music... Message-ID: <201501250906.t0P9611r044045@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sun Jan 25 09:06:00 2015 New Revision: 377868 URL: https://svnweb.freebsd.org/changeset/ports/377868 QAT: https://qat.redports.org/buildarchive/r377868/ Log: Merge from head Added: projects/rework-dependency-registration/devel/editline/ - copied from r377867, head/devel/editline/ projects/rework-dependency-registration/editors/xcoral/files/ - copied from r377867, head/editors/xcoral/files/ projects/rework-dependency-registration/games/hedgewars/files/patch-CMakeLists.txt - copied unchanged from r377867, head/games/hedgewars/files/patch-CMakeLists.txt projects/rework-dependency-registration/games/lbreakout/files/patch-lbreakout__hiscore.h - copied unchanged from r377867, head/games/lbreakout/files/patch-lbreakout__hiscore.h projects/rework-dependency-registration/games/minerbold/ - copied from r377867, head/games/minerbold/ projects/rework-dependency-registration/games/xmoto/files/patch-src-GameInit.cpp - copied unchanged from r377867, head/games/xmoto/files/patch-src-GameInit.cpp projects/rework-dependency-registration/games/xmoto/files/patch-src-WWW.cpp - copied unchanged from r377867, head/games/xmoto/files/patch-src-WWW.cpp projects/rework-dependency-registration/graphics/osg-devel/files/patch-CMakeModules__FindGStreamer.cmake - copied unchanged from r377867, head/graphics/osg-devel/files/patch-CMakeModules__FindGStreamer.cmake projects/rework-dependency-registration/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2bufferpool.c - copied unchanged from r377867, head/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2bufferpool.c projects/rework-dependency-registration/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_v4l2-calls.c - copied unchanged from r377867, head/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_v4l2-calls.c projects/rework-dependency-registration/multimedia/vdr/files/patch-z-dvbdevice.c - copied unchanged from r377867, head/multimedia/vdr/files/patch-z-dvbdevice.c projects/rework-dependency-registration/multimedia/w_scan/files/patch-z-scan.c - copied unchanged from r377867, head/multimedia/w_scan/files/patch-z-scan.c projects/rework-dependency-registration/net/quagga/files/patch-configure - copied unchanged from r377867, head/net/quagga/files/patch-configure projects/rework-dependency-registration/print/fontforge/files/patch-fontforge_splinefont.h - copied unchanged from r377867, head/print/fontforge/files/patch-fontforge_splinefont.h projects/rework-dependency-registration/sysutils/pacman/files/pkg-deinstall.in - copied unchanged from r377867, head/sysutils/pacman/files/pkg-deinstall.in Deleted: projects/rework-dependency-registration/emulators/wine-devel/files/patch-alternate-toolchain projects/rework-dependency-registration/games/hedgewars/files/patch-gameServer__Actions.hs projects/rework-dependency-registration/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt projects/rework-dependency-registration/games/hedgewars/files/patch-tools__CMakeLists.txt projects/rework-dependency-registration/net/quagga/files/patch-configure.ac projects/rework-dependency-registration/sysutils/pacman/pkg-deinstall Modified: projects/rework-dependency-registration/Mk/bsd.options.desc.mk projects/rework-dependency-registration/audio/denemo/Makefile projects/rework-dependency-registration/audio/jack/Makefile projects/rework-dependency-registration/audio/libebur128/Makefile projects/rework-dependency-registration/audio/libgroove/Makefile projects/rework-dependency-registration/audio/listener/Makefile projects/rework-dependency-registration/audio/mhwaveedit/Makefile projects/rework-dependency-registration/audio/mixxx/Makefile projects/rework-dependency-registration/audio/musescore/Makefile projects/rework-dependency-registration/audio/musicpd/Makefile projects/rework-dependency-registration/audio/pulseaudio/Makefile projects/rework-dependency-registration/audio/py-fastaudio/Makefile projects/rework-dependency-registration/audio/rezound/Makefile projects/rework-dependency-registration/audio/zynaddsubfx/Makefile projects/rework-dependency-registration/cad/brickutils/Makefile projects/rework-dependency-registration/comms/gnuradio/Makefile projects/rework-dependency-registration/comms/linrad/Makefile projects/rework-dependency-registration/comms/quisk/Makefile projects/rework-dependency-registration/deskutils/conduit/Makefile projects/rework-dependency-registration/deskutils/gnome-documents/Makefile projects/rework-dependency-registration/deskutils/xfce4-tumbler/Makefile projects/rework-dependency-registration/devel/Makefile projects/rework-dependency-registration/devel/libedit/Makefile projects/rework-dependency-registration/devel/libedit/pkg-descr projects/rework-dependency-registration/devel/py-roxlib/Makefile projects/rework-dependency-registration/devel/ruby-build/Makefile projects/rework-dependency-registration/devel/scala-ide/Makefile projects/rework-dependency-registration/editors/xcoral/Makefile projects/rework-dependency-registration/emulators/hatari/Makefile projects/rework-dependency-registration/emulators/wine-devel/Makefile projects/rework-dependency-registration/emulators/wine-devel/distinfo projects/rework-dependency-registration/emulators/wine-devel/pkg-plist projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/Makefile projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/distinfo projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/files/patch-R-quoteStockTsData.R projects/rework-dependency-registration/games/Makefile projects/rework-dependency-registration/games/balazarbrothers/Makefile projects/rework-dependency-registration/games/dodgindiamond2/Makefile projects/rework-dependency-registration/games/dodgindiamond2/pkg-plist projects/rework-dependency-registration/games/hedgewars/Makefile projects/rework-dependency-registration/games/hedgewars/distinfo projects/rework-dependency-registration/games/lbreakout/Makefile projects/rework-dependency-registration/games/lbreakout/pkg-plist projects/rework-dependency-registration/games/linux-candycruncher-demo/Makefile projects/rework-dependency-registration/games/linux-coldwar-demo/Makefile projects/rework-dependency-registration/games/linux-gorky17-demo/Makefile projects/rework-dependency-registration/games/linux-hdb-demo/Makefile projects/rework-dependency-registration/games/linux-majesty-demo/Makefile projects/rework-dependency-registration/games/linux-ningpo-demo/Makefile projects/rework-dependency-registration/games/lmarbles/Makefile projects/rework-dependency-registration/games/lmarbles/pkg-plist projects/rework-dependency-registration/games/openarena/Makefile.include projects/rework-dependency-registration/games/xmoto/files/patch-src-include-xm__hashmap.h projects/rework-dependency-registration/games/yahtzee/Makefile projects/rework-dependency-registration/games/yahtzee/files/patch-Makefile projects/rework-dependency-registration/games/yahtzee/pkg-plist projects/rework-dependency-registration/graphics/libsixel/Makefile projects/rework-dependency-registration/graphics/libsixel/distinfo projects/rework-dependency-registration/graphics/osg-devel/Makefile projects/rework-dependency-registration/graphics/osg-devel/distinfo projects/rework-dependency-registration/graphics/osg-devel/files/patch-CMakeLists.txt projects/rework-dependency-registration/graphics/osg-devel/pkg-plist projects/rework-dependency-registration/lang/gcc48/Makefile projects/rework-dependency-registration/lang/gcc48/distinfo projects/rework-dependency-registration/lang/gcc49/Makefile projects/rework-dependency-registration/lang/gcc49/distinfo projects/rework-dependency-registration/mail/wanderlust-devel/Makefile projects/rework-dependency-registration/mail/wanderlust-devel/distinfo projects/rework-dependency-registration/math/freemat/Makefile projects/rework-dependency-registration/math/ipopt/Makefile projects/rework-dependency-registration/math/ipopt/distinfo projects/rework-dependency-registration/math/ipopt/pkg-plist projects/rework-dependency-registration/math/ocaml-ocamlgraph/Makefile projects/rework-dependency-registration/math/ocaml-ocamlgraph/distinfo projects/rework-dependency-registration/math/ocaml-ocamlgraph/pkg-plist projects/rework-dependency-registration/math/octave-forge-ltfat/Makefile projects/rework-dependency-registration/math/octave-forge-nan/Makefile projects/rework-dependency-registration/math/octave-forge-nan/distinfo projects/rework-dependency-registration/math/octave-forge-tsa/Makefile projects/rework-dependency-registration/math/octave-forge-tsa/distinfo projects/rework-dependency-registration/misc/py-osd/Makefile projects/rework-dependency-registration/net-im/centerim-devel/Makefile projects/rework-dependency-registration/net-im/centerim/Makefile projects/rework-dependency-registration/net-im/psimedia/Makefile projects/rework-dependency-registration/net/gq/Makefile projects/rework-dependency-registration/net/opennx/Makefile projects/rework-dependency-registration/net/quagga/Makefile projects/rework-dependency-registration/net/vnc/Makefile projects/rework-dependency-registration/net/wireshark/Makefile projects/rework-dependency-registration/print/fontforge/Makefile projects/rework-dependency-registration/print/fontforge/distinfo projects/rework-dependency-registration/print/hpijs/Makefile projects/rework-dependency-registration/print/photoprint/Makefile projects/rework-dependency-registration/print/texinfo/Makefile projects/rework-dependency-registration/print/texinfo/distinfo projects/rework-dependency-registration/science/afni/Makefile projects/rework-dependency-registration/security/gnome-gpg/Makefile projects/rework-dependency-registration/security/gnome-keyring-sharp/Makefile projects/rework-dependency-registration/security/gpass/Makefile projects/rework-dependency-registration/security/hotssh/Makefile projects/rework-dependency-registration/security/w3af/Makefile projects/rework-dependency-registration/security/zenmap/Makefile projects/rework-dependency-registration/sysutils/backuppc/Makefile projects/rework-dependency-registration/sysutils/backuppc/distinfo projects/rework-dependency-registration/sysutils/backuppc/files/patch-update.pl projects/rework-dependency-registration/sysutils/backuppc/files/update.sh.in projects/rework-dependency-registration/sysutils/backuppc/pkg-plist projects/rework-dependency-registration/sysutils/pacman/Makefile projects/rework-dependency-registration/sysutils/pacman/distinfo projects/rework-dependency-registration/sysutils/pacman/pkg-plist projects/rework-dependency-registration/textproc/docproj/Makefile projects/rework-dependency-registration/textproc/p5-XML-Feed-Deduper/Makefile projects/rework-dependency-registration/textproc/py-rss2gen/Makefile projects/rework-dependency-registration/textproc/py-rss2gen/distinfo projects/rework-dependency-registration/textproc/sdom/Makefile projects/rework-dependency-registration/textproc/sgmlformat/Makefile projects/rework-dependency-registration/www/choqok/Makefile projects/rework-dependency-registration/www/choqok/distinfo projects/rework-dependency-registration/www/choqok/pkg-plist projects/rework-dependency-registration/www/kwebkitpart/pkg-plist projects/rework-dependency-registration/x11-themes/kde-gtk-config/pkg-plist projects/rework-dependency-registration/x11-toolkits/attica/pkg-plist projects/rework-dependency-registration/x11-toolkits/py-kivy/Makefile projects/rework-dependency-registration/x11-toolkits/shared-desktop-ontologies/pkg-plist projects/rework-dependency-registration/x11-wm/wmakerconf/Makefile projects/rework-dependency-registration/x11/hotwire-shell/Makefile projects/rework-dependency-registration/x11/kde4-baseapps/Makefile projects/rework-dependency-registration/x11/mlterm/Makefile projects/rework-dependency-registration/x11/mlterm/distinfo projects/rework-dependency-registration/x11/qimageblitz/pkg-plist Directory Properties: projects/rework-dependency-registration/ (props changed) Modified: projects/rework-dependency-registration/Mk/bsd.options.desc.mk ============================================================================== --- projects/rework-dependency-registration/Mk/bsd.options.desc.mk Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/Mk/bsd.options.desc.mk Sun Jan 25 09:06:00 2015 (r377868) @@ -69,6 +69,7 @@ DIRAC_DESC?= Dirac codec support via li DJVU_DESC?= DjVu document support DOCS_DESC?= Build and/or install documentation DOXYGEN_DESC?= Build documentation with Doxygen +DTRACE_DESC?= Build with DTrace probes DV_DESC?= Quasar DV video codec support (libdv) DVDCSS_DESC?= Encrypted DVD support via libdvdcss ECW_DESC?= ECW image format support Modified: projects/rework-dependency-registration/audio/denemo/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/denemo/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/denemo/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -12,17 +12,16 @@ COMMENT= Graphical score editor LICENSE= GPLv3 -BUILD_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2 LIB_DEPENDS= libaubio.so:${PORTSDIR}/audio/aubio \ libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \ libjack.so:${PORTSDIR}/audio/jack \ + libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ libsmf.so:${PORTSDIR}/audio/libsmf \ libsndfile.so:${PORTSDIR}/audio/libsndfile \ librubberband.so:${PORTSDIR}/audio/rubberband \ libguile.so:${PORTSDIR}/lang/guile \ libfftw3.so:${PORTSDIR}/math/fftw3 -RUN_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2 \ - xdg-open:${PORTSDIR}/devel/xdg-utils +RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils USES= bison gettext gmake pkgconfig USE_GNOME= librsvg2 libxml2 Modified: projects/rework-dependency-registration/audio/jack/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/jack/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/jack/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -14,7 +14,7 @@ COMMENT= Low latency audio server LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio \ +LIB_DEPENDS= libportaudio.so.0:${PORTSDIR}/audio/portaudio \ libsndfile.so:${PORTSDIR}/audio/libsndfile \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ libcelt0.so:${PORTSDIR}/audio/celt \ Modified: projects/rework-dependency-registration/audio/libebur128/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/libebur128/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/libebur128/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -3,6 +3,7 @@ PORTNAME= libebur128 PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= ports@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= Implementation of the EBU R128 LICENSE= MIT -LIB_DEPENDS= libspeexdsp.so:${PORTSDIR}/audio/speex +LIB_DEPENDS= libspeexdsp.so:${PORTSDIR}/audio/speexdsp USES= cmake:outsource pkgconfig Modified: projects/rework-dependency-registration/audio/libgroove/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/libgroove/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/libgroove/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -3,7 +3,7 @@ PORTNAME= libgroove PORTVERSION= 4.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= ports@FreeBSD.org @@ -11,10 +11,10 @@ COMMENT= Audio dispatching library LICENSE= MIT -LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/libav \ +LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libchromaprint.so:${PORTSDIR}/audio/chromaprint \ libebur128.so:${PORTSDIR}/audio/libebur128 \ - libspeexdsp.so:${PORTSDIR}/audio/speex \ + libspeexdsp.so:${PORTSDIR}/audio/speexdsp \ libSDL2.so:${PORTSDIR}/devel/sdl20 USES= cmake:outsource Modified: projects/rework-dependency-registration/audio/listener/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/listener/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/listener/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -12,9 +12,8 @@ COMMENT= Program to listen for and recor LICENSE= GPLv2 -BUILD_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2 -LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile -RUN_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2 +LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ + libsndfile.so:${PORTSDIR}/audio/libsndfile USES= ncurses tar:tgz Modified: projects/rework-dependency-registration/audio/mhwaveedit/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/mhwaveedit/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/mhwaveedit/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -50,7 +50,7 @@ LADSPA_BUILD_DEPENDS= ladspa>0:${PORTSDI LADSPA_RUN_DEPENDS= ladspa>0:${PORTSDIR}/audio/ladspa LADSPA_CONFIGURE_ENV_OFF= ac_cv_header_ladspa_h=no OSS_CONFIGURE_WITH= oss -PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio +PORTAUDIO_LIB_DEPENDS= libportaudio.so.0:${PORTSDIR}/audio/portaudio PORTAUDIO_CONFIGURE_WITH= portaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_WITH= pulse Modified: projects/rework-dependency-registration/audio/mixxx/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/mixxx/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/mixxx/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -13,15 +13,14 @@ COMMENT= DJ mixing application LICENSE= GPLv2 # (or later) -BUILD_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \ libid3tag.so:${PORTSDIR}/audio/libid3tag \ libmad.so:${PORTSDIR}/audio/libmad \ + libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ libsndfile.so:${PORTSDIR}/audio/libsndfile \ libvorbisfile.so:${PORTSDIR}/audio/libvorbis \ libtag.so:${PORTSDIR}/audio/taglib \ libprotobuf.so:${PORTSDIR}/devel/protobuf -RUN_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: projects/rework-dependency-registration/audio/musescore/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/musescore/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/musescore/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -38,8 +38,7 @@ JACK_LIB_DEPENDS= libjack.so:${PORTSDIR} JACK_CMAKE_ON= -DBUILD_JACK:BOOL=ON JACK_CMAKE_OFF= -DBUILD_JACK:BOOL=OFF -PORTAUDIO_BUILD_DEPENDS=portaudio2>=0:${PORTSDIR}/audio/portaudio2 -PORTAUDIO_RUN_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 PORTAUDIO_CMAKE_ON= -DBUILD_PORTAUDIO:BOOL=ON PORTAUDIO_CMAKE_OFF= -DBUILD_PORTAUDIO:BOOL=OFF Modified: projects/rework-dependency-registration/audio/musicpd/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/musicpd/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/musicpd/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -132,11 +132,6 @@ GROUPS= ${MPDGROUP} .include <bsd.port.options.mk> -# Work around suspected clang bug -.if ${OSVERSION} >= 1001000 -USE_GCC= yes -.endif - .ifdef MPDCONF IGNORE=Please remove the MPDCONF line from make.conf, then rename ${PREFIX}/etc/${MPDCONF} to musicpd.conf, if it exists .endif Modified: projects/rework-dependency-registration/audio/pulseaudio/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/pulseaudio/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/pulseaudio/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -7,7 +7,7 @@ PORTNAME= pulseaudio PORTVERSION= 5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ @@ -16,7 +16,7 @@ COMMENT= Sound server for UNIX LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ libsndfile.so:${PORTSDIR}/audio/libsndfile \ - libspeexdsp.so:${PORTSDIR}/audio/speex \ + libspeexdsp.so:${PORTSDIR}/audio/speexdsp \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libfftw3f.so:${PORTSDIR}/math/fftw3-float \ liborc-0.4.so:${PORTSDIR}/devel/orc \ Modified: projects/rework-dependency-registration/audio/py-fastaudio/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/py-fastaudio/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/py-fastaudio/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -16,7 +16,7 @@ MAINTAINER= ninjin@kth.se COMMENT= Python bindings for the PortAudio multi-platform audio library BUILD_DEPENDS= pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex -LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio \ +LIB_DEPENDS= libportaudio.so.0:${PORTSDIR}/audio/portaudio \ libsndfile.so:${PORTSDIR}/audio/libsndfile PLIST_FILES= %%PYTHON_SITELIBDIR%%/fastaudio.so Modified: projects/rework-dependency-registration/audio/rezound/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/rezound/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/rezound/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -36,7 +36,7 @@ BROKEN_NLS_DESC= ${NLS_DESC} (broken!) LARGEFILE_CONFIGURE_ON= --enable-largefile JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack AUDIOFILE_LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile -PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio +PORTAUDIO_LIB_DEPENDS= libportaudio.so.0:${PORTSDIR}/audio/portaudio OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac Modified: projects/rework-dependency-registration/audio/zynaddsubfx/Makefile ============================================================================== --- projects/rework-dependency-registration/audio/zynaddsubfx/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/audio/zynaddsubfx/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -54,8 +54,7 @@ LASH_CMAKE_OFF= -DLashEnabe:BOOL=OFF JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CMAKE_OFF= -DJackEnable:BOOL=OFF -PORTAUDIO_BUILD_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 -PORTAUDIO_RUN_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 PORTAUDIO_CFLAGS= -I${LOCALBASE}/include/portaudio2 PORTAUDIO_CMAKE_OFF= -DPaEnabe:BOOL=OFF PORTAUDIO_LDFLAGS= ${LOCALBASE}/lib/portaudio2/libportaudio.so Modified: projects/rework-dependency-registration/cad/brickutils/Makefile ============================================================================== --- projects/rework-dependency-registration/cad/brickutils/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/cad/brickutils/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -20,7 +20,7 @@ COMMENT= Utility for building models wit LICENSE= GPLv3 RUN_DEPENDS= ${LOCALBASE}/share/ldraw/models/car.dat:${PORTSDIR}/cad/ldraw \ - ${PYTHON_PACKAGENAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ ${PYXML} WRKSRC= ${WRKDIR}/BrickUtils-${PORTVERSION} Modified: projects/rework-dependency-registration/comms/gnuradio/Makefile ============================================================================== --- projects/rework-dependency-registration/comms/gnuradio/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/comms/gnuradio/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -16,23 +16,21 @@ LICENSE= GPLv3 BUILD_DEPENDS= sdl-config:${PORTSDIR}/devel/sdl12 \ swig2.0:${PORTSDIR}/devel/swig20 \ cheetah:${PORTSDIR}/devel/py-cheetah \ - ${PYTHON_SITELIBDIR}/lxml:${PORTSDIR}/devel/py-lxml \ - ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2 \ - ${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4 \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \ + ${PYTHON_PKGNAMEPREFIX}qt4>0:${PORTSDIR}/devel/py-qt4 \ xdg-open:${PORTSDIR}/devel/xdg-utils \ guile:${PORTSDIR}/lang/guile \ icebox:${PORTSDIR}/devel/ice \ aconnect:${PORTSDIR}/audio/alsa-utils \ git:${PORTSDIR}/devel/git \ ${PYNUMPY} \ - ${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem\ - ${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4 + ${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem LIB_DEPENDS= libcppunit.so:${PORTSDIR}/devel/cppunit \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \ libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ - libportaudio.so:${PORTSDIR}/audio/portaudio2 \ + libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ libjack.so:${PORTSDIR}/audio/jack \ libasound.so:${PORTSDIR}/audio/alsa-lib \ libgsl.so:${PORTSDIR}/math/gsl @@ -47,6 +45,7 @@ CMAKE_ARGS+= -DICONV_PREFIX:STRING="${IC # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace DOCSDIR= share/doc/${PORTNAME}-${PORTVERSION} +USE_GNOME= pygtk2 USE_WX= 3.0+ USE_QT4= gui xml qmake moc rcc uic WX_COMPS= wx wx:build wx:run python:build python:run Modified: projects/rework-dependency-registration/comms/linrad/Makefile ============================================================================== --- projects/rework-dependency-registration/comms/linrad/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/comms/linrad/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -15,7 +15,7 @@ MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio DSP utility (SDR) LIB_DEPENDS= librtlsdr.so:${PORTSDIR}/comms/rtl-sdr \ - libportaudio.so:${PORTSDIR}/audio/portaudio2 \ + libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ libftdi.so:${PORTSDIR}/devel/libftdi BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm Modified: projects/rework-dependency-registration/comms/quisk/Makefile ============================================================================== --- projects/rework-dependency-registration/comms/quisk/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/comms/quisk/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -14,7 +14,7 @@ COMMENT= Software Defined Radio (SDR) LICENSE= GPLv2 LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 \ - libportaudio.so:${PORTSDIR}/audio/portaudio2 \ + libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ libasound.so:${PORTSDIR}/audio/alsa-lib \ libpulse.so:${PORTSDIR}/audio/pulseaudio Modified: projects/rework-dependency-registration/deskutils/conduit/Makefile ============================================================================== --- projects/rework-dependency-registration/deskutils/conduit/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/deskutils/conduit/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -15,13 +15,13 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gooc ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ xmlproc_parse:${PORTSDIR}/textproc/py-xml \ ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \ - ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus + ${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ xmlproc_parse:${PORTSDIR}/textproc/py-xml \ ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \ - ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ + ${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \ xdg-open:${PORTSDIR}/devel/xdg-utils GNU_CONFIGURE= yes Modified: projects/rework-dependency-registration/deskutils/gnome-documents/Makefile ============================================================================== --- projects/rework-dependency-registration/deskutils/gnome-documents/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/deskutils/gnome-documents/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -23,7 +23,7 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDI libgjs.so:${PORTSDIR}/lang/gjs \ libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker \ libzapojit-0.0.so:${PORTSDIR}/net/libzapojit -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ +RUN_DEPENDS= py2?-dbus>0:${PORTSDIR}/devel/py-dbus \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ unoconv:${PORTSDIR}/textproc/unoconv Modified: projects/rework-dependency-registration/deskutils/xfce4-tumbler/Makefile ============================================================================== --- projects/rework-dependency-registration/deskutils/xfce4-tumbler/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/deskutils/xfce4-tumbler/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -86,8 +86,7 @@ USE_GNOME+= gdkpixbuf2 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer PLIST_SUB+= PIXBUF="" .endif -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libexif.so:${PORTSDIR}/graphics/exif +LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--enable-jpeg-thumbnailer PLIST_SUB+= JPEG="" .else Modified: projects/rework-dependency-registration/devel/Makefile ============================================================================== --- projects/rework-dependency-registration/devel/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/devel/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -387,6 +387,7 @@ SUBDIR += ebnf2yacc SUBDIR += ecgi SUBDIR += edb + SUBDIR += editline SUBDIR += efivar SUBDIR += efl SUBDIR += eggdbus Modified: projects/rework-dependency-registration/devel/libedit/Makefile ============================================================================== --- projects/rework-dependency-registration/devel/libedit/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/devel/libedit/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -23,4 +23,6 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-widec MAKE_ENV= LC_ALL=C +CONFLICT_INSTALL= editline-* + .include <bsd.port.mk> Modified: projects/rework-dependency-registration/devel/libedit/pkg-descr ============================================================================== --- projects/rework-dependency-registration/devel/libedit/pkg-descr Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/devel/libedit/pkg-descr Sun Jan 25 09:06:00 2015 (r377868) @@ -1,3 +1,5 @@ libedit provides command line editing functionality. Both emacs and vi key bindings are supported. Note that the base system also includes libedit, but this port is generally more current. + +WWW: http://thrysoee.dk/editline/ Modified: projects/rework-dependency-registration/devel/py-roxlib/Makefile ============================================================================== --- projects/rework-dependency-registration/devel/py-roxlib/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/devel/py-roxlib/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -12,9 +12,9 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Python libraries for ROX USES= python tar:bzip2 +USE_GNOME= pygtk2:run -RUN_DEPENDS= ${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \ - ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2 +RUN_DEPENDS= ${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer do-build: @${PYTHON_CMD} -m compileall ${WRKSRC} Modified: projects/rework-dependency-registration/devel/ruby-build/Makefile ============================================================================== --- projects/rework-dependency-registration/devel/ruby-build/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/devel/ruby-build/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -9,7 +9,7 @@ COMMENT= Compile and install different r LICENSE= MIT -RUN_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \ +RUN_DEPENDS= autoconf>0:${PORTSDIR}/devel/autoconf \ curl:${PORTSDIR}/ftp/curl \ gmake:${PORTSDIR}/devel/gmake Modified: projects/rework-dependency-registration/devel/scala-ide/Makefile ============================================================================== --- projects/rework-dependency-registration/devel/scala-ide/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/devel/scala-ide/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/site .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MWTP} -RUN_DEPENDS+= ${LOCALBASE}/share/eclipse/dropins/webtools:${PORTSDIR}/java/eclipse-webtools +RUN_DEPENDS+= eclipse-webtools>0:${PORTSDIR}/java/eclipse-webtools .endif .include "${.CURDIR}/../../java/eclipse/Makefile.plugins" Modified: projects/rework-dependency-registration/editors/xcoral/Makefile ============================================================================== --- projects/rework-dependency-registration/editors/xcoral/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/editors/xcoral/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -3,7 +3,7 @@ PORTNAME= xcoral PORTVERSION= 3.47 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= http://xcoral.free.fr/ Modified: projects/rework-dependency-registration/emulators/hatari/Makefile ============================================================================== --- projects/rework-dependency-registration/emulators/hatari/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/emulators/hatari/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -13,9 +13,8 @@ COMMENT= Atari ST emulator LICENSE= GPLv2 # (or later) -BUILD_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2 -LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png -RUN_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2 +LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ + libpng.so:${PORTSDIR}/graphics/png USES= cmake readline tar:bzip2 USE_GNOME= pygtk2 Modified: projects/rework-dependency-registration/emulators/wine-devel/Makefile ============================================================================== --- projects/rework-dependency-registration/emulators/wine-devel/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/emulators/wine-devel/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 1.7.34 +DISTVERSION= 1.7.35 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ Modified: projects/rework-dependency-registration/emulators/wine-devel/distinfo ============================================================================== --- projects/rework-dependency-registration/emulators/wine-devel/distinfo Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/emulators/wine-devel/distinfo Sun Jan 25 09:06:00 2015 (r377868) @@ -1,4 +1,4 @@ -SHA256 (wine-1.7.34.tar.bz2) = 4d5a3b25450fb232aa9d0d0dd859b7d50b8ffb6180f24aefb6eb4e400d32330b -SIZE (wine-1.7.34.tar.bz2) = 21956792 -SHA256 (v1.7.34.tar.gz) = 9e71b5d3ce0cd8c4c511c375bcdae74de33d96dbda1d1e70fc7eb8708ee018dc -SIZE (v1.7.34.tar.gz) = 8865976 +SHA256 (wine-1.7.35.tar.bz2) = eb2ef652a302c366d3f6ee9315790f162b1c0913d442cb5a856d9f7d95e31cfb +SIZE (wine-1.7.35.tar.bz2) = 22005666 +SHA256 (v1.7.35.tar.gz) = f1663938c29ab20c493569a5eaba7711a0f0d47cf5e4b9988f97140de2599b16 +SIZE (v1.7.35.tar.gz) = 8896849 Modified: projects/rework-dependency-registration/emulators/wine-devel/pkg-plist ============================================================================== --- projects/rework-dependency-registration/emulators/wine-devel/pkg-plist Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/emulators/wine-devel/pkg-plist Sun Jan 25 09:06:00 2015 (r377868) @@ -1638,6 +1638,7 @@ lib/wine/fakedlls/wuaueng.dll lib/wine/fakedlls/wusa.exe lib/wine/fakedlls/x3daudio1_7.dll lib/wine/fakedlls/xapofx1_1.dll +lib/wine/fakedlls/xaudio2_7.dll lib/wine/fakedlls/xcopy.exe lib/wine/fakedlls/xinput1_1.dll lib/wine/fakedlls/xinput1_2.dll @@ -2214,6 +2215,7 @@ lib/wine/wuaueng.dll.so lib/wine/wusa.exe.so lib/wine/x3daudio1_7.dll.so lib/wine/xapofx1_1.dll.so +lib/wine/xaudio2_7.dll.so lib/wine/xcopy.exe.so lib/wine/xinput1_1.dll.so lib/wine/xinput1_2.dll.so Modified: projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/Makefile ============================================================================== --- projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -3,7 +3,7 @@ PORTNAME= RFinanceYJ PORTVERSION= 0.3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= finance DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/distinfo ============================================================================== --- projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/distinfo Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/distinfo Sun Jan 25 09:06:00 2015 (r377868) @@ -1,2 +1,2 @@ -SHA256 (RFinanceYJ_0.3.1.tar.gz) = b8fc8b7e6dcf0683b84df985749f6ebe2674f2761f3c64c9532a387965c7c0a9 -SIZE (RFinanceYJ_0.3.1.tar.gz) = 3719 +SHA256 (RFinanceYJ_0.3.1.tar.gz) = a33eeb02a919490bdaa3b2c7721c03a122f8a5d2574f39d90757b00399fe1562 +SIZE (RFinanceYJ_0.3.1.tar.gz) = 3635 Modified: projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/files/patch-R-quoteStockTsData.R ============================================================================== --- projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/files/patch-R-quoteStockTsData.R Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/finance/R-cran-RFinanceYJ/files/patch-R-quoteStockTsData.R Sun Jan 25 09:06:00 2015 (r377868) @@ -1,15 +1,70 @@ --- R/quoteStockTsData.R.orig 2013-08-13 00:05:58.000000000 +0900 -+++ R/quoteStockTsData.R 2014-05-25 10:58:31.000000000 +0900 -@@ -57,10 +57,10 @@ - - extractQuoteTable <- function(r,type){ - if(type %in% c("fund","fx")){ ++++ R/quoteStockTsData.R 2015-01-24 20:34:35.000000000 +0900 +@@ -46,42 +46,33 @@ + #get time series data from Yahoo! Finance. + quoteTsData <- function(x,function.financialproduct,since,start.num,date.end,time.interval,type="stock"){ + r <- NULL +- result.num <- 51 + financial.data <- data.frame(NULL) +- #start <- (gsub("([0-9]{4,4})-([0-9]{2,2})-([0-9]{2,2})","&c=\\1&a=\\2&b=\\3",since)) +- #end <- (gsub("([0-9]{4,4})-([0-9]{2,2})-([0-9]{2,2})","&f=\\1&d=\\2&e=\\3",date.end)) + start <- (gsub("([0-9]{4,4})-([0-9]{2,2})-([0-9]{2,2})","&sy=\\1&sm=\\2&sd=\\3",since)) + end <- (gsub("([0-9]{4,4})-([0-9]{2,2})-([0-9]{2,2})","&ey=\\1&em=\\2&ed=\\3",date.end)) + + if(!any(time.interval==c('d','w','m'))) stop("Invalid time.interval value") +- +- extractQuoteTable <- function(r,type){ +- if(type %in% c("fund","fx")){ - tbl <- r[[2]][[2]][[7]][[3]][[3]][[9]][[2]] -+ tbl <- r[[2]][[2]][[7]][[3]][[3]][[8]][[2]] - } - else{ +- } +- else{ - tbl <- r[[2]][[2]][[7]][[3]][[3]][[10]][[2]] -+ tbl <- r[[2]][[2]][[7]][[3]][[3]][[11]][[2]] +- } +- return(tbl) +- } +- +- while( result.num >= 51 ){ ++ while( 1 ){ + start.num <- start.num + 1 + quote.table <- NULL + quote.url <- paste('http://info.finance.yahoo.co.jp/history/?code=',x,start,end,'&p=',start.num,'&tm=',substr(time.interval,1,1),sep="") + +- try( r <- xmlRoot(htmlTreeParse(quote.url,error=xmlErrorCumulator(immediate=F))), TRUE) ++ try( r <- htmlParse(quote.url) ) + if( is.null(r) ) stop(paste("Can not access :", quote.url)) + +- #try( quote.table <- r[[2]][[1]][[1]][[16]][[1]][[1]][[1]][[4]][[1]][[1]][[1]], TRUE ) +- try( quote.table <- extractQuoteTable(r,type), TRUE ) ++ try( quote.table <- xpathApply(r,"//table")[[2]], TRUE ) ++ ++ quote.size <- xmlSize(quote.table) ++ ++ if( xmlSize(quote.table) <= 1 ){ ++ return(financial.data) ++ } + + if( is.null(quote.table) ){ + if( is.null(financial.data) ){ + stop(paste("Can not quote :", x)) + }else{ +- financial.data <- financial.data[order(financial.data$date),] +- return(financial.data) ++ financial.data <- financial.data[order(financial.data$date),] ++ return(financial.data) + } + } + +@@ -90,7 +81,6 @@ + financial.data <- rbind(financial.data,function.financialproduct(quote.table[[i]])) } - return(tbl) + +- result.num <- xmlSize(quote.table) + Sys.sleep(1) } + financial.data <- financial.data[order(financial.data$date),] +@@ -120,5 +110,3 @@ + return(startOfNextMonth-1) + } + +- +- Modified: projects/rework-dependency-registration/games/Makefile ============================================================================== --- projects/rework-dependency-registration/games/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -590,6 +590,7 @@ SUBDIR += mindguard SUBDIR += minecraft-client SUBDIR += minecraft-server + SUBDIR += minerbold SUBDIR += minetest SUBDIR += minetest_game SUBDIR += mirrormagic Modified: projects/rework-dependency-registration/games/balazarbrothers/Makefile ============================================================================== --- projects/rework-dependency-registration/games/balazarbrothers/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/balazarbrothers/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcal3d.so:${PORTSDIR}/graphics/cal3d \ libfreetype.so:${PORTSDIR}/print/freetype2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ogg>0:${PORTSDIR}/audio/py-vorbis \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:${PORTSDIR}/audio/py-vorbis \ ${PYTHON_PKGNAMEPREFIX}soya3d>0:${PORTSDIR}/graphics/py-soya3d \ ${PYTHON_PKGNAMEPREFIX}tofu>0:${PORTSDIR}/net/py-tofu \ ${PYTHON_PKGNAMEPREFIX}cerealizer>0:${PORTSDIR}/security/py-cerealizer Modified: projects/rework-dependency-registration/games/dodgindiamond2/Makefile ============================================================================== --- projects/rework-dependency-registration/games/dodgindiamond2/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/dodgindiamond2/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -1,19 +1,19 @@ # Created by: Jean-Yves Lefort <jylefort@brutele.be> # $FreeBSD$ -PORTNAME= dodgindiamond2 -PORTVERSION= 0.2.2 -PORTREVISION= 10 -CATEGORIES= games -MASTER_SITES= http://www.usebox.net/jjm/dd2/releases/ -DISTNAME= dd2-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Old school shoot'em up game - -USE_SDL= sdl image mixer -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var/games +PORTNAME= dodgindiamond2 +PORTVERSION= 0.2.2 +PORTREVISION= 11 +CATEGORIES= games +MASTER_SITES= http://www.usebox.net/jjm/dd2/releases/ +DISTNAME= dd2-${PORTVERSION} + +MAINTAINER= ports@FreeBSD.org +COMMENT= Old school shoot'em up game + +USE_SDL= sdl image mixer +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir=/var/games OPTIONS_DEFINE= DOCS @@ -29,5 +29,7 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/src/data/dd2.cfg ${STAGEDIR}${PREFIX}/etc/dd2.cfg.sample + ${MKDIR} ${STAGEDIR}/var/games + ${TOUCH} ${STAGEDIR}/var/games/dd2-hiscore.sample .include <bsd.port.mk> Modified: projects/rework-dependency-registration/games/dodgindiamond2/pkg-plist ============================================================================== --- projects/rework-dependency-registration/games/dodgindiamond2/pkg-plist Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/dodgindiamond2/pkg-plist Sun Jan 25 09:06:00 2015 (r377868) @@ -1,13 +1,6 @@ -@group games -@mode 2755 -bin/dd2 -@mode -@group -@exec touch /var/games/dd2-hiscore ; chmod 664 /var/games/dd2-hiscore -@unexec if [ -f /var/games/dd2-hiscore ] ; then rm /var/games/dd2-hiscore; fi -@unexec if cmp -s %D/etc/dd2.cfg %D/etc/dd2.cfg.sample; then rm -f %D/etc/dd2.cfg; fi -etc/dd2.cfg.sample -@exec if test ! -f %D/etc/dd2.cfg; then cp -p %D/etc/dd2.cfg.sample %D/etc/dd2.cfg; fi +@(,games,2755) bin/dd2 +@sample(,games,664) /var/games/dd2-hiscore.sample +@sample etc/dd2.cfg.sample share/dd2/bgm1.xm share/dd2/bgm2.xm share/dd2/efx1.wav @@ -25,5 +18,3 @@ share/dd2/gfx.bmp %%PORTDOCS%%share/doc/dd2/NEWS %%PORTDOCS%%share/doc/dd2/README %%PORTDOCS%%share/doc/dd2/TODO -@dirrm share/dd2 -%%PORTDOCS%%@dirrm share/doc/dd2 Modified: projects/rework-dependency-registration/games/hedgewars/Makefile ============================================================================== --- projects/rework-dependency-registration/games/hedgewars/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/hedgewars/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hedgewars -PORTVERSION= 0.9.20.5 -PORTREVISION= 4 +PORTVERSION= 0.9.21.1 CATEGORIES= games MASTER_SITES= http://download.gna.org/hedgewars/ \ http://mirror.amdmi3.ru/distfiles/ @@ -15,6 +14,8 @@ COMMENT= Free Worms-like turn based stra LICENSE= GPLv2 GFDL LICENSE_COMB= multi +LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs + ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= depends on fpc which is only available for i386 and amd64 @@ -30,11 +31,10 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:C/\.[0-9]$//} PLIST_FILES= bin/${PORTNAME} bin/hwengine \ + share/appdata/hedgewars.appdata.xml \ share/applications/${PORTNAME}.desktop \ share/pixmaps/${PORTNAME}.png \ - lib/libhwphysfs.so \ - lib/libhwphysfs.so.1 \ - lib/libhwphysfs.so.2.1.0 \ + share/pixmaps/${PORTNAME}.xpm \ lib/libphyslayer.so PORTDATA= * @@ -48,17 +48,19 @@ SERVER_DESC= Build server (requires hask #VIDEOREC_LIB_DEPENDS=libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 #VIDEOREC_CMAKE_OFF=-DNOVIDEOREC=1 -SERVER_BUILD_DEPENDS=\ - ghc:${PORTSDIR}/lang/ghc \ - hs-vector>=0:${PORTSDIR}/devel/hs-vector \ - hs-network>=0:${PORTSDIR}/net/hs-network \ - hs-utf8-string>=0:${PORTSDIR}/devel/hs-utf8-string \ - hs-bytestring-show>=0:${PORTSDIR}/devel/hs-bytestring-show \ - hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc \ - hs-random>=0:${PORTSDIR}/devel/hs-random \ - hs-hslogger>=0:${PORTSDIR}/devel/hs-hslogger -SERVER_CMAKE_OFF=-DNOSERVER=1 -SERVER_PLIST_FILES=bin/${PORTNAME}-server +SERVER_BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-vector>=0:${PORTSDIR}/devel/hs-vector \ + hs-network>=0:${PORTSDIR}/net/hs-network \ + hs-utf8-string>=0:${PORTSDIR}/devel/hs-utf8-string \ + hs-bytestring-show>=0:${PORTSDIR}/devel/hs-bytestring-show \ + hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc \ + hs-random>=0:${PORTSDIR}/devel/hs-random \ + hs-hslogger>=0:${PORTSDIR}/devel/hs-hslogger \ + hs-SHA>=0:${PORTSDIR}/security/hs-SHA \ + hs-entropy>=0:${PORTSDIR}/security/hs-entropy \ + hs-zlib>=0:${PORTSDIR}/archivers/hs-zlib +SERVER_CMAKE_OFF= -DNOSERVER=1 +SERVER_PLIST_FILES= bin/${PORTNAME}-server post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/cmake_modules/*.cmake Modified: projects/rework-dependency-registration/games/hedgewars/distinfo ============================================================================== --- projects/rework-dependency-registration/games/hedgewars/distinfo Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/hedgewars/distinfo Sun Jan 25 09:06:00 2015 (r377868) @@ -1,2 +1,2 @@ -SHA256 (hedgewars-src-0.9.20.5.tar.bz2) = a6d0896fe88d5746a4272c8f495c7457b17586e8d16ef429ce50dfa449c0adcc -SIZE (hedgewars-src-0.9.20.5.tar.bz2) = 161550331 +SHA256 (hedgewars-src-0.9.21.1.tar.bz2) = 590a9458d2123c5550d5eb39edfed28d0663703d76e13c8987237c92ca41f3f8 +SIZE (hedgewars-src-0.9.21.1.tar.bz2) = 160250791 Copied: projects/rework-dependency-registration/games/hedgewars/files/patch-CMakeLists.txt (from r377867, head/games/hedgewars/files/patch-CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/rework-dependency-registration/games/hedgewars/files/patch-CMakeLists.txt Sun Jan 25 09:06:00 2015 (r377868, copy of r377867, head/games/hedgewars/files/patch-CMakeLists.txt) @@ -0,0 +1,12 @@ +Fix ghc stack overflow while building server +--- CMakeLists.txt.orig 2015-01-06 23:55:59.000000000 +0300 ++++ CMakeLists.txt 2015-01-24 22:39:01.000000000 +0300 +@@ -108,7 +108,7 @@ + endif() + endif() + +-list(APPEND haskell_flags ${ghflags_parsed} "-O2") ++list(APPEND haskell_flags ${ghflags_parsed}) + + #get BUILD_TYPE and enable/disable optimisation + message(STATUS "Using ${CMAKE_BUILD_TYPE} configuration") Modified: projects/rework-dependency-registration/games/lbreakout/Makefile ============================================================================== --- projects/rework-dependency-registration/games/lbreakout/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/lbreakout/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -3,25 +3,29 @@ PORTNAME= lbreakout PORTVERSION= 010315 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/lgames/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Nice clone of classical Breakout game +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING + USE_SDL= sdl USES= gmake GNU_CONFIGURE= yes LIBS+= -lcompat post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - @${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ - 's|"SDL/SDL|"SDL|g ; \ - s|<SDL/SDL|<SDL|g' + @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure pre-install: ${MKDIR} ${STAGEDIR}/var/games/${PORTNAME} +post-install: + ${MV} ${STAGEDIR}/var/games/${PORTNAME}/lbreakout.hscr \ + ${STAGEDIR}/var/games/${PORTNAME}/lbreakout.hscr.sample + .include <bsd.port.mk> Copied: projects/rework-dependency-registration/games/lbreakout/files/patch-lbreakout__hiscore.h (from r377867, head/games/lbreakout/files/patch-lbreakout__hiscore.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/rework-dependency-registration/games/lbreakout/files/patch-lbreakout__hiscore.h Sun Jan 25 09:06:00 2015 (r377868, copy of r377867, head/games/lbreakout/files/patch-lbreakout__hiscore.h) @@ -0,0 +1,20 @@ +--- lbreakout/hiscore.h.orig 2001-02-24 22:00:24.000000000 +0300 ++++ lbreakout/hiscore.h 2015-01-25 05:37:12.000000000 +0300 +@@ -60,7 +60,7 @@ + protected: + HiScoreEntry *entries; + int entry_num; +- char filename[32]; ++ char filename[1024]; + public: + StandardHiScore(char* f); + StandardHiScore(FILE* f); +@@ -88,7 +88,7 @@ + // maintains two tables: one per score, the other per level + class CompositeHiScore : public HiScore { + private: +- char filename[32]; ++ char filename[1024]; + LevelHiScore* pLevel; + StandardHiScore* pStandard; + Modified: projects/rework-dependency-registration/games/lbreakout/pkg-plist ============================================================================== --- projects/rework-dependency-registration/games/lbreakout/pkg-plist Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/lbreakout/pkg-plist Sun Jan 25 09:06:00 2015 (r377868) @@ -43,6 +43,5 @@ share/lbreakout/wall.wav share/lbreakout/weapon.bmp share/lbreakout/weapon.wav share/lbreakout/wontgiveup.wav -@dirrm share/lbreakout -@(root,games,664) /var/games/lbreakout/lbreakout.hscr -@dirrm /var/games/lbreakout +@sample(root,games,664) /var/games/lbreakout/lbreakout.hscr.sample +@dir /var/games/lbreakout Modified: projects/rework-dependency-registration/games/linux-candycruncher-demo/Makefile ============================================================================== --- projects/rework-dependency-registration/games/linux-candycruncher-demo/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/linux-candycruncher-demo/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -24,6 +24,8 @@ PORTDOCS= README README.licenses README. LIBFILES= libcrypto.so.0.9.8 libgrapple-0.9.so.2 liblua.so liblualib.so \ libssl.so.0.9.8 +BROKEN= Does not fetch + do-extract: @${MKDIR} ${WRKSRC} @cd ${WRKSRC} && ${TAIL} +377 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ Modified: projects/rework-dependency-registration/games/linux-coldwar-demo/Makefile ============================================================================== --- projects/rework-dependency-registration/games/linux-coldwar-demo/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/linux-coldwar-demo/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -24,6 +24,8 @@ PORTDOCS= README README.licenses EULA OPTIONS_DEFINE= NVIDIA DOCS NVIDIA_DESC= Enable nvidia graphics driver support +BROKEN= Does not fetch + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNVIDIA} Modified: projects/rework-dependency-registration/games/linux-gorky17-demo/Makefile ============================================================================== --- projects/rework-dependency-registration/games/linux-gorky17-demo/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/linux-gorky17-demo/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -25,6 +25,8 @@ DATFILES= adjust.dat demo1.jpg demo2.jpg OPTIONS_DEFINE= NVIDIA DOCS NVIDIA_DESC= Enable nvidia graphics driver support +BROKEN= Does not fetch + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNVIDIA} Modified: projects/rework-dependency-registration/games/linux-hdb-demo/Makefile ============================================================================== --- projects/rework-dependency-registration/games/linux-hdb-demo/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/linux-hdb-demo/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -22,6 +22,8 @@ DATADIR= ${PREFIX}/lib/${PKGNAMEPREFIX}$ SUB_FILES= hdb PORTDOCS= README README.licenses README.unixthanks license.txt +BROKEN= Does not fetch + .include <bsd.port.pre.mk> do-extract: Modified: projects/rework-dependency-registration/games/linux-majesty-demo/Makefile ============================================================================== --- projects/rework-dependency-registration/games/linux-majesty-demo/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/linux-majesty-demo/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -22,6 +22,8 @@ DATADIR= ${PREFIX}/lib/${PKGNAMEPREFIX}$ SUB_FILES= majesty PORTDOCS= README README.licenses EULA +BROKEN= Does not fetch + .include <bsd.port.pre.mk> do-extract: Modified: projects/rework-dependency-registration/games/linux-ningpo-demo/Makefile ============================================================================== --- projects/rework-dependency-registration/games/linux-ningpo-demo/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/linux-ningpo-demo/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -22,6 +22,8 @@ DATADIR= ${PREFIX}/lib/${PKGNAMEPREFIX}$ SUB_FILES= ningpo PORTDOCS= README README.licenses license.txt +BROKNE= Does not fetch + .include <bsd.port.pre.mk> do-extract: Modified: projects/rework-dependency-registration/games/lmarbles/Makefile ============================================================================== --- projects/rework-dependency-registration/games/lmarbles/Makefile Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/lmarbles/Makefile Sun Jan 25 09:06:00 2015 (r377868) @@ -13,27 +13,21 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${E MAINTAINER= ports@FreeBSD.org COMMENT= Atomix-like game of moving marbles in puzzles -LICENSE= GPLv2 +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake USE_SDL= sdl mixer GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${ETCDIR} +CONFIGURE_ARGS= --localstatedir=/var/games/${PORTNAME} PORTDOCS= * -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= AUTHORS ChangeLog README README-SDL.txt - -DOCSRCDIR2= ${WRKSRC}/src/manual -DOCSDIR2= ${DOCSDIR}/manual -DOC_FILES2= *.jpg *.html - OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|(datadir)/icons|(datadir)/pixmaps|; \ - s|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|' \ + s|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|-m 666||; \ s|lmarbles.prfs|lmarbles.prfs.sample|' \ @@ -45,12 +39,7 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ - @${CHMOD} -R 464 ${STAGEDIR}${ETCDIR}/lmarbles.prfs.sample - @${CHOWN} root:games ${STAGEDIR}${ETCDIR}/lmarbles.prfs.sample - - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} + cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog README README-SDL.txt" ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/src && ${COPYTREE_SHARE} "manual" ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: projects/rework-dependency-registration/games/lmarbles/pkg-plist ============================================================================== --- projects/rework-dependency-registration/games/lmarbles/pkg-plist Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/lmarbles/pkg-plist Sun Jan 25 09:06:00 2015 (r377868) @@ -1,7 +1,4 @@ -bin/lmarbles -@unexec if cmp -s %D/%%ETCDIR%%/lmarbles.prfs.sample %D/%%ETCDIR%%/lmarbles.prfs ; then rm -f %D/%%ETCDIR%%/lmarbles.prfs ; fi -%%ETCDIR%%/lmarbles.prfs.sample -@exec if [ ! -f %D/%%ETCDIR%%/lmarbles.prfs ] ; then cp -p %D/%F %B/lmarbles.prfs ; fi +@(,games,2755) bin/lmarbles man/man6/lmarbles.6.gz share/applications/lmarbles.desktop %%DATADIR%%/gfx/board.bmp @@ -72,11 +69,5 @@ share/applications/lmarbles.desktop share/pixmaps/lmarbles32.png share/pixmaps/lmarbles48.gif share/pixmaps/lmarbles48.png -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/levels -@dirrm %%DATADIR%%/gfx/wood -@dirrm %%DATADIR%%/gfx/stone -@dirrm %%DATADIR%%/gfx/metal -@dirrm %%DATADIR%%/gfx -@dirrm %%DATADIR%% -@dirrmtry %%ETCDIR%% +@sample(,games,664) /var/games/lmarbles/lmarbles.prfs.sample +@dir /var/games/lmarbles Modified: projects/rework-dependency-registration/games/openarena/Makefile.include ============================================================================== --- projects/rework-dependency-registration/games/openarena/Makefile.include Sun Jan 25 08:58:31 2015 (r377867) +++ projects/rework-dependency-registration/games/openarena/Makefile.include Sun Jan 25 09:06:00 2015 (r377868) @@ -6,7 +6,7 @@ OABASE?= baseoa PLIST_SUB+= OADIR="share/openarena" .if ! ${OABASE:Mbaseoa} -RUN_DEPENDS+= ${OABIN}:${PORTSDIR}/games/openarena +RUN_DEPENDS+= openarena>0:${PORTSDIR}/games/openarena .endif .include <bsd.port.pre.mk> Copied: projects/rework-dependency-registration/games/xmoto/files/patch-src-GameInit.cpp (from r377867, head/games/xmoto/files/patch-src-GameInit.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/rework-dependency-registration/games/xmoto/files/patch-src-GameInit.cpp Sun Jan 25 09:06:00 2015 (r377868, copy of r377867, head/games/xmoto/files/patch-src-GameInit.cpp) @@ -0,0 +1,11 @@ +--- src/GameInit.cpp.orig 2015-01-10 18:22:36.000000000 +0100 ++++ src/GameInit.cpp 2015-01-10 18:27:28.000000000 +0100 +@@ -248,7 +248,7 @@ void GameApp::run_load(int nNumArgs, cha + Logger::setActiv(XMSession::instance()->noLog() == false); /* apply log activ mode */ + + LogInfo(std::string("X-Moto " + XMBuild::getVersionString(true)).c_str()); +- LogInfo("compiled at "__DATE__" "__TIME__); ++ LogInfo("compiled at " __DATE__ " " __TIME__); + if(SwapEndian::bigendien) { + LogInfo("Systeme is bigendien"); + } else { Copied: projects/rework-dependency-registration/games/xmoto/files/patch-src-WWW.cpp (from r377867, head/games/xmoto/files/patch-src-WWW.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/rework-dependency-registration/games/xmoto/files/patch-src-WWW.cpp Sun Jan 25 09:06:00 2015 (r377868, copy of r377867, head/games/xmoto/files/patch-src-WWW.cpp) @@ -0,0 +1,47 @@ +--- src/WWW.cpp.orig 2015-01-10 18:11:22.000000000 +0100 ++++ src/WWW.cpp 2015-01-10 18:21:32.000000000 +0100 +@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri + std::string v_www_agent = WWW_AGENT; + + /* open the file */ +- if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) { ++ if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == NULL) { + throw Exception("error : unable to open output file " + + v_local_file_tmp); + } +@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri + LogInfo(std::string("Uploading replay " + p_replayFilename).c_str()); + + /* open the file */ +- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) { ++ if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) { + throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR")); + } + +@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string& + LogInfo("Sending vote"); + + /* open the file */ +- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) { ++ if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) { + throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV")); + } + +@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string + LogInfo("Sending report"); + + /* open the file */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501250906.t0P9611r044045>