Re: Is portupgrade working?

[YONETANI Tomokazu <qhwt+dragonfly-kernel@xxxxxxxxxx>]

Hi.

On Sat, Mar 20, 2004 at 07:03:51PM -0800, walt wrote:
> I'm getting some funny errors from portupgrade.  Anyone else seeing
> these?
> 
> # portupgrade XFree86-libraries-4.3.0_6
> ** Invalid package name: x11/XFree86-4-libraries: : Not in due form: 
> <name>-<version>
> ** The following packages were not installed or upgraded (*:skipped / 
> !:failed)
>         ! x11/XFree86-4-libraries (XFree86-libraries-4.3.0_6) 
> (invalid package name)
> 
> I get a similar error from imake-4, for example, but several other
> packages upgraded without a problem.

portupgrade relies on the output from the shell command

`cd /usr/ports/Category/Ports && make -V SomeVariables'

to obtain information from the ports tree. The problem here is that
`make -V PKGNAME' returns an empty string if the port has DragonFly
override. This is because PKGNAME gets set in ${PORTSDIR}/Mk/bsd.port.mk,
which is included from /usr/share/mk/bsd.port.mk only when the port has
no DragonFly override. A temporary workaround is to change
/usr/share/mk/bsd.port.mk so that it include Mk/bsd.port.mk when the
port has override, but this may have bad side-effects.

Index: bsd.port.mk
===================================================================
RCS file: /home/source/dragonfly/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.13
diff -u -r1.13 bsd.port.mk
--- bsd.port.mk	2 Mar 2004 15:03:00 -0000	1.13
+++ bsd.port.mk	21 Mar 2004 16:11:47 -0000
@@ -32,6 +32,7 @@
 .include "${PORTSDIR}/Mk/bsd.port.mk"
 
 .else
+.include "${PORTSDIR}/Mk/bsd.port.mk"
 
 .undef BEFOREPORTMK
 .undef AFTERPORTMK