From bd986edbc7589ee68fff8e2354ef7cb37ad88aa3 Mon Sep 17 00:00:00 2001 From: martti Date: Tue, 9 Oct 2007 19:19:08 +0000 Subject: Remove trailing spaces. --- audio/gst-plugins0.10-a52/DESCR | 4 ++-- audio/gst-plugins0.10-dts/DESCR | 4 ++-- audio/gst-plugins0.10-sid/DESCR | 4 ++-- bootstrap/README | 4 ++-- bootstrap/README.OpenBSD | 6 +++--- bootstrap/mkbinarykit | 6 +++--- cad/pcb/Makefile | 4 ++-- devel/bmake/import-bmake-sh | 4 ++-- devel/cogito/Makefile | 6 +++--- devel/nss/Makefile | 4 ++-- devel/p5-Path-Class/Makefile | 4 ++-- devel/tla/Makefile | 4 ++-- emulators/compat16/Makefile | 4 ++-- emulators/compat20/Makefile | 4 ++-- emulators/compat30/Makefile | 4 ++-- emulators/xmame/Makefile | 4 ++-- filesystems/fuse-unionfs/DESCR | 2 +- lang/gcc34-ada/README | 2 +- lang/gcc34/README | 6 +++--- lang/guile/Makefile | 8 ++++---- lang/php/pear_plist.php | 4 ++-- lang/php5/MESSAGE | 6 +++--- mail/sqwebmail/INSTALL | 4 ++-- mail/thunderbird-bin-nightly/Makefile.linux-i386 | 4 ++-- mk/bsd.pkg.mk | 4 ++-- mk/bsd.pkg.readme.mk | 6 +++--- mk/bulk/sort-packages | 4 ++-- mk/bulk/upload | 10 +++++----- mk/checksum/checksum.mk | 4 ++-- mk/defaults/mk.conf | 4 ++-- mk/emulator/emulator.mk | 4 ++-- mk/emulator/pkg-rpm.mk | 6 +++--- mk/scripts/mkreadme | 4 ++-- mk/wrapper/cmd-sink-cross-gcc | 4 ++-- mk/x11.buildlink3.mk | 4 ++-- net/gofish/Makefile | 4 ++-- net/php5-soap/MESSAGE | 4 ++-- net/solaris-tap/DEINSTALL | 4 ++-- net/vpnc/DESCR | 2 +- net/xipdump/Makefile | 4 ++-- news/leafnode/DEINSTALL | 8 ++++---- pkgtools/pkg_install/MESSAGE | 4 ++-- print/teTeX3-bin/INSTALL | 6 +++--- print/tex-hugelatex/INSTALL | 4 ++-- security/qca/buildlink3.mk | 4 ++-- sysutils/apcupsd/Makefile | 4 ++-- sysutils/xenkernel3/Makefile | 4 ++-- templates/README.all | 4 ++-- templates/README.ipv6 | 6 +++--- templates/README.pkg | 8 ++++---- templates/README.top | 4 ++-- textproc/hunspell/Makefile | 4 ++-- textproc/p5-YAML-Syck/Makefile | 4 ++-- time/p5-DateTime-Event-ICal/DESCR | 2 +- time/xalarm/MESSAGE | 4 ++-- wm/olvwm/Makefile | 4 ++-- www/firefox-bin/Makefile.solaris-sparc | 4 ++-- www/firefox15-bin/Makefile.solaris-sparc | 4 ++-- www/p5-Kwiki-Archive-Cvs/DESCR | 2 +- www/py-swish-e/DESCR | 2 +- x11/lbxproxy/DESCR | 2 +- x11/xf86-video-via/Makefile | 4 ++-- x11/xterm/INSTALL.openwin | 4 ++-- 63 files changed, 137 insertions(+), 137 deletions(-) diff --git a/audio/gst-plugins0.10-a52/DESCR b/audio/gst-plugins0.10-a52/DESCR index 6bafc912d3e..3fa04063507 100644 --- a/audio/gst-plugins0.10-a52/DESCR +++ b/audio/gst-plugins0.10-a52/DESCR @@ -1,10 +1,10 @@ GStreamer is a library that allows the construction of graphs of media-handling components, ranging from simple Ogg/Vorbis playback to -complex audio (mixing) and video (non-linear editing) processing. +complex audio (mixing) and video (non-linear editing) processing. Applications can take advantage of advances in codec and filter technology transparently. Developers can add new codecs and filters by writing a -simple plugin with a clean, generic interface. +simple plugin with a clean, generic interface. GStreamer is released under the LGPL. diff --git a/audio/gst-plugins0.10-dts/DESCR b/audio/gst-plugins0.10-dts/DESCR index 54d62106a83..94463e29211 100644 --- a/audio/gst-plugins0.10-dts/DESCR +++ b/audio/gst-plugins0.10-dts/DESCR @@ -1,10 +1,10 @@ GStreamer is a library that allows the construction of graphs of media-handling components, ranging from simple Ogg/Vorbis playback to -complex audio (mixing) and video (non-linear editing) processing. +complex audio (mixing) and video (non-linear editing) processing. Applications can take advantage of advances in codec and filter technology transparently. Developers can add new codecs and filters by writing a -simple plugin with a clean, generic interface. +simple plugin with a clean, generic interface. GStreamer is released under the LGPL. diff --git a/audio/gst-plugins0.10-sid/DESCR b/audio/gst-plugins0.10-sid/DESCR index fca26cdadac..25e98bb2667 100644 --- a/audio/gst-plugins0.10-sid/DESCR +++ b/audio/gst-plugins0.10-sid/DESCR @@ -1,10 +1,10 @@ GStreamer is a library that allows the construction of graphs of media-handling components, ranging from simple Ogg/Vorbis playback to -complex audio (mixing) and video (non-linear editing) processing. +complex audio (mixing) and video (non-linear editing) processing. Applications can take advantage of advances in codec and filter technology transparently. Developers can add new codecs and filters by writing a -simple plugin with a clean, generic interface. +simple plugin with a clean, generic interface. GStreamer is released under the LGPL. diff --git a/bootstrap/README b/bootstrap/README index dd22487b708..5bf9426d78b 100644 --- a/bootstrap/README +++ b/bootstrap/README @@ -1,9 +1,9 @@ -$NetBSD: README,v 1.9 2007/07/02 19:05:29 tnn Exp $ +$NetBSD: README,v 1.10 2007/10/09 19:19:08 martti Exp $ To try to get pkgsrc working on your system, please try the following as root: -# ./bootstrap +# ./bootstrap [ --workdir ] [ --prefix ] [ --pkgdbdir ] diff --git a/bootstrap/README.OpenBSD b/bootstrap/README.OpenBSD index 0a1c9c70aee..f6e615792e1 100644 --- a/bootstrap/README.OpenBSD +++ b/bootstrap/README.OpenBSD @@ -1,4 +1,4 @@ -$NetBSD: README.OpenBSD,v 1.2 2004/07/31 04:07:03 xtraeme Exp $ +$NetBSD: README.OpenBSD,v 1.3 2007/10/09 19:19:08 martti Exp $ Please read the general README file as well. @@ -18,8 +18,8 @@ good idea to move them out of the way to avoid confusion, e.g.: mv pkg_info pkg_info.orig 3. An example /etc/mk.conf file will be placed in mk.conf.example file -when you use the bootstrap script. OpenBSD's make program uses /etc/mk.conf -as well. You can work around this by enclosing all the pkgsrc specific parts +when you use the bootstrap script. OpenBSD's make program uses /etc/mk.conf +as well. You can work around this by enclosing all the pkgsrc specific parts of the mk.conf file with: .ifdef BSD_PKG_MK diff --git a/bootstrap/mkbinarykit b/bootstrap/mkbinarykit index 45a6bb8e389..2e4567dbb84 100755 --- a/bootstrap/mkbinarykit +++ b/bootstrap/mkbinarykit @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: mkbinarykit,v 1.25 2007/08/01 14:03:49 joerg Exp $ +# $NetBSD: mkbinarykit,v 1.26 2007/10/09 19:19:08 martti Exp $ # # Make a binary bootstrap kit and place it in targetdir (or current # working directory if not specified). The mk.conf.example file is @@ -35,7 +35,7 @@ mkbinarykit_tar() { # in case tar was built by bootstrap PATH="$prefix/bin:$PATH"; export PATH - [ ! -d $sysconfdir ] && mkdir -p $sysconfdir + [ ! -d $sysconfdir ] && mkdir -p $sysconfdir cp ${wrkdir}/mk.conf.example $mkfile && \ cd / && \ tar -hcf "$targetdir/bootstrap-pkgsrc-$opsys-$osrev-$ospro-$date.tar" \ @@ -73,7 +73,7 @@ fetch_cmd="" targetdir=`pwd` wrkdir=`pwd`/work # default: relative to pkgsrc/bootstrap -sedprog="sed" +sedprog="sed" case "$opsys" in AIX) diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index 55cbcef48f0..c3a7b6ad338 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2007/09/13 02:24:51 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.41 2007/10/09 19:19:08 martti Exp $ # DISTNAME= pcb-20070912 @@ -16,7 +16,7 @@ CONFLICTS+= pcb-current-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ENV+= WISH=${TOOLS_PATH.wish} # work around a problem where the configure script uses -# AM_PROG_LEX and follows it with an AC_PATH_PROG to try +# AM_PROG_LEX and follows it with an AC_PATH_PROG to try # and make sure that lex really does exist. Unfortunately # that test is thrown off by pkgsrc giving a full path for LEX. # so, bypass the test and put our desired result directly into the diff --git a/devel/bmake/import-bmake-sh b/devel/bmake/import-bmake-sh index 1e03866d94c..dd28be72fe5 100755 --- a/devel/bmake/import-bmake-sh +++ b/devel/bmake/import-bmake-sh @@ -1,8 +1,8 @@ : -# $Id: import-bmake-sh,v 1.1 2005/12/02 00:14:56 sjg Exp $ +# $Id: import-bmake-sh,v 1.2 2007/10/09 19:19:08 martti Exp $ # Nice and simple, but make sure it is done consistently... -# Simply unpack bmake-.tar.gz +# Simply unpack bmake-.tar.gz # cd bmake # then run this script. diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile index cd668c5017a..6f2a1967696 100644 --- a/devel/cogito/Makefile +++ b/devel/cogito/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2007/06/27 22:52:44 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.9 2007/10/09 19:19:09 martti Exp $ # DISTNAME= cogito-0.18.2 @@ -13,12 +13,12 @@ COMMENT= Version control system of the Linux kernel DEPENDS+= scmgit-[0-9]*:../../devel/scmgit -USE_TOOLS+= gmake bash:run fgrep:run grep:run mktemp:run xargs:run +USE_TOOLS+= gmake bash:run fgrep:run grep:run mktemp:run xargs:run MAKE_FLAGS+= prefix=${PREFIX:Q} .include "../../mk/bsd.prefs.mk" -# we need gnu-ish versions of these. In particular, we require +# we need gnu-ish versions of these. In particular, we require # that grep accept -q and xargs accept -0 .if ${OPSYS} == "SunOS" diff --git a/devel/nss/Makefile b/devel/nss/Makefile index da0586de19b..418507cb494 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/04/05 18:11:53 gdt Exp $ +# $NetBSD: Makefile,v 1.25 2007/10/09 19:19:09 martti Exp $ DISTNAME= nss-3.11.5 CATEGORIES= security @@ -58,7 +58,7 @@ do-install: # The exact set of libfreebl* libs built and installed depends on the # operating system and platform. For example, on solaris/sparc you might -# get +# get # libfreebl_32fpu_3.so # libfreebl_32int_3.so # libfreebl_32int64_3.so diff --git a/devel/p5-Path-Class/Makefile b/devel/p5-Path-Class/Makefile index d4078f4072d..495022f098c 100644 --- a/devel/p5-Path-Class/Makefile +++ b/devel/p5-Path-Class/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/01/10 21:58:19 bad Exp $ +# $NetBSD: Makefile,v 1.2 2007/10/09 19:19:09 martti Exp $ # DISTNAME= Path-Class-0.16 @@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/K/KW/KWILLIAMS/} MAINTAINER= bad@netbsd.org HOMEPAGE= http://search.cpan.org/~kwilliams/Path-Class-0.16/ -COMMENT= Cross-platform path specification manipulation +COMMENT= Cross-platform path specification manipulation PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/devel/tla/Makefile b/devel/tla/Makefile index 8082e53b1d6..7cf4d753c1f 100644 --- a/devel/tla/Makefile +++ b/devel/tla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/06/08 18:39:24 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2007/10/09 19:19:09 martti Exp $ # DISTNAME= tla-1.3.5 @@ -19,7 +19,7 @@ CHECK_PORTABILITY_SKIP+= \ src/tla/tests/changeset-tests/chmod_random \ src/tla/tests/changeset-tests/run-spaces-test.sh \ src/tla/tests/changeset-tests/run-test.sh - + REPLACE_BASH+= src/tla/tests/changeset-tests/chmod_random USE_TOOLS+= bash diff --git a/emulators/compat16/Makefile b/emulators/compat16/Makefile index ad6b58a974b..3987e6ecb03 100644 --- a/emulators/compat16/Makefile +++ b/emulators/compat16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/10/07 12:59:12 kano Exp $ +# $NetBSD: Makefile,v 1.13 2007/10/09 19:19:09 martti Exp $ COMPAT_PKG= compat16 # for compat_netbsd/Makefile.common NETBSD_VERSION= 1.6 @@ -33,7 +33,7 @@ COMPAT_VERSION= 1.6.2 .if defined(NETBSD_COMPAT32) COMPAT_EXTRAS= # empty . for _netbsd_ in ${ACCEPTABLE_NETBSD} -COMPAT_EXTRAS= netbsd32_compat16-extras-${COMPAT_VERSION}{,nb*}:../../emulators/netbsd32_compat16-extras +COMPAT_EXTRAS= netbsd32_compat16-extras-${COMPAT_VERSION}{,nb*}:../../emulators/netbsd32_compat16-extras . endfor . if !empty(COMPAT_EXTRAS) DEPENDS+= ${COMPAT_EXTRAS} diff --git a/emulators/compat20/Makefile b/emulators/compat20/Makefile index 573f48a5000..c3159caadc4 100644 --- a/emulators/compat20/Makefile +++ b/emulators/compat20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/10/07 12:59:12 kano Exp $ +# $NetBSD: Makefile,v 1.4 2007/10/09 19:19:09 martti Exp $ COMPAT_PKG= compat20 # for compat_netbsd/Makefile.common NETBSD_VERSION= 2.0 @@ -33,7 +33,7 @@ COMPAT_VERSION= 2.1 .if defined(NETBSD_COMPAT32) COMPAT_EXTRAS= # empty . for _netbsd_ in ${ACCEPTABLE_NETBSD} -COMPAT_EXTRAS= netbsd32_compat20-extras-${COMPAT_VERSION}{,nb*}:../../emulators/netbsd32_compat20-extras +COMPAT_EXTRAS= netbsd32_compat20-extras-${COMPAT_VERSION}{,nb*}:../../emulators/netbsd32_compat20-extras . endfor . if !empty(COMPAT_EXTRAS) DEPENDS+= ${COMPAT_EXTRAS} diff --git a/emulators/compat30/Makefile b/emulators/compat30/Makefile index e19b1322aa7..29152559f4f 100644 --- a/emulators/compat30/Makefile +++ b/emulators/compat30/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/10/07 12:59:13 kano Exp $ +# $NetBSD: Makefile,v 1.4 2007/10/09 19:19:09 martti Exp $ COMPAT_PKG= compat30 # for compat_netbsd/Makefile.common NETBSD_VERSION= 3.0 @@ -33,7 +33,7 @@ COMPAT_VERSION= 3.1 .if defined(NETBSD_COMPAT32) COMPAT_EXTRAS= # empty . for _netbsd_ in ${ACCEPTABLE_NETBSD} -COMPAT_EXTRAS= netbsd32_compat30-extras-${COMPAT_VERSION}{,nb*}:../../emulators/netbsd32_compat30-extras +COMPAT_EXTRAS= netbsd32_compat30-extras-${COMPAT_VERSION}{,nb*}:../../emulators/netbsd32_compat30-extras . endfor . if !empty(COMPAT_EXTRAS) DEPENDS+= ${COMPAT_EXTRAS} diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index becda585a05..f559b6df9ee 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.150 2007/03/25 20:42:14 wiz Exp $ +# $NetBSD: Makefile,v 1.151 2007/10/09 19:19:09 martti Exp $ # DISTNAME= xmame-0.106 @@ -64,7 +64,7 @@ MAKE_FLAGS+= ARCH="${MAME_ARCH.${OPSYS}}" .include "../../x11/libXxf86vm/buildlink3.mk" MAKE_FLAGS+= X11_DGA=1 MAKE_FLAGS+= X11_XV=1 -.else +.else . if exists(${X11BASE}/include/X11/extensions/xf86dga.h) MAKE_FLAGS+= X11_DGA=1 . endif diff --git a/filesystems/fuse-unionfs/DESCR b/filesystems/fuse-unionfs/DESCR index 63241baf3e6..5de603b490b 100644 --- a/filesystems/fuse-unionfs/DESCR +++ b/filesystems/fuse-unionfs/DESCR @@ -1,6 +1,6 @@ The FUSE-based union file system allows several directories to be stacked under one mountpoint - this will produce the effect of -having a number of directories merged under one mountpoint. +having a number of directories merged under one mountpoint. This utility is implemented at the user level - to mount a series of roots, simply use: diff --git a/lang/gcc34-ada/README b/lang/gcc34-ada/README index a6e29e0461e..92ab137cee6 100644 --- a/lang/gcc34-ada/README +++ b/lang/gcc34-ada/README @@ -6,7 +6,7 @@ compiler to build. This pkg may also be built using lang/gcc3 (which contains Ada). You can download a pre-built Ada compiler, suitable -for bootstrapping this package, from: +for bootstrapping this package, from: http://www.johnrshannon.com/NetBSD/ix86/ http://www.johnrshannon.com/NetBSD/x86_64/ diff --git a/lang/gcc34/README b/lang/gcc34/README index 5f37fd1cf0e..e0608381eff 100644 --- a/lang/gcc34/README +++ b/lang/gcc34/README @@ -1,11 +1,11 @@ -1) You may want to adjust the "Optional languages" +1) You may want to adjust the "Optional languages" section of the Makefile before building this package. 2) The Ada compiler front-end of gcc is itself written in Ada. Consequently, an Ada compiler must be used to build this pkg. In pkgsrc, lang/gcc3-ada is version 3.3 of the gcc Ada compiler; it also requires an Ada - compiler to build. This pkg may also be built from + compiler to build. This pkg may also be built from lang/gcc34-ada. For bootstrapping, you can download a pre-built version @@ -14,6 +14,6 @@ http://www.johnrshannon.com/NetBSD/ix86/gccAda-3.4.0.tgz http://www.johnrshannon.com/NetBSD/pentium4/gccAda-3.4.0.tgz http://www.johnrshannon.com/NetBSD/x86_64/gccAda-3.4.0.tgz - + The first two pkgs were built on NetBSD 2.0-BETA. The AMD64 pkg was built under NetBSD 1.6ZL. diff --git a/lang/guile/Makefile b/lang/guile/Makefile index c26c95888a2..f3781267a79 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2007/07/20 00:09:21 gdt Exp $ +# $NetBSD: Makefile,v 1.76 2007/10/09 19:19:10 martti Exp $ DISTNAME= guile-1.8.2 CATEGORIES= lang @@ -18,7 +18,7 @@ PTHREAD_AUTO_VARS= YES INFO_FILES= # PLIST # couldn't figure out how to work around an error on solaris-2.9/sparc with gcc when # compiling ${WRKSRC}/libguile/filesys.c. The warning is that readdir64_r was missing -# a prototype. +# a prototype. CONFIGURE_ARGS+= --disable-error-on-warning #CONFIGURE_ARGS+= --without-threads TEST_DIRS= ${WRKSRC} @@ -33,13 +33,13 @@ OWN_DIRS= ${PREFIX}/share/guile/site # up ./strings.h which tries to include scmconfig.h which doesn't exist # yet. While not a clean fix, this seems to work around the problem. # -# +# # for info on the slib part, see # http://lists.gnu.org/archive/html/guile-user/2006-11/msg00035.html post-patch: ${TOUCH} ${WRKSRC}/libguile/scmconfig.h echo "(define-module (ice-9 slib))" > ${WRKSRC}/ice-9/slib.scm - echo "(load-from-path \"slib/guile.init\")" >> ${WRKSRC}/ice-9/slib.scm + echo "(load-from-path \"slib/guile.init\")" >> ${WRKSRC}/ice-9/slib.scm .if ${OPSYS} == "DragonFly" CONFIGURE_ARGS+= ac_cv_type_complex_double=no diff --git a/lang/php/pear_plist.php b/lang/php/pear_plist.php index eb4a63e56de..5e188c686bc 100644 --- a/lang/php/pear_plist.php +++ b/lang/php/pear_plist.php @@ -1,5 +1,5 @@ $v) { $prefix = $v['baseinstalldir'] . '/'; # sometimes the baseinstalldir begins with a slash, - # which make the PLIST output to have two instead of + # which make the PLIST output to have two instead of # one. We fix this here. if ($prefix[0] == '/') $prefix = substr($prefix, 1); diff --git a/lang/php5/MESSAGE b/lang/php5/MESSAGE index 728aecd0a96..817c5a8b582 100644 --- a/lang/php5/MESSAGE +++ b/lang/php5/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.8 2007/05/05 21:45:12 adrianp Exp $ +$NetBSD: MESSAGE,v 1.9 2007/10/09 19:19:10 martti Exp $ To process PHP scripts, you will need a PHP-enabled HTTP server. You may either configure the HTTP server to use the PHP CGI binary located in @@ -11,7 +11,7 @@ or you may install a PHP module for your HTTP server, e.g. www/ap-php. Note that php-openssl is no longer a separate package as of version 5.0.5nb1 because the main PHP5 package has it built-in now. -As of version 5.2.1nb3 PEAR is no longer installed by default with the -php package. In order to use PEAR packages with PHP you will need to +As of version 5.2.1nb3 PEAR is no longer installed by default with the +php package. In order to use PEAR packages with PHP you will need to install the lang/pear package. =========================================================================== diff --git a/mail/sqwebmail/INSTALL b/mail/sqwebmail/INSTALL index cbd18035422..314c296a52e 100644 --- a/mail/sqwebmail/INSTALL +++ b/mail/sqwebmail/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.3 2006/04/28 18:16:25 jlam Exp $ +# $NetBSD: INSTALL,v 1.4 2007/10/09 19:19:10 martti Exp $ case ${STAGE} in POST-INSTALL) @@ -12,7 +12,7 @@ order to preserve your existing users' calendar information, you will need to move: @VARBASE@/sqwebmail -to +to @SQWEBMAIL_STATEDIR@/sqwebmail =========================================================================== diff --git a/mail/thunderbird-bin-nightly/Makefile.linux-i386 b/mail/thunderbird-bin-nightly/Makefile.linux-i386 index 830d46963d3..fbe566af956 100644 --- a/mail/thunderbird-bin-nightly/Makefile.linux-i386 +++ b/mail/thunderbird-bin-nightly/Makefile.linux-i386 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:34 jlam Exp $ +# $NetBSD: Makefile.linux-i386,v 1.2 2007/10/09 19:19:10 martti Exp $ DISTNAME= thunderbird-3.0a1pre.en-US.linux-i686 -EXTRACT_SUFX= .tar.bz2 +EXTRACT_SUFX= .tar.bz2 MOZ_GTK2= yes MOZ_PLATFORM= linux diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 655aeff87a4..e8531490bd6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1926 2007/09/29 16:03:28 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1927 2007/10/09 19:19:11 martti Exp $ # # This file is in the public domain. # @@ -622,7 +622,7 @@ ${.CURDIR}/${WRKDIR_BASENAME}: # # MAKEFLAGS.su-${.TARGET} # The additional flags that are passed to the make process. -# +# # XXX: Shouldn't the $${PATH} be ${PATH} here? This may be related to # PR 34470. diff --git a/mk/bsd.pkg.readme.mk b/mk/bsd.pkg.readme.mk index 40c6eef1811..8c7ab0a8749 100644 --- a/mk/bsd.pkg.readme.mk +++ b/mk/bsd.pkg.readme.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.readme.mk,v 1.13 2007/08/29 23:26:30 adrianp Exp $ +# $NetBSD: bsd.pkg.readme.mk,v 1.14 2007/10/09 19:19:12 martti Exp $ # # This Makefile fragment is included by bsd.pkg.mk and encapsulates the # code to produce README.html files in each package directory. @@ -232,7 +232,7 @@ SED_HOMEPAGE_EXPR= -e 's|%%HOMEPAGE%%||' # XXX: The code for the pkg_install<20070714 vulnerability checks are # XXX: broken. It will not find vulnerabilities in any packages that -# XXX: have complex names in the pkg-vulnerabilties file. +# XXX: have complex names in the pkg-vulnerabilties file. # XXX: e.g. php{4,5}-perl and sun-{jdk,jre}15 # XXX: Post pkg_install-20070714 only currently known vulnerabilities are # XXX: shown in the generated README.html files for packages. @@ -259,7 +259,7 @@ show-vulnerabilities-html: gsub("\&", "\\&", printurl); \ printf("
  • %s has a %s exploit (see %s for more details)
    • \n", $$2, $$5, $$8, printurl) }'; \ fi; \ - fi + fi # If PACKAGES is set to the default (../../packages), the current # ${MACHINE_ARCH} and "release" (uname -r) will be used. Otherwise a directory diff --git a/mk/bulk/sort-packages b/mk/bulk/sort-packages index 6592d927293..4dbc343de67 100644 --- a/mk/bulk/sort-packages +++ b/mk/bulk/sort-packages @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: sort-packages,v 1.10 2007/08/27 15:38:08 adrianp Exp $ +# $NetBSD: sort-packages,v 1.11 2007/10/09 19:19:13 martti Exp $ # This program scans all binary packages in the current directory and # creates three lists of files in OUTDIR: @@ -71,7 +71,7 @@ for pkg in *${PKG_SUFX}; do _INFO_VER=`${PKG_INFO} -V`; if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${_INFO_VER}; then # XXX: The egrep command is only needed here because - # audit-packages before pkg_install-20070714 is so + # audit-packages before pkg_install-20070714 is so # awfully slow. if egrep "^({.*${pkg_prefix}.*}|${pkg_prefix}|{.*}${pkg_prefix})" ${PKGVULNDIR}/pkg-vulnerabilities >/dev/null 4>&1; then vuln=`${AUDIT_PACKAGES} -p "${pkg}"` diff --git a/mk/bulk/upload b/mk/bulk/upload index 256d51c777e..8fe064ad903 100644 --- a/mk/bulk/upload +++ b/mk/bulk/upload @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: upload,v 1.40 2007/07/25 12:00:21 adrianp Exp $ +# $NetBSD: upload,v 1.41 2007/10/09 19:19:13 martti Exp $ # # Upload non-restricted binary pkgs to ftp server @@ -27,8 +27,8 @@ Usage: $prog [-c|--config ] [-n|--no-upload] [-d|--debug] [-v|--verbose] $prog -h|--help $prog -V|--version - -c | --config - Load the following configuration file instead of + -c | --config + Load the following configuration file instead of the default one. -d|--debug Preserves some intermediate files to help @@ -64,8 +64,8 @@ EOF # print out error message and exit 1 die () { - echo "$0: error:" 1>&2 - for i in "$@"; do + echo "$0: error:" 1>&2 + for i in "$@"; do echo " $i" 1>&2 done exit 1 diff --git a/mk/checksum/checksum.mk b/mk/checksum/checksum.mk index 6e950103a49..5b6ec75e06e 100644 --- a/mk/checksum/checksum.mk +++ b/mk/checksum/checksum.mk @@ -1,4 +1,4 @@ -# $NetBSD: checksum.mk,v 1.11 2007/08/31 16:30:11 jlam Exp $ +# $NetBSD: checksum.mk,v 1.12 2007/10/09 19:19:13 martti Exp $ # # See bsd.checksum.mk for helpful comments. # @@ -32,7 +32,7 @@ _CHECKSUM_CMD= \ TEST=${TOOLS_TEST:Q} \ ${SH} ${PKGSRCDIR}/mk/checksum/checksum \ -checksum checksum-phase: +checksum checksum-phase: ${RUN} set -e; \ case ${.TARGET:Q} in \ *-phase) ${TEST} ! -f ${_COOKIE.checksum} || exit 0 ;; \ diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index d0f762af1fc..da4381d7e53 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.162 2007/10/09 14:31:31 rillig Exp $ +# $NetBSD: mk.conf,v 1.163 2007/10/09 19:19:13 martti Exp $ # # This file provides default values for variables that may be overridden @@ -1727,7 +1727,7 @@ USERPPP_GROUP?= network UUCP_GROUP?= daemon # System group for uucp-related programs. # Possible: any group name -# Default: daemon +# Default: daemon UUCP_USER?= uucp # System user for uucp-related programs. diff --git a/mk/emulator/emulator.mk b/mk/emulator/emulator.mk index b9952c3fee3..e1d13359697 100644 --- a/mk/emulator/emulator.mk +++ b/mk/emulator/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.8 2007/08/23 18:20:36 jlam Exp $ +# $NetBSD: emulator.mk,v 1.9 2007/10/09 19:19:13 martti Exp $ # # This file is included by bsd.pkg.mk. # @@ -79,7 +79,7 @@ OPSYS_EMULDIR?= # empty # package's binaries, libraries and scripts won't necessarily match the # actual paths on the file system, so skip some path checks that are # likely to fail. -# +# .if empty(EMUL_DISTRO:Mnative-*) CHECK_SHLIBS_SUPPORTED?= no CHECK_INTERPRETER_SKIP= * diff --git a/mk/emulator/pkg-rpm.mk b/mk/emulator/pkg-rpm.mk index 493badc15e5..7e7c203ff6d 100644 --- a/mk/emulator/pkg-rpm.mk +++ b/mk/emulator/pkg-rpm.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-rpm.mk,v 1.1 2007/07/29 05:19:43 jlam Exp $ +# $NetBSD: pkg-rpm.mk,v 1.2 2007/10/09 19:19:13 martti Exp $ # # RPM package format # @@ -10,7 +10,7 @@ # this is empty, then no PLIST is created. # # Default value: ${WRKDIR}/.PLIST.rpm2pkg -# +# # RPM2PKG_PREFIX # This is the directory under which the contents of the RPMs will # be extracted. This directory is stripped from the paths which @@ -32,7 +32,7 @@ # component of ``./''. # # Default value: 1 -# +# # RPM2PKG_STAGE # Stage at which to run the ``extract-rpm'' target. # diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme index cb823b4adbb..6f043948a9f 100755 --- a/mk/scripts/mkreadme +++ b/mk/scripts/mkreadme @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkreadme,v 1.18 2007/09/07 22:12:16 jlam Exp $ +# $NetBSD: mkreadme,v 1.19 2007/10/09 19:19:13 martti Exp $ # # Script for README.html generation # @@ -303,7 +303,7 @@ else exit 1 fi -# this needs to happen here as the variables referenced have not been +# this needs to happen here as the variables referenced have not been # populated until this stage (see above) # if [ "$pv" = "default" ]; then diff --git a/mk/wrapper/cmd-sink-cross-gcc b/mk/wrapper/cmd-sink-cross-gcc index d9e91aa539c..1b0996f951a 100644 --- a/mk/wrapper/cmd-sink-cross-gcc +++ b/mk/wrapper/cmd-sink-cross-gcc @@ -1,4 +1,4 @@ -# $NetBSD: cmd-sink-cross-gcc,v 1.1 2007/08/02 18:19:33 joerg Exp $ +# $NetBSD: cmd-sink-cross-gcc,v 1.2 2007/10/09 19:19:13 martti Exp $ # # Copyright (c) 2007 Joerg Sonnenberger . # All rights reserved. @@ -35,7 +35,7 @@ if [ "${dont_link}" != yes ]; then $debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" . $buildcmd - # All normal library locations should be checked for + # All normal library locations should be checked for for libdir in /usr/lib @PREFIX@/lib; do arg="-Wl,-rpath-link,@CROSS_DESTDIR@${libdir}" $debug_log $wrapperlog " (cmd-sink-native-cc) pop: $arg" diff --git a/mk/x11.buildlink3.mk b/mk/x11.buildlink3.mk index beb709853d7..6a7d02a884c 100644 --- a/mk/x11.buildlink3.mk +++ b/mk/x11.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: x11.buildlink3.mk,v 1.9 2007/10/01 07:21:44 rillig Exp $ +# $NetBSD: x11.buildlink3.mk,v 1.10 2007/10/09 19:19:12 martti Exp $ # # This file should only be included from the buildlink3.mk files from # the modular Xorg packages and only in the case that the native X11 @@ -18,7 +18,7 @@ USE_X11= yes # Sanity checks. # -. if ${X11_TYPE} != "native" +. if ${X11_TYPE} != "native" _WRONG_X11_TYPE:= ${X11_TYPE} PKG_FAIL_REASON+= "Do not include x11.version.mk for X11_TYPE != \"native\"." X11_TYPE:= native diff --git a/net/gofish/Makefile b/net/gofish/Makefile index ed4c2edd9ca..2dffe5849f9 100644 --- a/net/gofish/Makefile +++ b/net/gofish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/06/20 17:46:03 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/10/09 19:19:14 martti Exp $ DISTNAME= gofish-1.1 PKGREVISION= 2 @@ -41,7 +41,7 @@ FILES_SUBST+= PKG_USERS=${PKG_USERS:Q} SUBST_CLASSES+= user SUBST_MESSAGE.user= Fixing name of gopher user in files. SUBST_FILES.user= gofish.conf -SUBST_SED.user= -e "s/;user = gopher/user = ${GOPHER_USER}/g" +SUBST_SED.user= -e "s/;user = gopher/user = ${GOPHER_USER}/g" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gofish diff --git a/net/php5-soap/MESSAGE b/net/php5-soap/MESSAGE index 90629178436..690df99c936 100644 --- a/net/php5-soap/MESSAGE +++ b/net/php5-soap/MESSAGE @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2005/12/03 18:53:57 jdolecek Exp $ +$NetBSD: MESSAGE,v 1.2 2007/10/09 19:19:14 martti Exp $ PHP 5.1.0 introduced some changes in SOAP extension in WSDL mode: * XML base64Binary values transparently base64 encoded/decoded -* NULL values with maxOccurs="0" nillable="yes" not included in XML output +* NULL values with maxOccurs="0" nillable="yes" not included in XML output =========================================================================== diff --git a/net/solaris-tap/DEINSTALL b/net/solaris-tap/DEINSTALL index 2362933cc7e..f9e73bf1a45 100644 --- a/net/solaris-tap/DEINSTALL +++ b/net/solaris-tap/DEINSTALL @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: DEINSTALL,v 1.1.1.1 2007/07/01 00:43:20 tnn Exp $ +# $NetBSD: DEINSTALL,v 1.2 2007/10/09 19:19:14 martti Exp $ # cat << EOF @@ -7,7 +7,7 @@ cat << EOF Please remember to run: -# /usr/sbin/rem_drv tun +# /usr/sbin/rem_drv tun # /usr/sbin/rem_drv tap and remove the tun/tap driver from /usr/kernel/drv if you have copied diff --git a/net/vpnc/DESCR b/net/vpnc/DESCR index a6ff4416b8a..9a7339cc62a 100644 --- a/net/vpnc/DESCR +++ b/net/vpnc/DESCR @@ -5,4 +5,4 @@ vpnc is supposed to work with: * Cisco VPN concentrator 3000 Series * Cisco IOS routers * Cisco PIX / ASA Zecurity Appliances - * Juniper/Netscreen + * Juniper/Netscreen diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index d0682e4ac52..7a9c9dba64c 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2007/09/21 20:15:10 adrianp Exp $ +# $NetBSD: Makefile,v 1.30 2007/10/09 19:19:14 martti Exp $ # DISTNAME= xipdump-1.5.4 @@ -15,7 +15,7 @@ PLIST_SRC= ${WRKDIR}/PLIST USE_X11BASE= yes GNU_CONFIGURE= yes -CFLAGS+= -I${PREFIX}/include +CFLAGS+= -I${PREFIX}/include LIBS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lnet INSTALLATION_DIRS= bin lib/X11/app-defaults ${PKGMANDIR}/man8 diff --git a/news/leafnode/DEINSTALL b/news/leafnode/DEINSTALL index d2ab0860285..d9ae2f408f8 100644 --- a/news/leafnode/DEINSTALL +++ b/news/leafnode/DEINSTALL @@ -1,7 +1,7 @@ -# $NetBSD: DEINSTALL,v 1.3 2004/01/11 16:45:51 cjep Exp $ +# $NetBSD: DEINSTALL,v 1.4 2007/10/09 19:19:14 martti Exp $ LEAFNODE_CONFDIR=@LEAFNODE_CONFDIR@ -LEAFNODE_SPOOL=@LEAFNODE_SPOOL@ +LEAFNODE_SPOOL=@LEAFNODE_SPOOL@ LEAFNODE_LOCKDIR=@LEAFNODE_LOCKDIR@ LEAFNODE_HOME=@LEAFNODE_HOME@ @@ -12,9 +12,9 @@ case "${STAGE}" in Note that the leafnode spool, lock and configuration directories - ${LEAFNODE_SPOOL} + ${LEAFNODE_SPOOL} ${LEAFNODE_LOCKDIR} - ${LEAFNODE_HOME} + ${LEAFNODE_HOME} and ${LEAFNODE_CONFDIR} are NOT deleted during the package deinstallation. Please remove these diff --git a/pkgtools/pkg_install/MESSAGE b/pkgtools/pkg_install/MESSAGE index be1a22eb161..1e4c816a06f 100644 --- a/pkgtools/pkg_install/MESSAGE +++ b/pkgtools/pkg_install/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2007/08/05 17:21:50 adrianp Exp $ +$NetBSD: MESSAGE,v 1.3 2007/10/09 19:19:14 martti Exp $ You may wish to have the vulnerabilities file downloaded daily so that it remains current. This may be done by adding an appropriate entry @@ -34,7 +34,7 @@ A sample audit-packages.conf has been installed to: ${EGDIR}/audit-packages.conf -You may want to customise this file and copy it to +You may want to customise this file and copy it to ${PKG_SYSCONFDIR}/audit-packages.conf. If you want to use signature verification you will need to install GnuPG and set the path for GPG appropriately in your audit-packages.conf. See diff --git a/print/teTeX3-bin/INSTALL b/print/teTeX3-bin/INSTALL index 4d0f26a42f0..5aab6795a6a 100644 --- a/print/teTeX3-bin/INSTALL +++ b/print/teTeX3-bin/INSTALL @@ -1,11 +1,11 @@ -# $NetBSD: INSTALL,v 1.6 2006/12/07 15:06:07 joerg Exp $ +# $NetBSD: INSTALL,v 1.7 2007/10/09 19:19:14 martti Exp $ PATH="@PREFIX@"/bin:"${PATH}" export PATH case "${STAGE}" in POST-INSTALL) - ${TEST} ! -x ./+TEXCONFIG || ./+TEXCONFIG PAPER + ${TEST} ! -x ./+TEXCONFIG || ./+TEXCONFIG PAPER ${TEST} ! -x ./+TETEX || ./+TETEX ADD ;; esac @@ -79,7 +79,7 @@ REMOVE) ${TEST} ! -f "$file" || FMTUTIL_CNF="${FMTUTIL_CNF} $file" done - + # Remove fmt, mem, and log files generated by fmtutil-sys. ${TEST} -z "${FMTUTIL_CNF}" || ${CAT} ${FMTUTIL_CNF} | ${GREP} "^[^#]" | diff --git a/print/tex-hugelatex/INSTALL b/print/tex-hugelatex/INSTALL index 186cc7d387e..1dbebcc291d 100644 --- a/print/tex-hugelatex/INSTALL +++ b/print/tex-hugelatex/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.1 2006/10/12 13:38:35 joerg Exp $ +# $NetBSD: INSTALL,v 1.2 2007/10/09 19:19:15 martti Exp $ case ${STAGE} in POST-INSTALL) @@ -10,7 +10,7 @@ param_size.hugelatex = 1500 stack_size.hugelatex = 1500 hash_extra.hugelatex = 15000 string_vacancies.hugelatex = 45000 -pool_free.hugelatex = 47500 +pool_free.hugelatex = 47500 nest_size.hugelatex = 500 save_size.hugelatex = 5000 pool_size.hugelatex = 500000 diff --git a/security/qca/buildlink3.mk b/security/qca/buildlink3.mk index cf4ec8ad6a7..64ea422b254 100644 --- a/security/qca/buildlink3.mk +++ b/security/qca/buildlink3.mk @@ -1,5 +1,5 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:08 jlam Exp $ -# +# $NetBSD: buildlink3.mk,v 1.9 2007/10/09 19:19:15 martti Exp $ +# BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QCA_BUILDLINK3_MK:= ${QCA_BUILDLINK3_MK}+ diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 048fe9b6c05..2e51fc9db08 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2007/09/18 19:24:07 bouyer Exp $ +# $NetBSD: Makefile,v 1.54 2007/10/09 19:19:15 martti Exp $ DISTNAME= apcupsd-3.14.1 PKGREVISION= 2 @@ -73,7 +73,7 @@ EGFILES= netbsd/apccontrol etc/changeme etc/commfailure etc/commok \ etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf MANFILES= apcupsd apctest -INSTALLATION_DIRS= share/examples/apcupsd share/examples/rc.d +INSTALLATION_DIRS= share/examples/apcupsd share/examples/rc.d SUBST_CLASSES+= strip SUBST_STAGE.strip= pre-configure diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile index a6d2f1b8e18..d9b2a672ca2 100644 --- a/sysutils/xenkernel3/Makefile +++ b/sysutils/xenkernel3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/08/17 17:26:03 bouyer Exp $ +# $NetBSD: Makefile,v 1.4 2007/10/09 19:19:15 martti Exp $ # VERSION= 3.1.0 @@ -37,7 +37,7 @@ do-build: cd ${WRKSRC} && ${GMAKE} clean && \ ${GMAKE} XEN_TARGET_X86_PAE=n debug=y xen ${CP} ${WRKSRC}/dist/install/boot/xen.gz ${WRKDIR}/xen-debug.gz - + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/xen3-kernel ${INSTALL_DATA} ${WRKDIR}/xen.gz ${PREFIX}/xen3-kernel/xen.gz diff --git a/templates/README.all b/templates/README.all index ffe5780d695..60a41049821 100644 --- a/templates/README.all +++ b/templates/README.all @@ -1,4 +1,4 @@ - + All NetBSD Packages @@ -15,7 +15,7 @@ The following list contains all %%NPKGS%% packages currently available -in the NetBSD Packages Collection, sorted alphabetically. +in the NetBSD Packages Collection, sorted alphabetically. Please select an entry for more details!

    diff --git a/templates/README.ipv6 b/templates/README.ipv6 index d1167b7c33b..556c1d4e0c5 100644 --- a/templates/README.ipv6 +++ b/templates/README.ipv6 @@ -1,4 +1,4 @@ - + NetBSD: IPv6 enabled Packages @@ -14,8 +14,8 @@

    The following list contains all packages currently available -in the NetBSD Packages Collection, that are known to support -IPv6. +in the NetBSD Packages Collection, that are known to support +IPv6. Please select an entry for more details!

    diff --git a/templates/README.pkg b/templates/README.pkg index c1964733b68..d2ad2962860 100644 --- a/templates/README.pkg +++ b/templates/README.pkg @@ -1,9 +1,9 @@ - + The NetBSD Packages Collection: %%PORT%% - + @@ -27,7 +27,7 @@ longer description, or browse the package's %%LICENSE%% -

    The package is located in the +

    The package is located in the "%%PORT%%" directory. The current source version of the package is @@ -70,7 +70,7 @@ This package requires the following package(s) to run:

    Select one of the links below to download the package in precompiled binary form for installation with pkg_add(1). -Available machine architectures and package versions: +Available machine architectures and package versions: %%BIN_PKGS%%
    diff --git a/templates/README.top b/templates/README.top index 9d2583557c4..d2eeb3e0bdb 100644 --- a/templates/README.top +++ b/templates/README.top @@ -1,4 +1,4 @@ - + The NetBSD Packages Collection @@ -20,7 +20,7 @@ The packages collection is divided into categories of packages.

    Here are the one-line descriptions for each of the categories, -a complete list of all packages +a complete list of all packages and one with all IPv6 enabled packages is also available: diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile index b7128df872f..8feeea31dac 100644 --- a/textproc/hunspell/Makefile +++ b/textproc/hunspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/09/21 18:40:42 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2007/10/09 19:19:15 martti Exp $ # DISTNAME= hunspell-1.1.12-2 @@ -25,7 +25,7 @@ PKGCONFIG_OVERRIDE+= hunspell.pc.in SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing default path to dictionaries. SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= man/hunspell.1 man/hu/hunspell.1 src/tools/hunspell.cxx +SUBST_FILES.paths= man/hunspell.1 man/hu/hunspell.1 src/tools/hunspell.cxx SUBST_SED.paths+= -e 's,/usr/share/hunspell,${PREFIX}/share/hunspell,g' # Trailing slash important to not change hunspell.cxx SUBST_SED.paths+= -e 's,/usr/share/myspell/,${PREFIX}/share/hunspell/,g' diff --git a/textproc/p5-YAML-Syck/Makefile b/textproc/p5-YAML-Syck/Makefile index af7b3b7d43b..151bd063d55 100644 --- a/textproc/p5-YAML-Syck/Makefile +++ b/textproc/p5-YAML-Syck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/04/25 09:39:13 hiramatsu Exp $ +# $NetBSD: Makefile,v 1.3 2007/10/09 19:19:15 martti Exp $ DISTNAME= YAML-Syck-0.85 PKGNAME= p5-${DISTNAME} @@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/A/AU/AUDREYT/} MAINTAINER= bad@NetBSD.org HOMEPAGE= http://search.cpan.org/~audreyt/YAML-Syck-0.72/ -COMMENT= Fast, lightweight YAML loader and dumper +COMMENT= Fast, lightweight YAML loader and dumper USE_LANGUAGES= c PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/time/p5-DateTime-Event-ICal/DESCR b/time/p5-DateTime-Event-ICal/DESCR index 4f1ba7f47d0..96a3b079e29 100644 --- a/time/p5-DateTime-Event-ICal/DESCR +++ b/time/p5-DateTime-Event-ICal/DESCR @@ -1,2 +1,2 @@ -This module aims to support rfc2445 style recurrences, such as +This module aims to support rfc2445 style recurrences, such as 'last friday of march'. diff --git a/time/xalarm/MESSAGE b/time/xalarm/MESSAGE index 0685a099ca1..a985f44f7d4 100644 --- a/time/xalarm/MESSAGE +++ b/time/xalarm/MESSAGE @@ -1,12 +1,12 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2006/04/16 07:54:18 wiz Exp $ +$NetBSD: MESSAGE,v 1.3 2007/10/09 19:19:16 martti Exp $ The appearance of xalarm is much better if the color resources are properly specified and the correct resources for Xaw3d are set. You can do this just by setting -*customization: -color +*customization: -color in your ~/.Xdefaults file. diff --git a/wm/olvwm/Makefile b/wm/olvwm/Makefile index f022ad13393..81b5a54ccb9 100644 --- a/wm/olvwm/Makefile +++ b/wm/olvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/03/17 00:59:47 reed Exp $ +# $NetBSD: Makefile,v 1.16 2007/10/09 19:19:16 martti Exp $ # DISTNAME= olvwm4.src4 @@ -8,7 +8,7 @@ CATEGORIES= x11 wm MASTER_SITES= http://home.nyc.rr.com/twopks/olvwm/ MAINTAINER= w.wnuk@zodiac.mimuw.edu.pl -HOMEPAGE= http://home.nyc.rr.com/twopks/olvwm/ +HOMEPAGE= http://home.nyc.rr.com/twopks/olvwm/ COMMENT= Open Look Virtual Window Manager DEPENDS+= xview-clients>=3.2.1:../../x11/xview-clients diff --git a/www/firefox-bin/Makefile.solaris-sparc b/www/firefox-bin/Makefile.solaris-sparc index f209027a21d..c3bb0f706e7 100644 --- a/www/firefox-bin/Makefile.solaris-sparc +++ b/www/firefox-bin/Makefile.solaris-sparc @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.solaris-sparc,v 1.3 2007/10/07 19:58:45 dmcmahill Exp $ +# $NetBSD: Makefile.solaris-sparc,v 1.4 2007/10/09 19:19:16 martti Exp $ # Use the Solaris 8 binaries if we're not running at least Solaris 10. .if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-sparc EMUL_REQD= solaris>=10 MOZ_GTK2= yes -.else +.else DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-sparc-gtk1 EMUL_REQD= solaris>=8 .endif diff --git a/www/firefox15-bin/Makefile.solaris-sparc b/www/firefox15-bin/Makefile.solaris-sparc index f7c1e66c4b4..eb7ea1501cb 100644 --- a/www/firefox15-bin/Makefile.solaris-sparc +++ b/www/firefox15-bin/Makefile.solaris-sparc @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.solaris-sparc,v 1.2 2007/08/23 18:20:34 jlam Exp $ +# $NetBSD: Makefile.solaris-sparc,v 1.3 2007/10/09 19:19:16 martti Exp $ # Use the Solaris 8 binaries if we're not running at least Solaris 10. .if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*) DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-respin-sparc EMUL_REQD= solaris>=10 MOZ_GTK2= yes -.else +.else DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-respin-sparc-gtk1 EMUL_REQD= solaris>=8 .endif diff --git a/www/p5-Kwiki-Archive-Cvs/DESCR b/www/p5-Kwiki-Archive-Cvs/DESCR index 8a6e2f1d949..951c9384b4d 100644 --- a/www/p5-Kwiki-Archive-Cvs/DESCR +++ b/www/p5-Kwiki-Archive-Cvs/DESCR @@ -1,4 +1,4 @@ Kwiki plugin to archive pages using CVS. - + (This package includes the http://www.kwiki.org/?PatchKwikiArchiveCvs patches to make Kwiki::Archives::Cvs work with Kwiki::Revision.) diff --git a/www/py-swish-e/DESCR b/www/py-swish-e/DESCR index b7451f544d0..567f9fb5250 100644 --- a/www/py-swish-e/DESCR +++ b/www/py-swish-e/DESCR @@ -1,2 +1,2 @@ -This package provides a Python API to access the swish-e library. +This package provides a Python API to access the swish-e library. swish-e indexes can be accessed that way. diff --git a/x11/lbxproxy/DESCR b/x11/lbxproxy/DESCR index e58ae212d26..4e27667e698 100644 --- a/x11/lbxproxy/DESCR +++ b/x11/lbxproxy/DESCR @@ -1,6 +1,6 @@ This package provides lbxproxy, the proxy for the Low Bandwidth extension to X (LBX). Clients connect to lbxproxy, which multiplexes them over a single connection to the X server, performing various -optimisation to reduce bandwidth usage and/or latency. +optimisation to reduce bandwidth usage and/or latency. This is from the modular X.org X11 project. diff --git a/x11/xf86-video-via/Makefile b/x11/xf86-video-via/Makefile index 767361581f5..e36fca94571 100644 --- a/x11/xf86-video-via/Makefile +++ b/x11/xf86-video-via/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2007/08/16 14:18:25 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2007/10/09 19:19:17 martti Exp $ # DISTNAME= xf86-video-via-0.2.2 @@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config .include "../../mk/bsd.prefs.mk" -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" PLIST_SUBST+= XVMC_SUPPORT="" .else PLIST_SUBST+= XVMC_SUPPORT="@comment " diff --git a/x11/xterm/INSTALL.openwin b/x11/xterm/INSTALL.openwin index cb237abc52a..8234e4427e5 100644 --- a/x11/xterm/INSTALL.openwin +++ b/x11/xterm/INSTALL.openwin @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL.openwin,v 1.1 2005/06/12 05:06:11 jlam Exp $ +# $NetBSD: INSTALL.openwin,v 1.2 2007/10/09 19:19:17 martti Exp $ PKGNAME=$1 STAGE=$2 @@ -28,7 +28,7 @@ POST-INSTALL) DEINSTALL) ;; - + POST-DEINSTALL) cd ${PKG_PREFIX} for FILE in $CONFLICTS -- cgit v1.2.3