summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2007-02-22 19:01:13 +0000
committerwiz <wiz@pkgsrc.org>2007-02-22 19:01:13 +0000
commit6e2c35c083f338ceb42943121056662d71077c27 (patch)
tree552758ae68ac7d5cc8b8ab084ca3f57b0ed02319
parent10a728c9da6fdd9fcb71f5491ad5a237f5d688ab (diff)
downloadpkgsrc-6e2c35c083f338ceb42943121056662d71077c27.tar.gz
pkglint cleanup; update HOMEPAGE/MASTER_SITES.
From Sergey Svishchev in private mail.
-rw-r--r--audio/bmp-musepack/Makefile3
-rw-r--r--audio/darkice/Makefile5
-rw-r--r--audio/easytag/PLIST4
-rw-r--r--audio/freepats/Makefile6
-rw-r--r--audio/gkrellm1-volume/Makefile4
-rw-r--r--audio/gkrellm1-xmms/Makefile4
-rw-r--r--audio/gst-plugins0.10-mad/DESCR4
-rw-r--r--audio/gst-plugins0.10-oss/DESCR4
-rw-r--r--audio/id3ed/Makefile5
-rw-r--r--audio/liba52/PLIST4
-rw-r--r--audio/libmusepack/Makefile3
-rw-r--r--audio/libtunepimp/Makefile4
-rw-r--r--audio/libvisual/Makefile6
-rw-r--r--audio/taglib/Makefile4
-rw-r--r--audio/wavesurfer/Makefile4
-rw-r--r--audio/xanalyser/Makefile6
-rw-r--r--audio/xmms-funtimedancer/Makefile4
-rw-r--r--benchmarks/thrulay/Makefile6
-rw-r--r--benchmarks/thrulay/PLIST4
-rw-r--r--cad/gtk1-wcalc/Makefile4
-rw-r--r--cad/gtk2-wcalc/Makefile4
-rw-r--r--cad/simian-docs/Makefile4
-rw-r--r--chat/amsn/Makefile4
-rw-r--r--chat/bsflite/Makefile4
-rw-r--r--chat/xaric/Makefile4
-rw-r--r--comms/jpilot/Makefile6
-rw-r--r--converters/latex2rtf/DESCR2
-rw-r--r--databases/p5-DB_File-Lock/Makefile4
-rw-r--r--databases/p5-DB_File/Makefile4
-rw-r--r--databases/py-psycopg2/Makefile4
-rw-r--r--databases/slony1/Makefile4
-rw-r--r--devel/cook/Makefile6
-rw-r--r--devel/cqual/Makefile4
-rw-r--r--devel/eric3/Makefile4
-rw-r--r--devel/global/Makefile4
-rw-r--r--devel/gmp/Makefile4
-rw-r--r--devel/nspr/Makefile4
-rw-r--r--devel/p5-Proc-Daemon/Makefile4
-rw-r--r--devel/py-distutils/Makefile6
-rw-r--r--devel/python-mode/Makefile4
-rw-r--r--devel/ruby-amstd/Makefile4
-rw-r--r--editors/mflteco/Makefile4
-rw-r--r--editors/nvi/Makefile6
-rw-r--r--editors/wily/Makefile6
-rw-r--r--emulators/BasiliskII/Makefile6
-rw-r--r--emulators/ski/DESCR16
-rw-r--r--games/rollemup/Makefile6
-rw-r--r--geography/gpsutils/Makefile6
-rw-r--r--graphics/dia/options.mk4
-rw-r--r--graphics/digikam-doc/Makefile4
-rw-r--r--graphics/digikamimageplugins/Makefile4
-rw-r--r--graphics/feh/Makefile6
-rw-r--r--graphics/tuxpaint-stamps/Makefile4
-rw-r--r--graphics/tuxpaint/Makefile4
-rw-r--r--lang/gpc/Makefile4
-rw-r--r--lang/php5/Makefile.common4
-rw-r--r--lang/scm/Makefile4
-rw-r--r--lang/sun-jre13/builtin.mk4
-rw-r--r--lang/sun-jre14/builtin.mk4
-rw-r--r--lang/tcl-expect/PLIST6
-rw-r--r--mail/gnus/Makefile6
-rw-r--r--mail/qgreylist/Makefile4
-rw-r--r--mail/sylpheed-claws/Makefile.common4
-rw-r--r--math/graphopt/Makefile4
-rw-r--r--math/guppi/Makefile4
-rw-r--r--math/xlife/Makefile6
-rw-r--r--misc/ascii/Makefile6
-rw-r--r--misc/colortail/Makefile6
-rw-r--r--misc/koffice/DESCR4
-rw-r--r--misc/logsurfer/Makefile14
-rw-r--r--misc/logsurfer/PLIST4
-rw-r--r--misc/p5-Geo-Weather/DESCR2
-rw-r--r--misc/pdmenu/Makefile4
-rw-r--r--multimedia/RealPlayerGold/Makefile4
-rw-r--r--multimedia/dvdstyler/Makefile4
-rw-r--r--net/cftp/Makefile6
-rw-r--r--net/dlint/Makefile4
-rw-r--r--net/jigdo/Makefile6
-rw-r--r--net/mDNSResponder-nss/Makefile4
-rw-r--r--net/miredo/Makefile4
-rw-r--r--net/openag/Makefile4
-rw-r--r--net/p5-SOAP-Lite/Makefile4
-rw-r--r--net/pure-ftpd/Makefile4
-rw-r--r--net/rp-pppoe/Makefile4
-rw-r--r--net/ucarp/Makefile4
-rw-r--r--regress/compiler/Makefile4
-rw-r--r--security/crack/Makefile9
-rw-r--r--security/gnupg/options.mk4
-rw-r--r--security/ike-scan/Makefile6
-rw-r--r--security/rainbowcrack/Makefile4
-rw-r--r--security/smtpd/Makefile7
-rw-r--r--shells/eltclsh/Makefile6
-rw-r--r--shells/mksh/Makefile4
-rw-r--r--shells/perlsh/Makefile7
-rw-r--r--shells/tcsh/Makefile4
-rw-r--r--sysutils/9base/Makefile4
-rw-r--r--sysutils/apcupsd/PLIST4
-rw-r--r--sysutils/gst-plugins0.10-gnomevfs/DESCR4
-rw-r--r--sysutils/pciutils/Makefile4
-rw-r--r--sysutils/strace/Makefile4
-rw-r--r--sysutils/wmSMPmon/Makefile6
-rw-r--r--sysutils/xfsprogs/Makefile4
-rw-r--r--textproc/aspell-slovak/Makefile6
-rw-r--r--textproc/ispell-slovak/Makefile4
-rw-r--r--textproc/kbanner/Makefile6
-rw-r--r--textproc/lua-expat/Makefile4
-rw-r--r--textproc/p5-Text-Template/Makefile4
-rw-r--r--textproc/php-wddx/Makefile4
-rw-r--r--textproc/ruby-rttool/Makefile4
-rw-r--r--time/remind/Makefile4
-rw-r--r--wm/pwm/Makefile4
-rw-r--r--wm/windowlab/Makefile6
-rw-r--r--www/ap-auth-mysql/Makefile4
-rw-r--r--www/ap-mp3/Makefile6
-rw-r--r--www/ap2-suphp/Makefile4
-rw-r--r--www/bkedit/Makefile6
-rw-r--r--www/cherokee/Makefile6
-rw-r--r--www/py-flup/Makefile4
-rw-r--r--www/seamonkey-bin-nightly/Makefile.NetBSD.i3864
-rw-r--r--www/seamonkey-bin-nightly/Makefile.SunOS.sparc4
-rw-r--r--www/seamonkey/Makefile-seamonkey.common4
-rw-r--r--www/trac/Makefile8
-rw-r--r--www/zope25-ZPsycopgDA/Makefile4
-rw-r--r--www/zope3/Makefile4
-rw-r--r--x11/gst-plugins0.10-x11/DESCR4
-rw-r--r--x11/modeline/Makefile6
-rw-r--r--x11/multi-aterm/Makefile5
-rw-r--r--x11/py-Tk/Makefile4
-rw-r--r--x11/ssystem/Makefile4
-rw-r--r--x11/xdm3d/Makefile4
-rw-r--r--x11/xgrk/DESCR2
-rw-r--r--x11/xmountains/Makefile6
-rw-r--r--x11/xpmroot/Makefile4
-rw-r--r--x11/xrestop/Makefile4
-rw-r--r--x11/xteddy/Makefile6
-rw-r--r--x11/xteddy2/Makefile6
136 files changed, 328 insertions, 314 deletions
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index 0aa8bb431ec..7385e662786 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/05/22 22:08:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:01:13 wiz Exp $
#
DISTNAME= bmp-musepack-1.1
@@ -14,6 +14,7 @@ COMMENT= BMP plugin for Musepack (mpc) files
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
.include "../../audio/bmp/buildlink3.mk"
.include "../../audio/libmusepack/buildlink3.mk"
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index dbb1ba38048..63b064b5489 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/07 12:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:13 wiz Exp $
#
DISTNAME= darkice-0.17.1
@@ -29,7 +29,8 @@ CONF_FILES= ${EGDIR}/darkice.conf ${PKG_SYSCONFDIR}/darkice.conf
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
do-install:
- ${INSTALL_DATA_DIR} ${EGDIR} ${HTMLDIR}
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA_DIR} ${HTMLDIR}
${INSTALL_DATA} ${WRKSRC}/darkice.cfg ${EGDIR}/darkice.conf
${INSTALL_PROGRAM} ${WRKSRC}/src/darkice ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/man/darkice.1 ${PREFIX}/${PKGMANDIR}/man1
diff --git a/audio/easytag/PLIST b/audio/easytag/PLIST
index 3136fd72568..c12c0c2d1c3 100644
--- a/audio/easytag/PLIST
+++ b/audio/easytag/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:11 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/02/22 19:01:13 wiz Exp $
bin/easytag
man/man1/easytag.1
+share/applications/easytag.desktop
share/easytag/ChangeLog
share/easytag/EasyTAG_logo.xpm
-share/applications/easytag.desktop
share/locale/cs/LC_MESSAGES/easytag.mo
share/locale/da/LC_MESSAGES/easytag.mo
share/locale/de/LC_MESSAGES/easytag.mo
diff --git a/audio/freepats/Makefile b/audio/freepats/Makefile
index 5553fae06fa..c3f11e152f8 100644
--- a/audio/freepats/Makefile
+++ b/audio/freepats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/12/15 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:01:13 wiz Exp $
#
DISTNAME= freepats-20060219
@@ -20,9 +20,9 @@ INSTALLATION_DIRS= share
post-patch:
${ECHO} "dir ${PREFIX}/share/freepats" >${WRKSRC}/timidity.cfg
- ${CAT} ${WRKSRC}/freepats.cfg >>${WRKSRC}/timidity.cfg
+ cat ${WRKSRC}/freepats.cfg >>${WRKSRC}/timidity.cfg
do-install:
- cd ${WRKDIR} && ${PAX} -rw -pe freepats ${PREFIX}/share
+ cd ${WRKDIR} && pax -rw -pp freepats ${PREFIX}/share
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gkrellm1-volume/Makefile b/audio/gkrellm1-volume/Makefile
index 74d1c067b67..9c9678790ec 100644
--- a/audio/gkrellm1-volume/Makefile
+++ b/audio/gkrellm1-volume/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/17 13:46:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:01:13 wiz Exp $
DISTNAME= volume-0.8
PKGNAME= gkrellm-${DISTNAME}
@@ -8,7 +8,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://gkrellm.luon.net/volume.phtml
-COMMENT= gkrellm volume mixer plugin
+COMMENT= GKrellM volume mixer plugin
WRKSRC= ${WRKDIR}/volume
PTHREAD_OPTS= require
diff --git a/audio/gkrellm1-xmms/Makefile b/audio/gkrellm1-xmms/Makefile
index c3c89725f36..b5d041ad929 100644
--- a/audio/gkrellm1-xmms/Makefile
+++ b/audio/gkrellm1-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/17 13:46:15 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:01:13 wiz Exp $
DISTNAME= gkrellmms-0.5.6
PKGNAME= gkrellm-xmms-0.5.6
@@ -8,7 +8,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/
MAINTAINER= damon@NetBSD.org
HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml
-COMMENT= gkrellm xmms plugin
+COMMENT= GKrellM xmms plugin
WRKSRC= ${WRKDIR}/gkrellmms
diff --git a/audio/gst-plugins0.10-mad/DESCR b/audio/gst-plugins0.10-mad/DESCR
index 1c893bec9c3..217603b4be8 100644
--- a/audio/gst-plugins0.10-mad/DESCR
+++ b/audio/gst-plugins0.10-mad/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-oss/DESCR b/audio/gst-plugins0.10-oss/DESCR
index 55447ceda6d..e92f2aa0bad 100644
--- a/audio/gst-plugins0.10-oss/DESCR
+++ b/audio/gst-plugins0.10-oss/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/id3ed/Makefile b/audio/id3ed/Makefile
index 5d4da15a7c3..446df7a34f8 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:28:56 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:01:13 wiz Exp $
#
DISTNAME= id3ed-1.10.4
@@ -16,7 +16,8 @@ USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
-USE_GNU_READLINE= # uses rl_startup_hook
+# uses rl_startup_hook
+USE_GNU_READLINE= yes
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/liba52/PLIST b/audio/liba52/PLIST
index a161587e401..ed404f13f91 100644
--- a/audio/liba52/PLIST
+++ b/audio/liba52/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:16 jlam Exp $
-bin/extract_a52
+@comment $NetBSD: PLIST,v 1.5 2007/02/22 19:01:14 wiz Exp $
bin/a52dec
+bin/extract_a52
include/a52dec/a52.h
include/a52dec/attributes.h
include/a52dec/audio_out.h
diff --git a/audio/libmusepack/Makefile b/audio/libmusepack/Makefile
index 3a17a116e58..7747204e5c7 100644
--- a/audio/libmusepack/Makefile
+++ b/audio/libmusepack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/02/01 10:21:57 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:01:14 wiz Exp $
#
DISTNAME= libmusepack-1.0.3
@@ -12,5 +12,6 @@ COMMENT= Portable Musepack decoder library
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index f6d82e9ee68..9c1e0fea849 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/09 20:32:38 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:01:14 wiz Exp $
DISTNAME= libtunepimp-0.5.3
PKGREVISION= 2
@@ -7,7 +7,7 @@ MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
http://ftp.musicbrainz.org/pub/musicbrainz/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://musicbrainz.org/products/tunepimp/index.html
+HOMEPAGE= http://musicbrainz.org/doc/libtunepimp
COMMENT= Library to support MusicBrainz enabled tagging
GNU_CONFIGURE= YES
diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile
index f4c39419938..75760311b82 100644
--- a/audio/libvisual/Makefile
+++ b/audio/libvisual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/26 19:24:42 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:14 wiz Exp $
#
DISTNAME= libvisual-0.4.0
@@ -20,9 +20,9 @@ USE_TOOLS+= pkg-config
.include "../../mk/compiler.mk"
.if ${MACHINE_ARCH} == "i386"
-.if !empty(CC_VERSION:Mgcc*)
+. if !empty(CC_VERSION:Mgcc*)
CPPFLAGS+= -mmmx
-.endif
+. endif
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index c1146389804..952e78a375f 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/11/07 09:24:32 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:14 wiz Exp $
#
DISTNAME= taglib-1.4
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
pre-build:
- ${CP} ${FILESDIR}/id3lib_strings.h ${WRKSRC}/taglib/toolkit/.
+ cp ${FILESDIR}/id3lib_strings.h ${WRKSRC}/taglib/toolkit/.
post-install:
${INSTALL_DATA} ${FILESDIR}/id3lib_strings.h ${DESTDIR}${PREFIX}/include/taglib/.
diff --git a/audio/wavesurfer/Makefile b/audio/wavesurfer/Makefile
index c948efb4cf8..8a2710f1494 100644
--- a/audio/wavesurfer/Makefile
+++ b/audio/wavesurfer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/06/18 07:59:34 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:01:14 wiz Exp $
DISTNAME= wavesurfer-1.7.4
PKGREVISION= 1
@@ -26,6 +26,6 @@ INSTALLATION_DIRS= bin lib
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/wavesurfer.tcl ${PREFIX}/bin/wavesurfer
- cd ${WRKSRC} && ${PAX} -wr -pm wsurf1.7 ${PREFIX}/lib/
+ cd ${WRKSRC} && pax -wr -pm wsurf1.7 ${PREFIX}/lib/
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index df90fb5be96..6bbc4d508d5 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:01:14 wiz Exp $
#
DISTNAME= xanalyser-1.24
PKGREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ftp://ftp.suse.com/pub/people/arvin/private/
+MASTER_SITES= http://arvin.schnell-web.net/xanalyser/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= root@garbled.net
-HOMEPAGE= http://www.suse.de/~arvin/xanalyser/
+HOMEPAGE= http://arvin.schnell-web.net/xanalyser/
COMMENT= Frequency spectrum analyser for X
USE_LANGUAGES= c c++
diff --git a/audio/xmms-funtimedancer/Makefile b/audio/xmms-funtimedancer/Makefile
index d82e522be31..7add466f8a6 100644
--- a/audio/xmms-funtimedancer/Makefile
+++ b/audio/xmms-funtimedancer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/12 16:28:05 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:01:15 wiz Exp $
#
DISTNAME= FunTimeDancer-0.1
@@ -14,7 +14,7 @@ COMMENT= XMMS plugin displaying an animation
post-install:
cd ${WRKDIR} && \
- ${PAX} -rw -pe FunTimeDancer ${PREFIX}/lib/xmms/Visualization
+ pax -rw -pp FunTimeDancer ${PREFIX}/lib/xmms/Visualization
.include "../../audio/xmms/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/benchmarks/thrulay/Makefile b/benchmarks/thrulay/Makefile
index d86664933ec..b2bb0c85791 100644
--- a/benchmarks/thrulay/Makefile
+++ b/benchmarks/thrulay/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/08/14 13:31:21 rpaulo Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:01:15 wiz Exp $
DISTNAME= thrulay-0.8
CATEGORIES= benchmarks net
-MASTER_SITES= http://www.internet2.edu/~shalunov/thrulay/
+MASTER_SITES= http://shlang.com/thrulay/
MAINTAINER= rpaulo@NetBSD.org
-HOMEPAGE= http://www.internet2.edu/~shalunov/thrulay/
+HOMEPAGE= http://shlang.com/thrulay/
COMMENT= TCP and UDP network capacity tester
ONLY_FOR_PLATFORM= DragonFly-*-i386 FreeBSD-*-i386 Linux-*-i386 \
diff --git a/benchmarks/thrulay/PLIST b/benchmarks/thrulay/PLIST
index ed5ed2fc3c0..1dd02bf8bee 100644
--- a/benchmarks/thrulay/PLIST
+++ b/benchmarks/thrulay/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2006/08/14 13:31:21 rpaulo Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/02/22 19:01:15 wiz Exp $
bin/thrulay
-sbin/thrulayd
man/man1/thrulay.1
man/man8/thrulayd.8
+sbin/thrulayd
diff --git a/cad/gtk1-wcalc/Makefile b/cad/gtk1-wcalc/Makefile
index a6daa077595..a509ed09d09 100644
--- a/cad/gtk1-wcalc/Makefile
+++ b/cad/gtk1-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:21 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:01:15 wiz Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -7,7 +7,7 @@ PKGREVISION= 1
COMMENT= GTK Based Transmission Line Analysis/Synthesis Calculator
-CONFLICTS+= gtk2-wcalc-*
+CONFLICTS+= gtk2-wcalc-[0-9]*
# Only enable the gtk frontend
CONFIGURE_ARGS+= --disable-cgi
diff --git a/cad/gtk2-wcalc/Makefile b/cad/gtk2-wcalc/Makefile
index e28facb868a..64d53bc8c1d 100644
--- a/cad/gtk2-wcalc/Makefile
+++ b/cad/gtk2-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/04/17 13:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:01:15 wiz Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -7,7 +7,7 @@ PKGREVISION= 3
COMMENT= GTK2 Based Transmission Line Analysis/Synthesis Calculator
-CONFLICTS+= gtk1-wcalc-*
+CONFLICTS+= gtk1-wcalc-[0-9]*
# Only enable the gtk frontend
CONFIGURE_ARGS+= --disable-cgi
diff --git a/cad/simian-docs/Makefile b/cad/simian-docs/Makefile
index c25785f46c2..151dba5ae6b 100644
--- a/cad/simian-docs/Makefile
+++ b/cad/simian-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/05/02 02:27:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:01:15 wiz Exp $
#
DISTNAME= simian_man_12_98
@@ -25,6 +25,6 @@ NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simian
- ${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${PREFIX}/share/doc/simian
+ ${INSTALL_DATA} ${DISTDIR}/${DISTFILES:Q} ${PREFIX}/share/doc/simian
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/amsn/Makefile b/chat/amsn/Makefile
index 27536d54171..3796dde9189 100644
--- a/chat/amsn/Makefile
+++ b/chat/amsn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:23 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:01:15 wiz Exp $
#
DISTNAME= amsn-0_94
@@ -8,7 +8,7 @@ CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amsn/}
MAINTAINER= peter@pointless.nl
-HOMEPAGE= http://amsn.sourceforge.net/
+HOMEPAGE= http://www.amsn-project.net/
COMMENT= "Alvaro's MSN messenger client"
NO_CONFIGURE= YES
diff --git a/chat/bsflite/Makefile b/chat/bsflite/Makefile
index 44c463a4ef4..2aab8f77414 100644
--- a/chat/bsflite/Makefile
+++ b/chat/bsflite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/11/23 00:54:01 obache Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:01:15 wiz Exp $
DISTNAME= bsflite-0.82
CATEGORIES= chat
@@ -20,6 +20,6 @@ do-install:
${PREFIX}/share/examples/bsflite
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS=${LIBS:M*:Q}
+MAKE_ENV+= LIBS=${LIBS:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/xaric/Makefile b/chat/xaric/Makefile
index 683375350e5..406d980a0af 100644
--- a/chat/xaric/Makefile
+++ b/chat/xaric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:04 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:01:16 wiz Exp $
#
DISTNAME= xaric-0.12.1
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.xaric.org/pub/xaric/ \
http://www.xaric.org/downloads/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.xaric.org/
+HOMEPAGE= http://rf.cx/software/xaric/
COMMENT= IRC client similar to BitchX and ircII
GNU_CONFIGURE= yes
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 78143cf2dcd..967335d3536 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.59 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2007/02/22 19:01:16 wiz Exp $
#
DISTNAME= jpilot-0.99.9
CATEGORIES= comms
-MASTER_SITES= http://jpilot.org/
+MASTER_SITES= http://www.jpilot.org/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://jpilot.org/
+HOMEPAGE= http://www.jpilot.org/
COMMENT= Desktop organizer application for the palm pilot
CONFLICTS+= jpilot-libplugin-[0-9]*
diff --git a/converters/latex2rtf/DESCR b/converters/latex2rtf/DESCR
index 0d5b758059d..254455094dd 100644
--- a/converters/latex2rtf/DESCR
+++ b/converters/latex2rtf/DESCR
@@ -6,4 +6,4 @@ making the new file look very similar to the original.
This package also provides latex2png for converting a LaTeX or EPS
files to a PNG image. It needs latex, ImageMagick's convert,
-Ghostscript's eps2eps, and netpbm's pngtopnm and pnmcut.
+Ghostscript's eps2eps, and netpbm's pngtopnm and pnmcut.
diff --git a/databases/p5-DB_File-Lock/Makefile b/databases/p5-DB_File-Lock/Makefile
index 3480ed4f241..da8f1d85b93 100644
--- a/databases/p5-DB_File-Lock/Makefile
+++ b/databases/p5-DB_File-Lock/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2006/06/03 11:45:56 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:01:16 wiz Exp $
DISTNAME= DB_File-Lock-0.05
PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5dbfl
+SVR4_PKGNAME= p5dfl
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DB_File-Lock/}
diff --git a/databases/p5-DB_File/Makefile b/databases/p5-DB_File/Makefile
index 1a1b8f30653..b2aa42e815b 100644
--- a/databases/p5-DB_File/Makefile
+++ b/databases/p5-DB_File/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:10 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:01:16 wiz Exp $
DISTNAME= DB_File-1.814
PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5dbfi
+SVR4_PKGNAME= p5dfi
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DB_File/}
diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index 02be03f199e..f79daca4ae2 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/12/28 12:12:58 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:01:16 wiz Exp $
#
DISTNAME= psycopg2-2.0.5.1
@@ -8,7 +8,7 @@ CATEGORIES= databases python
MASTER_SITES= http://initd.org/pub/software/psycopg/
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://initd.org/software/psycopg2/
+HOMEPAGE= http://initd.org/projects/psycopg2/
COMMENT= PostgreSQL database adapter for Python
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index ff16ad9ec3e..f3f4d7210f4 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/12/28 12:12:58 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:01:16 wiz Exp $
DISTNAME= slony1-1.2.0
PKGREVISION= 1
@@ -7,7 +7,7 @@ MASTER_SITES= http://pgfoundry.org/frs/download.php/1136/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= adam@NetBSD.org
-HOMEPAGE= http://gborg.postgresql.org/project/slony1/
+HOMEPAGE= http://gborg.postgresql.org/project/slony1/projdisplay.php
COMMENT= Replication system for PostgreSQL
DEPENDS+= postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 65786fca743..d54ce13dc64 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.17 2006/12/06 14:14:11 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:17 wiz Exp $
DISTNAME= cook-2.26
PKGREVISION= 1
CATEGORIES= devel
-MASTER_SITES= http://www.canb.auug.org.au/~millerp/cook/
+MASTER_SITES= http://miller.emu.id.au/pmiller/software/cook/
MAINTAINER= groo@NetBSD.org
-HOMEPAGE= http://www.canb.auug.org.au/~millerp/cook/cook.html
+HOMEPAGE= http://miller.emu.id.au/pmiller/software/cook/
COMMENT= More powerful replacement for the traditional make(1) tool
USE_TOOLS+= msgfmt yacc perl:run
diff --git a/devel/cqual/Makefile b/devel/cqual/Makefile
index 0eecc09fe32..45e221b05c0 100644
--- a/devel/cqual/Makefile
+++ b/devel/cqual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/07/17 22:16:55 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:01:17 wiz Exp $
#
DISTNAME= cqual-0.991
@@ -7,7 +7,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cqual/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cqual.sourceforge.net/
+HOMEPAGE= http://www.cs.umd.edu/~jfoster/cqual/
COMMENT= Tool for adding type qualifiers to C
USE_PKGLOCALEDIR= yes
diff --git a/devel/eric3/Makefile b/devel/eric3/Makefile
index 62110064457..f96f6bd9171 100644
--- a/devel/eric3/Makefile
+++ b/devel/eric3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/21 17:16:34 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:17 wiz Exp $
#
DISTNAME= eric-3.8.1
@@ -6,7 +6,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eric-ide/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.die-offenbachs.de/detlev/eric3.html
+HOMEPAGE= http://www.die-offenbachs.de/detlev/eric.html
COMMENT= Python IDE
DEPENDS+= ${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules
diff --git a/devel/global/Makefile b/devel/global/Makefile
index a9c306612cc..d4ffc978d9f 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2006/11/14 14:14:52 obache Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:01:17 wiz Exp $
#
DISTNAME= global-5.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=global/} \
- http://tamacom.com/global/
+ http://www.tamacom.com/global/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/global/
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 9741f37e2a4..3625c1c8941 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/12/09 03:38:16 jnemeth Exp $
+# $NetBSD: Makefile,v 1.43 2007/02/22 19:01:17 wiz Exp $
DISTNAME= gmp-4.2.1
CATEGORIES= devel math
@@ -6,7 +6,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=gmp/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gnu.org/software/gmp/gmp.html
+HOMEPAGE= http://swox.com/gmp/
COMMENT= Library for arbitrary precision arithmetic
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 89c7e5f153a..098882a5d9a 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/12/05 17:43:06 tron Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:01:17 wiz Exp $
DISTNAME= nspr-4.6.1
PKGREVISION= 3
@@ -37,7 +37,7 @@ INSTALLATION_DIRS= bin
# see ${WRKSRC}/nspr-4.6.1/mozilla/nsprpub/pr/src/md/unix/Makefile.in
# for the bit about 32-bit sun4u machines installing an extra file.
# That is why we have this specific test and modify the PLIST
-.if ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS"
. if defined(ABI) && ${ABI} == "64"
CONFIGURE_ARGS+= --enable-64bit
. else
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index e211ac5d95a..9b4e64c9058 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/04 21:35:59 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:17 wiz Exp $
#
DISTNAME= Proc-Daemon-0.03
@@ -9,7 +9,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Proc/}
MAINTAINER= sketch@NetBSD.org
-HOMEPAGE= http://www.earlhood.com/earlsperls.html
+HOMEPAGE= http://www.mhonarc.org/~ehood/earlsperls.html
COMMENT= Provide capability for a Perl program to run as a daemon
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/devel/py-distutils/Makefile b/devel/py-distutils/Makefile
index 880d8cfce14..b0de5573641 100644
--- a/devel/py-distutils/Makefile
+++ b/devel/py-distutils/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2006/09/24 18:25:19 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:01:17 wiz Exp $
#
DISTNAME= Distutils-1.0.2
PKGNAME= ${PYPKGPREFIX}-distutils-1.0.2
CATEGORIES= devel python
-MASTER_SITES= http://www.python.org/sigs/distutils-sig/download/
+MASTER_SITES= http://www.python.org/community/sigs/current/distutils-sig/download/
MAINTAINER= drochner@NetBSD.org
-HOMEPAGE= http://www.python.org/sigs/distutils-sig/
+HOMEPAGE= http://www.python.org/community/sigs/current/distutils-sig/
COMMENT= Distribution Utilities for Python
PYTHON_VERSIONS_ACCEPTED= 15
diff --git a/devel/python-mode/Makefile b/devel/python-mode/Makefile
index 09f776adfbb..0c34da32109 100644
--- a/devel/python-mode/Makefile
+++ b/devel/python-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/04 21:36:00 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:18 wiz Exp $
#
DISTNAME= python-mode-4.54
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-mode/}
DISTFILES= python-mode.el
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/project/python-mode/
+HOMEPAGE= http://sourceforge.net/projects/python-mode/
COMMENT= Emacs mode for editing python files
# Note that XEmacs >=21.4.4 includes a python-mode in the prog-modes
diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile
index 24674ffe448..7ea714c3cc6 100644
--- a/devel/ruby-amstd/Makefile
+++ b/devel/ruby-amstd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/14 08:02:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:01:18 wiz Exp $
DISTNAME= amstd-2.0.0
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -7,7 +7,7 @@ CATEGORIES= devel ruby
MASTER_SITES= http://www.loveruby.net/archive/amstd/
MAINTAINER= taca@NetBSD.org
-HOMEPAGE= http://i.loveruby.net/en/projects/amstd
+HOMEPAGE= http://i.loveruby.net/en/projects/amstd/
COMMENT= Collection of miscellaneous Ruby modules
USE_RUBY_SETUP= yes
diff --git a/editors/mflteco/Makefile b/editors/mflteco/Makefile
index d07a57ce72c..757b5d8637a 100644
--- a/editors/mflteco/Makefile
+++ b/editors/mflteco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/07/06 21:14:19 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:01:18 wiz Exp $
#
PKGNAME= mflteco-19920331
@@ -28,7 +28,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/tecorc.mch ${XMPL}
-pre-patch:
+pre-patch:
cp ${WRKSRC}/Makefile.sun4 ${WRKSRC}/Makefile
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index 89e90ce3414..a350c239c78 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:01:18 wiz Exp $
#
DISTNAME= nvi-1.81.5
PKGREVISION= 3
CATEGORIES= editors
-MASTER_SITES= http://www.kotnet.org/~skimo/nvi/devel/
+MASTER_SITES= http://193.190.253.81/~skimo/nvi/devel/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.kotnet.org/~skimo/nvi/devel/
+HOMEPAGE= http://193.190.253.81/~skimo/nvi/devel/
COMMENT= Berkeley nvi with additional features
.include "../../mk/bsd.prefs.mk"
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 407b8173de3..91ec49f3879 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2007/01/30 23:13:37 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:18 wiz Exp $
#
DISTNAME= wily-0.13.41
PKGREVISION= 1
CATEGORIES= editors plan9
-MASTER_SITES= ftp://ftp.cs.yorku.ca/pub/wily/src/old/
+MASTER_SITES= ftp://ftp.cse.yorku.ca/pub/wily/src/old/
EXTRACT_SUFX= .tgz
MAINTAINER= agc@NetBSD.org
-HOMEPAGE= http://www.cs.yorku.ca/~oz/wily/
+HOMEPAGE= http://www.cse.yorku.ca/~oz/wily/
COMMENT= Unix/X11 clone of the Plan9 acme editor/environment
GNU_CONFIGURE= yes
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index b4a0107a64e..a10318a721f 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.28 2006/05/13 20:52:35 adam Exp $
+# $NetBSD: Makefile,v 1.29 2007/02/22 19:01:18 wiz Exp $
DISTNAME= BasiliskII_src_01052006
PKGNAME= BasiliskII-1.0.20060501
CATEGORIES= emulators
-MASTER_SITES= http://www.gibix.net/projects/basilisk2/files/
+MASTER_SITES= http://gwenole.beauchesne.info/projects/basilisk2/files/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gibix.net/projects/basilisk2/
+HOMEPAGE= http://gwenole.beauchesne.info/projects/basilisk2/
COMMENT= Open Source 68k Macintosh emulator
WRKSRC= ${WRKDIR}/BasiliskII-1.0
diff --git a/emulators/ski/DESCR b/emulators/ski/DESCR
index 80ed627a71a..9668c250e7a 100644
--- a/emulators/ski/DESCR
+++ b/emulators/ski/DESCR
@@ -2,12 +2,16 @@ The Hewlett-Packard IA-64 instruction set simulator for Linux/x86
To get the ski to run on NetBSD/i386, you need the following:
-compat_linux support in the kernel: http://www.netbsd.org/guide/en/chap-linux.html
-procfs support in the kernel: http://www.netbsd.org/guide/en/chap-linux.html#chap-linux-emulating-procfs
-mount /dev/pts: http://mail-index.netbsd.org/tech-kern/2004/11/08/0016.html
+compat_linux support in the kernel:
+ http://www.netbsd.org/guide/en/chap-linux.html
+procfs support in the kernel:
+ http://www.netbsd.org/guide/en/chap-linux.html#chap-linux-emulating-procfs
+mount /dev/pts:
+ http://mail-index.netbsd.org/tech-kern/2004/11/08/0016.html
-Tip: You can run the ski emulator with qemu usermode emulation on non i386 platforms
+Tip: You can run the ski emulator with qemu usermode emulation on
+non-i386 platforms.
-run the ski binary from within an xterm window.
+Run the ski binary from within an xterm window.
-BUGS: the xserver version xski doesn't currently work. \ No newline at end of file
+BUGS: the xserver version xski doesn't currently work.
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 46c161a6ba5..b690962fb85 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/09/03 00:56:29 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/22 19:01:18 wiz Exp $
DISTNAME= Rollemup
PKGNAME= rollemup-1.0
@@ -21,10 +21,6 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_CONFIGURE= yes
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
PLIST_SRC= ${WRKDIR}/PLIST.src
GAMES_DIR= share/games
diff --git a/geography/gpsutils/Makefile b/geography/gpsutils/Makefile
index 2897ddde9ec..24cf9b69c18 100644
--- a/geography/gpsutils/Makefile
+++ b/geography/gpsutils/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2006/05/11 11:05:54 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:01:19 wiz Exp $
#
DISTNAME= gpsutils-0.4.0
CATEGORIES= geography
-MASTER_SITES= http://www.wombat.ie/gps/
+MASTER_SITES= http://wombat.ie/gps/
MAINTAINER= hdp@cs.nmsu.edu
-HOMEPAGE= http://www.wombat.ie/gps/
+HOMEPAGE= http://wombat.ie/gps/
COMMENT= Capture and convert data from a Garmin GPS receiver
WRKSRC= ${WRKDIR}/gpsutils-0.4.0/src
diff --git a/graphics/dia/options.mk b/graphics/dia/options.mk
index e235c47289b..c11897839f5 100644
--- a/graphics/dia/options.mk
+++ b/graphics/dia/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2006/06/11 16:55:35 drochner Exp $
+# $NetBSD: options.mk,v 1.5 2007/02/22 19:01:19 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dia
#PKG_SUPPORTED_OPTIONS= gnome cairo
PKG_SUPPORTED_OPTIONS= gnome
-PKG_SUGGESTED_OPTIONS= gnome
+PKG_SUGGESTED_OPTIONS= gnome
.include "../../mk/bsd.options.mk"
diff --git a/graphics/digikam-doc/Makefile b/graphics/digikam-doc/Makefile
index 5d71a94dea5..ebce56aea60 100644
--- a/graphics/digikam-doc/Makefile
+++ b/graphics/digikam-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/17 23:47:20 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:01:19 wiz Exp $
DISTNAME= digikam-doc-0.8.2
PKGREVISION= 1
@@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://digikam.sourceforge.net/
+HOMEPAGE= http://www.digikam.org/
COMMENT= Documentation for Digikam
USE_DIRS+= xdg-1.1
diff --git a/graphics/digikamimageplugins/Makefile b/graphics/digikamimageplugins/Makefile
index b423740071a..f793a864bbf 100644
--- a/graphics/digikamimageplugins/Makefile
+++ b/graphics/digikamimageplugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/01/26 04:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:01:19 wiz Exp $
DISTNAME= digikamimageplugins-0.9.0
PKGREVISION= 2
@@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://digikam.sourceforge.net/
+HOMEPAGE= http://www.digikam.org/
COMMENT= Plugins for Digikam's ImageEditor
USE_TOOLS+= gmake msgfmt perl
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 92da604f21d..10e1d4fbabf 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.30 2007/02/15 14:58:20 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:01:19 wiz Exp $
#
DISTNAME= feh-1.3.4
PKGREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= http://www.linuxbrit.co.uk/downloads/
+MASTER_SITES= http://linuxbrit.co.uk/downloads/
MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://www.linuxbrit.co.uk/feh/
+HOMEPAGE= http://linuxbrit.co.uk/feh/
COMMENT= Advanced image viewer
DEPENDS+= wget-[0-9]*:../../net/wget
diff --git a/graphics/tuxpaint-stamps/Makefile b/graphics/tuxpaint-stamps/Makefile
index 50435c5015e..ea2fab8d346 100644
--- a/graphics/tuxpaint-stamps/Makefile
+++ b/graphics/tuxpaint-stamps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:52 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:01:20 wiz Exp $
#
DISTNAME= tuxpaint-stamps-2004-10-03
@@ -8,7 +8,7 @@ CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.newbreedsoftware.com/tuxpaint/
+HOMEPAGE= http://www.tuxpaint.org/
COMMENT= Rubber stamps for Tux Paint
DEPENDS+= tuxpaint>=0.9.13:../../graphics/tuxpaint
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 3d2b5d07d5b..14bd8fb25ba 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2007/02/22 19:01:19 wiz Exp $
#
DISTNAME= tuxpaint-0.9.14
@@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/} \
ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/source/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.newbreedsoftware.com/tuxpaint/
+HOMEPAGE= http://www.tuxpaint.org/
COMMENT= Drawing program for small children
USE_TOOLS+= gmake msgfmt
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index e96bc234291..736d6b809f9 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/12/06 07:28:25 obache Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:01:20 wiz Exp $
DISTNAME= gpc-2.1
PKGREVISION= 5
@@ -9,7 +9,7 @@ DISTFILES+= gcc-2.95.3.tar.gz
SITES.gcc-2.95.3.tar.gz=${MASTER_SITE_GNU:=gcc/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gnu-pascal.de/
+HOMEPAGE= http://www.gnu-pascal.de/gpc/h-index.html
COMMENT= GNU Pascal Compiler
PATCH_SITES= ${MASTER_SITE_LOCAL}
diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common
index 07a0ebd0b9e..fe4fe8f97f3 100644
--- a/lang/php5/Makefile.common
+++ b/lang/php5/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.23 2007/02/20 20:46:19 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.24 2007/02/22 19:01:21 wiz Exp $
.if !defined(DISTNAME)
DISTNAME= php-${PHP_BASE_VERS}
DIST_SUBDIR= ${DISTNAME}
.endif
-CATEGORIES+= www php5
+CATEGORIES+= www
.if !defined(PECL_VERSION)
MASTER_SITES?= http://www.php.net/distributions/ \
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 797108f0ac4..61007dda8b1 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/04/05 06:27:42 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:21 wiz Exp $
#
# Convert the version number as follows 2d2 -> 2.4.2, where the d is
# changed to a 4, representing the 4th letter.
@@ -41,7 +41,7 @@ do-configure:
${SED} -e "s|@CC@|"${CC:Q}"|g" \
-e "s|@CFLAGS@|"${CFLAGS:Q}"|g" \
-e "s|@PREFIX@|"${PREFIX:Q}"|g" \
- ${FILESDIR}/buildscm.sh > ${WRKSRC}/buildscm.sh
+ ${FILESDIR}/buildscm.sh > ${WRKSRC}/buildscm.sh
post-build:
cd ${WRKSRC} && ${SH} ./buildscm.sh
diff --git a/lang/sun-jre13/builtin.mk b/lang/sun-jre13/builtin.mk
index 87f68c89dd3..7942af7fbb6 100644
--- a/lang/sun-jre13/builtin.mk
+++ b/lang/sun-jre13/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2006/07/07 02:58:20 minskim Exp $
+# $NetBSD: builtin.mk,v 1.2 2007/02/22 19:01:21 wiz Exp $
BUILTIN_PKG:= sun-jre13
@@ -29,7 +29,7 @@ MAKEVARS+= IS_BUILTIN.sun-jre13
!empty(IS_BUILTIN.sun-jre13:M[yY][eE][sS]) && \
empty(JAVAVM13:M__nonexistent__)
BUILTIN_VERSION.sun-jre13!= \
- ${BASENAME} /System/Library/Frameworks/JavaVM.framework/Versions/1.3.*
+ ${BASENAME} /System/Library/Frameworks/JavaVM.framework/Versions/1.3.*
BUILTIN_PKG.sun-jre13= sun-jre13-${BUILTIN_VERSION.sun-jre13}
.endif
MAKEVARS+= BUILTIN_PKG.sun-jre13
diff --git a/lang/sun-jre14/builtin.mk b/lang/sun-jre14/builtin.mk
index 8dfc8256720..9dd497f1153 100644
--- a/lang/sun-jre14/builtin.mk
+++ b/lang/sun-jre14/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/07/07 02:55:28 minskim Exp $
+# $NetBSD: builtin.mk,v 1.3 2007/02/22 19:01:21 wiz Exp $
BUILTIN_PKG:= sun-jre14
@@ -29,7 +29,7 @@ MAKEVARS+= IS_BUILTIN.sun-jre14
!empty(IS_BUILTIN.sun-jre14:M[yY][eE][sS]) && \
empty(JAVAVM14:M__nonexistent__)
BUILTIN_VERSION.sun-jre14!= \
- ${BASENAME} /System/Library/Frameworks/JavaVM.framework/Versions/1.4.*
+ ${BASENAME} /System/Library/Frameworks/JavaVM.framework/Versions/1.4.*
BUILTIN_PKG.sun-jre14= sun-jre14-${BUILTIN_VERSION.sun-jre14}
.endif
MAKEVARS+= BUILTIN_PKG.sun-jre14
diff --git a/lang/tcl-expect/PLIST b/lang/tcl-expect/PLIST
index dd741df0b2e..1d1f98d74ee 100644
--- a/lang/tcl-expect/PLIST
+++ b/lang/tcl-expect/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/04/08 11:54:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/02/22 19:01:21 wiz Exp $
bin/expect
include/expect.h
include/expect_comm.h
@@ -6,8 +6,8 @@ include/expect_tcl.h
include/tcldbg.h
lib/libexpect543.la
lib/tcl/expect5.43/pkgIndex.tcl
-man/man1/expect.1.gz
-man/man3/libexpect.3.gz
+man/man1/expect.1
+man/man3/libexpect.3
share/examples/tcl/expect/autoexpect
share/examples/tcl/expect/autoexpect.1
share/examples/tcl/expect/autopasswd
diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile
index c416a504d1b..88e182bb811 100644
--- a/mail/gnus/Makefile
+++ b/mail/gnus/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2006/11/10 18:04:09 perry Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:21 wiz Exp $
DISTNAME= gnus-5.10.8
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
CATEGORIES= mail news
-MASTER_SITES= http://www.gnus.org/dist/
+MASTER_SITES= http://gnus.org/dist/
MAINTAINER= lha@NetBSD.org
-HOMEPAGE= http://www.gnus.org/
+HOMEPAGE= http://gnus.org/
COMMENT= Gnus is a flexible message reader running under GNU Emacs
#EMACS_VERSIONS_ACCEPTED= emacs21 emacs20 xemacs211 xemacs215
diff --git a/mail/qgreylist/Makefile b/mail/qgreylist/Makefile
index c2d747c5df6..9e9218749f3 100644
--- a/mail/qgreylist/Makefile
+++ b/mail/qgreylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:47:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:01:22 wiz Exp $
#
DISTNAME= qgreylist-0.3
@@ -6,7 +6,7 @@ CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}
MAINTAINER= schmonz@NetBSD.org
-HOMEPAGE= http://www.jonatkins.com/page/software/qgreylist/
+HOMEPAGE= http://www.jonatkins.com/page/software/qgreylist
COMMENT= Simple greylisting for qmail
DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail
diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common
index 6f0fe6c93ba..94bdc57a742 100644
--- a/mail/sylpheed-claws/Makefile.common
+++ b/mail/sylpheed-claws/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.19 2007/02/06 18:54:15 joerg Exp $
+# $NetBSD: Makefile.common,v 1.20 2007/02/22 19:01:22 wiz Exp $
DISTNAME= sylpheed-claws-${SYLPHEED_VERSION}
CATEGORIES= mail news x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
EXTRACT_SUFX= .tar.bz2
-HOMEPAGE= http://claws.sylpheed.org/
+HOMEPAGE= http://www.claws-mail.org/
DISTINFO_FILE= ${.CURDIR}/../../mail/sylpheed-claws/distinfo
PATCHDIR= ${.CURDIR}/../../mail/sylpheed-claws/patches
diff --git a/math/graphopt/Makefile b/math/graphopt/Makefile
index 6e9006fa557..68079a22b4b 100644
--- a/math/graphopt/Makefile
+++ b/math/graphopt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/07/22 04:46:16 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:01:22 wiz Exp $
#
DISTNAME= graphopt-0.4.1
@@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=graphopt/}
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://schmuhl.org/graphopt/
+HOMEPAGE= http://sourceforge.net/projects/graphopt/
COMMENT= Optimize graph layouts
USE_DIRS+= xdg-1.1
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 9b34a6e7d56..15f16a10e77 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/07/10 16:09:47 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2007/02/22 19:01:22 wiz Exp $
DISTNAME= Guppi-0.40.3
PKGNAME= ${DISTNAME:S/G/g/}
@@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=sources/Guppi/0.40/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gnome.org/guppi/
+HOMEPAGE= http://www.gnome.org/projects/guppi/
COMMENT= Plot program with integrated statistics capabilities
# guppi is no longer maintained, see e.g.
diff --git a/math/xlife/Makefile b/math/xlife/Makefile
index 3a23f6c456e..da27193e66b 100644
--- a/math/xlife/Makefile
+++ b/math/xlife/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:39 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:22 wiz Exp $
#
DISTNAME= xlife-5.0
PKGREVISION= 5
CATEGORIES= math games
-MASTER_SITES= http://www.tuxedo.org/~esr/
+MASTER_SITES= http://www.catb.org/~esr/
MAINTAINER= fredb@NetBSD.org
-HOMEPAGE= http://www.tuxedo.org/~esr/software.html
+HOMEPAGE= http://www.catb.org/~esr/software.html
COMMENT= John Horton Conway's "Game of Life"
WRKSRC= ${WRKDIR}
diff --git a/misc/ascii/Makefile b/misc/ascii/Makefile
index ecd2934c2db..7afb6b433cf 100644
--- a/misc/ascii/Makefile
+++ b/misc/ascii/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:00 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:22 wiz Exp $
#
DISTNAME= ascii-3.0
CATEGORIES= misc
-MASTER_SITES= http://www.tuxedo.org/~esr/
+MASTER_SITES= http://www.catb.org/~esr/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.tuxedo.org/~esr/software.html
+HOMEPAGE= http://www.catb.org/~esr/ascii/
COMMENT= ASCII character table program
BUILD_TARGET= ascii
diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile
index 02d40f1dc52..9f88b875c27 100644
--- a/misc/colortail/Makefile
+++ b/misc/colortail/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:00 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:22 wiz Exp $
DISTNAME= colortail-0.3.0
CATEGORIES= misc
-MASTER_SITES= http://morrdusk.net/files/
+MASTER_SITES= http://joakimandersson.se/files/
MAINTAINER= zuntum@NetBSD.org
-HOMEPAGE= http://morrdusk.net/projects/colortail/
+HOMEPAGE= http://joakimandersson.se/projects/colortail/
COMMENT= Colour-able replacement for tail(1)
USE_LANGUAGES= c c++
diff --git a/misc/koffice/DESCR b/misc/koffice/DESCR
index cb869c72476..0028a5221b6 100644
--- a/misc/koffice/DESCR
+++ b/misc/koffice/DESCR
@@ -12,9 +12,9 @@ It includes:
Karbon14 - a vector-drawing application
KPlato - a technology preview of a new project management application
-Additionally, KOffice includes robust embeddable objects:
+Additionally, KOffice includes robust embeddable objects:
Kugar - report generator (deprecated)
KChart - full-featured charting engine
KFormula - mathematical formula handling
as well as a built-in thesaurus (KThesaurus) and support for many different
-file formats.
+file formats.
diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
index 28e829a5d9e..3007ed932df 100644
--- a/misc/logsurfer/Makefile
+++ b/misc/logsurfer/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.16 2006/12/07 12:51:36 obache Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:22 wiz Exp $
DISTNAME= logsurfer-1.5b
PKGNAME= logsurfer-1.6.2
CATEGORIES= misc
-MASTER_SITES= ftp://ftp.cert.dfn.de/pub/tools/audit/logsurfer/
+MASTER_SITES= ftp://ftp.dfn-cert.de/pub/tools/audit/logsurfer/
PATCH_SITES= http://www.crypt.gen.nz/logsurfer/
PATCHFILES= logsurfer-15b-16b.patch
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cert.dfn.de/eng/logsurf/
+HOMEPAGE= http://www.dfn-cert.de/eng/logsurf/
COMMENT= Processes logfiles and performs certain actions
PATCH_DIST_STRIP.logsurfer-15b-16b.patch= -p2
@@ -20,4 +20,12 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE}
BUILD_DEFS+= VARBASE
+EGDIR= ${PREFIX}/share/examples/logsurfer
+
+INSTALLATION_DIRS= ${EGDIR}
+
+post-install:
+ ${MKDIR} ${EGDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/start-mail/start-mail ${EGDIR}/start-mail
+
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/logsurfer/PLIST b/misc/logsurfer/PLIST
index 3d0274f31ac..2bf6cd73e20 100644
--- a/misc/logsurfer/PLIST
+++ b/misc/logsurfer/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2006/12/07 12:51:36 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/02/22 19:01:22 wiz Exp $
bin/logsurfer
man/man1/logsurfer.1
man/man4/logsurfer.conf.4
+share/examples/logsurfer/start-mail
+@dirrm share/examples/logsurfer
diff --git a/misc/p5-Geo-Weather/DESCR b/misc/p5-Geo-Weather/DESCR
index e2493e89a01..e0fbf7f0dc8 100644
--- a/misc/p5-Geo-Weather/DESCR
+++ b/misc/p5-Geo-Weather/DESCR
@@ -1,3 +1,3 @@
The Geo::Weather module retrieves the current weather from weather.com
when given city and state or a US zip code. Geo::Weather relies on
-LWP::UserAgent to work.
+LWP::UserAgent to work.
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 0ce0da55b5d..e035ef2b07c 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:10:13 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:01:23 wiz Exp $
#
DISTNAME= pdmenu_1.2.65
@@ -8,7 +8,7 @@ CATEGORIES= misc
MASTER_SITES= http://www.kitenet.net/programs/pdmenu/
MAINTAINER= zuntum@NetBSD.org
-HOMEPAGE= http://www.kitenet.net/programs/pdmenu/
+HOMEPAGE= http://www.kitenet.net/~joey/code/pdmenu.html
COMMENT= Simple console menu program
WRKSRC= ${WRKDIR}/pdmenu
diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile
index 599877c6fbe..03cf0d41b95 100644
--- a/multimedia/RealPlayerGold/Makefile
+++ b/multimedia/RealPlayerGold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/15 20:45:49 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:23 wiz Exp $
#
DISTNAME= RealPlayer10GOLD
@@ -30,7 +30,7 @@ post-fetch:
${ECHO} "It appears that real.com has made a new version ($$ver) available so this" ; \
${ECHO} "package will need updating to work correctly. That likely the reason for" ; \
${ECHO} "the checksum failure." ; \
- fi
+ fi
.include "../../emulators/suse_linux/Makefile.application"
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 7dc4763e0ca..8782e76a18a 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/28 14:58:42 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:01:23 wiz Exp $
#
DISTNAME= DVDStyler-1.5b4
@@ -8,7 +8,7 @@ CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://dvdstyler.sourceforge.net/
+HOMEPAGE= http://www.dvdstyler.de/
COMMENT= Crossplatform DVD Authoring System
DEPENDS+= dvdauthor>=0.6.10:../../multimedia/dvdauthor
diff --git a/net/cftp/Makefile b/net/cftp/Makefile
index 1106b51077d..47c3da480b8 100644
--- a/net/cftp/Makefile
+++ b/net/cftp/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2006/04/06 03:20:54 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:01:23 wiz Exp $
#
DISTNAME= cftp-0.12
CATEGORIES= net
-MASTER_SITES= ftp://sunsite.csd.smc.univie.ac.at/pub/nih/cftp/ \
+MASTER_SITES= http://ftp.giga.or.at/pub/nih/cftp/ \
ftp://ftp.giga.or.at/pub/nih/cftp/
MAINTAINER= dillo@NetBSD.org
-HOMEPAGE= http://sunsite.csd.smc.univie.ac.at/pub/nih/cftp/
+HOMEPAGE= http://ftp.giga.or.at/pub/nih/cftp/
COMMENT= Comfortable FTP, a full screen ftp client
GNU_CONFIGURE= YES
diff --git a/net/dlint/Makefile b/net/dlint/Makefile
index de2b361f51b..1a4d7f579ff 100644
--- a/net/dlint/Makefile
+++ b/net/dlint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:01:23 wiz Exp $
#
DISTNAME= dlint1.4.0
@@ -8,7 +8,7 @@ CATEGORIES= net
MASTER_SITES= http://www.domtools.com/pub/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.domtools.com/dns/
+HOMEPAGE= http://www.domtools.com/
COMMENT= Internet Domain Name System (DNS) error checking utility
USE_TOOLS+= perl:run
diff --git a/net/jigdo/Makefile b/net/jigdo/Makefile
index 42185edcd18..7de657b3a41 100644
--- a/net/jigdo/Makefile
+++ b/net/jigdo/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2006/10/14 08:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:23 wiz Exp $
DISTNAME= jigdo-0.7.1
PKGREVISION= 3
CATEGORIES= net
-MASTER_SITES= http://www.atterer.net/jigdo/
+MASTER_SITES= http://atterer.net/jigdo/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.atterer.net/jigdo/
+HOMEPAGE= http://atterer.net/jigdo/
COMMENT= Tool to ease downloading of large files from the Internet
USE_TOOLS+= pkg-config
diff --git a/net/mDNSResponder-nss/Makefile b/net/mDNSResponder-nss/Makefile
index 968087f72b2..beb17908d34 100644
--- a/net/mDNSResponder-nss/Makefile
+++ b/net/mDNSResponder-nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:03 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:01:23 wiz Exp $
DISTNAME= mDNSResponder-108
PKGNAME= mDNSResponder-nss-108
@@ -7,7 +7,7 @@ CATEGORIES= net
MASTER_SITES= http://darwinsource.opendarwin.org/tarballs/apsl/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://developer.apple.com/darwin/projects/bonjour/
+HOMEPAGE= http://developer.apple.com/opensource/internet/bonjour.html
COMMENT= Apple's mDNS responder - NetBSD nsswitch module
# needs nsswitch
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index c4e02b957a5..4b881f75520 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/03 19:21:01 rpaulo Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:01:23 wiz Exp $
DISTNAME= miredo-1.0.6
CATEGORIES= net
@@ -6,7 +6,7 @@ MASTER_SITES= http://www.remlab.net/files/miredo/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= rpaulo@NetBSD.org
-HOMEPAGE= http://www.simphalempin.com/dev/miredo/
+HOMEPAGE= http://www.remlab.net/miredo/
COMMENT= Teredo IPv6 tunneling
NOT_FOR_PLATFORM= Interix-*-* NetBSD-[0-3]*-* SunOS-*-*
diff --git a/net/openag/Makefile b/net/openag/Makefile
index 033e300382f..95322cd597f 100644
--- a/net/openag/Makefile
+++ b/net/openag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/07 21:01:15 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:23 wiz Exp $
#
DISTNAME= OpenAG-1.1.1
@@ -8,7 +8,7 @@ CATEGORIES= net audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openags/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://homepage.mac.com/macdomeeu/dev/current/openag/
+HOMEPAGE= http://sourceforge.net/projects/openags/
COMMENT= Open Audio Galaxy client
DEPENDS+= wget-[0-9]*:../../net/wget
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index 378102bb41c..14008dfe8c9 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/23 18:03:16 tv Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:23 wiz Exp $
#
DISTNAME= SOAP-Lite-0.69
@@ -8,7 +8,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=SOAP/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://soaplite.com/
+HOMEPAGE= http://www.soaplite.com/
COMMENT= Perl5 module providing a lightweight interface to SOAP
WRKSRC= ${WRKDIR}/${DISTNAME:C|[a-z]$||}
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 011690d4eb1..1edc1cbc756 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/28 14:06:40 ghen Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:01:23 wiz Exp $
DISTNAME= pure-ftpd-1.0.21
CATEGORIES= net
@@ -13,7 +13,7 @@ MASTER_SITES+= ftp://ftp.cn.pureftpd.org/pub/pureftpd/pure-ftpd/releases/
MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pureftpd/}
MAINTAINER= dawszy@arhea.net
-HOMEPAGE= http://www.pureftpd.org/
+HOMEPAGE= http://www.pureftpd.org/project/pure-ftpd
COMMENT= Secure FTP daemon with optional SQL support
GNU_CONFIGURE= yes
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 92e6d826595..251d549d4e2 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/11/01 15:17:13 martin Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/22 19:01:24 wiz Exp $
DISTNAME= rp-pppoe-3.8
# PKGREVISION= 0
@@ -6,7 +6,7 @@ CATEGORIES= net
MASTER_SITES= http://www.roaringpenguin.com/files/download/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.roaringpenguin.com/penguin/open_source_rp-pppoe.php
+HOMEPAGE= http://www.roaringpenguin.com/penguin/openSourceProducts/rpPppoe
COMMENT= Roaring Penguin's PPP over Ethernet client
NOT_FOR_PLATFORM+= Interix-*-* # no userland protocol stack support
diff --git a/net/ucarp/Makefile b/net/ucarp/Makefile
index 643a547bec7..60a4df5909f 100644
--- a/net/ucarp/Makefile
+++ b/net/ucarp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/07/06 13:18:11 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:24 wiz Exp $
#
DISTNAME= ucarp-1.1
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.ucarp.org/pub/ucarp/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joel@carnat.net
-HOMEPAGE= http://www.ucarp.org/
+HOMEPAGE= http://www.ucarp.org/project/ucarp
COMMENT= Common Address Redundancy Protocol (CARP) for Unix
USE_PKGLOCALEDIR= YES
diff --git a/regress/compiler/Makefile b/regress/compiler/Makefile
index 7e572d05f7a..2d0c8a38360 100644
--- a/regress/compiler/Makefile
+++ b/regress/compiler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/10/22 07:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:01:24 wiz Exp $
#
DISTNAME= compiler-1.1
@@ -31,5 +31,5 @@ do-build:
# Test whether backslashes are preserved in macro definitions.
cd ${WRKSRC} && cc -c checktype.c -DTYPE="unsigned long"
cd ${WRKSRC} && cc -c checktype.c -DTYPE=unsigned\ long
-
+
.include "../../mk/bsd.pkg.mk"
diff --git a/security/crack/Makefile b/security/crack/Makefile
index 9fc480c6992..ebb06cfd649 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.21 2006/10/04 21:58:13 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:01:24 wiz Exp $
DISTNAME= crack5.0
PKGNAME= crack-5.0
PKGREVISION= 1
CATEGORIES= security
-MASTER_SITES= ftp://ftp.task.gda.pl/mirror/ftp.cert.org/pub/tools/crack/ \
- ftp://ftp.cs.umn.edu/mirror00/ftp.win.tue.nl/pub/security/ \
- ftp://ftp.nask.pl/pub/CERT_NASK/CERTCC_tools/crack/
+MASTER_SITES= ftp://ftp.cerias.purdue.edu/pub/tools/unix/pwdutils/crack \
+ ftp://ftp.netsw.org/system/tools/password/crack/crack/
MAINTAINER= bouyer@NetBSD.org
-HOMEPAGE= http://www.crypticide.com/users/alecm/
+HOMEPAGE= http://www.crypticide.com/dropsafe/info/home.html
COMMENT= The "Sensible" Unix Password Cracker
WRKSRC= ${WRKDIR}/c50a
diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk
index 396932ea195..83b8e89092d 100644
--- a/security/gnupg/options.mk
+++ b/security/gnupg/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2006/08/03 14:49:14 gdt Exp $
+# $NetBSD: options.mk,v 1.11 2007/02/22 19:01:24 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg
PKG_SUPPORTED_OPTIONS= curl idea ldap
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --without-libcurl
LICENCE= idea-license
RESTRICTED= Commercial distribution is claimed to require a license.
NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
DISTFILES+= idea.c.gz
SITES.idea.c.gz=ftp://ftp.gnupg.dk/pub/contrib-dk/ \
diff --git a/security/ike-scan/Makefile b/security/ike-scan/Makefile
index c9695f8f1f7..c7b06775035 100644
--- a/security/ike-scan/Makefile
+++ b/security/ike-scan/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2007/01/28 01:34:42 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:24 wiz Exp $
DISTNAME= ike-scan-1.9
CATEGORIES= security
-MASTER_SITES= http://www.nta-monitor.com/ike-scan/download/
+MASTER_SITES= http://www.nta-monitor.com/tools/ike-scan/download/
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.nta-monitor.com/ike-scan/
+HOMEPAGE= http://www.nta-monitor.com/tools/ike-scan/
COMMENT= Fingerprinting IKE implementation
GNU_CONFIGURE= yes
diff --git a/security/rainbowcrack/Makefile b/security/rainbowcrack/Makefile
index aebc95eec96..11fc67b212b 100644
--- a/security/rainbowcrack/Makefile
+++ b/security/rainbowcrack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/10/21 07:47:25 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:01:24 wiz Exp $
#
PKGNAME= rainbowcrack-1.2
@@ -10,7 +10,7 @@ DISTFILES= rainbowcrack-1.2-src.zip \
rainbowcrack-1.2-openbsd-diffs.tar.gz
MAINTAINER= dhowland@users.sourceforge.net
-HOMEPAGE= http://www.antsight.com/zsl/rainbowcrack
+HOMEPAGE= http://www.antsight.com/zsl/rainbowcrack/
COMMENT= Hash cracker
BUILD_DIRS= src
diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile
index 2594f07df48..d7843eb34c0 100644
--- a/security/smtpd/Makefile
+++ b/security/smtpd/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.19 2006/11/28 16:38:00 tv Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:01:24 wiz Exp $
#
DISTNAME= smtpd-2.0
PKGREVISION= 3
CATEGORIES= mail security
-MASTER_SITES= ftp://ftp.obtuse.com/pub/smtpd/
+MASTER_SITES= http://www.netsw.org/net/ip/firewall/proxy/smtpd/
PATCHFILES= patch-smtpd-2.0-RBL.gz
+PATCH_SITES= http://web.rge.com/pub/security/smtpd/
MAINTAINER= pkgsrc-users@NetBSD.org
+# "Obtuse smtpd hasn't been developed further since 1997."
+# google for osmtpd
HOMEPAGE= http://www.obtuse.com/smtpd.html
COMMENT= Store and forward SMTP proxy
diff --git a/shells/eltclsh/Makefile b/shells/eltclsh/Makefile
index 12a497d5e19..ec68680144f 100644
--- a/shells/eltclsh/Makefile
+++ b/shells/eltclsh/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2006/11/30 18:02:28 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:01:24 wiz Exp $
DISTNAME= eltclsh-1.6
PKGREVISION= 1
CATEGORIES= shells
-MASTER_SITES= http://softs.laas.fr/openrobots/distfiles/
+MASTER_SITES= http://softs.laas.fr/openrobots/php/download.php/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://softs.laas.fr/openrobots/tools/eltclsh.php
+HOMEPAGE= https://softs.laas.fr/openrobots/wiki/eltclsh
COMMENT= Interactive TCL shell with editline facilities
GNU_CONFIGURE= yes
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index 01d3f600bf1..947268fb870 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/09/15 13:00:37 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:01:24 wiz Exp $
DISTNAME= mksh-R28
PKGNAME= mksh-28
@@ -7,7 +7,7 @@ MASTER_SITES= http://www.mirbsd.org/MirOS/dist/mir/mksh/
EXTRACT_SUFX= .cpio.gz
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://mirbsd.de/mksh
+HOMEPAGE= http://www.mirbsd.de/?mksh
COMMENT= MirBSD Korn Shell
WRKSRC= ${WRKDIR}/mksh
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index 2b8bfe40d0d..50c518fe3b9 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:39 jlam Exp $
-# Cjep: Makefile,v 1.3 2003/04/20 16:21:44 cjep Exp
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:24 wiz Exp $
DISTNAME= psh-1.8
PKGNAME= perlsh-1.8
PKGREVISION= 3
CATEGORIES= shells perl5
-MASTER_SITES= http://www.gregorpurdy.com/gregor/psh/
+MASTER_SITES= http://www.focusresearch.com/gregor/download/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.gregorpurdy.com/gregor/psh/
+HOMEPAGE= http://www.focusresearch.com/gregor/sw/psh/
COMMENT= The Perl Shell
DEPENDS+= p5-Term-ReadKey>=2.21:../../devel/p5-Term-ReadKey
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index ad16eb7444e..1a3db84b830 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/01/24 20:42:49 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2007/02/22 19:01:25 wiz Exp $
#
DISTNAME= tcsh-6.14.00
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ \
ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/
MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://www.tcsh.org/
+HOMEPAGE= http://www.tcsh.org/Welcome
COMMENT= Extended C-shell with many useful features
CONFLICTS= static-tcsh-[0-9]*
diff --git a/sysutils/9base/Makefile b/sysutils/9base/Makefile
index bdbdf93fd73..b4f9b7bdf78 100644
--- a/sysutils/9base/Makefile
+++ b/sysutils/9base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:30:39 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:01:25 wiz Exp $
#
DISTNAME= 9base-20051114
@@ -15,7 +15,7 @@ PKG_SHELL= bin/rc
.include "../../mk/bsd.prefs.mk"
-# Darwin doesn't support static link.
+# Darwin doesn't support static link.
# See http://developer.apple.com/qa/qa2001/qa1118.html
.if ${OPSYS} != "Darwin"
LDFLAGS+= -static
diff --git a/sysutils/apcupsd/PLIST b/sysutils/apcupsd/PLIST
index b6606d57325..6e07f535a42 100644
--- a/sysutils/apcupsd/PLIST
+++ b/sysutils/apcupsd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/11/15 21:46:25 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/02/22 19:01:25 wiz Exp $
sbin/apcaccess
sbin/apctest
sbin/apcupsd
@@ -30,8 +30,8 @@ share/examples/apcupsd/commfailure
share/examples/apcupsd/commok
share/examples/apcupsd/masterconnect
share/examples/apcupsd/mastertimeout
-share/examples/apcupsd/onbattery
share/examples/apcupsd/offbattery
+share/examples/apcupsd/onbattery
share/examples/rc.d/apcupsd
@dirrm share/doc/html/apcupsd
@dirrm share/examples/apcupsd
diff --git a/sysutils/gst-plugins0.10-gnomevfs/DESCR b/sysutils/gst-plugins0.10-gnomevfs/DESCR
index 6d849fec523..aaa6d1fc1b0 100644
--- a/sysutils/gst-plugins0.10-gnomevfs/DESCR
+++ b/sysutils/gst-plugins0.10-gnomevfs/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/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index 95fb0715c02..25d3a31f925 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:10:56 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:01:25 wiz Exp $
DISTNAME= pciutils-2.1.11
PKGREVISION= 1
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
ftp://metalab.unc.edu/pub/Linux/hardware/
MAINTAINER= cube@NetBSD.org
-HOMEPAGE= http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
+HOMEPAGE= http://mj.ucw.cz/pciutils.shtml
COMMENT= PCI bus manipulation utility similar to NetBSD pcictl(8)
USE_TOOLS+= gmake
diff --git a/sysutils/strace/Makefile b/sysutils/strace/Makefile
index fd23f5ce7e4..eda8efa7614 100644
--- a/sysutils/strace/Makefile
+++ b/sysutils/strace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/31 00:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:01:25 wiz Exp $
#
DISTNAME= strace-4.5.14
@@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=strace/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= christos@NetBSD.org
-HOMEPAGE= http://www.liacs.nl/~wichert/strace/
+HOMEPAGE= http://sourceforge.net/projects/strace/
COMMENT= Trace system calls
BROKEN_IN= pkgsrc-2006Q4
diff --git a/sysutils/wmSMPmon/Makefile b/sysutils/wmSMPmon/Makefile
index 9a5018c07e5..9e85484257f 100644
--- a/sysutils/wmSMPmon/Makefile
+++ b/sysutils/wmSMPmon/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:13 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:01:25 wiz Exp $
DISTNAME= wmSMPmon-2.3
PKGREVISION= 1
CATEGORIES= sysutils x11
-MASTER_SITES= http://goupilfr.org/arch/
+MASTER_SITES= http://lancre.ribbrock.org/binabit/wmSMPmon/src/
MAINTAINER= joel@carnat.net
-HOMEPAGE= http://goupilfr.org/?soft=wmsmpmon
+HOMEPAGE= http://lancre.ribbrock.org/binabit/wmSMPmon/
COMMENT= Dockable CPU (SMP) monitor
WRKSRC= ${WRKDIR}/wmSMPmon-2.x/wmSMPmon
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 755d4751717..a173475c43c 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/10/04 21:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:01:25 wiz Exp $
DISTNAME= xfsprogs-2.7.3.src
PKGNAME= ${DISTNAME:S/.src//}
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=--enable-readline
CONFIGURE_ENV+= INSTALL_USER=${ROOT_USER} INSTALL_GROUP=${ROOT_GROUP}
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-BUILD_TARGET=
+BUILD_TARGET=
.include "../../devel/readline/buildlink3.mk"
diff --git a/textproc/aspell-slovak/Makefile b/textproc/aspell-slovak/Makefile
index 2c3893ded62..92eadbc7f2e 100644
--- a/textproc/aspell-slovak/Makefile
+++ b/textproc/aspell-slovak/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:11:00 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:25 wiz Exp $
#
DISTNAME= aspell-sk-0.52-0
PKGNAME= ${DISTNAME:C/sk-(.*)-(.*)/slovak-\1.\2/}
PKGREVISION= 3
CATEGORIES= textproc
-MASTER_SITES= http://spell.linux.sk/
+MASTER_SITES= http://sk-spell.sk.cx/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= salo@NetBSD.org
-HOMEPAGE= http://spell.linux.sk/
+HOMEPAGE= http://sk-spell.sk.cx/
COMMENT= Slovak language support for aspell
HAS_CONFIGURE= YES
diff --git a/textproc/ispell-slovak/Makefile b/textproc/ispell-slovak/Makefile
index f698c053ef5..ad1f6015bdf 100644
--- a/textproc/ispell-slovak/Makefile
+++ b/textproc/ispell-slovak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/14 08:23:29 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:01:25 wiz Exp $
#
DISTNAME= ispell-sk-0.2.2
@@ -7,7 +7,7 @@ CATEGORIES= textproc
MASTER_SITES= http://sk-spell.sk.cx/
MAINTAINER= salo@NetBSD.org
-HOMEPAGE= http://sk-spell.sk.cx/ispell.html
+HOMEPAGE= http://sk-spell.sk.cx/?id=4
COMMENT= Slovak dictionary for ispell
DEPENDS+= ispell-base>=3.1.20:../../textproc/ispell-base
diff --git a/textproc/kbanner/Makefile b/textproc/kbanner/Makefile
index ed329a462de..c2eb2503a4a 100644
--- a/textproc/kbanner/Makefile
+++ b/textproc/kbanner/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:01:25 wiz Exp $
DISTNAME= kbanner2
PKGNAME= kbanner-2.1
CATEGORIES= japanese textproc
-MASTER_SITES= ftp://ginkaku.kudpc.kyoto-u.ac.jp/program/
+MASTER_SITES= http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/program/
EXTRACT_SUFX= .tar.Z
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.kudpc.kyoto-u.ac.jp/~yasuoka/program.html
+HOMEPAGE= http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/program.html
COMMENT= Display kanji files in large letters
BUILD_TARGET= kbanner
diff --git a/textproc/lua-expat/Makefile b/textproc/lua-expat/Makefile
index 3ef36aca6d4..ea7fb51c449 100644
--- a/textproc/lua-expat/Makefile
+++ b/textproc/lua-expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/09/09 02:46:08 obache Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:26 wiz Exp $
#
DISTNAME= luaexpat-1.0a
@@ -8,7 +8,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.keplerproject.org/luaexpat/
MAINTAINER= pancake@phreaker.net
-HOMEPAGE= http://www.tecgraf.puc-rio.br/~diego/luasocket/new/
+HOMEPAGE= http://www.keplerproject.org/luaexpat/
COMMENT= XML parser for LUA based on expat
USE_TOOLS+= gmake
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index eee0ed0a00e..3447b49aa3a 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/11/05 17:06:43 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:01:26 wiz Exp $
#
DISTNAME= Text-Template-1.44
@@ -8,7 +8,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Text/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.plover.com/~mjd/perl/Template/
+HOMEPAGE= http://perl.plover.com/Template/
COMMENT= Perl5 library for generating form letters
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/textproc/php-wddx/Makefile b/textproc/php-wddx/Makefile
index d9b3a4ff8c8..8d996574fb9 100644
--- a/textproc/php-wddx/Makefile
+++ b/textproc/php-wddx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/11/06 21:37:37 jdolecek Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:01:26 wiz Exp $
MODNAME= wddx
CATEGORIES+= textproc
@@ -13,7 +13,7 @@ USE_PHP_EXT_PATCHES= # defined
# appease some PHP build assumpsions
CFLAGS+= -I${BUILDLINK_DIR}/include/libxml2 \
-I${BUILDLINK_DIR}/include/php/ext/date/lib
-
+
.include "../../lang/php/phpversion.mk"
diff --git a/textproc/ruby-rttool/Makefile b/textproc/ruby-rttool/Makefile
index c1e001ef096..4172cce8904 100644
--- a/textproc/ruby-rttool/Makefile
+++ b/textproc/ruby-rttool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/28 15:24:21 taca Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:26 wiz Exp $
DISTNAME= rttool-${VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -6,7 +6,7 @@ CATEGORIES= textproc ruby
MASTER_SITES= http://www.rubyist.net/~rubikitch/archive/
MAINTAINER= taca@NetBSD.org
-HOMEPAGE= http://www.rubyist.net/~rubikitch/computer/rt/
+HOMEPAGE= http://www.rubyist.net/~rubikitch/computer/rttool/
COMMENT= RT to HTML (and hopefully LaTeX in future) table converter
CONFLICTS+= ruby[1-9][0-9]-rttool-*
diff --git a/time/remind/Makefile b/time/remind/Makefile
index 2599e44f85f..a1783b8823d 100644
--- a/time/remind/Makefile
+++ b/time/remind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/01 08:26:56 schwarz Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:01:26 wiz Exp $
#
DISTNAME= remind-03.00.24
@@ -7,7 +7,7 @@ CATEGORIES= time
MASTER_SITES= http://www.roaringpenguin.com/penguin/
MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://www.roaringpenguin.com/penguin/open_source_remind.php
+HOMEPAGE= http://www.roaringpenguin.com/penguin/openSourceProducts/remind
COMMENT= Calendar/alarm program with interpreted input language
GNU_CONFIGURE= yes
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index 1f0d7ed353c..ef2a445fd95 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/02/01 22:54:33 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:01:26 wiz Exp $
#
DISTNAME= pwm-20060517
@@ -7,7 +7,7 @@ CATEGORIES= wm x11
MASTER_SITES= http://modeemi.fi/~tuomov/pwm/dl/
MAINTAINER= salo@NetBSD.org
-HOMEPAGE= http://modeemi.fi/~tuomov/pwm/
+HOMEPAGE= http://modeemi.fi/~tuomov/ion/pwm.html
COMMENT= Window manager that frames multiple client windows in a single frame
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index dd46d4db88e..9d0f4b96f1f 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:41 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:01:26 wiz Exp $
#
DISTNAME= windowlab-1.33
PKGREVISION= 2
CATEGORIES= wm
-MASTER_SITES= http://www.nickgravgaard.com/windowlab/
+MASTER_SITES= http://nickgravgaard.com/windowlab/
EXTRACT_SUFX= .tar
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.nickgravgaard.com/windowlab/
+HOMEPAGE= http://nickgravgaard.com/windowlab/
COMMENT= Small and simple window manager
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile
index 9ec1a2f7c2d..e9b36b424f8 100644
--- a/www/ap-auth-mysql/Makefile
+++ b/www/ap-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:26 wiz Exp $
#
DISTNAME= libapache-mod-auth-mysql_4.3.1
@@ -8,7 +8,7 @@ CATEGORIES= www databases security
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/liba/libapache-mod-auth-mysql/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://packages.debian.org/unstable/web/libapache-mod-auth-mysql.html
+HOMEPAGE= http://packages.debian.org/unstable/net/libapache-mod-auth-mysql.html
COMMENT= Module to allow apache authentication against a MySQL database
CONFLICTS= ap-auth-mysql-[0-9]*
diff --git a/www/ap-mp3/Makefile b/www/ap-mp3/Makefile
index fcc4cf380c0..8476cef91b0 100644
--- a/www/ap-mp3/Makefile
+++ b/www/ap-mp3/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 22:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:01:26 wiz Exp $
#
DISTNAME= mod_mp3-0.35
PKGNAME= ${DISTNAME:C|mod_|ap13-|}
CATEGORIES= www
MASTER_SITES= ftp://ftp.tangent.org/pub/apache/ \
- http://software.tangent.org/download/
+ http://www.tangent.org/download/
MAINTAINER= grant@NetBSD.org
-HOMEPAGE= http://tangent.org/media/
+HOMEPAGE= http://tangent.org/index.pl?lastnode_id=478&node_id=380
COMMENT= Apache module for streaming mp3 files
CONFLICTS= ap-mp3-[0-9]*
diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile
index 4fde15be7f6..f2ba48d6cc3 100644
--- a/www/ap2-suphp/Makefile
+++ b/www/ap2-suphp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/12/08 23:34:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:01:26 wiz Exp $
#
DISTNAME= suphp-0.6.0
@@ -8,7 +8,7 @@ CATEGORIES= www
MASTER_SITES= http://www.suphp.org/download/
MAINTAINER= rillig@NetBSD.org
-HOMEPAGE= http://www.suphp.org/download/
+HOMEPAGE= http://www.suphp.org/
COMMENT= SuEXEC-like wrapper for PHP scripts
USE_PKGLOCALEDIR= yes
diff --git a/www/bkedit/Makefile b/www/bkedit/Makefile
index f590d18be3a..9e1a11b248c 100644
--- a/www/bkedit/Makefile
+++ b/www/bkedit/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:11:19 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:26 wiz Exp $
#
DISTNAME= bk_edit-0.6.23
PKGNAME= ${DISTNAME:S/_//}
PKGREVISION= 2
CATEGORIES= www
-MASTER_SITES= http://www.allesdurcheinander.de/nettools/bk_edit/
+MASTER_SITES= http://www.vakuumverpackt.de/nettools/bk_edit/
MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://www.allesdurcheinander.de/nettools/bk_edit/
+HOMEPAGE= http://www.vakuumverpackt.de/nettools/bk_edit/
COMMENT= Bookmark manager and editor
USE_TOOLS+= bison
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 63239d864b7..b90a50280e8 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2006/08/06 05:20:40 kristerw Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:01:27 wiz Exp $
#
DISTNAME= cherokee-0.5.3
CATEGORIES= www
-MASTER_SITES= http://www.0x50.org/download/0.5/0.5.3/
+MASTER_SITES= http://www.cherokee-project.com/download/0.5/0.5.3/
MAINTAINER= jmmv@NetBSD.org
-HOMEPAGE= http://www.0x50.org/
+HOMEPAGE= http://www.cherokee-project.com/
COMMENT= Flexible and fast web server
GNU_CONFIGURE= yes
diff --git a/www/py-flup/Makefile b/www/py-flup/Makefile
index 76db7d0d9cf..2286156ce07 100644
--- a/www/py-flup/Makefile
+++ b/www/py-flup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/11/14 13:36:53 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:01:27 wiz Exp $
#
DISTNAME= flup-r2030
@@ -8,7 +8,7 @@ CATEGORIES= www python
MASTER_SITES= http://www.saddi.com/software/flup/dist/
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://www.saddi.com/software/flup/
+HOMEPAGE= http://trac.saddi.com/flup
COMMENT= WSGI support modules
PKG_DESTDIR_SUPPORT= # empty
diff --git a/www/seamonkey-bin-nightly/Makefile.NetBSD.i386 b/www/seamonkey-bin-nightly/Makefile.NetBSD.i386
index 253e633e07d..78d6bab6fbf 100644
--- a/www/seamonkey-bin-nightly/Makefile.NetBSD.i386
+++ b/www/seamonkey-bin-nightly/Makefile.NetBSD.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2006/09/24 16:40:50 salo Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.2 2007/02/22 19:01:27 wiz Exp $
BUILD_DEFS+= MOZILLA_USE_LINUX
@@ -11,7 +11,7 @@ ONLY_FOR_PLATFORM+= NetBSD-*-i386
.else
PKG_SKIP_REASON+= "No native pre-built NetBSD binary available."
PKG_SKIP_REASON+= "Set MOZILLA_USE_LINUX if you want to use the Linux binary."
-DISTNAME=
+DISTNAME=
EXTRACT_SUFX= .tar.bz2
MOZ_PLATFORM= netbsd
ONLY_FOR_PLATFORM+= NetBSD-1.6*-i386 NetBSD-2*-i386
diff --git a/www/seamonkey-bin-nightly/Makefile.SunOS.sparc b/www/seamonkey-bin-nightly/Makefile.SunOS.sparc
index df083968e04..816e01649ce 100644
--- a/www/seamonkey-bin-nightly/Makefile.SunOS.sparc
+++ b/www/seamonkey-bin-nightly/Makefile.SunOS.sparc
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.1.1.1 2006/09/24 16:40:50 salo Exp $
+# $NetBSD: Makefile.SunOS.sparc,v 1.2 2007/02/22 19:01:27 wiz Exp $
-DISTNAME=
+DISTNAME=
MOZ_PLATFORM= solaris
diff --git a/www/seamonkey/Makefile-seamonkey.common b/www/seamonkey/Makefile-seamonkey.common
index 796c22083c4..e5a9faae412 100644
--- a/www/seamonkey/Makefile-seamonkey.common
+++ b/www/seamonkey/Makefile-seamonkey.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-seamonkey.common,v 1.7 2007/01/30 14:34:34 joerg Exp $
+# $NetBSD: Makefile-seamonkey.common,v 1.8 2007/02/22 19:01:27 wiz Exp $
MOZILLA_BIN= seamonkey-bin
MOZ_VER= 1.1
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
CATEGORIES= www
MAINTAINER= ghen@NetBSD.org
-HOMEPAGE= http://www.mozilla.org/projects/seamonkey
+HOMEPAGE= http://www.mozilla.org/projects/seamonkey/
DISTINFO_FILE= ${.CURDIR}/../../www/seamonkey/distinfo
diff --git a/www/trac/Makefile b/www/trac/Makefile
index eb79323fd7d..94a37c18828 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2006/12/17 17:20:34 bouyer Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:01:27 wiz Exp $
#
DISTNAME= trac-0.10.3
CATEGORIES= devel www
-MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \
- ftp://ftp.edgewall.com/pub/trac/
+MASTER_SITES= http://ftp.edgewall.org/pub/trac/ \
+ ftp://ftp.edgewall.org/pub/trac/
MAINTAINER= epg@NetBSD.org
-HOMEPAGE= http://trac.edgewall.com/
+HOMEPAGE= http://trac.edgewall.org/
COMMENT= Subversion repository browser, wiki, and issue tracking system
DEPENDS+= ${PYPKGPREFIX}-clearsilver>=0.9.14:../../www/py-clearsilver
diff --git a/www/zope25-ZPsycopgDA/Makefile b/www/zope25-ZPsycopgDA/Makefile
index 5e1bd158863..dc8aa7769a1 100644
--- a/www/zope25-ZPsycopgDA/Makefile
+++ b/www/zope25-ZPsycopgDA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/10/04 22:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:01:27 wiz Exp $
#
DISTNAME= psycopg-1.1.21
@@ -8,7 +8,7 @@ CATEGORIES= www
MASTER_SITES= http://initd.org/pub/software/psycopg/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://initd.org/software/psycopg1
+HOMEPAGE= http://initd.org/projects/psycopg1/
COMMENT= PostgreSQL database adapter for Zope
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/www/zope3/Makefile b/www/zope3/Makefile
index f718c45f570..9aec9317e95 100644
--- a/www/zope3/Makefile
+++ b/www/zope3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/20 17:30:18 he Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:01:27 wiz Exp $
#
DISTNAME= Zope-3.3.1
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.zope.org/Products/Zope3/3.3.1/
EXTRACT_SUFX= .tgz
MAINTAINER= ykomatsu@akaumigame.org
-HOMEPAGE= http://dev.zope.org/Zope3/
+HOMEPAGE= http://www.zope.org/DevHome/Zope3/
COMMENT= Zope 3 Application Server
DEPENDS+= ${PYPKGPREFIX}-xml>=0.8.4:../../textproc/py-xml
diff --git a/x11/gst-plugins0.10-x11/DESCR b/x11/gst-plugins0.10-x11/DESCR
index ae55cb751e6..34dc7045cac 100644
--- a/x11/gst-plugins0.10-x11/DESCR
+++ b/x11/gst-plugins0.10-x11/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/x11/modeline/Makefile b/x11/modeline/Makefile
index e65d7ddfc02..a3b8bf822a7 100644
--- a/x11/modeline/Makefile
+++ b/x11/modeline/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:01:27 wiz Exp $
DISTNAME= modeline_vfr.c
PKGNAME= modeline-20001121
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://www.bohne-lang.de/spec/linux/modeline/
EXTRACT_SUFX= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.dkfz-heidelberg.de/spec/linux/modeline/
+HOMEPAGE= http://www.bohne-lang.de/spec/linux/modeline/
COMMENT= Calculates XF86 Modelines to configure your monitor for X11R6
WRKSRC= ${WRKDIR}/modeline
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 8e1b291fc75..b95f3c1dd28 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2007/01/30 15:34:36 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:01:27 wiz Exp $
#
+# materm is now mrxvt
DISTNAME= multi-aterm-0.0.4
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://www.materm.tuxfamily.org/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.materm.tuxfamily.org/
COMMENT= Multi-terminal for the X Window System based on aterm
GNU_CONFIGURE= YES
diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile
index e30d46d40d5..1ec3ca0a397 100644
--- a/x11/py-Tk/Makefile
+++ b/x11/py-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/10/04 22:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2007/02/22 19:01:28 wiz Exp $
#
PKGNAME= ${PYPKGPREFIX}-Tk-0
@@ -6,7 +6,7 @@ PKGREVISION= 4
CATEGORIES= x11 python
MAINTAINER= tsarna@NetBSD.org
-HOMEPAGE= http://www.python.org/moin/TkInter
+HOMEPAGE= http://wiki.python.org/moin/TkInter
COMMENT= Tkinter -- Python interface to Tcl/Tk
diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile
index 35681b4f33e..4994d84ae89 100644
--- a/x11/ssystem/Makefile
+++ b/x11/ssystem/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2007/01/30 20:45:10 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:01:28 wiz Exp $
#
DISTNAME= ssystem-1.6
PKGREVISION= 3
CATEGORIES= x11 graphics
-MASTER_SITES= ${HOMEPAGE} # ${HOMEPAGE}/hires/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= fredb@NetBSD.org
HOMEPAGE= http://www1.las.es/~amil/ssystem/
diff --git a/x11/xdm3d/Makefile b/x11/xdm3d/Makefile
index 90fc0b01606..185b01ae8c5 100644
--- a/x11/xdm3d/Makefile
+++ b/x11/xdm3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/31 00:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:01:28 wiz Exp $
DISTNAME= xdm3d-1.0
PKGREVISION= 1
@@ -6,7 +6,7 @@ CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= root@garbled.net
-HOMEPAGE= http://www.spade.com/linux/XBanner/
+HOMEPAGE= http://www.hijinks.com/~spade/linux/XBanner/
COMMENT= Replacement for xdm with 3D effects
BROKEN_IN= pkgsrc-2006Q1 pkgsrc-2006Q4
diff --git a/x11/xgrk/DESCR b/x11/xgrk/DESCR
index 8267661d9bf..5e1bbd369d2 100644
--- a/x11/xgrk/DESCR
+++ b/x11/xgrk/DESCR
@@ -1,5 +1,5 @@
This program is a contribution to the community of greek UNIX users. It makes
-it possible to change keyboard mapping with alt-shift or meta-shift
+it possible to change keyboard mapping with alt-shift or meta-shift
combinations or by clicking on the flag image. You will be able to write
greek in X programs like netscape or xedit. You must have the greek fonts,
which are not provided with this package.
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index 3081289cdd9..9613b411749 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:28 wiz Exp $
#
DISTNAME= xmountains_2.7
PKGNAME= ${DISTNAME:C/_/-/}
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://www.epcc.ed.ac.uk/~spb/xmountains/
+MASTER_SITES= http://www2.epcc.ed.ac.uk/~spb/xmountains/
MAINTAINER= fredb@NetBSD.org
-HOMEPAGE= http://www.epcc.ed.ac.uk/~spb/xmountains/
+HOMEPAGE= http://www2.epcc.ed.ac.uk/~spb/xmountains/
COMMENT= Fractal terrain generator for X11
WRKSRC= ${WRKDIR}
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index 7fbc04700f7..f19955e1318 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2007/02/22 19:01:28 wiz Exp $
#
DISTNAME= fvwm-${PKG_VERSION}
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
MAINTAINER= martti@NetBSD.org
-HOMEPAGE= http://www.fvwm.org/generated/manpages/xpmroot.html
+HOMEPAGE= http://www.fvwm.org/documentation/manpages/stable/xpmroot.php
COMMENT= Sets the root window to an Xpm pixmap
PKG_VERSION= 2.4.20
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index 0dec6eabadd..959667ddc75 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/15 17:57:21 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:01:28 wiz Exp $
#
DISTNAME= xrestop-0.3
@@ -7,7 +7,7 @@ CATEGORIES= x11
MASTER_SITES= http://www.freedesktop.org/software/xrestop/
MAINTAINER= reed@reedmedia.net
-HOMEPAGE= http://www.freedesktop.org/Software/xrestop
+HOMEPAGE= http://www.freedesktop.org/wiki/Software/xrestop
COMMENT= X11 clients' server-side resource usage monitor
GNU_CONFIGURE= yes
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile
index aa8c5154d47..2eedaee9b61 100644
--- a/x11/xteddy/Makefile
+++ b/x11/xteddy/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.19 2007/01/09 09:32:43 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:01:28 wiz Exp $
DISTNAME= xteddy-1.1
PKGREVISION= 1
CATEGORIES= x11 games
-MASTER_SITES= http://www.ITN.LiU.SE/~stegu/xteddy/
+MASTER_SITES= http://staffwww.itn.liu.se/~stegu/xteddy/
MAINTAINER= johnam@mail.kemper.org
-HOMEPAGE= http://www.ITN.LiU.SE/~stegu/xteddy/
+HOMEPAGE= http://staffwww.itn.liu.se/~stegu/xteddy/
COMMENT= Cuddly teddy bear for your desktop
GNU_CONFIGURE= YES
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 8d3a1ae0b34..d22fa62af1c 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.26 2007/01/13 10:29:18 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/22 19:01:28 wiz Exp $
DISTNAME= xteddy-2.0.1
PKGREVISION= 9
CATEGORIES= x11 games
-MASTER_SITES= http://www.ITN.LiU.SE/~stegu/xteddy/
+MASTER_SITES= http://staffwww.itn.liu.se/~stegu/xteddy/
MAINTAINER= johnam@mail.kemper.org
-HOMEPAGE= http://www.ITN.LiU.SE/~stegu/xteddy/
+HOMEPAGE= http://staffwww.itn.liu.se/~stegu/xteddy/
COMMENT= Teddy bear for your desktop
CONFLICTS+= xteddy-1.*