diff options
author | martti <martti> | 2006-12-15 12:46:23 +0000 |
---|---|---|
committer | martti <martti> | 2006-12-15 12:46:23 +0000 |
commit | f800f4a97ec4a0cfe2daf6d06a25d71da0b92317 (patch) | |
tree | 2c399d6a95c0986990ab6070ded1717566864e9e /mk | |
parent | 769a053cda9ef0438c9c30fcada81a95be5d677d (diff) | |
download | pkgsrc-f800f4a97ec4a0cfe2daf6d06a25d71da0b92317.tar.gz |
Remove trailing spaces.
Diffstat (limited to 'mk')
31 files changed, 123 insertions, 123 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7ad9709e2be..7b56a5fb6c7 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1899 2006/11/26 08:37:03 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1900 2006/12/15 12:46:23 martti Exp $ # # This file is in the public domain. # @@ -524,7 +524,7 @@ PKG_FAIL_REASON+= "${PKGNAME} is restricted:" \ PKG_FAIL_REASON+= "${PKGNAME} may not be built, because it utilizes strong cryptography" . endif . endif -. if defined(USE_X11) && (${X11_TYPE} == "native") && !exists(${X11BASE}) +. if defined(USE_X11) && (${X11_TYPE} == "native") && !exists(${X11BASE}) PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found" . endif . if defined(BROKEN) diff --git a/mk/build/test.mk b/mk/build/test.mk index 9ddce04008e..58af9ceaaf0 100644 --- a/mk/build/test.mk +++ b/mk/build/test.mk @@ -1,4 +1,4 @@ -# $NetBSD: test.mk,v 1.8 2006/10/26 21:12:47 rillig Exp $ +# $NetBSD: test.mk,v 1.9 2006/12/15 12:46:23 martti Exp $ # # Package-settable variables: # @@ -30,7 +30,7 @@ TEST_MAKE_FLAGS?= # none TEST_MAKE_CMD= \ ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${TEST_MAKE_FLAGS} \ - -f ${MAKE_FILE} + -f ${MAKE_FILE} ###################################################################### ### test (PUBLIC) diff --git a/mk/buildlink3/PKGVIEWS_UG b/mk/buildlink3/PKGVIEWS_UG index 204a2f3fbcf..5b420a56e0d 100644 --- a/mk/buildlink3/PKGVIEWS_UG +++ b/mk/buildlink3/PKGVIEWS_UG @@ -1,4 +1,4 @@ -$NetBSD: PKGVIEWS_UG,v 1.2 2004/12/01 09:53:01 wiz Exp $ +$NetBSD: PKGVIEWS_UG,v 1.3 2006/12/15 12:46:24 martti Exp $ 0 User's Guide to pkgviews ========================== @@ -73,7 +73,7 @@ config.status: creating config.h ===> Building for digest-20021220 cc -DHAVE_CONFIG_H -I. -I. -DHOST=\"i386--netbsdelf\" -DVERSION=\"20021220\" -O2 -mcpu=pentiumpro -c bits.c -o bits.o ... -cc -O2 -mcpu=pentiumpro -o digest digest.o md5c.o rmd160.o rmd160hl.o sha2.o sha2hl.o md5hl.o sha1.o sha1hl.o +cc -O2 -mcpu=pentiumpro -o digest digest.o md5c.o rmd160.o rmd160hl.o sha2.o sha2hl.o md5hl.o sha1.o sha1hl.o => Fixing buildlink references in files-to-be-installed. ===> Installing for digest-20021220 ===> Becoming root@blossom.hq.williamlam.com to install digest. diff --git a/mk/bulk/build b/mk/bulk/build index 8361cd9e979..83bb233e9f0 100644 --- a/mk/bulk/build +++ b/mk/bulk/build @@ -1,5 +1,5 @@ -#!/bin/sh -# $NetBSD: build,v 1.96 2006/11/27 00:05:22 jschauma Exp $ +#!/bin/sh +# $NetBSD: build,v 1.97 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> diff --git a/mk/bulk/parallel.txt b/mk/bulk/parallel.txt index a716637b51f..301d1c7966b 100644 --- a/mk/bulk/parallel.txt +++ b/mk/bulk/parallel.txt @@ -1,4 +1,4 @@ -# $Id: parallel.txt,v 1.6 2005/12/06 08:25:18 rillig Exp $ +# $Id: parallel.txt,v 1.7 2006/12/15 12:46:24 martti Exp $ # These are my (<dmcmahill>) thoughts on how one would want a parallel @@ -72,7 +72,7 @@ Single Machine Build Comments ==================================================================== There are several features of this approach that are worth mentioning -explicitly. +explicitly. 1) Packages are built in the correct order. We don't want to rebuild the gnome meta-pkg and then rebuild gnome-libs for example. @@ -100,7 +100,7 @@ explicitly. not needed before each build, we reduce the amount of installing and deinstalling needed during the build. For example, it is quite common to build several packages in a row which all need GNU - make or perl. + make or perl. 4) Using the 'supportsfile' to mark all packages which depend upon a package which has just failed to build can greatly reduce the time @@ -123,7 +123,7 @@ master == master machine. This machine is in charge of directing slave#x == slave machine #x. All slave machines are of the same MACHINE_ARCH and have the same operating system and access the same pkgsrc tree via NFS and access the same binary - packages directory. + packages directory. If the master machine is also to be used as a build machine, then it is also considered a slave. diff --git a/mk/bulk/upload b/mk/bulk/upload index 5018ed977ae..e91a6f83177 100644 --- a/mk/bulk/upload +++ b/mk/bulk/upload @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: upload,v 1.35 2006/12/07 23:31:48 rillig Exp $ +# $NetBSD: upload,v 1.36 2006/12/15 12:46:24 martti Exp $ # # Upload non-restricted binary pkgs to ftp server @@ -46,7 +46,7 @@ Example: cd /usr/pkgsrc && $prog Environment Variables: - + AWK -- If specified, sets the awk program to be used Files: diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk index fe52bfbbeaf..ee2f4a13d55 100644 --- a/mk/compiler/ccache.mk +++ b/mk/compiler/ccache.mk @@ -1,4 +1,4 @@ -# $NetBSD: ccache.mk,v 1.28 2006/10/14 08:59:08 rillig Exp $ +# $NetBSD: ccache.mk,v 1.29 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -63,7 +63,7 @@ _USE_CCACHE= NO # LANGUAGES.<compiler> is the list of supported languages by the compiler. # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones # requested by the package in USE_LANGUAGES. -# +# LANGUAGES.ccache= c c++ _LANGUAGES.ccache= # empty .for _lang_ in ${USE_LANGUAGES} diff --git a/mk/compiler/ccc.mk b/mk/compiler/ccc.mk index afd72f0c41b..9f94cdc92c2 100644 --- a/mk/compiler/ccc.mk +++ b/mk/compiler/ccc.mk @@ -1,4 +1,4 @@ -# $NetBSD: ccc.mk,v 1.14 2006/10/22 00:14:17 rillig Exp $ +# $NetBSD: ccc.mk,v 1.15 2006/12/15 12:46:24 martti Exp $ # # This is the compiler definition for the Compaq C Compilers. # @@ -56,7 +56,7 @@ CXXFLAGS+= -ieee # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the # ones requested by the package in USE_LANGUAGES. -# +# _LANGUAGES.ccc= # empty .for _lang_ in ${USE_LANGUAGES} _LANGUAGES.ccc+= ${LANGUAGES.ccc:M${_lang_}} @@ -70,7 +70,7 @@ PREPEND_PATH+= ${_CCC_DIR}/bin # Create compiler driver scripts in ${WRKDIR}. .for _var_ in ${_CCC_VARS} . if !target(${_CCC_${_var_}}) -override-tools: ${_CCC_${_var_}} +override-tools: ${_CCC_${_var_}} ${_CCC_${_var_}}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk index 3ef33edfb14..bb6fe784f04 100644 --- a/mk/compiler/distcc.mk +++ b/mk/compiler/distcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: distcc.mk,v 1.28 2006/07/21 14:27:56 jlam Exp $ +# $NetBSD: distcc.mk,v 1.29 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -52,7 +52,7 @@ _USE_DISTCC= NO # LANGUAGES.<compiler> is the list of supported languages by the compiler. # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones # requested by the package in USE_LANGUAGES. -# +# LANGUAGES.distcc= c c++ _LANGUAGES.distcc= # empty .for _lang_ in ${USE_LANGUAGES} diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk index f0d1138cc7f..0e72f22dd2b 100644 --- a/mk/compiler/f2c.mk +++ b/mk/compiler/f2c.mk @@ -1,4 +1,4 @@ -# $NetBSD: f2c.mk,v 1.7 2006/07/25 10:20:03 rillig Exp $ +# $NetBSD: f2c.mk,v 1.8 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -55,7 +55,7 @@ _USE_F2C= NO # LANGUAGES.<compiler> is the list of supported languages by the compiler. # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones # requested by the package in USE_LANGUAGES. -# +# LANGUAGES.f2c= fortran _LANGUAGES.f2c= # empty .for _lang_ in ${USE_LANGUAGES} diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index bf250baff3d..29c02d974b1 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.87 2006/12/06 16:18:19 joerg Exp $ +# $NetBSD: gcc.mk,v 1.88 2006/12/15 12:46:24 martti Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -146,7 +146,7 @@ _WRAP_EXTRA_ARGS.CC+= -std=gnu99 # This generates a huge number of warnings when building practically all # Objective-C code where it is convention to use "#import". Suppress # the warning if we're building Objective-C code using GCC. -# +# .if !empty(_LANGUAGES.gcc:Mobjc) CFLAGS+= -Wno-import .endif @@ -423,7 +423,7 @@ PREPEND_PATH+= ${_GCC_DIR}/bin GCC_USE_SYMLINKS?= no .for _var_ in ${_GCC_VARS} . if !target(${_GCC_${_var_}}) -override-tools: ${_GCC_${_var_}} +override-tools: ${_GCC_${_var_}} ${_GCC_${_var_}}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} . if !empty(GCC_USE_SYMLINKS:Myes) diff --git a/mk/compiler/icc.mk b/mk/compiler/icc.mk index 76dc357b39d..37ea4a0991c 100644 --- a/mk/compiler/icc.mk +++ b/mk/compiler/icc.mk @@ -1,4 +1,4 @@ -# $NetBSD: icc.mk,v 1.3 2006/10/22 00:14:17 rillig Exp $ +# $NetBSD: icc.mk,v 1.4 2006/12/15 12:46:24 martti Exp $ # # This is the compiler definition for the Intel compilers. # @@ -78,7 +78,7 @@ CONFIGURE_ENV+= ac_cv___attribute__=yes # Create compiler driver scripts in ${WRKDIR}. .for _var_ in ${_ICC_VARS} . if !target(${_ICC_${_var_}}) -override-tools: ${_ICC_${_var_}} +override-tools: ${_ICC_${_var_}} ${_ICC_${_var_}}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/mk/compiler/ido.mk b/mk/compiler/ido.mk index aba8e48907f..fcc32d1f655 100644 --- a/mk/compiler/ido.mk +++ b/mk/compiler/ido.mk @@ -1,4 +1,4 @@ -# $NetBSD: ido.mk,v 1.4 2006/10/22 00:14:17 rillig Exp $ +# $NetBSD: ido.mk,v 1.5 2006/12/15 12:46:24 martti Exp $ # # This is the compiler definition for the SGI IRIS Development Option # cc (IRIX 5). @@ -50,7 +50,7 @@ _COMPILER_RPATH_FLAG= -Wl,${_LINKER_RPATH_FLAG}, # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the # ones requested by the package in USE_LANGUAGES. -# +# _LANGUAGES.ido= # empty .for _lang_ in ${USE_LANGUAGES} _LANGUAGES.ido+= ${LANGUAGES.ido:M${_lang_}} @@ -64,7 +64,7 @@ PREPEND_PATH+= ${_IDO_DIR}/bin # Create compiler driver scripts in ${WRKDIR}. .for _var_ in ${_IDO_VARS} . if !target(${_IDO_${_var_}}) -override-tools: ${_IDO_${_var_}} +override-tools: ${_IDO_${_var_}} ${_IDO_${_var_}}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/mk/compiler/mipspro-ucode.mk b/mk/compiler/mipspro-ucode.mk index ea19dc23016..37f60255df6 100644 --- a/mk/compiler/mipspro-ucode.mk +++ b/mk/compiler/mipspro-ucode.mk @@ -1,10 +1,10 @@ -# $NetBSD: mipspro-ucode.mk,v 1.3 2005/01/12 18:36:38 jlam Exp $ +# $NetBSD: mipspro-ucode.mk,v 1.4 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. # # This code is derived from software contributed to The NetBSD Foundation -# by +# by # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk index be8ba1ef75f..eb4b142a5a6 100644 --- a/mk/compiler/mipspro.mk +++ b/mk/compiler/mipspro.mk @@ -1,4 +1,4 @@ -# $NetBSD: mipspro.mk,v 1.36 2006/12/02 22:32:59 jschauma Exp $ +# $NetBSD: mipspro.mk,v 1.37 2006/12/15 12:46:24 martti Exp $ # # This is the compiler definition for the MIPSpro C compiler. # @@ -65,7 +65,7 @@ _COMPILER_ABI_FLAG.64= -64 # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the # ones requested by the package in USE_LANGUAGES. -# +# _LANGUAGES.mipspro= # empty .for _lang_ in ${USE_LANGUAGES} _LANGUAGES.mipspro+= ${LANGUAGES.mipspro:M${_lang_}} @@ -83,7 +83,7 @@ PREPEND_PATH+= ${_MIPSPRO_DIR}/bin # Create compiler driver scripts in ${WRKDIR}. .for _var_ in ${_MIPSPRO_VARS} . if !target(${_MIPSPRO_${_var_}}) -override-tools: ${_MIPSPRO_${_var_}} +override-tools: ${_MIPSPRO_${_var_}} ${_MIPSPRO_${_var_}}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk index ac6e571d2cf..153ba0e68a8 100644 --- a/mk/compiler/sunpro.mk +++ b/mk/compiler/sunpro.mk @@ -1,4 +1,4 @@ -# $NetBSD: sunpro.mk,v 1.35 2006/10/22 00:14:17 rillig Exp $ +# $NetBSD: sunpro.mk,v 1.36 2006/12/15 12:46:24 martti Exp $ # # This is the compiler definition for the SUNWspro C compiler. # @@ -79,7 +79,7 @@ PREPEND_PATH+= ${_SUNPRO_DIR}/bin # Create compiler driver scripts in ${WRKDIR}. .for _var_ in ${_SUNPRO_VARS} . if !target(${_SUNPRO_${_var_}}) -override-tools: ${_SUNPRO_${_var_}} +override-tools: ${_SUNPRO_${_var_}} ${_SUNPRO_${_var_}}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/mk/compiler/xlc.mk b/mk/compiler/xlc.mk index 4cae9ac59b7..db454ba10b4 100644 --- a/mk/compiler/xlc.mk +++ b/mk/compiler/xlc.mk @@ -1,4 +1,4 @@ -# $NetBSD: xlc.mk,v 1.13 2006/10/22 00:14:17 rillig Exp $ +# $NetBSD: xlc.mk,v 1.14 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -102,7 +102,7 @@ PREPEND_PATH+= ${_XLC_DIR}/bin # Create compiler driver scripts in ${WRKDIR}. .for _var_ in ${_XLC_VARS} . if !target(${_XLC_${_var_}}) -override-tools: ${_XLC_${_var_}} +override-tools: ${_XLC_${_var_}} ${_XLC_${_var_}}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 3fde9f460a3..fb2947bd97d 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.137 2006/11/29 10:11:53 ghen Exp $ +# $NetBSD: mk.conf,v 1.138 2006/12/15 12:46:24 martti Exp $ # # This file provides default values for variables that may be overridden @@ -266,7 +266,7 @@ DISTDIR?= ${PKGSRCDIR}/distfiles # ${DISTFILES} and ${PATCHFILES}. If the requested file is not in any # of the directories in ${DIST_PATH}, it will be downloaded into # ${DISTDIR}. If the requested file is in one of the directories in -# ${DIST_PATH}, a symbolic link will be made to it from ${DISTDIR}. +# ${DIST_PATH}, a symbolic link will be made to it from ${DISTDIR}. # ${DIST_PATH} directories will will be searched before ${DISTDIR}, # letting a CD hold the main distfiles archive, and local ${DISTDIR} # hold any updated distfiles, for example. @@ -330,7 +330,7 @@ PKGVULNDIR?= ${DISTDIR} # Default: /usr/pkgsrc/distfiles #PASSIVE_FETCH= -# Use ftp(1) in passive mode, for use behind filtering firewalls. +# Use ftp(1) in passive mode, for use behind filtering firewalls. # (Set by default in ftp(1) in NetBSD-current) # Possible: defined, not defined # Default: not defined @@ -373,7 +373,7 @@ PATCH_FUZZ_FACTOR?= -F0 # Default: not set #HOST_SPECIFIC_PKGS= -# List of packages that are wanted for this particular host/machine. +# List of packages that are wanted for this particular host/machine. # Each package in the list is of the form <category>/<package>. # Possible: any combination of packages # Default: not set @@ -403,13 +403,13 @@ EXTRACT_USING?= nbtar # Default: not defined #MASTER_SORT= .ac.at .at .de .ch .se .fi .no -# Whitespace delimited list of preferred download locations. +# Whitespace delimited list of preferred download locations. # MASTER_SITES and PATCH_SITES will be reordered according to the hosts' # address last components. # Possible: list of domain name suffixes # Default: none -#MASTER_SORT_REGEX= ftp://.*/ +#MASTER_SORT_REGEX= ftp://.*/ # Same as MASTER_SORT, but takes a regular expression for more # flexibility in matching. Regexps defined here have higher priority # than MASTER_SORT. This example would prefer ftp transfers over @@ -489,7 +489,7 @@ SU_CMD?= ${ROOT_CMD} # Default: dependent on operating system. For NetBSD: ${SU} - root -c SU_CMD_PATH_APPEND?=/sbin:/usr/sbin -# Additional directories (in a colon separated list) to be added to the +# Additional directories (in a colon separated list) to be added to the # PATH environment variable when running ${SU_CMD}. # Default: /sbin:/usr/sbin @@ -503,11 +503,11 @@ FATAL_OBJECT_FMT_SKEW?=yes WARN_NO_OBJECT_FMT?=yes # Packages installed on a machine before OBJECT_FMT was added to the -# BUILD_DEFS definitions (on 29th September 1999) cannot say which -# object format they are in. This will cause a warning to be displayed. +# BUILD_DEFS definitions (on 29th September 1999) cannot say which +# object format they are in. This will cause a warning to be displayed. # Set this to "no" to stop the warning message being shown. # Possible: yes, no -# Default: yes +# Default: yes #SMART_MESSAGES=yes # Display the make(1) target, and the current stack of packages being built, @@ -556,12 +556,12 @@ AMANDA_USER?= backup AMANDA_TMP?= /tmp/amanda # Specifies the directory in which amanda puts its debug and temporary -# files. +# files. # Default: /tmp/amanda AMANDA_VAR?= ${VARBASE}/amanda # Specifies the directory in which amanda puts its logs and status -# files. +# files. # Default: ${VARBASE}/amanda #APACHE_CUSTOM_CFLAGS= @@ -721,7 +721,7 @@ DEFANG_SPOOLDIR?= ${VARBASE}/spool/MIMEDefang # Default: ${VARBASE}/spool/MIMEDefang #DEFAULT_IRC_SERVER= -# Used in ircII to set the default irc server. +# Used in ircII to set the default irc server. # Possible: see the list at # http://www.irchelp.org/irchelp/networks/servers/efnet.html # Default: not defined @@ -737,7 +737,7 @@ DIALER_GROUP?= dialer # xisp binaries. Also the modem device and pppd and chat should # have access permissions by this group. # Possible: dialer, dip, uucp, root, dialout, or any other group. -# Default: dialer +# Default: dialer DT_LAYOUT?= US # Used by dt package to specify the keyboard layout. @@ -935,7 +935,7 @@ IMAP_UW_CCLIENT_MBOX_FMT?= unix IMDICTDIR?= ${VARBASE}/dict # Specify the directory for input method's dictionary installation. # Possible: any valid location -# Default: ${VARBASE}/dict +# Default: ${VARBASE}/dict INN_DATA_DIR?= ${VARBASE}/news # Used by inn to specify the data directory. @@ -943,8 +943,8 @@ INN_DATA_DIR?= ${VARBASE}/news # Default: ${VARBASE}/news INN_USER?= news -# Used by inn to specify the username -# Possible: any valid username +# Used by inn to specify the username +# Possible: any valid username # Default: news INN_GROUP?= news @@ -980,7 +980,7 @@ IRCD_HYBRID_SYSLOG_FACILITY?= LOG_LOCAL4 # Used by ircd-hybrid. Sets the maximum number of connections the ircd # can support. Note that this also twiddles the HARD_FDLIMIT. # This value is typically automagically set by ./configure -# Possible: any valid number +# Possible: any valid number # Default: not defined IRCD_HYBRID_IRC_USER?= irc @@ -1073,7 +1073,7 @@ JAKARTA_HOME?= ${JAVA_HOME}/jakarta #JAVA_HOME= # Location of jvm to be used by pkgsrc. Java-based packages will be installed # in ${LOCALBASE}/lib/java, so that they are available to all jvms. -# +# # Possible: any directory # Default: home of JVM chosen by ${PKG_JVM} @@ -1094,7 +1094,7 @@ JSDK_HOME?= ${JAVA_HOME}/jsdk # Default: not defined #KERMIT_SUID_UUCP -# If set to YES or yes, install kermit binary set-uid uucp. Permits an +# If set to YES or yes, install kermit binary set-uid uucp. Permits an # unprivileged user to access the serial ports, with default permissions # on the /dev/tty0* special files. # Possible: YES, yes, not defined @@ -1153,8 +1153,8 @@ LEAFNODE_DATA_DIR?= ${VARBASE}/news # Note: default is the same as INN_DATA_DIR LEAFNODE_USER?= news -# Used by leafnode to specify the username -# Possible: any valid username +# Used by leafnode to specify the username +# Possible: any valid username # Default: news # Note: default is the same as INN_USER @@ -1290,7 +1290,7 @@ MTOOLS_ENABLE_FLOPPYD?= NO #MYSQL_DATADIR?= ${VARBASE}/mysql # Home directory of the mysql administrator and location of the -# database files. +# database files. # Possible: any directory # Default: ${VARBASE}/mysql @@ -1334,13 +1334,13 @@ NMH_PAGER?= more # Default: not defined #NS_USE_BSDI= YES -# Used to decide if i386 BSDi Netscape binary should be used in preference +# Used to decide if i386 BSDi Netscape binary should be used in preference # to linux version. # Possible: not defined, YES # Default: not defined #NS_USE_SUNOS= YES -# Used to decide if sparc SunOS-4.1 Netscape binary should be used in preference +# Used to decide if sparc SunOS-4.1 Netscape binary should be used in preference # to the Solaris-2.5.1 version. # Possible: not defined, YES # Default: not defined @@ -1594,7 +1594,7 @@ SILC_CLIENT_WITH_PERL?= YES #SPOP3D_ENABLE_STANDALONE= yes # Build mail/solid-pop3d to run standalone instead of via inetd. # Possible: undefined, defined -# Default: undefined +# Default: undefined #SPOP3D_ENABLE_ALIASES= yes # Build mail/solid-pop3d with support for user names mapping and non-IP @@ -1782,9 +1782,9 @@ XEN12_USE_COM2?= NO # http://public.planetmirror.com.au/pub/perl/cpan/modules/by-module/ #MASTER_SITE_OPENOFFICE=http://openoffice.mirrors.ilisys.com.au/ \ # http://mirror.pacific.net.au/openoffice/ \ -# http://planetmirror.com/pub/openoffice/ +# http://planetmirror.com/pub/openoffice/ #MASTER_SITE_SUNSITE= http://public.planetmirror.com.au/pub/sunsite/ -#MASTER_SITE_SUSE= http://public.planetmirror.com.au/pub/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ +#MASTER_SITE_SUSE= http://public.planetmirror.com.au/pub/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ #MASTER_SITE_TEX_CTAN= http://public.planetmirror.com.au/pub/tex-archive/ #MASTER_SITE_SOURCEFORGE=http://optusnet.dl.sourceforge.net/sourceforge/ \ # http://public.planetmirror.com.au/pub/sourceforge/ diff --git a/mk/pkginstall/dirs b/mk/pkginstall/dirs index 665dbaf4767..b4b2416029a 100644 --- a/mk/pkginstall/dirs +++ b/mk/pkginstall/dirs @@ -1,4 +1,4 @@ -# $NetBSD: dirs,v 1.2 2006/07/19 22:26:26 jlam Exp $ +# $NetBSD: dirs,v 1.3 2006/12/15 12:46:24 martti Exp $ # # Generate a +DIRS script that reference counts directories that are # required for the proper functioning of the package. @@ -170,7 +170,7 @@ REMOVE) ${TEST} -f "$preexist" || { case $d_flags:$_PKG_CONFIG in *f*:*|*:yes) - ${RMDIR} -p $dir 2>/dev/null || ${TRUE}; + ${RMDIR} -p $dir 2>/dev/null || ${TRUE}; ;; esac; } ${RM} -f $perms $preexist $token $token.tmp.* diff --git a/mk/pkginstall/usergroup-check b/mk/pkginstall/usergroup-check index 8561cabcf97..618cc86affc 100755 --- a/mk/pkginstall/usergroup-check +++ b/mk/pkginstall/usergroup-check @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: usergroup-check,v 1.1 2006/05/21 23:50:15 jlam Exp $ +# $NetBSD: usergroup-check,v 1.2 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -40,7 +40,7 @@ ###################################################################### # # NAME -# usergroup-check -- verify that users/groups match numeric IDs +# usergroup-check -- verify that users/groups match numeric IDs # # SYNOPSIS # usergroup-check -g [group_entry ...] diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk index 760891c65f5..4b1cfba7601 100644 --- a/mk/platform/OSF1.mk +++ b/mk/platform/OSF1.mk @@ -1,4 +1,4 @@ -# $NetBSD: OSF1.mk,v 1.13 2006/07/20 20:02:23 jlam Exp $ +# $NetBSD: OSF1.mk,v 1.14 2006/12/15 12:46:24 martti Exp $ # # Variable definitions for the OSF1 operating system. @@ -59,7 +59,7 @@ _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages _OPSYS_HAS_OSSAUDIO= no # libossaudio is available _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads -_OPSYS_RPATH_NAME= -rpath, # name of symbol in rpath directive to linker +_OPSYS_RPATH_NAME= -rpath, # name of symbol in rpath directive to linker _OPSYS_SHLIB_TYPE= COFF # type of shared lib _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix diff --git a/mk/scripts/binpkg-cache b/mk/scripts/binpkg-cache index c20ea5ffeec..07951797b2f 100755 --- a/mk/scripts/binpkg-cache +++ b/mk/scripts/binpkg-cache @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: binpkg-cache,v 1.13 2006/07/28 20:52:35 dmcmahill Exp $ +# $NetBSD: binpkg-cache,v 1.14 2006/12/15 12:46:24 martti Exp $ # # Script for generating a cache file with information about # all binary packages contained in a directory. @@ -209,7 +209,7 @@ process_binpkg_dir(){ fi fi - if test "${build_summary}" = "yes" -a ! -f ${d}/${summaryfile}.gz ; then + if test "${build_summary}" = "yes" -a ! -f ${d}/${summaryfile}.gz ; then echo "${tab}Summary file ${d}/${summaryfile}.gz is missing and will be created." need_update=yes fi @@ -219,10 +219,10 @@ process_binpkg_dir(){ fi # FIX_ME - # We should use stale_entries in a way where we only update the + # We should use stale_entries in a way where we only update the # cache file entries corresponding to these if we're rebuilding # due to stale entries. That should save a good bit of time. - # + # if test "X${need_update}" = "Xyes" ; then echo "pkgcache_version ${cacheversion}" > ${tmpd}/${cachefile} rm -f ${tmpd}/${summaryfile} @@ -373,7 +373,7 @@ do clean_and_exit1 ;; - *) + *) break ;; @@ -391,7 +391,7 @@ if test ! -d ${PACKAGES} ; then clean_and_exit2 fi -# put a trailing / after ${PACKAGES} in case ${PACKAGES} is +# put a trailing / after ${PACKAGES} in case ${PACKAGES} is # a link. # pass 1, we find all directories under PACKAGES. Note that this diff --git a/mk/scripts/binpkg-scan b/mk/scripts/binpkg-scan index 8cbd18c0e00..db8c0a31b10 100755 --- a/mk/scripts/binpkg-scan +++ b/mk/scripts/binpkg-scan @@ -1,5 +1,5 @@ #!/usr/bin/awk -f -# $NetBSD: binpkg-scan,v 1.1 2006/07/01 11:11:21 dmcmahill Exp $: genreadme.awk,v 1.22 2006/04/15 15:00:24 salo Exp $ +# $NetBSD: binpkg-scan,v 1.2 2006/12/15 12:46:24 martti Exp $: genreadme.awk,v 1.22 2006/04/15 15:00:24 salo Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -47,7 +47,7 @@ # Global variables #----------------- -# +# # notify - if set to 1, something will be set in the output script to make it # easy to detect and an automatic email can be sent to notify a person # that some cleanup is required. diff --git a/mk/scripts/chkdatabase.awk b/mk/scripts/chkdatabase.awk index c751f9201bc..18be58c3f3d 100755 --- a/mk/scripts/chkdatabase.awk +++ b/mk/scripts/chkdatabase.awk @@ -1,6 +1,6 @@ #!/usr/bin/awk -f # -# $NetBSD: chkdatabase.awk,v 1.2 2003/05/06 17:42:04 jmmv Exp $ +# $NetBSD: chkdatabase.awk,v 1.3 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. # All rights reserved. @@ -60,10 +60,10 @@ BEGIN { #build_depends /usr/pkgsrc/math/scilab libtool-base>=1.4.20010614nb9:../../devel/libtool-base # pkg = $2; - + # mark this package as having its depencencies listed depended_pkgs[pkg] = 1; - + # now go through the dependency lists and pull out all pkg directories that # we will need to examine to ensure they have been depended. for(i=3; i<=NF; i++) { @@ -82,10 +82,10 @@ BEGIN { printf("\tpkgpat = %s\n",pkgpat) > "/dev/stderr"; printf("\tpkgdir = %s\n",pkgdir) > "/dev/stderr"; } - + # mark this package directory as being one which is depended upon depended_on_pkgs[pkgdir] = 1; - + } next; } @@ -103,13 +103,13 @@ END { i++; } } - + i=0; while(i in not_depended) { printf("%s\n",not_depended[i]); i++; } close("/dev/stderr"); - + exit(0); } diff --git a/mk/scripts/genindex.awk b/mk/scripts/genindex.awk index 0e109955939..13f822a1943 100755 --- a/mk/scripts/genindex.awk +++ b/mk/scripts/genindex.awk @@ -1,5 +1,5 @@ #!/usr/bin/awk -f -# $NetBSD: genindex.awk,v 1.4 2003/09/02 07:00:08 jlam Exp $ +# $NetBSD: genindex.awk,v 1.5 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. # All rights reserved. @@ -48,7 +48,7 @@ # # alldepends[] : index=pkgdir (math/scilab) # Flattened dependency list by name. -# +# # @@ -240,7 +240,7 @@ END { printf("Generating INDEX file\n"); -# Output format: +# Output format: # package-name|package-path|installation-prefix|comment| \ # description-file|maintainer|categories|build deps|run deps|for arch| \ # not for opsys|homepage @@ -298,7 +298,7 @@ function find_all_depends(pkg, type, pkgreg, i, deps, depdir, topdep){ pkg, topdep, alldepends[pkg]); return(alldepends[pkg]); } - + # recursively gather depends that each of the depends has pkgreg = reg2str(pkg); split(topdep, deps); @@ -368,10 +368,10 @@ function fulldir2pkgdir(d, i){ # take the depends lists and uniq them. # function uniq(list, deps, i, ulist){ - + # split out the depends split(list, deps); - + i = 1; ulist = " "; while (i in deps){ diff --git a/mk/scripts/genreadme.awk b/mk/scripts/genreadme.awk index edf21c58adb..bb1fa43f960 100755 --- a/mk/scripts/genreadme.awk +++ b/mk/scripts/genreadme.awk @@ -1,5 +1,5 @@ #!/usr/bin/awk -f -# $NetBSD: genreadme.awk,v 1.23 2006/07/28 02:41:07 dmcmahill Exp $ +# $NetBSD: genreadme.awk,v 1.24 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2002, 2003, 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -48,7 +48,7 @@ # # alldepends[] : index=pkgdir (math/scilab) # Flattened dependency list by name. -# +# BEGIN { do_pkg_readme=1; # set to 1 to use "README-new.html" as the name @@ -349,9 +349,9 @@ END { # pat2dir[dpkgs[i]], # readme_name, nm); # We use a temp file to hold the html dependencies because for -# packages like gnome, this list can get very very large and +# packages like gnome, this list can get very very large and # become larger than what some awk implementations can deal -# with. The nawk shipped with solaris 9 is an example of +# with. The nawk shipped with solaris 9 is an example of # such a limited awk. printf("%s<a href=\"../../%s/%s\">%s</a>\n", htmldeps, @@ -519,9 +519,9 @@ END { # pkgdir2name[dir], # comment[dir]); # We use a temp file to hold the list of all packages because -# this list can get very very large and +# this list can get very very large and # become larger than what some awk implementations can deal -# with. The nawk shipped with solaris 9 is an example of +# with. The nawk shipped with solaris 9 is an example of # such a limited awk. printf("<TR><TD VALIGN=TOP><a href=\"%s/%s\">%s</a>: %s<TD>\n", pkg, readme_name, @@ -566,7 +566,7 @@ END { close(readme); close(templatefile); copy_readme(readmenew, readme); - + gsub(/href=\"/, "href=\""category"/", pkgs); allcat = sprintf("%s<TR><TD VALIGN=TOP><a href=\"%s/%s\">%s</a>: %s<TD>\n", allcat, category, readme_name, @@ -657,7 +657,7 @@ function find_all_depends(pkg, type, pkgreg, i, deps, depdir, topdep){ pkg, topdep, alldepends[pkg]); return(alldepends[pkg]); } - + # recursively gather depends that each of the depends has pkgreg = reg2str(pkg); split(topdep, deps); @@ -746,10 +746,10 @@ function fulldir2pkgdir(d, i){ # take the depends lists and uniq them. # function uniq(list, deps, i, ulist){ - + # split out the depends split(list, deps); - + i = 1; ulist = " "; while (i in deps){ diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme index 92fffa77eae..e6381abad11 100755 --- a/mk/scripts/mkreadme +++ b/mk/scripts/mkreadme @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkreadme,v 1.11 2006/07/28 02:41:07 dmcmahill Exp $ +# $NetBSD: mkreadme,v 1.12 2006/12/15 12:46:24 martti Exp $ # # Script for README.html generation # @@ -210,7 +210,7 @@ do clean_and_exit ;; - *) + *) break ;; @@ -259,7 +259,7 @@ echo " " if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then cd ${PKGSRCDIR}/pkgtools/prereq-readme eval "`${BMAKE} show-tools`" - for v in AWK CMP ECHO EXPR FGREP FIND GREP GZIP_CMD SED SETENV SORT + for v in AWK CMP ECHO EXPR FGREP FIND GREP GZIP_CMD SED SETENV SORT do eval "echo '---->' ${v}=\"\${${v}}\"" done @@ -274,7 +274,7 @@ echo " " if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then cd ${PKGSRCDIR}/pkgtools/prereq-readme for v in CDROM_PKG_URL_HOST CDROM_PKG_URL_DIR DISTDIR \ - FTP_PKG_URL_HOST FTP_PKG_URL_DIR PACKAGES PKG_INFO PKG_SUFX + FTP_PKG_URL_HOST FTP_PKG_URL_DIR PACKAGES PKG_INFO PKG_SUFX do val=`${BMAKE} show-var VARNAME=${v}` if [ $? != 0 ]; then diff --git a/mk/tools/bootstrap.mk b/mk/tools/bootstrap.mk index 0e100c5986f..87fefd54aa0 100644 --- a/mk/tools/bootstrap.mk +++ b/mk/tools/bootstrap.mk @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.7 2005/10/09 20:19:26 heinz Exp $ +# $NetBSD: bootstrap.mk,v 1.8 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -45,7 +45,7 @@ # XXX This file should go away and the bootstrap script should be # XXX taught to write out the correct TOOLS_PLATFORM.* definitions # XXX on its own, based on the configuration used. -# +# .if ${OPSYS} == "AIX" TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk index 2d81b4e63af..8fc9515933b 100644 --- a/mk/tools/bsd.tools.mk +++ b/mk/tools/bsd.tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.tools.mk,v 1.45 2006/07/25 18:04:25 jlam Exp $ +# $NetBSD: bsd.tools.mk,v 1.46 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -77,7 +77,7 @@ tools: ${_TOOLS_TARGETS} . else tools: barrier . endif -.endif +.endif .PHONY: acquire-tools-lock release-tools-lock acquire-tools-lock: acquire-lock diff --git a/mk/wrapper/arg-source b/mk/wrapper/arg-source index 09ace3c732d..0637b81d600 100644 --- a/mk/wrapper/arg-source +++ b/mk/wrapper/arg-source @@ -1,4 +1,4 @@ -# $NetBSD: arg-source,v 1.8 2006/09/17 22:52:45 rillig Exp $ +# $NetBSD: arg-source,v 1.9 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -63,12 +63,12 @@ while $test $# -gt 0; do # Same for -R and -Wl,-rpath and -Wl,-rpath-link. ############################################################## -R*:*|-Wl,-R*:*|\ - -Wl,-rpath,*:*|-Wl,-rpath-link,*:*|-Wl,--rpath,*:*) - case $arg in + -Wl,-rpath,*:*|-Wl,-rpath-link,*:*|-Wl,--rpath,*:*) + case $arg in -R*) R="-R" ;; -Wl,-R*) R="-Wl,-R" ;; - -Wl,-rpath,*) R="-Wl,-rpath," ;; - -Wl,-rpath-link,*) R="-Wl,-rpath-link," ;; + -Wl,-rpath,*) R="-Wl,-rpath," ;; + -Wl,-rpath-link,*) R="-Wl,-rpath-link," ;; -Wl,--rpath,*) R="-Wl,--rpath," ;; esac list="${arg#$R}" @@ -88,10 +88,10 @@ while $test $# -gt 0; do ############################################################## -Wl,-R|-Wl,-rpath|-Wl,-rpath-link|-Wl,--rpath) nextarg="$1"; shift - case $arg in + case $arg in -Wl,-R) R="-Wl,-R" ;; - -Wl,-rpath) R="-Wl,-rpath," ;; - -Wl,-rpath-link) R="-Wl,-rpath-link," ;; + -Wl,-rpath) R="-Wl,-rpath," ;; + -Wl,-rpath-link) R="-Wl,-rpath-link," ;; -Wl,--rpath) R="-Wl,--rpath," ;; esac nextarg="${nextarg#-Wl,}" diff --git a/mk/wrapper/wrapper.sh b/mk/wrapper/wrapper.sh index ca7708b1938..d638eed8c5f 100644 --- a/mk/wrapper/wrapper.sh +++ b/mk/wrapper/wrapper.sh @@ -1,6 +1,6 @@ #! @WRAPPER_SHELL@ # -# $NetBSD: wrapper.sh,v 1.11 2006/12/14 22:25:19 dmcmahill Exp $ +# $NetBSD: wrapper.sh,v 1.12 2006/12/15 12:46:24 martti Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -57,7 +57,7 @@ wrapperlog="${WRAPPER_LOG-@_WRAP_LOG@}" skip_transform="${WRAPPER_SKIP_TRANSFORM-@_WRAP_SKIP_TRANSFORM@}" debug="${WRAPPER_DEBUG-@WRAPPER_DEBUG@}" -cat="@CAT@" +cat="@CAT@" echo="@ECHO@" expr="@EXPR@" mv="@MV@" |