diff options
| -rw-r--r-- | mk/compiler/hp.mk | 6 | ||||
| -rw-r--r-- | mk/defaults/options.description | 4 | ||||
| -rw-r--r-- | mk/flavor/pkg/depends.mk | 4 | ||||
| -rwxr-xr-x | mk/flavor/pkg/register-dependencies | 4 | ||||
| -rwxr-xr-x | mk/gnu-config/config.guess | 2 | ||||
| -rwxr-xr-x | mk/scripts/genreadme.awk | 6 | ||||
| -rwxr-xr-x | mk/scripts/mkreadme | 4 | ||||
| -rw-r--r-- | mk/wrapper/cmd-sink-hpux-ld | 4 | ||||
| -rw-r--r-- | mk/wrapper/transform-ccc-cc | 4 |
9 files changed, 19 insertions, 19 deletions
diff --git a/mk/compiler/hp.mk b/mk/compiler/hp.mk index 93f1e506fdf..afa7aa3e622 100644 --- a/mk/compiler/hp.mk +++ b/mk/compiler/hp.mk @@ -1,4 +1,4 @@ -# $NetBSD: hp.mk,v 1.2 2007/04/17 11:09:28 tnn Exp $ +# $NetBSD: hp.mk,v 1.3 2007/05/28 11:07:00 martti Exp $ # # This is the compiler definition for the HP-UX C/aC++ compilers. # @@ -52,7 +52,7 @@ _COMPILER_RPATH_FLAG= ${_COMPILER_LD_FLAG}${_LINKER_RPATH_FLAG}, # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the # ones requested by the package in USE_LANGUAGES. -# +# _LANGUAGES.hp= # empty .for _lang_ in ${USE_LANGUAGES} _LANGUAGES.hp+= ${LANGUAGES.hp:M${_lang_}} @@ -66,7 +66,7 @@ PREPEND_PATH+= ${_HP_DIR}/bin # Create compiler driver scripts in ${WRKDIR}. .for _var_ in ${_HP_VARS} . if !target(${_HP_${_var_}}) -override-tools: ${_HP_${_var_}} +override-tools: ${_HP_${_var_}} ${_HP_${_var_}}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/mk/defaults/options.description b/mk/defaults/options.description index 5c4b46ec10a..366cd5eb7d1 100644 --- a/mk/defaults/options.description +++ b/mk/defaults/options.description @@ -81,7 +81,7 @@ efnet Enable tweaks to support EFNet. elinks-exmode Enable vi-like command entry. elinks-fastmem Allow direct use of system memory allocation functions. elinks-html-highlight Enable HTML highlighting using DOM engine. -elinks-root-exec Allow elinks to run as root. +elinks-root-exec Allow elinks to run as root. emacs-xaw3d Emacs should use Xaw3D for the scrollbar. esound Enable support for the Enlightment Sound Daemon. exim-build-eximon Also build the X based exim queue monitoring tool. @@ -94,7 +94,7 @@ exim-lookup-pgsql Perform lookups in PostgreSQL database. exim-lookup-sqlite Perform lookups in SQLite database. exim-lookup-whoson Lookup in whoson dynamic IP address. exim-old-demime Use deprecated "demime" condition in the DATA ACL. -expat Use the expat library for XML parsing. +expat Use the expat library for XML parsing. ezmlm-althash Patch to hash subscriber list case-insensitively. faac faad Enable AAC decoding support using faad2. diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk index 5df7b518054..94b74b45fe0 100644 --- a/mk/flavor/pkg/depends.mk +++ b/mk/flavor/pkg/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.33 2007/05/25 23:24:35 joerg Exp $ +# $NetBSD: depends.mk,v 1.34 2007/05/28 11:07:00 martti Exp $ # This command prints out the dependency patterns for all full (run-time) # dependencies of the package. @@ -138,6 +138,6 @@ bootstrap-depends: ${_BOOTSTRAP_DEPENDS_TARGETS} ${_DEPENDS_INSTALL_CMD}; \ done -.PHONY: +.PHONY: acquire-bootstrap-depends-lock: acquire-lock release-bootstrap-depends-lock: release-lock diff --git a/mk/flavor/pkg/register-dependencies b/mk/flavor/pkg/register-dependencies index ee837a3851b..c9a4ef3cbb9 100755 --- a/mk/flavor/pkg/register-dependencies +++ b/mk/flavor/pkg/register-dependencies @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: register-dependencies,v 1.3 2007/05/22 16:17:16 joerg Exp $ +# $NetBSD: register-dependencies,v 1.4 2007/05/28 11:07:00 martti Exp $ # ###################################################################### # @@ -12,7 +12,7 @@ # # DESCRIPTION # register-dependencies registers a dependency relationship from -# the named package pkgname and the packages passed in via +# the named package pkgname and the packages passed in via # standard input. # # ENVIRONMENT diff --git a/mk/gnu-config/config.guess b/mk/gnu-config/config.guess index 0f0fe712ae6..b6e6955881f 100755 --- a/mk/gnu-config/config.guess +++ b/mk/gnu-config/config.guess @@ -793,7 +793,7 @@ EOF exit ;; *:Interix*:[3456]*) case ${UNAME_MACHINE} in - x86) + x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; EM64T | authenticamd) diff --git a/mk/scripts/genreadme.awk b/mk/scripts/genreadme.awk index 2ef3ebcea2c..5fdf718bfd8 100755 --- a/mk/scripts/genreadme.awk +++ b/mk/scripts/genreadme.awk @@ -1,5 +1,5 @@ #!/usr/bin/awk -f -# $NetBSD: genreadme.awk,v 1.26 2007/02/18 00:08:36 adrianp Exp $ +# $NetBSD: genreadme.awk,v 1.27 2007/05/28 11:07:00 martti Exp $ # # Copyright (c) 2002, 2003, 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -278,8 +278,8 @@ END { if ( $0 ~ /^-----BEGIN PGP SIGNATURE-----.*/ ) { break; } - if ( ( $0 !~ /^\#/ ) && - ( $0 !~ /^Hash:.*/ ) && + if ( ( $0 !~ /^\#/ ) && + ( $0 !~ /^Hash:.*/ ) && ( $0 !~ /^-----BEGIN PGP SIGNED.*/ ) && ( $0 != "" ) ) { vulpkg[i] = $1; diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme index 0f838dbe307..5ee162b6e0d 100755 --- a/mk/scripts/mkreadme +++ b/mk/scripts/mkreadme @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkreadme,v 1.15 2007/02/18 00:08:36 adrianp Exp $ +# $NetBSD: mkreadme,v 1.16 2007/05/28 11:07:00 martti Exp $ # # Script for README.html generation # @@ -302,7 +302,7 @@ else exit 1 fi -# this needs to happen here as DISTDIR has not been populated until this +# this needs to happen here as DISTDIR has not been populated until this # stage (see above) if [ "x$pv" = "xdefault" ]; then PVDIR=$DISTDIR diff --git a/mk/wrapper/cmd-sink-hpux-ld b/mk/wrapper/cmd-sink-hpux-ld index 39804938032..51622064029 100644 --- a/mk/wrapper/cmd-sink-hpux-ld +++ b/mk/wrapper/cmd-sink-hpux-ld @@ -1,4 +1,4 @@ -# $NetBSD: cmd-sink-hpux-ld,v 1.5 2007/05/06 10:05:38 tnn Exp $ +# $NetBSD: cmd-sink-hpux-ld,v 1.6 2007/05/28 11:07:00 martti Exp $ # Empty out the command buffer and build up the command line in $cmd. hprunpath= @@ -61,7 +61,7 @@ if $test -n "$hprunpath"; then # the braindead HP-UX ld(1) which needs to relink binaries against libraries # in ${PREFIX} to get run paths correct. # NB: This is not optimal because it exposes the package to possibly unwanted -# libraries. (Ideally this should be done only in the installation phase.) +# libraries. (Ideally this should be done only in the installation phase.) ############################################################################## for dir in $hprunpathdirs do diff --git a/mk/wrapper/transform-ccc-cc b/mk/wrapper/transform-ccc-cc index 2fae5b90e9b..0dbe8b8ec83 100644 --- a/mk/wrapper/transform-ccc-cc +++ b/mk/wrapper/transform-ccc-cc @@ -1,4 +1,4 @@ -# $NetBSD: transform-ccc-cc,v 1.5 2007/04/28 21:32:30 tnn Exp $ +# $NetBSD: transform-ccc-cc,v 1.6 2007/05/28 11:07:01 martti Exp $ # transform_setname "transform-ccc-cc" @@ -10,7 +10,7 @@ case $arg in -[DILlU]?* |\ -O[01] ) transform_pass ;; -# -g3 is required if debugging is wanted while optimizing with -O2. +# -g3 is required if debugging is wanted while optimizing with -O2. -g ) transform_to "-g3" ;; # Directories for the runtime library search path are passed via |