Rename LATEX_ACCEPTED and LATEX_DEFAULT to TEX_ACCEPTED and TEX_DEFAULT

It is more consistent with the tex.buildlink3.mk name. Also, if a package
really needs latex, it just has to set TEX_ACCEPTED to latex distributions
altough today, all TEX_ACCEPTED possibilities are latex distributions

10 files changed, 81 insertions, 135 deletions

diff --git a/wm/bbconf/Makefile b/wm/bbconf/Makefile
index e8e7f679924..c978a934da4 100644
--- a/wm/bbconf/Makefile
+++ b/wm/bbconf/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:24 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/11/11 18:50:25 tonio Exp $
 #
 
-DISTNAME=	bbconf-1.4
-PKGREVISION=	1
+DISTNAME=	bbconf-1.10
 CATEGORIES=	wm
-MASTER_SITES=	http://bbconf.sourceforge.net/code/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbconf/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://bbconf.sourceforge.net/
@@ -13,8 +12,7 @@ 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/qt2-libs/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbconf/PLIST b/wm/bbconf/PLIST
index a0d6820e9bc..737e4c5a76d 100644
--- a/wm/bbconf/PLIST
+++ b/wm/bbconf/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:56 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/11/11 18:50:25 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 7d99c22a66b..5982652a479 100644
--- a/wm/bbconf/distinfo
+++ b/wm/bbconf/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:43:53 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/11/11 18:50:25 tonio Exp $
 
-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
+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
diff --git a/wm/bbconf/patches/patch-aa b/wm/bbconf/patches/patch-aa
index 5e139c0612c..2ddec9ecfac 100644
--- a/wm/bbconf/patches/patch-aa
+++ b/wm/bbconf/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/18 23:02:30 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/11 18:50:25 tonio Exp $
 
---- Makefile.in.orig	Sat Jan 19 03:10:27 2002
+--- Makefile.in.orig	2003-03-12 19:55:46.000000000 +0100
 +++ Makefile.in
-@@ -218,7 +218,7 @@
+@@ -193,7 +193,7 @@ AUTOMAKE_OPTIONS = foreign 
  
  MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
  
diff --git a/wm/bbconf/patches/patch-af b/wm/bbconf/patches/patch-af
index 81199d62b3b..b33d66164a5 100644
--- a/wm/bbconf/patches/patch-af
+++ b/wm/bbconf/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.2 2002/09/20 21:27:16 jlam Exp $
+$NetBSD: patch-af,v 1.3 2005/11/11 18:50:25 tonio Exp $
 
---- configure.orig	Sat Jan 19 03:07:04 2002
+--- configure.orig	2003-03-12 19:29:19.000000000 +0100
 +++ configure
-@@ -5179,7 +5179,7 @@
+@@ -22533,7 +22533,7 @@ fi
  
  
  
--jpeg_incdirs="/usr/include /usr/local/include $kde_extra_includes"
-+jpeg_incdirs="/usr/include ${LOCALBASE}/include $kde_extra_includes"
+-jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
++jpeg_incdirs="$includedir /usr/include ${LOCALBASE}/include $kde_extra_includes"
  
  jpeg_incdir=NO
  for i in $jpeg_incdirs;
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index 715f7b8a7d8..a2da9170161 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:24 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/11/11 18:50:25 tonio Exp $
 #
 
-DISTNAME=	blackbox-0.65.0
-PKGREVISION=	5
+DISTNAME=	blackbox-0.70.0
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
 
@@ -10,11 +9,12 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	Small and fast X11R6 window manager
 
-DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
+DEPENDS=	bsetroot>=0.2:../../wm/bsetroot
 
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
+USE_TOOLS+=     pkg-config
 
-.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/blackbox/PLIST b/wm/blackbox/PLIST
index 0b7ad1336c1..091fed2808d 100644
--- a/wm/blackbox/PLIST
+++ b/wm/blackbox/PLIST
@@ -1,78 +1,31 @@
-@comment $NetBSD: PLIST,v 1.4 2002/11/20 18:20:30 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/11/11 18:50:25 tonio Exp $
 bin/blackbox
