Xrender: remove

This package contains an old version of libXrender.

Announced in https://mail-index.netbsd.org/tech-pkg/2020/09/14/msg023792.html

9 files changed, 4 insertions, 224 deletions

diff --git a/doc/CHANGES-2020 b/doc/CHANGES-2020
index 399dd552898..9f05ed971fd 100644
--- a/doc/CHANGES-2020
+++ b/doc/CHANGES-2020
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.5436 2020/09/27 15:50:11 ryoon Exp $
+$NetBSD: CHANGES-2020,v 1.5437 2020/09/27 16:32:01 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2020:
 
@@ -8117,3 +8117,4 @@ Changes to the packages collection and infrastructure in 2020:
 	mk/bsd.pkg.mk: freeze ended for pkgsrc-2020Q3 branch [gdt 2020-09-27]
 	Updated mail/neomutt to 20200925 [wiz 2020-09-27]
 	Updated devel/cbindgen to 0.14.5 [ryoon 2020-09-27]
+	Removed x11/Xrender successor x11/libXrender [wiz 2020-09-27]
diff --git a/x11/Makefile b/x11/Makefile
index ceee9bc271f..05c73a36168 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.905 2020/09/11 13:28:13 leot Exp $
+# $NetBSD: Makefile,v 1.906 2020/09/27 16:32:01 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -9,7 +9,6 @@ SUBDIR+=	Xaw-Xpm
 SUBDIR+=	Xbae
 SUBDIR+=	Xfixes
 SUBDIR+=	XmHTML
-SUBDIR+=	Xrender
 SUBDIR+=	antiright
 SUBDIR+=	appmenu-qt
 SUBDIR+=	appres
