pkg/26480: make update broken in x11/xorg-imake

[hira%po6.nsk.ne.jp@localhost]

>Number:         26480
>Category:       pkg
>Synopsis:       make update broken in x11/xorg-imake
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jul 30 15:57:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kouichirou Hiratsuka
>Release:        NetBSD 2.0G
>Organization:
>Environment:
System: NetBSD firefly.localdomain 2.0G NetBSD 2.0G (FIREFLY.MP) #34: Thu Jul 
29 08:47:37 JST 2004 
root%firefly.localdomain@localhost:/usr/src/sys/arch/i386/compile/FIREFLY.MP 
i386
Architecture: i386
Machine: i386
>Description:
        When I ran `make update' in x11/xorg-imake, header files were deleted.

# cd /usr/pkgsrc/x11/xorg-imake
# make update
===> Deinstalling for xorg-imake
Running /usr/sbin/pkg_delete -K /var/db/pkg -r xorg-imake-6.7.0nb1
===> Checking for vulnerabilities in xorg-imake-6.7.0nb1
===> Installing for xorg-imake-6.7.0nb1
/usr/bin/make -f xmakefile install
[snip]
===> Registering installation for xorg-imake-6.7.0nb1
===> Installing in meta-pkgs/xorg
===> Deinstalling for xorg
===> Checking for vulnerabilities in xorg-6.7.0
===> Extracting for xorg-6.7.0
===> Required installed package xorg-imake>=6.7.0: xorg-imake-6.7.0nb1 found
===> Required installed package xorg-libs>=6.7.0: xorg-libs-6.7.0 found
===> Required installed package xorg-server>=6.7.0: xorg-server-6.7.0 found
===> Required installed package xorg-clients>=6.7.0: xorg-clients-6.7.0 found
===> Required installed package xorg-fontsEncodings>=6.7.0: 
xorg-fontsEncodings-6.7.0 found
===> Required installed package xorg-fonts100dpi>=6.7.0: xorg-fonts100dpi-6.7.0 
found
===> Required installed package xorg-fonts75dpi>=6.7.0: xorg-fonts75dpi-6.7.0 
found
===> Required installed package xorg-fontsMisc>=6.7.0: xorg-fontsMisc-6.7.0 
found
===> Required installed package xorg-fontsCyrillic>=6.7.0: 
xorg-fontsCyrillic-6.7.0 found
===> Required installed package xorg-fontsTruetype>=6.7.0: 
xorg-fontsTruetype-6.7.0 found
===> Required installed package xorg-fontsType1>=6.7.0: xorg-fontsType1-6.7.0 
found
===> Required installed package xorg-docs>=6.7.0: xorg-docs-6.7.0 found
===> Patching for xorg-6.7.0
===> Overriding tools for xorg-6.7.0
===> Installing for xorg-6.7.0
===> Registering installation for xorg-6.7.0
xorg-6.7.0 requires installed package xorg-clients-6.7.0
xorg-6.7.0 requires installed package xorg-docs-6.7.0
xorg-6.7.0 requires installed package xorg-fonts100dpi-6.7.0
xorg-6.7.0 requires installed package xorg-fonts75dpi-6.7.0
xorg-6.7.0 requires installed package xorg-fontsCyrillic-6.7.0
xorg-6.7.0 requires installed package xorg-fontsEncodings-6.7.0
xorg-6.7.0 requires installed package xorg-fontsMisc-6.7.0
xorg-6.7.0 requires installed package xorg-fontsTruetype-6.7.0
xorg-6.7.0 requires installed package xorg-fontsType1-6.7.0
xorg-6.7.0 requires installed package xorg-imake-6.7.0nb1
xorg-6.7.0 requires installed package xorg-libs-6.7.0
xorg-6.7.0 requires installed package xorg-server-6.7.0
===> Cleaning for xorg-6.7.0
===> Cleaning for xorg-imake-6.7.0nb1
# ls /usr/pkg/xorg/include
ls: /usr/pkg/xorg/include: No such file or directory
#

>How-To-Repeat:
        cd ${PKGSRCDIR}/meta-pkgs/xorg
        make && make install && make clean && make clean-depends
        cd ../../x11/xorg-imake
        make && make update

>Fix:
        remove `include' from SUBDIRS?

--- Makefile.orig       2004-07-30 23:53:16.000000000 +0900
+++ Makefile    2004-07-30 23:38:19.000000000 +0900
@@ -67,8 +67,9 @@
        cd ${WRKSRC} && ${MAKE} Makefile.boot && \
        ${MAKE_PROGRAM} -f xmakefile VerifyOS version.def Makefiles includes
 
-# These files are handled by xorg-libs.
-post-install:
-       @${RM} -rf ${X11ROOT}/include
+pre-install:
+       @${CP} ${WRKSRC}/xmakefile ${WRKSRC}/xmakefile.bak
+       @${SED} 's/SUBDIRS = include/SUBDIRS =/' ${WRKSRC}/xmakefile.bak > \
+               ${WRKSRC}/xmakefile
 
 .include "../../mk/bsd.pkg.mk"

>Release-Note:
>Audit-Trail:
>Unformatted: