From 17163561d2c17292580ab6e46fa17b977c58b050 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Mon, 12 May 2003 21:52:49 +0000
Subject: Un-break after Xft and XFree86 4.3 changes.

---
 x11/xstroke/Makefile                  | 15 ++++++---------
 x11/xstroke/files/patch-Imakefile     |  8 ++++----
 x11/xstroke/files/patch-action_item.h | 11 +++++++++++
 3 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 x11/xstroke/files/patch-action_item.h

(limited to 'x11/xstroke')

diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index 3351f4c34890..b75d3bcdd2e6 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:	xstroke
 # Date created:			May 14, 2002
 # Whom:				ijliao
@@ -15,22 +14,20 @@ MASTER_SITES=	ftp://ftp.handhelds.org/pub/projects/xstroke/release-${PORTVERSION
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fullscreen gesture recognition
 
-BROKEN=		Needs updates for Xft and XFree86 4.3
-
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_REINPLACE=	yes
 USE_BISON=	yes
 USE_IMAKE=	yes
-CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnugetopt
+CFLAGS+=	${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt ${PTHREAD_LIBS}
+MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=	xstroke.1
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g ; \
-		s,%%CFLAGS%%,${CFLAGS},g ; \
-		s,%%LDFLAGS%%,${LDFLAGS},g" ${WRKSRC}/Imakefile
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/etc/Imakefile
 	@${REINPLACE_CMD} -e "s,etc/,${PREFIX}/etc/,g" ${WRKSRC}/args.h
 
diff --git a/x11/xstroke/files/patch-Imakefile b/x11/xstroke/files/patch-Imakefile
index 7d6a7e68e121..8beae80ccf58 100644
--- a/x11/xstroke/files/patch-Imakefile
+++ b/x11/xstroke/files/patch-Imakefile
@@ -1,13 +1,13 @@
---- Imakefile.orig	Tue Dec 11 06:17:11 2001
-+++ Imakefile	Tue May 14 16:06:49 2002
+--- Imakefile.orig	Mon Dec 10 14:17:11 2001
++++ Imakefile	Mon May 12 14:55:25 2003
 @@ -1,9 +1,10 @@
  #define IHaveSubdirs
  SUBDIRS=etc
 -CDEBUGFLAGS=-g -ansi -ansi-error -Wall -pedantic
-+CDEBUGFLAGS=%%CFLAGS%%
++EXTRA_DEFINES=$(CPPFLAGS) $(XFTINCLUDES)
  YFLAGS=-d
 -LOCAL_LIBRARIES=$(XTESTLIB) $(XLIB) $(XRENDERLIB) $(XFTLIB) -lm -ldl -lpthread
-+LOCAL_LIBRARIES=$(XTESTLIB) $(XLIB) $(XRENDERLIB) $(XFTLIB) -lm -lpthread %%LDFLAGS%%
++LOCAL_LIBRARIES=$(XTESTLIB) $(XLIB) $(XRENDERLIB) $(XFTLIB) -lm $(LDFLAGS)
  FLEX=flex
 +YACC=bison -y
  OBJS=xstroke.o args.o backing.o bresenham.o brush.o control_win.o stroke.o matrix.o \
diff --git a/x11/xstroke/files/patch-action_item.h b/x11/xstroke/files/patch-action_item.h
new file mode 100644
index 000000000000..949ad55e2b23
--- /dev/null
+++ b/x11/xstroke/files/patch-action_item.h
@@ -0,0 +1,11 @@
+--- action_item.h.orig	Mon May 12 14:36:48 2003
++++ action_item.h	Mon May 12 14:36:59 2003
+@@ -18,7 +18,7 @@
+ 
+ #include <X11/X.h>
+ #define XK_MISCELLANY
+-#include <X11/keysymdef.h>
++#include <X11/keysym.h>
+ #include <X11/Xutil.h>
+ 
+ enum action_type
-- 
cgit v1.2.3