summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortonio <tonio@pkgsrc.org>2005-11-11 18:50:23 +0000
committertonio <tonio@pkgsrc.org>2005-11-11 18:50:23 +0000
commitc27f4ed5e11b4c35ae0566ee5b6390dba302b6b1 (patch)
tree8b52523e03e817211f2be2b9e50fe815756c7343
parentc01ba26746bc064586bc39f5f0d1ac96f3bd5fbb (diff)
downloadpkgsrc-c27f4ed5e11b4c35ae0566ee5b6390dba302b6b1.tar.gz
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
-rw-r--r--benchmarks/skampi/Makefile4
-rw-r--r--cad/fastcap/Makefile6
-rw-r--r--cad/tnt-mmtl/Makefile6
-rw-r--r--converters/bibtex2html/Makefile4
-rw-r--r--cross/avrdude/Makefile6
-rw-r--r--devel/cweb/Makefile4
-rw-r--r--devel/darcs/Makefile4
-rw-r--r--devel/doxygen/Makefile4
-rw-r--r--devel/pvs/Makefile4
-rw-r--r--editors/TeXmacs/Makefile4
-rw-r--r--editors/lyx-qt/Makefile.common4
-rw-r--r--math/pari/Makefile6
-rw-r--r--mk/tex.buildlink3.mk64
-rw-r--r--print/advi/Makefile4
-rw-r--r--print/cjk-lyx/Makefile4
-rw-r--r--print/dvipdfm/Makefile4
-rw-r--r--print/html2ps/Makefile4
-rw-r--r--print/ja-dvipdfm/Makefile4
-rw-r--r--print/ja-ptex-bin/Makefile4
-rw-r--r--print/ja-ptex-share/Makefile4
-rw-r--r--print/ja-vfxdvik/Makefile6
-rw-r--r--print/lgrind/Makefile4
-rw-r--r--print/magicfilter/Makefile4
-rw-r--r--print/teTeX/Makefile5
-rw-r--r--print/tex-chemarrow/PLIST3
-rw-r--r--print/tex-eurosym/Makefile4
-rw-r--r--print/tex-musixtex/Makefile4
-rw-r--r--print/tex-textpos/Makefile4
-rw-r--r--print/texfamily-share/Makefile4
-rw-r--r--print/texfamily/Makefile4
-rw-r--r--textproc/latex2html/Makefile4
-rw-r--r--textproc/rubber/Makefile4
-rw-r--r--wm/bbconf/Makefile10
-rw-r--r--wm/bbconf/PLIST14
-rw-r--r--wm/bbconf/distinfo16
-rw-r--r--wm/bbconf/patches/patch-aa6
-rw-r--r--wm/bbconf/patches/patch-af10
-rw-r--r--wm/blackbox/Makefile10
-rw-r--r--wm/blackbox/PLIST99
-rw-r--r--wm/blackbox/distinfo14
-rw-r--r--wm/blackbox/patches/patch-aa14
-rw-r--r--wm/blackbox/patches/patch-ab23
-rw-r--r--www/p5-SVN-Web/Makefile4
-rw-r--r--www/p5-Template-Extract/Makefile4
-rw-r--r--www/p5-Template-Generate/Makefile4
45 files changed, 186 insertions, 240 deletions
diff --git a/benchmarks/skampi/Makefile b/benchmarks/skampi/Makefile
index 73e6094892e..b6b81f6b614 100644
--- a/benchmarks/skampi/Makefile
+++ b/benchmarks/skampi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/08 17:40:38 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/11 18:50:23 tonio Exp $
#
DISTNAME= skampi4
@@ -14,7 +14,7 @@ HOMEPAGE= http://liinwww.ira.uka.de/~skampi/
COMMENT= MPI (Message Passing Interface) benchmarks
DEPENDS+= gnuplot>=3.7.1:../../graphics/gnuplot
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index f73c44c3be8..952bd8a0ac1 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/11/08 17:49:19 tonio Exp $
+# $NetBSD: Makefile,v 1.26 2005/11/11 18:50:24 tonio Exp $
#
DISTNAME= fastcap-2.0-18Sep92
@@ -17,8 +17,8 @@ WRKSRC= ${WRKDIR}
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./config
CONFIGURE_ARGS= 4
-LATEX_DEPMETHOD= build
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_DEPMETHOD= build
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
GCC_REQD+= 2.95.3
diff --git a/cad/tnt-mmtl/Makefile b/cad/tnt-mmtl/Makefile
index 8670354c325..03617d51143 100644
--- a/cad/tnt-mmtl/Makefile
+++ b/cad/tnt-mmtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/08 17:50:41 tonio Exp $
+# $NetBSD: Makefile,v 1.7 2005/11/11 18:50:24 tonio Exp $
#
DISTNAME= tnt-1.2.2
@@ -18,8 +18,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
USE_LANGUAGES= c c++ fortran
-LATEX_DEPMOD= build
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_DEPMOD= build
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
post-patch:
${MV} ${WRKSRC}/tnt ${WRKSRC}/tnt-mmtl
diff --git a/converters/bibtex2html/Makefile b/converters/bibtex2html/Makefile
index 5dc1e148f65..123699a656a 100644
--- a/converters/bibtex2html/Makefile
+++ b/converters/bibtex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/08 17:57:25 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/11 18:50:24 tonio Exp $
DISTNAME= bibtex2html-1.76
CATEGORIES= converters
@@ -12,7 +12,7 @@ BUILD_DEPENDS+= hevea-[0-9]*:../../textproc/hevea
GNU_CONFIGURE= yes
USE_TOOLS+= perl:run
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
SUBST_CLASSES+= paths
SUBST_MESSAGE.paths= "Fixing hardcoded paths."
diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile
index 3b0bb0afaff..f1c97eb55f8 100644
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/08 17:59:05 tonio Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:24 tonio Exp $
DISTNAME= avrdude-4.1.0
PKGREVISION= 2
@@ -10,8 +10,8 @@ HOMEPAGE= http://www.bsdhome.com/avrdude/
COMMENT= Downloader/uploader for Atmel AVR 8-bit RISC microcontrollers
USE_GNU_READLINE= YES
-LATEX_DEPMETHOD= build
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_DEPMETHOD= build
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
BUILD_DEPENDS+= texi2html>=1.76:../../textproc/texi2html
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 03d02495760..4b11a40ba3d 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/08 18:45:24 tonio Exp $
+# $NetBSD: Makefile,v 1.23 2005/11/11 18:50:24 tonio Exp $
#
# XXX This package needs to be installed with the same PREFIX as teTeX
#
@@ -14,7 +14,7 @@ COMMENT= CWEB System of Structured Documentation
CONFLICTS+= teTeX-bin>=2.0 # Part of teTeX>=2.0
-LATEX_ACCEPTED= teTeX1
+TEX_ACCEPTED= teTeX1
WRKSRC= ${WRKDIR}
INSTALLATION_DIRS= bin man/man1
diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index 797c18044e6..eb306bb68ed 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/08 18:53:02 tonio Exp $
+# $NetBSD: Makefile,v 1.7 2005/11/11 18:50:24 tonio Exp $
DISTNAME= darcs-1.0.3
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Distributed revision control system
BUILD_DEPENDS+= latex2html>=2002.2.1nb3:../../textproc/latex2html
-LATEX_DEPMETHOD= build
+TEX_DEPMETHOD= build
USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
GNU_CONFIGURE= yes
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 0bb5941079d..7708bb8eb08 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/11/08 18:47:07 tonio Exp $
+# $NetBSD: Makefile,v 1.39 2005/11/11 18:50:24 tonio Exp $
DISTNAME= doxygen-1.4.5.src
PKGNAME= doxygen-1.4.5
@@ -10,7 +10,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.doxygen.org/
COMMENT= Documentation system for C++, Java, IDL and C
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_TOOLS+= gmake perl flex
USE_LANGUAGES= c c++
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index 99120340e39..527cce2f0b0 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/08 18:52:30 tonio Exp $
+# $NetBSD: Makefile,v 1.23 2005/11/11 18:50:24 tonio Exp $
#
DISTNAME= pvs-${VERSION}
@@ -25,7 +25,7 @@ CHECK_SHLIBS= NO
SHLIB_HANDLING= NO
INFO_DIR= pvs/doc/release-notes
INFO_FILES= pvs-release-notes.info
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
LICENSE= pvs-license
# not quite sure about this, but to be on the safe side:
diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 39266675bbc..4b3d566882a 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/11/10 21:12:07 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2005/11/11 18:50:24 tonio Exp $
DISTNAME= TeXmacs-1.0.5.12-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -14,7 +14,7 @@ BUILD_TARGET= TEXMACS
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
PYTHON_PATCH_SCRIPTS= plugins/python/bin/tm_python
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 350642063b5..622567789d0 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2005/11/08 18:56:34 tonio Exp $
+# $NetBSD: Makefile.common,v 1.30 2005/11/11 18:50:24 tonio Exp $
#
DISTNAME= lyx-1.3.6
@@ -27,7 +27,7 @@ USE_TOOLS+= gmake perl:run
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
GCC_REQD+= 2.95
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
CONFIGURE_ARGS+= --with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \
--with-pspell-include=${BUILDLINK_PREFIX.aspell}/include/pspell \
diff --git a/math/pari/Makefile b/math/pari/Makefile
index 5a6b16b7059..e072af8bd9a 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/11/08 19:57:11 tonio Exp $
+# $NetBSD: Makefile,v 1.30 2005/11/11 18:50:24 tonio Exp $
DISTNAME= pari-2.1.6
CATEGORIES= math
@@ -9,8 +9,8 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://pari.math.u-bordeaux.fr/
COMMENT= Software package for computer-aided number theory
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
-LATEX_DEPMETHOD= build
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_DEPMETHOD= build
USE_GNU_READLINE= yes # rl_save_prompt()
USE_LIBTOOL= yes
diff --git a/mk/tex.buildlink3.mk b/mk/tex.buildlink3.mk
index fe7cae1e5c0..8d3fe3f99b6 100644
--- a/mk/tex.buildlink3.mk
+++ b/mk/tex.buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: tex.buildlink3.mk,v 1.2 2005/11/10 21:21:13 minskim Exp $
+# $NetBSD: tex.buildlink3.mk,v 1.3 2005/11/11 18:50:24 tonio Exp $
#
# A Makefile fragment for tex and latex packages
#
# * Determine the version of teTeX to be used.
-# Modify LATEX_DEFAULT to change the default version (default to teTeX2)
+# Modify TEX_DEFAULT to change the default version (default to teTeX2)
#
# * tex files are installed...
# teTeX[1-2]
@@ -19,16 +19,16 @@
# PKG_TEXMFPREFIX=PKG_LOCALTEXMFPREFIX=${PREFIX}/share/texmf
#
# * Assume each package supports teTeX{2,3} by default.
-# To change the supported latex versions, define LATEX_ACCEPTED
+# To change the supported latex versions, define TEX_ACCEPTED
# explicitly before including mk/latex.buildlink3.mk. Note that the order is
# important.
#
-# * Optionally set LATEX_DEPMETHOD to "build" to only add a build-time
+# * Optionally set TEX_DEPMETHOD to "build" to only add a build-time
# dependency on Latex. That may be useful for creating documentation
#
# Variables for users:
#
-# LATEX_DEFAULT
+# TEX_DEFAULT
# Description:
# The user's favorite latex implementation
# Possible values:
@@ -38,7 +38,7 @@
#
# Variables tex packages can provide:
#
-# LATEX_DEPMETHOD
+# TEX_DEPMETHOD
# Description:
# Set latex as DEPENDS or BUILD_DEPENDS
# Possible values:
@@ -46,7 +46,7 @@
# Default value:
# run
#
-# LATEX_ACCEPTED
+# TEX_ACCEPTED
# Description:
# Versions the package accepts (supports).
# Possible values:
@@ -70,7 +70,7 @@
# ${PREFIX}/share/texmf
# ${PREFIX}/share/texmf-local
#
-# LATEX_TYPE
+# TEX_TYPE
# Description:
# The type of the used latex package
# Possible values:
@@ -81,11 +81,11 @@ TEX_BUILDLINK3_MK= # defined
.include "../../mk/bsd.prefs.mk"
-LATEX_DEFAULT?= teTeX2
-LATEX_DEPMETHOD?= run
+TEX_DEFAULT?= teTeX2
+TEX_DEPMETHOD?= run
# Assume only teTeX {2-3} are supported by default.
-LATEX_ACCEPTED?= teTeX2 teTeX3
+TEX_ACCEPTED?= teTeX2 teTeX3
# set up variables for buildlink or depends
#
@@ -98,38 +98,38 @@ BUILDLINK_PKGSRCDIR.teTeX3= ../../print/teTeX3-bin
# Determine the Latex version to be used.
#
-.if !defined(_LATEX_TYPE)
-_LATEX_TYPE= ${LATEX_DEFAULT}
+.if !defined(_TEX_TYPE)
+_TEX_TYPE= ${TEX_DEFAULT}
.endif
-.if !empty(LATEX_ACCEPTED:M${_LATEX_TYPE})
-LATEX_TYPE= ${_LATEX_TYPE}
+.if !empty(TEX_ACCEPTED:M${_TEX_TYPE})
+TEX_TYPE= ${_TEX_TYPE}
.else
-LATEX_TYPE= none
+TEX_TYPE= none
.endif
# Set version specifics.
#
-.if ${LATEX_TYPE} == "teTeX3"
-_LATEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX3}
-_LATEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX3}
+.if ${TEX_TYPE} == "teTeX3"
+_TEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX3}
+_TEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX3}
#PKG_TEXMFPREFIX= ${PREFIX}/share/texmf-dist
PKG_TEXMFPREFIX= ${PREFIX}/share/texmf
#PKG_LOCALTEXMFPREFIX= ${PREFIX}/share/texmf-local
PKG_LOCALTEXMFPREFIX= ${PREFIX}/share/texmf
-.elif ${LATEX_TYPE} == "teTeX2"
-_LATEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX2}
-_LATEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX2}
+.elif ${TEX_TYPE} == "teTeX2"
+_TEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX2}
+_TEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX2}
PKG_TEXMFPREFIX= ${PREFIX}/share/texmf
PKG_LOCALTEXMFPREFIX= ${PREFIX}/share/texmf
-.elif ${LATEX_TYPE} == "teTeX1"
-_LATEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX1}
-_LATEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX1}
+.elif ${TEX_TYPE} == "teTeX1"
+_TEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX1}
+_TEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX1}
PKG_TEXMFPREFIX= ${PREFIX}/share/texmf
PKG_LOCALTEXMFPREFIX= ${PREFIX}/share/texmf
.endif
-PLIST_SUBST+= LATEX_TYPE=${LATEX_TYPE}
+PLIST_SUBST+= TEX_TYPE=${TEX_TYPE}
PLIST_SUBST+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:C|^${PREFIX}/||}
PLIST_SUBST+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:C|^${PREFIX}/||}
@@ -141,14 +141,14 @@ PRINT_PLIST_AWK+= /^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/
.endif # TEX_BUILDLINK3_MK
-.if ${LATEX_TYPE} == "none"
+.if ${TEX_TYPE} == "none"
PKG_FAIL_REASON= \
- "${_LATEX_TYPE} is not an acceptable latex version for ${PKGNAME}."
+ "${_TEX_TYPE} is not an acceptable latex version for ${PKGNAME}."
.else
-.if (${LATEX_DEPMETHOD} == "build")
-BUILD_DEPENDS+= ${_LATEX_DEPENDENCY}:${_LATEX_PKGSRCDIR}
+.if (${TEX_DEPMETHOD} == "build")
+BUILD_DEPENDS+= ${_TEX_DEPENDENCY}:${_TEX_PKGSRCDIR}
.else
-LATEX_DEPMETHOD:= run
-. include "${_LATEX_PKGSRCDIR}/buildlink3.mk"
+TEX_DEPMETHOD:= run
+. include "${_TEX_PKGSRCDIR}/buildlink3.mk"
.endif
.endif
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 41c9ea56ac9..3ed295d364d 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/08 20:30:29 tonio Exp $
+# $NetBSD: Makefile,v 1.15 2005/11/11 18:50:24 tonio Exp $
DISTNAME= advi-1.6.0
CATEGORIES= print
@@ -11,7 +11,7 @@ COMMENT= Active-DVI Presenter
BUILD_DEPENDS+= ocaml>=3.04:../../lang/ocaml
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 808b721e2e6..6658ebd73bd 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/08 20:33:50 tonio Exp $
+# $NetBSD: Makefile,v 1.18 2005/11/11 18:50:24 tonio Exp $
DISTNAME= lyx-${LYX_VERS}
PKGNAME= cjk-${DISTNAME}
@@ -22,7 +22,7 @@ CONFLICTS= lyx-[0-9]*
DEPENDS+= ispell-base-[0-9]*:../../textproc/ispell-base
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= perl:run
diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index 28c7bda1210..c5f32110f08 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/09 00:05:28 tonio Exp $
+# $NetBSD: Makefile,v 1.20 2005/11/11 18:50:24 tonio Exp $
DISTNAME= dvipdfm-0.13.2c
PKGREVISION= 4
@@ -12,7 +12,7 @@ COMMENT= DVI to PDF translator
CONFLICTS+= dvipdfmx-[0-9]*
CONFLICTS+= ja-dvipdfm-[0-9]*
CONFLICTS+= teTeX-bin>=2.0 # Part of teTeX>=2.0
-LATEX_ACCEPTED= teTeX1
+TEX_ACCEPTED= teTeX1
WRKSRC= ${WRKDIR}/dvipdfm
GNU_CONFIGURE= yes
diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index 5a8348871bf..beb2649886d 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/08 20:46:18 tonio Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/11 18:50:24 tonio Exp $
#
DISTNAME= html2ps-1.0b4
@@ -17,7 +17,7 @@ DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
DEPENDS+= weblint-[0-9]*:../../www/weblint
USE_TOOLS+= perl:run
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/print/ja-dvipdfm/Makefile b/print/ja-dvipdfm/Makefile
index 3f152c86c92..2878ef60620 100644
--- a/print/ja-dvipdfm/Makefile
+++ b/print/ja-dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/08 23:03:10 tonio Exp $
+# $NetBSD: Makefile,v 1.15 2005/11/11 18:50:24 tonio Exp $
DISTNAME= dvipdfm-0.13.2c
PKGNAME= ja-${DISTNAME}
@@ -16,7 +16,7 @@ COMMENT= DVI to PDF translator with Japanese patch
CONFLICTS+= dvipdfm-[0-9]*
CONFLICTS+= dvipdfmx-[0-9]*
-LATEX_ACCEPTED= teTeX1
+TEX_ACCEPTED= teTeX1
WRKSRC= ${WRKDIR}/dvipdfm
GNU_CONFIGURE= yes
diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index 78d89192ff4..ac51314b81a 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/08 23:03:10 tonio Exp $
+# $NetBSD: Makefile,v 1.19 2005/11/11 18:50:24 tonio Exp $
DISTNAME= ptex-src-${PTEX_VERS}
PKGNAME= ja-ptex-bin-${PTEX_VERS}
@@ -27,7 +27,7 @@ DEPENDS+= ja-ptex-share>=2.1:../../print/ja-ptex-share
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-LATEX_ACCEPTED= teTeX2
+TEX_ACCEPTED= teTeX2
.include "../../print/teTeX-bin/Makefile.common"
PTEX_VERS= 3.1.2
diff --git a/print/ja-ptex-share/Makefile b/print/ja-ptex-share/Makefile
index ef34d1f0ee8..065b6f7f30b 100644
--- a/print/ja-ptex-share/Makefile
+++ b/print/ja-ptex-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/08 23:03:10 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/11 18:50:24 tonio Exp $
DISTNAME= ptex-texmf-2.1
PKGNAME= ja-ptex-share-2.1
@@ -18,7 +18,7 @@ MAINTAINER= kei@NetBSD.org
HOMEPAGE= http://www.ascii.co.jp/pb/ptex/
COMMENT= Library files for pTeX
-LATEX_ACCEPTED= teTeX2
+TEX_ACCEPTED= teTeX2
WRKSRC= ${WRKDIR}
DIST_SUBDIR= teTeX
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index 2faabc67ee0..d7584080cde 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/08 23:03:10 tonio Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/11 18:50:24 tonio Exp $
DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS}
PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -19,10 +19,10 @@ XDVIK_JP_PATCH_VERS= j1.14
.if defined(USE_TEXFAMILY)
DEPENDS+= TeXfamily>=1.2.1:../../print/texfamily
-LATEX_ACCEPTED= teTeX1
+TEX_ACCEPTED= teTeX1
.else
DEPENDS+= ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin
-LATEX_ACCEPTED= teTeX2
+TEX_ACCEPTED= teTeX2
.endif
XDVI_DIR= ${WRKDIR}/${DISTNAME}/texk/xdvik
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index f0abe5761e1..b74904ed18f 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/11/08 20:30:29 tonio Exp $
+# $NetBSD: Makefile,v 1.24 2005/11/11 18:50:24 tonio Exp $
DISTNAME= lgrind
PKGNAME= lgrind-3.5
@@ -13,7 +13,7 @@ COMMENT= Source pretty printer for LaTeX
WRKSRC= ${WRKDIR}/lgrind/source
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
NO_CONFIGURE= yes
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
.include "../../mk/x11.buildlink3.mk"
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 15e88b4461b..c93571a2ee9 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/11/08 20:46:18 tonio Exp $
+# $NetBSD: Makefile,v 1.44 2005/11/11 18:50:25 tonio Exp $
DISTNAME= magicfilter-1.2
PKGREVISION= 4
@@ -18,7 +18,7 @@ USE_TOOLS+= gmake gzip
GNU_CONFIGURE= yes
CONFIGURE_ENV+= GHOSTSCRIPT=${LOCALBASE}/bin/gs
CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q}
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
PLIST_SRC= ${WRKDIR}/PLIST
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 48e187e02de..61895baa0d1 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/07/19 10:15:29 grant Exp $
+# $NetBSD: Makefile,v 1.40 2005/11/11 18:50:25 tonio Exp $
#
DISTNAME= teTeX-2.0.2
@@ -11,8 +11,6 @@ MAINTAINER= kei@NetBSD.org
HOMEPAGE= http://www.tug.org/tetex/
COMMENT= Thomas Esser's TeX distribution for UNIX compatible systems, version 2
-DEPENDS+= teTeX-bin>=2.0.2:../../print/teTeX-bin
-DEPENDS+= teTeX-sharesrc>=2.0.2:../../print/teTeX-sharesrc
DEPENDS+= texi2html>=1.52:../../textproc/texi2html
CONFLICTS+= teTeX2-[0-9]*
@@ -24,4 +22,5 @@ NO_BUILD= yes
do-install: # do nothing
+.include "../../mk/tex.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-chemarrow/PLIST b/print/tex-chemarrow/PLIST
index ac76c799efa..8767e664780 100644
--- a/print/tex-chemarrow/PLIST
+++ b/print/tex-chemarrow/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/11/08 21:45:01 tonio Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/11/11 18:50:25 tonio Exp $
${PKG_LOCALTEXMFPREFIX}/fonts/source/chemarrow/arrow.mf
${PKG_LOCALTEXMFPREFIX}/fonts/tfm/chemarrow/arrow.tfm
${PKG_LOCALTEXMFPREFIX}/tex/latex/chemarrow/chemarrow.sty
@@ -11,4 +11,5 @@ share/fonts/chemarrow/arrow.pfm
@exec %D/bin/texconfig rehash
@unexec %D/bin/texconfig rehash
@dirrm ${PKG_LOCALTEXMFPREFIX}/fonts/source/chemarrow
+@dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/chemarrow
@dirrm share/fonts/chemarrow
diff --git a/print/tex-eurosym/Makefile b/print/tex-eurosym/Makefile
index 01ae3e879f6..46b86e45b0a 100644
--- a/print/tex-eurosym/Makefile
+++ b/print/tex-eurosym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/08 21:16:09 tonio Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/11 18:50:25 tonio Exp $
#
DISTNAME= eurosym-1.0
@@ -12,7 +12,7 @@ HOMEPAGE= ftp://ftp.univie.ac.at/packages/tex/fonts/eurosym/
COMMENT= Euro symbols for LaTeX
# included in teTeX[23]
-LATEX_ACCEPTED= teTeX1
+TEX_ACCEPTED= teTeX1
CONFLICTS+= teTeX>1
WRKSRC= ${WRKDIR}/eurosym
diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index 30febf839b1..737557cac21 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/08 21:45:01 tonio Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/11 18:50:25 tonio Exp $
#
DISTNAME= musixtex-112
@@ -11,7 +11,7 @@ MAINTAINER= dgriffi@cs.csubak.edu
HOMEPAGE= http://icking-music-archive.sunsite.dk/
COMMENT= TeX macros to typeset music
-LATEX_ACCEPTED= teTeX2 teTeX3
+TEX_ACCEPTED= teTeX2 teTeX3
WRKSRC= ${WRKDIR}/musixtex-T112
NO_CONFIGURE= yes
diff --git a/print/tex-textpos/Makefile b/print/tex-textpos/Makefile
index 8441d9933ac..b534a1b8ec6 100644
--- a/print/tex-textpos/Makefile
+++ b/print/tex-textpos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/08 21:45:01 tonio Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/11 18:50:25 tonio Exp $
#
NAME= textpos
@@ -17,7 +17,7 @@ DIST_SUBDIR= ${NAME}
DISTFILES= textpos.ins LICENCE README textpos.dtx VERSION
# included in teTeX3
-LATEX_ACCEPTED= teTeX1 teTeX2
+TEX_ACCEPTED= teTeX1 teTeX2
CONFLICTS+= teTeX-bin>=3.0
NO_CONFIGURE= yes
diff --git a/print/texfamily-share/Makefile b/print/texfamily-share/Makefile
index 6dfddf20b20..e4bb395a753 100644
--- a/print/texfamily-share/Makefile
+++ b/print/texfamily-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/08 23:03:10 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/11 18:50:25 tonio Exp $
DISTNAME= TeXfamily-share-1.2.1
PKGREVISION= 5
@@ -27,7 +27,7 @@ NO_CONFIGURE= yes
NO_BUILD= yes
NO_MTREE= yes
PLIST_SRC= ${WRKDIR}/PLIST_SRC
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
do-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/texmf.local
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index c0c7b82a380..5bf3a12c03d 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/11/08 23:03:10 tonio Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/11 18:50:25 tonio Exp $
DISTNAME= TeXfamily-1.2.1
PKGREVISION= 5
@@ -27,7 +27,7 @@ PATCH_DIST_ARGS= -d ${WRKSRC}/texk/web2c/ptex-${TEXFAMILY_PTEXVERSION}
MAINTAINER= kei@NetBSD.org
COMMENT= TeXfamily (pTeX, JTeX, MuLTeX) - executables
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
DEPENDS+= TeXfamily-share>=1.2.1nb3:../../print/texfamily-share
DEPENDS+= ja-vflib-lib-[0-9]*:../../print/ja-vflib-lib
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 14d26a90922..6de957df7d5 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/11/08 20:02:52 tonio Exp $
+# $NetBSD: Makefile,v 1.21 2005/11/11 18:50:25 tonio Exp $
DISTNAME= latex2html-2002-2-1
PKGNAME= latex2html-2002.2.1
@@ -12,7 +12,7 @@ COMMENT= LaTeX to HTML converter
DEPENDS+= netpbm>=10.29nb2:../../graphics/netpbm
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
USE_TOOLS+= perl:run
GNU_CONFIGURE= yes
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index 3b0b6d872f4..f1afc1c5519 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/08 20:02:52 tonio Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:25 tonio Exp $
#
DISTNAME= rubber-1.0
@@ -16,7 +16,7 @@ USE_MAKEINFO= yes
INFO_FILES= rubber.info
TEXINFO_REQD= 4.6
PYTHON_VERSIONS_ACCEPTED= 24 23
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
CONFIGURE_ARGS+= --python=${PYTHONBIN} --prefix=${PREFIX} \
--datadir=${PREFIX}/share
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 \
diff --git a/www/p5-SVN-Web/Makefile b/www/p5-SVN-Web/Makefile
index 3601f0476c8..a1461aa2705 100644
--- a/www/p5-SVN-Web/Makefile
+++ b/www/p5-SVN-Web/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/08 20:06:43 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/11 18:50:25 tonio Exp $
DISTNAME= SVN-Web-0.35
PKGNAME= p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=OurNet/CLKAO/}
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Unstable snapshot of Subversion repository browser
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
DEPENDS+= p5-subversion>=0.32.1:../../devel/p5-subversion
DEPENDS+= p5-Template-Toolkit>=2.10:../../www/p5-Template-Toolkit
diff --git a/www/p5-Template-Extract/Makefile b/www/p5-Template-Extract/Makefile
index fbedc9360f6..d4db793a69d 100644
--- a/www/p5-Template-Extract/Makefile
+++ b/www/p5-Template-Extract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/08 20:06:43 tonio Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:25 tonio Exp $
DISTNAME= Template-Extract-0.25
PKGNAME= p5-${DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://search.cpan.org/~autrijus/Template-Extract/
COMMENT= Perl5 module for extracting data structure from TT2-rendered documents
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
DEPENDS+= p5-Template-Toolkit>=2.0:../../www/p5-Template-Toolkit
diff --git a/www/p5-Template-Generate/Makefile b/www/p5-Template-Generate/Makefile
index 01fd85c8b29..d29fc767eb2 100644
--- a/www/p5-Template-Generate/Makefile
+++ b/www/p5-Template-Generate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/08 20:06:43 tonio Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:25 tonio Exp $
DISTNAME= Template-Generate-0.04
PKGNAME= p5-${DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://search.cpan.org/~autrijus/Template-Generate/
COMMENT= Perl5 module for generating TT2 templates from TT2-rendered documents
-LATEX_ACCEPTED= teTeX1 teTeX2 teTeX3
+TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
DEPENDS+= p5-Template-Toolkit>=2.0:../../www/p5-Template-Toolkit