Remove Xcomposite. Despite the version number, it's a much older version

than libXcomposite. Also, it is unused in pkgsrc and conflicts with
libXcomposite.

8 files changed, 1 insertions, 125 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 27df7fd15fa..b2f85ae8f82 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.721 2013/12/13 14:48:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.722 2013/12/14 07:37:21 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -8,7 +8,6 @@ SUBDIR+=	XaoS
 SUBDIR+=	Xaw-Xpm
 SUBDIR+=	Xaw3d
 SUBDIR+=	Xbae
-SUBDIR+=	Xcomposite
 SUBDIR+=	Xfixes
 SUBDIR+=	XmHTML
 SUBDIR+=	Xrender
diff --git a/x11/Xcomposite/DESCR b/x11/Xcomposite/DESCR
deleted file mode 100644
index 9ef9d87a26f..00000000000
--- a/x11/Xcomposite/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the Xcomposite extension library.
diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile
deleted file mode 100644
index 74071e9dacf..00000000000
--- a/x11/Xcomposite/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2012/10/29 05:06:06 asau Exp $
-#
-
-DISTNAME=		libXcomposite-1.0.1
-PKGNAME=		${DISTNAME:S/lib//}
-PKGREVISION=		3
-CATEGORIES=		x11 devel
-MASTER_SITES=		http://xlibs.freedesktop.org/release/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://freedesktop.org/
-COMMENT=		Xcomposite extension (library)
-
-CONFLICTS+=		libXcomposite-[0-9]*
-
-USE_TOOLS+=		pkg-config
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-
-PKGCONFIG_OVERRIDE+=	xcomposite.pc.in
-
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xcomposite/PLIST b/x11/Xcomposite/PLIST
deleted file mode 100644
index 8a62db9c3b2..00000000000
--- a/x11/Xcomposite/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/09/30 12:42:39 wiz Exp $
-include/X11/extensions/Xcomposite.h
-lib/libXcomposite.la
-lib/pkgconfig/xcomposite.pc
diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
deleted file mode 100644
index c6a8b993d64..00000000000
--- a/x11/Xcomposite/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2012/05/07 01:54:06 dholland Exp $
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-BUILDLINK_TREE+=	Xcomposite
-
-.if !defined(XCOMPOSITE_BUILDLINK3_MK)
-XCOMPOSITE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.Xcomposite+=		Xcomposite>=1.0.1
-BUILDLINK_ABI_DEPENDS.Xcomposite+=	Xcomposite>=1.0.1nb2
-BUILDLINK_PKGSRCDIR.Xcomposite?=	../../x11/Xcomposite
-
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
-.endif # XCOMPOSITE_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-Xcomposite
diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
deleted file mode 100644
index a8caba066f8..00000000000
--- a/x11/Xcomposite/builtin.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: builtin.mk,v 1.14 2012/03/19 12:34:20 joerg Exp $
-
-BUILTIN_PKG:=	Xcomposite
-
-BUILTIN_FIND_FILES_VAR:=		H_XCOMPOSITE
-BUILTIN_FIND_FILES.H_XCOMPOSITE=	\
-	${X11BASE}/include/X11/extensions/Xcomposite.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.Xcomposite)
-.  if empty(H_XCOMPOSITE:M__nonexistent__)
-IS_BUILTIN.Xcomposite=	yes
-.  else
-IS_BUILTIN.Xcomposite=	no
-.  endif
-.endif
-MAKEVARS+=	IS_BUILTIN.Xcomposite
-
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-.if !defined(USE_BUILTIN.Xcomposite)
-.  if ${PREFER.Xcomposite} == "pkgsrc"
-USE_BUILTIN.Xcomposite=	no
-.  else
-USE_BUILTIN.Xcomposite=	${IS_BUILTIN.Xcomposite}
-.    if defined(BUILTIN_PKG.Xcomposite) && \
-        !empty(IS_BUILTIN.Xcomposite:M[yY][eE][sS])
-USE_BUILTIN.Xcomposite=	yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xcomposite}
-.        if !empty(USE_BUILTIN.Xcomposite:M[yY][eE][sS])
-USE_BUILTIN.Xcomposite!=						\
-	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xcomposite:Q}; then \
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-.        endif
-.      endfor
-.    endif
-.  endif  # PREFER.Xcomposite
-.endif
-MAKEVARS+=	USE_BUILTIN.Xcomposite
-
-.include "../../mk/x11.builtin.mk"
diff --git a/x11/Xcomposite/distinfo b/x11/Xcomposite/distinfo
deleted file mode 100644
index c8bfad008c3..00000000000
--- a/x11/Xcomposite/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/04/19 12:22:20 reed Exp $
-
-SHA1 (libXcomposite-1.0.1.tar.bz2) = a3b9f2d5293e1f84a063da1de692f372f5e24356
-RMD160 (libXcomposite-1.0.1.tar.bz2) = 5df01817b4152cfa54346148d6c8b98c4b2b0441
-Size (libXcomposite-1.0.1.tar.bz2) = 181910 bytes
-SHA1 (patch-aa) = 6cac5babd295e26b10db709b8432a49657e032d4
diff --git a/x11/Xcomposite/patches/patch-aa b/x11/Xcomposite/patches/patch-aa
deleted file mode 100644
index fc2f46c2705..00000000000
--- a/x11/Xcomposite/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/19 12:22:20 reed Exp $
-
---- configure.orig	2006-04-18 22:25:00.000000000 -0700
-+++ configure	2006-04-18 22:27:54.000000000 -0700
-@@ -19875,7 +19875,11 @@
- # Check compositeext configuration, strip extra digits from package version to
- # find the required protocol version
- 
-+#COMPOSITEEXT_VERSION=`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
-+# hack until we get this updated
-+# pkgsrc was using testing versions, real versions have lower version
- COMPOSITEEXT_VERSION=`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
-+COMPOSITEEXT_VERSION=0.3
- 
-   succeeded=no
-