Import compositeproto from pkgsrc-wip.

This package provides Composite extension headers from the modular
X.org X11 project.

This will replace the compositeext package.

6 files changed, 123 insertions, 0 deletions

diff --git a/x11/compositeproto/DESCR b/x11/compositeproto/DESCR
new file mode 100644
index 00000000000..830f905e3af
--- /dev/null
+++ b/x11/compositeproto/DESCR
@@ -0,0 +1,2 @@
+This package provides Composite extension headers from the modular
+X.org X11 project.
diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
new file mode 100644
index 00000000000..99580ef1fdb
--- /dev/null
+++ b/x11/compositeproto/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/04/18 17:17:50 reed Exp $
+#
+
+DISTNAME=		compositeproto-0.2.1
+CATEGORIES=		x11
+MASTER_SITES=		http://xorg.freedesktop.org/releases/X11R7.0-RC1/proto/
+
+MAINTAINER=		reed@reedmedia.net
+HOMEPAGE=		http://xorg.freedesktop.org/releases/X11R7.0-RC1/proto/
+COMMENT=		Composite extension headers from modular X.org
+
+CONFLICTS+=		compositeext-[0-9]*
+
+GNU_CONFIGURE=		YES
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/compositeproto.pc.in
+USE_LANGUAGES=		# empty
+
+.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/compositeproto/PLIST b/x11/compositeproto/PLIST
new file mode 100644
index 00000000000..ce0f42d0fbf
--- /dev/null
+++ b/x11/compositeproto/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/04/18 17:17:50 reed Exp $
+include/X11/extensions/composite.h
+include/X11/extensions/compositeproto.h
+lib/pkgconfig/compositeproto.pc
+@comment @dirrm include/X11/extensions
diff --git a/x11/compositeproto/buildlink3.mk b/x11/compositeproto/buildlink3.mk
new file mode 100644
index 00000000000..ef7fd00c416
--- /dev/null
+++ b/x11/compositeproto/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/04/18 17:17:50 reed Exp $
+
+BUILDLINK_DEPMETHOD.compositeproto?=	build
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+COMPOSITEPROTO_BUILDLINK3_MK:=	${COMPOSITEPROTO_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	compositeproto
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncompositeproto}
+BUILDLINK_PACKAGES+=	compositeproto
+
+.if !empty(COMPOSITEPROTO_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.compositeproto+=	compositeproto>=0.2.1
+BUILDLINK_PKGSRCDIR.compositeproto?=	../../x11/compositeproto
+.endif	# COMPOSITEPROTO_BUILDLINK3_MK
+
+.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/compositeproto/builtin.mk b/x11/compositeproto/builtin.mk
new file mode 100644
index 00000000000..ca638d80db0
--- /dev/null
+++ b/x11/compositeproto/builtin.mk
@@ -0,0 +1,67 @@
+# $NetBSD: builtin.mk,v 1.1.1.1 2006/04/18 17:17:50 reed Exp $
+
+BUILTIN_PKG:=	compositeproto
+
+BUILTIN_FIND_FILES_VAR:=		H_COMPOSITE H_COMPOSITEPROTO
+BUILTIN_FIND_FILES.H_COMPOSITE=		\
+	${X11BASE}/include/X11/extensions/composite.h
+BUILTIN_FIND_FILES.H_COMPOSITEPROTO=	\
+	${X11BASE}/include/X11/extensions/compositeproto.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.compositeproto)
+IS_BUILTIN.compositeproto=	no
+#
+# Here, we skip checking whether the files are under ${LOCALBASE} since
+# we'll consider this X11 package to be built-in even if it's a part
+# of one of the pkgsrc-installed X11 distributions.
+#
+.  if empty(H_COMPOSITE:M__nonexistent__) && \
+      empty(H_COMPOSITEPROTO:M__nonexistent__)
+IS_BUILTIN.compositeproto=	yes
+.  endif
+.endif
+MAKEVARS+=	IS_BUILTIN.compositeproto
+
+###
+### 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.compositeproto)
+.  if ${PREFER.compositeproto} == "pkgsrc"
+USE_BUILTIN.compositeproto=	no
+.  else
+USE_BUILTIN.compositeproto=	${IS_BUILTIN.compositeproto}
+.    if defined(BUILTIN_PKG.compositeproto) && \
+        !empty(IS_BUILTIN.compositeproto:M[yY][eE][sS])
+USE_BUILTIN.compositeproto=	yes
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.compositeproto}
+.        if !empty(USE_BUILTIN.compositeproto:M[yY][eE][sS])
+USE_BUILTIN.compositeproto!=						\
+	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.compositeproto:Q}; then \
+		${ECHO} yes;						\
+	else								\
+		${ECHO} no;						\
+	fi
+.        endif
+.      endfor
+.    endif
+.  endif  # PREFER.compositeproto
+.endif
+MAKEVARS+=	USE_BUILTIN.compositeproto
+
+# following so old pkg-config name compositeext.pc will be available
+BUILDLINK_TARGETS+=	compositeext-symlink-pc
+
+compositeext-symlink-pc:
+	src=${BUILDLINK_PREFIX.compositeproto}/lib/pkgconfig/compositeproto.pc \
+	dst=${BUILDLINK_DIR}/lib/pkgconfig/compositeext.pc; \
+	${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
+	if ${TEST} -f $${src}; then \
+		${LN} -sf $${src} $${dst}; \
+	fi
diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo
new file mode 100644
index 00000000000..219143e84ef
--- /dev/null
+++ b/x11/compositeproto/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/04/18 17:17:50 reed Exp $
+
+SHA1 (compositeproto-0.2.1.tar.gz) = ab3a1816e9726f1ccdc61c89464aad6acda9b645
+RMD160 (compositeproto-0.2.1.tar.gz) = b39b43fd19cdb005dda750e01723b1ac60f7e449
+Size (compositeproto-0.2.1.tar.gz) = 42950 bytes