diff --git a/x11/Xrender/DESCR b/x11/Xrender/DESCR
deleted file mode 100644
index 7ce7172358f..00000000000
--- a/x11/Xrender/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-The X Rendering Extension introduces digital image composition as the
-foundation of a rendering model within the X Window System.  Rendering
-geometric figures is accomplished by client-side tessellation into either
-triangles or trapezoids.  Text is drawn by loading glyphs into the server
-and rendering sets of them.
-
-This package contains the client library for connecting to a Xserver that
-supports the Xrender extension.
-
-This package is for use with older native X11 versions. The modular
-X.org version is in x11/libXrender.
diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
deleted file mode 100644
index 791b0aba0c7..00000000000
--- a/x11/Xrender/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.40 2019/11/03 09:14:06 rillig Exp $
-
-DISTNAME=	libXrender-0.9.0
-PKGNAME=	${DISTNAME:S/lib//}
-PKGREVISION=	3
-CATEGORIES=	x11
-MASTER_SITES=	https://xlibs.freedesktop.org/release/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://fontconfig.org/
-COMMENT=	Client library for the X Rendering Extension protocol
-
-CONFLICTS+=	libXrender-[0-9]*
-
-USE_TOOLS+=		pkg-config
-USE_LIBTOOL=		YES
-GNU_CONFIGURE=		YES
-PKGCONFIG_OVERRIDE=	xrender.pc.in
-CONFIGURE_ENV+=		X_LIBS=${X11_LDFLAGS:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} != "native"
-PKG_FAIL_REASON+=	"This package is for native X11 only; use libXrender instead."
-.endif
-
-.include "../../x11/xorgproto/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrender/PLIST b/x11/Xrender/PLIST
deleted file mode 100644
index 6d5c31edebe..00000000000
--- a/x11/Xrender/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:57 jlam Exp $
-include/X11/extensions/Xrender.h
-lib/libXrender.la
-lib/pkgconfig/xrender.pc
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
deleted file mode 100644
index 6bb75bdec97..00000000000
--- a/x11/Xrender/buildlink3.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.46 2018/03/07 11:57:33 wiz Exp $
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-BUILDLINK_TREE+=	Xrender
-
-.if !defined(XRENDER_BUILDLINK3_MK)
-XRENDER_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.2
-BUILDLINK_ABI_DEPENDS.Xrender+=	Xrender>=0.9.0nb1
-BUILDLINK_PKGSRCDIR.Xrender?=	../../x11/Xrender
-
-.include "../../mk/x11.buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
-.endif # XRENDER_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-Xrender
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
deleted file mode 100644
index cba1eb64e1b..00000000000
--- a/x11/Xrender/builtin.mk
+++ /dev/null
@@ -1,141 +0,0 @@
-# $NetBSD: builtin.mk,v 1.22 2019/11/03 09:14:06 rillig Exp $
-
-BUILTIN_PKG:=	Xrender
-
-BUILTIN_FIND_FILES_VAR:=	H_XRENDER
-BUILTIN_FIND_FILES.H_XRENDER=	${X11BASE}/include/X11/extensions/Xrender.h
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-###
-### Determine if there is a built-in implementation of the package and
-### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
-###
-.if !defined(IS_BUILTIN.Xrender)
-.  if empty(H_XRENDER:M__nonexistent__)
-IS_BUILTIN.Xrender=	yes
-.  else
-IS_BUILTIN.Xrender=	no
-.  endif
-.endif
-MAKEVARS+=		IS_BUILTIN.Xrender
-
-###
-### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
-### a package name to represent the built-in package.
-###
-.if !defined(BUILTIN_PKG.Xrender) && \
-    !empty(IS_BUILTIN.Xrender:M[yY][eE][sS]) && \
-    empty(H_XRENDER:M__nonexistent__)
-#
-# Xrender doesn't provide a method of discovering the version number of
-# the software.  Match up Xrender versions with X11 versions for an
-# approximate determination of the Xrender version.
-#
-_BLTN_XRENDER_VERSIONS=		0.8.3  0.8.2  0.8.1  0.8  0.2  0.1
-_BLTN_XRENDER_0.1.XFree86=	4.0 4.0.* 4.1 4.1.[0-9] 4.1.[0-9].*	\
-				4.1.[1-8][0-9]* 4.1.9[0-8]*
-_BLTN_XRENDER_0.2.XFree86=	4.1.99.* 4.2 4.2.[0-9] 4.2.[0-9].*	\
-				4.2.[1-8][0-9]* 4.2.9[0-8]*
-_BLTN_XRENDER_0.8.XFree86=	4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].*	\
-				4.3.[1-8][0-9]* 4.3.9[0-8]*		\
-				4.3.99.* 4.[4-9]* 4.[1-9][0-9]*
-_BLTN_XRENDER_0.8.xorg=		6.[7-9]* 6.[1-9][0-9]*
-.  for _version_ in ${_BLTN_XRENDER_VERSIONS}
-.    for _pattern_ in ${_BLTN_XRENDER_${_version_}.${BUILTIN_X11_TYPE.${X11_TYPE}}}
-.      if defined(BUILTIN_X11_VERSION.${X11_TYPE}) && \
-          !empty(BUILTIN_X11_VERSION.${X11_TYPE}:M${_pattern_})
-BUILTIN_VERSION.Xrender?=	${_version_}
-.      endif
-.    endfor
-.  endfor
-.  if defined(BUILTIN_VERSION.Xrender)
-BUILTIN_PKG.Xrender=		Xrender-${BUILTIN_VERSION.Xrender}
-.  endif
-.endif
-MAKEVARS+=			BUILTIN_PKG.Xrender
-
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-#
-# These are dependencies of Xrender.  If we need to use the pkgsrc
-# versions of any of these, then also use the pkgsrc version of
-# Xrender.
-#
-#.if defined(USE_BUILTIN.render) && !empty(USE_BUILTIN.render:M[nN][oO])
-#USE_BUILTIN.render=	no
-#.endif
-
-.if !defined(USE_BUILTIN.Xrender)
-.  if ${PREFER.Xrender} == "pkgsrc"
-USE_BUILTIN.Xrender=	no
-.  else
-USE_BUILTIN.Xrender=	${IS_BUILTIN.Xrender}
-.    if defined(BUILTIN_PKG.Xrender) && \
-        !empty(IS_BUILTIN.Xrender:M[yY][eE][sS])
-USE_BUILTIN.Xrender=	yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xrender}
-.        if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS])
-USE_BUILTIN.Xrender!=							\
-	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrender:Q}; then \
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-.        endif
-.      endfor
-.    endif
-.  endif  # PREFER.Xrender
-.endif
-MAKEVARS+=		USE_BUILTIN.Xrender
-
-###
-### The section below only applies if we are not including this file
-### solely to determine whether a built-in implementation exists.
-###
-
-.include "../../mk/x11.builtin.mk"
-
-CHECK_BUILTIN.Xrender?=	no
-.if !empty(CHECK_BUILTIN.Xrender:M[nN][oO])
-
-.  if !empty(USE_BUILTIN.Xrender:M[nN][oO])
-BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8.2
-BUILDLINK_API_DEPENDS.render+=	Xrender>=0.8
-.  endif
-
-.  if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS])
-BUILDLINK_PREFIX.Xrender=	${X11BASE}
-USE_BUILTIN.render=		yes
-.  endif
-
-# If we are using the builtin version, check whether it has a xrender.pc file
-# or not.  If the latter, generate a fake one.
-.  if !empty(USE_BUILTIN.Xrender:M[Yy][Ee][Ss])
-BUILDLINK_TARGETS+=	Xrender-fake-pc
-
-Xrender-fake-pc:
-	${RUN} \
-	for dir in lib lib${LIBABISUFFIX} share; do \
-		${TEST} -f ${BUILDLINK_PREFIX.Xrender}/$${dir}/pkgconfig/xrender.pc && exit; \
-	done; \
-	src=${BUILDLINK_PREFIX.Xrender}/lib/pkgconfig/xrender.pc; \
-	dst=${BUILDLINK_DIR}/lib/pkgconfig/xrender.pc; \
-	${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
-	if ${TEST} -f $${src}; then \
-		${LN} -sf $${src} $${dst}; \
-	else \
-		{ ${ECHO} "Name: Xrender"; \
-	   	${ECHO} "Description: X Render Library"; \
-	   	${ECHO} "Version: 0.8.4"; \
-	   	${ECHO} "Cflags: -I${BUILDLINK_PREFIX.Xrender}/include"; \
-	   	${ECHO} "Libs: -L${BUILDLINK_PREFIX.Xrender}/lib" \
-	       	"${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xrender}/lib" \
-		    "-lXrender"; \
-		} >$${dst}; \
-	fi
-.  endif
-
-.endif	# CHECK_BUILTIN.Xrender
diff --git a/x11/Xrender/distinfo b/x11/Xrender/distinfo
deleted file mode 100644
index 6f20f62eadf..00000000000
--- a/x11/Xrender/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 03:28:25 agc Exp $
-
-SHA1 (libXrender-0.9.0.tar.bz2) = 98437c8eadf6caa78ceed2b748d72da97b154359
-RMD160 (libXrender-0.9.0.tar.bz2) = 4d1bf4aa5fd24b35094773d4bdb3b2834ce971c2
-SHA512 (libXrender-0.9.0.tar.bz2) = 660d9a91453527882af9d4fcfd930eaa545ccb21153fdb14aea887c0a32f5a60947000748a24b015e3f3e6c740a9c064d727fde2537c882015d19cb0c9c487e5
-Size (libXrender-0.9.0.tar.bz2) = 211968 bytes
diff --git a/x11/libXrender/buildlink3.mk b/x11/libXrender/buildlink3.mk
index 2cadf5513f5..976a2d48dd0 100644
--- a/x11/libXrender/buildlink3.mk
+++ b/x11/libXrender/buildlink3.mk
@@ -1,12 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2018/03/07 11:57:37 wiz Exp $
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${X11_TYPE} != "modular" && \
-    !exists(${X11BASE}/lib/pkgconfig/xrender.pc) && \
-    !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xrender.pc)
-.include "../../x11/Xrender/buildlink3.mk"
-.else
+# $NetBSD: buildlink3.mk,v 1.8 2020/09/27 16:32:01 wiz Exp $
 
 BUILDLINK_TREE+=	libXrender
 
@@ -21,5 +13,3 @@ BUILDLINK_PKGSRCDIR.libXrender?=	../../x11/libXrender
 .  endif # LIBXRENDER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libXrender
-
-.endif