>Number:         13304
>Category:       pkg
>Synopsis:       use devel/zlib/buildlink.mk to resolv zlib includes/libs issue
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Jun 25 03:25:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Stoned Elipot
>Release:        pkgsrc-current
>Organization:
SCRIPT, Paris VII University, France
>Environment:
System: NetBSD bandsept 1.5 NetBSD 1.5 (BANDSEPT) #0: Mon Dec 18 14:43:36 CET 2000 seb@bandsept:/site/a/src/sys-nbsd15/arch/sparc/compile/BANDSEPT sparc

and
System: SunOS tzolkin 5.8 Generic_108528-06 sun4u sparc SUNW,Ultra-5_10
Architecture: sun4

and
System: SunOS pok-a-tok 5.7 Generic_106541-12 sun4u sparc
Architecture: sun4

>Description:
Zlib dependency can be avoided on newer Solaris system as it is included
in base system. Use devel/zlib/buildlink.mk to let it decide if dependency
on pkg zlib-* should be included on a system independant way.
With the proposed patch zlib dependency is included only if /usr/include/zlib.h
is not present (as of current version of devel/zlib/buildlink.mk)
>How-To-Repeat:
Try to build cvs pkg on solaris 8 with zoularis and you'll have dependency
on pkg zlib included.
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cvs/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile	2001/04/17 07:49:46	1.42
+++ Makefile	2001/06/25 10:21:45
@@ -18,10 +18,7 @@
 
 BUILD_DEFS+=	USE_INET6
 
-.if (${OPSYS} == "SunOS")
-DEPENDS+=	zlib-*:../../devel/zlib
-CFLAGS+=	-I${PREFIX}/include		# zlib.h
-.else
+.if (${OPSYS} != "SunOS")
 PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
 PATCHFILES=		cvs-1.11-v6-20010413.diff.gz
 PATCH_DIST_STRIP=	-p1
@@ -52,4 +49,5 @@
 
 INFO_FILES=	cvs.info cvsclient.info
 
+.include "../../devel/zlib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
>Release-Note:
>Audit-Trail:
>Unformatted: