Re: i386: Updating ports conflicts'

2014-07-18 Thread Vadim Zhukov
2014-07-17 22:14 GMT+02:00 Stefan Wollny stefan.wol...@web.de:
 Hi there,

 a cvs-update of /etc/ports on i386-current quits at the letter D:

 ~ $ dmesg | grep OpenBSD
 OpenBSD 5.6-beta (GENERIC.MP) #247: Wed Jul 16 22:09:54 MDT 2014


 8 ---
 ? devel/p5-MooseX-Role-WithOverloading
 ? devel/p5-MooseX-SemiAffordanceAccessor
 ? devel/p5-MooseX-Traits
 ? devel/p5-MooseX-Traits-Pluggable
 RCS file: /cvs/ports/INDEX,v
 retrieving revision 1.427
 retrieving revision 1.428
 Merging differences between 1.427 and 1.428 into INDEX
 rcsmerge: warning: conflicts during merge
 cvs server: conflicts found in INDEX
 C INDEX

It looks like you called make index at some point in the past. Just
remove that file and then cvs up INDEX to get a clean version.

--
  WBR,
  Vadim Zhukov



Re: i386: Updating ports conflicts'

2014-07-18 Thread Vadim Zhukov
2014-07-17 22:14 GMT+02:00 Stefan Wollny stefan.wol...@web.de:
 Hi there,

 a cvs-update of /etc/ports on i386-current quits at the letter D:

 ~ $ dmesg | grep OpenBSD
 OpenBSD 5.6-beta (GENERIC.MP) #247: Wed Jul 16 22:09:54 MDT 2014


 8 ---
 ? devel/p5-MooseX-Role-WithOverloading
 ? devel/p5-MooseX-SemiAffordanceAccessor
 ? devel/p5-MooseX-Traits
 ? devel/p5-MooseX-Traits-Pluggable
 RCS file: /cvs/ports/INDEX,v
 retrieving revision 1.427
 retrieving revision 1.428
 Merging differences between 1.427 and 1.428 into INDEX
 rcsmerge: warning: conflicts during merge
 cvs server: conflicts found in INDEX
 C INDEX
 P archivers/freeze/Makefile
 P archivers/freeze/pkg/PLIST
 cvs server: cannot open directory /cvs/D: No such file or directory
 cvs server: skipping directory audio/gmpc-autoplaylist
 cvs server: cannot open directory /cvs/D: No such file or directory
 cvs server: skipping directory audio/gmpc-stopbutton
 cvs server: cannot open directory /cvs/D: No such file or directory
 cvs server: skipping directory audio/gmpccaa
 cvs server: cannot open directory /cvs/D: No such file or directory
 cvs server: skipping directory audio/gom
 cvs server: cannot open directory /cvs/D: No such file or directory
 cvs server: skipping directory audio/last.fm
 cvs server: cannot open directory /cvs/D: No such file or directory
 cvs server: skipping directory audio/libmpcdec
 cvs server: cannot open directory /cvs/D: No such file or directory
 cvs server: skipping directory audio/lopster
 cvs [server aborted]: could not find desired version 1.26 in
 /cvs/ports/books/Makefile,v
 quirks-1.146 signed on 2014-07-08T10:12:04Z

Sorry, typed Ctrl+Enter too fast.

It looks like as your AnonCVS mirror was broken, you realized it and
then switched to another one. But the broken files are still there...
Just get rid of the /usr/ports and reload it again; Given how many
chages were in the tree since 5.5, checking out could be faster than
updating from ports.tar.gz from 5.5.

--
  WBR,
  Vadim Zhukov



i386: Updating ports conflicts'

2014-07-17 Thread Stefan Wollny
Hi there,

a cvs-update of /etc/ports on i386-current quits at the letter D:

~ $ dmesg | grep OpenBSD
OpenBSD 5.6-beta (GENERIC.MP) #247: Wed Jul 16 22:09:54 MDT 2014


8 ---
? devel/p5-MooseX-Role-WithOverloading
? devel/p5-MooseX-SemiAffordanceAccessor
? devel/p5-MooseX-Traits
? devel/p5-MooseX-Traits-Pluggable
RCS file: /cvs/ports/INDEX,v
retrieving revision 1.427
retrieving revision 1.428
Merging differences between 1.427 and 1.428 into INDEX
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in INDEX
C INDEX
P archivers/freeze/Makefile
P archivers/freeze/pkg/PLIST
cvs server: cannot open directory /cvs/D: No such file or directory
cvs server: skipping directory audio/gmpc-autoplaylist
cvs server: cannot open directory /cvs/D: No such file or directory
cvs server: skipping directory audio/gmpc-stopbutton
cvs server: cannot open directory /cvs/D: No such file or directory
cvs server: skipping directory audio/gmpccaa
cvs server: cannot open directory /cvs/D: No such file or directory
cvs server: skipping directory audio/gom
cvs server: cannot open directory /cvs/D: No such file or directory
cvs server: skipping directory audio/last.fm
cvs server: cannot open directory /cvs/D: No such file or directory
cvs server: skipping directory audio/libmpcdec
cvs server: cannot open directory /cvs/D: No such file or directory
cvs server: skipping directory audio/lopster
cvs [server aborted]: could not find desired version 1.26 in
/cvs/ports/books/Makefile,v
quirks-1.146 signed on 2014-07-08T10:12:04Z
8 ---


