reverting unconsidered changes

5 files changed, 31 insertions, 25 deletions

diff --git a/wm/bbconf/Makefile b/wm/bbconf/Makefile
index c978a934da4..2f82ef4923d 100644
--- a/wm/bbconf/Makefile
+++ b/wm/bbconf/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/11 19:13:09 tonio Exp $
 #
 
-DISTNAME=	bbconf-1.10
+DISTNAME=	bbconf-1.4
+PKGREVISION=	1
 CATEGORIES=	wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbconf/}
+MASTER_SITES=	http://bbconf.sourceforge.net/code/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://bbconf.sourceforge.net/
@@ -12,7 +13,8 @@ COMMENT=	Configuration tool for the blackbox window manager
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
+LTCONFIG_OVERRIDE=	${WRKSRC}/admin/ltconfig
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt2-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbconf/PLIST b/wm/bbconf/PLIST
index 737e4c5a76d..37153733f92 100644
--- a/wm/bbconf/PLIST
+++ b/wm/bbconf/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2005/11/11 18:50:25 tonio Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/11/11 19:13:09 tonio Exp $
 bin/bbconf
-lib/bbconf/plugins/libbbconf.la
-lib/bbconf/plugins/libkeybindings.la
-lib/bbconf/plugins/libmenu.la
-lib/bbconf/plugins/libthemes.la
 man/man1/bbconf.1
+share/bbconf/plugins/libbbconf.la
+share/bbconf/plugins/libkeybindings.la
+share/bbconf/plugins/libmenu.la
+share/bbconf/plugins/libthemes.la
 share/doc/bbconf/AUTHORS
 share/doc/bbconf/COPYING
 share/doc/bbconf/ChangeLog
 share/doc/bbconf/README
 share/doc/bbconf/README.html
 share/doc/bbconf/TODO
+@dirrm share/bbconf/plugins
+@dirrm share/bbconf
 @dirrm share/doc/bbconf
-@dirrm lib/bbconf/plugins
-@dirrm lib/bbconf
diff --git a/wm/bbconf/distinfo b/wm/bbconf/distinfo
index 5982652a479..04af86e6301 100644
--- a/wm/bbconf/distinfo
+++ b/wm/bbconf/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/11/11 18:50:25 tonio Exp $
+$NetBSD: distinfo,v 1.5 2005/11/11 19:13:09 tonio Exp $
 
-SHA1 (bbconf-1.10.tar.gz) = c2c9c3dcb6fc74738e38208813b4eb2378307e3c
-RMD160 (bbconf-1.10.tar.gz) = 34c63d3e52a84aefb636cd266985f956f24c7d6d
-Size (bbconf-1.10.tar.gz) = 720599 bytes
-SHA1 (patch-aa) = 79e84f44cdb705c5a37635f25f0fa6478f431bcb
-SHA1 (patch-af) = 73663510bd3147b920f418edc381b08c12cae351
+SHA1 (bbconf-1.4.tar.gz) = 4985200f90ac57f8aa1441c3fc5ceecd8f018d79
+RMD160 (bbconf-1.4.tar.gz) = f2115eafae58332e4850f5863880ccc6c2f0657a
+Size (bbconf-1.4.tar.gz) = 536665 bytes
+SHA1 (patch-aa) = 26c53221cdee163a70d4642e6acd779c0773f904
+SHA1 (patch-ab) = bbcd8da80bb79e50a82198026912bd7e185b765a
+SHA1 (patch-ac) = 46e9330f58fe92ae248380971d07f4f752773a73
+SHA1 (patch-ad) = a876ad35dc892084cd0d297506ab6150b27a006a
+SHA1 (patch-ae) = 65553e7f805656ea9d5fdcfcb14b72704b195a2b
+SHA1 (patch-af) = 57c5ce4feecf3865fcd8d8024dfb1a719c22db71
diff --git a/wm/bbconf/patches/patch-aa b/wm/bbconf/patches/patch-aa
index 2ddec9ecfac..c6ecb070663 100644
--- a/wm/bbconf/patches/patch-aa
+++ b/wm/bbconf/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/11/11 18:50:25 tonio Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/11 19:13:09 tonio Exp $
 
---- Makefile.in.orig	2003-03-12 19:55:46.000000000 +0100
+--- Makefile.in.orig	Sat Jan 19 03:10:27 2002
 +++ Makefile.in
-@@ -193,7 +193,7 @@ AUTOMAKE_OPTIONS = foreign 
+@@ -218,7 +218,7 @@
  
  MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
  
diff --git a/wm/bbconf/patches/patch-af b/wm/bbconf/patches/patch-af
index b33d66164a5..dab5596897c 100644
--- a/wm/bbconf/patches/patch-af
+++ b/wm/bbconf/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.3 2005/11/11 18:50:25 tonio Exp $
+$NetBSD: patch-af,v 1.4 2005/11/11 19:13:09 tonio Exp $
 
---- configure.orig	2003-03-12 19:29:19.000000000 +0100
+--- configure.orig	Sat Jan 19 03:07:04 2002
 +++ configure
-@@ -22533,7 +22533,7 @@ fi
+@@ -5179,7 +5179,7 @@
  
  
  
--jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-+jpeg_incdirs="$includedir /usr/include ${LOCALBASE}/include $kde_extra_includes"
+-jpeg_incdirs="/usr/include /usr/local/include $kde_extra_includes"
++jpeg_incdirs="/usr/include ${LOCALBASE}/include $kde_extra_includes"
  
  jpeg_incdir=NO
  for i in $jpeg_incdirs;