Update to 0.8.3.

Remove Xext dependency; split in Xrender and render; use automake;
add animate cursor support; some other fixes.

5 files changed, 32 insertions, 69 deletions

diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
index 2beb356d771..7a65dff88a5 100644
--- a/x11/Xrender/Makefile
+++ b/x11/Xrender/Makefile
@@ -1,41 +1,21 @@
-# $NetBSD: Makefile,v 1.6 2003/07/30 15:15:43 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/19 17:22:14 wiz Exp $
 
-DISTNAME=	fcpackage.2_1
-PKGNAME=	Xrender-${XRENDER_VERSION}
-WRKSRC=		${WRKDIR}/${DISTNAME}/Xrender
+DISTNAME=	xrender-0.8.3
+PKGNAME=	Xrender-0.8.3
 CATEGORIES=	x11
-MASTER_SITES=	http://fontconfig.org/release/
+MASTER_SITES=	http://pdx.freedesktop.org/software/fontconfig/releases/
 
 MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://fontconfig.org/
 COMMENT=	Client library for the X Rendering Extension protocol
 
-# This value is RENDER_MAJOR.RENDOR_MINOR from ${WRKSRC}/render.h.
-XRENDER_VERSION=	0.7
-
 USE_BUILDLINK2=		YES
-USE_IMAKE=		YES
-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})
-_IS_BUILTIN_XRENDER!=	${GREP} -c BuildRenderLibrary ${_X11_TMPL} || ${TRUE}
-.else
-_IS_BUILTIN_XRENDER=	0
-.endif
-
-.if ${X11PREFIX} == ${X11BASE} && ${_IS_BUILTIN_XRENDER} != "0"
-PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
-.endif
-
+USE_X11=		YES
+# XXX: LIBTOOL: uses libtool>=1.5 features
+#USE_LIBTOOL=		YES
+#LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+GNU_CONFIGURE=		YES
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../x11/render/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrender/PLIST b/x11/Xrender/PLIST
index 58e4021854a..d511d888cb3 100644
--- a/x11/Xrender/PLIST
+++ b/x11/Xrender/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2003/07/30 15:15:44 grant Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/09/19 17:22:14 wiz 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
-${NOT_SUNOS}lib/libXrender.a
+lib/libXrender.a
+lib/libXrender.la
 lib/libXrender.so
-${NOT_SUNOS}lib/libXrender.so.1
-lib/libXrender.so.1.1
+lib/libXrender.so.1
+lib/libXrender.so.1.2
+lib/pkgconfig/xrender.pc
diff --git a/x11/Xrender/buildlink2.mk b/x11/Xrender/buildlink2.mk
index 6a7847d9a36..903a476cd1c 100644
--- a/x11/Xrender/buildlink2.mk
+++ b/x11/Xrender/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/01/14 09:16:36 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/19 17:22:15 wiz Exp $
 
 .if !defined(XRENDER_BUILDLINK2_MK)
 XRENDER_BUILDLINK2_MK=	# defined
@@ -49,6 +49,9 @@ _NEED_XRENDER!= \
 .  endif
 .endif
 
+BUILDLINK_FILES.Xrender=	include/X11/extensions/Xrender.h
+BUILDLINK_FILES.Xrender+=	lib/libXrender.*
+
 .if ${_NEED_XRENDER} == "YES"
 BUILDLINK_PACKAGES+=			Xrender
 EVAL_PREFIX+=	BUILDLINK_PREFIX.Xrender=Xrender
@@ -57,20 +60,19 @@ BUILDLINK_PREFIX.Xrender_DEFAULT=	${X11PREFIX}
 # If we depend on the package, depend on the latest version
 # with a library major bump.
 #
-BUILDLINK_DEPENDS.Xrender=	Xrender>=0.7
+BUILDLINK_DEPENDS.Xrender=	Xrender>=0.8.3
+
+.include "../../x11/render/buildlink2.mk"
 .else
 BUILDLINK_PREFIX.Xrender=	${X11BASE}
+BUILDLINK_FILES.Xrender+=      include/X11/extensions/extutil.h
+BUILDLINK_FILES.Xrender+=      include/X11/extensions/region.h
+BUILDLINK_FILES.Xrender+=      include/X11/extensions/render.h
+BUILDLINK_FILES.Xrender+=      include/X11/extensions/renderproto.h
 .endif
 
 USE_X11=			# defined
 
-BUILDLINK_FILES.Xrender=	include/X11/extensions/Xrender.h
-BUILDLINK_FILES.Xrender+=	include/X11/extensions/extutil.h
-BUILDLINK_FILES.Xrender+=	include/X11/extensions/region.h
-BUILDLINK_FILES.Xrender+=	include/X11/extensions/render.h
-BUILDLINK_FILES.Xrender+=	include/X11/extensions/renderproto.h
-BUILDLINK_FILES.Xrender+=	lib/libXrender.*
-
 BUILDLINK_TARGETS+=		Xrender-buildlink
 
 Xrender-buildlink: _BUILDLINK_USE
diff --git a/x11/Xrender/distinfo b/x11/Xrender/distinfo
index 814e3b8d130..77f8af359d9 100644
--- a/x11/Xrender/distinfo
+++ b/x11/Xrender/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/04/10 21:15:56 jmc Exp $
+$NetBSD: distinfo,v 1.3 2003/09/19 17:22:15 wiz Exp $
 
-SHA1 (fcpackage.2_1.tar.gz) = b4d960ea1e2384f48aa9fed05e90ad4755da12be
-Size (fcpackage.2_1.tar.gz) = 544661 bytes
-SHA1 (patch-aa) = 72db2982e878c85f8d3a236a954bfd3de5e355e6
+SHA1 (xrender-0.8.3.tar.gz) = a99c1c395b86b2fc4a92bd6de750e1438a5f3461
+Size (xrender-0.8.3.tar.gz) = 217525 bytes
diff --git a/x11/Xrender/patches/patch-aa b/x11/Xrender/patches/patch-aa
deleted file mode 100644
index 3215aa5e860..00000000000
--- a/x11/Xrender/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/04/10 21:15:55 jmc Exp $
-
---- Imakefile.orig	Thu Nov 14 21:01:18 2002
-+++ Imakefile	Thu Apr 10 20:27:41 2003
-@@ -86,6 +86,11 @@
- RENDERINCDIR   = $(BUILDINCROOT)
- #endif
- 
-+# Solaris always puts -mt in here otherwise...
-+#if defined(SunArchitecture) && defined(SparcArchitecture) && \
-+    (OSMajorVersion == 5)
-+#define LocalThreadsDefines -DXTHREADS
-+#endif
- #include <Threads.tmpl>
- 
- #ifdef SharedXrenderReqs