pkg/43397: [PATCH] devel/bzr wants zlib which Ubuntu does not have

[makoto%ki.nu@localhost]

>Number:         43397
>Category:       pkg
>Synopsis:       Ubuntu does not have zlib while bzr wants it.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Tue Jun 01 06:55:00 +0000 2010
>Originator:     Makoto Fujiwara
>Release:        Ubuntu-10.04
>Organization:
KINU Corporation
>Environment:
        
        
        Linux ubuntu 2.6.32-21-generic #32-Ubuntu SMP Fri Apr 16 08:10:02 UTC 
2010 i686 GNU/Linux
>Description:
        
devel/bzr wants zlib. While NetBSD has zlib built-in, 
   % ls -l /usr/include/zlib.h
   -r--r--r--  1 root  wheel  66311 Apr 13 04:51 /usr/include/zlib.h
ubuntu may not have it when its OS is just installed.
>How-To-Repeat:
        
(1) prepare pkgsrc environment by bootstrap-pkgsrc on ubuntu
    ... it may not be straightforward...,
     some memo on http://www.ki.nu/~makoto/diary/2010/05/12/
(2) cd devel/bzr
    bmake package

Then it will say:
-----------
gcc -DNDEBUG -Wno-error -DHAVE_DB_185_H -I/usr/include
    -I/usr/pkg/include/db4 -I/usr/pkg/include -Wno-error
    -I/usr/include -I/usr/pkg/include/python2.6 -I/usr/include
    -I/usr/pkg/include/python2.6 -fPIC
    -I/usr/pkg/include/python2.6 -c bzrlib/_chk_map_pyx.c -o
    build/temp.linux-i686-2.6/bzrlib/_chk_map_pyx.o
bzrlib/_chk_map_pyx.c:31:18: error: zlib.h: No such file or directory
bzrlib/_chk_map_pyx.c: In function 
'__pyx_f_6bzrlib_12_chk_map_pyx__search_key_16':
bzrlib/_chk_map_pyx.c:243: error: 'Bytef' undeclared (first use in this 
function)
bzrlib/_chk_map_pyx.c:243: error: (Each undeclared identifier is reported only 
once
bzrlib/_chk_map_pyx.c:243: error: for each function it appears in.)
bzrlib/_chk_map_pyx.c:243: error: '__pyx_v_c_bit' undeclared (first use in this 
function)
  (ommit about 20 lines)                         

This will happen even if devel/zlib is installed separately.
>Fix:
        

Index: devel/bzr/Makefile
===================================================================
RCS file: /export/cvsync/pkgsrc/devel/bzr/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- devel/bzr/Makefile  16 Feb 2010 11:27:27 -0000      1.47
+++ devel/bzr/Makefile  1 Jun 2010 06:44:01 -0000
@@ -41,6 +41,10 @@
 #      XXX shouldn't HOME=FAKEHOME already be set?
        HOME=${FAKEHOMEDIR}; cd ${WRKSRC} && ./bzr selftest -v
 
+# at least ubuntu 10.04 does not have native zlib.h
+.if ${OPSYS} == "Linux"
+. include "../../devel/zlib/buildlink3.mk"
+.endif
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

>Unformatted: