 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.326 2009/05/09 23:40:09 seb Exp $
+# $NetBSD: Makefile,v 1.327 2009/07/22 09:05:23 wiz Exp $
+#
 COMMENT=	Miscellaneous utilities
 SUBDIR+=	9menu
 SUBDIR+=	Addresses
 SUBDIR+=	JMdict
 SUBDIR+=	ascii
 SUBDIR+=	asr-manpages
 SUBDIR+=	astrolog
 SUBDIR+=	autocue
 SUBDIR+=	basket
 SUBDIR+=	bbappconf
 @@ -55,56 +55,51 @@ SUBDIR+=	fep
 SUBDIR+=	figlet
 SUBDIR+=	figlet-fonts
 SUBDIR+=	firelib
 SUBDIR+=	gaupol
 SUBDIR+=	gelemental
 SUBDIR+=	getopt
 SUBDIR+=	git
 SUBDIR+=	gkrellm-flynn
 SUBDIR+=	gkrellm-launch
 SUBDIR+=	gkrellm-leds
 SUBDIR+=	gkrellm-moon
 SUBDIR+=	gkrellm-weather
 SUBDIR+=	gnome-devel-docs
 SUBDIR+=	gnome-dirs
 SUBDIR+=	gnome-user-docs
 SUBDIR+=	gnome-utils
 SUBDIR+=	gnome1-dirs
 SUBDIR+=	gnome2-dirs
 SUBDIR+=	gnuls
 SUBDIR+=	goffice0.6
 SUBDIR+=	gok
 SUBDIR+=	gone
 SUBDIR+=	gperiodic
 SUBDIR+=	granulate
 SUBDIR+=	gwaei
 SUBDIR+=	gxmame
 SUBDIR+=	hanzim
 SUBDIR+=	heyu
 SUBDIR+=	ibutton-pdkit
 SUBDIR+=	ipbt
 SUBDIR+=	iselect
 SUBDIR+=	ja-less
 SUBDIR+=	ja-man
 SUBDIR+=	jhd
 SUBDIR+=	jitterbug
 SUBDIR+=	jive
 SUBDIR+=	kanjidic
 SUBDIR+=	kanjidic2
 SUBDIR+=	kanjipad
 SUBDIR+=	kchm
 SUBDIR+=	kchmviewer
 SUBDIR+=	kde3-dirs
 SUBDIR+=	kde4-dirs
 SUBDIR+=	kdeaccessibility3
 SUBDIR+=	kdeaddons3
 SUBDIR+=	kdeadmin3
 SUBDIR+=	kdeartwork3
 SUBDIR+=	kdeedu3
 SUBDIR+=	kdepim3
 SUBDIR+=	kdeutils3
 SUBDIR+=	kdrill
 SUBDIR+=	kodos
 SUBDIR+=	koffice
 SUBDIR+=	koffice-l10n-da
 SUBDIR+=	koffice-l10n-de
 SUBDIR+=	koffice-l10n-en_GB
 @@ -199,46 +194,43 @@ SUBDIR+=	ruby-transaction-simple
 SUBDIR+=	rubygems
 SUBDIR+=	sch
 SUBDIR+=	sci
 SUBDIR+=	screen
 SUBDIR+=	siag
 SUBDIR+=	softmaker-office-demo
 SUBDIR+=	splitvt
 SUBDIR+=	stellarium
 SUBDIR+=	taskjuggler
 SUBDIR+=	tds
 SUBDIR+=	team
 SUBDIR+=	tellico
 SUBDIR+=	teseq
 SUBDIR+=	theme-dirs
 SUBDIR+=	tmux
 SUBDIR+=	ttyrec
 SUBDIR+=	udfclient
 SUBDIR+=	ukpostcodes
 SUBDIR+=	uptimec
 SUBDIR+=	usbids
 SUBDIR+=	utftools
 SUBDIR+=	vera
 SUBDIR+=	vfu
 SUBDIR+=	visual-regexp
 SUBDIR+=	vttest
 SUBDIR+=	vym
 SUBDIR+=	watch
 SUBDIR+=	wdic
 SUBDIR+=	whohas
 SUBDIR+=	xchm
 SUBDIR+=	xdg-dirs
 SUBDIR+=	xdg-utils
 SUBDIR+=	xdg-x11-dirs
 SUBDIR+=	xfce4-weather-plugin
 SUBDIR+=	xjdic
 SUBDIR+=	xrolodex
 SUBDIR+=	xtail
 SUBDIR+=	xtend
 SUBDIR+=	xtide
 SUBDIR+=	yelp
 SUBDIR+=	yrolo
 SUBDIR+=	zorro
 SUBDIR+=	zyGrib
 SUBDIR+=	zyGrib-maps
 .include "../mk/misc/category.mk"

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.47 2008/05/16 20:00:09 tnn Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.48 2009/07/22 09:05:24 wiz Exp $
+#
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
+#
 # Package-settable variables:
