xf86-video-intel-git: rename from xf86-video-intel

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Tue Sep 22 20:02:47 2015 +0200
Changeset:	d1f9c37253ce6010dd79ea337d5d66305662db58

Modified Files:
	Makefile
Added Files:
	xf86-video-intel-git/DESCR
	xf86-video-intel-git/Makefile
	xf86-video-intel-git/PLIST
	xf86-video-intel-git/distinfo
	xf86-video-intel-git/patches/patch-src_backlight.c
Removed Files:
	xf86-video-intel/DESCR
	xf86-video-intel/Makefile
	xf86-video-intel/PLIST
	xf86-video-intel/distinfo
	xf86-video-intel/patches/patch-src_backlight.c

Log Message:
xf86-video-intel-git: rename from xf86-video-intel

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d1f9c37253ce6010dd79ea337d5d66305662db58

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  2 +-
 xf86-video-intel-git/DESCR                         |  1 +
 xf86-video-intel-git/Makefile                      | 41 ++++++++++++++++++++++
 xf86-video-intel-git/PLIST                         |  3 ++
 xf86-video-intel-git/distinfo                      |  2 ++
 xf86-video-intel-git/patches/patch-src_backlight.c | 15 ++++++++
 xf86-video-intel/DESCR                             |  1 -
 xf86-video-intel/Makefile                          | 41 ----------------------
 xf86-video-intel/PLIST                             |  3 --
 xf86-video-intel/distinfo                          |  2 --
 xf86-video-intel/patches/patch-src_backlight.c     | 15 --------
 11 files changed, 63 insertions(+), 63 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 7eccf03..472c573 100644
--- a/Makefile
+++ b/Makefile
@@ -4013,7 +4013,7 @@ SUBDIR+=	xesam-glib
 SUBDIR+=	xf86-input-synaptics
 SUBDIR+=	xf86-input-vboxmouse
 SUBDIR+=	xf86-video-geode
-SUBDIR+=	xf86-video-intel
+SUBDIR+=	xf86-video-intel-git
 SUBDIR+=	xf86-video-intel-old
 SUBDIR+=	xf86-video-virtualbox
 SUBDIR+=	xf86-video-voodoo
