svn commit: r325522 - in head/x11/xcb-util-cursor: . files

[Niclas Zeising]

Author: zeising
Date: Wed Aug 28 12:19:55 2013
New Revision: 325522
URL: http://svnweb.freebsd.org/changeset/ports/325522

Log:
  Update to 0.1.0
  
  Add dependency on gperf.
  Fix build with out ancient gcc.

Added:
  head/x11/xcb-util-cursor/files/patch-cursor__shape_to_id.gperf   (contents, props changed)
  head/x11/xcb-util-cursor/files/patch-cursor_cursor.h   (contents, props changed)
Deleted:
  head/x11/xcb-util-cursor/files/patch-cursor__cursor.h
  head/x11/xcb-util-cursor/files/patch-cursor__parse_cursor_file.c
Modified:
  head/x11/xcb-util-cursor/Makefile
  head/x11/xcb-util-cursor/distinfo

Modified: head/x11/xcb-util-cursor/Makefile
==============================================================================
--- head/x11/xcb-util-cursor/Makefile	Wed Aug 28 12:07:44 2013	(r325521)
+++ head/x11/xcb-util-cursor/Makefile	Wed Aug 28 12:19:55 2013	(r325522)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xcb-util-cursor
-PORTVERSION=	0.0.99
+PORTVERSION=	0.1.0
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
@@ -10,7 +10,8 @@ COMMENT=	XCB cursor library
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:${PORTSDIR}/x11/xcb-util \
 		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil \
-		${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:${PORTSDIR}/x11/xcb-util-image
+		${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:${PORTSDIR}/x11/xcb-util-image \
+		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
 		
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:${PORTSDIR}/x11/xcb-util \
 		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil \
@@ -22,6 +23,7 @@ USE_XORG=	xcb xorg-macros
 USES=		gmake
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
 
 post-patch:
 	@${REINPLACE_CMD} -e \

Modified: head/x11/xcb-util-cursor/distinfo
==============================================================================
--- head/x11/xcb-util-cursor/distinfo	Wed Aug 28 12:07:44 2013	(r325521)
+++ head/x11/xcb-util-cursor/distinfo	Wed Aug 28 12:19:55 2013	(r325522)
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-cursor-0.0.99.tar.bz2) = 14fa5bfe639d26e950047ab904c559e935bad0ffac7bc7dc0362066d0a4e55b3
-SIZE (xcb-util-cursor-0.0.99.tar.bz2) = 276739
+SHA256 (xcb-util-cursor-0.1.0.tar.bz2) = bb7bc11a977a7eca9c0b79dbe1c47ec813db98fbed6bcaf613118487a60131e5
+SIZE (xcb-util-cursor-0.1.0.tar.bz2) = 289086

Added: head/x11/xcb-util-cursor/files/patch-cursor__shape_to_id.gperf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xcb-util-cursor/files/patch-cursor__shape_to_id.gperf	Wed Aug 28 12:19:55 2013	(r325522)
@@ -0,0 +1,18 @@
+--- cursor/shape_to_id.gperf.orig	2013-08-28 14:00:29.539200308 +0200
++++ cursor/shape_to_id.gperf	2013-08-28 14:01:02.866194795 +0200
+@@ -1,5 +1,5 @@
+ struct shape_mapping { const char *name; int number; };
+-const int cursor_shape_to_id(const char *name);
++int cursor_shape_to_id(const char *name);
+ %%
+ X_cursor,0
+ arrow,1
+@@ -79,7 +79,7 @@
+ watch,75
+ xterm,76
+ %%
+-const int cursor_shape_to_id(const char *name) {
++int cursor_shape_to_id(const char *name) {
+ 	struct shape_mapping *mapping = in_word_set(name, strlen(name));
+ 	return (mapping ? (mapping->number * 2) : -1);
+ }

Added: head/x11/xcb-util-cursor/files/patch-cursor_cursor.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xcb-util-cursor/files/patch-cursor_cursor.h	Wed Aug 28 12:19:55 2013	(r325522)
@@ -0,0 +1,11 @@
+--- cursor/cursor.h.orig	2013-08-28 13:57:29.231213533 +0200
++++ cursor/cursor.h	2013-08-28 13:57:38.222207468 +0200
+@@ -154,7 +154,7 @@
+ } __attribute__((packed)) xcint_image_t;
+ 
+ /* shape_to_id.c */
+-const int cursor_shape_to_id(const char *name);
++int cursor_shape_to_id(const char *name);
+ 
+ /* parse_cursor_file.c */
+ int parse_cursor_file(xcb_cursor_context_t *c, const int fd, xcint_image_t **images, int *nimg);