+#
 # USE_BSD_MAKEFILE
 #	Should be set to "yes" whenever a package uses a BSD-style
 #	Makefile. These Makefiles typically end with a line including
 #	<bsd.prog.mk>.
 # USE_IMAKE
 #	When set to "yes", means that the package uses imake as the
 @@ -71,33 +71,26 @@ PKG_FAIL_REASON=	"INSTALLATION_PREFIX ca
 .endif
 ############################################################################
 # General settings
 ############################################################################
 ### PKG_USE_KERBEROS
 .if defined(PKG_USE_KERBEROS)
 CRYPTO?=		uses Kerberos encryption code
 BUILD_DEFS+=		KERBEROS
 .endif
 ### USE_DIRS
 USE_DIRS?=		# empty
 .if !empty(USE_DIRS) && ${PKG_INSTALLATION_TYPE} == "overwrite"
 .  include "dirs.mk"
 .endif
 ### USE_LIBTOOL, PKG_[SH]LIBTOOL
+#
 # PKG_LIBTOOL is the path to the libtool script installed by libtool-base.
 # _LIBTOOL is the path the libtool used by the build, which could be the
 #	path to a libtool wrapper script.
 # LIBTOOL is the publicly-readable variable that should be used by
 #	Makefiles to invoke the proper libtool.
+#
 PKG_LIBTOOL?=		${LOCALBASE}/bin/libtool
 PKG_SHLIBTOOL?=		${LOCALBASE}/bin/shlibtool
 _LIBTOOL?=		${PKG_LIBTOOL}
 _SHLIBTOOL?=		${PKG_SHLIBTOOL}

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.293 2009/07/22 07:03:25 minskim Exp $
+# $NetBSD: Makefile,v 1.294 2009/07/22 09:05:24 wiz Exp $
+#
 COMMENT=	Desktop publishing
 SUBDIR+=	LPRng
 SUBDIR+=	LPRng-core
 SUBDIR+=	LPRng-doc
 SUBDIR+=	a2ps
 SUBDIR+=	abc2ps
 SUBDIR+=	abcm2ps
 SUBDIR+=	acroread
 SUBDIR+=	acroread5
 SUBDIR+=	acroread7
 @@ -310,27 +310,26 @@ SUBDIR+=	tex-titlesec
 SUBDIR+=	tex-titlesec-doc
 SUBDIR+=	tex-tools
 SUBDIR+=	tex-tools-doc
 SUBDIR+=	tex-type1cm
 SUBDIR+=	tex-type1cm-doc
 SUBDIR+=	tex-ucs
 SUBDIR+=	tex-ukrhyph
 SUBDIR+=	tex-xkeyval
 SUBDIR+=	tex-xkeyval-doc
 SUBDIR+=	tex-xunicode
 SUBDIR+=	tex-xunicode-doc
 #SUBDIR+=	texlive				# place holder directory
 SUBDIR+=	texlive-tetex
 SUBDIR+=	texmf-dirs
 SUBDIR+=	transfig
 SUBDIR+=	web2c
 SUBDIR+=	xdvik
 SUBDIR+=	xetex
 SUBDIR+=	xfce4-print
 SUBDIR+=	xpdf
 SUBDIR+=	xpdf-arabic
 SUBDIR+=	xpdf-chinese-simplified
 SUBDIR+=	xpdf-chinese-traditional
 SUBDIR+=	xpdf-cyrillic
 SUBDIR+=	xpdf-greek
 SUBDIR+=	xpdf-hebrew
 SUBDIR+=	xpdf-japanese