It it just me and my system? Any hints anyone?

Thanks in advance.

Cheers,
STEFAN




OpenBSD 5.6-beta (GENERIC.MP) #247: Wed Jul 16 22:09:54 MDT 2014
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP
cpu0: Intel(R) Core(TM) Duo CPU T2400 @ 1.83GHz (GenuineIntel
686-class) 1.83 GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,NXE,SSE3,MWAIT,VMX,EST,TM2,xTPR,PDCM,PERF
real mem  = 3219484672 (3070MB)
avail mem = 3154423808 (3008MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: AT/286+ BIOS, date 03/21/11, BIOS32 rev. 0 @ 0xfd6b0,
SMBIOS rev. 2.4 @ 0xe0010 (68 entries)
bios0: vendor LENOVO version 79ETE7WW (2.27 ) date 03/21/2011
bios0: LENOVO 200855G
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP SSDT ECDT TCPA APIC MCFG HPET BOOT SSDT SSDT
SSDT SSDT
acpi0: wakeup devices LID_(S3) SLPB(S3) LURT(S3) DURT(S3) EXP0(S4)
EXP1(S4) EXP2(S4) EXP3(S4) PCI1(S4) USB0(S3) USB1(S3) USB2(S3) USB7(S3)
HDEF(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpiec0 at acpi0
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 166MHz
cpu0: mwait min=64, max=64, C-substates=0.2.2.2.2, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Intel(R) Core(TM) Duo CPU T2400 @ 1.83GHz (GenuineIntel
686-class) 1.83 GHz
cpu1:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,NXE,SSE3,MWAIT,VMX,EST,TM2,xTPR,PDCM,PERF
ioapic0 at mainbus0: apid 1 pa 0xfec0, version 20, 24 pins
ioapic0: misconfigured as apic 2, remapped to apid 1
acpimcfg0 at acpi0 addr 0xf000, bus 0-63
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 1 (AGP_)
acpiprt2 at acpi0: bus 2 (EXP0)
acpiprt3 at acpi0: bus 3 (EXP1)
acpiprt4 at acpi0: bus 4 (EXP2)
acpiprt5 at acpi0: bus 12 (EXP3)
acpiprt6 at acpi0: bus 21 (PCI1)
acpicpu0 at acpi0: C3, C2, C1, PSS
acpicpu1 at acpi0: C3, C2, C1, PSS
acpipwrres0 at acpi0: PUBS, resource for USB0, USB2, USB7
acpitz0 at acpi0: critical temperature is 127 degC
acpitz1 at acpi0: critical temperature is 99 degC
acpibtn0 at acpi0: LID_
acpibtn1 at acpi0: SLPB
acpibat0 at acpi0: BAT0 model 92P1139 serial  6480 type LION oem
Panasonic
acpibat1 at acpi0: BAT1 not present
acpiac0 at acpi0: AC unit online
acpithinkpad0 at acpi0
acpidock0 at acpi0: GDCK not docked (0)
bios0: ROM list: 0xc/0xfe00 0xd/0x1000 0xd1000/0x1000
0xdc000/0x4000! 0xe/0x1!
cpu0: Enhanced SpeedStep 1829 MHz: speeds: 1833, 1333, 1000 MHz
pci0 at mainbus0 bus 0: configuration mode 1 (bios)
pchb0 at pci0 dev 0 function 0 Intel 82945GM Host rev 0x03
ppb0 at pci0 dev 1 function 0 Intel 82945GM PCIE rev 0x03: apic 1 int 16
pci1 at ppb0 bus 1
radeondrm0 at pci1 dev 0 function 0 ATI Radeon Mobility X1300 M52-64
rev 0x00
drm0 at radeondrm0
radeondrm0: apic 1 int 16
azalia0 at pci0 dev 27 function 0 Intel 82801GB HD Audio rev 0x02: msi
azalia0: codecs: Analog Devices AD1981HD, Conexant/0x2bfa, using Analog
Devices AD1981HD
audio0 at azalia0
ppb1 at pci0 dev 28 function 0 Intel 82801GB PCIE rev 0x02: apic 1 int 20
pci2 at ppb1 bus 2
em0 at pci2 dev 0 function 0 Intel 82573L rev 0x00: