summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-07-30 15:15:43 +0000
committergrant <grant@pkgsrc.org>2003-07-30 15:15:43 +0000
commitd92d0ee7774210ed89d2c94398a55e035a8a88f9 (patch)
tree1dac4b4c281a7930fba601adaf03f10040740661
parent6eb3264971e0f21662c86167c4c08e1c2a9e7bee (diff)
downloadpkgsrc-d92d0ee7774210ed89d2c94398a55e035a8a88f9.tar.gz
imake doesn't create libXrender.so.major nor libXrender.a on Solaris,
so exclude them from the PLIST. XXX perhaps we should automatically handle the libraries and links that imake builds on different platforms..
-rw-r--r--x11/Xrender/Makefile11
-rw-r--r--x11/Xrender/PLIST6
2 files changed, 12 insertions, 5 deletions
diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
index c6539662dc8..2beb356d771 100644
--- a/x11/Xrender/Makefile
+++ b/x11/Xrender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:38:24 martti Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/30 15:15:43 grant Exp $
DISTNAME= fcpackage.2_1
PKGNAME= Xrender-${XRENDER_VERSION}
@@ -19,6 +19,13 @@ EXTRACT_ELEMENTS= ${DISTNAME}/Xrender
.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "SunOS"
+PLIST_SUBST+= NOT_SUNOS="@comment "
+.else
+PLIST_SUBST+= NOT_SUNOS=""
+.endif
+
+PLIST_SUBST+=
_RENDER_H= ${X11BASE}/include/X11/extensions/render.h
_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl
.if exists(${_RENDER_H}) && exists(${_X11_TMPL})
@@ -27,7 +34,7 @@ _IS_BUILTIN_XRENDER!= ${GREP} -c BuildRenderLibrary ${_X11_TMPL} || ${TRUE}
_IS_BUILTIN_XRENDER= 0
.endif
-.if (${X11PREFIX} == ${X11BASE}) && (${_IS_BUILTIN_XRENDER} != "0")
+.if ${X11PREFIX} == ${X11BASE} && ${_IS_BUILTIN_XRENDER} != "0"
PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
.endif
diff --git a/x11/Xrender/PLIST b/x11/Xrender/PLIST
index 80ed7686e70..58e4021854a 100644
--- a/x11/Xrender/PLIST
+++ b/x11/Xrender/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/14 09:16:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/30 15:15:44 grant Exp $
include/X11/extensions/Xrender.h
include/X11/extensions/extutil.h
include/X11/extensions/region.h
include/X11/extensions/render.h
include/X11/extensions/renderproto.h
-lib/libXrender.a
+${NOT_SUNOS}lib/libXrender.a
lib/libXrender.so
-lib/libXrender.so.1
+${NOT_SUNOS}lib/libXrender.so.1
lib/libXrender.so.1.1