Subject: pkg/20720: expat is included in XF4 4.3.0, so pkgs should use it
To: None <gnats-bugs@gnats.netbsd.org>
From: None <skrueger@europe.com>
List: netbsd-bugs
Date: 03/15/2003 11:14:12
>Number:         20720
>Category:       pkg
>Synopsis:       expat is included in XF4 4.3.0, so pkgs should use it
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Mar 15 11:15:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Krüger
>Release:        NetBSD 1.6P
>Organization:
>Environment:
>Description:
since expat is now included in XFree86 4.3.0, we should use it instead of building / installing a seperate pkg.

Patch is included.
>How-To-Repeat:

>Fix:
--- buildlink2.mk       2003-03-15 16:40:12.000000000 +0100
+++ buildlink2.mk.new   2003-03-15 16:40:04.000000000 +0100
@@ -3,12 +3,16 @@
 .if !defined(EXPAT_BUILDLINK2_MK)
 EXPAT_BUILDLINK2_MK=   # defined
 
+.if exists(${X11BASE}/include/expat.h)
+BUILDLINK_PREFIX.expat=                ${X11BASE}
+.else
 BUILDLINK_PACKAGES+=           expat
 BUILDLINK_DEPENDS.expat?=      expat>=1.95.2
 BUILDLINK_PKGSRCDIR.expat?=    ../../textproc/expat
 
 EVAL_PREFIX+=  BUILDLINK_PREFIX.expat=expat
 BUILDLINK_PREFIX.expat_DEFAULT=        ${LOCALBASE}
+.endif
 BUILDLINK_FILES.expat=         include/expat.h
 BUILDLINK_FILES.expat+=                lib/libexpat.*

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