diff options
| author | tron <tron> | 2002-09-01 15:13:41 +0000 |
|---|---|---|
| committer | tron <tron> | 2002-09-01 15:13:41 +0000 |
| commit | daaa56d1765f2db56b00eaf61b1f3c08651cba48 (patch) | |
| tree | e4f6fd2a7cf6661873f728d21cd12e9c371b77cc /graphics/xpm | |
| parent | 432b31742b02a145971f48fc6f25c8999d2d2fe0 (diff) | |
| download | pkgsrc-daaa56d1765f2db56b00eaf61b1f3c08651cba48.tar.gz | |
The "Xpm" library is distributed with Solaris 9. Handle this case like
XFree86 4.x and don't install the package.
Diffstat (limited to 'graphics/xpm')
| -rw-r--r-- | graphics/xpm/Makefile | 8 | ||||
| -rw-r--r-- | graphics/xpm/buildlink.mk | 10 | ||||
| -rw-r--r-- | graphics/xpm/buildlink2.mk | 10 |
3 files changed, 20 insertions, 8 deletions
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index d150f932df3..0ec7157defa 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2002/08/25 18:39:24 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2002/09/01 15:13:42 tron Exp $ DISTNAME= xpm-3.4k CATEGORIES= graphics x11 @@ -14,13 +14,17 @@ USE_IMAKE= # defined .include "../../mk/bsd.prefs.mk" -# Check if we got Xpm distributed with XFree86 4.x. +# Check if we got Xpm distributed with XFree86 4.x or Solaris 9. +.if (${OPSYS} != SunOS) .if exists(${X11BASE}/include/X11/xpm.h) && \ exists(${X11BASE}/lib/X11/config/X11.tmpl) _IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} .else _IS_BUILTIN_XPM= 0 .endif +.else +_IS_BUILTIN_XPM!= (/usr/sbin/pkgchk -l SUNWxwinc | ${EGREP} -c xpm.h) || ${TRUE} +.endif .if ${_IS_BUILTIN_XPM} != "0" IGNORE= "The Xpm library is included in your X11 distribution." diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk index cb4d46a79c8..ea9fcc6ce8f 100644 --- a/graphics/xpm/buildlink.mk +++ b/graphics/xpm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.12 2002/08/25 18:39:25 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.13 2002/09/01 15:13:42 tron Exp $ # # This Makefile fragment is included by packages that use xpm. # @@ -17,16 +17,20 @@ XPM_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.xpm?= xpm-3.4k -# Check if we got Xpm distributed with XFree86 4.x or if we need to -# depend on the Xpm package. +# Check if we got Xpm distributed with XFree86 4.x or Solaris 9 or if we need +# to depend on the Xpm package. # _REQUIRE_BUILTIN_XPM?= NO +.if (${OPSYS} != SunOS) .if exists(${X11BASE}/include/X11/xpm.h) && \ exists(${X11BASE}/lib/X11/config/X11.tmpl) _IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} .else _IS_BUILTIN_XPM= 0 .endif +.else +_IS_BUILTIN_XPM!= (/usr/sbin/pkgchk -l SUNWxwinc | ${EGREP} -c xpm.h) || ${TRUE} +.endif .if (${_IS_BUILTIN_XPM} == "0") && (${_REQUIRE_BUILTIN_XPM} == "NO") _NEED_XPM= YES .else diff --git a/graphics/xpm/buildlink2.mk b/graphics/xpm/buildlink2.mk index ab420b75f74..7278b95bd49 100644 --- a/graphics/xpm/buildlink2.mk +++ b/graphics/xpm/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:25 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/09/01 15:13:43 tron Exp $ .if !defined(XPM_BUILDLINK2_MK) XPM_BUILDLINK2_MK= # defined @@ -8,16 +8,20 @@ XPM_BUILDLINK2_MK= # defined BUILDLINK_DEPENDS.xpm?= xpm-3.4k BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm -# Check if we got Xpm distributed with XFree86 4.x or if we need to -# depend on the Xpm package. +# Check if we got Xpm distributed with XFree86 4.x or Solaris 9 or if we need +# to depend on the Xpm package. # _REQUIRE_BUILTIN_XPM?= NO +.if (${OPSYS} != SunOS) .if exists(${X11BASE}/include/X11/xpm.h) && \ exists(${X11BASE}/lib/X11/config/X11.tmpl) _IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} .else _IS_BUILTIN_XPM= 0 .endif +.else +_IS_BUILTIN_XPM!= (/usr/sbin/pkgchk -l SUNWxwinc | ${EGREP} -c xpm.h) || ${TRUE} +.endif .if (${_IS_BUILTIN_XPM} == "0") && (${_REQUIRE_BUILTIN_XPM} == "NO") _NEED_XPM= YES .else |