Date: Wed, 23 Nov 2005 12:25:18 +1100 From: Mark Andrews <Mark_Andrews@isc.org> Cc: Dejan Lesjak <dejan.lesjak@ijs.si>, freebsd-stable@freebsd.org Subject: Re: xorg-clients conflicts with xterm (patch) Message-ID: <200511230125.jAN1PIAQ005788@drugs.dv.isc.org> In-Reply-To: Your message of "Wed, 23 Nov 2005 12:18:58 %2B1100."
next in thread | raw e-mail | index | archive | help
> > > On Wednesday 23 of November 2005 01:11, Joel Hatton wrote: > > > > Joel Hatton wrote: > > > > > What was the rationale behind changing this behaviour for 206_1? > > > > > > > > That xterm should install as xterm and not xterm-static. > > > > > > This is certainly sensible, however it appears that the onus has now been > > > put on the maintainer of xorg-clients to change its installation process > > > to accommodate xterm. > > > > It has been accommodated. > > > > > This hasn't happened yet (after cvsup this morning), > > > which means that xterm remains incompatible with the current xorg-clients > > > version and thus will fail during every portupgrade -a until then, unless > > > I make xterm a held package. > > > > > > According to UPDATING, upgrading "xorg-clients to 6.8.2_1 or newer" is ok > , > > > but this is not the case: > > > > > > # pkg_info -I xorg-clients\* > > > xorg-clients-6.8.2_1 X client programs and related files from X.Org > > > > > > # portupgrade -p xterm > > > > > > ... (building) > > > > > > ---> Installing the new version via the port > > > ===> Installing for xterm-206_1 > > > > > > ===> xterm-206_1 conflicts with installed package(s): > > > xorg-clients-6.8.2 > > > > > > They install files into the same place. > > > Please remove them first with pkg_delete(1). > > > > Interesting. This is how it goes here: > > > > # pkg_info -I xorg-clients\* > > xorg-clients-6.8.2_1 X client programs and related files from X.Org > > > > # portupgrade -fp xterm > > ... > > ===> Building for xterm-206_1 > > ... (build) ... > > ===> Installing for xterm-206_1 > > ... (install) ... > > ===> Registering installation for xterm-206_1 > > ... > > > > > > Can you try without portupgrade (cd /usr/ports/x11/xterm && make install). > > > > > Couldn't this transition have been better managed? > > > > Possibly. Do you have a suggestion so it can be used in similar future > > situations? > > > > > > Dejan > > _______________________________________________ > > freebsd-stable@freebsd.org mailing list > > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" > > For some reason the conflict detection code comes out with > xorg-clients-6.8.2 even though when you run the steps by hand > they don't produce xorg-clients-6.8.2. > > After modifying Mk/bsd.port.mk to display what it is doing: > > ===> Installing for xterm-206_1 > set -x ; found=`/usr/local/sbin/pkg_info -I 'xorg-clients-6.7*' 'xorg-client > s-6.8.[0-1]*' 'xorg-clients-6.8.2' 'XFree86-clients-4.[0-4]*' 'XFree86-client > s-4.5.0' 'XFree86-3*' 2>/dev/null | /usr/bin/awk '{print $1}'`; conflicts_wi > th=; echo found is ${found}; for entry in ${found}; do prfx=`/usr/local/sb > in/pkg_info -q -p "${entry}" 2> /dev/null | /usr/bin/sed -ne '1s/^@cwd //p'`; > orgn=`/usr/local/sbin/pkg_info -q -o "${entry}" 2> /dev/null`; if [ "//usr > /X11R6" = "/${prfx}" -a "/x11/xterm" != "/${orgn}" ]; then conflicts_with="$ > {conflicts_with} ${entry}"; fi; done; if [ -n "${conflicts_with}" ]; then > echo; echo "===> xterm-206_1 conflicts with installed package(s): "; for > entry in ${conflicts_with}; do echo " ${entry}"; done; echo; echo " > They install files into the same place."; echo " Please remove the > m first with pkg_delete(1)."; exit 1; fi > + /usr/local/sbin/pkg_info+ /usr/bin/awk -I {print $1} xorg-clients-6.7* > xorg-clients-6.8.[0-1]* xorg-clients-6.8.2 XFree86-clients-4.[0-4]* XFree86- > clients-4.5.0 XFree86-3* > + found=xorg-clients-6.8.2 > + conflicts_with= > + echo found is xorg-clients-6.8.2 > found is xorg-clients-6.8.2 > + /usr/local/sbin/pkg_info+ /usr/bin/sed -q -ne -p 1s/^@cwd //p xorg-clients- > 6.8.2 > > + prfx=/usr/X11R6 > + /usr/local/sbin/pkg_info -q -o xorg-clients-6.8.2 > + orgn=x11/xorg-clients > + [ //usr/X11R6 = //usr/X11R6 -a /x11/xterm != /x11/xorg-clients ] > + conflicts_with= xorg-clients-6.8.2 > + [ -n xorg-clients-6.8.2 ] > + echo > > + echo ===> xterm-206_1 conflicts with installed package(s): > ===> xterm-206_1 conflicts with installed package(s): > + echo xorg-clients-6.8.2 > xorg-clients-6.8.2 > + echo > > + echo They install files into the same place. > They install files into the same place. > + echo Please remove them first with pkg_delete(1). > Please remove them first with pkg_delete(1). > + exit 1 > *** Error code 1 > > Stop in /usr/ports/x11/xterm. > *** Error code 1 > > Stop in /usr/ports/x11/xterm. > ** Command failed [exit code 1]: /usr/bin/script -qa /tmp/portupgrade79753.0 > make reinstall > ** Fix the installation problem and try again. > ** Listing the failed packages (*:skipped / !:failed) > ! x11/xterm (install error) > ---> Packages processed: 0 done, 0 ignored, 0 skipped and 1 failed > drugs# sh > # /usr/local/sbin/pkg_info -I 'xorg-clients-6.7*' 'xorg-clients-6.8.[0-1]*' ' > xorg-clients-6.8.2' 'XFree86-clients-4.[0-4]*' 'XFree86-clients-4.5.0' 'XFree > 86-3*' 2>/dev/null | /usr/bin/awk '{print $1}' > # /usr/local/sbin/pkg_info -I 'xorg-clients-6.7*' 'xorg-clients-6.8.[0-1]*' ' > xorg-clients-6.8.2' 'XFree86-clients-4.[0-4]*' 'XFree86-clients-4.5.0' 'XFree > 86-3*' > pkg_info: can't find package 'xorg-clients-6.7*' installed or in a file! > pkg_info: can't find package 'xorg-clients-6.8.[0-1]*' installed or in a file > ! > pkg_info: can't find package 'xorg-clients-6.8.2' installed or in a file! > pkg_info: can't find package 'XFree86-clients-4.[0-4]*' installed or in a fil > e! > pkg_info: can't find package 'XFree86-clients-4.5.0' installed or in a file! > pkg_info: can't find package 'XFree86-3*' installed or in a file! > # > > Calling env at this point in the install produces. > > PORTSDIR=/usr/ports > ARCH=i386 > OPSYS=FreeBSD > USER=marka > SSH_CLIENT=2001:470:1f00:820:2e0:29ff:fe19:c02d 1878 22 > MACHTYPE=i386 > CVS_RSH=/usr/local/bin/ssh > CVS_SERVER=cvs > MAIL=/var/mail/marka > VENDOR=intel > SHLVL=2 > HOME=/root > LESS=-f > OLDPWD=/usr/ports/x11/xterm > DEPENDS_TARGET=reinstall > PAGER=more > GROUP=marka > LOGNAME=marka > OSREL=4.11 > WINDOWID=33554446 > XTERM_SHELL=/bin/csh > TERM=xterm > BLOCKSIZE=K > PORTOBJFORMAT=elf > LESSCHARSET=latin1 > PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin: > /usr/X11R6/bin:/root/bin > PACKAGES=/home/packages > DISPLAY=localhost:12.0 > REMOTEHOST=localhost > SYSTEMVERSION= > SSH_AUTH_SOCK=/tmp/ssh-qju0Lvlp/agent.454 > OSVERSION=492100 > SHELL=/bin/csh > HOST=drugs.dv.isc.org > PKG_PATH=/home/packages/All > OSTYPE=FreeBSD > PWD=/usr/ports/x11/xterm > CVSROOT=:ext:cvs.isc.org:/proj/cvs/prod > SSH_CONNECTION=2001:470:1f00:820:2e0:29ff:fe19:c02d 1878 2001:470:1f00:820:20 > 8:74ff:fe9f:eeae 22 > XTERM_VERSION=X.Org 6.8.2(205) > TERMCAP=xterm|xterm-color|X11 terminal emulator:ti@:te@:k1=\EOP:k2=\EOQ:k3=\E > OR:k4=\EOS:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:F1=\E[ > 23~:F2=\E[24~:kH=\EOF:@7=\EOF:kI=\E[2~:kh=\EOH:*6=\EOF:kP=\E[5~:kN=\E[6~:ku=\ > EOA:kd=\EOB:kr=\EOC:kl=\EOD:Km=\E[M:li#49:co#80:am:kn#12:km:mi:ms:xn:bl=^G:is > =\E[!p\E[?3;4l\E[4l\E>:rs=\E[!p\E[?3;4l\E[4l\E>:le=^H:AL=\E[%dL:DL=\E[%dM:DC= > \E[%dP:al=\E[L:dc=\E[P:dl=\E[M:UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:ho=\E[ > H:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4 > l:ks=\E[?1h\E=:ke=\E[?1l\E>:kD=\E[3~:sf=\n:sr=\EM:st=\EH:ct=\E[3g:sc=\E7:rc=\ > E8:eA=\E(B\E)0:as=^N:ae=^O:ml=\El:mu=\Em:up=\E[A:nd=\E[C:md=\E[1m:me=\E[m^O:m > r=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:vi=\E[?25l:ve=\E[?25h:ut:Co#8:p > a#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:kb=\010: > FTP_PASSIVE_MODE=YES > HOSTTYPE=FreeBSD > EDITOR=vi > > > FreeBSD drugs.dv.isc.org 4.11-STABLE FreeBSD 4.11-STABLE #26: Wed Oct 12 20:1 > 1:22 EST 2005 marka@drugs.dv.isc.org:/usr/obj/usr/src/sys/DRUGS i386 > > -- > Mark Andrews, ISC > 1 Seymour St., Dundas Valley, NSW 2117, Australia > PHONE: +61 2 9871 4742 INTERNET: Mark_Andrews@isc.org This is explains the false positive. $ sh $ PACKAGES=/home/packages $ export PACKAGES $ /usr/local/sbin/pkg_info -I xorg-clients-6.8.2 pkg_info: can't find package 'xorg-clients-6.8.2' installed or in a file! $ PKG_PATH=/home/packages/All $ export PKG_PATH $ /usr/local/sbin/pkg_info -I xorg-clients-6.8.2 xorg-clients-6.8.2 X client programs and related files from X.Org $ -- Mark Andrews, ISC 1 Seymour St., Dundas Valley, NSW 2117, Australia PHONE: +61 2 9871 4742 INTERNET: Mark_Andrews@isc.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511230125.jAN1PIAQ005788>