From 36b1a476b044e96666a67cf54e3564bc2121cad7 Mon Sep 17 00:00:00 2001
From: mharo <mharo@FreeBSD.org>
Date: Thu, 29 Mar 2001 20:16:27 +0000
Subject: update to 0.3.6

PR:		26077
Submitted by:	    Stijn Hoop <stijn@win.tue.nl>
---
 x11-wm/bbkeys/Makefile       |  6 +++---
 x11-wm/bbkeys/distinfo       |  2 +-
 x11-wm/bbkeys/files/patch-aa | 12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'x11-wm')

diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 4693705d699..5f5da4ef634 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bbkeys
-PORTVERSION=	0.3.3
+PORTVERSION=	0.3.6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://movingparts.thelinuxcommunity.org/bbkeys/
 
@@ -20,10 +20,10 @@ USE_QT2=yes
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-	@(cd ${WRKSRC}/bbkeysconf-1.2; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+	@(cd ${WRKSRC}/bbkeysconf-1.3; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-	@(cd ${WRKSRC}/bbkeysconf-1.2 && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@(cd ${WRKSRC}/bbkeysconf-1.3 && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 .include <bsd.port.mk>
diff --git a/x11-wm/bbkeys/distinfo b/x11-wm/bbkeys/distinfo
index 4038e67c778..74b24287d45 100644
--- a/x11-wm/bbkeys/distinfo
+++ b/x11-wm/bbkeys/distinfo
@@ -1 +1 @@
-MD5 (bbkeys-0.3.3.tar.gz) = 04f8798acddb6fc0e475e5f9ad74a2cb
+MD5 (bbkeys-0.3.6.tar.gz) = a8d24c463ea8900c4f5e5fdbc4ee8f9f
diff --git a/x11-wm/bbkeys/files/patch-aa b/x11-wm/bbkeys/files/patch-aa
index a70a456725f..253950a0d6c 100644
--- a/x11-wm/bbkeys/files/patch-aa
+++ b/x11-wm/bbkeys/files/patch-aa
@@ -1,11 +1,11 @@
---- bbkeysconf-1.2/Makefile.orig	Wed May 17 00:33:45 2000
-+++ bbkeysconf-1.2/Makefile	Sat Jun 17 17:56:39 2000
+--- bbkeysconf-1.3/Makefile.orig	Thu Mar 15 01:16:54 2001
++++ bbkeysconf-1.3/Makefile	Sun Mar 25 19:10:37 2001
 @@ -1,11 +1,11 @@
 -CXX=		/usr/bin/g++
 -QTDIR =		/usr/lib/qt2
 -MOC =		/usr/bin/moc
--LIBS =		-L$(QTDIR)/lib -L/usr/lib -lqt
--CXXFLAGS =	-g -I/usr/include -I$(QTDIR)/include -I/usr/X11R6/include
+-LIBS =		-L$(QTDIR)/lib -L/usr/X11R6/lib -L/usr/lib -lqt -lX11
+-CXXFLAGS =	-g -I/usr/include -I/usr/include/qt -I/usr/X11R6/include
 +CXX ?=		/usr/bin/g++
 +QTDIR =		/usr/X11R6
 +MOC =		/usr/X11R6/bin/moc2
@@ -34,4 +34,6 @@
 -    /usr/bin/install -s $(TARGET) $(PREFIX)/$(TARGET)
 +	echo "Installing $(TARGET) in $(PREFIX)/bin..."; \
 +    /usr/bin/install -s $(TARGET) $(PREFIX)/bin/$(TARGET)
-
+ 
+ gui.o: gui.cc gui.moc
+ main.o: main.cc
-- 
cgit