diff --git a/xf86-video-intel-git/DESCR b/xf86-video-intel-git/DESCR
new file mode 100644
index 0000000..08dab8f
--- /dev/null
+++ b/xf86-video-intel-git/DESCR
@@ -0,0 +1 @@
+This is the video driver for Intel cards for the modular Xorg server.
diff --git a/xf86-video-intel-git/Makefile b/xf86-video-intel-git/Makefile
new file mode 100644
index 0000000..1d893ff
--- /dev/null
+++ b/xf86-video-intel-git/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2015/04/01 13:11:38 tnn2 Exp $
+
+DISTNAME=	xf86-video-intel-0
+CATEGORIES=	x11
+
+GIT_REPOSITORIES=		xf86-video-intel
+GIT_REPO.xf86-video-intel=	git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
+WRKSRC=			${WRKDIR}/${PKGBASE}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Modular Xorg Intel video driver
+
+CONFLICTS+=	xf86-video-i810-[0-9]*
+
+CONFIGURE_ARGS+=	--enable-dri
+CONFIGURE_ARGS+=	--enable-dri2
+CONFIGURE_ARGS+=	--disable-dri3
+
+GNU_CONFIGURE=	YES
+USE_LIBTOOL=	YES
+USE_TOOLS+=	pkg-config automake autoconf autoreconf
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
+.endif
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -vif
+
+BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.7
+
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/libXvMC/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xf86-video-intel-git/PLIST b/xf86-video-intel-git/PLIST
new file mode 100644
index 0000000..45c2434
--- /dev/null
+++ b/xf86-video-intel-git/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/01 13:11:38 tnn2 Exp $
+lib/xorg/modules/drivers/intel_drv.la
+man/man4/intel.4
diff --git a/xf86-video-intel-git/distinfo b/xf86-video-intel-git/distinfo
new file mode 100644
index 0000000..44133f1
--- /dev/null
+++ b/xf86-video-intel-git/distinfo
@@ -0,0 +1,2 @@
+$NetBSD: distinfo,v 1.1 2015/04/01 13:11:38 tnn2 Exp $
+SHA1 (patch-src_backlight.c) = 8cd0c6d2ae26370e4b4f9f2a3c8a6f081f3dc9f8
diff --git a/xf86-video-intel-git/patches/patch-src_backlight.c b/xf86-video-intel-git/patches/patch-src_backlight.c
new file mode 100644
index 0000000..04d4cc1
--- /dev/null
+++ b/xf86-video-intel-git/patches/patch-src_backlight.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix forward declaration.
+
+--- src/backlight.c.orig	2015-09-22 17:33:34.000000000 +0000
++++ src/backlight.c
+@@ -532,6 +532,8 @@ void backlight_close(struct backlight *b
+ 		waitpid(b->pid, NULL, 0);
+ }
+ 
++static int __backlight_exists(const char *iface);
++
+ char *backlight_find_for_device(struct pci_device *pci)
+ {
+ 	char path[200];
diff --git a/xf86-video-intel/DESCR b/xf86-video-intel/DESCR
deleted file mode 100644
index 08dab8f..0000000
--- a/xf86-video-intel/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-This is the video driver for Intel cards for the modular Xorg server.
diff --git a/xf86-video-intel/Makefile b/xf86-video-intel/Makefile
deleted file mode 100644
index 1d893ff..0000000
--- a/xf86-video-intel/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/04/01 13:11:38 tnn2 Exp $
-
-DISTNAME=	xf86-video-intel-0
-CATEGORIES=	x11
-
-GIT_REPOSITORIES=		xf86-video-intel
-GIT_REPO.xf86-video-intel=	git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
-WRKSRC=			${WRKDIR}/${PKGBASE}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://xorg.freedesktop.org/
-COMMENT=	Modular Xorg Intel video driver
-
-CONFLICTS+=	xf86-video-i810-[0-9]*
-
-CONFIGURE_ARGS+=	--enable-dri
-CONFIGURE_ARGS+=	--enable-dri2
-CONFIGURE_ARGS+=	--disable-dri3
-
-GNU_CONFIGURE=	YES
-USE_LIBTOOL=	YES
-USE_TOOLS+=	pkg-config automake autoconf autoreconf
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
-.endif
-
-pre-configure:
-	cd ${WRKSRC} && autoreconf -vif
-
-BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.7
-
-.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/libXvMC/buildlink3.mk"
-.include "../../x11/xcb-util/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../wip/mk/git-package.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/xf86-video-intel/PLIST b/xf86-video-intel/PLIST
deleted file mode 100644
index 45c2434..0000000
--- a/xf86-video-intel/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/01 13:11:38 tnn2 Exp $
-lib/xorg/modules/drivers/intel_drv.la
-man/man4/intel.4
diff --git a/xf86-video-intel/distinfo b/xf86-video-intel/distinfo
deleted file mode 100644
index 44133f1..0000000
--- a/xf86-video-intel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/04/01 13:11:38 tnn2 Exp $
-SHA1 (patch-src_backlight.c) = 8cd0c6d2ae26370e4b4f9f2a3c8a6f081f3dc9f8
diff --git a/xf86-video-intel/patches/patch-src_backlight.c b/xf86-video-intel/patches/patch-src_backlight.c
deleted file mode 100644
index 04d4cc1..0000000
--- a/xf86-video-intel/patches/patch-src_backlight.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix forward declaration.
-
---- src/backlight.c.orig	2015-09-22 17:33:34.000000000 +0000
-+++ src/backlight.c
-@@ -532,6 +532,8 @@ void backlight_close(struct backlight *b
- 		waitpid(b->pid, NULL, 0);
- }
- 
-+static int __backlight_exists(const char *iface);
-+
- char *backlight_find_for_device(struct pci_device *pci)
- {
- 	char path[200];