+include/bt/Application.hh
+include/bt/Bitmap.hh
+include/bt/Color.hh
+include/bt/Display.hh
+include/bt/EWMH.hh
+include/bt/EventHandler.hh
+include/bt/Font.hh
+include/bt/Image.hh
+include/bt/Menu.hh
+include/bt/Pen.hh
+include/bt/PixmapCache.hh
+include/bt/Rect.hh
+include/bt/Resource.hh
+include/bt/Texture.hh
+include/bt/Timer.hh
+include/bt/Unicode.hh
+include/bt/Util.hh
+lib/libbt.la
+lib/pkgconfig/libbt.pc
 man/man1/blackbox.1
 share/blackbox/menu
-share/blackbox/nls/C/blackbox.cat
-share/blackbox/nls/POSIX
-share/blackbox/nls/US_ASCII
-share/blackbox/nls/da_DK/blackbox.cat
-share/blackbox/nls/de
-share/blackbox/nls/de_DE/blackbox.cat
-share/blackbox/nls/en
-share/blackbox/nls/en_GB
-share/blackbox/nls/en_US
-share/blackbox/nls/es
-share/blackbox/nls/es_AR/blackbox.cat
-share/blackbox/nls/es_ES/blackbox.cat
-share/blackbox/nls/es_MX
-share/blackbox/nls/fr
-share/blackbox/nls/fr_FR/blackbox.cat
-share/blackbox/nls/hu_HU/blackbox.cat
-share/blackbox/nls/it
-share/blackbox/nls/it_IT/blackbox.cat
-share/blackbox/nls/ja_JP/blackbox.cat
-share/blackbox/nls/ko_KR/blackbox.cat
-share/blackbox/nls/lv_LV/blackbox.cat
-share/blackbox/nls/nl
-share/blackbox/nls/nl_NL/blackbox.cat
-share/blackbox/nls/no_NO/blackbox.cat
-share/blackbox/nls/pl_PL/blackbox.cat
-share/blackbox/nls/pt_BR/blackbox.cat
-share/blackbox/nls/ro_RO/blackbox.cat
-share/blackbox/nls/ru_RU/blackbox.cat
-share/blackbox/nls/sk_SK/blackbox.cat
-share/blackbox/nls/sl_SI/blackbox.cat
-share/blackbox/nls/sv_SE/blackbox.cat
-share/blackbox/nls/uk_UA/blackbox.cat
-share/blackbox/nls/zh_CN/blackbox.cat
-share/blackbox/nls/zh_TW/blackbox.cat
-share/blackbox/styles/Artwiz
-share/blackbox/styles/Cthulhain
-share/blackbox/styles/Flux
-share/blackbox/styles/Minimal
-share/blackbox/styles/Nyz
-share/blackbox/styles/Operation
-share/blackbox/styles/Outcomes
-share/blackbox/styles/Rampage
-share/blackbox/styles/Rancor
-share/blackbox/styles/Results
-share/blackbox/styles/Shade
-share/blackbox/styles/Spiff
-share/blackbox/styles/TDF
-share/blackbox/styles/Twice
+share/blackbox/styles/Blue
+share/blackbox/styles/Gray
+share/blackbox/styles/Green
+share/blackbox/styles/Purple
+share/blackbox/styles/Red
 @dirrm share/blackbox/styles
-@dirrm share/blackbox/nls/zh_TW
-@dirrm share/blackbox/nls/zh_CN
-@dirrm share/blackbox/nls/uk_UA
-@dirrm share/blackbox/nls/sv_SE
-@dirrm share/blackbox/nls/sl_SI
-@dirrm share/blackbox/nls/sk_SK
-@dirrm share/blackbox/nls/ru_RU
-@dirrm share/blackbox/nls/ro_RO
-@dirrm share/blackbox/nls/pt_BR
-@dirrm share/blackbox/nls/pl_PL
-@dirrm share/blackbox/nls/no_NO
-@dirrm share/blackbox/nls/nl_NL
-@dirrm share/blackbox/nls/lv_LV
-@dirrm share/blackbox/nls/ko_KR
-@dirrm share/blackbox/nls/ja_JP
-@dirrm share/blackbox/nls/it_IT
-@dirrm share/blackbox/nls/hu_HU
-@dirrm share/blackbox/nls/fr_FR
-@dirrm share/blackbox/nls/es_ES
-@dirrm share/blackbox/nls/es_AR
-@dirrm share/blackbox/nls/de_DE
-@dirrm share/blackbox/nls/da_DK
-@dirrm share/blackbox/nls/C
-@dirrm share/blackbox/nls
 @dirrm share/blackbox
