Date: Thu, 23 Feb 2006 23:27:05 -0800 From: Pascal Hofstee <caelian@gmail.com> To: gnome@freebsd.org Subject: Re: bsd.port.mk (at least in MC-gnome) breaks package dependency registration Message-ID: <1140766025.825.6.camel@synergy.odyssey.homeunix.org> In-Reply-To: <1140765467.825.3.camel@synergy.odyssey.homeunix.org> References: <1140765467.825.3.camel@synergy.odyssey.homeunix.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-g7wcQghimAVx0a5X7BJN
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
On Thu, 2006-02-23 at 23:17 -0800, Pascal Hofstee wrote:
> Hi,
>
> With the recent reverting of the PERL_BUILD/RUN_DEPENDS mechanism it
> looks like somebody removed a single " too much from bsd.port.mk which
> in turn is causing Syntax error: Unterminated quoted string errors
> during package registration.
>
> Attached is a patch for bsd.port.mk which puts this " back in place
> which should hopefully restore package registration. It looks like i am
> forced to uninstall reinstall all my ports now since i only noticed the
> breakage halfway through a rather involved portupgrade cycle. So my
> package dependency information in /var/db/pkg is shot.
Ok .. Looks like i was a little hasty in sending out my initial patch ..
as the same breakage occurs in two other spots in bsd.port.mk (it looks
to be a MC problem only).
New Patch Attached.
--
Pascal Hofstee
--=-g7wcQghimAVx0a5X7BJN
Content-Disposition: attachment; filename=patch-bsd.port.mk
Content-Type: text/plain; name=patch-bsd.port.mk; charset=us-ascii
Content-Transfer-Encoding: 7bit
--- bsd.port.mk.orig Thu Feb 23 23:11:32 2006
+++ bsd.port.mk Thu Feb 23 23:24:35 2006
@@ -4690,7 +4690,7 @@
.endif
BUILD-DEPENDS-LIST= \
- for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | ${SORT} -u); do \
+ for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | ${SORT} -u); do \
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
@@ -4704,7 +4704,7 @@
.endif
RUN-DEPENDS-LIST= \
- for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | ${SORT} -u); do \
+ for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | ${SORT} -u); do \
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
@@ -4735,7 +4735,7 @@
done; \
fi; \
checked="${PARENT_CHECKED}"; \
- for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \
+ for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \
dir=$$(${REALPATH} $$dir); \
if [ -d $$dir ]; then \
if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \
--=-g7wcQghimAVx0a5X7BJN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1140766025.825.6.camel>