amd64 bulk build failures 2014-07-22
Here's the breakage from the 2014-07-22 amd64 bulk build, which used dpb -r: devel/monodevelop mono devel/msp430/gccgengtype internal error games/alephone/weland mono (Mono.Cairo) lang/mono-basic mono mail/dovecotssl compression x11/kde4/kstars missing library for qjson>=0.0 mono-basic and monodevelop have been taken care of already. -- Christian "naddy" Weisgerber na...@mips.inka.de
chromium 'user_action_event.pb.h' file not found
I'm trying a clean+rebuild now to see if it recurs, but ... [9334/13362] CXX obj/chrome/browser/ui/webui/memory_internals/browser_ui.memory_internals_ui.o FAILED: /usr/local/bin/clang++ -MMD -MF obj/chrome/browser/ui/webui/browser_ui.flash_ui.o.d -DV8_DEPRECATION_WARNINGS -DBLINK_SCALE_FILTERS_AT_RECORD_TIME -D_FILE_OFFSET_BITS=64 -DNO_TCMALLOC -DDISABLE_NACL -DCHROMIUM_BUILD -DCR_CLANG_REVISION=206824 -DTOOLKIT_VIEWS=1 -DUSE_AURA=1 -DUSE_CAIRO=1 -DUSE_GLIB=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DUSE_X11=1 -DUSE_CLIPBOARD_AURAX11=1 -DENABLE_ONE_CLICK_SIGNIN -DUSE_XI2_MT=2 -DENABLE_REMOTING=1 -DUSE_PROPRIETARY_CODECS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_EGLIMAGE=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2 -DENABLE_FULL_PRINTING=1 -DENABLE_PRINTING=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1 '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:! 80/"' '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/";' '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/";' '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect";' -DNACL_TARGET_SUBARCH=32 -DNACL_TARGET_ARCH=x86 -DNACL_BUILD_SUBARCH=32 -DNACL_BUILD_ARCH=x86 -DFULL_SAFE_BROWSING -DGL_GLEXT_PROTOTYPES -DMOJO_USE_SYSTEM_IMPL -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DPASSWORD_MANAGER_ENABLE_SYNC -DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1 -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT -DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1 -DSK_SUPPORT_LEGACY_GETTOPDEVICE -DSK_SUPPORT_LEGACY_N32_NAME -DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE -DSK_SUPPORT_LEGACY_GETTOTALCLIP -DSK_USE_POSIX_THREADS -DSK_DEFERRED_CANVAS_USES_FACTORIES=1 -DU_USING_ICU_NAMESPACE=0 -DUSE! _SYSTEM_LIBXML -DHUNSPELL_STATIC -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DPOSIX -DBSD -DOPENBSD -DUSE_CUPS -DUSE_GIO '-DCUSTOM_BASICTYPES="base/basictypes.h"' '-DCUSTOM_SCOPED_PTR="base/memory/scoped_ptr.h"' -DUSE_NSS=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_FORTIFY_SOURCE=2 -Igen/shim_headers/libusb/target -Igen/shim_headers/libspeex/target -Igen/shim_headers/libpng/target -Igen/shim_headers/icui18n/target -Igen/shim_headers/icuuc/target -Igen/shim_headers/libevent/target -I../.. -Iobj/chrome/browser_ui.gen -Igen -Iobj/chrome/browser_ui.gen/chrome -I../../skia/config -I../../third_party/khronos -I../../gpu -I../../third_party/WebKit/Source -Igen/protoc_out -I../../third_party/protobuf -I../../third_party/protobuf/src -Igen/chrome -Igen/components -Igen/components/strings -I../../third_party/WebKit -I../../net/third_party/nss/ssl -I../../third_p! arty/skia/src/core -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../skia/ext -I../../third_party/cacheinvalidation/overrides -I../../third_party/cacheinvalidation/src -I../../third_party/cacheinvalidation/google/cacheinvalidation -I../../third_party/zlib -Igen/ui/app_locale_settings -Igen/ui/ui_strings -Igen/ui/ui_resources -I../../third_party/re2 -I../../third_party/leveldatabase/src/include -I../../third_party/leveldatabase/src -I../../third_party/leveldatabase -I../../third_party/libjingle/overrides -I../../third_party/libjingle/source -I../../testing/gtest/include -I../../third_party -I../../third_party/webrtc -I../../third_party/npapi -I../../third_party/npapi/binding! s -I../../v8/include -Igen/webkit -Igen/policy -Igen/ash/resources -Igen/ui/keyboard -I../../third_party/libaddressinput/chromium/cpp/include -Igen/third_party/libaddressinput/ -fstack-protector --param=ssp-buffer-size=4 -fno-stack-protector -Wno-unknown-warning-option -pthread -fno-exceptions -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-reserved-user-defined-literal -Wno-deprecated-register -Wno-absolute-value -momit-leaf-frame-pointer -fcolor-diagnostics -pthread -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-
Re: Unmarked conflict checking in portcheck
On 2014-07-23, Marc Espie wrote: > Nope, this exists elsewhere. Reuse bin/check-conflicts Speaking of which, here's what check-conflicts reports for the 2014-07-22 amd64 bulk build: cyrus-imapd-2.4.17p7(mail/cyrus-imapd),cyrus-imapd-2.4.17p7-drac(mail/cyrus-imapd,drac),pop3d-1.0p0(mail/pop3d) /usr/local/man/man8/pop3d.8 freedt-0.22p1(sysutils/freedt),ucspi-tcp-0.88p0(net/ucspi-tcp) /usr/local/bin/argv0 /usr/local/bin/recordio p5-TAP-Parser-0.54p0(devel/p5-TAP-Parser),p5-Test-Harness-3.30(devel/p5-Test-Harness) /usr/local/libdata/perl5/site_perl/TAP/Base.pm /usr/local/libdata/perl5/site_perl/TAP/Harness.pm /usr/local/libdata/perl5/site_perl/TAP/Parser.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Aggregator.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Grammar.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator/Array.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator/Process.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator/Stream.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Result.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Bailout.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Comment.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Plan.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Test.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Unknown.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Version.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/YAML.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/Source.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/YAMLish/Reader.pm /usr/local/libdata/perl5/site_perl/TAP/Parser/YAMLish/Writer.pm p5-Tk-804.032p0(x11/p5-Tk,-main),p5-Tk-demo-804.032(x11/p5-Tk,-demo) /usr/local/man/man3p/Tk::demos::widget_lib::slide.3p /usr/local/man/man3p/Tk::demos::widget_lib::trace2.3p py3-distribute-0.6.27p1(devel/py-distribute,python3),py3-setuptools-3.4.4p0v0(devel/py-setuptools,python3) /usr/local/bin/easy_install-3.4 /usr/local/lib/python3.4/site-packages/__pycache__/easy_install.cpython-34.pyc /usr/local/lib/python3.4/site-packages/__pycache__/pkg_resources.cpython-34.pyc /usr/local/lib/python3.4/site-packages/easy_install.py /usr/local/lib/python3.4/site-packages/pkg_resources.py /usr/local/lib/python3.4/site-packages/setuptools/__init__.py /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/__init__.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/archive_util.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/depends.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/dist.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/extension.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/package_index.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/sandbox.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/script template (dev).cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/script template.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/archive_util.py /usr/local/lib/python3.4/site-packages/setuptools/command/__init__.py /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/__init__.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/alias.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/bdist_egg.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/bdist_rpm.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/bdist_wininst.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/build_ext.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/build_py.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/develop.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/easy_install.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/egg_info.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/install.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/install_egg_info.cpython-34.pyc /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/install_lib.cpython-34.pyc
Re: amd64 bulk build failures 2014-07-22
On Thu, Jul 24, 2014 at 01:04:13PM +0200, Christian Weisgerber wrote: > Here's the breakage from the 2014-07-22 amd64 bulk build, which > used dpb -r: > > devel/monodevelop mono > devel/msp430/gcc gengtype internal error > games/alephone/weland mono (Mono.Cairo) > lang/mono-basic mono > mail/dovecot ssl compression > x11/kde4/kstars missing library for qjson>=0.0 > > mono-basic and monodevelop have been taken care of already. "taking care" = marked broken for monodevelop, but sure :)
gnome-shell: chrashes while running pkg_add -u on amd64
Hi, with the last two snapshots i've seen contant crashes of gnome-shell while running pkg_add -u after updating to a newer snapshot. I have no malloc.conf. Running pkg_add -u inside gnome-terminal/ksh. Anything else i should provide? Regards, Fabian gnome-shell.core backtrace 1: #0 0x0d12618999f0 in dl_shallow_copy () from /usr/local/lib/libgio-2.0.so.4000.0 #1 0x0d1261899a89 in dl_calculate () from /usr/local/lib/libgio-2.0.so.4000.0 #2 0x0d1261898420 in _kh_dir_diff () from /usr/local/lib/libgio-2.0.so.4000.0 #3 0x0d12618985f9 in process_kqueue_notifications () from /usr/local/lib/libgio-2.0.so.4000.0 #4 0x0d1273306df2 in g_main_context_dispatch () from /usr/local/lib/libglib-2.0.so.4000.0 #5 0x0d1273308f1e in g_main_context_iterate () from /usr/local/lib/libglib-2.0.so.4000.0 #6 0x0d1273309eb5 in g_main_loop_run () from /usr/local/lib/libglib-2.0.so.4000.0 #7 0x0d12e9f15a32 in meta_run () from /usr/local/lib/libmutter.so.0.1 #8 0x0d1060003138 in __register_frame_info () from /usr/local/bin/gnome-shell #9 0x0d1060002ad1 in ?? () from /usr/local/bin/gnome-shell #10 0x in ?? () gnome-shell.core backtrace 2: #0 0x1a49fc6df9b5 in _atomic_lock (lock=0xdfdfdfdfdfdfdfdf) at /usr/src/lib/librthread/arch/amd64/_atomic_lock.c:21 #1 0x1a49fc6deb6d in _spinlock (lock=0xdfdfdfdfdfdfdfdf) at /usr/src/lib/librthread/rthread.c:81 #2 0x1a49fc6e2008 in _rthread_mutex_lock (mutexp=0x1a4a19b00140, trywait=0, abstime=0x0) at /usr/src/lib/librthread/rthread_sync.c:108 #3 0x1a4a664fbea1 in g_mutex_lock () from /usr/local/lib/libglib-2.0.so.4000.0 #4 0x1a4a479b6d1a in emit_cb () from /usr/local/lib/libgio-2.0.so.4000.0 #5 0x1a4a664b5df2 in g_main_context_dispatch () from /usr/local/lib/libglib-2.0.so.4000.0 #6 0x1a4a664b7f1e in g_main_context_iterate () from /usr/local/lib/libglib-2.0.so.4000.0 #7 0x1a4a664b7ff7 in g_main_context_iteration () from /usr/local/lib/libglib-2.0.so.4000.0 #8 0x1a4a664b8035 in glib_worker_main () from /usr/local/lib/libglib-2.0.so.4000.0 #9 0x1a4a664dd1f9 in g_thread_proxy () from /usr/local/lib/libglib-2.0.so.4000.0 #10 0x1a49fc6df97e in _rthread_start (v=Variable "v" is not available. ) at /usr/src/lib/librthread/rthread.c:145 #11 0x1a4a0eb9559b in __tfork_thread () at /usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:75 #12 0x in ?? () gnome-shell.core backtrace 3: #0 0x008a6ba2a9f0 in dl_shallow_copy () from /usr/local/lib/libgio-2.0.so.4000.0 #1 0x008a6ba2aa89 in dl_calculate () from /usr/local/lib/libgio-2.0.so.4000.0 #2 0x008a6ba29420 in _kh_dir_diff () from /usr/local/lib/libgio-2.0.so.4000.0 #3 0x008a6ba295f9 in process_kqueue_notifications () from /usr/local/lib/libgio-2.0.so.4000.0 #4 0x008ab5143df2 in g_main_context_dispatch () from /usr/local/lib/libglib-2.0.so.4000.0 #5 0x008ab5145f1e in g_main_context_iterate () from /usr/local/lib/libglib-2.0.so.4000.0 #6 0x008ab5146eb5 in g_main_loop_run () from /usr/local/lib/libglib-2.0.so.4000.0 #7 0x008a926aea32 in meta_run () from /usr/local/lib/libmutter.so.0.1 #8 0x00884c303138 in __register_frame_info () from /usr/local/bin/gnome-shell #9 0x00884c302ad1 in ?? () from /usr/local/bin/gnome-shell #10 0x in ?? () gnome-shell.core backtrace 4: #0 0x0a7e53e6f9b5 in _atomic_lock (lock=0xdfdfdfdfdfdfdfdf) at /usr/src/lib/librthread/arch/amd64/_atomic_lock.c:21 #1 0x0a7e53e6eb6d in _spinlock (lock=0xdfdfdfdfdfdfdfdf) at /usr/src/lib/librthread/rthread.c:81 #2 0x0a7e53e72008 in _rthread_mutex_lock (mutexp=0xa7e4e1b17a0, trywait=0, abstime=0x0) at /usr/src/lib/librthread/rthread_sync.c:108 #3 0x0a7e59698ea1 in g_mutex_lock () from /usr/local/lib/libglib-2.0.so.4000.0 #4 0x0a7eaa10cd1a in emit_cb () from /usr/local/lib/libgio-2.0.so.4000.0 #5 0x0a7e59652df2 in g_main_context_dispatch () from /usr/local/lib/libglib-2.0.so.4000.0 #6 0x0a7e59654f1e in g_main_context_iterate () from /usr/local/lib/libglib-2.0.so.4000.0 #7 0x0a7e59654ff7 in g_main_context_iteration () from /usr/local/lib/libglib-2.0.so.4000.0 #8 0x0a7e59655035 in glib_worker_main () from /usr/local/lib/libglib-2.0.so.4000.0 #9 0x0a7e5967a1f9 in g_thread_proxy () from /usr/local/lib/libglib-2.0.so.4000.0 #10 0x0a7e53e6f97e in _rthread_start (v=Variable "v" is not available. ) at /usr/src/lib/librthread/rthread.c:145 #11 0x0a7e0f03659b in __tfork_thread () at /usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:75 #12 0x in ?? () gnome-shell.core backtrace 5: #0 0x0f0458a8e9f0 in dl_shallow_copy () from /usr/local/lib/libgio-2.0.so.4000.0 #1 0x0f0458a8ea89 in dl_calculate () from /usr/local/lib/libgio-2.0.so.4000.0 #2 0x0f0458a8d420 in _kh_dir_diff () from /usr/local/lib/libgio-2.0.so.4000.0 #3 0x0f0458a8d5f9 in process_kqueue_notifications (
Re: amd64 bulk build failures 2014-07-22
On 2014 Jul 24 (Thu) at 13:04:13 +0200 (+0200), Christian Weisgerber wrote: :games/alephone/weland mono (Mono.Cairo) we should just mark it as BROKEN for the release, and I can work on an update for after unlock. -- I'll rob that rich person and give it to some poor deserving slob. That will *prove* I'm Robin Hood. -- Daffy Duck, "Robin Hood Daffy", [1958, Chuck Jones]
Re: amd64 bulk build failures 2014-07-22
On 2014/07/24 15:24, Peter Hessler wrote: > On 2014 Jul 24 (Thu) at 13:04:13 +0200 (+0200), Christian Weisgerber wrote: > :games/alephone/welandmono (Mono.Cairo) > > we should just mark it as BROKEN for the release, and I can work on an > update for after unlock. OK with me.
Re: chromium 'user_action_event.pb.h' file not found
On 2014/07/24 12:11, Stuart Henderson wrote: > I'm trying a clean+rebuild now to see if it recurs, but ... Rebuild has got past this point, so I am expecting it's a dependency issue with ninja's randomised builds.
Deconflict mail/cyrus-imapd pop3d.8 and mail/pop3d pop3d.8
The attached installs mail/cyrus-imapd's pop3d.8 manpage as
cyrus-pop3d.8 as to not conflict with mail/pop3d's pop3d.8 manpage.
This follows a similar format in mail/cyrus-imapd to prefix commonly
named cyrus manpages with cyrus-.
ok?
--
James Turner
Index: Makefile
===
RCS file: /cvs/ports/mail/cyrus-imapd/Makefile,v
retrieving revision 1.85
diff -u -p -u -p -r1.85 Makefile
--- Makefile19 Jun 2014 08:38:31 - 1.85
+++ Makefile24 Jul 2014 14:32:47 -
@@ -6,7 +6,7 @@ COMMENT=Cyrus IMAP server
V= 2.4.17
DISTNAME= cyrus-imapd-${V}
-REVISION= 7
+REVISION= 8
CATEGORIES=mail
@@ -63,7 +63,7 @@ pre-patch:
cd ${WRKSRC} && ${PATCH} -s -z .drac -p1 < contrib/drac_auth.patch
.endif
-MAN8= fetchnews idled master imapd deliver
+MAN8= fetchnews idled master imapd deliver pop3d
SIEVEREF= lib/imapoptions man/imapd.conf.5 \
tools/masssievec tools/rehash tools/translatesieve \
tools/upgradesieve doc/text/install-upgrade
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/cyrus-imapd/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 16 Jun 2014 15:08:43 - 1.10
+++ pkg/PLIST 24 Jul 2014 14:32:47 -
@@ -149,6 +149,7 @@ libexec/cyrus-imapd/
@man man/man8/cyrus-idled.8
@man man/man8/cyrus-imapd.8
@man man/man8/cyrus-master.8
+@man man/man8/cyrus-pop3d.8
@man man/man8/fud.8
@man man/man8/ipurge.8
@man man/man8/lmtpd.8
@@ -156,7 +157,6 @@ libexec/cyrus-imapd/
@man man/man8/mbpath.8
@man man/man8/nntpd.8
@man man/man8/notifyd.8
-@man man/man8/pop3d.8
@man man/man8/quota.8
@man man/man8/reconstruct.8
@man man/man8/rmnews.8
Re: Unmarked conflict checking in portcheck
2014-07-24 15:33 GMT+04:00 Christian Weisgerber : > On 2014-07-23, Marc Espie wrote: > >> Nope, this exists elsewhere. Reuse bin/check-conflicts > > Speaking of which, here's what check-conflicts reports for the > 2014-07-22 amd64 bulk build: > > cyrus-imapd-2.4.17p7(mail/cyrus-imapd),cyrus-imapd-2.4.17p7-drac(mail/cyrus-imapd,drac),pop3d-1.0p0(mail/pop3d) > /usr/local/man/man8/pop3d.8 > freedt-0.22p1(sysutils/freedt),ucspi-tcp-0.88p0(net/ucspi-tcp) > /usr/local/bin/argv0 > /usr/local/bin/recordio > p5-TAP-Parser-0.54p0(devel/p5-TAP-Parser),p5-Test-Harness-3.30(devel/p5-Test-Harness) > /usr/local/libdata/perl5/site_perl/TAP/Base.pm > /usr/local/libdata/perl5/site_perl/TAP/Harness.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Aggregator.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Grammar.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator/Array.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator/Process.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator/Stream.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Bailout.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Comment.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Plan.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Test.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Unknown.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Version.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/YAML.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Source.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/YAMLish/Reader.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/YAMLish/Writer.pm > p5-Tk-804.032p0(x11/p5-Tk,-main),p5-Tk-demo-804.032(x11/p5-Tk,-demo) > /usr/local/man/man3p/Tk::demos::widget_lib::slide.3p > /usr/local/man/man3p/Tk::demos::widget_lib::trace2.3p > py3-distribute-0.6.27p1(devel/py-distribute,python3),py3-setuptools-3.4.4p0v0(devel/py-setuptools,python3) > /usr/local/bin/easy_install-3.4 > > /usr/local/lib/python3.4/site-packages/__pycache__/easy_install.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/__pycache__/pkg_resources.cpython-34.pyc > /usr/local/lib/python3.4/site-packages/easy_install.py > /usr/local/lib/python3.4/site-packages/pkg_resources.py > /usr/local/lib/python3.4/site-packages/setuptools/__init__.py > > /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/__init__.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/archive_util.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/depends.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/dist.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/extension.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/package_index.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/sandbox.cpython-34.pyc > /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/script > template (dev).cpython-34.pyc > /usr/local/lib/python3.4/site-packages/setuptools/__pycache__/script > template.cpython-34.pyc > /usr/local/lib/python3.4/site-packages/setuptools/archive_util.py > /usr/local/lib/python3.4/site-packages/setuptools/command/__init__.py > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/__init__.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/alias.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/bdist_egg.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/bdist_rpm.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/bdist_wininst.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/build_ext.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/build_py.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/develop.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/easy_install.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/egg_info.cpython-34.pyc > > /usr/local/lib/python3.4/site-packages/setuptools/command/__pycache__/install.cpython-34.
Deconflict p5-Tk*
This removes a conflict:
p5-Tk-804.032p0(x11/p5-Tk,-main),p5-Tk-demo-804.032(x11/p5-Tk,-demo)
It looks like those two files were left in -main by mistake. Okay?
--
WBR,
Vadim Zhukov
Index: Makefile
===
RCS file: /cvs/ports/x11/p5-Tk/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile14 Jun 2014 23:26:03 - 1.52
+++ Makefile24 Jul 2014 14:59:00 -
@@ -9,7 +9,7 @@ MODULES=cpan
VERSION= 804.032
DISTNAME= Tk-${VERSION}
PKGNAME-main= p5-Tk-${VERSION}
-REVISION-main= 0
+REVISION-main= 1
PKGNAME-demo= p5-Tk-demo-${VERSION}
CATEGORIES=x11 devel
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/x11/p5-Tk/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 14 Jun 2014 23:26:03 - 1.6
+++ pkg/PLIST-main 24 Jul 2014 14:59:00 -
@@ -681,8 +681,6 @@ ${P5ARCH}/auto/Tk/updateWidgets.al
@man man/man3p/Tk::chooseColor.3p
@man man/man3p/Tk::chooseDirectory.3p
@man man/man3p/Tk::composite.3p
-@man man/man3p/Tk::demos::widget_lib::slide.3p
-@man man/man3p/Tk::demos::widget_lib::trace2.3p
@man man/man3p/Tk::event.3p
@man man/man3p/Tk::exit.3p
@man man/man3p/Tk::fileevent.3p
Tedu net/tcpcat?
I don't see any point in having this port when we already have (better documented) nc(1) in base. And this will get rid of conflict with net/ucspi-tcp. Nothing depends on net/tcpcat as well. -- WBR, Vadim Zhukov
Re: Tedu net/tcpcat?
On 2014/07/24 19:08, Vadim Zhukov wrote: > I don't see any point in having this port when we already have (better > documented) nc(1) in base. And this will get rid of conflict with > net/ucspi-tcp. Nothing depends on net/tcpcat as well. OK to zap it, though perhaps it makes sense to add the conflict marker to ucspi-tcp anyway for people who had the old one installed?
Mark freedt and ucspi-tcp as conflicting
This adds explicit @conflict between sysutils/freedt and net/ucspi-tcp. As far as I can understand, the conflicting items are interchangeable (freedt is a re-implementation of djb's utils), and nothing depends on those, so there's likely no point in de-conflicting. (personally I see no point in having freedt package at all but I'd left this question to post-release) -- WBR, Vadim Zhukov Index: net/ucspi-tcp/Makefile === RCS file: /cvs/ports/net/ucspi-tcp/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- net/ucspi-tcp/Makefile 12 Jun 2014 19:00:30 - 1.15 +++ net/ucspi-tcp/Makefile 24 Jul 2014 15:13:32 - @@ -3,7 +3,7 @@ COMMENT= tools for building tcp socket client/servers DISTNAME= ucspi-tcp-0.88 -REVISION= 0 +REVISION= 1 CATEGORIES=net HOMEPAGE= http://cr.yp.to/ucspi-tcp.html Index: net/ucspi-tcp/pkg/PLIST === RCS file: /cvs/ports/net/ucspi-tcp/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- net/ucspi-tcp/pkg/PLIST 12 Jun 2014 19:00:31 - 1.5 +++ net/ucspi-tcp/pkg/PLIST 24 Jul 2014 15:13:32 - @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.5 2014/06/12 19:00:31 sthen Exp $ +@conflict freedt-* @bin bin/addcr @bin bin/argv0 bin/date@ Index: sysutils/freedt/Makefile === RCS file: /cvs/ports/sysutils/freedt/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- sysutils/freedt/Makefile11 Mar 2013 11:41:30 - 1.14 +++ sysutils/freedt/Makefile24 Jul 2014 15:13:32 - @@ -3,7 +3,7 @@ COMMENT= reimplementation of Dan Bernstein's daemontools#' DISTNAME= freedt-0.22 -REVISION= 1 +REVISION= 2 CATEGORIES=sysutils HOMEPAGE= http://offog.org/code/freedt.html Index: sysutils/freedt/pkg/PLIST === RCS file: /cvs/ports/sysutils/freedt/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- sysutils/freedt/pkg/PLIST 1 Jan 2012 16:16:24 - 1.2 +++ sysutils/freedt/pkg/PLIST 24 Jul 2014 15:13:32 - @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.2 2012/01/01 16:16:24 sthen Exp $ +@conflict ucspi-tcp-* @bin bin/anonidentd @bin bin/argv0 @bin bin/dumblog
Re: Tedu net/tcpcat?
On Thu, Jul 24, 2014 at 04:17:50PM +0100, Stuart Henderson wrote: > On 2014/07/24 19:08, Vadim Zhukov wrote: > > I don't see any point in having this port when we already have (better > > documented) nc(1) in base. And this will get rid of conflict with > > net/ucspi-tcp. Nothing depends on net/tcpcat as well. > > OK to zap it, though perhaps it makes sense to add the conflict marker > to ucspi-tcp anyway for people who had the old one installed? Yep, conflict markers are cheap
Re: Mark freedt and ucspi-tcp as conflicting
On 2014/07/24 19:19, Vadim Zhukov wrote: > This adds explicit @conflict between sysutils/freedt and > net/ucspi-tcp. As far as I can understand, the conflicting items > are interchangeable (freedt is a re-implementation of djb's utils), > and nothing depends on those, so there's likely no point in > de-conflicting. > > (personally I see no point in having freedt package at all but > I'd left this question to post-release) these packages are useful together, I'd rather rename freedt's copy of these.
Re: Deconflict mail/cyrus-imapd pop3d.8 and mail/pop3d pop3d.8
2014-07-24 18:36 GMT+04:00 James Turner :
> The attached installs mail/cyrus-imapd's pop3d.8 manpage as
> cyrus-pop3d.8 as to not conflict with mail/pop3d's pop3d.8 manpage.
>
> This follows a similar format in mail/cyrus-imapd to prefix commonly
> named cyrus manpages with cyrus-.
>
> ok?
>
> --
> James Turner
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/cyrus-imapd/Makefile,v
> retrieving revision 1.85
> diff -u -p -u -p -r1.85 Makefile
> --- Makefile19 Jun 2014 08:38:31 - 1.85
> +++ Makefile24 Jul 2014 14:32:47 -
> @@ -6,7 +6,7 @@ COMMENT=Cyrus IMAP server
>
> V= 2.4.17
> DISTNAME= cyrus-imapd-${V}
> -REVISION= 7
> +REVISION= 8
>
> CATEGORIES=mail
>
> @@ -63,7 +63,7 @@ pre-patch:
> cd ${WRKSRC} && ${PATCH} -s -z .drac -p1 < contrib/drac_auth.patch
> .endif
>
> -MAN8= fetchnews idled master imapd deliver
> +MAN8= fetchnews idled master imapd deliver pop3d
> SIEVEREF= lib/imapoptions man/imapd.conf.5 \
> tools/masssievec tools/rehash tools/translatesieve \
> tools/upgradesieve doc/text/install-upgrade
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/mail/cyrus-imapd/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 PLIST
> --- pkg/PLIST 16 Jun 2014 15:08:43 - 1.10
> +++ pkg/PLIST 24 Jul 2014 14:32:47 -
> @@ -149,6 +149,7 @@ libexec/cyrus-imapd/
> @man man/man8/cyrus-idled.8
> @man man/man8/cyrus-imapd.8
> @man man/man8/cyrus-master.8
> +@man man/man8/cyrus-pop3d.8
> @man man/man8/fud.8
> @man man/man8/ipurge.8
> @man man/man8/lmtpd.8
> @@ -156,7 +157,6 @@ libexec/cyrus-imapd/
> @man man/man8/mbpath.8
> @man man/man8/nntpd.8
> @man man/man8/notifyd.8
> -@man man/man8/pop3d.8
> @man man/man8/quota.8
> @man man/man8/reconstruct.8
> @man man/man8/rmnews.8
pkg/README should be tweaked, too. Then okay zhuk@
--
WBR,
Vadim Zhukov
Re: Deconflict mail/cyrus-imapd pop3d.8 and mail/pop3d pop3d.8
2014-07-24 19:55 GMT+04:00 Vadim Zhukov :
> 2014-07-24 18:36 GMT+04:00 James Turner :
>> The attached installs mail/cyrus-imapd's pop3d.8 manpage as
>> cyrus-pop3d.8 as to not conflict with mail/pop3d's pop3d.8 manpage.
>>
>> This follows a similar format in mail/cyrus-imapd to prefix commonly
>> named cyrus manpages with cyrus-.
>>
>> ok?
>>
>> --
>> James Turner
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/mail/cyrus-imapd/Makefile,v
>> retrieving revision 1.85
>> diff -u -p -u -p -r1.85 Makefile
>> --- Makefile19 Jun 2014 08:38:31 - 1.85
>> +++ Makefile24 Jul 2014 14:32:47 -
>> @@ -6,7 +6,7 @@ COMMENT=Cyrus IMAP server
>>
>> V= 2.4.17
>> DISTNAME= cyrus-imapd-${V}
>> -REVISION= 7
>> +REVISION= 8
>>
>> CATEGORIES=mail
>>
>> @@ -63,7 +63,7 @@ pre-patch:
>> cd ${WRKSRC} && ${PATCH} -s -z .drac -p1 < contrib/drac_auth.patch
>> .endif
>>
>> -MAN8= fetchnews idled master imapd deliver
>> +MAN8= fetchnews idled master imapd deliver pop3d
>> SIEVEREF= lib/imapoptions man/imapd.conf.5 \
>> tools/masssievec tools/rehash tools/translatesieve \
>> tools/upgradesieve doc/text/install-upgrade
>> Index: pkg/PLIST
>> ===
>> RCS file: /cvs/ports/mail/cyrus-imapd/pkg/PLIST,v
>> retrieving revision 1.10
>> diff -u -p -u -p -r1.10 PLIST
>> --- pkg/PLIST 16 Jun 2014 15:08:43 - 1.10
>> +++ pkg/PLIST 24 Jul 2014 14:32:47 -
>> @@ -149,6 +149,7 @@ libexec/cyrus-imapd/
>> @man man/man8/cyrus-idled.8
>> @man man/man8/cyrus-imapd.8
>> @man man/man8/cyrus-master.8
>> +@man man/man8/cyrus-pop3d.8
>> @man man/man8/fud.8
>> @man man/man8/ipurge.8
>> @man man/man8/lmtpd.8
>> @@ -156,7 +157,6 @@ libexec/cyrus-imapd/
>> @man man/man8/mbpath.8
>> @man man/man8/nntpd.8
>> @man man/man8/notifyd.8
>> -@man man/man8/pop3d.8
>> @man man/man8/quota.8
>> @man man/man8/reconstruct.8
>> @man man/man8/rmnews.8
>
> pkg/README should be tweaked, too. Then okay zhuk@
(but you still need an okay from our musketeers, of course)
--
WBR,
Vadim Zhukov
Re: Mark freedt and ucspi-tcp as conflicting
2014-07-24 19:43 GMT+04:00 Stuart Henderson : > On 2014/07/24 19:19, Vadim Zhukov wrote: >> This adds explicit @conflict between sysutils/freedt and >> net/ucspi-tcp. As far as I can understand, the conflicting items >> are interchangeable (freedt is a re-implementation of djb's utils), >> and nothing depends on those, so there's likely no point in >> de-conflicting. >> >> (personally I see no point in having freedt package at all but >> I'd left this question to post-release) > > these packages are useful together, I'd rather rename freedt's copy of these. Will do. -- WBR, Vadim Zhukov
Re: Deconflict mail/cyrus-imapd pop3d.8 and mail/pop3d pop3d.8
On Thu, Jul 24, 2014 at 07:55:00PM +0400, Vadim Zhukov wrote:
> 2014-07-24 18:36 GMT+04:00 James Turner :
> > The attached installs mail/cyrus-imapd's pop3d.8 manpage as
> > cyrus-pop3d.8 as to not conflict with mail/pop3d's pop3d.8 manpage.
> >
> > This follows a similar format in mail/cyrus-imapd to prefix commonly
> > named cyrus manpages with cyrus-.
> >
> > ok?
> >
> > --
> > James Turner
>
> pkg/README should be tweaked, too. Then okay zhuk@
>
> --
> WBR,
> Vadim Zhukov
>
Thanks, didn't notice that. Updated diff attached. I've also cc'ed
Antoine as he is the maintainer.
--
James Turner
Index: Makefile
===
RCS file: /cvs/ports/mail/cyrus-imapd/Makefile,v
retrieving revision 1.85
diff -u -p -u -p -r1.85 Makefile
--- Makefile19 Jun 2014 08:38:31 - 1.85
+++ Makefile24 Jul 2014 16:27:15 -
@@ -6,7 +6,7 @@ COMMENT=Cyrus IMAP server
V= 2.4.17
DISTNAME= cyrus-imapd-${V}
-REVISION= 7
+REVISION= 8
CATEGORIES=mail
@@ -63,7 +63,7 @@ pre-patch:
cd ${WRKSRC} && ${PATCH} -s -z .drac -p1 < contrib/drac_auth.patch
.endif
-MAN8= fetchnews idled master imapd deliver
+MAN8= fetchnews idled master imapd deliver pop3d
SIEVEREF= lib/imapoptions man/imapd.conf.5 \
tools/masssievec tools/rehash tools/translatesieve \
tools/upgradesieve doc/text/install-upgrade
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/cyrus-imapd/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 16 Jun 2014 15:08:43 - 1.10
+++ pkg/PLIST 24 Jul 2014 16:27:15 -
@@ -149,6 +149,7 @@ libexec/cyrus-imapd/
@man man/man8/cyrus-idled.8
@man man/man8/cyrus-imapd.8
@man man/man8/cyrus-master.8
+@man man/man8/cyrus-pop3d.8
@man man/man8/fud.8
@man man/man8/ipurge.8
@man man/man8/lmtpd.8
@@ -156,7 +157,6 @@ libexec/cyrus-imapd/
@man man/man8/mbpath.8
@man man/man8/nntpd.8
@man man/man8/notifyd.8
-@man man/man8/pop3d.8
@man man/man8/quota.8
@man man/man8/reconstruct.8
@man man/man8/rmnews.8
Index: pkg/README
===
RCS file: /cvs/ports/mail/cyrus-imapd/pkg/README,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 README
--- pkg/README 17 Jun 2013 19:30:43 - 1.2
+++ pkg/README 24 Jul 2014 16:27:15 -
@@ -16,6 +16,7 @@ packages:
idled(8) -> cyrus-idled(8) # conflict with sysutils/idled
master(8)-> cyrus-master(8)# conflict with mail/postfix
imapd(8) -> cyrus-imapd(8) # conflict with mail/courier-imap
+pop3d(8) -> cyrus-pop3d(8) # conflict with mail/pop3d
cyrus-imapd uses the LOG_LOCAL6 syslog facility for logging. This
package of cyrus-imapd uses idled for IMAP IDLE.
Re: Mark freedt and ucspi-tcp as conflicting
This removes unmarked conflict between freedt and ucspi-tcp.
The ucspi-tcp patch will follow separately because it's related
with other ports.
--
WBR,
Vadim Zhukov
Index: Makefile
===
RCS file: /cvs/ports/sysutils/freedt/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile11 Mar 2013 11:41:30 - 1.14
+++ Makefile24 Jul 2014 16:28:08 -
@@ -3,7 +3,7 @@
COMMENT= reimplementation of Dan Bernstein's daemontools#'
DISTNAME= freedt-0.22
-REVISION= 1
+REVISION= 2
CATEGORIES=sysutils
HOMEPAGE= http://offog.org/code/freedt.html
@@ -16,5 +16,9 @@ WANTLIB= c
MASTER_SITES= http://offog.org/files/
CONFIGURE_STYLE= gnu
+
+post-install:
+ rm -f ${PREFIX}/bin/recordio
+ mv ${PREFIX}/bin/{,f}argv0
.include
Index: pkg/DESCR
===
RCS file: /cvs/ports/sysutils/freedt/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -r1.3 DESCR
--- pkg/DESCR 14 Mar 2011 08:44:38 - 1.3
+++ pkg/DESCR 24 Jul 2014 16:28:08 -
@@ -14,3 +14,7 @@ Please note that this package is not a d
daemontools; the internal state files in service directories are
different, and the error messages (and a few of the options) aren't
quite the same.
+
+The recordio script (simple "ratelimit -r" wrapper) was removed
+to avoid conflict with net/ucspi-tcp. For the same reason the argv0
+was renamed to fargv0.
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/freedt/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 1 Jan 2012 16:16:24 - 1.2
+++ pkg/PLIST 24 Jul 2014 16:28:08 -
@@ -1,12 +1,11 @@
@comment $OpenBSD: PLIST,v 1.2 2012/01/01 16:16:24 sthen Exp $
@bin bin/anonidentd
-@bin bin/argv0
+@bin bin/fargv0
@bin bin/dumblog
@bin bin/envdir
@bin bin/envuidgid
bin/mkservice
@bin bin/ratelimit
-bin/recordio
@bin bin/setlock
@bin bin/setuidgid
@bin bin/softlimit
Re: Mark freedt and ucspi-tcp as conflicting
Add @conflict markers for freedt and (now removed) tcpcat. To be committed right after freedt (see version in @conflict marker). Okay? -- WBR, Vadim Zhukov Index: Makefile === RCS file: /cvs/ports/net/ucspi-tcp/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile12 Jun 2014 19:00:30 - 1.15 +++ Makefile24 Jul 2014 16:36:02 - @@ -3,7 +3,7 @@ COMMENT= tools for building tcp socket client/servers DISTNAME= ucspi-tcp-0.88 -REVISION= 0 +REVISION= 1 CATEGORIES=net HOMEPAGE= http://cr.yp.to/ucspi-tcp.html Index: pkg/PLIST === RCS file: /cvs/ports/net/ucspi-tcp/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 12 Jun 2014 19:00:31 - 1.5 +++ pkg/PLIST 24 Jul 2014 16:36:02 - @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.5 2014/06/12 19:00:31 sthen Exp $ +@conflict freedt-<0.22p2 +@conflict tcpcat-* @bin bin/addcr @bin bin/argv0 bin/date@
Re: Deconflict mail/cyrus-imapd pop3d.8 and mail/pop3d pop3d.8
On Thu, Jul 24, 2014 at 12:28:58PM -0400, James Turner wrote:
> On Thu, Jul 24, 2014 at 07:55:00PM +0400, Vadim Zhukov wrote:
> > 2014-07-24 18:36 GMT+04:00 James Turner :
> > > The attached installs mail/cyrus-imapd's pop3d.8 manpage as
> > > cyrus-pop3d.8 as to not conflict with mail/pop3d's pop3d.8 manpage.
> > >
> > > This follows a similar format in mail/cyrus-imapd to prefix commonly
> > > named cyrus manpages with cyrus-.
> > >
> > > ok?
> > >
> > > --
> > > James Turner
> >
> > pkg/README should be tweaked, too. Then okay zhuk@
> >
> > --
> > WBR,
> > Vadim Zhukov
> >
>
> Thanks, didn't notice that. Updated diff attached. I've also cc'ed
> Antoine as he is the maintainer.
It's fine for me but I cannot give OKs anymore.
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/cyrus-imapd/Makefile,v
> retrieving revision 1.85
> diff -u -p -u -p -r1.85 Makefile
> --- Makefile 19 Jun 2014 08:38:31 - 1.85
> +++ Makefile 24 Jul 2014 16:27:15 -
> @@ -6,7 +6,7 @@ COMMENT= Cyrus IMAP server
>
> V= 2.4.17
> DISTNAME=cyrus-imapd-${V}
> -REVISION=7
> +REVISION=8
>
> CATEGORIES= mail
>
> @@ -63,7 +63,7 @@ pre-patch:
> cd ${WRKSRC} && ${PATCH} -s -z .drac -p1 < contrib/drac_auth.patch
> .endif
>
> -MAN8=fetchnews idled master imapd deliver
> +MAN8=fetchnews idled master imapd deliver pop3d
> SIEVEREF=lib/imapoptions man/imapd.conf.5 \
> tools/masssievec tools/rehash tools/translatesieve \
> tools/upgradesieve doc/text/install-upgrade
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/mail/cyrus-imapd/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 PLIST
> --- pkg/PLIST 16 Jun 2014 15:08:43 - 1.10
> +++ pkg/PLIST 24 Jul 2014 16:27:15 -
> @@ -149,6 +149,7 @@ libexec/cyrus-imapd/
> @man man/man8/cyrus-idled.8
> @man man/man8/cyrus-imapd.8
> @man man/man8/cyrus-master.8
> +@man man/man8/cyrus-pop3d.8
> @man man/man8/fud.8
> @man man/man8/ipurge.8
> @man man/man8/lmtpd.8
> @@ -156,7 +157,6 @@ libexec/cyrus-imapd/
> @man man/man8/mbpath.8
> @man man/man8/nntpd.8
> @man man/man8/notifyd.8
> -@man man/man8/pop3d.8
> @man man/man8/quota.8
> @man man/man8/reconstruct.8
> @man man/man8/rmnews.8
> Index: pkg/README
> ===
> RCS file: /cvs/ports/mail/cyrus-imapd/pkg/README,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 README
> --- pkg/README17 Jun 2013 19:30:43 - 1.2
> +++ pkg/README24 Jul 2014 16:27:15 -
> @@ -16,6 +16,7 @@ packages:
> idled(8) -> cyrus-idled(8) # conflict with sysutils/idled
> master(8)-> cyrus-master(8)# conflict with mail/postfix
> imapd(8) -> cyrus-imapd(8) # conflict with mail/courier-imap
> +pop3d(8) -> cyrus-pop3d(8) # conflict with mail/pop3d
>
> cyrus-imapd uses the LOG_LOCAL6 syslog facility for logging. This
> package of cyrus-imapd uses idled for IMAP IDLE.
--
Antoine
Fix conflicts in py-setuptools and py-distribute
This tweaks conflict markers for py-setuptools and py-distribute.
Packages fine on i386. Okay?
--
WBR,
Vadim Zhukov
Index: py-distribute/Makefile
===
RCS file: /cvs/ports/devel/py-distribute/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- py-distribute/Makefile 3 Jun 2014 11:34:24 - 1.7
+++ py-distribute/Makefile 24 Jul 2014 17:10:54 -
@@ -5,7 +5,7 @@ COMMENT = fork of setuptools Python pac
MODPY_EGG_VERSION =0.6.27
DISTNAME = distribute-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
+REVISION = 2
CATEGORIES = devel
Index: py-distribute/pkg/PFRAG.python3
===
RCS file: py-distribute/pkg/PFRAG.python3
diff -N py-distribute/pkg/PFRAG.python3
--- /dev/null 1 Jan 1970 00:00:00 -
+++ py-distribute/pkg/PFRAG.python3 24 Jul 2014 17:10:54 -
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@conflict py3-setuptools-*
Index: py-distribute/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-distribute/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- py-distribute/pkg/PLIST 27 Jun 2012 19:00:50 - 1.3
+++ py-distribute/pkg/PLIST 24 Jul 2014 17:10:54 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2012/06/27 19:00:50 rpointel Exp $
@pkgpath devel/py3-distribute
+%%python3%%
!%%python3%%
@comment bin/easy_install
bin/easy_install-${MODPY_VERSION}
Index: py-setuptools/Makefile
===
RCS file: /cvs/ports/devel/py-setuptools/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- py-setuptools/Makefile 3 Jun 2014 11:34:24 - 1.23
+++ py-setuptools/Makefile 24 Jul 2014 17:10:54 -
@@ -9,7 +9,7 @@ EPOCH = 0
CATEGORIES=devel
PKG_ARCH= *
-REVISION = 0
+REVISION = 1
MASTER_SITES= ${MASTER_SITE_PYPI:=s/setuptools/}
HOMEPAGE= http://peak.telecommunity.com/DevCenter/setuptools
Index: py-setuptools/pkg/PFRAG.no-python3
===
RCS file: py-setuptools/pkg/PFRAG.no-python3
diff -N py-setuptools/pkg/PFRAG.no-python3
--- /dev/null 1 Jan 1970 00:00:00 -
+++ py-setuptools/pkg/PFRAG.no-python3 24 Jul 2014 17:10:54 -
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@conflict py-distribute-*
Index: py-setuptools/pkg/PFRAG.python3
===
RCS file: py-setuptools/pkg/PFRAG.python3
diff -N py-setuptools/pkg/PFRAG.python3
--- /dev/null 1 Jan 1970 00:00:00 -
+++ py-setuptools/pkg/PFRAG.python3 24 Jul 2014 17:10:54 -
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@conflict py3-distribute-*
Index: py-setuptools/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-setuptools/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- py-setuptools/pkg/PLIST 27 Apr 2014 17:04:23 - 1.8
+++ py-setuptools/pkg/PLIST 24 Jul 2014 17:10:54 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2014/04/27 17:04:23 rpointel Exp $
-@conflict py-distribute-*
+%%python3%%
+!%%python3%%
@comment bin/easy_install
bin/easy_install-${MODPY_VERSION}
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
Re: FIX: conflict between ucspi-tcp and freedt
On Wed, Jul 23, 2014 at 01:07:35PM +0100, Stuart Henderson wrote:
> On 2014/07/23 13:56, J?r?mie Courr?ges-Anglas wrote:
> > Landry Breuil writes:
> >
> > > On Mon, Jul 21, 2014 at 07:10:47PM +0200, Jan Klemkow wrote:
> > >> Hi,
> > >>
> > >> this diff fixes a file conflict between the ports ucspi-tcp and freedt.
> > >> I just remove the binaries 'argv0' and 'recordio' cause I think the
> > >> manpages of the tools are useful. The package freedt does not provide
> > >> them.
> > >>
> > >> I am not sure, but I think increasing the revision number is the right
> > >> thing to do in this kind of situation!?
> > >
> > > Yes, bumping the rev number is one of the things to do, but simply
> > > removing files from PLIST wont be enough, since they'll come back next
> > > time someone runs make update-plist. You should either:
> > > - @comment both entries so they're not in the package
> > > - set appropriate @conflict markers in both PLISTs to explicitely say
> > > the two packages conflicts so they're not installed altogether.
> >
> > freedt is supposed to be a reimplementation of the daemontools package,
> > but the latter does not ship the argv0 and recordio executables. Also,
> > the freedt README says "These tools almost certainly aren't production
> > quality yet". Thus I'd either use @conflict or remove/rename the freedt
> > executables.
>
> +1 for removing/renaming the freedt executables.
I tried to add conflict markers to the ucspi-tcp port, but I don't
understand how to use them.
I just get this error message:
===> Building package for ucspi-tcp-0.88p1
Create /usr/ports/packages/amd64/all/ucspi-tcp-0.88p1.tgz
Error: invalid @conflict bin/argv0 in packing-list
Error: invalid @conflict bin/recordio in packing-list
I looked at ports that uses this marker, too. But I don't get it.
This is my PLIST file:
@comment $OpenBSD: PLIST,v 1.5 2014/06/12 19:00:31 sthen Exp $
@bin bin/addcr
@comment bin/argv0
@conflict bin/argv0
bin/date@
@bin bin/delcr
bin/finger@
@bin bin/fixcrio
bin/http@
bin/mconnect
@bin bin/mconnect-io
@bin bin/rblsmtpd
@comment bin/recordio
@conflict bin/recordio
bin/tcpcat
@bin bin/tcpclient
@bin bin/tcprules
@bin bin/tcprulescheck
@bin bin/tcpserver
bin/who@
@man man/man1/addcr.1
@man man/man1/argv0.1
@man man/man1/date@.1
@man man/man1/delcr.1
@man man/man1/finger@.1
@man man/man1/fixcr.1
@man man/man1/http@.1
@man man/man1/mconnect.1
@man man/man1/recordio.1
@man man/man1/tcpclient.1
@man man/man1/tcprules.1
@man man/man1/tcprulescheck.1
@man man/man1/tcpserver.1
@man man/man1/who@.1
@man man/man5/tcp-environ.5
share/doc/pkg-readmes/${FULLPKGNAME}
bye,
Jan
Add tcpcat removal to quirks
This adds tcpcat to quirks. I didn't find acceptable message and
thus added a new one. Okay?
--
WBR,
Vadim Zhukov
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.161
diff -u -p -r1.161 Makefile
--- Makefile23 Jul 2014 20:35:15 - 1.161
+++ Makefile24 Jul 2014 17:27:59 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.7
+PKGNAME = quirks-2.8
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.167
diff -u -p -r1.167 Quirks.pm
--- files/Quirks.pm 23 Jul 2014 20:35:15 - 1.167
+++ files/Quirks.pm 24 Jul 2014 17:27:59 -
@@ -360,6 +360,7 @@ my @msg = (
"web application with no benefit being packaged", #1
"no longer maintained and full of security holes", #2
"no longer maintained upstream", #3
+ "superseded by base component", #4
);
my $obsolete_reason = {
@@ -420,6 +421,7 @@ my $obsolete_reason = {
'bonk' => 3,
'xmms-bonk' => 3,
'mailcrypt' => 0,
+ 'tcpcat' => 4,
};
# ->is_base_system($handle, $state):
Re: Unmarked conflict checking in portcheck
2014-07-24 15:33 GMT+04:00 Christian Weisgerber : > Speaking of which, here's what check-conflicts reports for the > 2014-07-22 amd64 bulk build: > > p5-TAP-Parser-0.54p0(devel/p5-TAP-Parser),p5-Test-Harness-3.30(devel/p5-Test-Harness) > /usr/local/libdata/perl5/site_perl/TAP/Base.pm > /usr/local/libdata/perl5/site_perl/TAP/Harness.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Aggregator.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Grammar.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator/Array.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator/Process.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Iterator/Stream.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Bailout.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Comment.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Plan.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Test.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Unknown.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/Version.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Result/YAML.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/Source.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/YAMLish/Reader.pm > /usr/local/libdata/perl5/site_perl/TAP/Parser/YAMLish/Writer.pm This is the only one left, and this is a complicated one. p5-Test-Harness installs TAP::* without permit, and it differs from p5-TAP-Parser enough to be incompatible. The p5-Test-Harness is pure TDEP for devel/p5-Test-Warnings and devel/p5-Module-Build-Tiny - maybe, that's not a big deal and we could just add @conflict markers and be done. -- WBR, Vadim Zhukov
Re: Unmarked conflict checking in portcheck
On Thu, Jul 24, 2014 at 09:39:05PM +0400, Vadim Zhukov wrote: > 2014-07-24 15:33 GMT+04:00 Christian Weisgerber : > > Speaking of which, here's what check-conflicts reports for the > > 2014-07-22 amd64 bulk build: > > > > p5-TAP-Parser-0.54p0(devel/p5-TAP-Parser),p5-Test-Harness-3.30(devel/p5-Test-Harness) > This is the only one left, and this is a complicated one. > p5-Test-Harness installs TAP::* without permit, and it differs from > p5-TAP-Parser enough to be incompatible. The p5-Test-Harness is pure > TDEP for devel/p5-Test-Warnings and devel/p5-Module-Build-Tiny - > maybe, that's not a big deal and we could just add @conflict markers > and be done. As far as I know, TAP::Parser was renamed to Test::Harness in 2007, I would personally remove p5-TAP-Parser and replace it with p5-Test-Harness in dependencies. https://metacpan.org/source/LEONT/Test-Harness-3.32/Changes#L420 l8rZ, -- andrew - http://afresh1.com The 3 great virtues of a programmer: Laziness, Impatience, and Hubris. --Larry Wall
Re: Unmarked conflict checking in portcheck
2014-07-24 21:48 GMT+04:00 Andrew Fresh : > On Thu, Jul 24, 2014 at 09:39:05PM +0400, Vadim Zhukov wrote: >> 2014-07-24 15:33 GMT+04:00 Christian Weisgerber : >> > Speaking of which, here's what check-conflicts reports for the >> > 2014-07-22 amd64 bulk build: >> > >> > p5-TAP-Parser-0.54p0(devel/p5-TAP-Parser),p5-Test-Harness-3.30(devel/p5-Test-Harness) > >> This is the only one left, and this is a complicated one. >> p5-Test-Harness installs TAP::* without permit, and it differs from >> p5-TAP-Parser enough to be incompatible. The p5-Test-Harness is pure >> TDEP for devel/p5-Test-Warnings and devel/p5-Module-Build-Tiny - >> maybe, that's not a big deal and we could just add @conflict markers >> and be done. > > As far as I know, TAP::Parser was renamed to Test::Harness in 2007, I > would personally remove p5-TAP-Parser and replace it with > p5-Test-Harness in dependencies. > > https://metacpan.org/source/LEONT/Test-Harness-3.32/Changes#L420 sqlite> SELECT COUNT(*) FROM Depends WHERE DEPENDSPATH LIKE 'devel/p5-TAP-Parser%'; 0 I think p5-TAP-Parser should die then. -- WBR, Vadim Zhukov
Get rid of p5-TAP-Parser
So I propose the following. Okay?
--
WBR,
Vadim Zhukov
Index: quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.162
diff -u -p -r1.162 Makefile
--- quirks/Makefile 24 Jul 2014 19:54:59 - 1.162
+++ quirks/Makefile 24 Jul 2014 20:05:58 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.8
+PKGNAME = quirks-2.9
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.168
diff -u -p -r1.168 Quirks.pm
--- quirks/files/Quirks.pm 24 Jul 2014 19:54:59 - 1.168
+++ quirks/files/Quirks.pm 24 Jul 2014 20:05:58 -
@@ -352,6 +352,7 @@ my $stem_extensions = {
'nagios-plugins-pgsql' => 'monitoring-plugins-pgsql',
'kdnssd' => 'zeroconf-ioslave',
'kwallet' => 'kwalletmanager',
+ 'p5-TAP-Parser' => 'p5-Test-Harness',
};
# reasons for obsolete packages
Index: p5-Test-Harness/Makefile
===
RCS file: /cvs/ports/devel/p5-Test-Harness/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- p5-Test-Harness/Makefile26 Apr 2014 22:11:43 - 1.16
+++ p5-Test-Harness/Makefile24 Jul 2014 20:05:58 -
@@ -4,6 +4,7 @@ COMMENT = Run Perl standard test scripts
DISTNAME = Test-Harness-3.30
CATEGORIES = devel
+REVISION = 0
MAINTAINER = Andrew Fresh
Index: p5-Test-Harness/pkg/PLIST
===
RCS file: /cvs/ports/devel/p5-Test-Harness/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- p5-Test-Harness/pkg/PLIST 26 Apr 2014 22:11:43 - 1.8
+++ p5-Test-Harness/pkg/PLIST 24 Jul 2014 20:05:58 -
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2014/04/26 22:11:43 afresh1 Exp $
+@conflict p5-TAP-Parser-*
+@pkgpath devel/p5-TAP-Parser
bin/prove
${P5SITE}/App/
${P5SITE}/App/Prove/
Index: p5-TAP-Parser/Makefile
===
RCS file: p5-TAP-Parser/Makefile
diff -N p5-TAP-Parser/Makefile
--- p5-TAP-Parser/Makefile 11 Mar 2013 10:50:22 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/11 10:50:22 espie Exp $
-
-COMMENT= parse TAP output
-
-MODULES= cpan
-DISTNAME= TAP-Parser-0.54
-REVISION= 0
-CATEGORIES=devel
-
-# perl
-PERMIT_PACKAGE_CDROM= Yes
-
-CPAN_AUTHOR= ANDYA
-
-CONFIGURE_STYLE= modbuild
-USE_GROFF =Yes
-
-.include
Index: p5-TAP-Parser/distinfo
===
RCS file: p5-TAP-Parser/distinfo
diff -N p5-TAP-Parser/distinfo
--- p5-TAP-Parser/distinfo 14 Sep 2007 05:53:04 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,5 +0,0 @@
-MD5 (TAP-Parser-0.54.tar.gz) = gie5N/716T/o1cDmSLLZ4A==
-RMD160 (TAP-Parser-0.54.tar.gz) = z7pABjHQe4hMdvtY6UdB30H5r2M=
-SHA1 (TAP-Parser-0.54.tar.gz) = smGs8PR8fNyYs4h7xPdkmpjbXxY=
-SHA256 (TAP-Parser-0.54.tar.gz) = Aeu2MZFBFHof+0Y4qbKw4fH9j6mZokNfltoAoevRpTs=
-SIZE (TAP-Parser-0.54.tar.gz) = 116215
Index: p5-TAP-Parser/patches/patch-Build_PL
===
RCS file: p5-TAP-Parser/patches/patch-Build_PL
diff -N p5-TAP-Parser/patches/patch-Build_PL
--- p5-TAP-Parser/patches/patch-Build_PL14 Sep 2007 05:53:04 -
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-Build_PL,v 1.1.1.1 2007/09/14 05:53:04 msf Exp $
Build.PL.orig Fri Sep 14 14:36:53 2007
-+++ Build.PL Fri Sep 14 14:37:34 2007
-@@ -36,16 +36,6 @@ my $builder = $build_class->new(
- add_to_cleanup => ['TAP-Parser-*'],
- );
-
--if ($builder->prompt(
--"TAP::Parser includes \"runtests\" which is the equivalent of the\n"
-- . "TAP::Harness \"prove\". If you choose to install runtests you
will be able\n"
-- . "to run a module's test suite via TAP::Parser by typing
\"runtests -rb\" in\n"
-- . "the project's root directory.\n\n"
-- . "Do you wish to install the 'runtests' utility?", "y"
--) =~ /^[Yy]/
-- )
--{
--$builder->script_files( ["bin/runtests"] );
--}
-+$builder->script_files( ["bin/runtests"] );
-
- $builder->create_build_script();
Index: p5-TAP-Parser/pkg/DESCR
===
RCS file: p5-TAP-Parser/pkg/DESCR
diff -N p5-TAP-Parser/pkg/DESCR
--- p5-TAP-Parser/pkg/DESCR 14 Sep 2007 05:53:04 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1 +0,0 @@
-TAP::Parser is designed as a replacement for Test::Harness.
Index: p5-TAP-Parser/pkg/PLIST
Re: Get rid of p5-TAP-Parser
On Fri, Jul 25, 2014 at 12:08:02AM +0400, Vadim Zhukov wrote:
> So I propose the following. Okay?
I didn't test it, but I don't see any dependent ports for p5-TAP-Parser,
so the concept is OK by me.
> --
> WBR,
> Vadim Zhukov
>
>
> Index: quirks/Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.162
> diff -u -p -r1.162 Makefile
> --- quirks/Makefile 24 Jul 2014 19:54:59 - 1.162
> +++ quirks/Makefile 24 Jul 2014 20:05:58 -
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-2.8
> +PKGNAME =quirks-2.9
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.168
> diff -u -p -r1.168 Quirks.pm
> --- quirks/files/Quirks.pm24 Jul 2014 19:54:59 - 1.168
> +++ quirks/files/Quirks.pm24 Jul 2014 20:05:58 -
> @@ -352,6 +352,7 @@ my $stem_extensions = {
> 'nagios-plugins-pgsql' => 'monitoring-plugins-pgsql',
> 'kdnssd' => 'zeroconf-ioslave',
> 'kwallet' => 'kwalletmanager',
> + 'p5-TAP-Parser' => 'p5-Test-Harness',
> };
>
> # reasons for obsolete packages
> Index: p5-Test-Harness/Makefile
> ===
> RCS file: /cvs/ports/devel/p5-Test-Harness/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- p5-Test-Harness/Makefile 26 Apr 2014 22:11:43 - 1.16
> +++ p5-Test-Harness/Makefile 24 Jul 2014 20:05:58 -
> @@ -4,6 +4,7 @@ COMMENT = Run Perl standard test scripts
>
> DISTNAME = Test-Harness-3.30
> CATEGORIES = devel
> +REVISION = 0
>
> MAINTAINER = Andrew Fresh
>
> Index: p5-Test-Harness/pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/p5-Test-Harness/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- p5-Test-Harness/pkg/PLIST 26 Apr 2014 22:11:43 - 1.8
> +++ p5-Test-Harness/pkg/PLIST 24 Jul 2014 20:05:58 -
> @@ -1,4 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.8 2014/04/26 22:11:43 afresh1 Exp $
> +@conflict p5-TAP-Parser-*
> +@pkgpath devel/p5-TAP-Parser
> bin/prove
> ${P5SITE}/App/
> ${P5SITE}/App/Prove/
> Index: p5-TAP-Parser/Makefile
> ===
> RCS file: p5-TAP-Parser/Makefile
> diff -N p5-TAP-Parser/Makefile
> --- p5-TAP-Parser/Makefile11 Mar 2013 10:50:22 - 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,18 +0,0 @@
> -# $OpenBSD: Makefile,v 1.5 2013/03/11 10:50:22 espie Exp $
> -
> -COMMENT= parse TAP output
> -
> -MODULES= cpan
> -DISTNAME=TAP-Parser-0.54
> -REVISION=0
> -CATEGORIES= devel
> -
> -# perl
> -PERMIT_PACKAGE_CDROM=Yes
> -
> -CPAN_AUTHOR= ANDYA
> -
> -CONFIGURE_STYLE= modbuild
> -USE_GROFF = Yes
> -
> -.include
> Index: p5-TAP-Parser/distinfo
> ===
> RCS file: p5-TAP-Parser/distinfo
> diff -N p5-TAP-Parser/distinfo
> --- p5-TAP-Parser/distinfo14 Sep 2007 05:53:04 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,5 +0,0 @@
> -MD5 (TAP-Parser-0.54.tar.gz) = gie5N/716T/o1cDmSLLZ4A==
> -RMD160 (TAP-Parser-0.54.tar.gz) = z7pABjHQe4hMdvtY6UdB30H5r2M=
> -SHA1 (TAP-Parser-0.54.tar.gz) = smGs8PR8fNyYs4h7xPdkmpjbXxY=
> -SHA256 (TAP-Parser-0.54.tar.gz) =
> Aeu2MZFBFHof+0Y4qbKw4fH9j6mZokNfltoAoevRpTs=
> -SIZE (TAP-Parser-0.54.tar.gz) = 116215
> Index: p5-TAP-Parser/patches/patch-Build_PL
> ===
> RCS file: p5-TAP-Parser/patches/patch-Build_PL
> diff -N p5-TAP-Parser/patches/patch-Build_PL
> --- p5-TAP-Parser/patches/patch-Build_PL 14 Sep 2007 05:53:04 -
> 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-Build_PL,v 1.1.1.1 2007/09/14 05:53:04 msf Exp $
> Build.PL.origFri Sep 14 14:36:53 2007
> -+++ Build.PL Fri Sep 14 14:37:34 2007
> -@@ -36,16 +36,6 @@ my $builder = $build_class->new(
> - add_to_cleanup => ['TAP-Parser-*'],
> - );
> -
> --if ($builder->prompt(
> --"TAP::Parser includes \"runtests\" which is the equivalent of the\n"
> -- . "TAP::Harness \"prove\". If you choose to install runtests you
> will be able\n"
> -- . "to run a module's test suite via TAP::Parser by typing
> \"runtests -rb\" in\n"
> -- . "the project's root directory.\n\n"
> -- . "Do you wish to install the 'runtests' utility?", "y"
> --) =~ /^[Yy]/
> -- )
> --{
> --$builder->script_files( ["bin/runtests"] );
> --}
> -+$builder->script_files( ["bin/runtests"] );
> -
> - $builder->create_build_script();
> Index: p5-TAP-Parser/pkg/DESCR
> ==