+@dirrm include/bt
diff --git a/wm/blackbox/distinfo b/wm/blackbox/distinfo
index f2d1e543b6a..8442f83fff2 100644
--- a/wm/blackbox/distinfo
+++ b/wm/blackbox/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 18:43:53 wiz Exp $
+$NetBSD: distinfo,v 1.9 2005/11/11 18:50:25 tonio Exp $
 
-SHA1 (blackbox-0.65.0.tar.gz) = 903a35526b1c29912ca500b7f8c205368e60fc38
-RMD160 (blackbox-0.65.0.tar.gz) = d88d9c5d9375274da149c77d3c63bb9c92470f26
-Size (blackbox-0.65.0.tar.gz) = 292950 bytes
-SHA1 (patch-aa) = 265249c3e27da0d7dd9b2b85da1c417684c57e0f
-SHA1 (patch-ab) = 6081da04f0dbab0f711523114e130c176a0f1f05
-SHA1 (patch-ac) = 5f249a2e6d75e5d88605d6d8a1675d003b1cb52f
-SHA1 (patch-ad) = 0906aa36c45b1e9ebd8c10e166ac1ba8e345fd9e
+SHA1 (blackbox-0.70.0.tar.gz) = f700efa5d284f97ba4c7aa27d1a3425cb26baf7b
+RMD160 (blackbox-0.70.0.tar.gz) = 64b857aed8cbd49bb6c5168f5f1fc65c609b4e75
+Size (blackbox-0.70.0.tar.gz) = 583527 bytes
+SHA1 (patch-aa) = b3fee258878443d83be18a47ceab5aa7afcecf35
+SHA1 (patch-ab) = f3c2f4e8b310b38050d39b8ada25c225baa34b78
diff --git a/wm/blackbox/patches/patch-aa b/wm/blackbox/patches/patch-aa
index 0ef2c42b1c8..5861fbc92e7 100644
--- a/wm/blackbox/patches/patch-aa
+++ b/wm/blackbox/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2002/11/20 18:20:30 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/11 18:50:25 tonio Exp $
 
---- doc/Makefile.in.orig	Wed Nov 20 12:08:31 2002
-+++ doc/Makefile.in	Wed Nov 20 12:08:43 2002
-@@ -75,7 +75,7 @@
- 
+--- doc/Makefile.in.orig	2005-03-01 20:43:25.000000000 +0100
++++ doc/Makefile.in
+@@ -168,7 +168,7 @@ xft_CFLAGS = @xft_CFLAGS@
+ xft_LIBS = @xft_LIBS@
  CLEANFILES = blackbox.1
  MAINTAINERCLEANFILES = Makefile.in
 -man_MANS = blackbox.1 bsetroot.1 bsetbg.1
 +man_MANS = blackbox.1
- 
  DEFAULT_MENU = $(pkgdatadir)/menu
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ all: all-am
+ 
diff --git a/wm/blackbox/patches/patch-ab b/wm/blackbox/patches/patch-ab
index 1dfb62d7aef..846a04f5e6e 100644
--- a/wm/blackbox/patches/patch-ab
+++ b/wm/blackbox/patches/patch-ab
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2002/11/20 18:20:30 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/11 18:50:25 tonio Exp $
 
---- Makefile.in.orig	Wed Nov 20 12:09:13 2002
-+++ Makefile.in	Wed Nov 20 12:09:22 2002
-@@ -75,7 +75,7 @@
+--- Makefile.in.orig	2005-03-01 20:43:27.000000000 +0100
++++ Makefile.in
+@@ -191,8 +191,7 @@ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = data \
+ 			  doc \
+ 			  lib \
+-			  src \
+-			  util
++			  src
  
- AUTOMAKE_OPTIONS = foreign
- 
--SUBDIRS = data doc nls src util
-+SUBDIRS = data doc nls src
- MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ MAINTAINERCLEANFILES = Makefile.in \
+ 			  aclocal.m4 \