Date: Wed, 23 Jan 2013 19:20:01 GMT From: Mark Johnston <markj@freebsd.org> To: freebsd-x11@FreeBSD.org Subject: Re: ports/175532: x11/xdm: /bin/cp -n /usr/local/share/examples/xdm/GiveConsole /usr/local/lib/X11/xdm/GiveConsole *** [post-install] Error code 1 Message-ID: <201301231920.r0NJK1SD003194@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/175532; it has been noted by GNATS.
From: Mark Johnston <markj@freebsd.org>
To: bug-followup@FreeBSD.org, ohartman@zedat.fu-berlin.de
Cc: obrien@freebsd.org
Subject: Re: ports/175532: x11/xdm: /bin/cp -n
/usr/local/share/examples/xdm/GiveConsole /usr/local/lib/X11/xdm/GiveConsole
*** [post-install] Error code 1
Date: Wed, 23 Jan 2013 12:11:26 -0800
--LyciRD1jyfeSSjG0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
I suspect that this is because of r245832, which changed cp -n to return
an error if the destination file exists. Previously it would just exit
with a status of 0.
The attached (untested) patch should fix this problem. I'm not sure what
the general fix should be - there are at least ~20 ports that use cp -n
in some way or another (found by grepping for '${CP} -[A-Za-z]*n').
-Mark
--LyciRD1jyfeSSjG0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 862050b..028e6e2 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -49,7 +49,7 @@ post-configure:
post-install:
.for f in ${CFFILES}
- ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f
+ -${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f
.endfor
${MKDIR} /var/lib/xdm/authdir
${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir
--LyciRD1jyfeSSjG0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301231920.r0NJK1SD003194>