>Number:         14901
>Category:       pkg
>Synopsis:       Patch to update bbkeys-qt package from version 1.2 to version 1.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Dec 10 08:07:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Yannick Montulet
>Release:        1.5.2
>Organization:
Student
>Environment:
NetBSD yannick.lse.epita.fr 1.5.2 NetBSD 1.5.2 (YANNICK.LSE) #0: Tue Dec  4 13:17:36 GMT 2001     yannick@yannick.lse.epita.fr:/usr/src/sys/arch/i386/compile/YANNICK.LSE i386

>Description:
Patch to update bbkeys-qt package from version 1.2 to version 1.3
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bbkeys-qt/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile    2001/06/26 21:01:59     1.2
+++ Makefile    2001/12/10 15:29:03
@@ -1,14 +1,19 @@
 # $NetBSD: Makefile,v 1.2 2001/06/26 21:01:59 jlam Exp $
 #
 
-.include "../bbkeys/Makefile.common"
+DISTNAME=       bbkeysconf-1.3
+CATEGORIES=     x11 wm
+MASTER_SITES=   http://movingparts.thelinuxcommunity.org/bbkeys/
 
-PKGNAME=       bbkeys-qt-1.2
-COMMENT=       Qt-based configuration utility for bbkeys
+MAINTAINER=     alaric@alaric-snell.com
+HOMEPAGE=       http://movingparts.thelinuxcommunity.org/bbkeys.shtml
+
+USE_X11BASE=    YES
 
-DEPENDS+=      bbkeys-0.3.5:../bbkeys
+PKGNAME=       bbkeys-qt-1.3
+COMMENT=       Qt-based configuration utility for bbkeys
 
-WRKSRC=                ${WRKDIR}/bbkeys-0.3.5/bbkeysconf-1.2
+DEPENDS+=      bbkeys-0.8.3:../bbkeys
 
 .include "../../x11/qt2-libs/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bbkeys-qt/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    2001/06/26 21:01:59     1.3
+++ distinfo    2001/12/10 15:29:03
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.3 2001/06/26 21:01:59 jlam Exp $
 
-SHA1 (bbkeys-0.3.5.tar.gz) = 1c0e74db16b940e0fbcda088a11a9c9af905a1e8
-Size (bbkeys-0.3.5.tar.gz) = 102703 bytes
-SHA1 (patch-aa) = d9c6a4aa734c6405e89e0e8bd2b138fa1781e673
+SHA1 (bbkeysconf-1.3.tar.gz) = 03faf202bc44c5cb461380cfce38875c02e4426b
+Size (bbkeysconf-1.3.tar.gz) = 6931 bytes
+SHA1 (patch-aa) = 40a9bf80398d0b56ebab6345d2cb5a0f4f690c8f
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bbkeys-qt/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patch-aa    2001/06/26 21:02:00     1.2
+++ patch-aa    2001/12/10 15:29:03
@@ -1,22 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2001/06/26 21:02:00 jlam Exp $
-
---- Makefile.orig      Tue Jun 26 16:48:09 2001
-+++ Makefile
+--- Makefile.orig      Wed Dec  5 10:12:51 2001
++++ Makefile   Fri Dec  7 13:26:45 2001
 @@ -1,11 +1,11 @@
 -CXX=          /usr/bin/g++
 -QTDIR =               /usr/lib/qt2
 -MOC =         /usr/bin/moc
--LIBS =                -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib -lqt -lX11
--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/lib/qt2
++#QTDIR =      /usr/lib/qt2
 +MOC =         $(QTDIR)/bin/moc
 +LIBS =                ${LDFLAGS} -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lX11 -ljpeg
-+CXXFLAGS +=   -g -I$(QTDIR)/include -I${X11BASE}/include
++CXXFLAGS =    -g -I$(QTDIR)/include -I${X11BASE}/include
  
  TARGET =      bbkeysconf
 -PREFIX = /usr/local/bin
-+#PREFIX = /usr/local/bin
++#PREFIX =     /usr/local/bin
  OBJECTS =     gui.o main.o myapplication.o
  SOURCES =     gui.cc main.cc myapplication.cc
  MOCSRC =      gui.hh

>Release-Note:
>Audit-Trail:
>Unformatted: