summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2007-02-22 19:26:05 +0000
committerwiz <wiz>2007-02-22 19:26:05 +0000
commit0c152e7442b8ddde8405ba9d0f2d4d981d5c3151 (patch)
treefae33b1f36c87708a527346fcfbac7913893ed98
parent8a5fbfcada8ed360c15f5cf866f70753cbb13b39 (diff)
downloadpkgsrc-0c152e7442b8ddde8405ba9d0f2d4d981d5c3151.tar.gz
Whitespace cleanup, courtesy of pkglint.
Patch provided by Sergey Svishchev in private mail.
-rw-r--r--audio/cdparanoia/Makefile4
-rw-r--r--audio/cmus/Makefile6
-rw-r--r--audio/csound5/Makefile4
-rw-r--r--audio/gnome-speech/Makefile4
-rw-r--r--audio/gsm/Makefile6
-rw-r--r--audio/gtick/Makefile4
-rw-r--r--audio/guspatches/Makefile4
-rw-r--r--audio/icecast/Makefile4
-rw-r--r--audio/liba52/Makefile4
-rw-r--r--audio/madplay/options.mk4
-rw-r--r--audio/mserv_irman/Makefile4
-rw-r--r--audio/py-mad/Makefile4
-rw-r--r--audio/py-musique/Makefile12
-rw-r--r--audio/py-vorbis/Makefile8
-rw-r--r--audio/rio/Makefile6
-rw-r--r--audio/speex/Makefile4
-rw-r--r--audio/tcl-snack/Makefile4
-rw-r--r--audio/tremor/Makefile4
-rw-r--r--audio/ubs/Makefile6
-rw-r--r--audio/wmmp/Makefile4
-rw-r--r--audio/wmmp3/Makefile4
-rw-r--r--audio/xcdplayer/Makefile4
-rw-r--r--audio/xmcd/Makefile4
-rw-r--r--audio/xmmix/Makefile6
-rw-r--r--audio/xmms-liveice/Makefile4
-rw-r--r--audio/xmms-modplug/Makefile4
-rw-r--r--audio/xmms/Makefile.common6
-rw-r--r--benchmarks/bonnie/Makefile6
-rw-r--r--benchmarks/postmark/Makefile6
-rw-r--r--biology/arka/Makefile6
-rw-r--r--biology/glimmer/Makefile4
-rw-r--r--biology/hmmer/Makefile4
-rw-r--r--biology/pdbalign/Makefile4
-rw-r--r--biology/xylem/Makefile4
-rw-r--r--cad/covered-current/Makefile4
-rw-r--r--cad/dinotrace-mode/Makefile4
-rw-r--r--cad/dinotrace/Makefile4
-rw-r--r--cad/geda-utils/Makefile4
-rw-r--r--cad/geda/Makefile10
-rw-r--r--cad/gnetlist/Makefile4
-rw-r--r--cad/oct-wcalc/Makefile6
-rw-r--r--cad/spice/Makefile4
-rw-r--r--cad/wcalc/Makefile.common14
-rw-r--r--chat/bitchbot/Makefile4
-rw-r--r--chat/eggdrop/Makefile4
-rw-r--r--chat/fugu/Makefile4
-rw-r--r--chat/gaim/Makefile4
-rw-r--r--chat/gale/Makefile4
-rw-r--r--chat/gossip/Makefile4
-rw-r--r--chat/ircII/Makefile4
-rw-r--r--chat/ircservices/Makefile8
-rw-r--r--chat/iroffer/Makefile4
-rw-r--r--chat/irssi/Makefile4
-rw-r--r--chat/jabberd2/Makefile6
-rw-r--r--chat/jabberd2/options.mk16
-rw-r--r--chat/ninja/options.mk4
-rw-r--r--chat/silc-client/Makefile8
-rw-r--r--chat/silc-server/Makefile4
-rw-r--r--chat/tzc/Makefile6
-rw-r--r--comms/birda/Makefile6
-rw-r--r--comms/dl-ezkit/Makefile4
-rw-r--r--comms/jpilot/DESCR2
-rw-r--r--comms/minicom/Makefile4
-rw-r--r--comms/p5-pilot-link/Makefile6
-rw-r--r--comms/snooper/Makefile4
-rw-r--r--converters/bbcim/Makefile6
-rw-r--r--converters/fribidi/Makefile4
-rw-r--r--converters/p5-Unicode-Map8/Makefile4
-rw-r--r--converters/p5-Unicode-String/Makefile4
-rw-r--r--converters/recode/Makefile4
-rw-r--r--converters/uudeview/Makefile4
-rw-r--r--converters/uulib/Makefile6
-rw-r--r--cross/atasm/Makefile8
-rw-r--r--cross/h8300-hms-gcc/Makefile4
-rw-r--r--crosspkgtools/crosspkg-netbsd1-cats/Makefile4
-rw-r--r--crosspkgtools/crosspkg-netbsd1-evbarm/Makefile4
-rw-r--r--crosspkgtools/crosspkg-netbsd1-hpcarm/Makefile4
-rw-r--r--crosspkgtools/crosspkg-netbsd1-netwinder/Makefile4
-rw-r--r--crosspkgtools/crosspkg-netbsd1-shark/Makefile4
-rw-r--r--crosspkgtools/kwacross-netbsd1-arm/Makefile6
-rw-r--r--databases/adodb/Makefile4
-rw-r--r--databases/jdbc-postgresql80/Makefile10
-rw-r--r--databases/jdbc-postgresql81/Makefile10
-rw-r--r--databases/kmysqladmin/Makefile4
-rw-r--r--databases/libpqxx/Makefile.common6
-rw-r--r--databases/p5-MLDBM-Sync/Makefile6
-rw-r--r--databases/p5-perl-ldap/Makefile4
-rw-r--r--databases/p5-qdbm/Makefile16
-rw-r--r--databases/pear-DB/Makefile4
-rw-r--r--databases/php-filepro/Makefile4
-rw-r--r--databases/qdbm-cgi/Makefile10
-rw-r--r--databases/qdbm-plus/Makefile12
-rw-r--r--databases/ruby-mysql/Makefile4
-rw-r--r--databases/ruby-postgresql/Makefile4
-rw-r--r--databases/ruby-qdbm/Makefile14
-rw-r--r--databases/ruby-vapor/Makefile4
-rw-r--r--databases/tcl-fbsql/Makefile4
-rw-r--r--databases/zope-mysql/Makefile4
-rw-r--r--devel/GConf2/schemas.mk4
-rw-r--r--devel/aap/Makefile4
-rw-r--r--devel/at-spi/Makefile6
-rw-r--r--devel/autoconf213/Makefile4
-rw-r--r--devel/bison/hacks.mk4
-rw-r--r--devel/bmake/Makefile6
-rw-r--r--devel/cbrowser/Makefile14
-rw-r--r--devel/cdecl/Makefile4
-rw-r--r--devel/cvsup-gui-bin/Makefile4
-rw-r--r--devel/devhelp/options.mk4
-rw-r--r--devel/gdb/Makefile6
-rw-r--r--devel/gputils/Makefile6
-rw-r--r--devel/its4/Makefile4
-rw-r--r--devel/kdevelop-base/Makefile4
-rw-r--r--devel/kdevelop/Makefile4
-rw-r--r--devel/libast/Makefile4
-rw-r--r--devel/libgnome/Makefile6
-rw-r--r--devel/libslang/Makefile4
-rw-r--r--devel/libwhisker2/Makefile4
-rw-r--r--devel/mk-files/Makefile4
-rw-r--r--devel/nasm/Makefile4
-rw-r--r--devel/ogre/Makefile4
-rw-r--r--devel/p5-Date-Business/Makefile6
-rw-r--r--devel/p5-Date-Calc/Makefile6
-rw-r--r--devel/p5-Date-Manip/Makefile6
-rw-r--r--devel/p5-ExtUtils-MakeMaker/Makefile4
-rw-r--r--devel/p5-Hash-Case/Makefile4
-rw-r--r--devel/p5-Parse-Yapp/Makefile4
-rw-r--r--devel/p5-Perl6-Slurp/Makefile4
-rw-r--r--devel/p5-Spiffy/Makefile6
-rw-r--r--devel/p5-Spoon/Makefile6
-rw-r--r--devel/p5-Test-Cmd/Makefile4
-rw-r--r--devel/p5-Tie-IxHash/Makefile4
-rw-r--r--devel/pcl-cvs/Makefile4
-rw-r--r--devel/prcs/Makefile4
-rw-r--r--devel/pvs/Makefile10
-rw-r--r--devel/py-generate/Makefile4
-rw-r--r--devel/py-pexpect/Makefile4
-rw-r--r--devel/rt-mysql/Makefile.common4
-rw-r--r--devel/sfio/Makefile8
-rw-r--r--devel/silc-toolkit/Makefile4
-rw-r--r--devel/splint/Makefile4
-rw-r--r--devel/subversion-base/Makefile8
-rw-r--r--editors/ed/Makefile6
-rw-r--r--editors/elvis-x11/Makefile4
-rw-r--r--editors/elvis/Makefile4
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/lyx-qt/Makefile4
-rw-r--r--editors/lyx-qt/Makefile.common6
-rw-r--r--editors/lyx-xforms/Makefile4
-rw-r--r--editors/ng/Makefile10
-rw-r--r--editors/nvi-m17n/Makefile4
-rw-r--r--editors/ted-cs/Makefile4
-rw-r--r--editors/ted-da/Makefile4
-rw-r--r--editors/ted-de/Makefile4
-rw-r--r--editors/ted-en-gb/Makefile4
-rw-r--r--editors/ted-en-us/Makefile4
-rw-r--r--editors/ted-es/Makefile4
-rw-r--r--editors/ted-fr/Makefile4
-rw-r--r--editors/ted-it/Makefile4
-rw-r--r--editors/ted-nl/Makefile4
-rw-r--r--editors/ted-no/Makefile4
-rw-r--r--editors/ted-pl/Makefile4
-rw-r--r--editors/ted-pt/Makefile4
-rw-r--r--editors/ted-sv/Makefile4
-rw-r--r--emulators/fmsx/Makefile4
-rw-r--r--emulators/gpsim-ptyusart/Makefile4
-rw-r--r--emulators/netbsd32_compat15/Makefile4
-rw-r--r--emulators/palmosemulator/Makefile4
-rw-r--r--emulators/peace/Makefile4
-rw-r--r--emulators/qemu/Makefile4
-rw-r--r--emulators/suse100_base/Makefile6
-rw-r--r--emulators/suse91_base/Makefile6
-rw-r--r--emulators/suse91_base/Makefile.x86_644
-rw-r--r--emulators/suse91_vmware/Makefile4
-rw-r--r--emulators/vmware-module/Makefile4
-rw-r--r--emulators/vmware-module3/Makefile4
-rw-r--r--emulators/vmware/Makefile4
-rw-r--r--finance/gkrellm1-stock/Makefile4
-rw-r--r--finance/gnucash-gtk1/Makefile4
-rw-r--r--finance/kmymoney2/Makefile4
-rw-r--r--fonts/artwiz-fonts/Makefile4
-rw-r--r--fonts/cyberbit-ttf/Makefile.common6
-rw-r--r--fonts/gucharmap/Makefile4
-rw-r--r--fonts/jisx0208fonts/Makefile4
-rw-r--r--fonts/mglfonts/Makefile12
-rw-r--r--fonts/ms-ttf/Makefile10
-rw-r--r--fonts/profont/Makefile4
-rw-r--r--games/battleball/options.mk6
-rw-r--r--games/bzflag/Makefile4
-rw-r--r--games/et/Makefile20
-rw-r--r--games/fkiss/Makefile6
-rw-r--r--games/freeciv-client/DESCR2
-rw-r--r--games/gnuchess/Makefile4
-rw-r--r--games/knights/Makefile6
-rw-r--r--games/majesty-demo/Makefile4
-rw-r--r--games/nethack-lib/Makefile.common4
-rw-r--r--games/netmaze/Makefile4
-rw-r--r--games/openttd/Makefile6
-rw-r--r--games/quake3server/Makefile4
-rw-r--r--games/rtcw/Makefile4
-rw-r--r--games/xconq/Makefile4
-rw-r--r--games/xdemineur/Makefile4
-rw-r--r--games/xfreecell/Makefile6
-rw-r--r--games/xfrisk/Makefile4
-rw-r--r--games/xkobo/Makefile4
-rw-r--r--games/xmahjongg/Makefile4
-rw-r--r--games/xrick/Makefile4
-rw-r--r--geography/proj-swig/Makefile4
-rw-r--r--graphics/Coin/hacks.mk4
-rw-r--r--graphics/Mesa/Makefile4
-rw-r--r--graphics/Mesa/Makefile.common4
-rw-r--r--graphics/cal3d-examples/Makefile4
-rw-r--r--graphics/cal3d/Makefile4
-rw-r--r--graphics/cal3d/Makefile.common4
-rw-r--r--graphics/camediaplay/Makefile4
-rw-r--r--graphics/camlimages/Makefile4
-rw-r--r--graphics/eog2/Makefile4
-rw-r--r--graphics/gimp2-wideangle/Makefile4
-rw-r--r--graphics/gnuplot-nox11/Makefile4
-rw-r--r--graphics/gnuplot/Makefile4
-rw-r--r--graphics/jpegoptim/Makefile4
-rw-r--r--graphics/mng/Makefile6
-rw-r--r--graphics/ns-cult3d/Makefile4
-rw-r--r--graphics/nvtv/Makefile.common4
-rw-r--r--graphics/p5-GDGraph/Makefile4
-rw-r--r--graphics/p5-GDGraph3d/Makefile4
-rw-r--r--graphics/p5-GIFgraph/Makefile4
-rw-r--r--graphics/p5-SWF-File/Makefile4
-rw-r--r--graphics/pear-Image_Canvas/Makefile4
-rw-r--r--graphics/pear-Image_Color/Makefile4
-rw-r--r--graphics/pear-Image_Graph/Makefile4
-rw-r--r--graphics/php-jpgraph/Makefile8
-rw-r--r--graphics/phpsview/Makefile4
-rw-r--r--graphics/py-biggles/Makefile6
-rw-r--r--graphics/py-gd/Makefile4
-rw-r--r--graphics/py-imaging/Makefile4
-rw-r--r--graphics/py-imagingtk/Makefile4
-rw-r--r--graphics/qcamview/Makefile4
-rw-r--r--graphics/qvplay/Makefile4
-rw-r--r--graphics/rayshade/Makefile4
-rw-r--r--graphics/sane-backends/Makefile6
-rw-r--r--graphics/sane-backends/options.mk10
-rw-r--r--graphics/skencil/Makefile4
-rw-r--r--graphics/vnc2swf/Makefile22
-rw-r--r--graphics/vtk-python/Makefile4
-rw-r--r--graphics/vtk/Makefile.vtkdist4
-rw-r--r--graphics/xpaint/Makefile6
-rw-r--r--ham/7plus/Makefile4
-rw-r--r--ham/gnuradio-wxgui/Makefile4
-rw-r--r--ham/grig/Makefile4
-rw-r--r--inputmethod/canna-server/Makefile6
-rw-r--r--lang/STk/Makefile4
-rw-r--r--lang/a60/Makefile4
-rw-r--r--lang/baci/Makefile4
-rw-r--r--lang/drscheme/Makefile4
-rw-r--r--lang/ezm3/Makefile16
-rw-r--r--lang/gauche/Makefile4
-rw-r--r--lang/jasmin/Makefile4
-rw-r--r--lang/jbuilder-jit/Makefile4
-rw-r--r--lang/jikes/Makefile4
-rw-r--r--lang/joos/Makefile4
-rw-r--r--lang/kaffe/Makefile.common4
-rw-r--r--lang/kali/Makefile4
-rw-r--r--lang/mawk/Makefile8
-rw-r--r--lang/moscow_ml/Makefile6
-rw-r--r--lang/nawk/Makefile4
-rw-r--r--lang/p2c/Makefile4
-rw-r--r--lang/py-extclass/Makefile6
-rw-r--r--lang/py-funge/Makefile6
-rw-r--r--lang/py-psyco/Makefile14
-rw-r--r--lang/python15/Makefile8
-rw-r--r--lang/python22/Makefile6
-rw-r--r--lang/python23-nth/Makefile4
-rw-r--r--lang/sablevm-classpath/Makefile4
-rw-r--r--lang/sun-jre13/Makefile.common4
-rw-r--r--lang/sun-jre14/Makefile4
-rw-r--r--lang/swi-prolog-lite/Makefile.common4
-rw-r--r--lang/tcl-expect/Makefile4
-rw-r--r--lang/tk-expect/Makefile4
-rw-r--r--mail/balsa2/options.mk4
-rw-r--r--mail/columba/Makefile4
-rw-r--r--mail/demime/Makefile10
-rw-r--r--mail/dovecot/options.mk4
-rw-r--r--mail/drac/Makefile4
-rw-r--r--mail/dspam/options.mk6
-rw-r--r--mail/exim-html/Makefile4
-rw-r--r--mail/gld/Makefile6
-rw-r--r--mail/imap-uw/Makefile8
-rw-r--r--mail/kbiff/Makefile6
-rw-r--r--mail/maildrop/Makefile8
-rw-r--r--mail/majordomo/Makefile4
-rw-r--r--mail/mdfrm/Makefile4
-rw-r--r--mail/nail/Makefile4
-rw-r--r--mail/newspipe/Makefile8
-rw-r--r--mail/nmh/Makefile4
-rw-r--r--mail/p5-IMAP-Admin/Makefile6
-rw-r--r--mail/p5-Mail-IMAPClient/Makefile6
-rw-r--r--mail/p5-Mail-SPF-Query/Makefile4
-rw-r--r--mail/pear-Mail/Makefile6
-rw-r--r--mail/procmail/Makefile4
-rw-r--r--mail/qmail/options.mk8
-rw-r--r--mail/qpopper/options.mk4
-rw-r--r--mail/ripmime/Makefile4
-rw-r--r--mail/sendmail/Makefile.common4
-rw-r--r--mail/sma/Makefile8
-rw-r--r--mail/smtpfeed/Makefile4
-rw-r--r--mail/spamd/Makefile4
-rw-r--r--mail/spamprobe/options.mk6
-rw-r--r--mail/sylpheed-claws/Makefile4
-rw-r--r--mail/sylpheed-claws/plugins.mk6
-rw-r--r--mail/sylpheed-devel/Makefile4
-rw-r--r--mail/sylpheed/Makefile4
-rw-r--r--mail/wl/Makefile4
-rw-r--r--mail/xmailbox/Makefile6
-rw-r--r--mail/xmailwatcher/Makefile4
-rw-r--r--math/R-DAAG/Makefile16
-rw-r--r--math/R-GRASS/Makefile14
-rw-r--r--math/R-ISwR/Makefile14
-rw-r--r--math/R-PHYLOGR/Makefile14
-rw-r--r--math/R-R2HTML/Makefile14
-rw-r--r--math/R-RArcInfo/Makefile14
-rw-r--r--math/R-Rcmdr/Makefile14
-rw-r--r--math/R-abind/Makefile12
-rw-r--r--math/R-chron/Makefile14
-rw-r--r--math/R-date/Makefile14
-rw-r--r--math/R-geoR/Makefile12
-rw-r--r--math/R-gstat/Makefile12
-rw-r--r--math/R-httpRequest/Makefile12
-rw-r--r--math/R-hwde/Makefile12
-rw-r--r--math/R-mapproj/Makefile12
-rw-r--r--math/R-maps/Makefile12
-rw-r--r--math/R-pixmap/Makefile12
-rw-r--r--math/R-shapefiles/Makefile14
-rw-r--r--math/R-statmod/Makefile12
-rw-r--r--math/R/Makefile.extension4
-rw-r--r--math/djbfft/Makefile14
-rw-r--r--math/djbfft/options.mk8
-rw-r--r--math/gap/gap.package.mk8
-rw-r--r--math/libffm/Makefile4
-rw-r--r--math/p5-Math-FFT/Makefile4
-rw-r--r--math/pear-Numbers_Roman/Makefile4
-rw-r--r--math/pear-Numbers_Words/Makefile4
-rw-r--r--math/py-rpy/Makefile6
-rw-r--r--math/sc/Makefile4
-rw-r--r--math/xgap/Makefile4
-rw-r--r--math/yorick/Makefile4
-rw-r--r--mbone/imm/Makefile4
-rw-r--r--mbone/vic/Makefile6
-rw-r--r--meta-pkgs/gnuradio/Makefile.common4
-rw-r--r--meta-pkgs/xorg/Makefile.common32
-rw-r--r--misc/astrolog/Makefile18
-rw-r--r--misc/bidwatcher/Makefile6
-rw-r--r--misc/buffer/Makefile4
-rw-r--r--misc/chipmunk/Makefile6
-rw-r--r--misc/cstream/Makefile6
-rw-r--r--misc/dgpsip/Makefile4
-rw-r--r--misc/dt/Makefile4
-rw-r--r--misc/dvorakng/Makefile4
-rw-r--r--misc/figlet-fonts/Makefile4
-rw-r--r--misc/gkrellm-weather/Makefile8
-rw-r--r--misc/gkrellm1-weather/Makefile4
-rw-r--r--misc/gok/Makefile4
-rw-r--r--misc/ibutton-pdkit/Makefile4
-rw-r--r--misc/koffice/options.mk6
-rw-r--r--misc/kp/Makefile6
-rw-r--r--misc/latin-words-bin/Makefile4
-rw-r--r--misc/less/Makefile14
-rw-r--r--misc/mmv/Makefile12
-rw-r--r--misc/molden/Makefile10
-rw-r--r--misc/nxtvepg/Makefile4
-rw-r--r--misc/openoffice-bin/Makefile4
-rw-r--r--misc/openoffice-bin/Makefile.NetBSD.i3866
-rw-r--r--misc/openoffice2-bin/Makefile4
-rw-r--r--misc/qbrew/Makefile4
-rw-r--r--misc/root/Makefile4
-rw-r--r--misc/yelp/Makefile6
-rw-r--r--misc/yrolo/Makefile6
-rw-r--r--multimedia/ffmpeg/options.mk10
-rw-r--r--multimedia/gmencoder/Makefile8
-rw-r--r--multimedia/mjpegtools/hacks.mk4
-rw-r--r--multimedia/mmg/Makefile6
-rw-r--r--multimedia/mplayer/Makefile4
-rw-r--r--multimedia/ns-flash/Makefile6
-rw-r--r--multimedia/vlc/Makefile8
-rw-r--r--multimedia/vlc07/Makefile8
-rw-r--r--multimedia/xfmedia/Makefile12
-rw-r--r--net/argus/Makefile8
-rw-r--r--net/arla/Makefile4
-rw-r--r--net/arla/options.mk6
-rw-r--r--net/arpd/hacks.mk4
-rw-r--r--net/bing/Makefile6
-rw-r--r--net/bsddip/Makefile4
-rw-r--r--net/citrix_ica/Makefile30
-rw-r--r--net/dgd/Makefile4
-rw-r--r--net/firewalk/Makefile4
-rw-r--r--net/freeradius/Makefile14
-rw-r--r--net/freeradius/options.mk4
-rw-r--r--net/gated/Makefile6
-rw-r--r--net/gftp/Makefile.common4
-rw-r--r--net/gift/Makefile4
-rw-r--r--net/gofish/Makefile16
-rw-r--r--net/ipw/Makefile6
-rw-r--r--net/isic/Makefile6
-rw-r--r--net/ja-samba/options.mk22
-rw-r--r--net/kftpgrabber/Makefile4
-rw-r--r--net/latd/Makefile6
-rw-r--r--net/libares/Makefile4
-rw-r--r--net/libnids/options.mk4
-rw-r--r--net/libpcap/Makefile4
-rw-r--r--net/libradius/Makefile4
-rw-r--r--net/libsoup-devel/Makefile4
-rw-r--r--net/llnlxdir/Makefile6
-rw-r--r--net/llnlxftp/Makefile6
-rw-r--r--net/nagios-base/Makefile4
-rw-r--r--net/nagios-base/Makefile.common10
-rw-r--r--net/nagios-imagepak-base/Makefile4
-rw-r--r--net/nagios-nrpe/Makefile6
-rw-r--r--net/nagios-nrpe/options.mk8
-rw-r--r--net/nagios-nsca/Makefile4
-rw-r--r--net/nagios-nsca/Makefile.common10
-rw-r--r--net/nagios-plugin-ldap/Makefile4
-rw-r--r--net/nagios-plugin-mysql/Makefile8
-rw-r--r--net/nagios-plugin-pgsql/Makefile8
-rw-r--r--net/nagios-plugin-snmp/Makefile8
-rw-r--r--net/nagios-plugins/Makefile6
-rw-r--r--net/ncftp2/options.mk6
-rw-r--r--net/netatalk/Makefile12
-rw-r--r--net/netatalk1/options.mk6
-rw-r--r--net/nicotine/Makefile4
-rw-r--r--net/nmapfe/Makefile4
-rw-r--r--net/nocol/Makefile4
-rw-r--r--net/oinkmaster/Makefile4
-rw-r--r--net/openntpd/Makefile4
-rw-r--r--net/openvmps/Makefile4
-rw-r--r--net/p5-Net-CIDR-Lite/Makefile4
-rw-r--r--net/pear-SOAP/Makefile4
-rw-r--r--net/php-xmlrpc/Makefile10
-rw-r--r--net/php5-soap/Makefile4
-rw-r--r--net/ppp-lzs/Makefile4
-rw-r--r--net/py-adns/Makefile16
-rw-r--r--net/py-dns/Makefile4
-rw-r--r--net/py-google/Makefile4
-rw-r--r--net/py-twisted/Makefile.common4
-rw-r--r--net/smokeping/Makefile14
-rw-r--r--net/socket++/Makefile6
-rw-r--r--net/speedtouch/Makefile6
-rw-r--r--net/tcl-scotty/Makefile4
-rw-r--r--net/tcpdump/Makefile4
-rw-r--r--net/tcpflow/Makefile4
-rw-r--r--net/tcpick/Makefile4
-rw-r--r--net/teamspeak-client/Makefile12
-rw-r--r--net/tkined/Makefile4
-rw-r--r--net/trafshow/Makefile4
-rw-r--r--net/tsclient/Makefile6
-rw-r--r--net/vncviewer/Makefile8
-rw-r--r--net/vpnc/Makefile4
-rw-r--r--net/waste/Makefile12
-rw-r--r--net/whoson/Makefile6
-rw-r--r--net/wimon/Makefile4
-rw-r--r--net/wmget/Makefile4
-rw-r--r--net/wu-ftpd/Makefile4
-rw-r--r--net/xnap/Makefile4
-rw-r--r--net/yafc/Makefile4
-rw-r--r--net/ytalk/Makefile6
-rw-r--r--news/cg/Makefile4
-rw-r--r--news/inn/options.mk4
-rw-r--r--news/trn/Makefile4
-rw-r--r--parallel/pvm3/arch.mk6
-rw-r--r--pkgtools/cdpack/Makefile6
-rw-r--r--pkgtools/genrpm/Makefile4
-rw-r--r--pkgtools/libkver/Makefile4
-rw-r--r--pkgtools/p5-pkgsrc-Dewey/Makefile4
-rw-r--r--pkgtools/pkg_select/Makefile6
-rw-r--r--pkgtools/pkg_tarup/Makefile4
-rw-r--r--pkgtools/pkgclean/Makefile8
-rw-r--r--pkgtools/pkgsurvey/Makefile6
-rw-r--r--pkgtools/prereq-readme/Makefile10
-rw-r--r--print/acroread/Makefile4
-rw-r--r--print/bibtool/Makefile6
-rw-r--r--print/foomatic-filters/Makefile8
-rw-r--r--print/ghostscript-esp/Makefile8
-rw-r--r--print/ghostscript-esp/options.mk4
-rw-r--r--print/mp/Makefile4
-rw-r--r--print/pcps/Makefile4
-rw-r--r--print/poppler-glib/Makefile4
-rw-r--r--print/poppler-utils/Makefile4
-rw-r--r--print/psjoin/Makefile4
-rw-r--r--print/py-reportlab-renderPM/Makefile4
-rw-r--r--print/py-reportlab/Makefile4
-rw-r--r--print/scribus/Makefile4
-rw-r--r--print/tcl-pdflib/Makefile8
-rw-r--r--print/teTeX/Makefile10
-rw-r--r--print/tex-bagpipetex/Makefile8
-rw-r--r--print/tex-musixtex/Makefile6
-rw-r--r--regress/make-env-phases/Makefile6
-rw-r--r--security/AiSSLtelnet/Makefile10
-rw-r--r--security/aide/Makefile6
-rw-r--r--security/aide06/Makefile6
-rw-r--r--security/amap/Makefile26
-rw-r--r--security/amavisd-new/Makefile6
-rw-r--r--security/ap-modsecurity2/Makefile4
-rw-r--r--security/crypto++/Makefile4
-rw-r--r--security/cyrus-sasl/Makefile4
-rw-r--r--security/fragroute/Makefile4
-rw-r--r--security/gnupg/hacks.mk6
-rw-r--r--security/gss/Makefile4
-rw-r--r--security/ipsec-tools/Makefile4
-rw-r--r--security/libdes/Makefile6
-rw-r--r--security/libpreludedb/Makefile4
-rw-r--r--security/mirrordir/Makefile4
-rw-r--r--security/mit-krb5/builtin.mk4
-rw-r--r--security/mixminion/Makefile4
-rw-r--r--security/nfsbug/Makefile4
-rw-r--r--security/openssh+gssapi/Makefile6
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/openssh/options.mk4
-rw-r--r--security/openssl/builtin.mk16
-rw-r--r--security/p5-Crypt-OpenPGP/Makefile4
-rw-r--r--security/pflkm/builtin.mk6
-rw-r--r--security/pgp2/Makefile4
-rw-r--r--security/pgp5/Makefile4
-rw-r--r--security/prelude-manager/Makefile22
-rw-r--r--security/py-OpenSSL/Makefile6
-rw-r--r--security/py-mcrypt/Makefile6
-rw-r--r--security/qca-tls/Makefile6
-rw-r--r--security/seahorse-gedit/Makefile4
-rw-r--r--security/seahorse/Makefile4
-rw-r--r--security/smimemsg/Makefile8
-rw-r--r--security/ssh2/Makefile4
-rw-r--r--security/tcp_wrappers/Makefile6
-rw-r--r--shells/scsh/Makefile4
-rw-r--r--shells/zsh/Makefile.common12
-rw-r--r--shells/zsh3/Makefile6
-rw-r--r--sysutils/adjustkernel/Makefile4
-rw-r--r--sysutils/amanda-client/Makefile12
-rw-r--r--sysutils/amanda-server/Makefile12
-rw-r--r--sysutils/asapm/Makefile4
-rw-r--r--sysutils/atitvout/Makefile4
-rw-r--r--sysutils/cdrdao/Makefile.common4
-rw-r--r--sysutils/cdrtools-ossdvd/Makefile6
-rw-r--r--sysutils/cdrtools/Makefile6
-rw-r--r--sysutils/cfengine2-doc/Makefile6
-rw-r--r--sysutils/coreutils/Makefile4
-rw-r--r--sysutils/cpuburn/Makefile4
-rw-r--r--sysutils/crashme/Makefile6
-rw-r--r--sysutils/fdgw/Makefile6
-rw-r--r--sysutils/hddtemp/Makefile4
-rw-r--r--sysutils/i2ocfg/Makefile6
-rw-r--r--sysutils/ipw-firmware/Makefile6
-rw-r--r--sysutils/kdirstat/Makefile6
-rw-r--r--sysutils/libol/Makefile4
-rw-r--r--sysutils/memtestplus/Makefile4
-rw-r--r--sysutils/mtscan/Makefile4
-rw-r--r--sysutils/nvnet/Makefile14
-rw-r--r--sysutils/pear-Log/Makefile4
-rw-r--r--sysutils/setquota/Makefile4
-rw-r--r--sysutils/sformat/Makefile6
-rw-r--r--sysutils/socket/Makefile4
-rw-r--r--sysutils/tits/Makefile6
-rw-r--r--sysutils/top/Makefile6
-rw-r--r--sysutils/usbutil/Makefile6
-rw-r--r--sysutils/wmcpuload/Makefile4
-rw-r--r--sysutils/xentools20/Makefile10
-rw-r--r--sysutils/xentools30-hvm/Makefile12
-rw-r--r--sysutils/xentools30/Makefile12
-rw-r--r--sysutils/xraidadmin/Makefile6
-rw-r--r--textproc/aspell-gaeilge/Makefile4
-rw-r--r--textproc/biblook/Makefile8
-rw-r--r--textproc/chasen/Makefile.common4
-rw-r--r--textproc/dict-client/Makefile8
-rw-r--r--textproc/dict-dictionaries/Makefile4
-rw-r--r--textproc/glimpse/Makefile4
-rw-r--r--textproc/groff/options.mk4
-rw-r--r--textproc/gsed/Makefile8
-rw-r--r--textproc/hevea/Makefile4
-rw-r--r--textproc/html/Makefile4
-rw-r--r--textproc/ipadic/Makefile6
-rw-r--r--textproc/iso8879/Makefile6
-rw-r--r--textproc/ispell-gaeilge/Makefile4
-rw-r--r--textproc/ja-grep/Makefile8
-rw-r--r--textproc/libcroco/Makefile4
-rw-r--r--textproc/namazu2/Makefile4
-rw-r--r--textproc/opensp/Makefile4
-rw-r--r--textproc/p5-Pod-POM/Makefile6
-rw-r--r--textproc/p5-Text-CharWidth/Makefile6
-rw-r--r--textproc/p5-Text-Format/Makefile6
-rw-r--r--textproc/p5-Text-Reform/Makefile6
-rw-r--r--textproc/p5-Text-Shellwords/Makefile4
-rw-r--r--textproc/p5-Text-Unaccent/Makefile6
-rw-r--r--textproc/p5-Text-WrapI18N/Makefile6
-rw-r--r--textproc/p5-Text-Wrapper/Makefile6
-rw-r--r--textproc/p5-XML-Simple/Makefile12
-rw-r--r--textproc/po4a/Makefile4
-rw-r--r--textproc/py-SimpleParse/Makefile6
-rw-r--r--textproc/py-cmTemplate/Makefile4
-rw-r--r--textproc/py-dtml/Makefile4
-rw-r--r--textproc/py-expat/Makefile4
-rw-r--r--textproc/sablotron/Makefile4
-rw-r--r--textproc/scrollkeeper/Makefile14
-rw-r--r--textproc/tcl-xml/Makefile4
-rw-r--r--time/bbdate/Makefile4
-rw-r--r--time/p5-Time-Period/Makefile4
-rw-r--r--time/p5-Time/Makefile4
-rw-r--r--time/p5-TimeDate/Makefile4
-rw-r--r--time/phoon/Makefile4
-rw-r--r--time/projclock/Makefile6
-rw-r--r--time/wmclockmon/Makefile4
-rw-r--r--time/wmmoonclock/Makefile8
-rw-r--r--wm/amiwm/Makefile8
-rw-r--r--wm/blackbox70/Makefile4
-rw-r--r--wm/jwm/Makefile4
-rw-r--r--wm/jwm/options.mk4
-rw-r--r--wm/oroborus/Makefile4
-rw-r--r--www/analog/Makefile8
-rw-r--r--www/ap-Embperl/Makefile6
-rw-r--r--www/ap-jk/Makefile.common6
-rw-r--r--www/ap-throttle/Makefile4
-rw-r--r--www/ap-xslt/Makefile4
-rw-r--r--www/apache-tomcat55/Makefile10
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/apache2/options.mk12
-rw-r--r--www/august/Makefile4
-rw-r--r--www/checkbot/Makefile10
-rw-r--r--www/clearsilver/Makefile.common6
-rw-r--r--www/drivel/hacks.mk4
-rw-r--r--www/drupal/Makefile4
-rw-r--r--www/firefox-bin-acroread/Makefile4
-rw-r--r--www/firefox-bin-acroread5/Makefile4
-rw-r--r--www/firefox-bin-acroread7/Makefile4
-rw-r--r--www/firefox-bin-flash/Makefile.common6
-rw-r--r--www/firefox-bin/Makefile.NetBSD.i3864
-rw-r--r--www/geeklog/Makefile16
-rw-r--r--www/geeklog/Makefile.common4
-rw-r--r--www/grail/Makefile6
-rw-r--r--www/jakarta-tomcat4/Makefile8
-rw-r--r--www/jsdk20/Makefile4
-rw-r--r--www/kdewebdev3/Makefile4
-rw-r--r--www/lighttpd/options.mk6
-rw-r--r--www/navigator/Makefile.common14
-rw-r--r--www/opera-acroread/Makefile4
-rw-r--r--www/opera-acroread5/Makefile4
-rw-r--r--www/opera-acroread7/Makefile4
-rw-r--r--www/p5-Apache-Session-Wrapper/Makefile8
-rw-r--r--www/p5-CGI-Kwiki/Makefile6
-rw-r--r--www/p5-CGI/Makefile6
-rw-r--r--www/p5-CGI_Lite/Makefile6
-rw-r--r--www/p5-FCGI/Makefile6
-rw-r--r--www/p5-HTML-Mason/Makefile6
-rw-r--r--www/p5-HTTP-DAV/Makefile4
-rw-r--r--www/p5-HTTP-Request-Form/Makefile10
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile4
-rw-r--r--www/p5-Kwiki-Archive-Rcs/Makefile6
-rw-r--r--www/p5-Kwiki-BreadCrumbs/Makefile6
-rw-r--r--www/p5-Kwiki-Edit-RequireUserName/Makefile6
-rw-r--r--www/p5-Kwiki-Favorites/Makefile6
-rw-r--r--www/p5-Kwiki-HtmlBlocks/Makefile6
-rw-r--r--www/p5-Kwiki-Icons-Gnome/Makefile6
-rw-r--r--www/p5-Kwiki-NewPage/Makefile6
-rw-r--r--www/p5-Kwiki-Notify-Mail/Makefile6
-rw-r--r--www/p5-Kwiki-PagePrivacy/Makefile6
-rw-r--r--www/p5-Kwiki-ParagraphBlocks/Makefile6
-rw-r--r--www/p5-Kwiki-PreformattedBlocks/Makefile6
-rw-r--r--www/p5-Kwiki-RecentChanges/Makefile6
-rw-r--r--www/p5-Kwiki-Revisions/Makefile6
-rw-r--r--www/p5-Kwiki-Scode/Makefile6
-rw-r--r--www/p5-Kwiki-Search/Makefile6
-rw-r--r--www/p5-Kwiki-Simple-Server-HTTP/Makefile6
-rw-r--r--www/p5-Kwiki-UserName/Makefile6
-rw-r--r--www/p5-Kwiki-UserPreferences/Makefile6
-rw-r--r--www/p5-Kwiki-Weather/Makefile6
-rw-r--r--www/p5-Kwiki-Wikiwyg/Makefile6
-rw-r--r--www/p5-Kwiki-Zipcode/Makefile6
-rw-r--r--www/p5-Kwiki/Makefile6
-rw-r--r--www/p5-libwww/Makefile4
-rw-r--r--www/py-django/options.mk6
-rw-r--r--www/py-pcgi/Makefile4
-rw-r--r--www/py-zpublisher/Makefile4
-rw-r--r--www/swish-e/Makefile6
-rw-r--r--www/tinyproxy/options.mk6
-rw-r--r--www/wApua/Makefile4
-rw-r--r--www/webalizer/Makefile6
-rw-r--r--www/whisker/Makefile4
-rw-r--r--www/wwwcount/Makefile10
-rw-r--r--www/wwwoffle/Makefile16
-rw-r--r--www/zope-confera/Makefile4
-rw-r--r--www/zope/Makefile4
-rw-r--r--www/zope29/Makefile4
-rw-r--r--x11/Xfixes/Makefile4
-rw-r--r--x11/XmHTML/Makefile6
-rw-r--r--x11/Xrandr-mixedcase/Makefile4
-rw-r--r--x11/dfm/Makefile.common4
-rw-r--r--x11/fixesproto/builtin.mk4
-rw-r--r--x11/fltk/Makefile6
-rw-r--r--x11/gnome-mag/Makefile4
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome2-control-center/Makefile4
-rw-r--r--x11/gnome2-terminal/Makefile4
-rw-r--r--x11/gnopernicus/Makefile4
-rw-r--r--x11/kdelibs3/Makefile6
-rw-r--r--x11/kmessage/Makefile6
-rw-r--r--x11/py-Pmw/Makefile4
-rw-r--r--x11/py-qt3-sip/Makefile4
-rw-r--r--x11/qt3-libs/Makefile.common4
-rw-r--r--x11/qwt/Makefile4
-rw-r--r--x11/randrproto/builtin.mk6
-rw-r--r--x11/wmavgload/Makefile4
-rw-r--r--x11/x11vnc/Makefile4
-rw-r--r--x11/x3270/Makefile4
-rw-r--r--x11/xcursor/Makefile4
-rw-r--r--x11/xextproto/builtin.mk4
-rw-r--r--x11/xgas/Makefile12
-rw-r--r--x11/xkeycaps/Makefile4
-rw-r--r--x11/xlockmore/Makefile.common16
-rw-r--r--x11/xmascot/Makefile4
-rw-r--r--x11/xnodecor/Makefile4
-rw-r--r--x11/xorg-clients/Makefile8
-rw-r--r--x11/xphoon/Makefile4
-rw-r--r--x11/xplanet/Makefile8
-rw-r--r--x11/xscreensaver-demo/Makefile6
-rw-r--r--x11/xservers/Makefile4
-rw-r--r--x11/xsnow/Makefile4
-rw-r--r--x11/xview-config/Makefile4
-rw-r--r--x11/xview-lib/Makefile4
-rw-r--r--x11/xview/Makefile4
724 files changed, 2110 insertions, 2110 deletions
diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index 0c627c319b8..ae5e4036208 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/11/03 12:45:21 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:05 wiz Exp $
#
DISTNAME= cdparanoia-III-alpha9.8
@@ -26,6 +26,6 @@ CONFIGURE_ARGS+= --includedir=${PREFIX}/include/cdparanoia
MAKE_ENV+= GCC=yes
LDFLAGS.FreeBSD+= -lcam
-LDFLAGS.DragonFly+= -lcam
+LDFLAGS.DragonFly+= -lcam
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 208743697d7..1549e85b182 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/02/15 14:28:16 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:05 wiz Exp $
#
DISTNAME= cmus-2.1.0
@@ -6,9 +6,9 @@ CATEGORIES= audio
MASTER_SITES= http://onion.dynserv.net/~timo/files/
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= webmaster@deepblack24.de
+MAINTAINER= webmaster@deepblack24.de
HOMEPAGE= http://onion.dynserv.net/~timo/files/
-COMMENT= Cmus is an ncurses based mp3/ogg player with a lot of features
+COMMENT= Cmus is an ncurses based mp3/ogg player with a lot of features
HAS_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile
index 5f35a987089..ef93b191757 100644
--- a/audio/csound5/Makefile
+++ b/audio/csound5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/07 12:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:05 wiz Exp $
#
DISTNAME= Csound${CSOUND_VERSION}_src
@@ -15,7 +15,7 @@ COMMENT= Software synthesizer and sequencer
CSOUND_VERSION= 5.01
USE_LANGUAGES= c c++
CFLAGS+= -g -D__PKGSRC_PREFIX__=${PREFIX}/ -DBETA
-BUILD_DEPENDS+= scons>=0.96:../../devel/scons
+BUILD_DEPENDS+= scons>=0.96:../../devel/scons
NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 # Severe LP64 problems
SCONS= ${PREFIX}/bin/scons
SCONS_ARGS= -C ${WRKSRC} prefix=${PREFIX}
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
index 26079974e5a..09faf78a8fc 100644
--- a/audio/gnome-speech/Makefile
+++ b/audio/gnome-speech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/01/26 18:45:52 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:05 wiz Exp $
#
DISTNAME= gnome-speech-0.4.6
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
# Disable Java support.
CONFIGURE_ARGS+= JAVAC=no JAVA=no IDLJ=no JAB=no
-PKGCONFIG_OVERRIDE+= gnome-speech-1.0.pc.in
+PKGCONFIG_OVERRIDE+= gnome-speech-1.0.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 0c215491cbc..570cd12e731 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:28:55 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:05 wiz Exp $
#
-DISTNAME= gsm-1.0.10
+DISTNAME= gsm-1.0.10
PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://kbs.cs.tu-berlin.de/~jutta/toast.html
COMMENT= Audio converter and library for converting u-law to gsm encoding
-WRKSRC= ${WRKDIR}/gsm-1.0-pl10
+WRKSRC= ${WRKDIR}/gsm-1.0-pl10
USE_LIBTOOL= yes
NO_CONFIGURE= yes
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index 4e32325f675..5414e86aedc 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/26 20:05:53 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:05 wiz Exp $
#
DISTNAME= gtick-0.3.10
@@ -12,7 +12,7 @@ COMMENT= Metronome application using GTK2+
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
+USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config
LIBS+= ${LIBOSSAUDIO}
diff --git a/audio/guspatches/Makefile b/audio/guspatches/Makefile
index c4f56affe02..b7050ea8e83 100644
--- a/audio/guspatches/Makefile
+++ b/audio/guspatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/09/19 23:19:41 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:05 wiz Exp $
#
DISTNAME= dgguspat
@@ -8,7 +8,7 @@ CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .zip
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= GUS (Gravis Ultrasound) patches (audio samples) for TiMidity
RESTRICTED= Uses copyrighted patches
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index c1dc1d4e6e1..3c41b82b631 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2006/11/19 11:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/02/22 19:26:05 wiz Exp $
#
DISTNAME= icecast-2.3.0
PKGREVISION= 2
CATEGORIES= audio
-MASTER_SITES= http://svn.xiph.org/releases/icecast/
+MASTER_SITES= http://svn.xiph.org/releases/icecast/
MAINTAINER= pancake@phreaker.net
HOMEPAGE= http://www.icecast.org/
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 2da2855dc49..c8c089ada06 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/11 19:32:13 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:06 wiz Exp $
#
DISTNAME= a52dec-0.7.4
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://liba52.sourceforge.net/
COMMENT= Free ATSC A/52 stream decoder library
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-oss
diff --git a/audio/madplay/options.mk b/audio/madplay/options.mk
index c46012b1f13..282d99befe7 100644
--- a/audio/madplay/options.mk
+++ b/audio/madplay/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/03/09 21:04:41 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2007/02/22 19:26:06 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.madplay
PKG_SUPPORTED_OPTIONS= esound oss
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS= esound oss
.if !empty(PKG_OPTIONS:Mesound)
.include "../../audio/esound/buildlink3.mk"
.else
-CONFIGURE_ARGS+= --without-esd
+CONFIGURE_ARGS+= --without-esd
.endif
.if !empty(PKG_OPTIONS:Moss)
diff --git a/audio/mserv_irman/Makefile b/audio/mserv_irman/Makefile
index 29bed371c5b..0af399053dd 100644
--- a/audio/mserv_irman/Makefile
+++ b/audio/mserv_irman/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:06 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:06 wiz Exp $
#
DISTNAME= mserv_irman-0.20
CATEGORIES= audio
MASTER_SITES= http://www.mono.org/abs/tools/mserv_irman/
-EXTRACT_SUFX= .tbz
+EXTRACT_SUFX= .tbz
MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.mono.org/abs/tools/mserv_irman/
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index 701c8536f66..a3a9a7fe3ad 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/10/04 20:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:06 wiz Exp $
#
DISTNAME= pymad-0.5.4
@@ -6,7 +6,7 @@ PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
CATEGORIES= audio python
MASTER_SITES= http://spacepants.org/src/pymad/download/
-MAINTAINER= froz@icix.org
+MAINTAINER= froz@icix.org
HOMEPAGE= http://spacepants.org/src/pymad/
COMMENT= Python bindings for libmad
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index 0dc659de97f..0f17ba0ac31 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 20:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:06 wiz Exp $
#
DISTNAME= pymusique-0.5
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.pyronecrophilia.com/content/pymusique/
@@ -12,10 +12,10 @@ HOMEPAGE= http://www.pyronecrophilia.com/content/pymusique/
COMMENT= Interface to the iTunes Music Store
RESTRICTED= Possible legal problems due to iTunes access
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 676dee340de..86f7895f9f8 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:28:58 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:06 wiz Exp $
#
DISTNAME= pyvorbis-1.3
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
PKGREVISION= 2
CATEGORIES= audio python
MASTER_SITES= http://vorbis.com/files/1.0.1/unix/py/
@@ -11,8 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://vorbis.com/
COMMENT= Python bindings for Vorbis library
-PY_PATCHPLIST= yes
-PYDISTUTILSPKG= yes
+PY_PATCHPLIST= yes
+PYDISTUTILSPKG= yes
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ${PYTHONBIN} config_unix.py
diff --git a/audio/rio/Makefile b/audio/rio/Makefile
index bf9ed589c60..7ef8434e415 100644
--- a/audio/rio/Makefile
+++ b/audio/rio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/01/09 04:17:30 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:26:07 wiz Exp $
#
DISTNAME= rio007
@@ -7,8 +7,8 @@ CATEGORIES= audio
MASTER_SITES= http://www.world.co.uk/sba/
EXTRACT_SUFX= .tgz
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.world.co.uk/sba/rio.html
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://www.world.co.uk/sba/rio.html
COMMENT= Utility to display and manage files on the Diamond Rio PMP300
ONLY_FOR_PLATFORM= NetBSD-*-i386
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 86a10d7c57e..c1ebaa1bf3e 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/11/02 17:59:37 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:07 wiz Exp $
#
DISTNAME= speex-1.0.5
@@ -22,7 +22,7 @@ CONFLICTS= Speex-[0-9]*
CONFIGURE_ARGS+= --with-ogg-dir="${BUILDLINK_PREFIX.libogg}"
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE:Q}
+CONFIGURE_ENV+= F77=${FALSE:Q}
BUILDLINK_TRANSFORM+= l:gnugetopt:getopt
diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile
index 61f6f15110f..53f38dec5cc 100644
--- a/audio/tcl-snack/Makefile
+++ b/audio/tcl-snack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/09 21:04:41 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:07 wiz Exp $
DISTNAME= snack2.2.8
PKGNAME= tcl-snack-2.2.8
@@ -12,7 +12,7 @@ COMMENT= The Snack Sound Toolkit
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/${DISTNAME}/unix
+WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index 5a8d6c78d02..b09ff850327 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/10/04 20:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:07 wiz Exp $
DISTNAME= tremor_snapshot_030406
PKGNAME= tremor-1.0.2
@@ -11,7 +11,7 @@ MAINTAINER= chris@NetBSD.org
HOMEPAGE= http://www.xiph.org/vorbis/
COMMENT= Fixed point decoding library for the Ogg Vorbis audio encoding format
-WRKSRC= ${WRKDIR}/Tremor
+WRKSRC= ${WRKDIR}/Tremor
AUTOCONF_REQD= 2.50
GNU_CONFIGURE= yes
USE_TOOLS+= automake14 gmake
diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile
index 604d1ad49c1..41d52c3bad3 100644
--- a/audio/ubs/Makefile
+++ b/audio/ubs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/14 07:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:07 wiz Exp $
#
DISTNAME= ubs-0.17
@@ -25,8 +25,8 @@ UBS_BASEDIR?= /var/spool/ubs
UBS_USER?= ubs
UBS_GROUP?= ubs
-PKG_GROUPS= ${UBS_GROUP}
-PKG_USERS= ${UBS_USER}:${UBS_GROUP}
+PKG_GROUPS= ${UBS_GROUP}
+PKG_USERS= ${UBS_USER}:${UBS_GROUP}
FILES_SUBST+= PREFIX=${PREFIX:Q}
FILES_SUBST+= UBS_USER=${UBS_USER:Q}
FILES_SUBST+= UBS_GROUP=${UBS_GROUP:Q}
diff --git a/audio/wmmp/Makefile b/audio/wmmp/Makefile
index 7700d27ed66..55dba1ff9c6 100644
--- a/audio/wmmp/Makefile
+++ b/audio/wmmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/01/26 18:41:13 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:08 wiz Exp $
DISTNAME= WMmp-0.10.0
CATEGORIES= audio
-MASTER_SITES= http://mercury.chem.pitt.edu/~shank/
+MASTER_SITES= http://mercury.chem.pitt.edu/~shank/
MAINTAINER= rpaulo@NetBSD.org
HOMEPAGE= http://musicpd.org/WMmp.shtml
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 5758eece92b..c098a1ed2fe 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:35 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:08 wiz Exp $
DISTNAME= wmmp3-0.12
PKGREVISION= 2
CATEGORIES= audio
-MASTER_SITES= http://www.dotfiles.com/software/wmmp3/
+MASTER_SITES= http://www.dotfiles.com/software/wmmp3/
MAINTAINER= rxg@NetBSD.org
# HOMEPAGE= http://www.dotfiles.com/software/wmmp3/
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index b6d6700146d..a1da3ffeabf 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:35 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:26:08 wiz Exp $
-DISTNAME= xcdplayer-2.2
+DISTNAME= xcdplayer-2.2
PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 7f97ad01e24..8e4a47ee46f 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2007/01/02 14:58:53 rillig Exp $
+# $NetBSD: Makefile,v 1.66 2007/02/22 19:26:08 wiz Exp $
DISTNAME= xmcd-3.0.2
-PKGREVISION= 9
+PKGREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://www.ibiblio.org/tkan/download/xmcd/src/
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 0bc5f1af612..4889f40271c 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:08 wiz Exp $
-DISTNAME= xmmix-1.2
+DISTNAME= xmmix-1.2
PKGREVISION= 4
CATEGORIES= audio
-MASTER_SITES= http://www.ibiblio.org/tkan/download/xmmix/1.2.2/src/
+MASTER_SITES= http://www.ibiblio.org/tkan/download/xmmix/1.2.2/src/
MAINTAINER= augustss@cs.chalmers.se
HOMEPAGE= http://www.amb.org/xmmix/
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 369728a1e51..d1c63f2f33d 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:08 wiz Exp $
#
DISTNAME= liveice-xmms
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://star.arm.ac.uk/~spm/software/
COMMENT= Audio streaming plugin for XMMS
-WRKSRC= ${WRKDIR}/LiveIce-1.0.0
+WRKSRC= ${WRKDIR}/LiveIce-1.0.0
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 0a8af898b48..5f8bbaf5752 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/15 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:08 wiz Exp $
#
DISTNAME= modplugxmms-2.05
@@ -30,7 +30,7 @@ SUBST_CLASSES+= mpplay
SUBST_MESSAGE.mpplay= Skipping modplugplay
SUBST_STAGE.mpplay= pre-build
SUBST_FILES.mpplay= Makefile
-SUBST_SED.mpplay= -e 's,^\(SUBDIRS = modplugxmms glade\) modplugplay,\1,'
+SUBST_SED.mpplay= -e 's,^\(SUBDIRS = modplugxmms glade\) modplugplay,\1,'
PLIST_SUBST+= NOTFOROSX="@comment "
.else
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index c685621b9c4..f54ca37035d 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2006/07/08 01:11:21 minskim Exp $
+# $NetBSD: Makefile.common,v 1.26 2007/02/22 19:26:08 wiz Exp $
#
DISTNAME= xmms-1.2.10
@@ -30,8 +30,8 @@ LDFLAGS+= ${BUILDLINK_LDADD.iconv}
PTHREAD_OPTS+= require
-PKG_OPTIONS_VAR= PKG_OPTIONS.xmms
-PKG_SUPPORTED_OPTIONS= inet6
+PKG_OPTIONS_VAR= PKG_OPTIONS.xmms
+PKG_SUPPORTED_OPTIONS= inet6
.include "../../mk/bsd.options.mk"
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 81b976b04fb..3662d9f5493 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2007/01/18 11:16:56 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:09 wiz Exp $
-DISTNAME= bonnie
+DISTNAME= bonnie
PKGNAME= bonnie-2.06
PKGREVISION= 2
CATEGORIES= benchmarks
-MASTER_SITES= http://www.textuality.com/bonnie/
+MASTER_SITES= http://www.textuality.com/bonnie/
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.textuality.com/bonnie/index.html
diff --git a/benchmarks/postmark/Makefile b/benchmarks/postmark/Makefile
index 63b803c9f4f..fe6c9c298a2 100644
--- a/benchmarks/postmark/Makefile
+++ b/benchmarks/postmark/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:12:51 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:09 wiz Exp $
-DISTNAME= postmark-1_5.c
+DISTNAME= postmark-1_5.c
PKGNAME= postmark-1.5
CATEGORIES= benchmarks
-MASTER_SITES= http://www.netapp.com/ftp/
+MASTER_SITES= http://www.netapp.com/ftp/
EXTRACT_SUFX= #
MAINTAINER= root@garbled.net
diff --git a/biology/arka/Makefile b/biology/arka/Makefile
index eeef080bf9b..940aed6fe9f 100644
--- a/biology/arka/Makefile
+++ b/biology/arka/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:48 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:09 wiz Exp $
#
DISTNAME= arka-0.11
-PKGREVISION= 1
-CATEGORIES= biology
+PKGREVISION= 1
+CATEGORIES= biology
MASTER_SITES= http://bioinformatics.org/genpak/download/
EXTRACT_SUFX= .tgz
diff --git a/biology/glimmer/Makefile b/biology/glimmer/Makefile
index cff81aaa337..8009c97f48d 100644
--- a/biology/glimmer/Makefile
+++ b/biology/glimmer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/26 13:44:02 schwarz Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:09 wiz Exp $
#
DISTNAME= glimmer213
@@ -12,7 +12,7 @@ COMMENT= System for finding genes in microbial DNA
USE_LANGUAGES= c c++
-WRKSRC= ${WRKDIR}/glimmer2.13
+WRKSRC= ${WRKDIR}/glimmer2.13
INSTALLATION_DIRS= bin
do-install:
diff --git a/biology/hmmer/Makefile b/biology/hmmer/Makefile
index f159ded3fb8..e972ed9e91e 100644
--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:51 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:09 wiz Exp $
#
DISTNAME= hmmer-2.3.2
@@ -13,6 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-MAKE_FLAGS+= MKDIR=${MKDIR:Q}
+MAKE_FLAGS+= MKDIR=${MKDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/biology/pdbalign/Makefile b/biology/pdbalign/Makefile
index b0c74d6eebb..e0cbce296a2 100644
--- a/biology/pdbalign/Makefile
+++ b/biology/pdbalign/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:09 wiz Exp $
#
DISTNAME= pdbalign
@@ -7,7 +7,7 @@ CATEGORIES= biology
MASTER_SITES= ftp://ftp.ebi.ac.uk/pub/software/unix/pdbalign/
MAINTAINER= hdp@cs.nmsu.edu
-HOMEPAGE= #empty
+HOMEPAGE= #empty
COMMENT= Prediction of Protein Secondary Structure and Active Sites
WRKSRC= ${WRKDIR}
diff --git a/biology/xylem/Makefile b/biology/xylem/Makefile
index 4b78427b44d..4f07a820766 100644
--- a/biology/xylem/Makefile
+++ b/biology/xylem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/03 19:52:44 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:09 wiz Exp $
#
DISTNAME= xylem.1.8.7
@@ -11,7 +11,7 @@ MAINTAINER= hdp@cs.nmsu.edu
HOMEPAGE= http://home.cc.umanitoba.ca/~psgendb/XYLEM.html
COMMENT= Tools for manipulation of genetic databases
-WRKSRC= ${WRKDIR}/xylem
+WRKSRC= ${WRKDIR}/xylem
BUILD_DIRS= src.c # yes, it's a directory
INSTALLATION_DIRS= bin
diff --git a/cad/covered-current/Makefile b/cad/covered-current/Makefile
index de38d423165..a6bc3189c8b 100644
--- a/cad/covered-current/Makefile
+++ b/cad/covered-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/12 03:13:30 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:09 wiz Exp $
#
DISTNAME= covered-${SNAPDATE}
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
DEPENDS+= verilog{,-current}-[0-9]*:../../cad/verilog
-CONFLICTS+= covered-[0-9]*
+CONFLICTS+= covered-[0-9]*
SNAPDATE= 20060904
GNU_CONFIGURE= YES
diff --git a/cad/dinotrace-mode/Makefile b/cad/dinotrace-mode/Makefile
index 96325ba7b84..337f683e5b5 100644
--- a/cad/dinotrace-mode/Makefile
+++ b/cad/dinotrace-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:20 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:10 wiz Exp $
#
DISTNAME= dinotrace-9.3a
@@ -8,7 +8,7 @@ CATEGORIES= cad editors
MASTER_SITES= http://www.veripool.com/ftp/
MAINTAINER= dmcmahill@NetBSD.org
-HOMEPAGE= http://www.veripool.com/dinotrace/
+HOMEPAGE= http://www.veripool.com/dinotrace/
COMMENT= Emacs major mode for dinotrace
DEPENDS+= ${EMACS_PKGNAME_PREFIX}verilog-mode>=3.13:../../cad/verilog-mode
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 5c02bcd7a11..aa3c7736690 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:09 wiz Exp $
#
DISTNAME= dinotrace-9.3a
@@ -7,7 +7,7 @@ CATEGORIES= cad
MASTER_SITES= http://www.veripool.com/ftp/
MAINTAINER= dmcmahill@NetBSD.org
-HOMEPAGE= http://www.veripool.com/dinotrace/
+HOMEPAGE= http://www.veripool.com/dinotrace/
COMMENT= Tool for viewing the output of digital simulators
GNU_CONFIGURE= YES
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 919073f35ce..c60b503fbb4 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/02/21 13:23:54 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.40 2007/02/22 19:26:10 wiz Exp $
#
DISTNAME= geda-utils-${PKGVERSION}
@@ -31,7 +31,7 @@ post-patch:
EVAL_PREFIX+= PYDIR=python
-REPLACE_INTERPRETER+= python
+REPLACE_INTERPRETER+= python
REPLACE.python.old= .*/bin/python
REPLACE.python.new= ${PYDIR}/bin/python
REPLACE_FILES.python= scripts/tragesym
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 365be6f88a3..5b067cda396 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/10/23 09:43:13 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.52 2007/02/22 19:26:10 wiz Exp $
#
DISTNAME= geda-${PKGVERSION}
@@ -20,11 +20,11 @@ DEPENDS+= geda-symbols-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-symbols
.include "Makefile.common"
-EXTRACT_ONLY= # none
+EXTRACT_ONLY= # none
NO_CHECKSUM= yes
-NO_CONFIGURE= yes
-NO_BUILD= yes
-NO_MTREE= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
+NO_MTREE= yes
do-install: # empty
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index da343b9ae50..0d514bc5b41 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/09/17 17:36:35 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2007/02/22 19:26:10 wiz Exp $
#
DISTNAME= geda-gnetlist-${PKGVERSION}
@@ -21,7 +21,7 @@ USE_LIBTOOL= YES
# needs GNU m4 for the PCBboard and gsch2pcb netlisters
USE_TOOLS+= gmake m4:run pkg-config
-EVAL_PREFIX+= PCBDIR=pcb
+EVAL_PREFIX+= PCBDIR=pcb
CONFIGURE_ARGS+= --with-pcbm4dir=${PCBDIR}/share/pcb/m4
CONFIGURE_ARGS+= --with-pcbconfdir=${PKG_SYSCONFDIR}/pcb
diff --git a/cad/oct-wcalc/Makefile b/cad/oct-wcalc/Makefile
index e12611a84ca..32469737bdf 100644
--- a/cad/oct-wcalc/Makefile
+++ b/cad/oct-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/07 12:25:54 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:10 wiz Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -28,8 +28,8 @@ USE_LANGUAGES= c c++ fortran
.include "../../math/octave/octave.mk"
-PLIST_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR:S/${LOCALBASE}\///}
-PLIST_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR:S/${LOCALBASE}\///}
+PLIST_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR:S/${LOCALBASE}\///}
+PLIST_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR:S/${LOCALBASE}\///}
.include "../../cad/libwcalc/buildlink3.mk"
.include "../../math/octave/buildlink3.mk"
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 896c8c8c120..dc859993ae3 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:48 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2007/02/22 19:26:10 wiz Exp $
DISTNAME= sp3f4.kit
PKGNAME= spice-3f5.1
PKGREVISION= 4
CATEGORIES= cad
MASTER_SITES= ftp://ic.eecs.berkeley.edu/pub/Spice3/
-EXTRACT_SUFX= .tar.Z
+EXTRACT_SUFX= .tar.Z
MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
diff --git a/cad/wcalc/Makefile.common b/cad/wcalc/Makefile.common
index 78c024f8216..7fb10d4659d 100644
--- a/cad/wcalc/Makefile.common
+++ b/cad/wcalc/Makefile.common
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile.common,v 1.7 2007/01/17 14:19:43 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.8 2007/02/22 19:26:10 wiz Exp $
#
-DISTNAME= wcalc-1.0
-CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wcalc/}
+DISTNAME= wcalc-1.0
+CATEGORIES= cad
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wcalc/}
-MAINTAINER= dmcmahill@NetBSD.org
-HOMEPAGE= http://wcalc.sourceforge.net/
+MAINTAINER= dmcmahill@NetBSD.org
+HOMEPAGE= http://wcalc.sourceforge.net/
DISTINFO_FILE= ${.CURDIR}/../../cad/wcalc/distinfo
PATCHDIR= ${.CURDIR}/../../cad/wcalc/patches
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= yes
diff --git a/chat/bitchbot/Makefile b/chat/bitchbot/Makefile
index a067ce1cb93..f6e992be4e6 100644
--- a/chat/bitchbot/Makefile
+++ b/chat/bitchbot/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2005/12/29 06:21:32 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:10 wiz Exp $
DISTNAME= bitchbot-1.0.2
CATEGORIES= chat
MASTER_SITES= http://www.r1ch.net/projects/bitchbot/download/
MAINTAINER= adrianp@stindustries.net
-HOMEPAGE= http://www.r1ch.net/projects/bitchbot/
+HOMEPAGE= http://www.r1ch.net/projects/bitchbot/
COMMENT= Bitchbot is a perl-based IRC bot
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index b180a1fd8cb..4754c8586d2 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/01/07 09:13:48 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:11 wiz Exp $
DISTNAME= eggdrop1.6.17
PKGNAME= eggdrop-1.6.17
@@ -6,7 +6,7 @@ CATEGORIES= chat
MASTER_SITES= ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.eggheads.org/
COMMENT= IRC robot with TCL scripting and multi-channel ability
diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile
index 7863976b929..ac6f040bf64 100644
--- a/chat/fugu/Makefile
+++ b/chat/fugu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/01/06 14:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:26:11 wiz Exp $
#
DISTNAME= fugu-1.0
@@ -14,7 +14,7 @@ COMMENT= Graphical client for the gale secure instant messaging system
PYTHON_VERSIONS_ACCEPTED= 20 21 # no 22 - uses Makefile.pre.in
PYTHON_PATCH_SCRIPTS= puffdisp.py pygale/authcache.py pygale/prettypuff.py
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
CONFIGURE_ENV+= vi_cv_path_python=${PYTHONBIN:Q}
LDFLAGS+= -L${BUILDLINK_PREFIX.py-Pmw}/lib \
${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.py-Pmw}/lib
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index f1414d9aad6..507a2383754 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2007/01/30 19:50:54 joerg Exp $
+# $NetBSD: Makefile,v 1.111 2007/02/22 19:26:11 wiz Exp $
DISTNAME= gaim-1.5.0
PKGREVISION= 6
@@ -29,7 +29,7 @@ CONFIGURE_ENV+= DLLIB=${BUILDLINK_LDADD.dl}
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
-_INSTALL_UNSTRIPPED= yes
+_INSTALL_UNSTRIPPED= yes
.endif
.if ${X11_TYPE} != "native"
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 448eb231190..bc4b0e0c6a1 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/07/19 19:14:37 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/22 19:26:11 wiz Exp $
DISTNAME= gale-0.99fruit
PKGNAME= gale-0.99f
@@ -13,7 +13,7 @@ COMMENT= Secure instant messaging system
USE_GNU_READLINE= yes # needs rl_named_function()
USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ENV+= PROG_GLIB_CONFIG=${GLIB_CONFIG:Q}
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 7e7da9ef412..07b1171d721 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2007/01/11 10:46:49 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2007/02/22 19:26:11 wiz Exp $
#
DISTNAME= gossip-0.10.2
@@ -16,7 +16,7 @@ BUILD_DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
+USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 327edf02193..40cb4f70893 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/07/26 02:21:35 mrg Exp $
+# $NetBSD: Makefile,v 1.46 2007/02/22 19:26:11 wiz Exp $
DISTNAME= ircii-${VERS}
PKGNAME= ircII-${VERS}
@@ -17,7 +17,7 @@ CONFLICTS= blackened-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
VERS= 20060725
-PLIST_SUBST+= VERS=${VERS:Q}
+PLIST_SUBST+= VERS=${VERS:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index 3312f163fc4..225a9d0f1ec 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/11/13 23:12:38 adrianp Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:11 wiz Exp $
#
DISTNAME= ircservices-5.0.59
@@ -26,14 +26,14 @@ SUBST_FILES.install= install-script tools/ircservices-chk.in
SUBST_SED.install= -e "s|/bin/cp|${CP}|g"
SUBST_SED.install+= -e "s|/bin/chown|${CHOWN}|g"
SUBST_SED.install+= -e "s|/bin/chgrp|${CHGRP}|g"
-SUBST_SED.install+= -e "s|/bin/chmod|${CHMOD}|g"
-SUBST_SED.install+= -e "s|@DATDEST@|${VARBASE}/run|g"
+SUBST_SED.install+= -e "s|/bin/chmod|${CHMOD}|g"
+SUBST_SED.install+= -e "s|@DATDEST@|${VARBASE}/run|g"
SUBST_MESSAGE.install= Fixing scripts.
SUBST_CLASSES+= utils
SUBST_STAGE.utils= post-patch
SUBST_FILES.utils= data/Makefile tools/Makefile
-SUBST_SED.utils= -e "s|chgrp|${CHGRP}|g"
+SUBST_SED.utils= -e "s|chgrp|${CHGRP}|g"
SUBST_SED.utils+= -e "s|chmod|${CHMOD}|g"
SUBST_SED.utils+= -e "s|find|${FIND}|g"
SUBST_MESSAGE.utils= Fixing paths of hard-coded utilities.
diff --git a/chat/iroffer/Makefile b/chat/iroffer/Makefile
index 89fde59035d..78cbbc2d680 100644
--- a/chat/iroffer/Makefile
+++ b/chat/iroffer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/10/05 12:25:33 obache Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:11 wiz Exp $
#
-DISTNAME= iroffer1.3.b11
+DISTNAME= iroffer1.3.b11
PKGNAME= iroffer-1.3.11
CATEGORIES= chat net
MASTER_SITES= http://iroffer.org/archive/v1.3/
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index dde051ee567..3ac2f56c986 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/11/03 07:12:24 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2007/02/22 19:26:12 wiz Exp $
DISTNAME= ${IRSSI_DISTNAME}
CATEGORIES= chat
@@ -7,7 +7,7 @@ EXTRACT_SUFX= ${IRSSI_EXTRACT_SUFX}
MAINTAINER= mutru@iki.fi
HOMEPAGE= http://www.irssi.org/
-COMMENT= Secure and modular IRC client with text mode user interface
+COMMENT= Secure and modular IRC client with text mode user interface
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 1136e98b506..107226e8d63 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/01/17 03:11:18 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:12 wiz Exp $
#
DISTNAME= jabberd-2.0s11
@@ -45,8 +45,8 @@ FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q}
FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q}
FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
FILES_SUBST+= JABBERD_LOGDIR=${JABBERD_LOGDIR:Q}
-PKG_GROUPS= ${JABBERD_GROUP}
-PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}
+PKG_GROUPS= ${JABBERD_GROUP}
+PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}
BINDIR= ${PREFIX}/bin
EGDIR= ${PREFIX}/share/examples/jabberd
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 7166c08d987..c98cd451908 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2006/05/31 18:22:23 ghen Exp $
+# $NetBSD: options.mk,v 1.12 2007/02/22 19:26:12 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2
@@ -11,28 +11,28 @@ PKG_SUGGESTED_OPTIONS= mysql
.if !empty(PKG_OPTIONS:Mdb)
BUILD_DEFS+= JABBERD_DBDIR
-JABBERD_DBDIR?= ${VARBASE}/db/jabberd
-CONFIGURE_ARGS+= --enable-db
+JABBERD_DBDIR?= ${VARBASE}/db/jabberd
+CONFIGURE_ARGS+= --enable-db
. include "../../databases/db4/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mmysql)
-CONFIGURE_ARGS+= --enable-mysql
-CPPFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
+CONFIGURE_ARGS+= --enable-mysql
+CPPFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
. include "../../mk/mysql.buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
-CONFIGURE_ARGS+= --enable-pgsql
+CONFIGURE_ARGS+= --enable-pgsql
. include "../../mk/pgsql.buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --enable-ldap
+CONFIGURE_ARGS+= --enable-ldap
. include "../../databases/openldap-client/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mpam)
-CONFIGURE_ARGS+= --enable-pam
+CONFIGURE_ARGS+= --enable-pam
. include "../../mk/pam.buildlink3.mk"
.endif
diff --git a/chat/ninja/options.mk b/chat/ninja/options.mk
index 612d5285e0f..15093b8217c 100644
--- a/chat/ninja/options.mk
+++ b/chat/ninja/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/05/31 22:00:37 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:12 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ninja
PKG_SUPPORTED_OPTIONS= inet6
@@ -6,5 +6,5 @@ PKG_SUPPORTED_OPTIONS= inet6
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+= --enable-ipv6
.endif
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index b9e14fe07eb..470735fe5d9 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2007/02/22 19:26:12 wiz Exp $
#
DISTNAME= ${SILC_CLIENT_DISTNAME}
@@ -13,7 +13,7 @@ EXTRACT_SUFX= ${SILC_CLIENT_EXTRACT_SUFX}
MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://www.silcnet.org/
-COMMENT= Client for the Secure Internet Live Conferencing (SILC) protocol
+COMMENT= Client for the Secure Internet Live Conferencing (SILC) protocol
.include "../../chat/silc-client/Makefile.common"
@@ -45,10 +45,10 @@ CONFIGURE_ARGS+= --without-libtoolfix
.if (${OPSYS} == "NetBSD") || (${OPSYS} == "SunOS")
CONFIGURE_ARGS+= --with-vcurses
.elif (${OPSYS} == "Linux") || (${OPSYS} == "Darwin")
-CONFIGURE_ARGS+= --with-ncurses
+CONFIGURE_ARGS+= --with-ncurses
.else
# XXX: Need testing on other operating systems, use safe defaults for now.
-CONFIGURE_ARGS+= --with-ncurses
+CONFIGURE_ARGS+= --with-ncurses
.endif
# Assembler optimizations.
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index a4135b1e480..c6f5c1e2c57 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2007/02/22 19:26:12 wiz Exp $
#
DISTNAME= silc-server-1.0.2
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://www.silcnet.org/
-COMMENT= Server for the Secure Internet Live Conferencing (SILC) protocol
+COMMENT= Server for the Secure Internet Live Conferencing (SILC) protocol
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/chat/tzc/Makefile b/chat/tzc/Makefile
index dbb591a0542..e1c1229b736 100644
--- a/chat/tzc/Makefile
+++ b/chat/tzc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 20:50:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:12 wiz Exp $
#
DISTNAME= tzc-2.6.15
@@ -10,8 +10,8 @@ MAINTAINER= sommerfeld@NetBSD.org
HOMEPAGE= http://www.cs.cmu.edu/People/dkindred/zephyr/zephyr.html
COMMENT= Back-end program for zephyr-mode
-CPPFLAGS+= -I/usr/include/kerberosIV -I/usr/include/krb5
-LDFLAGS+= -lroken -lcrypto -lcom_err
+CPPFLAGS+= -I/usr/include/kerberosIV -I/usr/include/krb5
+LDFLAGS+= -lroken -lcrypto -lcom_err
.include "../../chat/zephyr/buildlink3.mk"
.include "../../security/kth-krb4/buildlink3.mk"
diff --git a/comms/birda/Makefile b/comms/birda/Makefile
index 7c7ec770d6c..52ec380a2fc 100644
--- a/comms/birda/Makefile
+++ b/comms/birda/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2006/06/06 00:08:59 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:12 wiz Exp $
#
-DISTNAME= birda-1.3
+DISTNAME= birda-1.3
CATEGORIES= comms
-MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/
+MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/
MAINTAINER= lennart@augustsson.net
COMMENT= Bohlin's IrDA utilities
diff --git a/comms/dl-ezkit/Makefile b/comms/dl-ezkit/Makefile
index 9d029035c77..6fbe89e4323 100644
--- a/comms/dl-ezkit/Makefile
+++ b/comms/dl-ezkit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:13 wiz Exp $
DISTNAME= dl-ezkit-0.8.1-bsd
-PKGNAME= dl-ezkit-0.8.1
+PKGNAME= dl-ezkit-0.8.1
CATEGORIES= comms
MASTER_SITES= http://www.ww.tu-freiberg.de/~pberg/download/Unix-sources/
diff --git a/comms/jpilot/DESCR b/comms/jpilot/DESCR
index 98f4f90b7c5..f4c53dd6be7 100644
--- a/comms/jpilot/DESCR
+++ b/comms/jpilot/DESCR
@@ -37,4 +37,4 @@ system. Features include:
* Datebook support for "By Day" reoccurring eventseven when its on the last
day of the month, and not the 4th. i.e. Try adding a monthly repeating
appointment "By Day" on the 4th week ofa month when there is no 5th
- occurrence of that day in the month
+ occurrence of that day in the month
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index f6aa9f03568..ff8f32df6f6 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.51 2006/10/04 20:51:40 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2007/02/22 19:26:14 wiz Exp $
DISTNAME= minicom-2.1
PKGREVISION= 2
CATEGORIES= comms
MASTER_SITES= http://alioth.debian.org/download.php/123/
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://alioth.debian.org/projects/minicom/
COMMENT= MS-DOS Telix serial communication program "workalike"
diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index 2db0970f595..fc801531832 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2007/01/30 22:13:25 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2007/02/22 19:26:14 wiz Exp $
#
.include "../../comms/pilot-link/Makefile.common"
-PKGNAME= p5-${DISTNAME}
+PKGNAME= p5-${DISTNAME}
COMMENT= Perl bindings for pilot-link
@@ -14,7 +14,7 @@ USE_TOOLS+= gmake
CONFIGURE_ARGS+= --enable-conduits
CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
PERL5_CONFIGURE= NO
-PERL5_PACKLIST= auto/PDA/Pilot/.packlist
+PERL5_PACKLIST= auto/PDA/Pilot/.packlist
PERL5_LDFLAGS= -lpisock
REPLACE_PERL+= bindings/Perl/h2xs-pilot-link
diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile
index 9534734ddbe..2725c4f37da 100644
--- a/comms/snooper/Makefile
+++ b/comms/snooper/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2005/12/27 13:51:27 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:14 wiz Exp $
DISTNAME= snooper-19991202
PKGREVISION= 1
CATEGORIES= comms
-MASTER_SITES= ftp://ftp.foretune.co.jp/pub/tools/snooper/ \
+MASTER_SITES= ftp://ftp.foretune.co.jp/pub/tools/snooper/ \
ftp://lkbreth.foretune.co.jp/pub/tools/snooper/
MAINTAINER= itojun@itojun.org
diff --git a/converters/bbcim/Makefile b/converters/bbcim/Makefile
index 196036d4617..7e441f41d97 100644
--- a/converters/bbcim/Makefile
+++ b/converters/bbcim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:14 wiz Exp $
#
-DISTNAME= bbcim095-5
-PKGNAME= bbcim-0.95b5
+DISTNAME= bbcim095-5
+PKGNAME= bbcim-0.95b5
PKGREVISION= 1
CATEGORIES= converters
MASTER_SITES= http://www.nvg.ntnu.no/bbc/util/
diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile
index 46a4002b25e..302427e848e 100644
--- a/converters/fribidi/Makefile
+++ b/converters/fribidi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/11/14 13:55:34 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:15 wiz Exp $
#
DISTNAME= fribidi-0.10.4
@@ -18,7 +18,7 @@ REPLACE.bash.old= /bin/bash
REPLACE.bash.new= ${SH}
REPLACE_FILES.bash= run.tests
-USE_LIBTOOL= yes
+USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index 10af53b2d17..d42ebf84b1f 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:15 wiz Exp $
#
DISTNAME= Unicode-Map8-0.12
@@ -13,7 +13,7 @@ COMMENT= Perl5 module providing mapping tables between charsets
DEPENDS+= p5-Unicode-String-[0-9]*:../../converters/p5-Unicode-String
-PERL5_PACKLIST= auto/Unicode/Map8/.packlist
+PERL5_PACKLIST= auto/Unicode/Map8/.packlist
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/p5-Unicode-String/Makefile b/converters/p5-Unicode-String/Makefile
index 8b79faab56c..68604727757 100644
--- a/converters/p5-Unicode-String/Makefile
+++ b/converters/p5-Unicode-String/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:15 wiz Exp $
#
DISTNAME= Unicode-String-2.07
@@ -13,7 +13,7 @@ COMMENT= Perl5 modules to handle various Unicode issues
DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-PERL5_PACKLIST= auto/Unicode/String/.packlist
+PERL5_PACKLIST= auto/Unicode/String/.packlist
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 1462f977f4d..9304ebd143a 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/07/19 19:14:37 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:15 wiz Exp $
#
DISTNAME= recode-3.6
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
BROKEN_GETTEXT_DETECTION= yes
-INFO_FILES= # PLIST
+INFO_FILES= # PLIST
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index b4bf387995d..89551f0fc61 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/03/04 21:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/22 19:26:15 wiz Exp $
#
-DISTNAME= uudeview-0.5.20
+DISTNAME= uudeview-0.5.20
PKGREVISION= 1
CATEGORIES= converters
MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index e4fd3461aa3..94a5b416fd1 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2007/01/07 09:13:50 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2007/02/22 19:26:15 wiz Exp $
#
-DISTNAME= uudeview-0.5.20
-PKGNAME= uulib-0.5.20
+DISTNAME= uudeview-0.5.20
+PKGNAME= uulib-0.5.20
PKGREVISION= 3
CATEGORIES= converters
MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
diff --git a/cross/atasm/Makefile b/cross/atasm/Makefile
index d067062da4e..148a82d37ac 100644
--- a/cross/atasm/Makefile
+++ b/cross/atasm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:50 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:16 wiz Exp $
#
DISTNAME= atasm104
-PKGNAME= atasm-1.04
+PKGNAME= atasm-1.04
PKGREVISION= 2
CATEGORIES= devel cross emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atasm/}
@@ -14,8 +14,8 @@ COMMENT= Cross-assembler for 6502 optimized to code for Atari 8 bit computers
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
-NO_CONFIGURE= YES
+WRKSRC= ${WRKDIR}/${DISTNAME}/src
+NO_CONFIGURE= YES
DOCDIR= ${PREFIX}/share/doc/atasm
diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile
index 969b4a220e4..e5b2371182d 100644
--- a/cross/h8300-hms-gcc/Makefile
+++ b/cross/h8300-hms-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/09/02 20:33:36 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:16 wiz Exp $
DISTNAME= gcc-core-3.1
PKGNAME= cross-h8300-hms-gcc-3.1
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --with-newlib
CONFIGURE_SCRIPT= ${SRCDIR}/configure
SRCDIR= ${WRKDIR}/gcc-3.1
BUILD_TARGET= CFLAGS="-O2 -fomit-frame-pointer" all
-INFO_FILES= # PLIST
+INFO_FILES= # PLIST
GCC_REQD+= 2.8.0
diff --git a/crosspkgtools/crosspkg-netbsd1-cats/Makefile b/crosspkgtools/crosspkg-netbsd1-cats/Makefile
index a0ee2e7c076..038ab238e60 100644
--- a/crosspkgtools/crosspkg-netbsd1-cats/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-cats/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/08/24 18:28:38 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:16 wiz Exp $
DISTNAME= crosspkg-netbsd1-cats-1.6.2
-CATEGORIES= crosspkgtools
+CATEGORIES= crosspkgtools
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/cats/binary/sets/
EXTRACT_SUFX= .tgz
DISTFILES= base.tgz comp.tgz etc.tgz games.tgz kern-GENERIC.tgz man.tgz \
diff --git a/crosspkgtools/crosspkg-netbsd1-evbarm/Makefile b/crosspkgtools/crosspkg-netbsd1-evbarm/Makefile
index bd5aec72931..0f46774d27f 100644
--- a/crosspkgtools/crosspkg-netbsd1-evbarm/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-evbarm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/08/24 18:28:38 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:16 wiz Exp $
DISTNAME= crosspkg-netbsd1-evbarm-1.6.2
-CATEGORIES= crosspkgtools
+CATEGORIES= crosspkgtools
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/evbarm/binary/sets/
EXTRACT_SUFX= .tgz
DISTFILES= base.tgz comp.tgz etc.tgz games.tgz kern-INTEGRATOR.tgz man.tgz \
diff --git a/crosspkgtools/crosspkg-netbsd1-hpcarm/Makefile b/crosspkgtools/crosspkg-netbsd1-hpcarm/Makefile
index a51a05016e1..e1557fde4a1 100644
--- a/crosspkgtools/crosspkg-netbsd1-hpcarm/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-hpcarm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/08/24 18:28:38 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:16 wiz Exp $
DISTNAME= crosspkg-netbsd1-hpcarm-1.6.2
-CATEGORIES= crosspkgtools
+CATEGORIES= crosspkgtools
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/hpcarm/binary/sets/
EXTRACT_SUFX= .tgz
DISTFILES= base.tgz comp.tgz etc.tgz games.tgz kern-JORNADA720.tgz man.tgz \
diff --git a/crosspkgtools/crosspkg-netbsd1-netwinder/Makefile b/crosspkgtools/crosspkg-netbsd1-netwinder/Makefile
index 0735eb367fa..69a9de94904 100644
--- a/crosspkgtools/crosspkg-netbsd1-netwinder/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-netwinder/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/08/24 18:28:38 kristerw Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:16 wiz Exp $
DISTNAME= crosspkg-netbsd1-netwinder-1.6.2
-CATEGORIES= crosspkgtools
+CATEGORIES= crosspkgtools
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/netwinder/binary/sets/
EXTRACT_SUFX= .tgz
DISTFILES= base.tgz comp.tgz etc.tgz games.tgz kern-GENERIC.tgz man.tgz \
diff --git a/crosspkgtools/crosspkg-netbsd1-shark/Makefile b/crosspkgtools/crosspkg-netbsd1-shark/Makefile
index 8ae1f9c9ea2..7dc97c0b55c 100644
--- a/crosspkgtools/crosspkg-netbsd1-shark/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-shark/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/08/24 18:28:38 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:16 wiz Exp $
DISTNAME= crosspkg-netbsd1-shark-1.6.2
-CATEGORIES= crosspkgtools
+CATEGORIES= crosspkgtools
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/shark/binary/sets/
EXTRACT_SUFX= .tgz
DISTFILES= base.tgz comp.tgz etc.tgz games.tgz kern-GENERIC.tgz man.tgz \
diff --git a/crosspkgtools/kwacross-netbsd1-arm/Makefile b/crosspkgtools/kwacross-netbsd1-arm/Makefile
index 42434a8217d..fcf061368cb 100644
--- a/crosspkgtools/kwacross-netbsd1-arm/Makefile
+++ b/crosspkgtools/kwacross-netbsd1-arm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/11/18 18:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:17 wiz Exp $
DISTNAME= kwacross-netbsd1-arm-20050605
-CATEGORIES= crosspkgtools
+CATEGORIES= crosspkgtools
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/source/sets/
EXTRACT_SUFX= .tgz
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -16,7 +16,7 @@ SITES.kwacross-netbsd1-arm-20050605.tgz=http://www.df.lth.se/~cato/kwacross/dist
ONLY_FOR_PLATFORM= NetBSD-1.6*-* NetBSD-[2-9]*-*
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_BSHELL="/bin/sh"
# Where the target's file system is located.
diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index 74fb09530dc..1ce17f2b3c7 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/11 14:21:31 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:17 wiz Exp $
#
DISTNAME= adodb481
@@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=adodb/}
EXTRACT_SUFX= .tgz
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://adodb.sourceforge.net/
+HOMEPAGE= http://adodb.sourceforge.net/
COMMENT= Active Data Objects Data Base for php4
DEPENDS+= php>=4.1.0:../../www/php4
diff --git a/databases/jdbc-postgresql80/Makefile b/databases/jdbc-postgresql80/Makefile
index d84d69f507a..514d6e921a6 100644
--- a/databases/jdbc-postgresql80/Makefile
+++ b/databases/jdbc-postgresql80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/13 21:31:18 abs Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:17 wiz Exp $
#
DISTNAME= postgresql-jdbc-8.0-${PGBUILD}.src
@@ -14,14 +14,14 @@ COMMENT= PostgreSQL 8.0 JDBC3 driver
PGBUILD= 318
JARDIST= postgresql-8.0-${PGBUILD}.jdbc3.jar
JARFILE= postgresql80.jar
-EXTRACT_ONLY= ${DISTFILES:N*.jar}
+EXTRACT_ONLY= ${DISTFILES:N*.jar}
USE_JAVA= run
USE_JAVA2= 1.4
-NO_BUILD= YES
+NO_BUILD= YES
-EXAMPLEDIR= share/examples/java/${PKGBASE}
-DOCDIR= share/doc/java/${PKGBASE}
+EXAMPLEDIR= share/examples/java/${PKGBASE}
+DOCDIR= share/doc/java/${PKGBASE}
PLIST_SUBST+= JARFILE=${JARFILE:Q}
PLIST_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q}
PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
diff --git a/databases/jdbc-postgresql81/Makefile b/databases/jdbc-postgresql81/Makefile
index 37b2e3e93d7..0dd242d1a76 100644
--- a/databases/jdbc-postgresql81/Makefile
+++ b/databases/jdbc-postgresql81/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/01/13 21:34:40 abs Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:18 wiz Exp $
#
DISTNAME= postgresql-jdbc-8.1-${PGBUILD}.src
@@ -14,14 +14,14 @@ COMMENT= PostgreSQL 8.1 JDBC3 driver
PGBUILD= 408
JARDIST= postgresql-8.1-${PGBUILD}.jdbc3.jar
JARFILE= postgresql81.jar
-EXTRACT_ONLY= ${DISTFILES:N*.jar}
+EXTRACT_ONLY= ${DISTFILES:N*.jar}
USE_JAVA= run
USE_JAVA2= 1.4
-NO_BUILD= YES
+NO_BUILD= YES
-EXAMPLEDIR= share/examples/java/${PKGBASE}
-DOCDIR= share/doc/java/${PKGBASE}
+EXAMPLEDIR= share/examples/java/${PKGBASE}
+DOCDIR= share/doc/java/${PKGBASE}
PLIST_SUBST+= JARFILE=${JARFILE:Q}
PLIST_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q}
PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index affb62f7523..77d7f8a3bca 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/01/26 03:49:32 markd Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:18 wiz Exp $
DISTNAME= kmysqladmin-0.7.0
PKGREVISION= 7
@@ -6,7 +6,7 @@ CATEGORIES= databases kde
MASTER_SITES= http://www.alwins-world.de/programs/download/kmysqladmin/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.alwins-world.de/programs/kmysqladmin/
+HOMEPAGE= http://www.alwins-world.de/programs/kmysqladmin/
COMMENT= MySQL administration GUI
USE_LANGUAGES= c c++
diff --git a/databases/libpqxx/Makefile.common b/databases/libpqxx/Makefile.common
index cbd32f981c4..28eaeed97ae 100644
--- a/databases/libpqxx/Makefile.common
+++ b/databases/libpqxx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2006/10/04 20:53:45 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/02/22 19:26:18 wiz Exp $
#
LIBPQXX_VERSION= 2.5.5
@@ -9,5 +9,5 @@ MASTER_SITES= ftp://gborg.postgresql.org/pub/libpqxx/stable/
MAINTAINER= is@NetBSD.org
HOMEPAGE= http://thaiopensource.org/development/
-DISTINFO_FILE= ${.CURDIR}/../../databases/libpqxx/distinfo
-PATCHDIR= ${.CURDIR}/../../databases/libpqxx/patches
+DISTINFO_FILE= ${.CURDIR}/../../databases/libpqxx/distinfo
+PATCHDIR= ${.CURDIR}/../../databases/libpqxx/patches
diff --git a/databases/p5-MLDBM-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile
index 2258ef2257c..b85e300abcd 100644
--- a/databases/p5-MLDBM-Sync/Makefile
+++ b/databases/p5-MLDBM-Sync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:10 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:18 wiz Exp $
DISTNAME= MLDBM-Sync-0.15
PKGNAME= p5-${DISTNAME}
@@ -10,8 +10,8 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MLDBM/}
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Perl5 module for safe concurrent access to MLDBM databases
-DEPENDS+= p5-MLDBM-[0-9]*:../../databases/p5-MLDBM
-DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
+DEPENDS+= p5-MLDBM-[0-9]*:../../databases/p5-MLDBM
+DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
PERL5_PACKLIST= auto/MLDBM/Sync/.packlist
diff --git a/databases/p5-perl-ldap/Makefile b/databases/p5-perl-ldap/Makefile
index ea46594ce62..bdb13ddc848 100644
--- a/databases/p5-perl-ldap/Makefile
+++ b/databases/p5-perl-ldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2006/10/04 20:53:45 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:18 wiz Exp $
#
-DISTNAME= perl-ldap-0.33
+DISTNAME= perl-ldap-0.33
PKGNAME= p5-perl-ldap-0.33
SVR4_PKGNAME= pldap
CATEGORIES= databases net devel perl5
diff --git a/databases/p5-qdbm/Makefile b/databases/p5-qdbm/Makefile
index c5f0d3c752a..6670f709844 100644
--- a/databases/p5-qdbm/Makefile
+++ b/databases/p5-qdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/23 06:36:56 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:26:18 wiz Exp $
#
.include "../../databases/qdbm/Makefile.common"
@@ -15,19 +15,19 @@ BUILD_DIRS= ${MY_SUBDIR}
CONFIGURE_DIRS= ${MY_SUBDIR}
GNU_CONFIGURE= yes
-PERL5_CONFIGURE= no
-TEST_TARGET= check
+PERL5_CONFIGURE= no
+TEST_TARGET= check
PERL5_PACKLIST= auto/Curia/.packlist auto/Depot/.packlist auto/Villa/.packlist
-REPLACE_PERL= ${MY_SUBDIR}/curia/plcrtest ${MY_SUBDIR}/depot/pldptest \
+REPLACE_PERL= ${MY_SUBDIR}/curia/plcrtest ${MY_SUBDIR}/depot/pldptest \
${MY_SUBDIR}/villa/plvltest
.include "../../databases/qdbm/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
-SUBST_CLASSES+= pthread
-SUBST_STAGE.pthread= pre-configure
-SUBST_FILES.pthread= ${MY_SUBDIR}/configure
-SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
+SUBST_CLASSES+= pthread
+SUBST_STAGE.pthread= pre-configure
+SUBST_FILES.pthread= ${MY_SUBDIR}/configure
+SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
index e7dd15e7046..588c535c0c2 100644
--- a/databases/pear-DB/Makefile
+++ b/databases/pear-DB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:53 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:18 wiz Exp $
DISTNAME= DB-1.7.6
CATEGORIES= databases
@@ -6,7 +6,7 @@ CATEGORIES= databases
CONFLICTS= php-pear-DB-[0-9]*
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://pear.php.net/package/DB
+HOMEPAGE= http://pear.php.net/package/DB
COMMENT= PHP Database Abstraction Layer
.include "../../lang/php/pear.mk"
diff --git a/databases/php-filepro/Makefile b/databases/php-filepro/Makefile
index 4771f2d88dd..c36b6dac705 100644
--- a/databases/php-filepro/Makefile
+++ b/databases/php-filepro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/11/06 22:06:35 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:19 wiz Exp $
MODNAME= filepro
CATEGORIES+= databases
@@ -7,7 +7,7 @@ COMMENT= PHP extension for read-only filePro database access
CONFLICTS= php-filepro-[0-9]*
# filepro extension removed in PHP 5.2.0, no replacement in PECL yet
-PHP_VERSIONS_ACCEPTED= 4
+PHP_VERSIONS_ACCEPTED= 4
CONFIGURE_ARGS+= --with-${MODNAME}=shared
diff --git a/databases/qdbm-cgi/Makefile b/databases/qdbm-cgi/Makefile
index 8b6cdd4b04f..05a90476f5d 100644
--- a/databases/qdbm-cgi/Makefile
+++ b/databases/qdbm-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/23 06:51:57 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:26:19 wiz Exp $
#
.include "../../databases/qdbm/Makefile.common"
@@ -18,9 +18,9 @@ GNU_CONFIGURE= yes
.include "../../databases/qdbm/buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
-SUBST_CLASSES+= pthread
-SUBST_STAGE.pthread= pre-configure
-SUBST_FILES.pthread= ${MY_SUBDIR}/configure
-SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
+SUBST_CLASSES+= pthread
+SUBST_STAGE.pthread= pre-configure
+SUBST_FILES.pthread= ${MY_SUBDIR}/configure
+SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/qdbm-plus/Makefile b/databases/qdbm-plus/Makefile
index 1582634a102..1b21a0fcb19 100644
--- a/databases/qdbm-plus/Makefile
+++ b/databases/qdbm-plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/07/22 04:46:15 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:19 wiz Exp $
#
.include "../../databases/qdbm/Makefile.common"
@@ -16,13 +16,13 @@ CONFIGURE_DIRS= ${MY_SUBDIR}
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-TEST_TARGET= check
+TEST_TARGET= check
.include "../../databases/qdbm/buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
-SUBST_CLASSES+= pthread
-SUBST_STAGE.pthread= pre-configure
-SUBST_FILES.pthread= ${MY_SUBDIR}/configure
-SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
+SUBST_CLASSES+= pthread
+SUBST_STAGE.pthread= pre-configure
+SUBST_FILES.pthread= ${MY_SUBDIR}/configure
+SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index 3be8ae1debe..92dde90fc10 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/01/28 15:21:06 taca Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:19 wiz Exp $
#
DISTNAME= mysql-ruby-2.7.3
@@ -7,7 +7,7 @@ CATEGORIES= databases ruby
MASTER_SITES= http://tmtm.org/downloads/mysql/ruby/
MAINTAINER= neumann@s-direktnet.de
-HOMEPAGE= http://www.tmtm.org/en/mysql/ruby/
+HOMEPAGE= http://www.tmtm.org/en/mysql/ruby/
COMMENT= Ruby extension for MySQL
RUBY_HAS_ARCHLIB= yes
diff --git a/databases/ruby-postgresql/Makefile b/databases/ruby-postgresql/Makefile
index 6004d2b7425..a9b965fbea1 100644
--- a/databases/ruby-postgresql/Makefile
+++ b/databases/ruby-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/12/28 12:12:58 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:19 wiz Exp $
DISTNAME= ruby-postgres-${VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-postgresql-${VERSION}
@@ -13,7 +13,7 @@ HOMEPAGE= http://ruby.scripting.ca/postgres/
COMMENT= Ruby extension for postgresql
RUBY_HAS_ARCHLIB= yes
-USE_RUBY_EXTCONF= yes
+USE_RUBY_EXTCONF= yes
VERSION= 0.7.1
INSTALL_TARGET= site-install
CONFIGURE_ARGS+= --with-pgsql-include-dir=${PGSQL_PREFIX}/include/postgresql \
diff --git a/databases/ruby-qdbm/Makefile b/databases/ruby-qdbm/Makefile
index 6c57fdc6ba2..61eb47af57e 100644
--- a/databases/ruby-qdbm/Makefile
+++ b/databases/ruby-qdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/11 14:07:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:19 wiz Exp $
#
.include "../../databases/qdbm/Makefile.common"
@@ -15,20 +15,20 @@ BUILD_DIRS= ${MY_SUBDIR}
CONFIGURE_DIRS= ${MY_SUBDIR}
GNU_CONFIGURE= yes
-TEST_TARGET= check
+TEST_TARGET= check
#USE_RUBY_EXTCONF= yes
#RUBY_EXTCONF_SUBDIRS= ${MY_SUBDIR}/curia ${MY_SUBDIR}/depot ${MY_SUBDIR}/villa
RUBY_HAS_ARCHLIB= yes
-REPLACE_RUBY= ${MY_SUBDIR}/curia/rbcrtest ${MY_SUBDIR}/depot/rbdptest \
+REPLACE_RUBY= ${MY_SUBDIR}/curia/rbcrtest ${MY_SUBDIR}/depot/rbdptest \
${MY_SUBDIR}/villa/rbvltest
.include "../../databases/qdbm/buildlink3.mk"
.include "../../lang/ruby/modules.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
-SUBST_CLASSES+= pthread
-SUBST_STAGE.pthread= pre-configure
-SUBST_FILES.pthread= ${MY_SUBDIR}/configure
-SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
+SUBST_CLASSES+= pthread
+SUBST_STAGE.pthread= pre-configure
+SUBST_FILES.pthread= ${MY_SUBDIR}/configure
+SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-vapor/Makefile b/databases/ruby-vapor/Makefile
index e3ec7f6689f..c05e4644279 100644
--- a/databases/ruby-vapor/Makefile
+++ b/databases/ruby-vapor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/28 12:12:58 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:19 wiz Exp $
DISTNAME= vapor-0.81
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT= Ruby transparent persistence to postgresql
DEPENDS+= ${RUBY_PKGPREFIX}-DBD-postgresql>=0.0.20:../../databases/ruby-DBD-postgresql
USE_RUBY_SETUP= yes
-RUBY_SETUP= install.rb
+RUBY_SETUP= install.rb
REPLACE_RUBY= doc/examples/university/createperson \
doc/examples/university/createuni \
doc/examples/university/employment \
diff --git a/databases/tcl-fbsql/Makefile b/databases/tcl-fbsql/Makefile
index baedc0fa642..ff6781f6132 100644
--- a/databases/tcl-fbsql/Makefile
+++ b/databases/tcl-fbsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:19 wiz Exp $
DISTNAME= fbsql.c
PKGNAME= tcl-fbsql-1.06
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.fastbase.co.nz/fbsql/
EXTRACT_SUFX=
MAINTAINER= bouyer@NetBSD.org
-HOMEPAGE= http://www.fastbase.co.nz/fbsql/index.html
+HOMEPAGE= http://www.fastbase.co.nz/fbsql/index.html
COMMENT= Tcl interface to MySQL
WRKSRC= ${WRKDIR}/src
diff --git a/databases/zope-mysql/Makefile b/databases/zope-mysql/Makefile
index 5de6f2ef6e9..c6a0df9176a 100644
--- a/databases/zope-mysql/Makefile
+++ b/databases/zope-mysql/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:20 wiz Exp $
#
DISTNAME= ZMySQLDA-1.1.3-nonbin
PKGNAME= zope-mysql-1.1.3
PKGREVISION= 4
CATEGORIES= databases www
-MASTER_SITES= http://www.zope.org/Members/MikeP/ZMySQLDA/
+MASTER_SITES= http://www.zope.org/Members/MikeP/ZMySQLDA/
MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://www.zope.org/Members/MikeP/ZMySQLDA
diff --git a/devel/GConf2/schemas.mk b/devel/GConf2/schemas.mk
index 64c3e47e1c5..5820f5c5b39 100644
--- a/devel/GConf2/schemas.mk
+++ b/devel/GConf2/schemas.mk
@@ -1,4 +1,4 @@
-# $NetBSD: schemas.mk,v 1.15 2006/06/15 22:13:58 jlam Exp $
+# $NetBSD: schemas.mk,v 1.16 2007/02/22 19:26:20 wiz Exp $
#
# This Makefile fragment is intended to be included by packages that install
# GConf2 schema files. It takes care of registering them in the GConf2
@@ -36,7 +36,7 @@ GCONF2_CONFIG_SOURCE= xml::${PKG_SYSCONFBASE}/gconf/gconf.xml.defaults
GCONF2_SCHEMAS_DIR= ${BUILDLINK_PREFIX.GConf2}/share/gconf/schemas
.if defined(GNU_CONFIGURE) && !empty(GNU_CONFIGURE:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --disable-schemas-install
+CONFIGURE_ARGS+= --disable-schemas-install
CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${GCONF2_SCHEMAS_DIR:Q}
.endif
diff --git a/devel/aap/Makefile b/devel/aap/Makefile
index 6b2f1a6ba63..df92be763eb 100644
--- a/devel/aap/Makefile
+++ b/devel/aap/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:12 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:20 wiz Exp $
DISTNAME= exec-0.107
PKGNAME= aap-0.107
PKGREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=a-a-p/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=a-a-p/}
EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index adaf47274a5..e3ba6044c29 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/12/27 13:37:36 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:20 wiz Exp $
#
DISTNAME= at-spi-1.7.12
@@ -15,8 +15,8 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= cspi-1.0.pc.in
-PKGCONFIG_OVERRIDE+= libspi-1.0.pc.in
+PKGCONFIG_OVERRIDE+= cspi-1.0.pc.in
+PKGCONFIG_OVERRIDE+= libspi-1.0.pc.in
BUILDLINK_API_DEPENDS.atk+= atk>=1.12.0
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 85e0f6c4e2f..240dcfaf8c3 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2006/11/02 18:17:22 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:26:20 wiz Exp $
-DISTNAME= autoconf-2.13
+DISTNAME= autoconf-2.13
PKGNAME= autoconf213-2.13
PKGREVISION= 1
CATEGORIES= devel
diff --git a/devel/bison/hacks.mk b/devel/bison/hacks.mk
index 9c33ab36c5f..53ebcc33cdd 100644
--- a/devel/bison/hacks.mk
+++ b/devel/bison/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2004/11/14 07:24:37 jlam Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/02/22 19:26:20 wiz Exp $
.if !defined(BISON_HACKS_MK)
BISON_HACKS_MK= defined
@@ -12,7 +12,7 @@ BISON_HACKS_MK= defined
###
.if !empty(PKGSRC_COMPILER:Msunpro)
PKG_HACKS+= optimisation
-BUILDLINK_TRANSFORM+= rm:-O[0-9]*
+BUILDLINK_TRANSFORM+= rm:-O[0-9]*
.endif
.endif # BISON_HACKS_MK
diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index f317eaad7ce..149112001fa 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2007/01/31 00:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:20 wiz Exp $
#
-DISTNAME= bmake-20051105
+DISTNAME= bmake-20051105
PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= # empty
@@ -39,7 +39,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKDIR}/${OPSYS}/bmake ${PREFIX}/bin
${INSTALL_MAN} ${WRKDIR}/${OPSYS}/bmake.1 ${PREFIX}/${PKGMANDIR}/man1
-.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
+.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
. include "../../pkgtools/libnbcompat/inplace.mk"
.else
. include "../../pkgtools/libnbcompat/buildlink3.mk"
diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 2f972d217ce..f08b9c9e9a2 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2006/10/05 09:32:02 obache Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:21 wiz Exp $
#
-DISTNAME= cbrowser-0.8
-CATEGORIES= devel tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cbrowser/}
+DISTNAME= cbrowser-0.8
+CATEGORIES= devel tk
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cbrowser/}
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cbrowser.sourceforge.net/
-COMMENT= Graphical C/C++ source code browsing tool, and call graph viewer
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://cbrowser.sourceforge.net/
+COMMENT= Graphical C/C++ source code browsing tool, and call graph viewer
DEPENDS+= cscope-[0-9]*:../../devel/cscope
DEPENDS+= tk-[0-9]*:../../x11/tk
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 3a2adf64e6a..be254862617 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/06/09 15:50:35 minskim Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:26:21 wiz Exp $
#
DISTNAME= cdecl-2.5
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/ \
ftp://ftp.deva.net/pub/sources/programming/declaration/ \
ftp://ftp.bitcon.no//pub/linux/linuxberg/files/console/dev/
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Utility to explain and compose C and C++ declarations
BUILD_TARGET= cdecl
diff --git a/devel/cvsup-gui-bin/Makefile b/devel/cvsup-gui-bin/Makefile
index 82a7cd76d91..78c7db1dbb1 100644
--- a/devel/cvsup-gui-bin/Makefile
+++ b/devel/cvsup-gui-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/17 20:59:48 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:21 wiz Exp $
DISTNAME= cvsup-gui-static-16.1.h
PKGNAME= ${DISTNAME:C/static/bin/}
@@ -18,7 +18,7 @@ NO_BUILD= yes
# remove on next update -- see PR 25255 for details
DIST_SUBDIR= cvsup-i386-1.6
-ONLY_FOR_PLATFORM= NetBSD-1.[5-9]*-i386 NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM= NetBSD-1.[5-9]*-i386 NetBSD-[2-9]*-i386
INSTALLATION_DIRS= bin
diff --git a/devel/devhelp/options.mk b/devel/devhelp/options.mk
index dff542bdfc6..e019b16984f 100644
--- a/devel/devhelp/options.mk
+++ b/devel/devhelp/options.mk
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2006/09/24 16:24:34 salo Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:21 wiz Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.devhelp
+PKG_OPTIONS_VAR= PKG_OPTIONS.devhelp
.include "../../www/seamonkey/gecko-options.mk"
.include "../../mk/bsd.options.mk"
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 938aca99707..20894c9ae67 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2007/01/31 00:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:21 wiz Exp $
#
-DISTNAME= gdb-5.3
+DISTNAME= gdb-5.3
PKGREVISION= 4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=gdb/}
@@ -23,7 +23,7 @@ REPLACE_LOCALEDIR_PATTERNS+= Make-in
INSTALL_TARGET= install install-info
TEST_TARGET= check
INFO_FILES= # PLIST.common
-CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
+CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 70edcb0a3e6..e4f4a9e68b1 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:21 wiz Exp $
DISTNAME= gputils-0.13.3
PKGREVISION= 1
@@ -6,12 +6,12 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gputils/}
MAINTAINER= dogcow@NetBSD.org
-HOMEPAGE= http://gputils.sourceforge.net/
+HOMEPAGE= http://gputils.sourceforge.net/
COMMENT= collection of tools for Microchip's PIC micro-processors
CONFLICTS= gpasm-*
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
USE_TOOLS+= gmake
post-install:
diff --git a/devel/its4/Makefile b/devel/its4/Makefile
index e6a15357659..5b209ed56f0 100644
--- a/devel/its4/Makefile
+++ b/devel/its4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:50 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:21 wiz Exp $
#
DISTNAME= its4-1.1.1
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cigital.com/its4/
COMMENT= Static C/C++ code scanner for potential security problems
-LICENSE= no-commercial-use
+LICENSE= no-commercial-use
WRKSRC= ${WRKDIR}/its4
HAS_CONFIGURE= YES
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index bdff31d3ffd..bdf93ec5a8b 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.60 2007/01/26 03:30:26 markd Exp $
+# $NetBSD: Makefile,v 1.61 2007/02/22 19:26:21 wiz Exp $
DISTNAME= kdevelop-3.3.6
PKGNAME= kdevelop-base-3.3.6
CATEGORIES= devel kde
-HOMEPAGE= http://www.kdevelop.org/
+HOMEPAGE= http://www.kdevelop.org/
COMMENT= Base modules for IDE for Unix/X11/KDE
.include "../../meta-pkgs/kde3/Makefile.kde3"
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index b9f72f57b15..c2f41aee6ee 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2007/01/26 03:31:32 markd Exp $
+# $NetBSD: Makefile,v 1.65 2007/02/22 19:26:21 wiz Exp $
DISTNAME= kdevelop-3.3.6
CATEGORIES= devel kde meta-pkgs
@@ -6,7 +6,7 @@ MASTER_SITES= # empty
DISTFILES= # empty
MAINTAINER= markd@NetBSD.org
-HOMEPAGE= http://www.kdevelop.org/
+HOMEPAGE= http://www.kdevelop.org/
COMMENT= Integrated Development Environment for Unix/X11/KDE
DEPENDS+= c-cpp-reference>=2.0.2nb4:../../devel/c-cpp-reference
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index e87e4c79dbb..5f0ddb46fe0 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2007/01/14 10:52:29 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:26:22 wiz Exp $
DISTNAME= libast-0.6.1
PKGREVISION= 3
CATEGORIES= devel
-MASTER_SITES= http://www.eterm.org/download/
+MASTER_SITES= http://www.eterm.org/download/
MAINTAINER= gendalia@NetBSD.org
HOMEPAGE= http://freshmeat.net/projects/libast/?topic_id=809%2C861
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 9e71fc33a3c..1d076b5b739 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/11/05 17:49:33 joerg Exp $
+# $NetBSD: Makefile,v 1.63 2007/02/22 19:26:22 wiz Exp $
#
DISTNAME= libgnome-2.16.0
@@ -22,7 +22,7 @@ USE_PKGLOCALEDIR= YES
PKGCONFIG_OVERRIDE= libgnome/libgnome-2.0.pc.in
-CONFIGURE_ARGS= --enable-gtk-doc=no
+CONFIGURE_ARGS= --enable-gtk-doc=no
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
@@ -36,7 +36,7 @@ CONF_FILES= ${EGDIR}/sound/events/gnome-2.soundlist \
CONF_FILES+= ${EGDIR}/sound/events/gtk-events-2.soundlist \
${PKG_SYSCONFDIR}/sound/events/gtk-events-2.soundlist
-GCONF2_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas
+GCONF2_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas
GCONF2_SCHEMAS+= desktop_gnome_accessibility_startup.schemas
GCONF2_SCHEMAS+= desktop_gnome_applications_browser.schemas
GCONF2_SCHEMAS+= desktop_gnome_applications_help_viewer.schemas
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 57d17556c54..894d03923fa 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2006/11/01 08:58:27 joerg Exp $
+# $NetBSD: Makefile,v 1.60 2007/02/22 19:26:22 wiz Exp $
#
DISTNAME= slang-1.4.9
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
ftp://ftp.plig.org/pub/slang/v1.4/
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.s-lang.org/
COMMENT= Routines for rapid alpha-numeric terminal applications development
diff --git a/devel/libwhisker2/Makefile b/devel/libwhisker2/Makefile
index 8cbe9c62326..dea0296435f 100644
--- a/devel/libwhisker2/Makefile
+++ b/devel/libwhisker2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/07/07 22:10:07 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:22 wiz Exp $
DISTNAME= libwhisker2-2.3
PKGREVISION= 1
@@ -6,7 +6,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.wiretrip.net/rfp/libwhisker/
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.wiretrip.net/rfp/lw.asp
+HOMEPAGE= http://www.wiretrip.net/rfp/lw.asp
COMMENT= Perl module geared specifically for HTTP testing
DEPENDS+= p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
diff --git a/devel/mk-files/Makefile b/devel/mk-files/Makefile
index ac03bab20ff..ae575435310 100644
--- a/devel/mk-files/Makefile
+++ b/devel/mk-files/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2006/07/14 23:06:27 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:22 wiz Exp $
#
DISTNAME= mk-20050405
PKGNAME= mk-files-20050405
PKGREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
+MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
CONFLICTS+= bootstrap-mk-files-[0-9]*
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 3e322bcdf15..925049606c4 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/01/06 15:11:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:22 wiz Exp $
DISTNAME= nasm-0.98.39
PKGREVISION= 3
@@ -31,7 +31,7 @@ INSTALLATION_DIRS= bin ${PKGINFODIR} ${PKGMANDIR}/man1 share/doc/html
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-2*)
-BUILDLINK_TRANSFORM+= rm:-std=c99
+BUILDLINK_TRANSFORM+= rm:-std=c99
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index 3a3913e2f12..8a68b1514c4 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/06/12 16:28:05 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:26:22 wiz Exp $
#
DISTNAME= ogre-v0-12-1
@@ -20,7 +20,7 @@ USE_LIBTOOL= yes
CONFIGURE_ARGS+= --with-platform=SDL
-PKGCONFIG_OVERRIDE+= OGRE.pc.in
+PKGCONFIG_OVERRIDE+= OGRE.pc.in
.include "../../devel/devIL/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/devel/p5-Date-Business/Makefile b/devel/p5-Date-Business/Makefile
index a1cec9ecbaa..f1ddd73de5d 100644
--- a/devel/p5-Date-Business/Makefile
+++ b/devel/p5-Date-Business/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/08/15 01:51:14 erh Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:22 wiz Exp $
#
-DISTNAME= Date-Business-1.2
-PKGNAME= ${DISTNAME:S/Date-Business/p5-Date-Business/}
+DISTNAME= Date-Business-1.2
+PKGNAME= ${DISTNAME:S/Date-Business/p5-Date-Business/}
SVR4_PKGNAME= p5dbu
PKGREVISION= 2
CATEGORIES= textproc perl5
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index acae000e18c..e683c69649e 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/10/04 21:35:59 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:22 wiz Exp $
#
-DISTNAME= Date-Calc-5.4
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Date-Calc-5.4
+PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5dca
PKGREVISION= 2
CATEGORIES= devel perl5
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 2b83efbb086..2341030e6dd 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2006/07/12 16:46:44 heinz Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:22 wiz Exp $
#
-DISTNAME= DateManip-5.44
-PKGNAME= ${DISTNAME:S/DateManip/p5-Date-Manip/}
+DISTNAME= DateManip-5.44
+PKGNAME= ${DISTNAME:S/DateManip/p5-Date-Manip/}
SVR4_PKGNAME= p5dma
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Date/}
diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index c04e5ade629..34e98ee6a8e 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2006/04/10 18:24:34 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:23 wiz Exp $
#
DISTNAME= ExtUtils-MakeMaker-6.30
PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/M/MS/MSCHWERN/}
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/M/MS/MSCHWERN/}
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Write a Makefile for an extension module from a Makefile.PL
diff --git a/devel/p5-Hash-Case/Makefile b/devel/p5-Hash-Case/Makefile
index d13cb6b7714..95c2db70aee 100644
--- a/devel/p5-Hash-Case/Makefile
+++ b/devel/p5-Hash-Case/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/12/15 14:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:23 wiz Exp $
#
-DISTNAME= Hash-Case-1.003
+DISTNAME= Hash-Case-1.003
PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5hac
CATEGORIES= perl5
diff --git a/devel/p5-Parse-Yapp/Makefile b/devel/p5-Parse-Yapp/Makefile
index de84a0f51d5..d2e135b88d6 100644
--- a/devel/p5-Parse-Yapp/Makefile
+++ b/devel/p5-Parse-Yapp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:23 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:23 wiz Exp $
#
-DISTNAME= Parse-Yapp-1.05
+DISTNAME= Parse-Yapp-1.05
PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5pya
PKGREVISION= 2
diff --git a/devel/p5-Perl6-Slurp/Makefile b/devel/p5-Perl6-Slurp/Makefile
index c787b776111..76b55bd7ef6 100644
--- a/devel/p5-Perl6-Slurp/Makefile
+++ b/devel/p5-Perl6-Slurp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/06/07 11:57:54 abs Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:26:23 wiz Exp $
#
DISTNAME= Perl6-Slurp-0.03
@@ -12,7 +12,7 @@ COMMENT= Implements the Perl 6 'slurp' built-in
PKG_INSTALLATION_TYPES= overwrite pkgviews
-DEPENDS+= p5-Perl6-Export-[0-9]*:../../devel/p5-Perl6-Export
+DEPENDS+= p5-Perl6-Export-[0-9]*:../../devel/p5-Perl6-Export
USE_LANGUAGES= # empty
PERL5_PACKLIST= auto/Perl6/Slurp/.packlist
diff --git a/devel/p5-Spiffy/Makefile b/devel/p5-Spiffy/Makefile
index 57017aa2e48..ca1069ad4c7 100644
--- a/devel/p5-Spiffy/Makefile
+++ b/devel/p5-Spiffy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/05/02 03:30:21 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:23 wiz Exp $
-DISTNAME= Spiffy-0.30
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Spiffy-0.30
+PKGNAME= p5-${DISTNAME}
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
MODULE_DIR= modules/by-module
diff --git a/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile
index e43613bcc1d..a23dc24c307 100644
--- a/devel/p5-Spoon/Makefile
+++ b/devel/p5-Spoon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/03/14 16:00:41 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:23 wiz Exp $
-DISTNAME= Spoon-0.23
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Spoon-0.23
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
diff --git a/devel/p5-Test-Cmd/Makefile b/devel/p5-Test-Cmd/Makefile
index a157741203a..99a2e67ba8c 100644
--- a/devel/p5-Test-Cmd/Makefile
+++ b/devel/p5-Test-Cmd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2006/01/23 12:03:20 wulf Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:23 wiz Exp $
DISTNAME= Test-Cmd-1.05
-PKGNAME= p5-${DISTNAME}
+PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5tcm
PKGREVISION= 2
CATEGORIES= devel perl5
diff --git a/devel/p5-Tie-IxHash/Makefile b/devel/p5-Tie-IxHash/Makefile
index 73d2a4ea20b..45df47fbc4c 100644
--- a/devel/p5-Tie-IxHash/Makefile
+++ b/devel/p5-Tie-IxHash/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:25 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:23 wiz Exp $
#
-DISTNAME= Tie-IxHash-1.21
+DISTNAME= Tie-IxHash-1.21
PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5tix
PKGREVISION= 2
diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile
index 2efddfd8dfa..0b9bf905bc0 100644
--- a/devel/pcl-cvs/Makefile
+++ b/devel/pcl-cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/02/17 20:59:49 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:26:23 wiz Exp $
#
DISTNAME= pcl-cvs-2.9.9
@@ -27,7 +27,7 @@ PKG_SKIP_REASON+= "${PKGNAME} is only for emacs20"
.endif
MAKE_ENV+= PREFIX=${PREFIX:Q}
-BUILD_TARGET= default
+BUILD_TARGET= default
INFO_FILES= # PLIST
MESSAGE_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index 9e011833d0d..0a2bfa1ed84 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2007/02/17 20:59:50 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2007/02/22 19:26:23 wiz Exp $
-DISTNAME= prcs-1.3.3
+DISTNAME= prcs-1.3.3
PKGREVISION= 4
CATEGORIES= devel scm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prcs/}
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index 675a04038fe..ec08ab5808d 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/08/10 03:21:39 minskim Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:24 wiz Exp $
#
DISTNAME= pvs-${VERSION}
@@ -26,13 +26,13 @@ CHECK_SHLIBS_SUPPORTED= no
INFO_FILES= # PLIST
TEX_ACCEPTED= teTeX3
-LICENSE= pvs-license
+LICENSE= pvs-license
# not quite sure about this, but to be on the safe side:
-RESTRICTED= Redistribution not permitted - see ${HOMEPAGE}license.html
+RESTRICTED= Redistribution not permitted - see ${HOMEPAGE}license.html
NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
ONLY_FOR_PLATFORM= NetBSD-1.6*-* NetBSD-[2-9]*-* Linux-*-* SunOS-*-*
ONLY_FOR_PLATFORM+= DragonFly-*-*
diff --git a/devel/py-generate/Makefile b/devel/py-generate/Makefile
index 19ddc39d94a..7274d542a09 100644
--- a/devel/py-generate/Makefile
+++ b/devel/py-generate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/30 13:04:52 darcy Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:24 wiz Exp $
#
DISTNAME= generate-2.4
@@ -15,7 +15,7 @@ MAKE_ENV+= MANDIR=${LOCALBASE}/man
MAKE_ENV+= BINDIR=${LOCALBASE}/bin
USE_TOOLS+= gmake
-LIBS.SunOS+= -lnsl -lsocket
+LIBS.SunOS+= -lnsl -lsocket
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/devel/py-pexpect/Makefile b/devel/py-pexpect/Makefile
index 65a3a025cdb..720ba39dbb6 100644
--- a/devel/py-pexpect/Makefile
+++ b/devel/py-pexpect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/04 20:06:37 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:24 wiz Exp $
DISTNAME= pexpect-0.999
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT= Pure Python Expect-like module
PYDISTUTILSPKG= yes
PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
-NO_CONFIGURE= yes
+NO_CONFIGURE= yes
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/rt-mysql/Makefile.common b/devel/rt-mysql/Makefile.common
index 0a5864fa327..6b76659b678 100644
--- a/devel/rt-mysql/Makefile.common
+++ b/devel/rt-mysql/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.13 2006/10/04 21:36:00 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2007/02/22 19:26:25 wiz Exp $
-DISTNAME= rt-2-0-15
+DISTNAME= rt-2-0-15
CATEGORIES= devel
MASTER_SITES= http://www.bestpractical.com/rt/release/
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index a4fbb47ac4b..964b502e216 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:51 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:25 wiz Exp $
#
# pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000.
@@ -8,10 +8,10 @@
# the license term permits redistribution. a copy of the distribution kit
# is put into ${MASTER_SITE_LOCAL}.
#
-DISTNAME= sfio_1999.src.unix
-PKGNAME= sfio-1999
+DISTNAME= sfio_1999.src.unix
+PKGNAME= sfio-1999
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .cpio
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index eab58941240..a322dde7687 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/25 01:40:36 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:25 wiz Exp $
#
DISTNAME= silc-toolkit-0.9.13
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://www.silcnet.org/
-COMMENT= Secure Internet Live Conferencing (SILC) protocol Toolkit
+COMMENT= Secure Internet Live Conferencing (SILC) protocol Toolkit
CONFLICTS+= silc-client<1.0.1nb1
diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index fa53ce68184..9d472336cb1 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/12/02 19:15:13 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:25 wiz Exp $
#
VERSION= 3.1.1
@@ -15,7 +15,7 @@ COMMENT= Statically check C programs
WRKSRC= ${WRKDIR}/splint-${VERSION}
USE_TOOLS+= gmake lex
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/splint.1 ${PREFIX}/${PKGMANDIR}/man1
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 496634ace07..93b010510d1 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/01/25 18:15:49 epg Exp $
+# $NetBSD: Makefile,v 1.43 2007/02/22 19:26:25 wiz Exp $
PKGNAME= subversion-base-${SVNVER}
COMMENT= Version control system, base programs and libraries
@@ -54,9 +54,9 @@ PLIST_SUBST+= DAV_RA=${DAV_RA:Q}
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= contrib/cgi/tweak-log.cgi
-SUBST_SED.paths= -e "s|/usr/local/bin/|${PREFIX}/bin|g"
-SUBST_MESSAGE.paths= Fixing hardcoded /usr/local/bin paths.
+SUBST_FILES.paths= contrib/cgi/tweak-log.cgi
+SUBST_SED.paths= -e "s|/usr/local/bin/|${PREFIX}/bin|g"
+SUBST_MESSAGE.paths= Fixing hardcoded /usr/local/bin paths.
post-install:
${INSTALL_DATA_DIR} ${DESTDIR}${SVNDOC}
diff --git a/editors/ed/Makefile b/editors/ed/Makefile
index 25643a2997a..c1c8fea3dd2 100644
--- a/editors/ed/Makefile
+++ b/editors/ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/20 18:15:38 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:25 wiz Exp $
DISTNAME= ed-0.2
PKGREVISION= 1
@@ -22,7 +22,7 @@ INFO_FILES= # PLIST
# the ./configure accepts --program-prefix, but doesn't use
MAKE_ENV+= binprefix=${GNU_PROGRAM_PREFIX:Q}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
-BUILD_DEFS+= GNU_PROGRAM_PREFIX
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
+BUILD_DEFS+= GNU_PROGRAM_PREFIX
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile
index 811303e4d02..3ead24730b1 100644
--- a/editors/elvis-x11/Makefile
+++ b/editors/elvis-x11/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:25 wiz Exp $
#
.include "../../editors/elvis/Makefile.common"
-PKGNAME= elvis-x11-2.2.0
+PKGNAME= elvis-x11-2.2.0
PKGREVISION= 5
COMMENT= GUI for elvis, includes console elvis
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 62007a1ca9c..29bb750d265 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/05/15 16:29:19 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:25 wiz Exp $
#
.include "./Makefile.common"
-PKGNAME= elvis-2.2.0
+PKGNAME= elvis-2.2.0
PKGREVISION= 2
COMMENT= Vi clone with regex search, hex editing, HTML and TeX previewing
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 76cffa887c5..11b45aa86cb 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2007/02/20 19:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2007/02/22 19:26:25 wiz Exp $
DISTNAME= emacs-${EMACSVERSION}a
PKGREVISION= 10
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-gif
.include "../../graphics/png/buildlink3.mk"
CONFIGURE_ARGS+= --with-png
-PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
+PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
PKG_OPTIONS_OPTIONAL_GROUPS= toolkit
PKG_OPTIONS_GROUP.toolkit= emacs-xaw3d motif
.include "../../mk/bsd.options.mk"
diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index dff63444668..c098c787db3 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/07/23 00:28:12 reed Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/22 19:26:25 wiz Exp $
#
.include "./Makefile.common"
@@ -9,7 +9,7 @@ COMMENT+= (QT version)
CONFLICTS+= lyx-xforms-[0-9]*
-CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.qt3-libs} \
+CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.qt3-libs} \
--with-qt-dir=${QTDIR:Q} \
--with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include \
--with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib \
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index daa404481e5..1ab2f4ea163 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2007/02/01 22:28:48 joerg Exp $
+# $NetBSD: Makefile.common,v 1.45 2007/02/22 19:26:25 wiz Exp $
#
DISTNAME= lyx-1.4.3
@@ -67,8 +67,8 @@ CXXFLAGS+= -fno-exceptions
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc" \
|| ${MACHINE_ARCH} == "m68k")
-CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g}
-CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
+CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g}
+CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
. endif
diff --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile
index f4bc9e16a75..d30625c5edb 100644
--- a/editors/lyx-xforms/Makefile
+++ b/editors/lyx-xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/07/23 00:28:13 reed Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:26:25 wiz Exp $
#
.include "../../editors/lyx-qt/Makefile.common"
@@ -9,7 +9,7 @@ COMMENT+= (xforms version)
CONFLICTS+= lyx-qt-[0-9]*
-CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.xforms} \
+CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.xforms} \
--with-frontend=xforms
.include "../../x11/xforms/buildlink3.mk"
diff --git a/editors/ng/Makefile b/editors/ng/Makefile
index 0c577793b63..5052a18240d 100644
--- a/editors/ng/Makefile
+++ b/editors/ng/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.20 2005/12/01 18:14:40 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:26 wiz Exp $
DISTNAME= ng-1.4.3
PKGREVISION= 1
-CATEGORIES= editors japanese
-MASTER_SITES= http://tt.sakura.ne.jp/~amura/archives/ng/
+CATEGORIES= editors japanese
+MASTER_SITES= http://tt.sakura.ne.jp/~amura/archives/ng/
-MAINTAINER= fk200329@fsinet.or.jp
+MAINTAINER= fk200329@fsinet.or.jp
HOMEPAGE= http://tt.sakura.ne.jp/~amura/ng/
COMMENT= Very light Emacs-clone with japanese support
-WRKSRC= ${WRKDIR}/ng
+WRKSRC= ${WRKDIR}/ng
PKG_SUPPORTED_OPTIONS= canna
PKG_SUGGESTED_OPTIONS= canna
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index f09839eeaa0..7d73f8edd6c 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/12/06 17:08:07 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:26:26 wiz Exp $
DISTNAME= nvi-1.79
PKGNAME= nvi-m17n-1.79.20040401
@@ -50,7 +50,7 @@ ENCODINGS+= euc-jp euc-cn euc-kr sjis big5 euc-tw hz
.if ${OPSYS} == "NetBSD"
# XXX ignore NetBSD 2.0F and later's grantpt(3) and SysV pty for just now
-CONFIGURE_ENV+= vi_cv_sys5_pty=no
+CONFIGURE_ENV+= vi_cv_sys5_pty=no
.endif
post-patch:
diff --git a/editors/ted-cs/Makefile b/editors/ted-cs/Makefile
index 9c5bbe95af5..0b02990b46b 100644
--- a/editors/ted-cs/Makefile
+++ b/editors/ted-cs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:26 wiz Exp $
DISTNAME= Ted_cs_CZ
PKGNAME= ted-cs-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= Czech spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-da/Makefile b/editors/ted-da/Makefile
index 4b3b65c9842..59131248387 100644
--- a/editors/ted-da/Makefile
+++ b/editors/ted-da/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:26 wiz Exp $
DISTNAME= Ted_da_DK
PKGNAME= ted-da-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= Danish spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-de/Makefile b/editors/ted-de/Makefile
index 0f54cfafacc..16db1ab9d0b 100644
--- a/editors/ted-de/Makefile
+++ b/editors/ted-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:26 wiz Exp $
DISTNAME= Ted_de_DE
PKGNAME= ted-de-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= German spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-en-gb/Makefile b/editors/ted-en-gb/Makefile
index 9b4e617a86b..8e92453557c 100644
--- a/editors/ted-en-gb/Makefile
+++ b/editors/ted-en-gb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:26 wiz Exp $
DISTNAME= Ted_en_GB
PKGNAME= ted-en-gb-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= UK English spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile
index 67928c78f46..b082de3a24e 100644
--- a/editors/ted-en-us/Makefile
+++ b/editors/ted-en-us/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:26 wiz Exp $
DISTNAME= ted-2.16.src
PKGNAME= ted-en-us-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= US English spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}/Ted-2.16
USE_X11BASE= YES
diff --git a/editors/ted-es/Makefile b/editors/ted-es/Makefile
index cc5c82d7002..ad037c4dc00 100644
--- a/editors/ted-es/Makefile
+++ b/editors/ted-es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:26 wiz Exp $
DISTNAME= Ted_es_ES
PKGNAME= ted-es-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= Spanish spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-fr/Makefile b/editors/ted-fr/Makefile
index 2b80627a604..2a5ed8dec27 100644
--- a/editors/ted-fr/Makefile
+++ b/editors/ted-fr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:26 wiz Exp $
DISTNAME= Ted_fr_FR
PKGNAME= ted-fr-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= French spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-it/Makefile b/editors/ted-it/Makefile
index 5e818723153..b855b1d9631 100644
--- a/editors/ted-it/Makefile
+++ b/editors/ted-it/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:26 wiz Exp $
DISTNAME= Ted_it_IT
PKGNAME= ted-it-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= Italian spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-nl/Makefile b/editors/ted-nl/Makefile
index 16c8e6bdb34..3b7a33b38c8 100644
--- a/editors/ted-nl/Makefile
+++ b/editors/ted-nl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:26 wiz Exp $
DISTNAME= Ted_nl_NL
PKGNAME= ted-nl-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= Dutch spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-no/Makefile b/editors/ted-no/Makefile
index 2193be6353a..4bbc94dad99 100644
--- a/editors/ted-no/Makefile
+++ b/editors/ted-no/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:26 wiz Exp $
DISTNAME= Ted_no_NO
PKGNAME= ted-no-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= Norwegian spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-pl/Makefile b/editors/ted-pl/Makefile
index 00ecb83dcf6..f767105a16d 100644
--- a/editors/ted-pl/Makefile
+++ b/editors/ted-pl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:33 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:27 wiz Exp $
DISTNAME= Ted_pl_PL
PKGNAME= ted-pl-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= Polish spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-pt/Makefile b/editors/ted-pt/Makefile
index b2bda99170d..2c203e7f046 100644
--- a/editors/ted-pt/Makefile
+++ b/editors/ted-pt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:33 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:27 wiz Exp $
DISTNAME= Ted_pt_PT
PKGNAME= ted-pt-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= Portuguese spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/editors/ted-sv/Makefile b/editors/ted-sv/Makefile
index 46100a4efa9..408dd219a34 100644
--- a/editors/ted-sv/Makefile
+++ b/editors/ted-sv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:33 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:27 wiz Exp $
DISTNAME= Ted_sv_SE
PKGNAME= ted-sv-2.16
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nllgg.nl/Ted/
COMMENT= Swedish spelling dictionary for the Ted word processor
-DEPENDS+= ted>=2.6:../../editors/ted
+DEPENDS+= ted>=2.6:../../editors/ted
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 03582276317..275cf1e2231 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/02/19 11:55:43 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:26:27 wiz Exp $
DISTNAME= fMSX24.tar
PKGNAME= fmsx-2.4
@@ -17,7 +17,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
-WRKSRC= ${WRKDIR}/MSX
+WRKSRC= ${WRKDIR}/MSX
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
diff --git a/emulators/gpsim-ptyusart/Makefile b/emulators/gpsim-ptyusart/Makefile
index 86581a8a5e9..c6cce5eb745 100644
--- a/emulators/gpsim-ptyusart/Makefile
+++ b/emulators/gpsim-ptyusart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:23 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:27 wiz Exp $
#
DISTNAME= ptyusart-0.3.2
@@ -10,7 +10,7 @@ MASTER_SITES= http://www-asim.lip6.fr/~bouyer/pic/
MAINTAINER= bouyer@NetBSD.org
COMMENT= Pseudo-tty module for gpsim
-ONLY_FOR_PLATFORM= NetBSD-*-*
+ONLY_FOR_PLATFORM= NetBSD-*-*
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile
index 776503d9e97..89eaf1489e7 100644
--- a/emulators/netbsd32_compat15/Makefile
+++ b/emulators/netbsd32_compat15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/10/19 19:39:04 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:27 wiz Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
@@ -16,7 +16,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.5/index.html
COMMENT= 32-bit shared libraries for NetBSD 1.5 (and earlier) compatibility
-CONFLICTS= netbsd32_compat16-[0-9]*
+CONFLICTS= netbsd32_compat16-[0-9]*
ONLY_FOR_PLATFORM= NetBSD-*-sparc64
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 5ba213714a2..98bfad36c0c 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/07/27 18:48:02 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:27 wiz Exp $
#
DISTNAME= emulator_src_${POSE_VERSION}
@@ -22,7 +22,7 @@ SITES.emulator-skins-19.tar.gz= http://www.palmos.com/dev/tools/emulator/
#LICENSE= GPL
-WRKSRC= ${WRKDIR}/Emulator_Src_${POSE_VERSION}
+WRKSRC= ${WRKDIR}/Emulator_Src_${POSE_VERSION}
POSE_BUILD_DIR= ${WRKSRC}/BuildUnix
POSE_SHARE_DIR= ${PREFIX}/share/palmosemulator
POSE_SKINS_DIR= ${POSE_SHARE_DIR}/skins
diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
index 3620eb109c4..404a8688607 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/07/27 18:48:02 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:27 wiz Exp $
#
PEACE_VERSION= 0.0.20060701
DISTNAME= peace-${PEACE_VERSION}
@@ -11,7 +11,7 @@ COMMENT= Support running Win32 executables
DISTFILES+= peace-${PEACE_VERSION}.tar.gz
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=peace/}
-ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386
DEPENDS+= icu>=2.4nb1:../../textproc/icu
DEPENDS+= freetype2>=2.2.1:../../graphics/freetype2
# bin/showstack requires perl5 and cross-i386-netbsdpe
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index a6809bac720..c364b13fa3b 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/12/06 22:31:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.44 2007/02/22 19:26:27 wiz Exp $
#
DISTNAME= qemu-0.8.2
@@ -23,7 +23,7 @@ BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html
GCC_REQD+= 3.0
.if !empty(MACHINE_PLATFORM:MNetBSD-4*)
-USE_PKGSRC_GCC= yes
+USE_PKGSRC_GCC= yes
.endif
CONFIGURE_ENV+= PKGMANDIR=${PKGMANDIR}
diff --git a/emulators/suse100_base/Makefile b/emulators/suse100_base/Makefile
index 795f07fbd55..1553487d9c7 100644
--- a/emulators/suse100_base/Makefile
+++ b/emulators/suse100_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/09/19 19:58:46 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:27 wiz Exp $
DISTNAME= suse_base-${SUSE_VERSION}
PKGREVISION= 3
@@ -13,8 +13,8 @@ COMMENT= Linux compatibility package
CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
# these files are handled by manually during de-/installation/pkg_add
-CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/dev/.*
-CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/dev/.*
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
EXTRACT_ONLY= # empty
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse91_base/Makefile b/emulators/suse91_base/Makefile
index 96aaad98d18..7efa78acf65 100644
--- a/emulators/suse91_base/Makefile
+++ b/emulators/suse91_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/10/11 19:12:52 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:28 wiz Exp $
DISTNAME= suse_base-${SUSE_VERSION}
PKGREVISION= 12
@@ -13,8 +13,8 @@ COMMENT= Linux compatibility package
CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
# these files are handled by manually during de-/installation/pkg_add
-CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/dev/.*
-CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/dev/.*
+CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache
CHECK_INTERPRETER_SKIP+= ${PREFIX}/${EMULSUBDIR}/*
EXTRACT_ONLY= # empty
diff --git a/emulators/suse91_base/Makefile.x86_64 b/emulators/suse91_base/Makefile.x86_64
index d4b8a5ecbf6..ae359fb2ce8 100644
--- a/emulators/suse91_base/Makefile.x86_64
+++ b/emulators/suse91_base/Makefile.x86_64
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.x86_64,v 1.3 2005/11/06 14:52:43 salo Exp $
+# $NetBSD: Makefile.x86_64,v 1.4 2007/02/22 19:26:28 wiz Exp $
-RPMFILES= aaa_base-9.1-0.29.${SUSE_ARCH}.rpm \
+RPMFILES= aaa_base-9.1-0.29.${SUSE_ARCH}.rpm \
bash-2.05b-305.1.${SUSE_ARCH}.rpm \
coreutils-5.2.1-23.8.${SUSE_ARCH}.rpm \
glibc-2.3.3-63.${SUSE_ARCH}.rpm \
diff --git a/emulators/suse91_vmware/Makefile b/emulators/suse91_vmware/Makefile
index 6f8e01655c2..3eec3dcfcf9 100644
--- a/emulators/suse91_vmware/Makefile
+++ b/emulators/suse91_vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:28 wiz Exp $
DISTNAME= suse_vmware-${SUSE_VERSION}
PKGREVISION= 2
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package to support running VMware
DEPENDS+= suse_base-${SUSE_VERSION}{,nb*}:../../emulators/suse91_base
-DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
+DEPENDS+= suse_x11-${SUSE_VERSION}{,nb*}:../../emulators/suse91_x11
EXTRACT_ONLY= # empty
NO_BUILD= YES
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile
index 9eef374d6e8..4c0b7650453 100644
--- a/emulators/vmware-module/Makefile
+++ b/emulators/vmware-module/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2007/01/31 00:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:26:29 wiz Exp $
DISTNAME= vmware-netbsd-1.2
PKGNAME= vmware-module-1.2
CATEGORIES= emulators
-MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/vmware/
+MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/vmware/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/emulators/vmware-module3/Makefile b/emulators/vmware-module3/Makefile
index 0bf97f16bed..f9c2e61ff6e 100644
--- a/emulators/vmware-module3/Makefile
+++ b/emulators/vmware-module3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2006/07/05 06:53:12 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:29 wiz Exp $
DISTNAME= vmware-netbsd-3.2.1.8
PKGNAME= vmware-module-3.2.1.8
CATEGORIES= emulators
-MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/vmware/
+MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/vmware/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jdolecek@NetBSD.org
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index cdca5b5de31..d13bf11069b 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:53 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:29 wiz Exp $
DISTNAME= VMware-2.0.4-1142
PKGNAME= vmware-2.0.4
PKGREVISION= 1
CATEGORIES= emulators
-MASTER_SITES= http://www4.vmware.com/software/ \
+MASTER_SITES= http://www4.vmware.com/software/ \
http://www.vmware.com/download1/software/ \
ftp://download1.vmware.com/pub/software/ \
http://vmware-svca.www.conxion.com/software/ \
diff --git a/finance/gkrellm1-stock/Makefile b/finance/gkrellm1-stock/Makefile
index 2ecbb3e649f..a59f23c711a 100644
--- a/finance/gkrellm1-stock/Makefile
+++ b/finance/gkrellm1-stock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:24 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:29 wiz Exp $
DISTNAME= gkrellstock-0.2
PKGNAME= gkrellm-stock-0.2
@@ -10,7 +10,7 @@ MAINTAINER= damon@NetBSD.org
HOMEPAGE= http://www.geocities.com/m_muthukumar/gkrellstock.html
COMMENT= gkrellm stock ticker plugin
-DEPENDS+= p5-Finance-Quote-1.*:../../finance/p5-Finance-Quote
+DEPENDS+= p5-Finance-Quote-1.*:../../finance/p5-Finance-Quote
WRKSRC= ${WRKDIR}/gkrellStock-0.2
USE_TOOLS+= perl:run
diff --git a/finance/gnucash-gtk1/Makefile b/finance/gnucash-gtk1/Makefile
index b658baf9bf8..bf37ae773c9 100644
--- a/finance/gnucash-gtk1/Makefile
+++ b/finance/gnucash-gtk1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/07/13 10:10:37 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:29 wiz Exp $
DISTNAME= gnucash-1.8.12
PKGREVISION= 5
@@ -12,7 +12,7 @@ COMMENT= Personal double-entry accounting program (GTK1 version)
DEPENDS+= guile-slib-[0-9]*:../../devel/guile-slib
DEPENDS+= p5-Date-Manip>=5.42a:../../devel/p5-Date-Manip
-DEPENDS+= p5-Finance-Quote>=1.06:../../finance/p5-Finance-Quote
+DEPENDS+= p5-Finance-Quote>=1.06:../../finance/p5-Finance-Quote
USE_DIRS+= gnome1-1.5
USE_TOOLS+= bison gmake intltool perl:run pkg-config
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 93574675224..b57b9702e2c 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/01/26 04:03:20 markd Exp $
+# $NetBSD: Makefile,v 1.35 2007/02/22 19:26:29 wiz Exp $
DISTNAME= kmymoney2-0.8.5
PKGREVISION= 2
@@ -20,7 +20,7 @@ SHLIBTOOL_OVERRIDE= # empty
CONFIGURE_ARGS+= --enable-mt
-REPLACE_PERL+= admin/fixuifiles
+REPLACE_PERL+= admin/fixuifiles
# a fix for qt-3.3.5, please remove if qt-3.3.6 (or newer) solves the problem
SUBST_CLASSES+= hints
diff --git a/fonts/artwiz-fonts/Makefile b/fonts/artwiz-fonts/Makefile
index b612adb3b57..51bc2782696 100644
--- a/fonts/artwiz-fonts/Makefile
+++ b/fonts/artwiz-fonts/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:29 wiz Exp $
#
DISTNAME= artwiz-aleczapka-1.3
-PKGNAME= ${DISTNAME:S/aleczapka/fonts/}
+PKGNAME= ${DISTNAME:S/aleczapka/fonts/}
PKGREVISION= 3
CATEGORIES= fonts
MASTER_SITES= http://fluxbox.org/artwiz-aleczapka/
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index c7e4a14cf89..987c121de6e 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2006/04/22 09:22:08 rillig Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/02/22 19:26:29 wiz Exp $
#
DISTNAME= # empty
@@ -17,9 +17,9 @@ BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
LICENSE= cyberbit-ttf-license
RESTRICTED= Redistribution not permitted; single user license only.
NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
DIST_SUBDIR= cyberbit-ttf
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index fed7953603a..34f949e07e0 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/09/16 12:20:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2007/02/22 19:26:29 wiz Exp $
#
DISTNAME= gucharmap-1.8.0
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= gucharmap.pc.in
+PKGCONFIG_OVERRIDE+= gucharmap.pc.in
GTK2_IMMODULES= yes
diff --git a/fonts/jisx0208fonts/Makefile b/fonts/jisx0208fonts/Makefile
index 4ff10f3bed0..fafe17119cb 100644
--- a/fonts/jisx0208fonts/Makefile
+++ b/fonts/jisx0208fonts/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:09:10 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:29 wiz Exp $
#
DISTNAME= jisx0208fonts-200301316
PKGREVISION= 1
CATEGORIES= fonts x11 japanese
-MASTER_SITES= # empty
+MASTER_SITES= # empty
DISTFILES= # empty
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
diff --git a/fonts/mglfonts/Makefile b/fonts/mglfonts/Makefile
index 47ba4913a5c..6d82b1af5f4 100644
--- a/fonts/mglfonts/Makefile
+++ b/fonts/mglfonts/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:37:26 grant Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:29 wiz Exp $
-DISTNAME= fontkit-nobdf
-PKGNAME= mglfonts-0.1
-CATEGORIES= fonts
-MASTER_SITES= http://www.at.sakura.ne.jp/~suz/arc/
+DISTNAME= fontkit-nobdf
+PKGNAME= mglfonts-0.1
+CATEGORIES= fonts
+MASTER_SITES= http://www.at.sakura.ne.jp/~suz/arc/
-MAINTAINER= fk200329@fsinet.or.jp
+MAINTAINER= fk200329@fsinet.or.jp
HOMEPAGE= http://www.NetBSD.org/Ports/hpcmips/mgl2.html
COMMENT= MGL2 fonts and font tools
diff --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile
index dba3c4bcfff..9abadd95906 100644
--- a/fonts/ms-ttf/Makefile
+++ b/fonts/ms-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/11/05 17:17:04 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:29 wiz Exp $
DISTNAME= # empty
PKGNAME= ms-ttf-20020306
@@ -17,17 +17,17 @@ PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DEPENDS+= cabextract-[0-9]*:../../archivers/cabextract
-LICENSE= ms-ttf-license
+LICENSE= ms-ttf-license
RESTRICTED= No redistribution in altered form
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_CONFIGURE= yes
-NO_BUILD= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
-USE_X11BASE= yes
+USE_X11BASE= yes
DIST_SUBDIR= ms-ttf
EVAL_PREFIX+= CABEXTRACT_PREFIX=cabextract
CABEXTRACT_PREFIX_DEFAULT=${LOCALBASE}
diff --git a/fonts/profont/Makefile b/fonts/profont/Makefile
index 389a9728828..bbc755405c7 100644
--- a/fonts/profont/Makefile
+++ b/fonts/profont/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/02/15 22:37:06 perry Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:30 wiz Exp $
#
DISTNAME= profontlinux
-PKGNAME= profont-1.0
+PKGNAME= profont-1.0
PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.tobiasjung.net/dl/
diff --git a/games/battleball/options.mk b/games/battleball/options.mk
index b40d50c5cfa..02966a993a1 100644
--- a/games/battleball/options.mk
+++ b/games/battleball/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:30 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.battleball
PKG_SUPPORTED_OPTIONS= opengl
@@ -8,6 +8,6 @@ PKG_SUPPORTED_OPTIONS= opengl
.if !empty(PKG_OPTIONS:Mopengl)
.include "../../graphics/MesaLib/buildlink3.mk"
.else
-CPPFLAGS+= -DNO_OPENGL
-SED_CMDS+= -e '/^GLINCS/s|^|\#|' -e '/^GLLIBS/s|^|\#|'
+CPPFLAGS+= -DNO_OPENGL
+SED_CMDS+= -e '/^GLINCS/s|^|\#|' -e '/^GLLIBS/s|^|\#|'
.endif
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index c9850b30157..57b177ddb4c 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2007/02/02 17:51:58 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:30 wiz Exp $
DISTNAME= bzflag-2.0.2.20050318
PKGNAME= ${DISTNAME:S/.20050318//}
PKGREVISION= 4
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bzflag/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bzflag/}
MAINTAINER= blymn@NetBSD.org
HOMEPAGE= http://www.bzflag.org/
diff --git a/games/et/Makefile b/games/et/Makefile
index 63833828ce9..2ccc7351db7 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:14 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:30 wiz Exp $
#
-DISTNAME= et-linux-2.56-2.x86
-PKGNAME= et-2.56
+DISTNAME= et-linux-2.56-2.x86
+PKGNAME= et-2.56
PKGREVISION= 1
-CATEGORIES= games
-MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/et/linux/
-EXTRACT_SUFX= .run
+CATEGORIES= games
+MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/et/linux/
+EXTRACT_SUFX= .run
-MAINTAINER= dhowland@users.sourceforge.net
-HOMEPAGE= http://games.activision.com/games/wolfenstein/
-COMMENT= Wolfenstein: Enemy Territory for Linux
+MAINTAINER= dhowland@users.sourceforge.net
+HOMEPAGE= http://games.activision.com/games/wolfenstein/
+COMMENT= Wolfenstein: Enemy Territory for Linux
NO_BUILD= yes
ONLY_FOR_PLATFORM= *-*-i386
@@ -23,7 +23,7 @@ EXTRACT_CMD= ${TAIL} +356 ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \
.include "../../emulators/suse_linux/Makefile.application"
.if !defined(USE_NATIVE_LINUX)
-DEPENDS+= suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
+DEPENDS+= suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
.endif
INSTALLATION_DIRS= bin
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 5abfee1d426..24a7265dd1c 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/02/02 17:24:58 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:30 wiz Exp $
#
DISTNAME= fkiss-0.33
@@ -12,8 +12,8 @@ HOMEPAGE= http://www.oersted.co.jp/~yav/soft/indexe.html#fkiss
COMMENT= Kisekae viewer
PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= fkiss-0.33a.diff
-PATCH_DIST_STRIP= -p1
+PATCHFILES= fkiss-0.33a.diff
+PATCH_DIST_STRIP= -p1
DEPENDS+= lha-[0-9]*:../../archivers/lha
diff --git a/games/freeciv-client/DESCR b/games/freeciv-client/DESCR
index 21dcea76b71..639dc58d17f 100644
--- a/games/freeciv-client/DESCR
+++ b/games/freeciv-client/DESCR
@@ -7,4 +7,4 @@ than this file and the online help. This is also where we'll inform people
about new releases/bugs/fixes/competitions, etc.
This package contains the Freeciv client with an interface built on top of
-either gtk, gtk2, xaw, xaw3d, sdl, or just plain x11.
+either gtk, gtk2, xaw, xaw3d, sdl, or just plain x11.
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index a73c0c652fc..09f528dba24 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/06/08 04:15:59 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/22 19:26:30 wiz Exp $
DISTNAME= gnuchess-5.07
PKGREVISION= 3
@@ -21,7 +21,7 @@ DOCDIR= ${PREFIX}/share/doc/gnuchess
.if (${MACHINE_ARCH} == "powerpc")
CONFIGURE_ENV+= CFLAGS="-O -Winline -Wmissing-prototypes -funroll-loops"
.else
-CONFIGURE_ENV+= CFLAGS="-O3 -Winline -Wmissing-prototypes -funroll-loops -fomit-frame-pointer"
+CONFIGURE_ENV+= CFLAGS="-O3 -Winline -Wmissing-prototypes -funroll-loops -fomit-frame-pointer"
.endif
SUBST_CLASSES+= paths
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 523ebbcf359..48b1862bdb8 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 04:03:20 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:30 wiz Exp $
DISTNAME= knights-0.6
PKGREVISION= 6
@@ -11,8 +11,8 @@ COMMENT= Chess interface for KDE
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+GNU_CONFIGURE= YES
+USE_LIBTOOL= YES
BUILDLINK_DEPMETHOD.libXt?= build
diff --git a/games/majesty-demo/Makefile b/games/majesty-demo/Makefile
index 0325b68133f..db300aa7580 100644
--- a/games/majesty-demo/Makefile
+++ b/games/majesty-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/12/18 01:36:09 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:30 wiz Exp $
#
DISTNAME= majesty_demo
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}
.if !defined(USE_NATIVE_LINUX)
.if (${MACHINE_ARCH} == "i386")
-DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
.endif
.endif
diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common
index a6b3d54200f..b6cb3b787e7 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2006/10/29 21:12:46 pooka Exp $
+# $NetBSD: Makefile.common,v 1.23 2007/02/22 19:26:30 wiz Exp $
#
NETHACK_BASEVER= 3.4.3
@@ -44,7 +44,7 @@ SUBST_FILES.os= include/unixconf.h
SUBST_SED.os= -e 's,__NETHACK_OS__,${NETHACK_OS},'
NETHACK_GROUP= games
-PKG_GROUPS= ${NETHACK_GROUP}
+PKG_GROUPS= ${NETHACK_GROUP}
pre-configure:
@${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
diff --git a/games/netmaze/Makefile b/games/netmaze/Makefile
index 1d261f97f55..64e9be65dd2 100644
--- a/games/netmaze/Makefile
+++ b/games/netmaze/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2007/02/15 14:53:14 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:30 wiz Exp $
DISTNAME= netmaze0.81
PKGNAME= netmaze-0.81
PKGREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/multiplayer/}
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/multiplayer/}
MAINTAINER= jdc@NetBSD.org
COMMENT= X windows-based multiplayer combat game (like Midi Maze)
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 5de5552094c..36888b90274 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2006/10/06 15:41:59 ghen Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:31 wiz Exp $
DISTNAME= openttd-0.4.8-source
PKGNAME= openttd-0.4.8
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openttd/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openttd/}
MAINTAINER= froz@icix.org
HOMEPAGE= http://www.openttd.com/
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tar.bz2
USE_TOOLS+= gmake pkg-config
-DATA_DIR= ${PREFIX}/share/games/openttd
+DATA_DIR= ${PREFIX}/share/games/openttd
MAKE_ENV+= PREFIX=${PREFIX:Q}
MAKE_ENV+= INSTALL=1
diff --git a/games/quake3server/Makefile b/games/quake3server/Makefile
index 1e2f9ead469..e9efc2053e9 100644
--- a/games/quake3server/Makefile
+++ b/games/quake3server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:31 wiz Exp $
DISTNAME= linuxq3apoint-1.32b.x86
PKGNAME= quake3server-1.32b
@@ -16,7 +16,7 @@ COMMENT= Quake III Arena Dedicated Server for Linux
ONLY_FOR_PLATFORM= NetBSD-*-i386
USE_TOOLS+= gtar
-EXTRACT_CMD= ${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf -
+EXTRACT_CMD= ${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf -
WRKSRC= ${WRKDIR}
BASEDOCDIR= ${PREFIX}/share/doc/lokigames/quake3server
RCD_SCRIPTS= quake3server
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index e494486d024..6505ceb7520 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/05/22 22:22:03 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:31 wiz Exp $
DISTNAME= wolf-linux-1.33.x86
PKGNAME= rtcw-1.33
@@ -28,7 +28,7 @@ USE_TOOLS+= gtar
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "Linux"
-DEPENDS+= suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
+DEPENDS+= suse_base>=6.3:../../emulators/${SUSE_DIR_PREFIX}_base
.include "../../emulators/suse_linux/Makefile.application"
.else
.include "../../mk/x11.buildlink3.mk"
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index ec25b065da2..4111cfc57c8 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2007/01/08 17:59:17 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/22 19:26:31 wiz Exp $
DISTNAME= xconq-7.4.1
PKGREVISION= 5
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_PREFIX.tk}/lib"
MAKE_ENV+= LOCALBASE=${LOCALBASE:Q}
MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q} \
infodir=${PREFIX:Q}/${PKGINFODIR:Q}
-INFO_FILES= # PLIST
+INFO_FILES= # PLIST
post-build:
cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index 70a22ee455e..4ad2d98b0fb 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:31 wiz Exp $
#
-DISTNAME= xdemineur-2.1.1
+DISTNAME= xdemineur-2.1.1
PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.babafou.eu.org/xdemineur/ \
diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile
index b15aec95df3..70a2db37f49 100644
--- a/games/xfreecell/Makefile
+++ b/games/xfreecell/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2007/02/02 18:22:53 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:31 wiz Exp $
DISTNAME= xfreecell-1.0.5b
PKGREVISION= 1
CATEGORIES= games
-MASTER_SITES= http://www2.giganet.net/~nakayama/
+MASTER_SITES= http://www2.giganet.net/~nakayama/
EXTRACT_SUFX= .tgz
MAINTAINER= chris@infolaunch.com
-HOMEPAGE= http://www2.giganet.net/~nakayama/
+HOMEPAGE= http://www2.giganet.net/~nakayama/
COMMENT= Popular freecell card game for X
USE_X11BASE= yes
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 850b170836f..8be87cf1f2d 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/22 09:22:09 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:31 wiz Exp $
#
DISTNAME= xfrisk-1.2
@@ -20,7 +20,7 @@ NO_BIN_ON_CDROM=${RESTRICTED}
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
-MAKE_ENV+= LIBS="-lsocket -lnsl"
+MAKE_ENV+= LIBS="-lsocket -lnsl"
.endif
# xfrisk doesn't work with standard Xaw.
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index da9ae6668af..f81fe860a84 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:31 wiz Exp $
-DISTNAME= xkobo-1.11
+DISTNAME= xkobo-1.11
PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/} \
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index d6e15d68017..65536bf849c 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/02/02 18:06:05 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:31 wiz Exp $
#
DISTNAME= xmahjongg-3.6.1
@@ -16,7 +16,7 @@ USE_LANGUAGES= c c++
.include "../../mk/bsd.prefs.mk"
# XXX: hack - work round an ICE with GCC 3.3 on sparc
.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
-GCC_REQD+= 3.4
+GCC_REQD+= 3.4
.endif
.include "../../x11/libX11/buildlink3.mk"
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index d9a186ddac1..5ddf89f36dd 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:55 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:31 wiz Exp $
#
DISTNAME= xrick-021212
@@ -11,7 +11,7 @@ MAINTAINER= pino@dohd.org
HOMEPAGE= http://www.bigorno.net/xrick/
COMMENT= Rick Dangerous clone for X
-RESTRICTED= Copyright of graphics, images, maps, and sounds is questionable.
+RESTRICTED= Copyright of graphics, images, maps, and sounds is questionable.
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/geography/proj-swig/Makefile b/geography/proj-swig/Makefile
index f8ff035ca8b..03e10df763b 100644
--- a/geography/proj-swig/Makefile
+++ b/geography/proj-swig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/09/06 10:16:25 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:31 wiz Exp $
#
DISTNAME= proj-swig-0.01
@@ -15,7 +15,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-PY_PATCHPLIST= yes
+PY_PATCHPLIST= yes
SUBST_CLASSES+= pkg
SUBST_STAGE.pkg= pre-configure
diff --git a/graphics/Coin/hacks.mk b/graphics/Coin/hacks.mk
index 50130401714..40aecd32d26 100644
--- a/graphics/Coin/hacks.mk
+++ b/graphics/Coin/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2007/02/19 22:10:43 joerg Exp $
+# $NetBSD: hacks.mk,v 1.4 2007/02/22 19:26:32 wiz Exp $
.if !defined(COIN_HACKS_MK)
COIN_HACKS_MK= defined
@@ -10,7 +10,7 @@ COIN_HACKS_MK= defined
###
.if ${OPSYS} == "NetBSD"
PKG_HACKS+= optimization
-BUILDLINK_TRANSFORM+= rm:-O[0-9]*
+BUILDLINK_TRANSFORM+= rm:-O[0-9]*
.endif
.endif # COIN_HACKS_MK
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index a81b68bbe25..faf15e35e3f 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2007/02/22 19:26:32 wiz Exp $
PKGNAME= Mesa-${MESA_VERSION}
-MASTER_SITES= # empty
+MASTER_SITES= # empty
DISTFILES= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index c9ec61a5c2d..ba74cad4e2e 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2006/11/06 11:25:54 joerg Exp $
+# $NetBSD: Makefile.common,v 1.55 2007/02/22 19:26:32 wiz Exp $
#
# This Makefile fragment is included either directly or indirectly (through
# Makefile.lib) by all packages that are built from the Mesa sources.
@@ -6,7 +6,7 @@
DISTNAME?= MesaLib-${MESA_VERSION}
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
EXTRACT_SUFX= .tar.bz2
# When changing this version, please run "make distinfo" in the following
diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile
index 01059fa8d15..74ef8358c3f 100644
--- a/graphics/cal3d-examples/Makefile
+++ b/graphics/cal3d-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/15 14:58:20 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:33 wiz Exp $
#
PKGNAME= cal3d-examples-${CAL3D_VERSION}
@@ -9,7 +9,7 @@ PKGREVISION= 2
DISTFILES= TheCallyDemo-0.9.1b.zip \
cal3d-${CAL3D_VERSION}${EXTRACT_SUFX}
-COMMENT= Tools and demos for cal3d library
+COMMENT= Tools and demos for cal3d library
USE_TOOLS+= automake
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 976ac083e00..b82f354d35f 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:33 wiz Exp $
#
PKGNAME= cal3d-${CAL3D_VERSION}
@@ -6,7 +6,7 @@ PKGREVISION= 2
.include "../../graphics/cal3d/Makefile.common"
-COMMENT= Skeletal based 3d character animation library in C++
+COMMENT= Skeletal based 3d character animation library in C++
USE_TOOLS+= automake
diff --git a/graphics/cal3d/Makefile.common b/graphics/cal3d/Makefile.common
index 037c9390090..307cf9f6441 100644
--- a/graphics/cal3d/Makefile.common
+++ b/graphics/cal3d/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2006/07/22 04:46:16 rillig Exp $
+# $NetBSD: Makefile.common,v 1.9 2007/02/22 19:26:33 wiz Exp $
#
DISTNAME= cal3d-${CAL3D_VERSION}
@@ -9,7 +9,7 @@ CAL3D_VERSION= 0.9.1
MAINTAINER= root@garbled.net
HOMEPAGE= http://cal3d.sourceforge.net/
-COMMENT= Skeletal based 3d character animation library in C++
+COMMENT= Skeletal based 3d character animation library in C++
EXTRACT_SUFX= .tar.bz2
USE_LANGUAGES= c c++
diff --git a/graphics/camediaplay/Makefile b/graphics/camediaplay/Makefile
index c19185ddcce..06acad37d8f 100644
--- a/graphics/camediaplay/Makefile
+++ b/graphics/camediaplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:46 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:34 wiz Exp $
DISTNAME= camediaplay-20010211
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.itojun.org/pub/digi-cam/C-400L/unix/ \
+MASTER_SITES= ftp://ftp.itojun.org/pub/digi-cam/C-400L/unix/ \
ftp://ftp.digipri.co.jp/pub/free-software/Olympus/C-400L/unix/
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index d1605807701..4bafbd310f4 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:57 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:34 wiz Exp $
DISTNAME= camlimages-2.2.0
PKGREVISION= 4
@@ -12,7 +12,7 @@ COMMENT= Image processing library for Objective Caml
BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.0.6
-WRKSRC= ${WRKDIR}/camlimages-2.2
+WRKSRC= ${WRKDIR}/camlimages-2.2
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 106e64bfee8..ceb84c31100 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2007/02/08 18:21:27 drochner Exp $
+# $NetBSD: Makefile,v 1.69 2007/02/22 19:26:34 wiz Exp $
#
DISTNAME= eog-2.16.3
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-GCONF2_SCHEMAS= eog.schemas
+GCONF2_SCHEMAS= eog.schemas
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0
BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.16
diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile
index e8d5e4eb01d..e4c9f168d19 100644
--- a/graphics/gimp2-wideangle/Makefile
+++ b/graphics/gimp2-wideangle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 21:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:34 wiz Exp $
#
DISTNAME= wideangle
@@ -13,7 +13,7 @@ HOMEPAGE= http://members.ozemail.com.au/~hodsond/wideangle.html
COMMENT= GIMP plugin for wideangle lens distortions
DIST_SUBDIR= ${PKGNAME_NOREV}
-WRKSRC= ${WRKDIR}
+WRKSRC= ${WRKDIR}
do-build:
(cd ${WRKSRC} && gimptool-2.0 --build wideangle.c)
diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile
index 443a7e0e033..a556f97ed38 100644
--- a/graphics/gnuplot-nox11/Makefile
+++ b/graphics/gnuplot-nox11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2007/02/01 12:15:39 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:34 wiz Exp $
#
-PKGNAME= ${DISTNAME:C/-/-nox11-/}
+PKGNAME= ${DISTNAME:C/-/-nox11-/}
PKGREVISION= 6
SVR4_PKGNAME= gplot
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index a5909b9de5d..2dae37f577e 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2007/02/01 12:15:38 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:26:34 wiz Exp $
#
PKGREVISION= 7
SVR4_PKGNAME= gplot
CATEGORIES+= x11
-CONFLICTS+= gnuplot-nox11-[0-9]*
+CONFLICTS+= gnuplot-nox11-[0-9]*
.include "../../graphics/gnuplot/Makefile.common"
diff --git a/graphics/jpegoptim/Makefile b/graphics/jpegoptim/Makefile
index 0ba736ef01c..553bc0947c6 100644
--- a/graphics/jpegoptim/Makefile
+++ b/graphics/jpegoptim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:34 wiz Exp $
-DISTNAME= jpegoptim-1.2.2
+DISTNAME= jpegoptim-1.2.2
PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://people.cc.jyu.fi/~tjko/rpms/jpegoptim/
diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile
index 8e19f4c61b2..2f0dff41e06 100644
--- a/graphics/mng/Makefile
+++ b/graphics/mng/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2006/11/05 17:23:45 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:34 wiz Exp $
DISTNAME= lm1009
PKGNAME= mng-1.0.9
PKGREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libmng/} \
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libmng/} \
http://www.3-t.com/libmng/download/ \
http://www.libmng.com/download/
# this is just a workaround because the 1.0.9 tar.gz is broken
@@ -24,7 +24,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= automake
# only needed as long as we use the zip distfile
-EXTRACT_OPTS_ZIP?= -aqo
+EXTRACT_OPTS_ZIP?= -aqo
WRKSRC= ${WRKDIR}/libmng
CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg}
diff --git a/graphics/ns-cult3d/Makefile b/graphics/ns-cult3d/Makefile
index 03bd72626d2..8c1f868f55b 100644
--- a/graphics/ns-cult3d/Makefile
+++ b/graphics/ns-cult3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/09 08:42:10 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:34 wiz Exp $
#
DISTNAME= Cult3D_NS4_5.2b1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.cult3d.com/
COMMENT= Netscape plugin for cult 3d files
NOT_FOR_PLATFORM= Interix-*-*
-ONLY_FOR_PLATFORM= *-*-i386
+ONLY_FOR_PLATFORM= *-*-i386
WRKSRC= ${WRKDIR}/cult3d-5.2-b1-linux-x86
NO_CONFIGURE= yes
diff --git a/graphics/nvtv/Makefile.common b/graphics/nvtv/Makefile.common
index 102a284ddb2..de19b6629be 100644
--- a/graphics/nvtv/Makefile.common
+++ b/graphics/nvtv/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/12/29 06:21:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2007/02/22 19:26:34 wiz Exp $
DISTNAME= nvtv-0.4.7
CATEGORIES= graphics
@@ -8,7 +8,7 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/nv-tv-out/
COMMENT= Tool to manipulate TV-Out settings on NVidia cards
-ONLY_FOR_PLATFORM= *-*-i386
+ONLY_FOR_PLATFORM= *-*-i386
GNU_CONFIGURE= YES
RCD_SCRIPTS= nvtvd
diff --git a/graphics/p5-GDGraph/Makefile b/graphics/p5-GDGraph/Makefile
index fa128f1fdab..15b90d529fc 100644
--- a/graphics/p5-GDGraph/Makefile
+++ b/graphics/p5-GDGraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:34 wiz Exp $
#
DISTNAME= GDGraph-1.43
@@ -12,7 +12,7 @@ MAINTAINER= damon@brodiefamily.org
HOMEPAGE= http://cpan.uwinnipeg.ca/htdocs/GDGraph/GD/Graph.html
COMMENT= GDGraph is a package to generate charts, using Lincoln Stein's GD.pm
-DEPENDS+= p5-GDTextUtil>=0.75:../../graphics/p5-GDTextUtil
+DEPENDS+= p5-GDTextUtil>=0.75:../../graphics/p5-GDTextUtil
USE_LANGUAGES= # empty
PERL5_PACKLIST= auto/GD/Graph/.packlist
diff --git a/graphics/p5-GDGraph3d/Makefile b/graphics/p5-GDGraph3d/Makefile
index 10522c33ab6..375b832b711 100644
--- a/graphics/p5-GDGraph3d/Makefile
+++ b/graphics/p5-GDGraph3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:35 wiz Exp $
DISTNAME= GDGraph3d-0.56
PKGNAME= p5-${DISTNAME}
@@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/}
MAINTAINER= damon@brodiefamily.org
COMMENT= GDGraph3d is a pkg to generate charts, using Lincoln Stein's GD.pm
-DEPENDS+= p5-GDGraph>=1.30:../../graphics/p5-GDGraph
+DEPENDS+= p5-GDGraph>=1.30:../../graphics/p5-GDGraph
USE_LANGUAGES= # empty
PERL5_PACKLIST= auto/GD/Graph3d/.packlist
diff --git a/graphics/p5-GIFgraph/Makefile b/graphics/p5-GIFgraph/Makefile
index 99473b710f5..7c8b103d060 100644
--- a/graphics/p5-GIFgraph/Makefile
+++ b/graphics/p5-GIFgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:35 wiz Exp $
#
DISTNAME= GIFgraph-1.20
@@ -12,7 +12,7 @@ MAINTAINER= he@NetBSD.org
HOMEPAGE= http://search.cpan.org/search?module=GIFgraph
COMMENT= GIFgraph is a package to generate graphs, using GD::Graph
-DEPENDS+= p5-GDGraph>=1.33:../../graphics/p5-GDGraph
+DEPENDS+= p5-GDGraph>=1.33:../../graphics/p5-GDGraph
DEPENDS+= p5-PerlMagick>=5.3.9:../../graphics/p5-PerlMagick
PERL5_PACKLIST= auto/GIFgraph/.packlist
diff --git a/graphics/p5-SWF-File/Makefile b/graphics/p5-SWF-File/Makefile
index 1598a7e927b..e55cb1c29be 100644
--- a/graphics/p5-SWF-File/Makefile
+++ b/graphics/p5-SWF-File/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:50 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:35 wiz Exp $
#
DISTNAME= SWF-File-0.22
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/SWF-File/
COMMENT= Manipulating Flash movie (SWF) files
-DEPENDS+= p5-Data-TemporaryBag-[0-9]*:../../devel/p5-Data-TemporaryBag
+DEPENDS+= p5-Data-TemporaryBag-[0-9]*:../../devel/p5-Data-TemporaryBag
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index 54f7630cc1e..4da2a0ad198 100644
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:53 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:35 wiz Exp $
DISTNAME= Image_Canvas-0.2.4
CATEGORIES= graphics
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://pear.php.net/package/Image_Color/
+HOMEPAGE= http://pear.php.net/package/Image_Color/
COMMENT= Common interface to image drawing, making image source code
CONFLICTS= php-pear-Image_Canvas-[0-9]*
diff --git a/graphics/pear-Image_Color/Makefile b/graphics/pear-Image_Color/Makefile
index 9d8423f9060..501e2432e19 100644
--- a/graphics/pear-Image_Color/Makefile
+++ b/graphics/pear-Image_Color/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:35 wiz Exp $
DISTNAME= Image_Color-1.0.2
CATEGORIES= graphics
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://pear.php.net/package/Image_Color/
+HOMEPAGE= http://pear.php.net/package/Image_Color/
COMMENT= Manage and handles color data and conversions
CONFLICTS= php-pear-Image_Color-[0-9]*
diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile
index 740c30600c1..3d358dd7303 100644
--- a/graphics/pear-Image_Graph/Makefile
+++ b/graphics/pear-Image_Graph/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:35 wiz Exp $
DISTNAME= Image_Graph-0.3.0dev4
CATEGORIES= graphics
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://pear.php.net/package/Image_Graph/
+HOMEPAGE= http://pear.php.net/package/Image_Graph/
COMMENT= Package for displaying (numerical) data as a graph/chart/plot
CONFLICTS= php-pear-Image_Graph-[0-9]*
diff --git a/graphics/php-jpgraph/Makefile b/graphics/php-jpgraph/Makefile
index 7fac2d26c20..d4abd86cf5b 100644
--- a/graphics/php-jpgraph/Makefile
+++ b/graphics/php-jpgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:35 wiz Exp $
DISTNAME= jpgraph-1.18
PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME}
@@ -6,7 +6,7 @@ CATEGORIES= graphics www
MASTER_SITES= http://members.chello.se/jpgraph/jpgdownloads/
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.aditus.nu/jpgraph/index.php
+HOMEPAGE= http://www.aditus.nu/jpgraph/index.php
COMMENT= Object Oriented class library for PHP
CONFLICTS= php-jgraph-[0-9]*
@@ -19,9 +19,9 @@ NO_BUILD= YES
EXDIR= ${PREFIX}/share/examples/php-jpgraph
PJDIR= ${PREFIX}/share/php-jpgraph
PJCONFFILE= ${PKG_SYSCONFDIR}/jpg-config.inc
-CONF_FILES= ${EXDIR}/jpg-config.inc ${PKG_SYSCONFDIR}/jpg-config.inc
+CONF_FILES= ${EXDIR}/jpg-config.inc ${PKG_SYSCONFDIR}/jpg-config.inc
-PKG_SYSCONFSUBDIR?= php-jpgraph
+PKG_SYSCONFSUBDIR?= php-jpgraph
MESSAGE_SUBST+= PJCONFFILE=${PJCONFFILE} PJDIR=${PJDIR} EXDIR=${EXDIR}
diff --git a/graphics/phpsview/Makefile b/graphics/phpsview/Makefile
index 6b69d218e1c..2df479cf253 100644
--- a/graphics/phpsview/Makefile
+++ b/graphics/phpsview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/09/09 02:42:01 obache Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:35 wiz Exp $
#
DISTNAME= pwc-9.0.2
@@ -8,7 +8,7 @@ CATEGORIES= graphics x11
MASTER_SITES= http://www.smcc.demon.nl/webcam/
PATCH_SITES= http://www.medias.ne.jp/~takam/bsd/
-PATCHFILES= pwc-9.0.2-bsd-0.03.patch.gz
+PATCHFILES= pwc-9.0.2-bsd-0.03.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= hamajima@NetBSD.org
diff --git a/graphics/py-biggles/Makefile b/graphics/py-biggles/Makefile
index 33ef54688e1..c48edcca2c2 100644
--- a/graphics/py-biggles/Makefile
+++ b/graphics/py-biggles/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2007/02/02 19:10:14 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:35 wiz Exp $
#
DISTNAME= python-biggles-1.6.3
-PKGNAME= ${PYPKGPREFIX}${DISTNAME:S/python//}
+PKGNAME= ${PYPKGPREFIX}${DISTNAME:S/python//}
PKGREVISION= 3
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=biggles/}
MAINTAINER= Kai.Puolamaki@iki.fi
HOMEPAGE= http://biggles.sourceforge.net/
-COMMENT= Python module for creating 2D scientific plots
+COMMENT= Python module for creating 2D scientific plots
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index f4c3834cf24..baf4456e066 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/04/17 13:46:35 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:35 wiz Exp $
DISTNAME= gdmodule.c
PKGNAME= ${PYPKGPREFIX}-gd-1.3
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}
BUILD_TARGET= default
PYDISTUTILSPKG= yes
-PYBINMODULE= yes
+PYBINMODULE= yes
post-patch:
${SED} 's+@LOCALBASE@+${LOCALBASE}+g' ${FILESDIR}/Setup.in > ${WRKSRC}/setup.py
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index fdbf6d1149a..d0faec174df 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/01/20 15:17:20 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:36 wiz Exp $
DISTNAME= Imaging-1.1.5
PKGNAME= ${PYPKGPREFIX}-imaging-1.1.5
@@ -10,7 +10,7 @@ MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://www.pythonware.com/products/pil/
COMMENT= PIL, the Python Imaging Library
-DIST_SUBDIR= python
+DIST_SUBDIR= python
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile
index 37c495d08b3..025a5003a6c 100644
--- a/graphics/py-imagingtk/Makefile
+++ b/graphics/py-imagingtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:05 reed Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:36 wiz Exp $
#
DISTNAME= Imaging-1.1.5
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.pythonware.com/products/pil/
COMMENT= Tk support for the Python Imaging Library (PIL)
-DIST_SUBDIR= python
+DIST_SUBDIR= python
PYDISTUTILSPKG= yes
BUILDLINK_API_DEPENDS.python20+= python20>=2.0.1nb4
PY_PATCHPLIST= yes
diff --git a/graphics/qcamview/Makefile b/graphics/qcamview/Makefile
index 4bba16f1fdc..f14daccda57 100644
--- a/graphics/qcamview/Makefile
+++ b/graphics/qcamview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/22 21:12:33 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:36 wiz Exp $
#
DISTNAME= qce-ga-0.40d
@@ -8,7 +8,7 @@ CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qce-ga/}
PATCH_SITES= http://www.medias.ne.jp/~takam/bsd/
-PATCHFILES= qce-ga-bsd-0.04.patch.gz
+PATCHFILES= qce-ga-bsd-0.04.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= hamajima@NetBSD.org
diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile
index e6eebde2bf6..d1442101643 100644
--- a/graphics/qvplay/Makefile
+++ b/graphics/qvplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/10/04 17:38:30 reed Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:36 wiz Exp $
#
DISTNAME= qvplay-0.94
-CATEGORIES= graphics
+CATEGORIES= graphics
MASTER_SITES= http://www.asahi-net.or.jp/~xg2k-hys/
MAINTAINER= jwise@NetBSD.org
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index a275e28ca09..06cc3bbb10b 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/08 21:40:21 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:36 wiz Exp $
DISTNAME= rayshade.4.0
PKGNAME= rayshade-4.0
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://graphics.stanford.edu/pub/rayshade/ \
ftp://ftp.princeton.edu/pub/Graphics/rayshade.4.0/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Extensible system for creating ray-traced images
HAS_CONFIGURE= yes
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 25d7fe085a4..be6d17cae55 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2006/08/05 22:41:49 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/02/22 19:26:36 wiz Exp $
.include "Makefile.common"
COMMENT= API for access to scanners, digitals camera, frame grabbers etc.
-DISTNAME= sane-backends-${SANE_VERSION}
+DISTNAME= sane-backends-${SANE_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
USE_TOOLS+= msgfmt
@@ -19,7 +19,7 @@ PLIST_SUBST+= SANE_PINT="@comment "
PLIST_SUBST+= SANE_SM3600="@comment "
.elif (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly")
PLIST_SUBST+= SANE_PINT="@comment "
-PLIST_SUBST+= SANE_SM3600=""
+PLIST_SUBST+= SANE_SM3600=""
.else
PLIST_SUBST+= SANE_PINT=""
PLIST_SUBST+= SANE_SM3600=""
diff --git a/graphics/sane-backends/options.mk b/graphics/sane-backends/options.mk
index 89956e60c41..577044ec233 100644
--- a/graphics/sane-backends/options.mk
+++ b/graphics/sane-backends/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2007/01/30 07:09:03 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:36 wiz Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.sane-backends
-PKG_SUPPORTED_OPTIONS= sane-backends-hp3900
+PKG_OPTIONS_VAR= PKG_OPTIONS.sane-backends
+PKG_SUPPORTED_OPTIONS= sane-backends-hp3900
PKG_SUGGESTED_OPTIONS= #defined
.include "../../mk/bsd.options.mk"
@@ -12,12 +12,12 @@ PKG_SUGGESTED_OPTIONS= #defined
### hp3900 support
###
.if !empty(PKG_OPTIONS:Mhp3900)
-PLIST_SUBST+= SANE_HP3900=""
+PLIST_SUBST+= SANE_HP3900=""
DISTFILES+= hp3900-sane1017_src_0.5.tar.gz
SITES.hp3900-sane1017_src_0.5.tar.gz=${MASTER_SITE_SOURCEFORGE:=hp3900-series/}
post-patch:
cd ${WRKSRC} && \
${PATCH} -p1 <${WRKDIR}/hp3900-sane1017_src_0.5/hp3900-sane1017_0.5.diff
.else
-PLIST_SUBST+= SANE_HP3900="@comment "
+PLIST_SUBST+= SANE_HP3900="@comment "
.endif
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 54550ac4df4..96ba4b9e0e3 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2007/01/08 17:48:09 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:36 wiz Exp $
#
DISTNAME= skencil-0.6.17
PKGREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sketch/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sketch/}
MAINTAINER= uebayasi@NetBSD.org
HOMEPAGE= http://sketch.sourceforge.net/
diff --git a/graphics/vnc2swf/Makefile b/graphics/vnc2swf/Makefile
index 871f1853dae..8762b95cf59 100644
--- a/graphics/vnc2swf/Makefile
+++ b/graphics/vnc2swf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/02/06 12:20:47 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:36 wiz Exp $
#
DISTNAME= vnc2swf-0.5.0
@@ -10,23 +10,23 @@ MAINTAINER= obata@lins.jp
HOMEPAGE= http://www.unixuser.org/~euske/vnc2swf/
COMMENT= Record vnc session as flash movie
-DEPENDS+= x11vnc-[0-9]*:../../x11/x11vnc
+DEPENDS+= x11vnc-[0-9]*:../../x11/x11vnc
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
INSTALLATION_DIRS= bin lib/X11/app-defaults share/doc/html/vnc2swf
-SUBST_CLASSES+= x11base
-SUBST_STAGE.x11base= pre-configure
-SUBST_MESSAGE.x11base= Change X11base to ${PREFIX} in Makefile
-SUBST_FILES.x11base= Makefile.in
-SUBST_SED.x11base= -e "s|/usr/X11R6|${PREFIX}|"
+SUBST_CLASSES+= x11base
+SUBST_STAGE.x11base= pre-configure
+SUBST_MESSAGE.x11base= Change X11base to ${PREFIX} in Makefile
+SUBST_FILES.x11base= Makefile.in
+SUBST_SED.x11base= -e "s|/usr/X11R6|${PREFIX}|"
-SUBST_CLASSES+= toolpath
-SUBST_STAGE.toolpath= pre-configure
-SUBST_FILES.toolpath= recordwin.sh
-SUBST_SED.toolpath= -E -e "s|^(VNC2SWF=).*|\1${PREFIX}/bin/vnc2swf|" \
+SUBST_CLASSES+= toolpath
+SUBST_STAGE.toolpath= pre-configure
+SUBST_FILES.toolpath= recordwin.sh
+SUBST_SED.toolpath= -E -e "s|^(VNC2SWF=).*|\1${PREFIX}/bin/vnc2swf|" \
-e "s|^(X11VNC=).*|\1${PREFIX}/bin/x11vnc|" \
-e "s|^(XWININFO=).*|\1${X11BASE}/bin/xwininfo|" \
-e "s|^(AWK=).*|\1${AWK}|" \
diff --git a/graphics/vtk-python/Makefile b/graphics/vtk-python/Makefile
index 07083758e73..bd9354467fb 100644
--- a/graphics/vtk-python/Makefile
+++ b/graphics/vtk-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/31 00:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:36 wiz Exp $
#
PKGNAME= vtk-python-${VTKDIST_VERSION}
@@ -6,7 +6,7 @@ PKGREVISION= 2
COMMENT= Python wrapper libraries for vtk; see vtk package for details
-VTK_CMAKE_OPT= -DPYTHON_INCLUDE_PATH:STRING=${PREFIX}/${PYINC} \
+VTK_CMAKE_OPT= -DPYTHON_INCLUDE_PATH:STRING=${PREFIX}/${PYINC} \
-DPYTHON_LIBRARY:STRING=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so \
-DVTK_WRAP_PYTHON:BOOL=ON
diff --git a/graphics/vtk/Makefile.vtkdist b/graphics/vtk/Makefile.vtkdist
index 4172f12fc2d..e8ba88419af 100644
--- a/graphics/vtk/Makefile.vtkdist
+++ b/graphics/vtk/Makefile.vtkdist
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vtkdist,v 1.7 2007/02/15 14:33:06 joerg Exp $
+# $NetBSD: Makefile.vtkdist,v 1.8 2007/02/22 19:26:36 wiz Exp $
.include "../../graphics/vtk/Makefile.common"
@@ -6,7 +6,7 @@
VTKDIST_VERSION= 4.2.6
DISTNAME= VTK-4.2-LatestRelease
DIST_SUBDIR= VTK-4.2.6
-WRKSRC= ${WRKDIR}/VTK
+WRKSRC= ${WRKDIR}/VTK
DISTINFO_FILE= ${.CURDIR}/../vtk/distinfo
PATCHDIR= ${.CURDIR}/../vtk/patches
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index f9659fc7b6d..8af347cebcc 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2007/01/29 22:06:43 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2007/02/22 19:26:37 wiz Exp $
-DISTNAME= xpaint-2.7.8.1
+DISTNAME= xpaint-2.7.8.1
PKGREVISION= 2
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
@@ -10,7 +10,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://sf-xpaint.sourceforge.net/
COMMENT= Simple paint program
-USE_IMAKE= yes
+USE_IMAKE= yes
USE_TOOLS+= gmake
MAKE_ENV+= XMKMF=${XMKMF:Q}
diff --git a/ham/7plus/Makefile b/ham/7plus/Makefile
index ddd84a3d282..adc65fdca53 100644
--- a/ham/7plus/Makefile
+++ b/ham/7plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/12/27 05:12:02 wulf Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:37 wiz Exp $
#
DISTNAME= 7pl225sr
@@ -13,7 +13,7 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= #http://home.t-online.de/home/dg1bbq/
COMMENT= Uuencode-like file coder for AMPR BBS S&F of binary files
-LICENSE= no-commercial-use
+LICENSE= no-commercial-use
WRKSRC= ${WRKDIR}/7plsrc.225
MAKE_FILE= netbsd.mak
diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile
index ad5ed2d9e92..610b0a77345 100644
--- a/ham/gnuradio-wxgui/Makefile
+++ b/ham/gnuradio-wxgui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/11/24 14:25:36 wulf Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:37 wiz Exp $
PKGNAME= gnuradio-wxgui-${VERSION}
COMMENT= GUI framework for GNU Radio based on wxPython
@@ -18,7 +18,7 @@ SUBST_SED.py-exec= -e 's,python -c,${PYTHONBIN} -c,g'
.include "../../meta-pkgs/gnuradio/Makefile.common"
-CONF_FILES+= ${EGDIR}/gr-wxgui.conf ${PKG_SYSCONFDIR}/gr-wxgui.conf
+CONF_FILES+= ${EGDIR}/gr-wxgui.conf ${PKG_SYSCONFDIR}/gr-wxgui.conf
CONFIGURE_ARGS+=--enable-gr-wxgui
.include "../../ham/gnuradio-core/buildlink3.mk"
diff --git a/ham/grig/Makefile b/ham/grig/Makefile
index efb95355813..327bde8cdf6 100644
--- a/ham/grig/Makefile
+++ b/ham/grig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/12/27 05:57:25 wulf Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:37 wiz Exp $
#
DISTNAME= grig-0.7.2
@@ -6,7 +6,7 @@ CATEGORIES= ham
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=groundstation/}
MAINTAINER= wulf@NetBSD.org
-HOMEPAGE= http://groundstation.sourceforge.net/
+HOMEPAGE= http://groundstation.sourceforge.net/
COMMENT= Graphical user interface to the Hamlib libraries
USE_LIBTOOL= yes
diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile
index e1480f6d4cc..ff3b6452ac9 100644
--- a/inputmethod/canna-server/Makefile
+++ b/inputmethod/canna-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/05 04:48:28 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:37 wiz Exp $
PKGREVISION= 2
CANNA_MODULE= server
@@ -15,8 +15,8 @@ PKG_GROUPS= ${CANNA_GROUP}
PKG_USERS= ${CANNA_USER}:${CANNA_GROUP}
MAKE_DIRS+= ${IMDICTDIR}
-OWN_DIRS+= ${IMDICTDIR}/canna
-OWN_DIRS+= ${IMDICTDIR}/canna/canna
+OWN_DIRS+= ${IMDICTDIR}/canna
+OWN_DIRS+= ${IMDICTDIR}/canna/canna
OWN_DIRS_PERMS+= ${CANNA_SPOOL} \
${CANNA_USER} ${CANNA_GROUP} ${CANNA_MODE}
diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index c1daa0c96ca..817a88ecb50 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2007/02/15 22:29:19 perry Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:37 wiz Exp $
-DISTNAME= STk-4.0.1
+DISTNAME= STk-4.0.1
PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://kaolin.unice.fr/pub/STk/
diff --git a/lang/a60/Makefile b/lang/a60/Makefile
index a34b7f3e874..e37bce177c2 100644
--- a/lang/a60/Makefile
+++ b/lang/a60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/05 06:27:41 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:37 wiz Exp $
DISTNAME= a60-0.20a
CATEGORIES= lang
@@ -9,7 +9,7 @@ COMMENT= Algol 60 interpreter
GNU_CONFIGURE= yes
-CPPFLAGS+= -Dunix
+CPPFLAGS+= -Dunix
INFO_FILES= # PLIST
diff --git a/lang/baci/Makefile b/lang/baci/Makefile
index e1de82d1f89..74bed46f4ef 100644
--- a/lang/baci/Makefile
+++ b/lang/baci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/20 22:12:25 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:37 wiz Exp $
#
DISTNAME= bacisrc
@@ -16,7 +16,7 @@ DEPENDS+= bison-[0-9]*:../../devel/bison
USE_TOOLS+= flex
-PLIST_SRC= ${WRKDIR}/PLIST
+PLIST_SRC= ${WRKDIR}/PLIST
INSTALLATION_DIRS= bin
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 316155e73e0..f6cf7471fb5 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/02/19 22:28:25 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2007/02/22 19:26:37 wiz Exp $
#
DISTNAME= plt-${DRSCHEME_VERSION}-src-unix
@@ -23,7 +23,7 @@ COMMENT= R4RS-compliant and nearly R5RS-compliant scheme tailored for teaching
CONFLICTS+= mzscheme-[0-9]*
-WRKSRC= ${WRKDIR}/plt/src
+WRKSRC= ${WRKDIR}/plt/src
USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= yes
diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile
index 52405cab3cb..f2dc01af6d2 100644
--- a/lang/ezm3/Makefile
+++ b/lang/ezm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/20 16:21:01 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:37 wiz Exp $
DISTNAME= ezm3-1.2
PKGREVISION= 1
@@ -25,7 +25,7 @@ EZM3ROOT= ${PREFIX}/ezm3
BUILDLINK_PASSTHRU_DIRS+= ${EZM3ROOT}
# XXX: This may well work for some others.
-ONLY_FOR_PLATFORM= FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 \
+ONLY_FOR_PLATFORM= FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 \
Linux-*-i386
# DragonFly-*-i386 needs new bootstrap
@@ -34,13 +34,13 @@ BOOTSTRAP= ${DISTNAME}-FreeBSD4-boot.tar.bz2
TARGET= FreeBSD4
TARGETDIR= freebsd-4
.elif ${OPSYS} == "NetBSD"
-BOOTSTRAP= ${DISTNAME}-NetBSDi386-boot.tar.bz2
-TARGET= NetBSDi386
-TARGETDIR= netbsd-1
+BOOTSTRAP= ${DISTNAME}-NetBSDi386-boot.tar.bz2
+TARGET= NetBSDi386
+TARGETDIR= netbsd-1
.elif ${OPSYS} == "OpenBSD"
-BOOTSTRAP= ${DISTNAME}-OpenBSD_386-boot.tar.bz2
-TARGET= OpenBSD_386
-TARGETDIR= openbsd-2
+BOOTSTRAP= ${DISTNAME}-OpenBSD_386-boot.tar.bz2
+TARGET= OpenBSD_386
+TARGETDIR= openbsd-2
.elif ${OPSYS} == "Linux"
BOOTSTRAP= ${DISTNAME}-LINUXLIBC6-boot.tar.bz2
TARGET= LINUXLIBC6
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index b361c6f8c40..57c59b149e0 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/01/26 13:07:58 uebayasi Exp $
+# $NetBSD: Makefile,v 1.42 2007/02/22 19:26:37 wiz Exp $
#
DISTNAME= Gauche-0.8.9
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --enable-multibyte=utf-8
CONFIGURE_ARGS+= --enable-threads=pthreads
CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --with-iconv-lib=${BUILDLINK_LDADD.iconv:M-l*:S/-l//:Q}
-MAKE_ENV+= ICONV_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
+MAKE_ENV+= ICONV_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
USE_TOOLS+= gzip makeinfo
TEST_TARGET= check
diff --git a/lang/jasmin/Makefile b/lang/jasmin/Makefile
index 44282ed4598..36ad3fce04a 100644
--- a/lang/jasmin/Makefile
+++ b/lang/jasmin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/10/04 21:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:38 wiz Exp $
#
DISTNAME= jasmin-1.06
-CATEGORIES= lang java
+CATEGORIES= lang java
MASTER_SITES= http://mrl.nyu.edu/~meyer/jasmin/
MAINTAINER= jschauma@NetBSD.org
diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index e004f5a98c0..31ea1c4acbf 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2006/05/16 13:58:25 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:38 wiz Exp $
#
DISTNAME= unix_jb35foundation
PKGNAME= jbuilder-jit-1.2.15
PKGREVISION= 2
-CATEGORIES= lang java
+CATEGORIES= lang java
MASTER_SITES= http://ftp.cdut.edu.cn/pub2/linux/develop/jbuilder/ \
http://python.planetmirror.com/ftp/jbuilder/foundation/3.5/linux/ \
http://planetmirror.com.au/ftp/jbuilder/foundation/3.5/linux/ \
diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 69ebdfe932d..603939248c8 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/22 19:26:38 wiz Exp $
#
DISTNAME= jikes-1.22
@@ -13,7 +13,7 @@ COMMENT= Java source to byte-code compiler
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-UNLIMIT_RESOURCES= datasize
+UNLIMIT_RESOURCES= datasize
# enable "-source 1.5" -- not complete, but does not break normal compiles
CONFIGURE_ARGS+= --enable-source15
diff --git a/lang/joos/Makefile b/lang/joos/Makefile
index e11ec6afa2b..69344854fa0 100644
--- a/lang/joos/Makefile
+++ b/lang/joos/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/04/02 23:07:06 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:38 wiz Exp $
#
DISTNAME= joos-0.2
-CATEGORIES= lang java
+CATEGORIES= lang java
MASTER_SITES= ftp://netbsd.stevens-tech.edu/pub/NetBSD/packages/distfiles/
EXTRACT_SUFX= .tar.bz2
diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common
index 765362cf932..9c10bd8a231 100644
--- a/lang/kaffe/Makefile.common
+++ b/lang/kaffe/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2006/05/23 10:30:32 rumble Exp $
+# $NetBSD: Makefile.common,v 1.16 2007/02/22 19:26:38 wiz Exp $
DISTNAME= kaffe-1.1.7
CATEGORIES= lang java
@@ -8,7 +8,7 @@ MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.kaffe.org/
COMMENT= Virtual machine capable of running Java(tm) code
-DEPENDS+= jikes>=1.22:../../lang/jikes
+DEPENDS+= jikes>=1.22:../../lang/jikes
DEPENDS+= fastjar>=0.93:../../archivers/fastjar
EXTRACT_USING= gtar
diff --git a/lang/kali/Makefile b/lang/kali/Makefile
index 4013efd0004..92c1fd4a731 100644
--- a/lang/kali/Makefile
+++ b/lang/kali/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:38 wiz Exp $
DISTNAME= kali-0.47
CATEGORIES= lang
@@ -11,6 +11,6 @@ COMMENT= Distributed implementation of Scheme
GNU_CONFIGURE= yes
BUILD_TARGET= # empty
-NOT_FOR_PLATFORM= *-*-alpha
+NOT_FOR_PLATFORM= *-*-alpha
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index a6701ab5c0d..2acc7b3491e 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2005/12/27 21:20:49 reed Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:38 wiz Exp $
#
-DISTNAME= mawk-1.3.3
+DISTNAME= mawk-1.3.3
CATEGORIES= lang
-MASTER_SITES= ftp://ftp.whidbey.net/pub/brennan/ \
+MASTER_SITES= ftp://ftp.whidbey.net/pub/brennan/ \
ftp://ftp.fu-berlin.de/unix/languages/mawk/
MAINTAINER= agc@NetBSD.org
@@ -21,7 +21,7 @@ TEST_TARGET= mawk_test fpe_test
CFLAGS:= ${CFLAGS:S/-ffast-math//}
.if ${OPSYS} == "SunOS"
-MAKE_ENV+= CPPFLAGS=
+MAKE_ENV+= CPPFLAGS=
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 049f61b1ea4..51c3ce27f42 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:38 wiz Exp $
-DISTNAME= mos20src
-PKGNAME= moscow_ml-2.00
+DISTNAME= mos20src
+PKGNAME= moscow_ml-2.00
PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://ftp.dina.kvl.dk/pub/mosml/ \
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 1f54a983aa6..88405dd9180 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2006/07/14 16:24:28 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:38 wiz Exp $
-DISTNAME= nawk-20050424
+DISTNAME= nawk-20050424
CATEGORIES= lang
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/lang/p2c/Makefile b/lang/p2c/Makefile
index 21903e2a0b5..cebcb38167d 100644
--- a/lang/p2c/Makefile
+++ b/lang/p2c/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:38 wiz Exp $
DISTNAME= p2c-1.20
CATEGORIES= lang
MASTER_SITES= ftp://csvax.cs.caltech.edu/pub/
-EXTRACT_SUFX= .tar.Z
+EXTRACT_SUFX= .tar.Z
MAINTAINER= jwise@NetBSD.org
COMMENT= Pascal to C compiler (translates Pascal to C)
diff --git a/lang/py-extclass/Makefile b/lang/py-extclass/Makefile
index 3392e49eec2..725b966bc5b 100644
--- a/lang/py-extclass/Makefile
+++ b/lang/py-extclass/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.18 2006/10/04 21:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:39 wiz Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= py-extclass-2.2.2
PKGREVISION= 1
CATEGORIES= lang python
-MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
+MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://cvs.zope.org/*checkout*/Cruft/ExtensionClass/doc/Attic/Acquisition.html?rev=1.2
COMMENT= Python-extensible C "classes" and Acquisition for Python
-EXTRACT_ELEMENTS= ${DISTNAME}/lib/Components/ExtensionClass
+EXTRACT_ELEMENTS= ${DISTNAME}/lib/Components/ExtensionClass
WRKSRC= ${WRKDIR}/${DISTNAME}/lib/Components/ExtensionClass
do-configure:
diff --git a/lang/py-funge/Makefile b/lang/py-funge/Makefile
index aa3888559d1..32d1b9047fa 100644
--- a/lang/py-funge/Makefile
+++ b/lang/py-funge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:39 wiz Exp $
DISTNAME= pyfunge-0.2-beta1
PKGNAME= ${PYPKGPREFIX}-funge-0.2beta1
@@ -13,12 +13,12 @@ COMMENT= Extensible Funge-98 interpreter written in Python
NO_BUILD= yes
NO_CONFIGURE= yes
-PYTHON_VERSIONS_ACCEPTED?= 23
+PYTHON_VERSIONS_ACCEPTED?= 23
WRKSRC?= ${WRKDIR}/PyFunge
PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
-PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
+PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
diff --git a/lang/py-psyco/Makefile b/lang/py-psyco/Makefile
index 332127937d4..bcfd8e9f55f 100644
--- a/lang/py-psyco/Makefile
+++ b/lang/py-psyco/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2006/10/04 21:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:39 wiz Exp $
-DISTNAME= psyco-1.4-src
+DISTNAME= psyco-1.4-src
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-src//}
PKGREVISION= 1
-CATEGORIES= lang python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psyco/}
+CATEGORIES= lang python
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psyco/}
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://psyco.sourceforge.net/
-COMMENT= Python JIT and execution accelerator
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://psyco.sourceforge.net/
+COMMENT= Python JIT and execution accelerator
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
PYDISTUTILSPKG= YES
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 382bddaca22..ef8627d16ba 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/22 00:37:56 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:39 wiz Exp $
#
DISTNAME= py152
@@ -27,11 +27,11 @@ REPLACE_FILES.py15= Lib/cgi.py # explicitly demanded to be patched
.include "../../mk/bsd.prefs.mk"
-PLIST_SRC= ${.CURDIR}/../../lang/python15/PLIST.common
+PLIST_SRC= ${.CURDIR}/../../lang/python15/PLIST.common
.if exists(${.CURDIR}/../../lang/python15/PLIST.${OPSYS})
-PLIST_SRC+= ${.CURDIR}/../../lang/python15/PLIST.${OPSYS}
+PLIST_SRC+= ${.CURDIR}/../../lang/python15/PLIST.${OPSYS}
.endif
-PLIST_SRC+= ${.CURDIR}/../../lang/python15/PLIST.common_end
+PLIST_SRC+= ${.CURDIR}/../../lang/python15/PLIST.common_end
.if ${OPSYS} == "Darwin"
PY_PLATNAME= ${LOWER_OPSYS}
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index a801a1c3899..bfefa69d44f 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/06/17 22:07:33 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:39 wiz Exp $
#
DISTNAME= Python-2.2.3
@@ -36,7 +36,7 @@ PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.common_end
.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:Q}
.elif ${OPSYS} == "IRIX"
-PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:C/\..*//}
+PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:C/\..*//}
.elif ${OPSYS} == "SunOS"
PLIST_SUBST+= PY_PLATNAME=sunos${OS_VERSION:C/\..*//}
.else
@@ -66,5 +66,5 @@ post-extract:
# set earlier in the environment (last definition wins).
#
.if ${OBJECT_FMT} == "a.out"
-MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}"
+MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}"
.endif
diff --git a/lang/python23-nth/Makefile b/lang/python23-nth/Makefile
index f73ca87d13c..28b6c7499ea 100644
--- a/lang/python23-nth/Makefile
+++ b/lang/python23-nth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/05/14 20:46:37 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:39 wiz Exp $
#
PKGNAME= python23-nth-2.3.5
@@ -6,7 +6,7 @@ PKGREVISION= 6
CONFLICTS+= python-[0-9]*
-CONFIGURE_ARGS+= --without-threads
+CONFIGURE_ARGS+= --without-threads
PY_VER_SUFFIX= 2n3
diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile
index 5bfe7fd7974..add8c8d7eb8 100644
--- a/lang/sablevm-classpath/Makefile
+++ b/lang/sablevm-classpath/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2006/04/23 20:03:06 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:39 wiz Exp $
#
.include "Makefile.common"
PKGREVISION= 1
-BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
+BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
INFO_FILES= # PLIST
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index 448a4064f46..36aec2553ec 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2006/09/25 16:16:35 joerg Exp $
+# $NetBSD: Makefile.common,v 1.32 2007/02/22 19:26:39 wiz Exp $
# MASTER_SITES is very special, and must end in "=":
CATEGORIES= lang java
@@ -7,7 +7,7 @@ EXTRACT_SUFX= .bin
MAINTAINER= jschauma@NetBSD.org
HOMEPAGE= http://java.sun.com/
DOWNLOAD= http://java.sun.com/j2se/1.3/download.html
-ARCHIVE= http://java.sun.com/products/archive/index.html
+ARCHIVE= http://java.sun.com/products/archive/index.html
LICENSE= jdk13-license
RESTRICTED= Redistribution of repackaged binaries not permitted
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index d4375cc221e..91dacbf52f7 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/12/28 11:51:12 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:39 wiz Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
@@ -37,7 +37,7 @@ PKG_SUPPORTED_OPTIONS= sun-jre-jce
.include "../../mk/bsd.options.mk"
-PLIST_SRC= ${WRKDIR}/PLIST
+PLIST_SRC= ${WRKDIR}/PLIST
.if !empty(PKG_OPTIONS:Msun-jre-jce)
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_4_2.zip
diff --git a/lang/swi-prolog-lite/Makefile.common b/lang/swi-prolog-lite/Makefile.common
index 098c76cc968..6051bd460dc 100644
--- a/lang/swi-prolog-lite/Makefile.common
+++ b/lang/swi-prolog-lite/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2006/08/02 15:15:36 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/02/22 19:26:40 wiz Exp $
SWIPLVERS= 5.6.17
DISTNAME= pl-${SWIPLVERS}
@@ -11,4 +11,4 @@ DIST_SUBDIR= swi-prolog
DISTINFO_FILE= ${.CURDIR}/../../lang/swi-prolog-lite/distinfo
PATCHDIR= ${.CURDIR}/../../lang/swi-prolog-lite/patches
-PLIST_SUBST+= APPEND_ELF=${APPEND_ELF:Q}
+PLIST_SUBST+= APPEND_ELF=${APPEND_ELF:Q}
diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index 0ae1e6d6d85..2f54e597cfe 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/08 11:54:04 adam Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:40 wiz Exp $
.include "Makefile.common"
@@ -13,7 +13,7 @@ CONFLICTS+= expect-[0-9]*
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --with-tclconfig=${PREFIX}/lib
CONFIGURE_ARGS+= --with-tclinclude=${PREFIX}/include/tcl
-CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+= --without-x
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile
index 94fbda9b703..2843e734293 100644
--- a/lang/tk-expect/Makefile
+++ b/lang/tk-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:40 wiz Exp $
.include "../../lang/tcl-expect/Makefile.common"
@@ -11,7 +11,7 @@ COMMENT= Tcl interpreter with both the expect and tk extensions built in
DEPENDS+= tcl-expect>=${EXPECT_VERSION}:../../lang/tcl-expect
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --with-tclconfig=${PREFIX}/lib
CONFIGURE_ARGS+= --with-tclinclude=${PREFIX}/include/tcl
CONFIGURE_ARGS+= --with-tkconfig=${PREFIX}/lib
diff --git a/mail/balsa2/options.mk b/mail/balsa2/options.mk
index bc6da08ea23..411a7970c02 100644
--- a/mail/balsa2/options.mk
+++ b/mail/balsa2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/05/31 18:22:23 ghen Exp $
+# $NetBSD: options.mk,v 1.6 2007/02/22 19:26:40 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.balsa2
@@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS= ldap ssl
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --with-ldap
+CONFIGURE_ARGS+= --with-ldap
. include "../../databases/openldap-client/buildlink3.mk"
.endif
diff --git a/mail/columba/Makefile b/mail/columba/Makefile
index cafba6b526b..ae3693527a9 100644
--- a/mail/columba/Makefile
+++ b/mail/columba/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2006/04/22 09:22:10 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:40 wiz Exp $
#
DISTNAME= columba-unix-1.0_M2-bin
PKGNAME= columba-1.0M2
PKGREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=columba/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=columba/}
EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 25e7561ec38..df0bd46b68d 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:40 wiz Exp $
#
DISTNAME= demime-1.1d
@@ -13,10 +13,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://scifi.squawk.com/demime.html
COMMENT= Tool to scrub mime from mailing lists
-DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+= p5-HTML-Format-[0-9]*:../../www/p5-HTML-Format
-DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
+DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
+DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+= p5-HTML-Format-[0-9]*:../../www/p5-HTML-Format
+DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
DIST_SUBDIR= ${PKGNAME_NOREV}
USE_TOOLS+= perl:run pod2man
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index c77ce9bc202..56b8780280b 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2006/08/18 14:59:17 tv Exp $
+# $NetBSD: options.mk,v 1.19 2007/02/22 19:26:40 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
PKG_SUPPORTED_OPTIONS= gssapi inet6 kqueue ldap mysql pam pgsql sasl sqlite
@@ -16,7 +16,7 @@ PKG_SUGGESTED_OPTIONS+= kqueue
### Build with OpenSSL or GNU TLS as the underlying crypto library.
###
.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+= --with-ssl=openssl
+CONFIGURE_ARGS+= --with-ssl=openssl
CONFIGURE_ENV+= SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
CONFIGURE_ENV+= SSL_LIBS="-lssl -lcrypto"
. include "../../security/openssl/buildlink3.mk"
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 0aad23db867..da6e33e6085 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:41 wiz Exp $
#
DISTNAME= drac
PKGNAME= drac-1.12
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cc.umanitoba.ca/src/
-EXTRACT_SUFX= .tar.Z
+EXTRACT_SUFX= .tar.Z
MAINTAINER= groo@NetBSD.org
HOMEPAGE= http://mail.cc.umanitoba.ca/drac/
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk
index 2433723b61e..b313446f22c 100644
--- a/mail/dspam/options.mk
+++ b/mail/dspam/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2007/01/18 14:22:38 obache Exp $
+# $NetBSD: options.mk,v 1.19 2007/02/22 19:26:41 wiz Exp $
.if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS}
@@ -173,9 +173,9 @@ CONFIGURE_ARGS+= --enable-domain-scale
###
BUILD_DEFS+= DSPAM_PSFLAGS
.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
-DSPAM_PSFLAGS?= -deaf
+DSPAM_PSFLAGS?= -deaf
.else
-DSPAM_PSFLAGS?= aux
+DSPAM_PSFLAGS?= aux
.endif
###
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 3612af7e1be..096af42fc23 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:30 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:41 wiz Exp $
DISTNAME= exim-html-4.50
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.exim.org/
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 6eefbcb5332..836530e4151 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/07/10 20:32:59 sketch Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:41 wiz Exp $
#
DISTNAME= gld-1.6
@@ -22,8 +22,8 @@ CONF_FILES_PERMS= ${EGDIR}/gld.conf ${PKG_SYSCONFDIR}/gld.conf \
RCD_SCRIPTS= gld
GLD_USER?= gld
GLD_GROUP?= gld
-PKG_GROUPS= ${GLD_GROUP}
-PKG_USERS= ${GLD_USER}:${GLD_GROUP}
+PKG_GROUPS= ${GLD_GROUP}
+PKG_USERS= ${GLD_USER}:${GLD_GROUP}
PKG_GECOS.${GLD_USER}= Greylisting Daemon user
BUILD_DEFS+= GLD_USER GLD_GROUP
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index a4f8d5c3d56..4cbeba21ca8 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.113 2007/02/15 06:45:35 tron Exp $
+# $NetBSD: Makefile,v 1.114 2007/02/22 19:26:41 wiz Exp $
#
# ATTENTION:
# The Kerberos support in this software is known to be problematic. If you
# upgrade this package you *must* test it on a system with Kerberos libraries
# but not running Kerberos before committing the changes.
-DISTNAME= imap-2004g
-PKGNAME= ${DISTNAME:S/-/-uw-/}
+DISTNAME= imap-2004g
+PKGNAME= ${DISTNAME:S/-/-uw-/}
PKGREVISION= 2
-CATEGORIES= mail
+CATEGORIES= mail
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
EXTRACT_SUFX= .tar.Z
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index fb296c59f08..217d4d43885 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 04:25:46 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:41 wiz Exp $
DISTNAME= kbiff-3.8
PKGREVISION= 5
@@ -8,12 +8,12 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.granroth.org/kbiff/index.html
-COMMENT= Mail notification utility for KDE
+COMMENT= Mail notification utility for KDE
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
SHLIBTOOL_OVERRIDE= # empty
BUILDLINK_DEPMETHOD.libXt?= build
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index b9d44f15b51..b622fc7d8de 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2006/11/07 09:26:37 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:41 wiz Exp $
DISTNAME= maildrop-2.0.2
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX= .tar.bz2
+CATEGORIES= security
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= jlam@pkgsrc.org
COMMENT= Courier mail delivery agent with filtering abilities
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 83dcc2d7e56..0039bf86394 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2006/09/09 02:43:10 obache Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:41 wiz Exp $
DISTNAME= majordomo-1.94.5
PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
-EXTRACT_SUFX= .tgz
+EXTRACT_SUFX= .tgz
MAINTAINER= packages@biology.nmsu.edu
HOMEPAGE= http://www.greatcircle.com/majordomo/
diff --git a/mail/mdfrm/Makefile b/mail/mdfrm/Makefile
index 71ac1e01e07..4f0b8fc9709 100644
--- a/mail/mdfrm/Makefile
+++ b/mail/mdfrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:41 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:41 wiz Exp $
#
DISTNAME= mdfrm.pl
@@ -10,7 +10,7 @@ EXTRACT_SUFX= #
MAINTAINER= zuntum@NetBSD.org
COMMENT= Print a summary of mail in a Maildir waiting to be read
-DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
+DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
WRKSRC= ${WRKDIR}
USE_TOOLS+= perl:run
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index ebcd15234b8..3c9ccb805f0 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/01/07 09:13:58 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:41 wiz Exp $
DISTNAME= nail-11.25
CATEGORIES= mail
@@ -27,7 +27,7 @@ MAKE_ENV+= "SENDMAIL=/usr/lib/sendmail"
EGDIR= ${PREFIX}/share/examples/nail
-CONF_FILES= ${EGDIR}/nail.rc ${PKG_SYSCONFDIR}/nail.rc
+CONF_FILES= ${EGDIR}/nail.rc ${PKG_SYSCONFDIR}/nail.rc
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile
index 4cb7a389a9f..38c83582023 100644
--- a/mail/newspipe/Makefile
+++ b/mail/newspipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:09:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:42 wiz Exp $
#
DISTNAME= newspipe.1.1.9
@@ -14,9 +14,9 @@ COMMENT= Read RSS/Atom feeds as email messages
WRKSRC= ${WRKDIR}
-DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
-DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
+DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
+DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
NO_BUILD= yes
PYTHON_PATCH_SCRIPTS= *.py
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 20c34a7a20f..ade072febcd 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/12/16 13:18:54 schwarz Exp $
+# $NetBSD: Makefile,v 1.64 2007/02/22 19:26:42 wiz Exp $
DISTNAME= nmh-1.0.4
PKGREVISION= 7
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --without-krb4
.endif
DOCDIR= share/doc/nmh
-EGDIR= ${PREFIX}/share/examples/nmh
+EGDIR= ${PREFIX}/share/examples/nmh
BUILD_DEFS+= NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index faee8e81570..d90ebbda222 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:42 wiz Exp $
#
-DISTNAME= IMAP-Admin-1.6.1
-PKGNAME= p5-${DISTNAME}
+DISTNAME= IMAP-Admin-1.6.1
+PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5iad
PKGREVISION= 2
CATEGORIES= mail perl5
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index fd6f857b6db..c4e701e1cad 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:42 wiz Exp $
#
-DISTNAME= Mail-IMAPClient-2.2.9
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Mail-IMAPClient-2.2.9
+PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5mic
PKGREVISION= 2
CATEGORIES= mail perl5
diff --git a/mail/p5-Mail-SPF-Query/Makefile b/mail/p5-Mail-SPF-Query/Makefile
index f06a09928a4..e20e008753c 100644
--- a/mail/p5-Mail-SPF-Query/Makefile
+++ b/mail/p5-Mail-SPF-Query/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/02/15 23:37:39 heinz Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:42 wiz Exp $
DISTNAME= Mail-SPF-Query-1.999
-PKGNAME= p5-${DISTNAME}
+PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5msq
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 4b7b53cc300..43226444012 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2006/10/14 12:11:56 adrianp Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:42 wiz Exp $
DISTNAME= Mail-1.1.14
CATEGORIES= mail
CONFLICTS= php-pear-Mail-[0-9]*
-DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP
+DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://pear.php.net/package/Mail
+HOMEPAGE= http://pear.php.net/package/Mail
COMMENT= PHP Class that provides multiple interfaces for sending emails
.include "../../lang/php/pear.mk"
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 42ff72c8028..ea512ae93e0 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/01/07 09:13:59 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2007/02/22 19:26:42 wiz Exp $
#
DISTNAME= procmail-3.22
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
MAKE_ENV+= SHELL=${SH:Q} CHMOD=${CHMOD:Q}
INSTALL_TARGET= install-suid install.man
-UNLIMIT_RESOURCES= datasize
+UNLIMIT_RESOURCES= datasize
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 5f8364e6dbf..531adce9f64 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2007/02/03 03:02:36 schmonz Exp $
+# $NetBSD: options.mk,v 1.25 2007/02/22 19:26:42 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
PKG_SUPPORTED_OPTIONS+= darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
@@ -55,7 +55,7 @@ QREGEX_PATCH= qregex-20060423.patch
PATCHFILES+= ${QREGEX_PATCH}
SITES.${QREGEX_PATCH}= http://www.arda.homeunix.net/store/qmail/
PATCH_DIST_STRIP.${QREGEX_PATCH}= -p3
-PLIST_SRC+= ${PKGDIR}/PLIST.qregex
+PLIST_SRC+= ${PKGDIR}/PLIST.qregex
.endif
.if !empty(PKG_OPTIONS:Mqmail-realrcptto)
@@ -71,13 +71,13 @@ PKG_OPTIONS+= sasl
. endif
. include "../../security/openssl/buildlink3.mk"
TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20060105.patch
-PATCHFILES+= ${TLSSASL_PATCH}
+PATCHFILES+= ${TLSSASL_PATCH}
SITES.${TLSSASL_PATCH}= http://shupp.org/patches/
. if !empty(PKG_OPTIONS:Mtls)
CFLAGS+= -DTLS=20060104 # NOTE: update according to the patch
DJB_INSTALL_TARGETS= cert tmprsadh
USE_TOOLS+= gmake
-PLIST_SRC+= ${PKGDIR}/PLIST.tls
+PLIST_SRC+= ${PKGDIR}/PLIST.tls
. endif
.endif
diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk
index 2c19ce21476..e6fae09a9e5 100644
--- a/mail/qpopper/options.mk
+++ b/mail/qpopper/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: options.mk,v 1.12 2007/02/22 19:26:43 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qpopper
PKG_SUPPORTED_OPTIONS= drac inet6 kerberos pam qpopper-servermode ssl
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --disable-ipv6
# Please note this is currently experimental for platforms that support it
.if !empty(PKG_OPTIONS:Mpam)
. include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+= --with-pam
+CONFIGURE_ARGS+= --with-pam
.else
CONFIGURE_ARGS+= --without-pam
.endif
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index aaeb54d2795..4dfca57944b 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:44 wiz Exp $
#
-DISTNAME= ripmime-1.4.0.2
+DISTNAME= ripmime-1.4.0.2
CATEGORIES= mail
MASTER_SITES= http://www.pldaniels.com/ripmime/
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 6491e9c5c54..136c4960a2b 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2006/10/12 21:04:27 tv Exp $
+# $NetBSD: Makefile.common,v 1.40 2007/02/22 19:26:44 wiz Exp $
#
# Makefile fragment shared with libmilter
#
@@ -27,7 +27,7 @@ MAKE_ENV+= BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
-BUILD_DEFS+= SMRSH_CMDDIR
+BUILD_DEFS+= SMRSH_CMDDIR
WRKSRC= ${WRKDIR}/sendmail-${DIST_VERS}
USE_TOOLS+= gm4
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index 9e19c36438c..293c62ccb53 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:59 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:44 wiz Exp $
-DISTNAME= sma-1.4
+DISTNAME= sma-1.4
CATEGORIES= mail
-MASTER_SITES= http://www.klake.org/sma/dl/
+MASTER_SITES= http://www.klake.org/sma/dl/
MAINTAINER= markus@core.de
HOMEPAGE= http://www.klake.org/sma/
COMMENT= Sendmail log analyser
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
NO_CONFIGURE= yes
MAKE_FILE= Makefile
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index d276d3d2887..2150b87cbd8 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/01/07 09:13:59 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:44 wiz Exp $
DISTNAME= smtpfeed-1.18
PKGREVISION= 1
@@ -27,7 +27,7 @@ DOCS= COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
ML-ADMIN ML-ADMIN.j OPTIONS OPTIONS.j README README.j \
RELEASE.NOTE SIGNAL SIGNAL.j TODO
-BUILD_DEFS+= USE_INET6
+BUILD_DEFS+= USE_INET6
INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 share/doc/smtpfeed
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index 83ac64b99c3..374f1ed9348 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:44 wiz Exp $
DISTNAME= spamd-20060330
CATEGORIES= mail
@@ -25,7 +25,7 @@ PKG_USERS= _spamd:_spamd
PKG_GECOS._spamd= Spam Daemon User
PKG_HOME._spamd= ${SPAMD_HOME}
-RCD_SCRIPTS= pfspamd
+RCD_SCRIPTS= pfspamd
SPAMD_CONF= ${PKG_SYSCONFDIR}/spamd.conf
CONF_FILES= ${PREFIX}/share/examples/spamd/spamd.conf ${SPAMD_CONF}
diff --git a/mail/spamprobe/options.mk b/mail/spamprobe/options.mk
index b954d5b44e3..d4ae2b4772e 100644
--- a/mail/spamprobe/options.mk
+++ b/mail/spamprobe/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/01/07 10:27:51 hubertf Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:44 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.spamprobe
PKG_SUPPORTED_OPTIONS= bdb gif
@@ -7,9 +7,9 @@ PKG_SUGGESTED_OPTIONS= gif
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mbdb)
-BDB_ACCEPTED= db4 # db3 db2 (not tested)
+BDB_ACCEPTED= db4 # db3 db2 (not tested)
.include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ARGS+= --with-db=${BDBBASE:Q}
+CONFIGURE_ARGS+= --with-db=${BDBBASE:Q}
.endif
.if !empty(PKG_OPTIONS:Mgif)
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 9e8cdaad0d2..2b0a717fa3e 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2007/02/06 18:54:14 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2007/02/22 19:26:44 wiz Exp $
.include "Makefile.common"
@@ -14,7 +14,7 @@ PKGCONFIG_OVERRIDE+= sylpheed-claws.pc.in
#BUILDLINK_ABI_DEPENDS.libetpan+= libetpan>=0.46
-CONFIGURE_ARGS+= --enable-aspell
+CONFIGURE_ARGS+= --enable-aspell
CONFIGURE_ARGS+= --enable-nls
CONFIGURE_ARGS+= --enable-openssl
CONFIGURE_ARGS+= --enable-gpgme
diff --git a/mail/sylpheed-claws/plugins.mk b/mail/sylpheed-claws/plugins.mk
index abda83894b8..010cd68717a 100644
--- a/mail/sylpheed-claws/plugins.mk
+++ b/mail/sylpheed-claws/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.7 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: plugins.mk,v 1.8 2007/02/22 19:26:44 wiz Exp $
#
.include "../../mail/sylpheed-claws/Makefile.common"
@@ -9,11 +9,11 @@ CONFIGURE_DIRS= ${WRKDIR}/${DISTNAME}
BUILD_DIRS= ${WRKDIR}/${DISTNAME}/src/plugins/${PLUGIN_NAME}
INSTALL_DIRS= ${WRKDIR}/${DISTNAME}/src/plugins/${PLUGIN_NAME}
-DEPENDS+= sylpheed-claws>=${SYLPHEED_VERSION}:../../mail/sylpheed-claws
+DEPENDS+= sylpheed-claws>=${SYLPHEED_VERSION}:../../mail/sylpheed-claws
LIBTOOL_OVERRIDE= ../../../libtool
-CONFIGURE_ARGS+= --disable-aspell
+CONFIGURE_ARGS+= --disable-aspell
CONFIGURE_ARGS+= --disable-nls
CONFIGURE_ARGS+= --disable-openssl
CONFIGURE_ARGS+= --disable-gpgme
diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile
index a921a47a7b4..81a46e806f7 100644
--- a/mail/sylpheed-devel/Makefile
+++ b/mail/sylpheed-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/02/15 13:33:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.43 2007/02/22 19:26:45 wiz Exp $
DISTNAME= sylpheed-2.4.0beta4
PKGNAME= ${DISTNAME:S/-/-devel-/}
@@ -13,7 +13,7 @@ COMMENT= X based e-mail and netnews client
CONFLICTS= sylpheed-claws-[0-9]* sylpheed-[0-9]*
USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL= yes
USE_TOOLS+= gmake msgfmt pkg-config
GNU_CONFIGURE= yes
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index b6a42b25489..dfb84719f9e 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2007/02/04 09:00:57 xtraeme Exp $
+# $NetBSD: Makefile,v 1.103 2007/02/22 19:26:44 wiz Exp $
DISTNAME= sylpheed-2.3.1
CATEGORIES= mail news x11
@@ -12,7 +12,7 @@ COMMENT= X based e-mail and netnews client
CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL= yes
USE_TOOLS+= gmake msgfmt pkg-config
GNU_CONFIGURE= yes
diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index 1be691cb264..444590b048b 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/02/20 02:25:46 obache Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:45 wiz Exp $
DISTNAME= wl-2.14.0
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi>=1.14.6:../../devel/semi
# apel and bbdb are included in xemacs-packages
.if ${EMACS_FLAVOR} == "emacs"
DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
-DEPENDS+= ${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
+DEPENDS+= ${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
.endif
DEPENDS+= ${EMACS_PKGNAME_PREFIX}flim>=1.14.7:../../devel/flim
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 4f4a7bbe7dc..d261459089a 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:38 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:45 wiz Exp $
#
-DISTNAME= xmailbox-2.5
+DISTNAME= xmailbox-2.5
PKGREVISION= 2
CATEGORIES= mail x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
MAINTAINER= bouyer@NetBSD.org
COMMENT= Enhanced xbiff, with pixmap and sound support
diff --git a/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile
index 9218a09f6ca..4d8930fdce5 100644
--- a/mail/xmailwatcher/Makefile
+++ b/mail/xmailwatcher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:39 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:45 wiz Exp $
DISTNAME= xmailwatcher
PKGNAME= ${DISTNAME}-1.6
@@ -7,7 +7,7 @@ CATEGORIES= mail
MASTER_SITES= ftp://ftp.dcs.ed.ac.uk/pub/X11/
MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Mailbox checker which displays sender and subject lines of mails
+COMMENT= Mailbox checker which displays sender and subject lines of mails
USE_IMAKE= yes
diff --git a/math/R-DAAG/Makefile b/math/R-DAAG/Makefile
index b00340035cf..7d390cea2d5 100644
--- a/math/R-DAAG/Makefile
+++ b/math/R-DAAG/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 22:45:47 markd Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:45 wiz Exp $
#
-CATEGORIES= databases math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= databases math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/DAAG.html
-COMMENT= Example data sets and functions implmented in R
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/DAAG.html
+COMMENT= Example data sets and functions implmented in R
-R_PKGNAME= DAAG
-R_PKGVER= 0.79
+R_PKGNAME= DAAG
+R_PKGVER= 0.79
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-GRASS/Makefile b/math/R-GRASS/Makefile
index 9876a5bfbe1..0d97799d45b 100644
--- a/math/R-GRASS/Makefile
+++ b/math/R-GRASS/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 22:47:04 markd Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:45 wiz Exp $
#
-CATEGORIES= databases math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= databases math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/GRASS.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/GRASS.html
COMMENT= Interface between GRASS 5.0 geographical information system and R
-R_PKGNAME= GRASS
-R_PKGVER= 0.3-2
+R_PKGNAME= GRASS
+R_PKGVER= 0.3-2
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-ISwR/Makefile b/math/R-ISwR/Makefile
index 4e378143cdc..ef13a8ba5f8 100644
--- a/math/R-ISwR/Makefile
+++ b/math/R-ISwR/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:45 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= databases math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= databases math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/ISwR.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/ISwR.html
COMMENT= Data sets and scripts for 'Introductory Statistics with R'
-R_PKGNAME= ISwR
-R_PKGVER= 1.0-3
+R_PKGNAME= ISwR
+R_PKGVER= 1.0-3
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-PHYLOGR/Makefile b/math/R-PHYLOGR/Makefile
index 524802ca08e..c33f7a092a1 100644
--- a/math/R-PHYLOGR/Makefile
+++ b/math/R-PHYLOGR/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:45 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= databases math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= databases math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/PHYLOGR.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/PHYLOGR.html
COMMENT= Manipulation of phylogenetically simulated data sets using GLS
-R_PKGNAME= PHYLOGR
-R_PKGVER= 1.0.3
+R_PKGNAME= PHYLOGR
+R_PKGVER= 1.0.3
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-R2HTML/Makefile b/math/R-R2HTML/Makefile
index 3e14d715bfb..1380939424e 100644
--- a/math/R-R2HTML/Makefile
+++ b/math/R-R2HTML/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:45 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/R2HTML.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/R2HTML.html
COMMENT= Includes HTML function and methods to write in an HTML output
-R_PKGNAME= R2HTML
-R_PKGVER= 1.53
+R_PKGNAME= R2HTML
+R_PKGVER= 1.53
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-RArcInfo/Makefile b/math/R-RArcInfo/Makefile
index 3063cbf5d0e..65310d85382 100644
--- a/math/R-RArcInfo/Makefile
+++ b/math/R-RArcInfo/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:45 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/RArcInfo.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/RArcInfo.html
COMMENT= Package uses the functions to read geographical information in Arc/Info
-R_PKGNAME= RArcInfo
-R_PKGVER= 0.4-4
+R_PKGNAME= RArcInfo
+R_PKGVER= 0.4-4
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-Rcmdr/Makefile b/math/R-Rcmdr/Makefile
index 858373df024..ed81359f894 100644
--- a/math/R-Rcmdr/Makefile
+++ b/math/R-Rcmdr/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/Rcmdr.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/Rcmdr.html
COMMENT= Platform-independent basic-statistics GUI for R
-R_PKGNAME= Rcmdr
-R_PKGVER= 0.9-11
+R_PKGNAME= Rcmdr
+R_PKGVER= 0.9-11
DEPENDS+= tcl>=8.3:../../lang/tcl
diff --git a/math/R-abind/Makefile b/math/R-abind/Makefile
index de803cbc316..3f43242b4c2 100644
--- a/math/R-abind/Makefile
+++ b/math/R-abind/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/abind.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/abind.html
COMMENT= Combine multi-dimensional arrays
R_PKGNAME= abind
-R_PKGVER= 1.1-0
+R_PKGVER= 1.1-0
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-chron/Makefile b/math/R-chron/Makefile
index bb2a329e590..3fab2281ea0 100644
--- a/math/R-chron/Makefile
+++ b/math/R-chron/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/chron.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/chron.html
COMMENT= Chronological objects which can handle dates and times
-R_PKGNAME= chron
-R_PKGVER= 2.2-31
+R_PKGNAME= chron
+R_PKGVER= 2.2-31
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-date/Makefile b/math/R-date/Makefile
index dac57d5bce3..5b421a3901f 100644
--- a/math/R-date/Makefile
+++ b/math/R-date/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/date.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/date.html
COMMENT= Functions for handling dates
-R_PKGNAME= date
-R_PKGVER= 1.2-18
+R_PKGNAME= date
+R_PKGVER= 1.2-18
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-geoR/Makefile b/math/R-geoR/Makefile
index a5ecf6f5925..e3bd71dbb4d 100644
--- a/math/R-geoR/Makefile
+++ b/math/R-geoR/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/geoR.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/geoR.html
COMMENT= Geostatistical analysis including likelihood-based and Bayesian methods
R_PKGNAME= geoR
-R_PKGVER= 1.5-5
+R_PKGVER= 1.5-5
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-gstat/Makefile b/math/R-gstat/Makefile
index 7ab212bb6ff..8ea312504a2 100644
--- a/math/R-gstat/Makefile
+++ b/math/R-gstat/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/gstat.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/gstat.html
COMMENT= Uni/multivariable geostatistical modelling, prediction and simulation
R_PKGNAME= gstat
-R_PKGVER= 0.9-13
+R_PKGVER= 0.9-13
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-httpRequest/Makefile b/math/R-httpRequest/Makefile
index ac5e767e780..1b608b74c7d 100644
--- a/math/R-httpRequest/Makefile
+++ b/math/R-httpRequest/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/httpRequest.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/httpRequest.html
COMMENT= Implements the GET, POST and multipart POST request
R_PKGNAME= httpRequest
-R_PKGVER= 0.0.5
+R_PKGVER= 0.0.5
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-hwde/Makefile b/math/R-hwde/Makefile
index f3da8f88ec7..37bd8d2b6fb 100644
--- a/math/R-hwde/Makefile
+++ b/math/R-hwde/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/hwde.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/hwde.html
COMMENT= Models and tests for departure from Hardy-Weinberg equilibrium
R_PKGNAME= hwde
-R_PKGVER= 0.3
+R_PKGVER= 0.3
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-mapproj/Makefile b/math/R-mapproj/Makefile
index 9e7d4b0331e..748955b9989 100644
--- a/math/R-mapproj/Makefile
+++ b/math/R-mapproj/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/mapproj.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/mapproj.html
COMMENT= Converts latitude/longitude into projected coordinates
R_PKGNAME= mapproj
-R_PKGVER= 1.1-6
+R_PKGVER= 1.1-6
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-maps/Makefile b/math/R-maps/Makefile
index 5267fa08ab4..a37f9a52bb0 100644
--- a/math/R-maps/Makefile
+++ b/math/R-maps/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:46 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/maps.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/maps.html
COMMENT= Display of maps. Includes Projection code
R_PKGNAME= maps
-R_PKGVER= 2.0-22
+R_PKGVER= 2.0-22
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-pixmap/Makefile b/math/R-pixmap/Makefile
index 659dc626beb..8a2923ba1b6 100644
--- a/math/R-pixmap/Makefile
+++ b/math/R-pixmap/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2006/06/30 22:48:07 markd Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:46 wiz Exp $
#
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/pixmap.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/pixmap.html
COMMENT= Functions for manipulations of bitmaps with R
R_PKGNAME= pixmap
-R_PKGVER= 0.4-4
+R_PKGVER= 0.4-4
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-shapefiles/Makefile b/math/R-shapefiles/Makefile
index e3c91d8abf6..29704330769 100644
--- a/math/R-shapefiles/Makefile
+++ b/math/R-shapefiles/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:47 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/shapefiles.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/shapefiles.html
COMMENT= Functions to read and write ESRI shapefiles
-R_PKGNAME= shapefiles
-R_PKGVER= 0.3
+R_PKGNAME= shapefiles
+R_PKGVER= 0.3
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R-statmod/Makefile b/math/R-statmod/Makefile
index 5736e3c0e01..d01c9d017f1 100644
--- a/math/R-statmod/Makefile
+++ b/math/R-statmod/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:47 wiz Exp $
#
PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
-MAINTAINER= mchittur@cs.nmsu.edu
-HOMEPAGE= ${R_HOMEPAGE_BASE}/statmod.html
+MAINTAINER= mchittur@cs.nmsu.edu
+HOMEPAGE= ${R_HOMEPAGE_BASE}/statmod.html
COMMENT= Miscellaneous biostatistical modeling functions
R_PKGNAME= statmod
-R_PKGVER= 1.0.6
+R_PKGVER= 1.0.6
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension
index bb2d340c999..affa26eb823 100644
--- a/math/R/Makefile.extension
+++ b/math/R/Makefile.extension
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.9 2006/07/02 12:52:43 markd Exp $
+# $NetBSD: Makefile.extension,v 1.10 2007/02/22 19:26:45 wiz Exp $
#
# This Makefile fragment is included by packages for R library packages.
#
@@ -16,7 +16,7 @@ CATEGORIES+= math
R_HOMEPAGE_BASE= http://cran.r-project.org/src/contrib/Descriptions
-WRKSRC= ${WRKDIR}/${R_PKGNAME}
+WRKSRC= ${WRKDIR}/${R_PKGNAME}
do-build:
diff --git a/math/djbfft/Makefile b/math/djbfft/Makefile
index c5e0f906393..bdda4d0c220 100644
--- a/math/djbfft/Makefile
+++ b/math/djbfft/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:03 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:47 wiz Exp $
-DISTNAME= djbfft-0.76
-CATEGORIES= math
-MASTER_SITES= http://cr.yp.to/djbfft/
+DISTNAME= djbfft-0.76
+CATEGORIES= math
+MASTER_SITES= http://cr.yp.to/djbfft/
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://cr.yp.to/djbfft.html
-COMMENT= Extremely fast library for floating-point convolution
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://cr.yp.to/djbfft.html
+COMMENT= Extremely fast library for floating-point convolution
DJB_RESTRICTED= YES
NOT_FOR_PLATFORM= IRIX-*-*
diff --git a/math/djbfft/options.mk b/math/djbfft/options.mk
index b94a412061e..721dedef201 100644
--- a/math/djbfft/options.mk
+++ b/math/djbfft/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/10/05 05:46:54 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:47 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.djbfft
PKG_OPTIONS_OPTIONAL_GROUPS= optimization
@@ -11,13 +11,13 @@ PKG_SUGGESTED_OPTIONS+= djbfft-sparc
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdjbfft-pentium)
-DJB_CONFIG_CMDS= ${ECHO} pentium > conf-opt
+DJB_CONFIG_CMDS= ${ECHO} pentium > conf-opt
.endif
.if !empty(PKG_OPTIONS:Mdjbfft-ppro)
-DJB_CONFIG_CMDS= ${ECHO} ppro > conf-opt
+DJB_CONFIG_CMDS= ${ECHO} ppro > conf-opt
.endif
.if !empty(PKG_OPTIONS:Mdjbfft-sparc)
-DJB_CONFIG_CMDS= ${ECHO} sparc > conf-opt
+DJB_CONFIG_CMDS= ${ECHO} sparc > conf-opt
.endif
diff --git a/math/gap/gap.package.mk b/math/gap/gap.package.mk
index 14a6a9d19e8..940d2beddd7 100644
--- a/math/gap/gap.package.mk
+++ b/math/gap/gap.package.mk
@@ -1,14 +1,14 @@
-# $NetBSD: gap.package.mk,v 1.13 2005/12/05 20:50:36 rillig Exp $
+# $NetBSD: gap.package.mk,v 1.14 2007/02/22 19:26:47 wiz Exp $
#
# Set GAP_PKG_NAME in your Makefile. More may appear here later.
# Note that between 4.3nb1 == bug fix 3 and 4.3nb2 == bug fix 4 there are
# some interface changes
-DEPENDS+= gap>=4.3.5:../../math/gap
-GAP_DIRECTORY= ${LOCALBASE}/lib/gap4.3
+DEPENDS+= gap>=4.3.5:../../math/gap
+GAP_DIRECTORY= ${LOCALBASE}/lib/gap4.3
GAP_PKG_ROOT= ${GAP_DIRECTORY}/pkg
GAP_PKG_DIRECTORY= ${GAP_PKG_ROOT}/${GAP_PKG_NAME}
-GAP_PLATFORM= ${MACHINE_GNU_PLATFORM}-${CC}
+GAP_PLATFORM= ${MACHINE_GNU_PLATFORM}-${CC}
PLIST_SUBST+= GAP_PLATFORM=${GAP_PLATFORM:Q}
diff --git a/math/libffm/Makefile b/math/libffm/Makefile
index 6773f080875..cb9895a9d23 100644
--- a/math/libffm/Makefile
+++ b/math/libffm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:02 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:47 wiz Exp $
DISTNAME= libffm.0.28
PKGNAME= libffm-0.28
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_TOOLS+= gmake
-ONLY_FOR_PLATFORM= NetBSD-*-alpha
+ONLY_FOR_PLATFORM= NetBSD-*-alpha
INSTALLATION_DIRS= lib include
diff --git a/math/p5-Math-FFT/Makefile b/math/p5-Math-FFT/Makefile
index a621f8efd83..5ebd6d023de 100644
--- a/math/p5-Math-FFT/Makefile
+++ b/math/p5-Math-FFT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/06 06:19:23 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:47 wiz Exp $
DISTNAME= Math-FFT-0.25
PKGNAME= p5-${DISTNAME}
@@ -8,7 +8,7 @@ CATEGORIES= math perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Math/}
MAINTAINER= gson@NetBSD.org
-HOMEPAGE= http://search.cpan.org/dist/Math-FFT/
+HOMEPAGE= http://search.cpan.org/dist/Math-FFT/
COMMENT= Perl module to calculate Fast Fourier Transforms
PERL5_PACKLIST= auto/Math/FFT/.packlist
diff --git a/math/pear-Numbers_Roman/Makefile b/math/pear-Numbers_Roman/Makefile
index f31bc0370f6..14a9ba58596 100644
--- a/math/pear-Numbers_Roman/Makefile
+++ b/math/pear-Numbers_Roman/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:47 wiz Exp $
DISTNAME= Numbers_Roman-0.2.0
CATEGORIES= math
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://pear.php.net/package/Numbers_Roman/
+HOMEPAGE= http://pear.php.net/package/Numbers_Roman/
COMMENT= Provides methods for converting to and from Roman Numerals
CONFLICTS= php-pear-Numbers_Roman-[0-9]*
diff --git a/math/pear-Numbers_Words/Makefile b/math/pear-Numbers_Words/Makefile
index 19d08d4f29a..62e1d5b8d58 100644
--- a/math/pear-Numbers_Words/Makefile
+++ b/math/pear-Numbers_Words/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:47 wiz Exp $
DISTNAME= Numbers_Words-0.14.0
CATEGORIES= math
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://pear.php.net/package/Numbers_Words/
+HOMEPAGE= http://pear.php.net/package/Numbers_Words/
COMMENT= Provides methods for spelling numerals in words
CONFLICTS= php-pear-Numbers_Words-[0-9]*
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index 06b8692a6fe..fef9453fde0 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2006/06/20 19:54:14 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:47 wiz Exp $
#
DISTNAME= rpy-0.4.6
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
PKGREVISION= 4
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rpy/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rpy/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://rpy.sourceforge.net/
+HOMEPAGE= http://rpy.sourceforge.net/
COMMENT= R interface for Python
PYDISTUTILSPKG= YES
diff --git a/math/sc/Makefile b/math/sc/Makefile
index eebcad37730..55e529d5380 100644
--- a/math/sc/Makefile
+++ b/math/sc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/11 14:52:04 obache Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:47 wiz Exp $
DISTNAME= sc-6.21
PKGREVISION= 2
@@ -6,7 +6,7 @@ CATEGORIES= math
MASTER_SITES= ftp://gatekeeper.dec.com/pub/misc/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= eric@fox.phoenix.az.us
+MAINTAINER= eric@fox.phoenix.az.us
COMMENT= Curses-based spreadsheet program
WRKSRC= ${WRKDIR}
diff --git a/math/xgap/Makefile b/math/xgap/Makefile
index 221cedc264c..f361a417860 100644
--- a/math/xgap/Makefile
+++ b/math/xgap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/19 20:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:47 wiz Exp $
#
DISTNAME= xgap4r16
@@ -12,7 +12,7 @@ MAINTAINER= cjep@NetBSD.org
HOMEPAGE= http://www.gap-system.org/Share/xgap.html
COMMENT= GUI for GAP
-WRKSRC= ${WRKDIR}/${GAP_PKG_NAME}
+WRKSRC= ${WRKDIR}/${GAP_PKG_NAME}
GNU_CONFIGURE= YES
BUILD_TARGET= default
diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 3ae69b3523b..70ea321c43c 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2007/02/19 22:09:59 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:48 wiz Exp $
DISTNAME= yorick-1.6.02
PKGREVISION= 2
CATEGORIES= math
-MASTER_SITES= ftp://ftp-icf.llnl.gov/pub/Yorick/
+MASTER_SITES= ftp://ftp-icf.llnl.gov/pub/Yorick/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 1aa8da18bbf..99b03f1eb35 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/10/04 21:48:19 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:48 wiz Exp $
DISTNAME= imm36a1
PKGNAME= imm-3.6a1
@@ -11,7 +11,7 @@ MAINTAINER= is@NetBSD.org
HOMEPAGE= http://tang.itd.nrl.navy.mil/5522/ntm/imm.html
COMMENT= Internet Image(or other data) Multicaster (and receiver)
-DEPENDS+= xv>=3.10:../../graphics/xv
+DEPENDS+= xv>=3.10:../../graphics/xv
WRKSRC= ${WRKDIR}/${DISTNAME}.src
BUILD_TARGET= netbsd
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 39ea01ce00b..85de8eba885 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/01/13 11:27:02 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2007/02/22 19:26:48 wiz Exp $
DISTNAME= vicsrc-2.8
PKGNAME= ${DISTNAME:S/src//}
@@ -9,8 +9,8 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/
.include "../../mk/bsd.prefs.mk"
.if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*)
-PATCH_SITES= ftp://tink.ims.ac.jp/pub/NetBSD/vic/
-PATCHFILES= vic-2.8_ov511p0.diff.gz
+PATCH_SITES= ftp://tink.ims.ac.jp/pub/NetBSD/vic/
+PATCHFILES= vic-2.8_ov511p0.diff.gz
.endif
MAINTAINER= is@NetBSD.org
diff --git a/meta-pkgs/gnuradio/Makefile.common b/meta-pkgs/gnuradio/Makefile.common
index 865839ebe97..897def3e7a9 100644
--- a/meta-pkgs/gnuradio/Makefile.common
+++ b/meta-pkgs/gnuradio/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2006/11/13 16:19:40 wulf Exp $
+# $NetBSD: Makefile.common,v 1.7 2007/02/22 19:26:48 wiz Exp $
#
# This Makefile fragment is included at the top of package Makefiles for
# GNU Radio distributed packages (they all share common configure and build
@@ -24,7 +24,7 @@ BUILD_DEPENDS+=doxygen>=1.4.7:../../devel/doxygen
PY_PATCHPLIST= yes
PYTHON_VERSIONS_ACCEPTED= 24 23
-EGDIR= ${PREFIX}/share/examples/gnuradio/conf.d
+EGDIR= ${PREFIX}/share/examples/gnuradio/conf.d
PKG_SYSCONFSUBDIR=gnuradio/conf.d
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/examples
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 270c9cc34a9..5e091044d14 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2006/10/30 10:27:00 dsainty Exp $
+# $NetBSD: Makefile.common,v 1.45 2007/02/22 19:26:48 wiz Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -125,17 +125,17 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX}
XF86RUSH= '@comment '
IMAKE_MANTOOLS=
LIBDRI=
-MANSOURCEPATH= man/man
-MAN_DIR= ${MANSOURCEPATH}1
-LIBMAN_DIR= ${MANSOURCEPATH}3
-KERNMAN_DIR= ${MANSOURCEPATH}4
-FILEMAN_DIR= ${MANSOURCEPATH}5
-MISCMAN_DIR= ${MANSOURCEPATH}7
-MAN_SUFFIX= 1x
-LIBMAN_SUFFIX= 3x
-KERNMAN_SUFFIX= 4
-FILEMAN_SUFFIX= 5
-MISCMAN_SUFFIX= 7
+MANSOURCEPATH= man/man
+MAN_DIR= ${MANSOURCEPATH}1
+LIBMAN_DIR= ${MANSOURCEPATH}3
+KERNMAN_DIR= ${MANSOURCEPATH}4
+FILEMAN_DIR= ${MANSOURCEPATH}5
+MISCMAN_DIR= ${MANSOURCEPATH}7
+MAN_SUFFIX= 1x
+LIBMAN_SUFFIX= 3x
+KERNMAN_SUFFIX= 4
+FILEMAN_SUFFIX= 5
+MISCMAN_SUFFIX= 7
.endif # SunOS
@@ -162,7 +162,7 @@ CHECK_X11_TYPE?= yes
.if defined(CHECK_X11_TYPE) && !empty(CHECK_X11_TYPE:M[Yy][Ee][Ss])
. if !defined(X11_TYPE) || empty(X11_TYPE:Mxorg)
-PKG_SKIP_REASON+= "X11_TYPE=xorg is mandatory."
+PKG_SKIP_REASON+= "X11_TYPE=xorg is mandatory."
. endif
.endif
@@ -179,9 +179,9 @@ MESSAGE_SUBST+= X11ROOT=${X11ROOT}
.if ${OPSYS} != "Darwin"
. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "sparc64"
-PLIST_SUBST+= DGA=
+PLIST_SUBST+= DGA=
. else
-PLIST_SUBST+= DGA='@comment '
+PLIST_SUBST+= DGA='@comment '
. endif
.endif
@@ -228,7 +228,7 @@ SYSTEMS= FreeBSD NetBSD OpenBSD darwin linux DragonFly
.if !empty(MACHINE_PLATFORM:MNetBSD-1.6[M-Z]*) || \
!empty(MACHINE_PLATFORM:MNetBSD-[2-9]*)
SUBST_CLASSES+= thr
-SUBST_STAGE.thr= post-patch
+SUBST_STAGE.thr= post-patch
SUBST_MESSAGE.thr= Fixes for threadlib.h.
SUBST_FILES.thr= config/cf/NetBSD.cf.in
. if exists(/usr/include/threadlib.h)
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 982b6d4568b..74161fd7ff9 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.31 2007/02/02 17:15:51 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:48 wiz Exp $
-DISTNAME= ast54unx
-PKGNAME= astrolog-5.40
+DISTNAME= ast54unx
+PKGNAME= astrolog-5.40
PKGREVISION= 1
-CATEGORIES= misc
-MASTER_SITES= http://www.astrolog.org/ftp/ephem/ \
+CATEGORIES= misc
+MASTER_SITES= http://www.astrolog.org/ftp/ephem/ \
http://www.astrolog.org/ftp/ \
ftp://ftp.kiarchive.ru/pub/unix/magick/astrology/astrolog/
-DISTFILES= ${DISTNAME}.shr ${EPHEM}
+DISTFILES= ${DISTNAME}.shr ${EPHEM}
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.astrolog.org/
COMMENT= Astrology program for X11 and alpha-numeric terminals
@@ -19,12 +19,12 @@ NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
WRKSRC= ${WRKDIR}
-EPHEM= LRZ5_24 CHI_24 CPJV_24
+EPHEM= LRZ5_24 CHI_24 CPJV_24
EXTRACT_ONLY= ${DISTNAME}.shr
USE_X11BASE= yes
-DIST_SUBDIR= astrolog
+DIST_SUBDIR= astrolog
BUILD_TARGET= astrolog
INSTALLATION_DIRS= bin
diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index 99cd7df7dd2..5a9619d5cec 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/11/19 11:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2007/02/22 19:26:48 wiz Exp $
DISTNAME= bidwatcher-1.3.17
PKGREVISION= 3
@@ -6,8 +6,8 @@ CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bidwatcher/}
MAINTAINER= tron@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/bidwatcher/
-COMMENT= eBay snipe tool
+HOMEPAGE= http://sourceforge.net/projects/bidwatcher/
+COMMENT= eBay snipe tool
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 5089537f50d..dd832d96449 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:38 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:48 wiz Exp $
-DISTNAME= buffer-1.17
+DISTNAME= buffer-1.17
CATEGORIES= misc
MASTER_SITES= ftp://ftp.gwdg.de/pub/linux/jurix/source/system/backup/ \
ftp://ftp.fu-berlin.de/unix/linux/mirrors/jurix.jura.uni-sb.de/source/system/backup/
diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile
index 84f2d6408d9..a760e17ef09 100644
--- a/misc/chipmunk/Makefile
+++ b/misc/chipmunk/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:10 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:48 wiz Exp $
#
-DISTNAME= chipmunk-1.4
+DISTNAME= chipmunk-1.4
PKGREVISION= 1
CATEGORIES= misc
-MASTER_SITES= http://www.bitwizard.nl/chipmunk/
+MASTER_SITES= http://www.bitwizard.nl/chipmunk/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.bitwizard.nl/chipmunk/index.html
diff --git a/misc/cstream/Makefile b/misc/cstream/Makefile
index fc6da1ab829..94540f52a0c 100644
--- a/misc/cstream/Makefile
+++ b/misc/cstream/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:10 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:48 wiz Exp $
DISTNAME= cstream-2.2
CATEGORIES= misc
MASTER_SITES= http://www.cons.org/cracauer/download/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.cons.org/cracauer/
+HOMEPAGE= http://www.cons.org/cracauer/
COMMENT= General-purpose stream-handling tool with bandwidth limiting
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/misc/dgpsip/Makefile b/misc/dgpsip/Makefile
index 9d67b864942..f2258f690bf 100644
--- a/misc/dgpsip/Makefile
+++ b/misc/dgpsip/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2004/12/30 17:25:19 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:48 wiz Exp $
DISTNAME= dgpsip-1.35
CATEGORIES= misc
MASTER_SITES= http://www.wsrcc.com/wolfgang/ftp/
-MAINTAINER= wsr+dgpsip@wsrcc.com
+MAINTAINER= wsr+dgpsip@wsrcc.com
HOMEPAGE= http://www.wsrcc.com/wolfgang/gps/dgps-ip.html
COMMENT= Differential GPS over IP communication device
diff --git a/misc/dt/Makefile b/misc/dt/Makefile
index df2f575daf6..66629ffc71d 100644
--- a/misc/dt/Makefile
+++ b/misc/dt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2004/12/03 15:15:04 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:26:49 wiz Exp $
#
DISTNAME= dt-1.1.7
PKGREVISION= 3
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= fredb@NetBSD.org
COMMENT= Virtual consoles for NetBSD/mac68k (and macppc?)
diff --git a/misc/dvorakng/Makefile b/misc/dvorakng/Makefile
index 32b6c787da8..3e21134300e 100644
--- a/misc/dvorakng/Makefile
+++ b/misc/dvorakng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/02 16:13:36 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:49 wiz Exp $
#
DISTNAME= dvorakng-0.6.0rc1
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.free.of.pl/n/nopik/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= US English Dvorak keyboard tutor
+COMMENT= US English Dvorak keyboard tutor
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/misc/figlet-fonts/Makefile b/misc/figlet-fonts/Makefile
index d50d1ab13a8..caad1223e20 100644
--- a/misc/figlet-fonts/Makefile
+++ b/misc/figlet-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:11 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:49 wiz Exp $
#
DISTNAME= figlet-fonts-20021023
@@ -7,7 +7,7 @@ CATEGORIES= misc
MASTER_SITES= ftp://ftp.figlet.org/pub/figlet/fonts/
DISTFILES= contributed.tar.gz international.tar.gz ms-dos.tar.gz
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.figlet.org/
COMMENT= Additional fonts for figlet
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index cb22f4c4bdf..1f6a4390885 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/08/13 13:01:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/22 19:26:49 wiz Exp $
-DISTNAME= gkrellweather-2.0.7
-PKGNAME= gkrellm-weather-2.0.7
+DISTNAME= gkrellweather-2.0.7
+PKGNAME= gkrellm-weather-2.0.7
CATEGORIES= misc
MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
EXTRACT_SUFX= .tgz
@@ -10,7 +10,7 @@ MAINTAINER= tripledes@eslack.org
HOMEPAGE= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
COMMENT= Gkrellm2 weather plugin
-DEPENDS+= wget>=1.8:../../net/wget
+DEPENDS+= wget>=1.8:../../net/wget
USE_TOOLS+= gmake msgfmt perl:run pkg-config
USE_PKGLOCALEDIR= YES
diff --git a/misc/gkrellm1-weather/Makefile b/misc/gkrellm1-weather/Makefile
index 334caa2b557..c561f5b8d5a 100644
--- a/misc/gkrellm1-weather/Makefile
+++ b/misc/gkrellm1-weather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 21:49:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:49 wiz Exp $
DISTNAME= gkrellweather-0.2.7
PKGNAME= gkrellm-weather-0.2.7
@@ -10,7 +10,7 @@ MAINTAINER= damon@NetBSD.org
HOMEPAGE= http://www.cse.unsw.edu.au/~flam/
COMMENT= gkrellm weather plugin
-DEPENDS+= wmweather>=1.3:../../x11/wmweather
+DEPENDS+= wmweather>=1.3:../../x11/wmweather
pre-install:
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index ec75e1c76c3..aefecc2c9c3 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/01/29 19:07:39 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2007/02/22 19:26:49 wiz Exp $
#
DISTNAME= gok-1.2.0
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= gok-1.0.pc.in
+PKGCONFIG_OVERRIDE+= gok-1.0.pc.in
GCONF2_SCHEMAS= gok.schemas
diff --git a/misc/ibutton-pdkit/Makefile b/misc/ibutton-pdkit/Makefile
index 265eb48a560..e6b6ab0dad9 100644
--- a/misc/ibutton-pdkit/Makefile
+++ b/misc/ibutton-pdkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 21:49:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:49 wiz Exp $
#
DISTNAME= ulinuxgnu
@@ -15,7 +15,7 @@ COMMENT= 1-Wire Public Domain Kit Version 2.00
MAKE_FILE= makefile
WRKSRC= ${WRKDIR}
-SCRIPTS_ENV+= SED=${SED}
+SCRIPTS_ENV+= SED=${SED}
INSTALLATION_DIRS= bin
diff --git a/misc/koffice/options.mk b/misc/koffice/options.mk
index 55808f052fb..65e1c518627 100644
--- a/misc/koffice/options.mk
+++ b/misc/koffice/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2006/06/11 13:50:19 markd Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:49 wiz Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.koffice
-PKG_SUPPORTED_OPTIONS= mysql pgsql koffice-wv2 koffice-libwpd
+PKG_OPTIONS_VAR= PKG_OPTIONS.koffice
+PKG_SUPPORTED_OPTIONS= mysql pgsql koffice-wv2 koffice-libwpd
PKG_SUGGESTED_OPTIONS= koffice-wv2 koffice-libwpd
.include "../../mk/bsd.options.mk"
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 59cc730e141..db7252f1c08 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2007/02/02 17:13:56 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/22 19:26:49 wiz Exp $
-DISTNAME= kp-0.96
+DISTNAME= kp-0.96
PKGREVISION= 1
CATEGORIES= misc tk
-MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/kp/
+MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/kp/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= The Keyboard Practicer, touch-type training program
diff --git a/misc/latin-words-bin/Makefile b/misc/latin-words-bin/Makefile
index 41e31670404..84514180e2a 100644
--- a/misc/latin-words-bin/Makefile
+++ b/misc/latin-words-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/15 13:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:49 wiz Exp $
#
DISTNAME= words-1.97-linux
@@ -12,7 +12,7 @@ HOMEPAGE= http://users.erols.com/whitaker/wordslux.htm
COMMENT= Latin-to-English dictionary program (Linux binary)
WRKSRC= ${WRKDIR}/words-1.97
-NO_CONFIGURE= YES
+NO_CONFIGURE= YES
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
diff --git a/misc/less/Makefile b/misc/less/Makefile
index 4a0b34e1f4f..84df7bb47b2 100644
--- a/misc/less/Makefile
+++ b/misc/less/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.15 2006/09/27 11:28:32 taca Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:49 wiz Exp $
#
-DISTNAME= less-382
+DISTNAME= less-382
PKGREVISION= 1
-CATEGORIES= misc
-MASTER_SITES= http://www.greenwoodsoftware.com/less/ \
+CATEGORIES= misc
+MASTER_SITES= http://www.greenwoodsoftware.com/less/ \
${MASTER_SITE_GNU:=less/}
-MAINTAINER= bouyer@NetBSD.org
-HOMEPAGE= http://www.greenwoodsoftware.com/less/
+MAINTAINER= bouyer@NetBSD.org
+HOMEPAGE= http://www.greenwoodsoftware.com/less/
COMMENT= Pager similar to more and pg
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 0058785a846..2ce37086382 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:01 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:50 wiz Exp $
#
-DISTNAME= mmv_1.01b.orig
+DISTNAME= mmv_1.01b.orig
PKGNAME= mmv-1.0b
-CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/mmv/}
+CATEGORIES= misc
+MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/mmv/}
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= # none
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= # none
COMMENT= Move, copy, append or link multiple files using wildcard patterns
WRKSRC= ${WRKDIR}/mmv-1.01b.orig
diff --git a/misc/molden/Makefile b/misc/molden/Makefile
index 18634b1cce1..2b2092ae30b 100644
--- a/misc/molden/Makefile
+++ b/misc/molden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/10/04 21:49:19 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:50 wiz Exp $
DISTNAME= molden4.2
PKGNAME= ${DISTNAME:S/molden/&-/}
@@ -22,10 +22,10 @@ INTERACTIVE_STAGE= fetch
LICENSE= molden-license
RESTRICTED= Redistributing Molden by unregistered user is prohibited.
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
FETCH_MESSAGE= \
"Please read the following to learn how to get a copy of Molden:" \
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 12380084b43..45449385a3e 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/09/06 15:38:32 tron Exp $
+# $NetBSD: Makefile,v 1.51 2007/02/22 19:26:50 wiz Exp $
DISTNAME= nxtvepg-2.7.6
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/nxtvepg/
COMMENT= NextView EPG decoder
-ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
+ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-* \
NetBSD-[2-9]*-*
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile
index 9c6559f2cea..d60b1ecd3b8 100644
--- a/misc/openoffice-bin/Makefile
+++ b/misc/openoffice-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/10/19 19:52:51 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:50 wiz Exp $
PKGNAME= openoffice-bin-${OO_VER}
PKGREVISION= 2
@@ -20,7 +20,7 @@ PLIST_SUBST+= VER=${OO_VER:Q}
MESSAGE_SUBST+= VER=${OO_VER}
NO_BUILD= yes
-NO_CONFIGURE= yes
+NO_CONFIGURE= yes
CONFLICTS+= staroffice-[0-9]*
CONFLICTS+= openoffice-[0-9]*
diff --git a/misc/openoffice-bin/Makefile.NetBSD.i386 b/misc/openoffice-bin/Makefile.NetBSD.i386
index 3ac367f747f..3fe4eabbb2a 100644
--- a/misc/openoffice-bin/Makefile.NetBSD.i386
+++ b/misc/openoffice-bin/Makefile.NetBSD.i386
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.3 2005/12/05 20:50:40 rillig Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.4 2007/02/22 19:26:50 wiz Exp $
-DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
+DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
.if !exists(/emul/linux/proc/curproc/cmdline) && !exists(/proc/curproc/cmdline)
PKG_FAIL_REASON+= "please mount /emul/linux/proc or /proc"
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index ad9b7c5f693..7be6f62a708 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/12/13 17:33:30 ghen Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:50 wiz Exp $
PKGNAME= openoffice-bin-${OO_RELEASE}
CATEGORIES= misc
@@ -20,7 +20,7 @@ PLIST_SUBST+= VER=${OO_VER:Q}
MESSAGE_SUBST+= VER=${OO_VER:Q}
FILES_SUBST+= VER=${OO_VER:Q}
-NO_CONFIGURE= yes
+NO_CONFIGURE= yes
NO_BUILD= yes
CONFLICTS+= staroffice-[0-9]*
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index 6b813a67bbc..40ba064de0c 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/11 11:55:49 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:50 wiz Exp $
DISTNAME= qbrew-0.3.5
PKGREVISION= 3
@@ -7,7 +7,7 @@ MASTER_SITES= http://www.usermode.org/code/
MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://www.usermode.org/code.html
-COMMENT= Homebrewer's recipe calculator
+COMMENT= Homebrewer's recipe calculator
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
diff --git a/misc/root/Makefile b/misc/root/Makefile
index 1c73bd53d46..6c5a4fdfab0 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/12/15 20:32:59 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:50 wiz Exp $
DISTNAME= root_v5.10.00.source
PKGNAME= root-5.10
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
BUILD_TARGET=
.if (${MACHINE_ARCH} == "arm")
-BROKEN= Compilation stops due to internal compiler error
+BROKEN= Compilation stops due to internal compiler error
.endif
INSTALLATION_DIRS= bin
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 28b05645059..97d19e1d786 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2007/01/14 09:22:28 joerg Exp $
+# $NetBSD: Makefile,v 1.65 2007/02/22 19:26:51 wiz Exp $
#
DISTNAME= yelp-2.16.2
@@ -28,13 +28,13 @@ GCONF2_SCHEMAS= yelp.schemas
.include "options.mk"
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.14.0
BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.14.0
BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8
BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.5
-BUILDLINK_DEPMETHOD.gnome-doc-utils+= full
+BUILDLINK_DEPMETHOD.gnome-doc-utils+= full
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/misc/yrolo/Makefile b/misc/yrolo/Makefile
index e78aa1f1189..abfae316a50 100644
--- a/misc/yrolo/Makefile
+++ b/misc/yrolo/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2006/05/18 19:55:34 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:51 wiz Exp $
#
-DISTNAME= yrolo-1.1
+DISTNAME= yrolo-1.1
PKGREVISION= 4
CATEGORIES= misc
-MASTER_SITES= http://www.muquit.com/muquit/software/yrolo/
+MASTER_SITES= http://www.muquit.com/muquit/software/yrolo/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.muquit.com/muquit/software/yrolo/yrolo.html
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index 24f8e1e57b3..76f829f18ff 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -2,8 +2,8 @@
# Global and legacy options
-PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis faac faad a52
+PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
+PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis faac faad a52
.include "../../mk/bsd.options.mk"
@@ -17,12 +17,12 @@ PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis faac faad a52
.if !empty(MACHINE_ARCH:Mi386)
. if !empty(PKG_OPTIONS:Mmmx) && !empty(CC_VERSION:Mgcc*)
-CFLAGS+= -fomit-frame-pointer
+CFLAGS+= -fomit-frame-pointer
. else
-CONFIGURE_ARGS+= --disable-mmx
+CONFIGURE_ARGS+= --disable-mmx
. endif
.else
-CONFIGURE_ARGS+= --disable-mmx
+CONFIGURE_ARGS+= --disable-mmx
.endif
###
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 0efc6c1ea19..ab5a943bd8d 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/01/31 00:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:51 wiz Exp $
#
DISTNAME= gmencoder-0.1.0
@@ -13,11 +13,11 @@ COMMENT= GNOME2 frontend to mencoder
BROKEN_IN= pkgsrc-2006Q1 pkgsrc-2006Q4
-DEPENDS+= mencoder>=0.90:../../multimedia/mencoder
-DEPENDS+= mplayer>=0.90:../../multimedia/mplayer
+DEPENDS+= mencoder>=0.90:../../multimedia/mencoder
+DEPENDS+= mplayer>=0.90:../../multimedia/mplayer
GNU_CONFIGURE= yes
-USE_DIRS+= gnome2-1.5
+USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake msgfmt pkg-config
USE_PKGLOCALEDIR= yes
diff --git a/multimedia/mjpegtools/hacks.mk b/multimedia/mjpegtools/hacks.mk
index 1a26d4f2aba..2e31ce024d5 100644
--- a/multimedia/mjpegtools/hacks.mk
+++ b/multimedia/mjpegtools/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2006/01/30 08:44:25 xtraeme Exp $
+# $NetBSD: hacks.mk,v 1.4 2007/02/22 19:26:51 wiz Exp $
.if !defined(MJPEGTOOLS_HACKS_MK)
MJPEGTOOLS_HACKS_MK= defined
@@ -10,7 +10,7 @@ MJPEGTOOLS_HACKS_MK= defined
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-4.*)
-BUILDLINK_TRANSFORM+= rm:-fmove-all-movables
+BUILDLINK_TRANSFORM+= rm:-fmove-all-movables
.endif
.endif # MJPEGTOOLS_HACKS_MK
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
index 45abd37c2a4..fb9b102ca94 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.25 2007/01/09 11:35:30 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:51 wiz Exp $
#
.include "../../multimedia/mkvtoolnix/Makefile.dist"
-PKGNAME= ${DISTNAME:S/mkvtoolnix/mmg/}
+PKGNAME= ${DISTNAME:S/mkvtoolnix/mmg/}
MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://www.bunkus.org/videotools/mkvtoolnix/doc/mkvmerge-gui.html
-COMMENT= MKVtoolnix mkvmerge GUI
+COMMENT= MKVtoolnix mkvmerge GUI
DEPENDS+= ${DISTNAME}{,nb[0-9]*}:../../multimedia/mkvtoolnix
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index b613b464509..f2a32e53713 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2007/01/09 14:49:34 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:51 wiz Exp $
PKGNAME= mplayer-${MPLAYER_PKG_VERSION}
PKGREVISION= 3
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not
# ${X11_BASE}, so we need to also look for headers in this path.
.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386"
-CPPFLAGS+= -I/usr/X11R6/include
+CPPFLAGS+= -I/usr/X11R6/include
BUILDLINK_PASSTHRU_DIRS+= /usr/X11R6/include
.endif
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
index 970a08d4e8e..a717a5f5fd7 100644
--- a/multimedia/ns-flash/Makefile
+++ b/multimedia/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/02/01 13:44:14 ghen Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:51 wiz Exp $
CATEGORIES= multimedia www
MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/
@@ -7,7 +7,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.flash.com/
COMMENT= MacroMedia Flash Player Netscape plugin
-ONLY_FOR_PLATFORM= *-*-i386 SunOS-*-sparc
+ONLY_FOR_PLATFORM= *-*-i386 SunOS-*-sparc
NOT_FOR_PLATFORM= SunOS-*-i386
WRKSRC= ${WRKDIR}/${WRKNAME}
@@ -40,7 +40,7 @@ CONFLICTS+= communicator<=4.76nb1
CONFLICTS+= navigator<=4.76nb1
LICENSE= flash-license
-RESTRICTED= Redistribution not permitted
+RESTRICTED= Redistribution not permitted
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 1ec927433e8..85720441005 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2007/01/17 03:11:19 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2007/02/22 19:26:51 wiz Exp $
#
DISTNAME= vlc-${VLC_VER}
@@ -23,7 +23,7 @@ VLC_VER= 0.8.5
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+= --disable-vcd
+CONFIGURE_ARGS+= --disable-vcd
.endif
BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.4.8nb1 # Postprocess fix
@@ -70,8 +70,8 @@ pre-install:
ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-SUBST_CLASSES+= oss
-SUBST_STAGE.oss= post-patch
+SUBST_CLASSES+= oss
+SUBST_STAGE.oss= post-patch
SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
SUBST_FILES.oss+= modules/access/v4l/v4l.c
SUBST_FILES.oss+= modules/audio_output/oss.c
diff --git a/multimedia/vlc07/Makefile b/multimedia/vlc07/Makefile
index 246b7926cd1..f40ad5bf74c 100644
--- a/multimedia/vlc07/Makefile
+++ b/multimedia/vlc07/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/02/02 15:48:58 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:51 wiz Exp $
#
DISTNAME= vlc-${VLC_VER}
@@ -22,7 +22,7 @@ VLC_VER= 0.7.2
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+= --disable-vcd
+CONFIGURE_ARGS+= --disable-vcd
.endif
BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.4.8nb1 # Postprocess fix
@@ -59,8 +59,8 @@ pre-install:
ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-SUBST_CLASSES+= oss fnt libav
-SUBST_STAGE.oss= post-patch
+SUBST_CLASSES+= oss fnt libav
+SUBST_STAGE.oss= post-patch
SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
SUBST_FILES.oss+= modules/access/v4l/v4l.c
SUBST_FILES.oss+= modules/audio_output/oss.c
diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile
index 687b71ae33d..0464ef1b3f0 100644
--- a/multimedia/xfmedia/Makefile
+++ b/multimedia/xfmedia/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.12 2007/02/15 14:50:30 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:52 wiz Exp $
#
DISTNAME= xfmedia-0.9.1
PKGREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= http://spuriousinterrupt.org/projects/xfmedia/files/
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= dhowland@users.sourceforge.net
HOMEPAGE= http://spuriousinterrupt.org/projects/xfmedia/
COMMENT= Xfce media player based on xine
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.2
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake intltool msgfmt pkg-config
+USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
+USE_TOOLS+= gmake intltool msgfmt pkg-config
OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/xfmedia
diff --git a/net/argus/Makefile b/net/argus/Makefile
index 67b0d7c0434..c1844b6ba65 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:22 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:52 wiz Exp $
#
DISTNAME= argus-3.3
-PKGREVISION= 3
-CATEGORIES= net
+PKGREVISION= 3
+CATEGORIES= net
MASTER_SITES= http://www.tcp4me.com/code/argus-archive/
EXTRACT_SUFX= .tgz
@@ -19,7 +19,7 @@ DEPENDS+= p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
USE_TOOLS+= perl:run
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ${WRKSRC}/Configure
CONFIGURE_ARGS+= --bin_dir ${PREFIX}/bin
diff --git a/net/arla/Makefile b/net/arla/Makefile
index 0d5f4154bfa..b0c23ade422 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2007/01/31 00:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2007/02/22 19:26:52 wiz Exp $
DISTNAME= arla-0.43
PKGREVISION= 1
@@ -62,7 +62,7 @@ EGDIR= ${PREFIX}/share/examples/arla
EGFILES= CellServDB DynRootDB SuidCells ThisCell arla.conf
.for f in ${EGFILES}
-CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
RCD_SCRIPTS= arlad
diff --git a/net/arla/options.mk b/net/arla/options.mk
index 630969ec7e2..bf72a4c3ca7 100644
--- a/net/arla/options.mk
+++ b/net/arla/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/08/24 17:59:04 wennmach Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:52 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.arla
PKG_SUPPORTED_OPTIONS= x11
@@ -11,6 +11,6 @@ CONFIGURE_ARGS+= --with-x
PLIST_SUBST+= X11_SUPPORT=
.include "../../mk/x11.buildlink3.mk"
.else
-CONFIGURE_ARGS+= --without-x
-PLIST_SUBST+= X11_SUPPORT='@comment '
+CONFIGURE_ARGS+= --without-x
+PLIST_SUBST+= X11_SUPPORT='@comment '
.endif
diff --git a/net/arpd/hacks.mk b/net/arpd/hacks.mk
index c16a6dedf98..cafd90dc81f 100644
--- a/net/arpd/hacks.mk
+++ b/net/arpd/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2006/06/30 15:33:39 tron Exp $
+# $NetBSD: hacks.mk,v 1.3 2007/02/22 19:26:52 wiz Exp $
# GCC 4.1.x complains about a NULL argument to memcpy() because it gets
# confused by the definition of the ar_tha() macro under NetBSD.
@@ -7,7 +7,7 @@
.if ${OPSYS} == "NetBSD" && !empty(CC_VERSION:Mgcc-4.1.*)
PKG_HACKS+= gcc41-null-warning
-SUBST_CLASSES+= gcc41
+SUBST_CLASSES+= gcc41
SUBST_STAGE.gcc41= post-configure
SUBST_FILES.gcc41= Makefile
SUBST_SED.gcc41= -e "s/-Wall/-Wall -Wno-nonnull/"
diff --git a/net/bing/Makefile b/net/bing/Makefile
index 667ee45b3a1..008465cdd4c 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/10/04 21:53:15 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:52 wiz Exp $
DISTNAME= bing-1.0.4
CATEGORIES= net
@@ -29,7 +29,7 @@ post-install:
#
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "alpha")
-CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*//g}
-CFLAGS:= ${CFLAGS:C/-O[0-9]*//g}
+CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*//g}
+CFLAGS:= ${CFLAGS:C/-O[0-9]*//g}
. endif
.endif
diff --git a/net/bsddip/Makefile b/net/bsddip/Makefile
index 29bcde42303..b5fc84012fc 100644
--- a/net/bsddip/Makefile
+++ b/net/bsddip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/09 09:09:32 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:52 wiz Exp $
DISTNAME= bsddip-1.02
CATEGORIES= net
@@ -6,7 +6,7 @@ CATEGORIES= net
# the actual master site is almost out of reach for everybody
#MASTER_SITES= ftp://sun.rz.tu-clausthal.de/pub/bsddip/
MASTER_SITES+= ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX= .tar.Z
+EXTRACT_SUFX= .tar.Z
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Dialup IP program
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 64c0ec28756..89664786bc5 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2007/01/21 12:44:48 sborrill Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/22 19:26:52 wiz Exp $
#
# A default so lintpkgsrc is happy, overridden below
-DISTNAME= citrix
+DISTNAME= citrix
PKGNAME= citrix_ica-9.0.0
CATEGORIES= net
MASTER_SITES= http://download2.citrix.com/files/en/products/client/ica/current/
@@ -13,7 +13,7 @@ COMMENT= Citrix(R) ICA client for the Citrix(R) Presentation Server(TM)
.include "../../mk/bsd.prefs.mk"
-ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc
+ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc
ONLY_FOR_PLATFORM+= DragonFly-*-i386
.if ${OPSYS} == "NetBSD"
@@ -21,10 +21,10 @@ ONLY_FOR_PLATFORM+= DragonFly-*-i386
DISTNAME= linuxx86
PKGNAME= citrix_ica-9.0.0
. elif ${MACHINE_ARCH} == "sparc"
-DISTNAME= en.solaris
-PKGNAME= citrix_ica-8.46.110465
+DISTNAME= en.solaris
+PKGNAME= citrix_ica-8.46.110465
MASTER_SITES= http://www.citrix.com/site/resources/dynamic/software/
-EXTRACT_SUFX= .tar.Z
+EXTRACT_SUFX= .tar.Z
. endif
.elif ${OPSYS} == "SunOS"
DISTNAME= en.solaris
@@ -41,17 +41,17 @@ DEPENDS+= suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
DEPENDS+= suse_openmotif>=6.4:../../emulators/${SUSE_DIR_PREFIX}_openmotif
.endif
-LICENSE= citrix_ica-license
-RESTRICTED= License prohibits redistribution
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
+LICENSE= citrix_ica-license
+RESTRICTED= License prohibits redistribution
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
-WRKSRC= ${WRKDIR}
-DIST_SUBDIR= ${PKGNAME_NOREV}
+WRKSRC= ${WRKDIR}
+DIST_SUBDIR= ${PKGNAME_NOREV}
-CDIR= ${PREFIX}/lib/ICAClient
+CDIR= ${PREFIX}/lib/ICAClient
USE_TOOLS+= patch
.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 87519702f00..b36f93f04e9 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/22 09:22:12 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:52 wiz Exp $
DISTNAME= dgd-1.2p4
PKGNAME= dgd-1.2.0.4
@@ -6,7 +6,7 @@ PKGREVISION= 1
CATEGORIES= net games
MASTER_SITES= ftp://ftp.dworkin.nl/pub/dgd/
-MAINTAINER= sco@openface.ca
+MAINTAINER= sco@openface.ca
HOMEPAGE= http://www.dworkin.nl/dgd/
COMMENT= Object-oriented programmable server
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index ee04bc37b01..6649b150e94 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/02/18 18:47:19 adrianp Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:52 wiz Exp $
DISTNAME= firewalk-5.0
PKGREVISION= 2
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.packetfactory.net/Projects/firewalk/
COMMENT= Determines the filter rules on a packet forwarding device
-WRKSRC= ${WRKDIR}/Firewalk
+WRKSRC= ${WRKDIR}/Firewalk
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 47a8ed9abcc..782d5c847b6 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2007/02/17 18:36:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.57 2007/02/22 19:26:52 wiz Exp $
DISTNAME= freeradius-${RADVER}
CATEGORIES= net
@@ -51,8 +51,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
CONFIGURE_ARGS+= --disable-ltdl-install
CONFIGURE_ARGS+= --with-ltdl-lib=${PREFIX}/lib
CONFIGURE_ARGS+= --with-ltdl-include=${PREFIX}/include
-CONFIGURE_ARGS+= --without-rlm_ippool
-CONFIGURE_ARGS+= --without-rlm_smb
+CONFIGURE_ARGS+= --without-rlm_ippool
+CONFIGURE_ARGS+= --without-rlm_smb
CONFIGURE_ARGS+= --without-rlm_sql_iodbc
CONFIGURE_ARGS+= --without-rlm_sql_oracle
CONFIGURE_ARGS+= --without-rlm_sql_unixodbc
@@ -68,7 +68,7 @@ SUBST_CLASSES= make
SUBST_STAGE.make= post-patch
SUBST_FILES.make= src/modules/rlm_mschap/Makefile \
src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
-SUBST_SED.make= -e "s|RLM_LDFLAGS =|RLM_LDFLAGS = \
+SUBST_SED.make= -e "s|RLM_LDFLAGS =|RLM_LDFLAGS = \
-L../../../src/lib/.libs/ -lradius|g"
SUBST_SED.make+= -e "s|RLM_SQL_LIBS =|RLM_SQL_LIBS = \
-L${PREFIX}/lib|g"
@@ -98,7 +98,7 @@ EGFILES= acct_users attrs certs/demoCA/index.txt.old \
otp.conf sqlippool.conf
.for f in ${EGFILES}
-CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
+CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
${RADIUS_USER} ${RADIUS_GROUP} 0640
.endfor
@@ -112,12 +112,12 @@ CONFIGURE_ARGS+= --without-threads
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
.include "../../devel/pthread-sem/buildlink3.mk"
-SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \
+SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \
${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q} -lsemaphore|g'
.endif
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \
+SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \
${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|g'
.endif
diff --git a/net/freeradius/options.mk b/net/freeradius/options.mk
index ab4de326af6..547038ac18a 100644
--- a/net/freeradius/options.mk
+++ b/net/freeradius/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2006/08/11 16:22:04 adrianp Exp $
+# $NetBSD: options.mk,v 1.13 2007/02/22 19:26:53 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+= --without-snmp
###
.if !empty(PKG_OPTIONS:Mkerberos)
. include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --with-rlm_krb5
+CONFIGURE_ARGS+= --with-rlm_krb5
. if defined(KRB5_TYPE) && ${KRB5_TYPE} == "heimdal"
CONFIGURE_ARGS+= --enable-heimdal-krb5
. endif
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 50c85415419..9c5f7e72c6f 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2006/06/01 22:40:19 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:53 wiz Exp $
-DISTNAME= gated-3-5-11
-PKGNAME= gated-3.5.11
+DISTNAME= gated-3-5-11
+PKGNAME= gated-3.5.11
PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= http://ftp.rge.com/pub/networking/gated/ \
diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common
index 97a0287370b..240863a8f2f 100644
--- a/net/gftp/Makefile.common
+++ b/net/gftp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2006/07/05 05:37:44 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2007/02/22 19:26:53 wiz Exp $
DISTNAME= gftp-${VERSION}
CATEGORIES= net
@@ -23,7 +23,7 @@ VERSION= 2.0.18
.include "../../mk/bsd.prefs.mk"
.if !exists(/usr/bin/ssh-agent)
-DEPENDS+= openssh-[0-9]*:../../security/openssh
+DEPENDS+= openssh-[0-9]*:../../security/openssh
.endif
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/net/gift/Makefile b/net/gift/Makefile
index cd02e46cd36..4c3273a9a98 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/07/23 22:14:26 tv Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:53 wiz Exp $
#
DISTNAME= gift-0.11.8.1
@@ -17,7 +17,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
PTHREAD_AUTO_VARS= yes
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/lib/libgift.pc.in
+PKGCONFIG_OVERRIDE+= ${WRKSRC}/lib/libgift.pc.in
.include "../../devel/libltdl/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
diff --git a/net/gofish/Makefile b/net/gofish/Makefile
index 35123e1a2ae..a86fef1c9f0 100644
--- a/net/gofish/Makefile
+++ b/net/gofish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/23 00:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:53 wiz Exp $
DISTNAME= gofish-1.1
PKGREVISION= 1
@@ -17,26 +17,26 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
--localstatedir=${VARBASE:Q}
EGDIR= ${PREFIX}/share/examples/gofish
-RUNTIMEDIR= ${VARBASE}/gopher
+RUNTIMEDIR= ${VARBASE}/gopher
-GOPHER_USER= gopher
-GOPHER_GROUP= gopher
+GOPHER_USER= gopher
+GOPHER_GROUP= gopher
GOPHER_UID= 30
GOPHER_GID= 30
-PKG_GROUPS= ${GOPHER_GROUP}
-PKG_USERS= ${GOPHER_USER}:${GOPHER_GROUP}
+PKG_GROUPS= ${GOPHER_GROUP}
+PKG_USERS= ${GOPHER_USER}:${GOPHER_GROUP}
PKG_GID.${GOPHER_GROUP}= ${GOPHER_GID}
PKG_UID.${GOPHER_USER}= ${GOPHER_UID}
-OWN_DIRS_PERMS= ${RUNTIMEDIR} ${GOPHER_USER} ${GOPHER_GROUP} 0750
+OWN_DIRS_PERMS= ${RUNTIMEDIR} ${GOPHER_USER} ${GOPHER_GROUP} 0750
RCD_SCRIPTS= gopherd
CONF_FILES= ${EGDIR}/gofish.conf ${PKG_SYSCONFDIR}/gofish.conf \
${EGDIR}/gofish-www.conf ${PKG_SYSCONFDIR}/gofish-www.conf
-FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q}
+FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q}
FILES_SUBST+= PKG_USERS=${PKG_USERS:Q}
post-configure:
diff --git a/net/ipw/Makefile b/net/ipw/Makefile
index cd6d808c1f6..ee142d24475 100644
--- a/net/ipw/Makefile
+++ b/net/ipw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:46 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:53 wiz Exp $
#
DISTNAME= ipw-3.3a
@@ -6,9 +6,9 @@ PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_LOCAL}
-MAINTAINER= mipam@ibb.net,zuntum@NetBSD.org
+MAINTAINER= mipam@ibb.net,zuntum@NetBSD.org
HOMEPAGE= http://mjhb.marina-del-rey.ca.us/ipw/
-COMMENT= "whois" replacement that automatically queries several databases
+COMMENT= "whois" replacement that automatically queries several databases
WRKSRC= ${WRKDIR}
diff --git a/net/isic/Makefile b/net/isic/Makefile
index 9482b9ec310..e0bad96b18b 100644
--- a/net/isic/Makefile
+++ b/net/isic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/02/18 18:49:03 adrianp Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:53 wiz Exp $
#
DISTNAME= isic-0.06
@@ -27,8 +27,8 @@ post-install:
#
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "alpha")
-CPPFLAGS:= ${CPPFLAGS:C/-O[0-9]*//g}
-CFLAGS:= ${CFLAGS:C/-O[0-9]*//g}
+CPPFLAGS:= ${CPPFLAGS:C/-O[0-9]*//g}
+CFLAGS:= ${CFLAGS:C/-O[0-9]*//g}
CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q}
CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
. endif
diff --git a/net/ja-samba/options.mk b/net/ja-samba/options.mk
index 22edae57e9c..fb2631225b8 100644
--- a/net/ja-samba/options.mk
+++ b/net/ja-samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:24 ghen Exp $
+# $NetBSD: options.mk,v 1.7 2007/02/22 19:26:53 wiz Exp $
# Global and legacy options
@@ -69,22 +69,22 @@ CONFIGURE_ARGS+= --without-ssl
###
### Determine the proper name for the winbind and WINS NSS modules.
###
-NSS_WINBIND.${OPSYS}?= libnss_winbind.so
-NSS_WINS.${OPSYS}?= libnss_wins.so
+NSS_WINBIND.${OPSYS}?= libnss_winbind.so
+NSS_WINS.${OPSYS}?= libnss_wins.so
-NSS_WINBIND.AIX= WINBIND
-NSS_WINS.AIX= # empty
+NSS_WINBIND.AIX= WINBIND
+NSS_WINS.AIX= # empty
NSS_WINBIND.DragonFly= # empty
NSS_WINS.DragonFly= # empty
-NSS_WINBIND.IRIX= libns_winbind.so
-NSS_WINS.IRIX= libns_wins.so
+NSS_WINBIND.IRIX= libns_winbind.so
+NSS_WINS.IRIX= libns_wins.so
.if !empty(MACHINE_PLATFORM:MFreeBSD-5.*)
-NSS_WINBIND.FreeBSD= nss_winbind.so
-NSS_WINS.FreeBSD= nss_wins.so
+NSS_WINBIND.FreeBSD= nss_winbind.so
+NSS_WINS.FreeBSD= nss_wins.so
.endif
-NSS_WINBIND= ${NSS_WINBIND.${OPSYS}}
-NSS_WINS= ${NSS_WINS.${OPSYS}}
+NSS_WINBIND= ${NSS_WINBIND.${OPSYS}}
+NSS_WINS= ${NSS_WINS.${OPSYS}}
diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile
index 68e265a52e1..c44087e1771 100644
--- a/net/kftpgrabber/Makefile
+++ b/net/kftpgrabber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:53 wiz Exp $
DISTNAME= kftpgrabber-0.8.0
PKGREVISION= 2
@@ -7,7 +7,7 @@ MASTER_SITES= http://www.kftp.org/uploads/files/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= markd@NetBSD.org
-HOMEPAGE= http://www.kftp.org/
+HOMEPAGE= http://www.kftp.org/
COMMENT= Graphical FTP client for KDE
USE_LANGUAGES= c c++
diff --git a/net/latd/Makefile b/net/latd/Makefile
index 2eac0285d7b..7eef0e8e06b 100644
--- a/net/latd/Makefile
+++ b/net/latd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2006/06/03 00:07:01 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:53 wiz Exp $
#
-DISTNAME= latd-1.18
+DISTNAME= latd-1.18
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=linux-decnet/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=linux-decnet/}
MAINTAINER= fredette@theory.lcs.mit.edu
HOMEPAGE= http://theory.lcs.mit.edu/~fredette/latd/index.html
diff --git a/net/libares/Makefile b/net/libares/Makefile
index 2a4dd32104f..525b37cb990 100644
--- a/net/libares/Makefile
+++ b/net/libares/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/20 15:08:35 tonio Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:53 wiz Exp $
#
DISTNAME= ares-1.1.1
@@ -13,6 +13,6 @@ COMMENT= Asynchronous DNS resolver library
GNU_CONFIGURE= YES
-CFLAGS.Darwin+= -DBIND_8_COMPAT
+CFLAGS.Darwin+= -DBIND_8_COMPAT
.include "../../mk/bsd.pkg.mk"
diff --git a/net/libnids/options.mk b/net/libnids/options.mk
index 55c648d6816..7fa434915a8 100644
--- a/net/libnids/options.mk
+++ b/net/libnids/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2007/02/18 18:53:10 adrianp Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:54 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libnids
PKG_SUPPORTED_OPTIONS= libnet10 libnet11
-PKG_SUGGESTED_OPTIONS= libnet10
+PKG_SUGGESTED_OPTIONS= libnet10
.include "../../mk/bsd.options.mk"
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index fcb7c204783..fca2b59cf7b 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2007/01/03 13:34:55 adrianp Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/22 19:26:54 wiz Exp $
DISTNAME= libpcap-0.9.5
SVR4_PKGNAME= lpcap
CATEGORIES= net
-MASTER_SITES= http://www.tcpdump.org/release/
+MASTER_SITES= http://www.tcpdump.org/release/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.tcpdump.org/
diff --git a/net/libradius/Makefile b/net/libradius/Makefile
index 7d809c547f5..5ab9a5dc4e5 100644
--- a/net/libradius/Makefile
+++ b/net/libradius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/11/22 16:14:14 tron Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:55 wiz Exp $
DISTNAME= libradius-linux-20040827
PKGNAME= ${DISTNAME:S/-linux//}
-PKGREVISION= 2
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= http://portal-to-web.de/tacacs/
diff --git a/net/libsoup-devel/Makefile b/net/libsoup-devel/Makefile
index 2dcad782087..bcb516c4802 100644
--- a/net/libsoup-devel/Makefile
+++ b/net/libsoup-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/01/14 16:15:48 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:55 wiz Exp $
DISTNAME= libsoup-2.2.99
PKGNAME= ${DISTNAME:S/soup/soup-devel/}
@@ -14,7 +14,7 @@ USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= libsoup-2.2.pc.in
+PKGCONFIG_OVERRIDE+= libsoup-2.2.pc.in
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
diff --git a/net/llnlxdir/Makefile b/net/llnlxdir/Makefile
index 251628e5e90..b3ba4a847fb 100644
--- a/net/llnlxdir/Makefile
+++ b/net/llnlxdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/12/15 20:32:59 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:55 wiz Exp $
#
DISTNAME= llnlxdir2_1_2
@@ -12,8 +12,8 @@ MAINTAINER= tor@stormwall.org
HOMEPAGE= http://www.llnl.gov/icc/sdd/img/xdir.html
COMMENT= Advanced graphical FTP client
-USE_IMAKE= yes
-WRKSRC= ${WRKDIR}/llnlxdir2_1_2/sources
+USE_IMAKE= yes
+WRKSRC= ${WRKDIR}/llnlxdir2_1_2/sources
INSTALLATION_DIRS= bin lib/X11/app-defaults
do-install:
diff --git a/net/llnlxftp/Makefile b/net/llnlxftp/Makefile
index 7d4bfe9975d..237cdafc61a 100644
--- a/net/llnlxftp/Makefile
+++ b/net/llnlxftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/12/15 20:32:59 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:55 wiz Exp $
#
DISTNAME= llnlxftp2.1
@@ -12,8 +12,8 @@ MAINTAINER= tor@stormwall.org
HOMEPAGE= http://www.llnl.gov/icc/sdd/img/xftp.html
COMMENT= Motif FTP client
-USE_IMAKE= yes
-WRKSRC= ${WRKDIR}/llnlxftp2.1/sources
+USE_IMAKE= yes
+WRKSRC= ${WRKDIR}/llnlxftp2.1/sources
INSTALLATION_DIRS= bin lib/X11/app-defaults
do-install:
diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index c559939d60f..cb80b0f8414 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/20 08:45:10 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:55 wiz Exp $
#
DISTNAME= nagios-2.5
@@ -56,7 +56,7 @@ EGFILES= cgi.cfg checkcommands.cfg contactgroups.cfg contacts.cfg \
.for files in ${EGFILES}
CONF_FILES+= ${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files}
.endfor
-CONF_FILES+= ${EGDIR}/nagios.conf ${PKG_SYSCONFDIR}/nagios.conf
+CONF_FILES+= ${EGDIR}/nagios.conf ${PKG_SYSCONFDIR}/nagios.conf
NAGIOS_DIRS= log/nagios log/nagios/archives run/nagios run/nagios/rw
.for dir in ${NAGIOS_DIRS}
diff --git a/net/nagios-base/Makefile.common b/net/nagios-base/Makefile.common
index e5f69fc7e27..7753ab34e38 100644
--- a/net/nagios-base/Makefile.common
+++ b/net/nagios-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/10/20 08:07:45 rillig Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/02/22 19:26:55 wiz Exp $
#
NAGIOS_USER?= nagios
@@ -10,8 +10,8 @@ NAGIOSADM_GROUP?= ${NAGIOSADM_USER}
BUILD_DEFS+= NAGIOS_USER NAGIOS_GROUP
BUILD_DEFS+= NAGIOSADM_USER NAGIOSADM_GROUP
-USE_X11= YES
-GNU_CONFIGURE= YES
+USE_X11= YES
+GNU_CONFIGURE= YES
USE_TOOLS+= gmake
PKG_SYSCONFSUBDIR= nagios
@@ -20,8 +20,8 @@ PERL5_REQD= 5.6
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nagios
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/nagios
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --localstatedir=/var
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --with-cgiurl=/nagios/cgi-bin
CONFIGURE_ARGS+= --with-htmurl=/nagios
diff --git a/net/nagios-imagepak-base/Makefile b/net/nagios-imagepak-base/Makefile
index 7c7096bb89d..86abd215dca 100644
--- a/net/nagios-imagepak-base/Makefile
+++ b/net/nagios-imagepak-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:30:20 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:55 wiz Exp $
#
PKGNAME= nagios-imagepak-base-20030219
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nagios.org/
COMMENT= Additioannal icons for nagios
-DEPENDS+= nagios-base>=2.0:../../net/nagios-base
+DEPENDS+= nagios-base>=2.0:../../net/nagios-base
WRKSRC= ${WRKDIR}/base
diff --git a/net/nagios-nrpe/Makefile b/net/nagios-nrpe/Makefile
index beaab8e5c6b..ced2fde2510 100644
--- a/net/nagios-nrpe/Makefile
+++ b/net/nagios-nrpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/08/17 14:23:07 taca Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:55 wiz Exp $
#
DISTNAME= nrpe-2.5.2
@@ -6,8 +6,8 @@ PKGNAME= nagios-${DISTNAME}
CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/nagios/
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://sourceforge.net/projects/nagios/
COMMENT= Nagios remote program execution daemon
GNU_CONFIGURE= yes
diff --git a/net/nagios-nrpe/options.mk b/net/nagios-nrpe/options.mk
index d230c6487b7..48fedfba212 100644
--- a/net/nagios-nrpe/options.mk
+++ b/net/nagios-nrpe/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/05/21 10:28:40 grant Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:56 wiz Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.nagios-nrpe
-PKG_SUPPORTED_OPTIONS= ssl tcpwrappers
-PKG_SUGGESTED_OPTIONS= tcpwrappers
+PKG_OPTIONS_VAR= PKG_OPTIONS.nagios-nrpe
+PKG_SUPPORTED_OPTIONS= ssl tcpwrappers
+PKG_SUGGESTED_OPTIONS= tcpwrappers
.include "../../mk/bsd.options.mk"
diff --git a/net/nagios-nsca/Makefile b/net/nagios-nsca/Makefile
index 2495b164e68..3964a275ea0 100644
--- a/net/nagios-nsca/Makefile
+++ b/net/nagios-nsca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/05/09 18:12:11 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:56 wiz Exp $
#
DISTNAME= nsca-2.6
@@ -16,7 +16,7 @@ EGFILES= nsca.cfg
USE_TOOLS+= perl
.for files in ${EGFILES}
-CONF_FILES+= ${EGDIR}/${files} ${PKG_SYSCONFDIR}/${files}
+CONF_FILES+= ${EGDIR}/${files} ${PKG_SYSCONFDIR}/${files}
.endfor
.include "../../net/nagios-base/Makefile.common"
diff --git a/net/nagios-nsca/Makefile.common b/net/nagios-nsca/Makefile.common
index fb7a809e1f4..e0081ed25a9 100644
--- a/net/nagios-nsca/Makefile.common
+++ b/net/nagios-nsca/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/03/14 20:43:23 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/02/22 19:26:56 wiz Exp $
#
NAGIOS_USER?= nagios
@@ -8,8 +8,8 @@ NAGIOSADM_USER?= nagadmin
NAGIOSADM_GROUP?= ${NAGIOSADM_USER}
-USE_X11= YES
-GNU_CONFIGURE= YES
+USE_X11= YES
+GNU_CONFIGURE= YES
USE_TOOLS+= gmake
PKG_SYSCONFSUBDIR= nagios
@@ -18,8 +18,8 @@ PERL5_REQD= 5.6
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nagios
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/nagios
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --localstatedir=/var
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --with-cgiurl=/nagios/cgi-bin
CONFIGURE_ARGS+= --with-htmurl=/nagios
diff --git a/net/nagios-plugin-ldap/Makefile b/net/nagios-plugin-ldap/Makefile
index 461156d95de..91a3fa5b768 100644
--- a/net/nagios-plugin-ldap/Makefile
+++ b/net/nagios-plugin-ldap/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2006/10/23 07:17:40 seb Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:56 wiz Exp $
#
PKGNAME= nagios-plugin-ldap-${PLUGINSVERSION}
CATEGORIES= net sysutils databases
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Nagios ldap plugin
DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins
diff --git a/net/nagios-plugin-mysql/Makefile b/net/nagios-plugin-mysql/Makefile
index 3b5ff656384..3af085d72ff 100644
--- a/net/nagios-plugin-mysql/Makefile
+++ b/net/nagios-plugin-mysql/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2006/10/23 07:17:40 seb Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:56 wiz Exp $
#
PKGNAME= nagios-plugin-mysql-${PLUGINSVERSION}
-CATEGORIES= net sysutils databases
+CATEGORIES= net sysutils databases
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Nagios mysql plugin
-DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins
+DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins
CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}
diff --git a/net/nagios-plugin-pgsql/Makefile b/net/nagios-plugin-pgsql/Makefile
index 5f86d08d813..69ed08b37c0 100644
--- a/net/nagios-plugin-pgsql/Makefile
+++ b/net/nagios-plugin-pgsql/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2006/12/28 12:12:58 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:56 wiz Exp $
#
PKGNAME= nagios-plugin-pgsql-${PLUGINSVERSION}
PKGREVISION= 1
-CATEGORIES= net sysutils databases
+CATEGORIES= net sysutils databases
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Nagios pgsql plugin
-DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins
+DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins
CONFIGURE_ARGS+= --with-pgsql=${BUILDLINK_PREFIX.pgsql-lib}
#CPPFLAGS+= -I${PGSQL_PREFIX}/include/pgsql
diff --git a/net/nagios-plugin-snmp/Makefile b/net/nagios-plugin-snmp/Makefile
index 58d6398ca47..821f6aae5ec 100644
--- a/net/nagios-plugin-snmp/Makefile
+++ b/net/nagios-plugin-snmp/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2006/10/23 07:17:40 seb Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:56 wiz Exp $
#
PKGNAME= nagios-plugin-snmp-${PLUGINSVERSION}
-CATEGORIES= net sysutils
+CATEGORIES= net sysutils
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Nagios snmp plugins
DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins
-DEPENDS+= p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP
+DEPENDS+= p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP
.include "../../net/nagios-plugins/Makefile.common"
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index ee69ed8c1be..338b744b413 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2006/10/20 08:54:44 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:56 wiz Exp $
#
PKGREVISION= 1
CATEGORIES= net sysutils
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/nagiosplug/
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://sourceforge.net/projects/nagiosplug/
COMMENT= Nagios plugins
.include "../../net/nagios-plugins/Makefile.common"
diff --git a/net/ncftp2/options.mk b/net/ncftp2/options.mk
index c43e7dc4603..3b6befa6f38 100644
--- a/net/ncftp2/options.mk
+++ b/net/ncftp2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/02 17:02:29 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:56 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ncftp2
PKG_OPTIONS_OPTIONAL_GROUPS+= socks
@@ -8,9 +8,9 @@ PKG_OPTIONS_GROUP.socks= socks4 socks5
# Include SOCKS firewall support
.if !empty(PKG_OPTIONS:Msocks4)
-CONFIGURE_ARGS+= --enable-socks
+CONFIGURE_ARGS+= --enable-socks
.include "../../net/socks4/buildlink3.mk"
.elif !empty(PKG_OPTIONS:Msocks5)
-CONFIGURE_ARGS+= --enable-socks5
+CONFIGURE_ARGS+= --enable-socks5
.include "../../net/socks5/buildlink3.mk"
.endif
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index dc6759f8d5b..f70d462626b 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/04/22 09:22:12 rillig Exp $
+# $NetBSD: Makefile,v 1.52 2007/02/22 19:26:56 wiz Exp $
DISTNAME= netatalk-2.0.3
PKGREVISION= 4
@@ -56,22 +56,22 @@ SUBST_FILES.paths= etc/psf/etc2ps.sh distrib/initscripts/Makefile.in
SUBST_SED.paths= -e "s,^\(DVIPS=\)\(/usr/local/tex\)\(/bin\),\1${PREFIX}\3,"
SUBST_SED.paths+= -e "s,\(NETBSD.*\)/etc/rc.d,\1${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR},"
-PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
-PKG_SUPPORTED_OPTIONS= cups kerberos pam slp
+PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
+PKG_SUPPORTED_OPTIONS= cups kerberos pam slp
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mcups)
.include "../../print/cups/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-cups
+CONFIGURE_ARGS+= --enable-cups
.else
-CONFIGURE_ARGS+= --disable-cups
+CONFIGURE_ARGS+= --disable-cups
.endif
.if !empty(PKG_OPTIONS:Mkerberos)
.include "../../mk/krb5.buildlink3.mk"
CONFIGURE_ARGS+= --with-gssapi --enable-krbV-uam
-CONFIGURE_ENV+= GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
+CONFIGURE_ENV+= GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
PLIST_SUBST+= GSSAPI=""
.else
CONFIGURE_ARGS+= --without-gssapi
diff --git a/net/netatalk1/options.mk b/net/netatalk1/options.mk
index 3924a571dda..67bc9d95fbc 100644
--- a/net/netatalk1/options.mk
+++ b/net/netatalk1/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/06/05 23:40:56 taca Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:56 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk1
PKG_SUPPORTED_OPTIONS= pam
@@ -10,8 +10,8 @@ PKG_SUPPORTED_OPTIONS= pam
.if !empty(PKG_OPTIONS:Mpam)
. include "../../security/PAM/module.mk"
CONFIGURE_ARGS+= --with-pam
-PLIST_SUBST+= PAM=
+PLIST_SUBST+= PAM=
.else
CONFIGURE_ARGS+= --without-pam
-PLIST_SUBST+= PAM="@comment "
+PLIST_SUBST+= PAM="@comment "
.endif
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index 95b424c04f5..5c9c17e8721 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/04/17 13:46:44 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:26:56 wiz Exp $
#
DISTNAME= nicotine-1.0.8
@@ -13,7 +13,7 @@ COMMENT= Client for soulseek, a peer-to-peer network for music
USE_PKGLOCALEDIR= yes
-PYTHON_VERSIONS_ACCEPTED= 23
+PYTHON_VERSIONS_ACCEPTED= 23
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
diff --git a/net/nmapfe/Makefile b/net/nmapfe/Makefile
index 3025b203ba4..a4e756c1957 100644
--- a/net/nmapfe/Makefile
+++ b/net/nmapfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/12/17 17:57:31 salo Exp $
+# $NetBSD: Makefile,v 1.45 2007/02/22 19:26:57 wiz Exp $
#
DISTNAME= nmap-4.20
@@ -8,7 +8,7 @@ CATEGORIES= net security
MASTER_SITES= http://insecure.org/nmap/dist/
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= salo@NetBSD.org
+MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://insecure.org/nmap/
COMMENT= Graphical front end to the nmap port scanner
diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index 293d3cb0664..87d57746b8d 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2006/08/06 05:16:51 kristerw Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:57 wiz Exp $
#
DISTNAME= nocol-4.3.1
PKGREVISION= 3
CATEGORIES= net
-MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/
+MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.netplex-tech.com/software/nocol/
diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile
index 2e0c3e7032c..91d23716624 100644
--- a/net/oinkmaster/Makefile
+++ b/net/oinkmaster/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:04 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:57 wiz Exp $
DISTNAME= oinkmaster-2.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=oinkmaster/}
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://oinkmaster.sourceforge.net/
+HOMEPAGE= http://oinkmaster.sourceforge.net/
COMMENT= Manage snort rule updates
DEPENDS+= wget>=1.00:../../net/wget
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 04c383577d9..3763cc2c505 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:05 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:26:57 wiz Exp $
DISTNAME= openntpd-3.9p1
CATEGORIES= net
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
MAINTAINER= peter@pointless.nl
HOMEPAGE= http://www.openntpd.org/
-COMMENT= Free implementation of the Network Time Protocol
+COMMENT= Free implementation of the Network Time Protocol
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/net/openvmps/Makefile b/net/openvmps/Makefile
index 973fb57e24e..a3ac98dbbba 100644
--- a/net/openvmps/Makefile
+++ b/net/openvmps/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/05/31 17:47:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:57 wiz Exp $
DISTNAME= vmpsd-1.3
-PKGNAME= openvmps-1.3
+PKGNAME= openvmps-1.3
PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vmps/}
diff --git a/net/p5-Net-CIDR-Lite/Makefile b/net/p5-Net-CIDR-Lite/Makefile
index 412b7b7f889..68d6578ed31 100644
--- a/net/p5-Net-CIDR-Lite/Makefile
+++ b/net/p5-Net-CIDR-Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/15 22:28:06 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:57 wiz Exp $
#
DISTNAME= Net-CIDR-Lite-0.20
@@ -13,7 +13,7 @@ COMMENT= Perl extension for merging IPv4/v6 CIDR addresses
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PERL5_PACKLIST= auto/Net/CIDR/Lite/.packlist
+PERL5_PACKLIST= auto/Net/CIDR/Lite/.packlist
USE_LANGUAGES= # empty
.include "../../lang/perl5/module.mk"
diff --git a/net/pear-SOAP/Makefile b/net/pear-SOAP/Makefile
index 841e5c6eb8f..8fca62e65f3 100644
--- a/net/pear-SOAP/Makefile
+++ b/net/pear-SOAP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:57 wiz Exp $
DISTNAME= SOAP-0.8.1
CATEGORIES+= net
@@ -13,7 +13,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTTP_Request>=1.2:../../www/pear-HTTP_Request
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_URL>=1.0:../../net/pear-Net_URL
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_DIME>=0.3:../../net/pear-Net_DIME
-PEAR_DIRRM_BASEDIR= yes
+PEAR_DIRRM_BASEDIR= yes
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/php-xmlrpc/Makefile b/net/php-xmlrpc/Makefile
index f03ef1100ea..4e4ee2b6089 100644
--- a/net/php-xmlrpc/Makefile
+++ b/net/php-xmlrpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:57 wiz Exp $
MODNAME= xmlrpc
CATEGORIES+= net
@@ -27,15 +27,15 @@ CONFIGURE_ARGS+= --with-expat-dir=${BUILDLINK_PREFIX.expat}
# or use the packaged iconv, as appropriate; using
# --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists
#
-CHECK_BUILTIN.iconv:= yes
+CHECK_BUILTIN.iconv:= yes
.include "../../converters/libiconv/builtin.mk"
-CHECK_BUILTIN.iconv:= no
+CHECK_BUILTIN.iconv:= no
.if !empty(USE_BUILTIN.iconv:M[nN][oO]) || \
!empty(BUILTIN_LIB_FOUND.iconv:M[yY][eE][sS])
-CONFIGURE_ARGS+= --with-iconv-dir=shared,${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+= --with-iconv-dir=shared,${BUILDLINK_PREFIX.iconv}
.else
-CONFIGURE_ARGS+= --with-iconv-dir
+CONFIGURE_ARGS+= --with-iconv-dir
.endif
.if ${PKG_PHP_VERSION} == 5
diff --git a/net/php5-soap/Makefile b/net/php5-soap/Makefile
index e3dfd1d85a5..e4d19c85ae0 100644
--- a/net/php5-soap/Makefile
+++ b/net/php5-soap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:55 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:57 wiz Exp $
MODNAME= soap
CATEGORIES+= net
@@ -10,7 +10,7 @@ CONFLICTS= php-soap-[0-9]*
PHP_VERSIONS_ACCEPTED= 5
-CONFIGURE_ARGS+= --enable-${MODNAME}
+CONFIGURE_ARGS+= --enable-${MODNAME}
CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_PREFIX.libxml2}
.include "../../lang/php/ext.mk"
diff --git a/net/ppp-lzs/Makefile b/net/ppp-lzs/Makefile
index dddf3e64bc7..1eccb413b69 100644
--- a/net/ppp-lzs/Makefile
+++ b/net/ppp-lzs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/01/31 00:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:57 wiz Exp $
DISTNAME= ppp-lzs-1.2
CATEGORIES= net
@@ -11,7 +11,7 @@ COMMENT= PPP daemon and LKM with Stac LZS decompression
BROKEN_IN= pkgsrc-2005Q4 pkgsrc-2006Q1 pkgsrc-2006Q4
CONFLICTS+= ppp-* ppp-mppe-*
-ONLY_FOR_PLATFORM= NetBSD-*-*
+ONLY_FOR_PLATFORM= NetBSD-*-*
.include "../../mk/bsd.prefs.mk"
diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile
index 12ca8106b7a..91de150c7c7 100644
--- a/net/py-adns/Makefile
+++ b/net/py-adns/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2006/08/13 23:32:22 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:58 wiz Exp $
#
-DISTNAME= adns-python-1.0.0
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+DISTNAME= adns-python-1.0.0
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
PKGREVISION= 2
-CATEGORIES= net python
-MASTER_SITES= http://dustman.net/andy/python/adns-python/1.0.0/
+CATEGORIES= net python
+MASTER_SITES= http://dustman.net/andy/python/adns-python/1.0.0/
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://dustman.net/andy/python/adns-python/
-COMMENT= Python interface to the GNU asynchronous DNS resolver library
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://dustman.net/andy/python/adns-python/
+COMMENT= Python interface to the GNU asynchronous DNS resolver library
PYDISTUTILSPKG=
diff --git a/net/py-dns/Makefile b/net/py-dns/Makefile
index 6c69612088b..0e782075804 100644
--- a/net/py-dns/Makefile
+++ b/net/py-dns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/02 16:17:08 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:58 wiz Exp $
DISTNAME= dnspython-1.3.3
PKGNAME= ${PYPKGPREFIX}-dns-1.3.3
@@ -12,7 +12,7 @@ COMMENT= Python DNS toolkit
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
+PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index cefb5889281..4ca205c489d 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/06/07 16:56:08 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/22 19:26:59 wiz Exp $
#
DISTNAME= pygoogle-0.6
@@ -13,7 +13,7 @@ COMMENT= Call the Google web API from Python
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
+PYTHON_VERSIONS_ACCEPTED= 24 23 22
.include "../../lang/python/extension.mk"
.include "../../net/py-soappy/buildlink3.mk"
diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common
index 3a34e59ca5c..b1437fbb168 100644
--- a/net/py-twisted/Makefile.common
+++ b/net/py-twisted/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2004/05/26 11:59:25 recht Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/02/22 19:26:59 wiz Exp $
#
TWISTED_VERSION= 1.3.0
TWISTED_DISTNAME= Twisted-${TWISTED_VERSION}
TWISTED_PKGNAME= ${TWISTED_DISTNAME:S/T/t/}
-TWISTED_MASTER_SITES= http://twisted.sourceforge.net/ \
+TWISTED_MASTER_SITES= http://twisted.sourceforge.net/ \
http://twistedmatrix.com/downloads/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 49100809d75..423a5a5952c 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:59 wiz Exp $
DISTNAME= smokeping-2.0.9
CATEGORIES= net
@@ -16,15 +16,15 @@ DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww
USE_TOOLS+= perl:run
NO_BUILD= YES
-PKG_SYSCONFSUBDIR?= smokeping
+PKG_SYSCONFSUBDIR?= smokeping
SMOKEPING_HOME= ${VARBASE}/db/smokeping
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/smokeping
-CONF_FILES= ${EGDIR}/basepage.html.dist ${PKG_SYSCONFDIR}/basepage.html
-CONF_FILES+= ${EGDIR}/smokemail.dist ${PKG_SYSCONFDIR}/smokemail
-CONF_FILES+= ${EGDIR}/config.dist ${PKG_SYSCONFDIR}/config
-CONF_FILES+= ${EGDIR}/tmail.dist ${PKG_SYSCONFDIR}/tmail
+CONF_FILES= ${EGDIR}/basepage.html.dist ${PKG_SYSCONFDIR}/basepage.html
+CONF_FILES+= ${EGDIR}/smokemail.dist ${PKG_SYSCONFDIR}/smokemail
+CONF_FILES+= ${EGDIR}/config.dist ${PKG_SYSCONFDIR}/config
+CONF_FILES+= ${EGDIR}/tmail.dist ${PKG_SYSCONFDIR}/tmail
RCD_SCRIPTS= smokeping
REPLACE_PERL= bin/smokeping.dist bin/tSmoke.dist
diff --git a/net/socket++/Makefile b/net/socket++/Makefile
index 266219e1a8a..de3691e5d00 100644
--- a/net/socket++/Makefile
+++ b/net/socket++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/05/12 07:44:26 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:26:59 wiz Exp $
#
DISTNAME= socket++-1.12.10
@@ -14,8 +14,8 @@ INFO_FILES= # PLIST
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
USE_TOOLS+= automake14
-AUTOCONF_REQD= 2.50
-GNU_CONFIGURE= YES
+AUTOCONF_REQD= 2.50
+GNU_CONFIGURE= YES
USE_TOOLS+= gmake
TEST_DIRS= ${WRKSRC}/test
TEST_TARGET= check
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index 3950ec647d5..f30b576f45c 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/01/24 17:44:02 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:59 wiz Exp $
DISTNAME= speedtouch-1.3.1
PKGREVISION= 4
@@ -31,9 +31,9 @@ RCD_SCRIPTS= adsl
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-PLIST_SUBST+= PPPOA3=""
+PLIST_SUBST+= PPPOA3=""
.else
-PLIST_SUBST+= PPPOA3="@comment "
+PLIST_SUBST+= PPPOA3="@comment "
CONFIGURE_ENV+= ac_cv_lib_pthread_pthread_create=no
.endif
diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile
index cb73fcee337..9cb18510627 100644
--- a/net/tcl-scotty/Makefile
+++ b/net/tcl-scotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:27:00 wiz Exp $
#
DISTNAME= scotty-${DIST_VERS}
@@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
DIST_VERS= 2.1.11
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib \
--enable-multicast \
--enable-gdmo --without-tk-config
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index b389b4f3f6a..2ca37bd41b0 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:35 reed Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:27:00 wiz Exp $
DISTNAME= tcpdump-3.9.4
CATEGORIES= net
-MASTER_SITES= http://www.tcpdump.org/release/
+MASTER_SITES= http://www.tcpdump.org/release/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.tcpdump.org/
diff --git a/net/tcpflow/Makefile b/net/tcpflow/Makefile
index c569250e050..3ca25a6f78b 100644
--- a/net/tcpflow/Makefile
+++ b/net/tcpflow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/01/02 19:23:40 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:00 wiz Exp $
#
DISTNAME= tcpflow-0.21
@@ -7,7 +7,7 @@ CATEGORIES= net security
MASTER_SITES= http://www.circlemud.org/pub/jelson/tcpflow/
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.circlemud.org/~jelson/software/tcpflow/
+HOMEPAGE= http://www.circlemud.org/~jelson/software/tcpflow/
COMMENT= Captures data transmitted as part of TCP connections
GNU_CONFIGURE= YES
diff --git a/net/tcpick/Makefile b/net/tcpick/Makefile
index a5d6a2a750d..4cf6e04c7b1 100644
--- a/net/tcpick/Makefile
+++ b/net/tcpick/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2006/08/09 13:58:31 ben Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:27:00 wiz Exp $
-DISTNAME= tcpick-0.2.1
+DISTNAME= tcpick-0.2.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcpick/}
diff --git a/net/teamspeak-client/Makefile b/net/teamspeak-client/Makefile
index 13424aafd7f..ce41fa0208b 100644
--- a/net/teamspeak-client/Makefile
+++ b/net/teamspeak-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/09/25 13:15:35 abs Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:27:00 wiz Exp $
PKGNAME= teamspeak-client-2.0.32.60
DISTNAME= ts2_client_rc2_2032
@@ -26,11 +26,11 @@ USE_LANGUAGES=
PLIST_SRC= ${WRKDIR}/PLIST
-RESTRICTED= Redistribution to third parties is expressly prohibited
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-LICENSE= teamspeak-license
+RESTRICTED= Redistribution to third parties is expressly prohibited
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+LICENSE= teamspeak-license
WRKSRC= ${WRKDIR}/${DISTNAME}/setup.data/image
LIB_DIR= ${PREFIX}/lib/teamspeak-client
diff --git a/net/tkined/Makefile b/net/tkined/Makefile
index 15df0a35bc1..b57947bee7b 100644
--- a/net/tkined/Makefile
+++ b/net/tkined/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:07 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:27:00 wiz Exp $
#
DISTNAME= scotty-2.1.11
@@ -14,7 +14,7 @@ COMMENT= Graphical network discovery and monitoring tool based on scotty
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib \
--with-tk-config=${BUILDLINK_PREFIX.tk}/lib \
--enable-multicast --enable-gdmo
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 7b353e5dfbc..8883d076200 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/06/05 17:29:25 minskim Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:00 wiz Exp $
DISTNAME= trafshow-5.2.1
PKGREVISION= 1
@@ -6,7 +6,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.nsk.su/pub/RinetSoftware/
EXTRACT_SUFX= .tgz
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://soft.risp.ru/trafshow/index.shtml
COMMENT= Full screen visualization of the network traffic
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 507d93c024f..daae617b482 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/09/16 12:20:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/22 19:27:00 wiz Exp $
#
DISTNAME= tsclient-0.132
@@ -10,8 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnomepro.com/tsclient/
COMMENT= GNOME2 Frontend for rdesktop
-DEPENDS+= rdesktop-[0-9]*:../../net/rdesktop
-DEPENDS+= vncviewer-[0-9]*:../../net/vncviewer
+DEPENDS+= rdesktop-[0-9]*:../../net/rdesktop
+DEPENDS+= vncviewer-[0-9]*:../../net/vncviewer
USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile
index e8f01cc7dcb..c269bea2042 100644
--- a/net/vncviewer/Makefile
+++ b/net/vncviewer/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2007/01/27 10:43:59 abs Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:27:00 wiz Exp $
-DISTNAME= vnc-4_1_2-unixsrc
+DISTNAME= vnc-4_1_2-unixsrc
PKGNAME= vncviewer-4.1.2
CATEGORIES= net x11
-MASTER_SITES= http://www.realvnc.com/dist/
+MASTER_SITES= http://www.realvnc.com/dist/
-MAINTAINER= riz@NetBSD.org
+MAINTAINER= riz@NetBSD.org
HOMEPAGE= http://www.realvnc.com/
COMMENT= Viewer for remote X and Win32 VNC servers
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index ef6ddf185c3..48b34e89421 100644
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:07 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:27:00 wiz Exp $
#
DISTNAME= vpnc-0.3.3
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake
BUILD_TARGET= vpnc
INSTALLATION_DIRS= bin ${PKGMANDIR}/man8
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES+= ${EGDIR}/vpnc.conf ${PKG_SYSCONFDIR}/vpnc.conf
CONF_FILES_PERMS+= ${EGDIR}/vpnc-script ${PKG_SYSCONFDIR}/vpnc-script ${ROOT_USER} ${ROOT_GROUP} 755
diff --git a/net/waste/Makefile b/net/waste/Makefile
index b2719f95e93..037be5dcac1 100644
--- a/net/waste/Makefile
+++ b/net/waste/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:01 wiz Exp $
#
DISTNAME= waste-source
@@ -15,14 +15,14 @@ COMMENT= Secure file sharing network
WRKSRC= ${WRKDIR}/waste
-RESTRICTED= Unclear legal status: AOL claims Nullsoft did not \
+RESTRICTED= Unclear legal status: AOL claims Nullsoft did not \
release the software at all, while others regard it as \
licensed under the GPL
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
USE_LANGUAGES= c c++
diff --git a/net/whoson/Makefile b/net/whoson/Makefile
index 53b537c4a46..3627f080734 100644
--- a/net/whoson/Makefile
+++ b/net/whoson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:01 wiz Exp $
#
DISTNAME= whoson-2.03
@@ -18,8 +18,8 @@ CONFIGURE_ARGS+= --with-config="${PKG_SYSCONFDIR}/whoson.conf"
RCD_SCRIPTS= whosond
OWN_DIRS+= ${WHOSOND_CHROOT}
-EXDIR= ${PREFIX}/share/examples/whoson
-CONF_FILES= ${EXDIR}/whoson.conf ${PKG_SYSCONFDIR}/whoson.conf
+EXDIR= ${PREFIX}/share/examples/whoson
+CONF_FILES= ${EXDIR}/whoson.conf ${PKG_SYSCONFDIR}/whoson.conf
# Run this here as whoson's 'install' target will install if not present
pre-build:
diff --git a/net/wimon/Makefile b/net/wimon/Makefile
index 56dd6ec0a7d..1e077a54822 100644
--- a/net/wimon/Makefile
+++ b/net/wimon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:08 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:01 wiz Exp $
#
DISTNAME= wimon-0.3
@@ -12,7 +12,7 @@ COMMENT= Tool that shows a real-time graph of your wireless connection
PKG_INSTALLATION_TYPES= overwrite pkgviews
-ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* OpenBSD-*-* DragonFly-*-*
+ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* OpenBSD-*-* DragonFly-*-*
# Needs net80211/*.h header files which appeared in 1.6ZD.
NOT_FOR_PLATFORM= NetBSD-0*-* NetBSD-1.[012345]*-* NetBSD-1.6[-_.]*-*
NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
diff --git a/net/wmget/Makefile b/net/wmget/Makefile
index 4d12415959c..431267a3fbc 100644
--- a/net/wmget/Makefile
+++ b/net/wmget/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2006/12/27 13:37:39 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:27:01 wiz Exp $
DISTNAME= wmget-0.6.0-src
PKGNAME= ${DISTNAME:S/-src//}
WRKSRC= ${WRKDIR}/wmget
PKGREVISION= 1
CATEGORIES= net
-MASTER_SITES= http://amtrickey.net/download/
+MASTER_SITES= http://amtrickey.net/download/
MAINTAINER= rpaulo@NetBSD.org
HOMEPAGE= http://amtrickey.net/wmget/index.html
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 476315f268d..61875035ced 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2006/06/20 22:20:10 minskim Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:27:01 wiz Exp $
DISTNAME= wu-ftpd-2.6.2
PKGREVISION= 3
CATEGORIES= net
-MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ \
+MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ \
ftp://ftp.landfield.com/wu-ftpd/wu-ftpd.org/wu-ftpd/ \
ftp://ftp.academy.rpi.edu/pub/wu-ftpd/wu-ftpd/ \
ftp://ftp.auscert.org.au/pub/mirrors/ftp.wu-ftpd.org/wu-ftpd/ \
diff --git a/net/xnap/Makefile b/net/xnap/Makefile
index 265091d8a6c..3a2403f9f78 100644
--- a/net/xnap/Makefile
+++ b/net/xnap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:26 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:01 wiz Exp $
#
DISTNAME= xnap-2.0
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://xnap.sourceforge.net/
COMMENT= Java filesharing client with support for OpenNap
-NO_BUILD= yes
+NO_BUILD= yes
INSTALLATION_DIRS= bin
diff --git a/net/yafc/Makefile b/net/yafc/Makefile
index ba3f6cfa056..16346e90be1 100644
--- a/net/yafc/Makefile
+++ b/net/yafc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/04/06 03:20:54 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:01 wiz Exp $
DISTNAME= yafc-0.7.10
PKGREVISION= 2
@@ -20,7 +20,7 @@ INFO_FILES= # PLIST
.if defined(KERBEROS)
PKG_USE_KERBEROS= yes
-CONFIGURE_ARGS+= --with-krb5 --with-krb5-include=/usr/include/krb5
+CONFIGURE_ARGS+= --with-krb5 --with-krb5-include=/usr/include/krb5
CPPFLAGS+= -I/usr/include/gssapi
LIBS+= -lcrypt -lcrypto
.endif
diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index b26e5a8bac7..aa79d166495 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/11/24 23:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:01 wiz Exp $
-DISTNAME= ytalk-3.3.0
+DISTNAME= ytalk-3.3.0
CATEGORIES= net
-MASTER_SITES= http://www.impul.se/ytalk/
+MASTER_SITES= http://www.impul.se/ytalk/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.impul.se/ytalk/index.php
diff --git a/news/cg/Makefile b/news/cg/Makefile
index 38b267ee8ff..b4e3e196dc9 100644
--- a/news/cg/Makefile
+++ b/news/cg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/20 19:18:45 schwarz Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:01 wiz Exp $
#
DISTNAME= cg-0.4
@@ -17,7 +17,7 @@ TEST_TARGET= check
.if !empty(LOWER_OPSYS:Mirix5*)
# needs regex.h
. include "../../pkgtools/libnbcompat/buildlink3.mk"
-SUBST_CLASSES+= regex_h
+SUBST_CLASSES+= regex_h
SUBST_STAGE.regex_h= post-patch
SUBST_FILES.regex_h= checkgroup.c
SUBST_SED.regex_h= -e "s,<regex\.h>,<nbcompat/regex.h>,"
diff --git a/news/inn/options.mk b/news/inn/options.mk
index c76e3f71fbd..9f00299ce9d 100644
--- a/news/inn/options.mk
+++ b/news/inn/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/01/04 10:32:40 tron Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:27:01 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.inn
PKG_SUPPORTED_OPTIONS= python
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS=
###
.if !empty(PKG_OPTIONS:Mpython)
CONFIGURE_ARGS+= --with-python
-CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q}
+CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q}
.include "../../lang/python/application.mk"
.endif
diff --git a/news/trn/Makefile b/news/trn/Makefile
index cf86a0b4cfc..49bb1187bd7 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/01/07 09:14:08 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:02 wiz Exp $
DISTNAME= trn-4.0-test76
PKGNAME= trn-4.76
@@ -7,7 +7,7 @@ CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=trn/} \
ftp://trn.sourceforge.net/pub/trn/
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://trn.sourceforge.net/
COMMENT= Threaded version of rn, the classic news reader
diff --git a/parallel/pvm3/arch.mk b/parallel/pvm3/arch.mk
index fb898f5dfa8..71cf80c07f9 100644
--- a/parallel/pvm3/arch.mk
+++ b/parallel/pvm3/arch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: arch.mk,v 1.10 2006/06/15 15:32:35 joerg Exp $
+# $NetBSD: arch.mk,v 1.11 2007/02/22 19:27:02 wiz Exp $
#
.include "../../mk/bsd.prefs.mk"
@@ -24,7 +24,7 @@ _PVM_ARCH= # empty
. endif
.elif ${OPSYS} == "SunOS"
. if !empty(MACHINE_ARCH:Mi386*) || !empty(MACHINE_ARCH:Mx86_64*)
-_PVM_OPSYS= X86
+_PVM_OPSYS= X86
. else
_PVM_OPSYS= SUN4
. endif
@@ -32,7 +32,7 @@ _PVM_ARCH= SOL2 # Solaris (SunOS 5.*)
.elif ${OPSYS} == "Darwin"
_PVM_OPSYS= DARWIN
_PVM_ARCH= # empty
-.elif ${OPSYS} == "DragonFly"
+.elif ${OPSYS} == "DragonFly"
_PVM_OPSYS= DRAGONFLY
_PVM_ARCH= # empty
.elif ${OPSYS} == "FreeBSD"
diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile
index 28b8f904534..6a8578b29ee 100644
--- a/pkgtools/cdpack/Makefile
+++ b/pkgtools/cdpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/01/07 09:14:08 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:27:02 wiz Exp $
#
DISTNAME= cdpack-1.7
@@ -15,8 +15,8 @@ COMMENT= Utility to create multi-cd binary package collections
DEPENDS+= cdrtools-[0-9]*:../../sysutils/cdrtools
WRKSRC= ${WRKDIR}
-NO_CHECKSUM= yes
-NO_CONFIGURE= yes
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
USE_TOOLS+= awk:run
USE_TOOLS+= expr:run
diff --git a/pkgtools/genrpm/Makefile b/pkgtools/genrpm/Makefile
index bf15679efa8..02a10ae8991 100644
--- a/pkgtools/genrpm/Makefile
+++ b/pkgtools/genrpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:08 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:27:02 wiz Exp $
DISTNAME= genrpm-1.0
PKGREVISION= 1
@@ -16,7 +16,7 @@ DEPENDS+= rpm-[0-9]*:../../misc/rpm
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
-NO_CHECKSUM= yes
+NO_CHECKSUM= yes
INSTALLATION_DIRS= ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin
diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile
index 9470ab10b68..1a707026d95 100644
--- a/pkgtools/libkver/Makefile
+++ b/pkgtools/libkver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/05/31 22:10:30 seb Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:27:02 wiz Exp $
DISTNAME= libkver-${VERSION}
CATEGORIES= pkgtools
@@ -24,7 +24,7 @@ BUILDLINK_PASSTHRU_DIRS= ${BSDSRCDIR}/sys
.include "../../mk/bsd.prefs.mk"
-LDD_SYSCTL!= ldd /sbin/sysctl 2>&1
+LDD_SYSCTL!= ldd /sbin/sysctl 2>&1
MAKE_ENV+= LDD_SYSCTL=${LDD_SYSCTL:Q} # save another ldd run
.if empty(LDD_SYSCTL:M*libc*)
PLIST_SUBST+= HAS_SYSCTL=
diff --git a/pkgtools/p5-pkgsrc-Dewey/Makefile b/pkgtools/p5-pkgsrc-Dewey/Makefile
index 030c534e6ca..d024ead3910 100644
--- a/pkgtools/p5-pkgsrc-Dewey/Makefile
+++ b/pkgtools/p5-pkgsrc-Dewey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/11/14 16:11:10 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:02 wiz Exp $
DISTNAME= p5-pkgsrc-Dewey-1.0
PKGREVISION= 1
@@ -17,7 +17,7 @@ NO_CHECKSUM= yes
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
-PERL5_PACKLIST= auto/pkgsrc/Dewey/.packlist
+PERL5_PACKLIST= auto/pkgsrc/Dewey/.packlist
PKG_INSTALL_FILESDIR= ../../pkgtools/pkg_install/files
PKG_INSTALL_FILES= lib/dewey.c lib/dewey.h lib/defs.h
diff --git a/pkgtools/pkg_select/Makefile b/pkgtools/pkg_select/Makefile
index b17620037c6..4c62efb85cb 100644
--- a/pkgtools/pkg_select/Makefile
+++ b/pkgtools/pkg_select/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/10/03 20:53:38 reed Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:02 wiz Exp $
#
DISTNAME= pkg_select-20050817
@@ -11,7 +11,7 @@ COMMENT= Curses based pkgsrc system browser / manager
PKG_INSTALLATION_TYPES= overwrite pkgviews
-ONLY_FOR_PLATFORM= NetBSD-*-* FreeBSD-*-* Darwin-*-* DragonFly-*-*
+ONLY_FOR_PLATFORM= NetBSD-*-* FreeBSD-*-* Darwin-*-* DragonFly-*-*
WRKSRC= ${WRKDIR}/pkg_select
NO_CONFIGURE= yes
@@ -41,7 +41,7 @@ SUBST_SED.path= -e "s|/usr/pkgsrc|${PKGSRCDIR}|g" \
-e "s|/usr/pkg|${PREFIX}|g" \
-e "s|/var/db/pkg|${PKG_DBDIR}|g" \
-e "s|/usr/bin/make|${MAKE}|g"
-SUBST_MESSAGE.path= Adjusting path.
+SUBST_MESSAGE.path= Adjusting path.
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkg_tarup/Makefile b/pkgtools/pkg_tarup/Makefile
index 34a4df130e9..81d2747d7c9 100644
--- a/pkgtools/pkg_tarup/Makefile
+++ b/pkgtools/pkg_tarup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/10/29 07:50:27 erh Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:27:02 wiz Exp $
DISTNAME= pkg_tarup-1.6.6
CATEGORIES= pkgtools
@@ -10,7 +10,7 @@ COMMENT= Generates binary package(s) from installed pkg(s)
WRKSRC= ${WRKDIR}
EXTRACT_ONLY= # empty
-NO_CHECKSUM= yes
+NO_CHECKSUM= yes
NO_BUILD= yes
NO_MTREE= yes
USE_LANGUAGES= # none
diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile
index 9bb6fcd9b0a..613316772fb 100644
--- a/pkgtools/pkgclean/Makefile
+++ b/pkgtools/pkgclean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:09 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:02 wiz Exp $
DISTNAME= pkgclean-20051116
CATEGORIES= pkgtools
@@ -24,10 +24,10 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/pkgclean.1 ${PREFIX}/${PKGMANDIR}/man1/pkgclean.1
SUBST_CLASSES+= path
-SUBST_STAGE.path= post-patch
-SUBST_FILES.path= pkgclean.sh pkgclean.1
+SUBST_STAGE.path= post-patch
+SUBST_FILES.path= pkgclean.sh pkgclean.1
SUBST_SED.path+= -e 's,@SH@,${SH},g'
SUBST_SED.path+= -e 's,@PKGSRCDIR@,${PKGSRCDIR},g'
-SUBST_MESSAGE.path= Adjusting pkgsrc directory.
+SUBST_MESSAGE.path= Adjusting pkgsrc directory.
.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkgsurvey/Makefile b/pkgtools/pkgsurvey/Makefile
index 5af64943e05..af98e9190d5 100644
--- a/pkgtools/pkgsurvey/Makefile
+++ b/pkgtools/pkgsurvey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:02 wiz Exp $
#
DISTNAME= pkgsurvey-0.0
@@ -10,8 +10,8 @@ MAINTAINER= agc@pkgsrc.org
COMMENT= Utility to collate pkg information, and mail to central census site
WRKSRC= ${WRKDIR}
-NO_CHECKSUM= yes
-NO_CONFIGURE= yes
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
NO_BUILD= yes
INSTALLATION_DIRS= bin
diff --git a/pkgtools/prereq-readme/Makefile b/pkgtools/prereq-readme/Makefile
index 225f1f090ff..643ded451b8 100644
--- a/pkgtools/prereq-readme/Makefile
+++ b/pkgtools/prereq-readme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/07/28 02:41:07 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:27:03 wiz Exp $
#
DISTNAME= prereq-readme-20050521
@@ -12,10 +12,10 @@ COMMENT= Tools required for pkgsrc README.html generation
WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
-NO_CONFIGURE= yes
-NO_BUILD= yes
-NO_INSTALL= # defined
-NO_PACKAGE= # defined
+NO_CONFIGURE= yes
+NO_BUILD= yes
+NO_INSTALL= # defined
+NO_PACKAGE= # defined
# list all the tools we use
USE_TOOLS+= awk
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 045f391cd10..ac8b0dfc732 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/11/27 13:18:10 obache Exp $
+# $NetBSD: Makefile,v 1.53 2007/02/22 19:27:03 wiz Exp $
DISTNAME= acroread # Overridden below
PKGNAME= acroread-4.05
@@ -41,7 +41,7 @@ WRKSRC= ${WRKDIR}/ILINXR.install
PKG_FAIL_REASON+= '${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)'
. endif
DISTNAME= fdec-rs-405
-PLATFORM= alphaosf
+PLATFORM= alphaosf
WRKSRC= ${WRKDIR}/AOSFRS.install
. elif (${MACHINE_ARCH} == "sparc")
. if !exists(/emul/svr4/usr/lib/ld.so)
diff --git a/print/bibtool/Makefile b/print/bibtool/Makefile
index ccad153eea2..d491cb7e7e4 100644
--- a/print/bibtool/Makefile
+++ b/print/bibtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/09/09 02:46:08 obache Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:03 wiz Exp $
DISTNAME= BibTool-2.48
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=biblio/bibtex/utils/bibtool/}
@@ -20,8 +20,8 @@ REPLACE_PERL+= Perl/bibtool.pl
DOCDIR= ${LOCALBASE}/share/doc/BibTool
EXAMPLEDIR= ${LOCALBASE}/share/examples/BibTool
-TEX_ACCEPTED= teTeX3
-TEX_DEPMETHOD= build
+TEX_ACCEPTED= teTeX3
+TEX_DEPMETHOD= build
.include "../../mk/tex.buildlink3.mk"
#pre-configure:
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 1e0344f7bb0..d0e7188de32 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/10 00:27:30 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:27:03 wiz Exp $
.include "Makefile.common"
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --disable-file-converter-check
EVAL_PREFIX+= CUPS_PREFIX=cups
CUPS_FILTERDIR= ${CUPS_PREFIX:Q}/libexec/cups/filter
-CONFIGURE_ENV+= CUPS_FILTERS=${CUPS_FILTERDIR}
+CONFIGURE_ENV+= CUPS_FILTERS=${CUPS_FILTERDIR}
FILES_SUBST+= CUPS_FILTERDIR=${CUPS_FILTERDIR}
TEXTTOPS_DEPENDS= {a2ps,enscript,mpage}-[0-9]*
@@ -29,11 +29,11 @@ PKG_SUPPORTED_OPTIONS= cups
.include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+= MANINSTALL
+BUILD_DEFS+= MANINSTALL
.if ${OPSYS} == "SunOS"
# SunOS nroff has problems with foomatic-rip.1
-MANINSTALL= none
+MANINSTALL= none
INSTALL_TARGET= install-bin
.else
INSTALL_TARGET= install-bin install-man
diff --git a/print/ghostscript-esp/Makefile b/print/ghostscript-esp/Makefile
index 8607dfbd83b..e404211a9e4 100644
--- a/print/ghostscript-esp/Makefile
+++ b/print/ghostscript-esp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/04 21:56:34 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:27:03 wiz Exp $
DISTNAME= espgs-${GS_VERS}-source
PKGNAME= ghostscript-esp-${GS_VERS}
@@ -14,8 +14,8 @@ ESP_SITES= http://ftp.easysw.com/pub/ghostscript/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/ \
ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/ \
http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/
-MASTER_SITES= ${ESP_SITES:=${GS_VERS}/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${ESP_SITES:=${GS_VERS}/}
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= jlam@pkgsrc.org
COMMENT= ESP/CUPS Postscript interpreter
@@ -88,7 +88,7 @@ post-extract:
${RM} -f ${WRKSRC}/jpeg
${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
-SUBST_CLASSES+= ps2epsi-sh
+SUBST_CLASSES+= ps2epsi-sh
SUBST_MESSAGE.ps2epsi-sh= Fixing ps2epsi shell.
SUBST_FILES.ps2epsi-sh= lib/ps2epsi
SUBST_SED.ps2epsi-sh= -e 's|/bin/sh|${SH}|'
diff --git a/print/ghostscript-esp/options.mk b/print/ghostscript-esp/options.mk
index dce6e6e882d..f1bb99d847c 100644
--- a/print/ghostscript-esp/options.mk
+++ b/print/ghostscript-esp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/02/19 18:02:07 joerg Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:27:03 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript-esp
PKG_SUPPORTED_OPTIONS= x11 cups
@@ -12,7 +12,7 @@ CONFIGURE_ARGS+= --with-x
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.else
-CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+= --without-x
.endif
.if !empty(PKG_OPTIONS:Mcups)
diff --git a/print/mp/Makefile b/print/mp/Makefile
index 0424aaee7e2..0103cc3a4ca 100644
--- a/print/mp/Makefile
+++ b/print/mp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/01/15 17:49:45 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:03 wiz Exp $
#
DISTNAME= mpdist-3.7.1
@@ -7,7 +7,7 @@ PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpdist/}
-MAINTAINER= kim@tac.nyc.ny.us
+MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://mpdist.sourceforge.net/
COMMENT= PostScript pretty printer
diff --git a/print/pcps/Makefile b/print/pcps/Makefile
index 14b247a15c6..6c92462e647 100644
--- a/print/pcps/Makefile
+++ b/print/pcps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:09 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:03 wiz Exp $
#
DISTNAME= pcps840
@@ -17,7 +17,7 @@ BUILD_TARGET=
MAKE_ENV+= "CC=${CC} ${CFLAGS} -DUNIX"
NO_CONFIGURE= yes
-LICENSE= pcps-license
+LICENSE= pcps-license
RESTRICTED= This is shareware for your evaluation and subsequent payment
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index a67844fe9a4..75d86b107f2 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/28 00:14:46 dillo Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:05 wiz Exp $
#
.include "../../print/poppler/Makefile.common"
@@ -12,7 +12,7 @@ CONFLICTS+= poppler<0.4.5nb1
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.in
+PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.in
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
# Build the cairo graphics backend, required by glib.
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile
index 1a24cf8a997..31366d30c18 100644
--- a/print/poppler-utils/Makefile
+++ b/print/poppler-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/05/31 18:13:54 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:05 wiz Exp $
#
.include "../../print/poppler/Makefile.common"
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --disable-gtk-test
# Don't compile GLib wrapper which also needs gtk2
CONFIGURE_ARGS+= --disable-poppler-glib
# Enable build and install of the tools
-CONFIGURE_ARGS+= --enable-utils # the default
+CONFIGURE_ARGS+= --enable-utils # the default
BUILD_DIRS= utils # implies INSTALL_DIRS too
diff --git a/print/psjoin/Makefile b/print/psjoin/Makefile
index aa5912591b8..85aa643c922 100644
--- a/print/psjoin/Makefile
+++ b/print/psjoin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/04 21:30:31 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:27:05 wiz Exp $
#
DISTNAME= psjoin
@@ -17,7 +17,7 @@ REPLACE_PERL= psjoin
USE_TOOLS+= perl:run
WRKSRC= ${WRKDIR}
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS= bin
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/psjoin ${PREFIX}/bin/psjoin
diff --git a/print/py-reportlab-renderPM/Makefile b/print/py-reportlab-renderPM/Makefile
index e914190345d..c7f047323bc 100644
--- a/print/py-reportlab-renderPM/Makefile
+++ b/print/py-reportlab-renderPM/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:31 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:06 wiz Exp $
#
DISTNAME= renderPM-0-9
PKGNAME= ${PYPKGPREFIX}-reportlab-renderPM-0.9
PKGREVISION= 2
CATEGORIES= print python
-MASTER_SITES= http://www.reportlab.com/ftp/
+MASTER_SITES= http://www.reportlab.com/ftp/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index fb244cc6d49..a038e536621 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:06 wiz Exp $
#
DISTNAME= ReportLab_1_20
PKGNAME= ${PYPKGPREFIX}-reportlab-1.20
PKGREVISION= 2
CATEGORIES= print python
-MASTER_SITES= ftp://ftp.reportlab.com/
+MASTER_SITES= ftp://ftp.reportlab.com/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 761dfbd1e18..b0a649aee38 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/01/11 19:19:01 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2007/02/22 19:27:06 wiz Exp $
DISTNAME= scribus-1.3.3.7
CATEGORIES= print
@@ -18,7 +18,7 @@ USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= # empty
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} \
+CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} \
--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
# XXX should work with other Python versions, but there are
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index eba92af57f3..564b07d44eb 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/17 13:46:46 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:27:06 wiz Exp $
.include "../../print/pdflib/Makefile.common"
@@ -9,9 +9,9 @@ COMMENT= Tcl interface to PDFlib for generating PDF files
BUILDLINK_API_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS}
CONFIGURE_ARGS+= --with-tcl=${TCLSH:Q}
-CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
-CONFIGURE_ARGS+= --with-tclpkg="${PREFIX}/lib/tcl8.4"
-TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
+CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
+CONFIGURE_ARGS+= --with-tclpkg="${PREFIX}/lib/tcl8.4"
+TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
DIRS_TO_BUILD= bind/tcl
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 4daf7cd9fb1..3147104c40b 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/11/05 17:34:44 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2007/02/22 19:27:06 wiz Exp $
#
DISTNAME= teTeX-3.0
@@ -17,10 +17,10 @@ DEPENDS+= texi2html>=1.52:../../textproc/texi2html
CONFLICTS+= teTeX2-[0-9]*
-EXTRACT_ONLY= # empty
-NO_CHECKSUM= yes
-NO_CONFIGURE= yes
-NO_BUILD= yes
+EXTRACT_ONLY= # empty
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
do-install: # do nothing
diff --git a/print/tex-bagpipetex/Makefile b/print/tex-bagpipetex/Makefile
index 72d3cb16d65..665d34cefc7 100644
--- a/print/tex-bagpipetex/Makefile
+++ b/print/tex-bagpipetex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:06 wiz Exp $
#
DISTNAME= bagpipetex-3.01
@@ -14,10 +14,10 @@ COMMENT= MusixTeX macros to typeset bagpipe music
DEPENDS+= tex-musixtex>=112:../../print/tex-musixtex
-WRKSRC= ${WRKDIR}
-NO_CONFIGURE= yes
+WRKSRC= ${WRKDIR}
+NO_CONFIGURE= yes
-TEXMF_CNF= ${LOCALBASE}/share/texmf/web2c/texmf.cnf
+TEXMF_CNF= ${LOCALBASE}/share/texmf/web2c/texmf.cnf
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/texmf/doc/bagpipetex
diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index e6d770355e4..5b64748c6de 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/01/07 09:14:09 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:06 wiz Exp $
#
DISTNAME= musixtex-112
@@ -20,9 +20,9 @@ USE_DIRS+= texmf-1.0
.include "../../mk/bsd.prefs.mk"
.if exists(${LOCALBASE}/bin/initex)
-INITEX= initex # teTeX2
+INITEX= initex # teTeX2
.else
-INITEX= tex -ini # teTeX3
+INITEX= tex -ini # teTeX3
.endif
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/regress/make-env-phases/Makefile b/regress/make-env-phases/Makefile
index 1def4782a82..877b7f60ee5 100644
--- a/regress/make-env-phases/Makefile
+++ b/regress/make-env-phases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/09/06 03:37:14 ben Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:06 wiz Exp $
#
DISTNAME= make-env-phases-1.0
@@ -10,8 +10,8 @@ MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Tests whether MAKE_ENV changes between build and install phase
NO_CHECKSUM= yes
-NO_CONFIGURE= yes
-NO_PACKAGE= yes
+NO_CONFIGURE= yes
+NO_PACKAGE= yes
WRKSRC= ${WRKDIR}
do-build:
diff --git a/security/AiSSLtelnet/Makefile b/security/AiSSLtelnet/Makefile
index efa9707a3bb..8b8306927d9 100644
--- a/security/AiSSLtelnet/Makefile
+++ b/security/AiSSLtelnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/22 09:22:14 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:06 wiz Exp $
#
DISTNAME= AiSSLtelnet-0.15
@@ -12,11 +12,11 @@ COMMENT= SSL Telnet based on AiSSL
GNU_CONFIGURE= YES
-RESTRICTED= Source code redistribution is not permitted.consult okuno@mars.elcom.nitech.ac.jp.
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
+RESTRICTED= Source code redistribution is not permitted.consult okuno@mars.elcom.nitech.ac.jp.
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
-WRKSRC= ${WRKDIR}/AiSSLtelnet
+WRKSRC= ${WRKDIR}/AiSSLtelnet
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/AiSSLtelnet
diff --git a/security/aide/Makefile b/security/aide/Makefile
index 16f8e8ea8b4..0524d09b698 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2006/07/21 20:26:45 minskim Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/22 19:27:06 wiz Exp $
#
-DISTNAME= aide-0.10
+DISTNAME= aide-0.10
PKGREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aide/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aide/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cs.tut.fi/~rammer/aide.html
diff --git a/security/aide06/Makefile b/security/aide06/Makefile
index 3f3bdf25947..8874bacfc02 100644
--- a/security/aide06/Makefile
+++ b/security/aide06/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:33 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:06 wiz Exp $
#
-DISTNAME= aide-0.6
+DISTNAME= aide-0.6
PKGREVISION= 1
CATEGORIES= security
-MASTER_SITES= ftp://ftp.cs.tut.fi/pub/src/gnu/
+MASTER_SITES= ftp://ftp.cs.tut.fi/pub/src/gnu/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cs.tut.fi/~rammer/aide.html
diff --git a/security/amap/Makefile b/security/amap/Makefile
index 294bf06fb38..8ed407c71e7 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2006/10/30 14:07:28 adrianp Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:06 wiz Exp $
#
-DISTNAME= amap-5.2
-CATEGORIES= net security
-MASTER_SITES= http://thc.segfault.net/releases/ \
+DISTNAME= amap-5.2
+CATEGORIES= net security
+MASTER_SITES= http://thc.segfault.net/releases/ \
http://www.thc.org/releases/
-MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://thc.org.segfault.net/thc-amap/
-COMMENT= Applications and Services scanner
+MAINTAINER= adrianp@NetBSD.org
+HOMEPAGE= http://thc.org.segfault.net/thc-amap/
+COMMENT= Applications and Services scanner
HAS_CONFIGURE= YES
@@ -26,12 +26,12 @@ SUBST_CLASSES+= conf
SUBST_FILES.conf= configure
SUBST_STAGE.conf= pre-configure
SUBST_SED.conf= -e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.conf+= -e 's|@MANDIR@|${PREFIX}/man|g'
-SUBST_SED.conf+= -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
-SUBST_SED.conf+= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
-SUBST_SED.conf+= -e "s|@UNAME@|${UNAME}|g"
-SUBST_SED.conf+= -e "s|@GREP@|${GREP}|g"
-SUBST_SED.conf+= -e "s|@SED@|${SED}|g"
+SUBST_SED.conf+= -e 's|@MANDIR@|${PREFIX}/man|g'
+SUBST_SED.conf+= -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
+SUBST_SED.conf+= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
+SUBST_SED.conf+= -e "s|@UNAME@|${UNAME}|g"
+SUBST_SED.conf+= -e "s|@GREP@|${GREP}|g"
+SUBST_SED.conf+= -e "s|@SED@|${SED}|g"
SUBST_MESSAGE.conf= Fixing configure script.
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 7e72064d74d..feaae237bc3 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/02/09 02:39:40 obache Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:07 wiz Exp $
DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL}
PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -69,7 +69,7 @@ PKG_SUPPORTED_OPTIONS= milter
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mmilter)
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-runtime-dir=${AMAVIS_DIR:Q}
CONFIGURE_ARGS+= --with-sockname=${AMAVIS_DIR}/amavisd.sock
CONFIGURE_ARGS+= --with-user=${AMAVIS_USER:Q}
@@ -81,7 +81,7 @@ RCD_SCRIPTS+= amavismilter
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.milter
PLIST_SUBST+= MILTER=
-PTHREAD_OPTS+= require native # doesn't work with pth
+PTHREAD_OPTS+= require native # doesn't work with pth
. include "../../mail/libmilter/buildlink3.mk"
. include "../../mk/pthread.buildlink3.mk"
.else
diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile
index f7be9754c1a..72abd1a08b3 100644
--- a/security/ap-modsecurity2/Makefile
+++ b/security/ap-modsecurity2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/05 18:05:33 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:07 wiz Exp $
DISTNAME= modsecurity-apache_2.0.3
PKGNAME= ${APACHE_PKG_PREFIX}-modsecurity-2.0.3
@@ -24,7 +24,7 @@ BUILDLINK_API_DEPENDS.apache+= apache>=2.0.59nb2
SUBST_CLASSES= make
SUBST_STAGE.make= post-patch
SUBST_FILES.make= apache2/Makefile
-SUBST_SED.make= -e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.make= -e "s|@PREFIX@|${PREFIX}|g"
SUBST_MESSAGE.make= Fixing Makefiles.
.if !empty(PKG_OPTIONS:Mxml)
diff --git a/security/crypto++/Makefile b/security/crypto++/Makefile
index 0b66f382910..de228dc7621 100644
--- a/security/crypto++/Makefile
+++ b/security/crypto++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/09/09 02:46:08 obache Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:07 wiz Exp $
#
DISTNAME= cryptopp521
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.eskimo.com/~weidai/ \
${MASTER_SITE_SOURCEFORGE:=cryptopp/} \
http://gd.tuwien.ac.at/privacy/crypto/libs/cryptlib/ \
http://www.mirrors.wiretapped.net/security/cryptography/libraries/cryptolib/
-EXTRACT_SUFX= .zip
+EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cryptopp.com/
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 5f1a6f0054b..032f3b8571a 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/11/02 13:02:39 obache Exp $
+# $NetBSD: Makefile,v 1.54 2007/02/22 19:27:07 wiz Exp $
.include "Makefile.common"
@@ -32,7 +32,7 @@ BUILD_DEFS+= SASLSOCKETDIR
# plaintext password authentication.
#
AUTHDAEMONVAR?= ${VARBASE}/authdaemon
-CONFIGURE_ARGS+= --with-authdaemond=${AUTHDAEMONVAR}/socket
+CONFIGURE_ARGS+= --with-authdaemond=${AUTHDAEMONVAR}/socket
BUILD_DEFS+= AUTHDAEMONVAR
# Support using APOP against a POP server for plaintext password
diff --git a/security/fragroute/Makefile b/security/fragroute/Makefile
index 350cefb83f7..91b39e0af58 100644
--- a/security/fragroute/Makefile
+++ b/security/fragroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/11 05:22:24 tv Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:07 wiz Exp $
DISTNAME= fragroute-1.2
PKGREVISION= 4
@@ -7,7 +7,7 @@ MASTER_SITES= http://monkey.org/~dugsong/fragroute/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.monkey.org/~dugsong/fragroute/
-COMMENT= Tool for intercepting, modifying and rewriting egress traffic
+COMMENT= Tool for intercepting, modifying and rewriting egress traffic
GNU_CONFIGURE= YES
diff --git a/security/gnupg/hacks.mk b/security/gnupg/hacks.mk
index ed619453afb..3d2ac664f8a 100644
--- a/security/gnupg/hacks.mk
+++ b/security/gnupg/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: hacks.mk,v 1.4 2007/02/22 19:27:07 wiz Exp $
.if !defined(GNUPG_HACKS_MK)
GNUPG_HACKS_MK= # defined
@@ -7,8 +7,8 @@ GNUPG_HACKS_MK= # defined
### drop any -mcpu flag
###
.if ${MACHINE_ARCH} == "sparc"
-PKG_HACKS+= mcpu
-BUILDLINK_TRANSFORM+= rm:-mcpu=.*
+PKG_HACKS+= mcpu
+BUILDLINK_TRANSFORM+= rm:-mcpu=.*
.endif
.endif
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 771909d5ee5..56511c71af2 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:27:07 wiz Exp $
#
DISTNAME= gss-0.0.15
@@ -19,6 +19,6 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
INFO_FILES= # PLIST
-PKGCONFIG_OVERRIDE+= gss.pc.in
+PKGCONFIG_OVERRIDE+= gss.pc.in
.include "../../mk/bsd.pkg.mk"
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 9adbf14730a..a992acb3d30 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/10/25 17:12:18 bad Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:27:07 wiz Exp $
DISTNAME= ipsec-tools-0.6.6
CATEGORIES= security
@@ -15,7 +15,7 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKG_OPTIONS_VAR= PKG_OPTIONS.ipsec-tools
+PKG_OPTIONS_VAR= PKG_OPTIONS.ipsec-tools
PKG_SUPPORTED_OPTIONS= radius
PKG_SUGGESTED_OPTIONS= radius
diff --git a/security/libdes/Makefile b/security/libdes/Makefile
index 56255961ebf..006810d5ccc 100644
--- a/security/libdes/Makefile
+++ b/security/libdes/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:07 wiz Exp $
DISTNAME= libdes-4.04b
CATEGORIES= security
-MASTER_SITES= ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/
+MASTER_SITES= ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/
MAINTAINER= refling@comet.lbl.gov
COMMENT= Small DES (Data Encryption Standard) lib & standalone program
-WRKSRC= ${WRKDIR}/des
+WRKSRC= ${WRKDIR}/des
CRYPTO= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index 3ee785f82f9..5f9d339f1e4 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/25 14:39:03 shannonjr Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:07 wiz Exp $
#
DISTNAME= libpreludedb-0.9.10
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+= -enable-mysql
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --enable-python
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
-CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}
+CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}
CONFIGURE_ARGS+= --with-pgsql=no
LDFLAGS+= ${BUILDLINK_LDFLAGS.mysql-client}
PYBINMODULE= yes
diff --git a/security/mirrordir/Makefile b/security/mirrordir/Makefile
index c25bb94811a..647425c824c 100644
--- a/security/mirrordir/Makefile
+++ b/security/mirrordir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 21:58:14 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:07 wiz Exp $
#
DISTNAME= mirrordir-0.10.49
@@ -17,6 +17,6 @@ USE_LIBTOOL= yes
EGDIR= ${PREFIX}/share/examples/mirrordir
-CONF_FILES= ${EGDIR}/secure-mcservusers ${PKG_SYSCONFDIR}/secure-mcservusers
+CONF_FILES= ${EGDIR}/secure-mcservusers ${PKG_SYSCONFDIR}/secure-mcservusers
.include "../../mk/bsd.pkg.mk"
diff --git a/security/mit-krb5/builtin.mk b/security/mit-krb5/builtin.mk
index 05555451474..7e5b7f9cfb6 100644
--- a/security/mit-krb5/builtin.mk
+++ b/security/mit-krb5/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/04/10 18:05:16 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2007/02/22 19:27:08 wiz Exp $
BUILTIN_PKG:= mit-krb5
@@ -35,7 +35,7 @@ BUILTIN_VERSION.mit-krb5!= ${SH_KRB5_CONFIG} --version | \
BUILTIN_VERSION.mit-krb5?= 1.4.0
BUILTIN_PKG.mit-krb5= mit-krb5-${BUILTIN_VERSION.mit-krb5}
.endif
-MAKEVARS+= BUILTIN_PKG.mit-krb5
+MAKEVARS+= BUILTIN_PKG.mit-krb5
###
### Determine whether we should use the built-in implementation if it
diff --git a/security/mixminion/Makefile b/security/mixminion/Makefile
index 1b8d618a512..8324dc3b297 100644
--- a/security/mixminion/Makefile
+++ b/security/mixminion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/06 06:22:43 reed Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:08 wiz Exp $
#
DISTNAME= Mixminion-0.0.7.1
@@ -14,7 +14,7 @@ COMMENT= Mixminion impedes message traffic analysis
BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7d
CRYPTO= YES
-PYTHON_VERSIONS_ACCEPTED= 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 23 22 21
PYDISTUTILSPKG= YES
TEST_TARGET= test
diff --git a/security/nfsbug/Makefile b/security/nfsbug/Makefile
index c56318ba29c..2f686a02ec9 100644
--- a/security/nfsbug/Makefile
+++ b/security/nfsbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/28 22:07:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:27:08 wiz Exp $
DISTNAME= nfsshell-1.0
PKGREVISION= 1
@@ -10,7 +10,7 @@ DISTFILES= nfsBugFerret.tgz \
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= NFS security verification suite
-EXTRACT_ONLY= nfsBugFerret.tgz
+EXTRACT_ONLY= nfsBugFerret.tgz
WRKSRC= ${WRKDIR}/nfsbug
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index c450c6e3ff1..78474dd63fc 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/07/05 20:53:11 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:27:08 wiz Exp $
# NOTE: This package is modeled on ../openssh, but does not share
# files with it as that package may update faster than the gssapi
@@ -15,8 +15,8 @@ MASTER_SITES= ftp://ftp7.usa.openbsd.org/pub/os/OpenBSD/OpenSSH/portable/ \
ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
ftp://gd.tuwien.ac.at/opsys/OpenBSD/OpenSSH/portable/ \
ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/old/
-PATCH_SITES= http://www.sxw.org.uk/computing/patches/
-PATCHFILES= openssh-3.6.1p2-gssapi-20030430.diff
+PATCH_SITES= http://www.sxw.org.uk/computing/patches/
+PATCHFILES= openssh-3.6.1p2-gssapi-20030430.diff
PATCH_DIST_STRIP= -p1
# Don't delete the last entry -- it's there if the pkgsrc version is not
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index a9eef0f2193..f9e886490e5 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.176 2007/01/20 10:03:39 taca Exp $
+# $NetBSD: Makefile,v 1.177 2007/02/22 19:27:08 wiz Exp $
DISTNAME= openssh-4.5p1
PKGNAME= openssh-4.5.1
@@ -53,7 +53,7 @@ LIBS+= -lbind -ldb -lcrypt
.else # not Interix
-PKG_GROUPS= ${OPENSSH_GROUP}
+PKG_GROUPS= ${OPENSSH_GROUP}
PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP}
PKG_GECOS.${OPENSSH_USER}= sshd privsep pseudo-user
diff --git a/security/openssh/options.mk b/security/openssh/options.mk
index 4b06e08de53..2c6d283edf6 100644
--- a/security/openssh/options.mk
+++ b/security/openssh/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2007/01/20 10:03:39 taca Exp $
+# $NetBSD: options.mk,v 1.12 2007/02/22 19:27:08 wiz Exp $
.include "../../mk/bsd.prefs.mk"
@@ -13,7 +13,7 @@ PKG_SUPPORTED_OPTIONS+= pam
.if !empty(PKG_OPTIONS:Mkerberos)
. include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q}
+CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q}
.endif
.if !empty(PKG_OPTIONS:Mhpn-patch)
diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index c798453222b..379ad87baf9 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.20 2006/08/09 11:23:20 abs Exp $
+# $NetBSD: builtin.mk,v 1.21 2007/02/22 19:27:08 wiz Exp $
BUILTIN_PKG:= openssl
@@ -59,7 +59,7 @@ BUILTIN_VERSION.openssl!= \
#
# If the native OpenSSL contains the security fixes pulled up to the
# netbsd-1-6 branch on 2003-11-07, then pretend it's openssl-0.9.6l.
-#
+#
BUILTIN_OPENSSL_HAS_20031107_FIX!= \
${AWK} 'BEGIN { ans = "no" } \
/OPENSSL_HAS_20031107_FIX/ { ans = "yes" } \
@@ -71,7 +71,7 @@ BUILTIN_VERSION.openssl= 0.9.6l
#
# If the native OpenSSL contains the security fixes pulled up to the
# netbsd-1-6 branch on 2004-04-01, then pretend it's openssl-0.9.6m.
-#
+#
BUILTIN_OPENSSL_HAS_20040401_FIX!= \
${AWK} 'BEGIN { ans = "no" } \
/OPENSSL_HAS_20040401_FIX/ { ans = "yes" } \
@@ -86,7 +86,7 @@ BUILTIN_VERSION.openssl= 0.9.6m
# If the native OpenSSL contains the security fixes pulled up to the
# netbsd-2-0, netbsd-2, and netbsd-3-0 branches on 2005-10-11, then
# pretend it's openssl-0.9.7h.
-#
+#
BUILTIN_OPENSSL_HAS_20051011_FIX!= \
${AWK} 'BEGIN { ans = "no" } \
/OPENSSL_HAS_20051011_FIX/ { ans = "yes" } \
@@ -209,13 +209,13 @@ buildlink-openssl-des-h:
. endif # USE_OLD_DES_API == yes
. if defined(PKG_SYSCONFDIR.openssl)
-SSLDIR= ${PKG_SYSCONFDIR.openssl}
+SSLDIR= ${PKG_SYSCONFDIR.openssl}
. elif ${OPSYS} == "NetBSD"
-SSLDIR= /etc/openssl
+SSLDIR= /etc/openssl
. elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
-SSLDIR= /etc/ssl # most likely place
+SSLDIR= /etc/ssl # most likely place
. else
-SSLDIR= ${PKG_SYSCONFBASEDIR}/openssl
+SSLDIR= ${PKG_SYSCONFBASEDIR}/openssl
. endif
SSLCERTS= ${SSLDIR}/certs
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 586b3614690..e8495ae777b 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/08/06 06:19:29 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:27:08 wiz Exp $
#
DISTNAME= Crypt-OpenPGP-1.03
-PKGNAME= p5-${DISTNAME}
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 3
SVR4_PKGNAME= p5pgp
CATEGORIES= security perl5
diff --git a/security/pflkm/builtin.mk b/security/pflkm/builtin.mk
index 3c65b587d2a..cb65df32e94 100644
--- a/security/pflkm/builtin.mk
+++ b/security/pflkm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:22:44 reed Exp $
+# $NetBSD: builtin.mk,v 1.11 2007/02/22 19:27:08 wiz Exp $
BUILTIN_PKG:= pflkm
@@ -102,9 +102,9 @@ CHECK_BUILTIN.pflkm?= no
.if !empty(CHECK_BUILTIN.pflkm:M[nN][oO])
. if !empty(USE_BUILTIN.pflkm:M[nN][oO])
-PFCTL?= ${BUILDLINK_PREFIX.pflkm}/bin/pfctl
+PFCTL?= ${BUILDLINK_PREFIX.pflkm}/bin/pfctl
. else
-PFCTL?= ${EXE_PFCTL}
+PFCTL?= ${EXE_PFCTL}
. endif
.endif # CHECK_BUILTIN.pflkm
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index d0f72446a14..24e54f7f5e6 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2007/01/07 09:14:10 rillig Exp $
+# $NetBSD: Makefile,v 1.51 2007/02/22 19:27:08 wiz Exp $
DISTNAME= pgp263is
PKGREVISION= 1
@@ -37,7 +37,7 @@ ASMFLAG= -DPORTABLE -DMPORTABLE
.include "../../mk/endian.mk"
.if (${MACHINE_ENDIAN} == "big")
-CFLAGS+= -DHIGHFIRST
+CFLAGS+= -DHIGHFIRST
.endif
BUILD_DEFS+= ASMFLAG
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index abe367bad78..292c6dc7ce0 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/10/04 21:58:14 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/02/22 19:27:09 wiz Exp $
#
DISTNAME= pgp50i-unix-src
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \
http://ftp.tuwien.ac.at/privacy/pgp/5.0/unix/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.pgpi.org/
+HOMEPAGE= http://www.pgpi.org/
COMMENT= Public-key encryption and digital signature utilities (v5)
USE_TOOLS+= perl
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 4bc59043184..900f0215fe0 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/08/24 16:10:12 shannonjr Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:09 wiz Exp $
#
DISTNAME= prelude-manager-0.9.6
@@ -25,21 +25,21 @@ PRELUDE_USER?= _prelude
PRELUDE_GROUP?= _prelude
PRELUDE_HOME?= /var/spool/prelude-manager
-PKG_GROUPS= ${PRELUDE_GROUP}
-PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}
+PKG_GROUPS= ${PRELUDE_GROUP}
+PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}
PKG_GECOS.${PRELUDE_USER}= Prelude IDS manager
PKG_HOME.${PRELUDE_USER}= ${PRELUDE_HOME}
FILES_SUBST+= PRELUDE_MANAGER_PID_DIR=${PRELUDE_MANAGER_PID_DIR:Q}
-FILES_SUBST+= PRELUDE_USER=${PRELUDE_USER:Q}
-FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_USER:Q}
-
-SUBST_CLASSES+= code
-SUBST_STAGE.code= post-patch
-SUBST_FILES.code= run-prelude-manager.c
-SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
+FILES_SUBST+= PRELUDE_USER=${PRELUDE_USER:Q}
+FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_USER:Q}
+
+SUBST_CLASSES+= code
+SUBST_STAGE.code= post-patch
+SUBST_FILES.code= run-prelude-manager.c
+SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
EGDIR= share/examples/prelude-manager/
CONF_FILES_PERMS+= ${EGDIR}/prelude-manager.conf ${PKG_SYSCONFDIR}/prelude-manager/prelude-manager.conf \
diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile
index 43d5de0bc5c..b827987b823 100644
--- a/security/py-OpenSSL/Makefile
+++ b/security/py-OpenSSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/08/14 13:19:24 rpaulo Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:09 wiz Exp $
#
DISTNAME= pyOpenSSL-0.6
@@ -8,8 +8,8 @@ CATEGORIES= security python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyopenssl/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://pyopenssl.sourceforge.net/
-COMMENT= Python interface to the OpenSSL library
+HOMEPAGE= http://pyopenssl.sourceforge.net/
+COMMENT= Python interface to the OpenSSL library
PYTHON_VERSIONS_ACCEPTED= 24 23 22
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index c0f925436f8..17fdef9053f 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/09/03 00:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:09 wiz Exp $
#
DISTNAME= python-mcrypt-1.1
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//}
PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-mcrypt/}
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/python-mcrypt/
COMMENT= Python interface to mcrypt library
-PYBINMODULE= yes
+PYBINMODULE= yes
PYDISTUTILSPKG= yes
PYTHON_VERSIONS_ACCEPTED= 24 23 22
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index 2002d6795de..f0c115cb2a3 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/08/07 19:38:43 jdolecek Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:27:09 wiz Exp $
DISTNAME= qca-tls-1.0
PKGREVISION= 3
@@ -15,8 +15,8 @@ USE_LIBTOOL= yes
HAS_CONFIGURE= yes
USE_LANGUAGES= c c++
-CONFIGURE_ARGS+= --with-openssl-inc=${SSLBASE}/include
-CONFIGURE_ARGS+= --with-openssl-lib=${SSLBASE}/lib
+CONFIGURE_ARGS+= --with-openssl-inc=${SSLBASE}/include
+CONFIGURE_ARGS+= --with-openssl-lib=${SSLBASE}/lib
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/security/seahorse-gedit/Makefile b/security/seahorse-gedit/Makefile
index 350f944d6d5..e327a031cb8 100644
--- a/security/seahorse-gedit/Makefile
+++ b/security/seahorse-gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/12/06 19:51:52 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:09 wiz Exp $
DISTNAME= seahorse-0.8.1
PKGNAME= seahorse-gedit-0.8.1
@@ -22,7 +22,7 @@ USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --disable-nautilus
-GCONF2_SCHEMAS= seahorse-gedit.schemas
+GCONF2_SCHEMAS= seahorse-gedit.schemas
BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 6ac08bcdd29..0bac38dcbc2 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/12/06 19:51:52 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2007/02/22 19:27:09 wiz Exp $
DISTNAME= seahorse-0.8.1
PKGREVISION= 3
@@ -21,7 +21,7 @@ USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --disable-gedit
CONFIGURE_ARGS+= --disable-nautilus
-GCONF2_SCHEMAS= seahorse.schemas
+GCONF2_SCHEMAS= seahorse.schemas
BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2
diff --git a/security/smimemsg/Makefile b/security/smimemsg/Makefile
index 3fac487acb4..4ff4adc7b19 100644
--- a/security/smimemsg/Makefile
+++ b/security/smimemsg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/22 09:22:14 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:09 wiz Exp $
#
DISTNAME= smimemsg15
@@ -13,9 +13,9 @@ COMMENT= Generate and read S/MIME messages
WRKSRC= ${WRKDIR}/smimemsg
GNU_CONFIGURE= yes
-RESTRICTED= Source code redistribution is not permitted.consult okuno@mars.elcom.nitech.ac.jp.
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
+RESTRICTED= Source code redistribution is not permitted.consult okuno@mars.elcom.nitech.ac.jp.
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smimemsg
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index b5fa9e8c140..975db3e4e20 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/11/02 12:31:58 kivinen Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:09 wiz Exp $
DISTNAME= ssh-3.2.9.1
PKGNAME= ${DISTNAME:C/ssh-/ssh2-/}
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.ssh.com/
-COMMENT= Secure Shell client and server for V.2 SSH protocol
+COMMENT= Secure Shell client and server for V.2 SSH protocol
CONFLICTS+= openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]*
CONFLICTS+= openssh+gssapi-[0-9]* ssh2-nox11-[0-9]*
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index e8adadf89a2..6ffdbc34dd4 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:30:38 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:27:09 wiz Exp $
-DISTNAME= tcp_wrappers_7.6-ipv6.1
+DISTNAME= tcp_wrappers_7.6-ipv6.1
PKGNAME= tcp_wrappers-7.6.1
-PKGREVISION= 4
+PKGREVISION= 4
CATEGORIES= security net
MASTER_SITES= ftp://ftp.porcupine.org/pub/security/
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index c32252d5df6..31031bde7c4 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2006/12/06 18:59:28 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2007/02/22 19:27:09 wiz Exp $
DISTNAME= scsh-0.6.7
CATEGORIES= shells lang
MASTER_SITES= ftp://ftp.scsh.net/pub/scsh/0.6/
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.scsh.net/
COMMENT= Unix shell embedded into Scheme, with access to all Posix calls
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 02a01b24a13..17673bad893 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.36 2006/10/09 12:52:36 joerg Exp $
+# $NetBSD: Makefile.common,v 1.37 2007/02/22 19:27:10 wiz Exp $
-DISTNAME= zsh-${ZSH_VERSION}
+DISTNAME= zsh-${ZSH_VERSION}
CATEGORIES= shells
-MASTER_SITES= ftp://sunsite.dk/pub/unix/shells/zsh/ \
+MASTER_SITES= ftp://sunsite.dk/pub/unix/shells/zsh/ \
ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
ftp://ftp.funet.fi/pub/unix/shells/zsh/ \
http://www.math.technion.ac.il/pub/zsh/ \
@@ -58,11 +58,11 @@ PLIST_SRC= ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh
. if ${OPSYS} == "Linux" || ${OPSYS} == "IRIX" || ${OPSYS} == "OpenBSD"
-PLIST_SRC+= ${PKGDIR}/PLIST.terminfo
+PLIST_SRC+= ${PKGDIR}/PLIST.terminfo
. elif ${OPSYS} == "Interix" || ${OPSYS} == "DragonFly"
-PLIST_SRC+= ${PKGDIR}/PLIST.terminfo ${PKGDIR}/PLIST.shlibs
+PLIST_SRC+= ${PKGDIR}/PLIST.terminfo ${PKGDIR}/PLIST.shlibs
. else
-PLIST_SRC+= ${PKGDIR}/PLIST.shlibs
+PLIST_SRC+= ${PKGDIR}/PLIST.shlibs
. endif
PLIST_SRC+= ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile
index b751f956e4a..83fa01dacbe 100644
--- a/shells/zsh3/Makefile
+++ b/shells/zsh3/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2006/10/04 21:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:10 wiz Exp $
#
-DISTNAME= zsh-3.0.8
+DISTNAME= zsh-3.0.8
PKGREVISION= 1
CATEGORIES= shells
-MASTER_SITES= ftp://ftp.rge.com/pub/shells/zsh/old/ \
+MASTER_SITES= ftp://ftp.rge.com/pub/shells/zsh/old/ \
ftp://sunsite.auc.dk/pub/unix/shells/zsh/old/ \
ftp://ftp.uit.no/pub/unix/shells/zsh/old/ \
ftp://ftp.net.lut.ac.uk/zsh/old/ \
diff --git a/sysutils/adjustkernel/Makefile b/sysutils/adjustkernel/Makefile
index df1f6836ac4..166408257b1 100644
--- a/sysutils/adjustkernel/Makefile
+++ b/sysutils/adjustkernel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:11 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:10 wiz Exp $
DISTNAME= adjustkernel-1.7
CATEGORIES= sysutils
@@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Generate a NetBSD kernel config
WRKSRC= ${WRKDIR}
-NO_CHECKSUM= yes
+NO_CHECKSUM= yes
NO_BUILD= yes
NO_MTREE= yes
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index 35c565df7a3..7eecc1d3d94 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/05/26 13:19:38 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2007/02/22 19:27:10 wiz Exp $
#
PKGNAME= amanda-client-${VERS}
@@ -22,11 +22,11 @@ BUILD_DEFS+= AMANDA_DUMP_SNAP
# the amrecover Makefile to add the readline libraries as it's the only
# program that uses readline. (XXX: incorrect, does not happen)
#
-CONFIGURE_ENV+= ac_cv_lib_intl_main=no
-CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
+CONFIGURE_ENV+= ac_cv_lib_intl_main=no
+CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
+CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
+CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
+CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
.if defined(AMANDA_SMB)
CONFIGURE_ARGS+= --with-smbclient
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 35c184d8ce3..5acb4c61e5f 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/02/07 02:04:15 gdt Exp $
+# $NetBSD: Makefile,v 1.41 2007/02/22 19:27:10 wiz Exp $
PKGNAME= amanda-server-${VERS}
PKGREVISION= 6
@@ -15,11 +15,11 @@ CONFIGURE_ARGS+= --without-client
# Prevent configure script from finding unnecessary libraries.
#
-CONFIGURE_ENV+= ac_cv_lib_intl_main=no
-CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
+CONFIGURE_ENV+= ac_cv_lib_intl_main=no
+CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
+CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
+CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
+CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
# post-install:
# ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amanda
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index babd2d8f982..4e30cafcb2b 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2006/12/27 13:37:39 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:27:10 wiz Exp $
#
DISTNAME= asapm-2.11
-PKGREVISION= 4
+PKGREVISION= 4
CATEGORIES= sysutils x11
MASTER_SITES= http://www.tigr.net/afterstep/download/asapm/ \
ftp://ftp.afterstep.org/apps/asapm/ \
diff --git a/sysutils/atitvout/Makefile b/sysutils/atitvout/Makefile
index e509c222132..9f8a629df75 100644
--- a/sysutils/atitvout/Makefile
+++ b/sysutils/atitvout/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2006/09/09 02:46:08 obache Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:10 wiz Exp $
-DISTNAME= atitvout-0.4
+DISTNAME= atitvout-0.4
PKGREVISION= 1
CATEGORIES= sysutils graphics
MASTER_SITES= http://www.stud.uni-hamburg.de/users/lennart/projects/atitvout/
diff --git a/sysutils/cdrdao/Makefile.common b/sysutils/cdrdao/Makefile.common
index 58729bc4853..f69fb840777 100644
--- a/sysutils/cdrdao/Makefile.common
+++ b/sysutils/cdrdao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2006/12/11 12:28:36 drochner Exp $
+# $NetBSD: Makefile.common,v 1.7 2007/02/22 19:27:10 wiz Exp $
DISTNAME= cdrdao-${CDRDAO_VER}
CATEGORIES= sysutils
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-gtkmm-exec-prefix=/dev/null
LDFLAGS+= -L../paranoia
# override ARCH to avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
+MAKE_ENV+= ARCH=""
post-extract:
${CP} ${WRKSRC}/scsilib/RULES/os-freebsd.id ${WRKSRC}/scsilib/RULES/os-dragonfly.id
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index bbd5c890464..8deb1b719c9 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/01/07 09:14:11 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:10 wiz Exp $
DISTNAME= cdrtools-2.01.01a05
PKGNAME= cdrtools-ossdvd-2.01.1.36
@@ -30,8 +30,8 @@ BUILDLINK_TRANSFORM+= rmdir:/opt/schily
.endif
# avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
-MAKE_ENV+= MAKEPROG="gmake"
+MAKE_ENV+= ARCH=""
+MAKE_ENV+= MAKEPROG="gmake"
MAKE_ENV+= COPTX=${CFLAGS:M*:Q}
MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q}
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index a8622b48887..04efc1f038a 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:11 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:10 wiz Exp $
DISTNAME= cdrtools-2.01
PKGREVISION= 4
@@ -24,8 +24,8 @@ BUILDLINK_TRANSFORM+= rmdir:/opt/schily
.endif
# avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
-MAKE_ENV+= MAKEPROG="gmake"
+MAKE_ENV+= ARCH=""
+MAKE_ENV+= MAKEPROG="gmake"
MAKE_ENV+= COPTX=${CFLAGS:M*:Q}
MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q}
diff --git a/sysutils/cfengine2-doc/Makefile b/sysutils/cfengine2-doc/Makefile
index 8fc42d56d1a..368ef28874e 100644
--- a/sysutils/cfengine2-doc/Makefile
+++ b/sysutils/cfengine2-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/07 00:03:28 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:10 wiz Exp $
#
PKGNAME= cfengine-doc-${CFENGINE_VERSION}
@@ -7,8 +7,8 @@ PKGNAME= cfengine-doc-${CFENGINE_VERSION}
COMMENT= Documentation for cfengine
-NO_CONFIGURE= yes
-NO_BUILD= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
INFO_FILES= # PLIST
HTMLDIR= ${PREFIX}/share/doc/html/cfengine
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 3d5a29d55ec..644564c7c2e 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/08/14 08:39:52 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/02/22 19:27:11 wiz Exp $
DISTNAME= coreutils-5.2.1
PKGREVISION= 2
@@ -59,7 +59,7 @@ BUILD_DEFS+= GNU_PROGRAM_PREFIX
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
${OPSYS} == "OpenBSD"
MAKE_FLAGS+= setuid_root_mode=a=rx
-MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu
+MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu
MESSAGE_SUBST+= OPSYS=${OPSYS:Q}
.endif
diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile
index f269c9e23ef..83c1a7e7978 100644
--- a/sysutils/cpuburn/Makefile
+++ b/sysutils/cpuburn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/01 20:56:33 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:11 wiz Exp $
#
DISTNAME= cpuburn_1_4
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= *-*-i[3456]86
USE_TOOLS+= gtar
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
INSTALLATION_DIRS= bin share/doc/cpuburn
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 830b372b420..858775cc096 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2006/09/09 02:46:08 obache Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:27:11 wiz Exp $
#
-DISTNAME= crashme-2.4
+DISTNAME= crashme-2.4
CATEGORIES= sysutils
-MASTER_SITES= http://ochimizu-www.jaist.ac.jp:8000/linux/vger/crashme/
+MASTER_SITES= http://ochimizu-www.jaist.ac.jp:8000/linux/vger/crashme/
EXTRACT_SUFX= -shar
MAINTAINER= agc@NetBSD.org
diff --git a/sysutils/fdgw/Makefile b/sysutils/fdgw/Makefile
index 62cb6444ad1..b71a0482673 100644
--- a/sysutils/fdgw/Makefile
+++ b/sysutils/fdgw/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:00 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:11 wiz Exp $
#
DISTNAME= fdgw-20020130
CATEGORIES= sysutils net
MASTER_SITES= ftp://ftp.fml.org/pub/fdgw/source/
-MAINTAINER= fukachan@fml.org
+MAINTAINER= fukachan@fml.org
HOMEPAGE= http://www.fml.org/software/fdgw/
-COMMENT= Toolkit to build a one-floppy NetBSD system
+COMMENT= Toolkit to build a one-floppy NetBSD system
_IMG_SRC_DIR = ${WRKSRC}/image.${MACHINE_ARCH}
_IMG_DST_DIR = ${PREFIX}/fdgw/${MACHINE_ARCH}
diff --git a/sysutils/hddtemp/Makefile b/sysutils/hddtemp/Makefile
index 8150c8e48f8..f7d4ccf6d5f 100644
--- a/sysutils/hddtemp/Makefile
+++ b/sysutils/hddtemp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/19 09:44:35 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:11 wiz Exp $
DISTNAME= hddtemp-0.3-beta15
PKGNAME= hddtemp-0.3b15
@@ -14,7 +14,7 @@ COMMENT= Gather temperature stats for disk drives
SITES.hddtemp.db= http://www.guzu.net/linux/
PKG_INSTALLATION_TYPES= overwrite pkgviews
-ONLY_FOR_PLATFORM= Linux-*-*
+ONLY_FOR_PLATFORM= Linux-*-*
USE_LANGUAGES= c
USE_PKGLOCALEDIR= YES
diff --git a/sysutils/i2ocfg/Makefile b/sysutils/i2ocfg/Makefile
index 06bca6f2ea5..d6fb3b72e78 100644
--- a/sysutils/i2ocfg/Makefile
+++ b/sysutils/i2ocfg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 21:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:11 wiz Exp $
DISTNAME= i2ocfg-1.0
PKGREVISION= 1
@@ -9,9 +9,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.hairylemon.org/~ad/software/i2ocfg/
COMMENT= I2O configuration dialog gateway
-ONLY_FOR_PLATFORM= NetBSD-1.5[J-Z]-* NetBSD-1.6*-* NetBSD-[2-9]*-*
+ONLY_FOR_PLATFORM= NetBSD-1.5[J-Z]-* NetBSD-1.6*-* NetBSD-[2-9]*-*
-MANCOMPRESSED_IF_MANZ= YES
+MANCOMPRESSED_IF_MANZ= YES
MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP}
MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP}
diff --git a/sysutils/ipw-firmware/Makefile b/sysutils/ipw-firmware/Makefile
index 58203a1d435..e7fe725be6e 100644
--- a/sysutils/ipw-firmware/Makefile
+++ b/sysutils/ipw-firmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/04/22 09:22:15 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:11 wiz Exp $
DISTNAME= ipw2100-fw-1.2
PKGNAME= ipw-firmware-1.0
@@ -8,11 +8,11 @@ EXTRACT_SUFX= .tgz
MAINTAINER= Damien.Bergamini@Free.FR
HOMEPAGE= http://damien.bergamini.free.fr/ipw/
-COMMENT= Firmware binary images for ipw(4) driver
+COMMENT= Firmware binary images for ipw(4) driver
LICENSE= intel-ipw-license
-WRKSRC= ${WRKDIR}
+WRKSRC= ${WRKDIR}
RESTRICTED= Intel Licensed Software: see http://ipw2100.sourceforge.net/firmware.php?fid=3
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 4b5ddb4316e..f10afc4b0b2 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/01/26 04:37:27 markd Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:11 wiz Exp $
DISTNAME= kdirstat-2.4.4
CATEGORIES= sysutils kde
@@ -7,12 +7,12 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://kdirstat.sourceforge.net/
-COMMENT= Graphical disk usage utility
+COMMENT= Graphical disk usage utility
USE_TOOLS+= gmake msgfmt
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
REPLACE_PERL= kdirstat/fix_move_to_trash_bin.pl
diff --git a/sysutils/libol/Makefile b/sysutils/libol/Makefile
index 23f728aa23c..ba06e28f824 100644
--- a/sysutils/libol/Makefile
+++ b/sysutils/libol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/10/14 02:01:33 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:11 wiz Exp $
DISTNAME= libol-0.3.18
CATEGORIES= sysutils
@@ -6,7 +6,7 @@ PKGREVISION= 1
MASTER_SITES= http://www.balabit.com/downloads/libol/0.3/
MAINTAINER= adrianp@NetBSD.org
-HOMEPAGE= http://www.balabit.com/products/syslog_ng/
+HOMEPAGE= http://www.balabit.com/products/syslog_ng/
COMMENT= Support library for syslog-ng
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/sysutils/memtestplus/Makefile b/sysutils/memtestplus/Makefile
index ca5d5500e33..6fa1edab61d 100644
--- a/sysutils/memtestplus/Makefile
+++ b/sysutils/memtestplus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/01/06 22:48:07 smb Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:11 wiz Exp $
#
DISTNAME= memtest86+-1.65
PKGNAME= memtestplus-1.65
-PKGREVISION= 3
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://www.memtest.org/download/1.65/
diff --git a/sysutils/mtscan/Makefile b/sysutils/mtscan/Makefile
index 9d759a466d6..5540ecb9ce6 100644
--- a/sysutils/mtscan/Makefile
+++ b/sysutils/mtscan/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2006/07/06 21:14:19 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:11 wiz Exp $
-DISTNAME= mtscan-20050129
+DISTNAME= mtscan-20050129
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/sysutils/nvnet/Makefile b/sysutils/nvnet/Makefile
index 44ef01706ca..60d8a0246b1 100644
--- a/sysutils/nvnet/Makefile
+++ b/sysutils/nvnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/01/31 00:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:27:12 wiz Exp $
#
PKGNAME= nvnet-20050620nb1
@@ -16,13 +16,13 @@ COMMENT= Driver for nVidia ethernet
BROKEN_IN= pkgsrc-2006Q1 pkgsrc-2006Q4
-LICENSE= nvidia-license
+LICENSE= nvidia-license
-RESTRICTED= nVidia Licensed Software: http://www.nvidia.com/object/nv_swlicense.html
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+RESTRICTED= nVidia Licensed Software: http://www.nvidia.com/object/nv_swlicense.html
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
WRKSRC= ${WRKDIR}/nvnet
diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile
index 83f6920834f..19d01fd3476 100644
--- a/sysutils/pear-Log/Makefile
+++ b/sysutils/pear-Log/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:12 wiz Exp $
DISTNAME= Log-1.8.4
CATEGORIES= sysutils
MAINTAINER= jdolecek@NetBSD.org
-HOMEPAGE= http://www.csh.rit.edu/~jon/projects/pear_log/
+HOMEPAGE= http://www.csh.rit.edu/~jon/projects/pear_log/
COMMENT= PHP Log framework provides an abstracted logging system
CONFLICTS= php-pear-Log-[0-9]
diff --git a/sysutils/setquota/Makefile b/sysutils/setquota/Makefile
index d40ff123fda..dd737533616 100644
--- a/sysutils/setquota/Makefile
+++ b/sysutils/setquota/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/18 21:35:43 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:12 wiz Exp $
#
DISTNAME= setquota-0.1
@@ -6,7 +6,7 @@ PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.jurai.net/users/winter/
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= # unknown
COMMENT= Command line quota tools
diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index 38b70698a72..39e5e70d241 100644
--- a/sysutils/sformat/Makefile
+++ b/sysutils/sformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:12 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:12 wiz Exp $
#
DISTNAME= sformat-3.5
@@ -18,8 +18,8 @@ USE_TOOLS+= gmake
TBL?= tbl
# avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
-MAKE_ENV+= MAKEPROG="gmake"
+MAKE_ENV+= ARCH=""
+MAKE_ENV+= MAKEPROG="gmake"
MAKE_ENV+= COPTX=${CFLAGS:M*:Q}
MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q}
MAKE_FLAGS+= INS_BASE=${LOCALBASE:Q} # won't work in MAKE_ENV!
diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
index 409bc2e335c..cb9a8d0d063 100644
--- a/sysutils/socket/Makefile
+++ b/sysutils/socket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:12 wiz Exp $
DISTNAME= socket-1.1
CATEGORIES= sysutils net
@@ -9,7 +9,7 @@ COMMENT= Create tcp socket and connect to stdin/out
MAKE_ENV+= INSTALLBASE=${PREFIX:Q}
-BUILD_DEFS+= USE_INET6
+BUILD_DEFS+= USE_INET6
# to get USE_INET6
.include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/tits/Makefile b/sysutils/tits/Makefile
index e9904932d0d..89e5c262726 100644
--- a/sysutils/tits/Makefile
+++ b/sysutils/tits/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2006/09/28 07:07:15 scw Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:12 wiz Exp $
#
-DISTNAME= tits-1.2.2
+DISTNAME= tits-1.2.2
PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://www.mctavish.co.uk/tits/
+MASTER_SITES= http://www.mctavish.co.uk/tits/
MAINTAINER= scw@NetBSD.org
COMMENT= Server which provides telnet(1) access to one or more tty ports
diff --git a/sysutils/top/Makefile b/sysutils/top/Makefile
index 374e2728264..42c6b279e5b 100644
--- a/sysutils/top/Makefile
+++ b/sysutils/top/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2006/06/01 21:55:28 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/22 19:27:12 wiz Exp $
-DISTNAME= top-3.6alpha7
+DISTNAME= top-3.6alpha7
PKGNAME= top-3.6a7
CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.groupsys.com/pub/top/
+MASTER_SITES= ftp://ftp.groupsys.com/pub/top/
MAINTAINER= agc@NetBSD.org
HOMEPAGE= http://www.groupsys.com/topinfo/
diff --git a/sysutils/usbutil/Makefile b/sysutils/usbutil/Makefile
index 233b583fc7e..0a71140616c 100644
--- a/sysutils/usbutil/Makefile
+++ b/sysutils/usbutil/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2007/01/23 17:02:06 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:12 wiz Exp $
#
-DISTNAME= usbutil-0.5
+DISTNAME= usbutil-0.5
PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/
+MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/
MAINTAINER= lennart@augustsson.net
COMMENT= USB developer utilities
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index d4d6849b7c3..5481248a68b 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/20 12:56:27 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:12 wiz Exp $
#
DISTNAME= wmcpuload-1.0.1
@@ -11,7 +11,7 @@ MAINTAINER= coto@core.de
HOMEPAGE= http://www.sh.rim.or.jp/~ssato/dockapp/\#wmcpuload
COMMENT= Dockable CPU monitor
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
post-extract:
${CP} ${FILESDIR}/cpu_dragonfly.c ${WRKSRC}/src
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index 5c440339c3a..f4cc9292a69 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/11/22 00:12:34 seb Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:27:12 wiz Exp $
#
DISTNAME= xen-2.0.7-src
@@ -44,12 +44,12 @@ PYTHON_PATCH_SCRIPTS+= misc/xend
PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format
SUBST_CLASSES+= paths py conf
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= python/xen/xend/server/SrvDaemon.py
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= python/xen/xend/server/SrvDaemon.py
SUBST_FILES.paths+= python/xen/xend/XendDomainInfo.py
SUBST_FILES.paths+= python/xen/sv/Daemon.py
-SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g"
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
+SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g"
+SUBST_MESSAGE.paths= Fixing hardcoded paths.
SUBST_STAGE.py= pre-configure
SUBST_FILES.py= python/Makefile
diff --git a/sysutils/xentools30-hvm/Makefile b/sysutils/xentools30-hvm/Makefile
index 15b3df2bffb..da9c1f998d4 100644
--- a/sysutils/xentools30-hvm/Makefile
+++ b/sysutils/xentools30-hvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/11/05 20:47:26 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/22 19:27:13 wiz Exp $
#
DISTNAME= xen-3.0.3_0-src
@@ -37,11 +37,11 @@ PYTHON_VERSIONS_ACCEPTED= 24 23 22
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS= ioemu/keymaps/convert-map
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= ioemu/vl.c
-SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g"
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= ioemu/vl.c
+SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g"
+SUBST_MESSAGE.paths= Fixing hardcoded paths.
SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-configure
diff --git a/sysutils/xentools30/Makefile b/sysutils/xentools30/Makefile
index a0d52aba0b2..ecfbafe130a 100644
--- a/sysutils/xentools30/Makefile
+++ b/sysutils/xentools30/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/22 21:01:51 smb Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:12 wiz Exp $
#
DISTNAME= xen-3.0.3_0-src
@@ -58,11 +58,11 @@ PYTHON_PATCH_SCRIPTS+= security/xensec_gen.py
PYTHON_PATCH_SCRIPTS+= xenmon/xenmon.py
PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= ioemu/vl.c
-SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g"
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= ioemu/vl.c
+SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g"
+SUBST_MESSAGE.paths= Fixing hardcoded paths.
SUBST_CLASSES+= pathsvar
SUBST_STAGE.pathsvar= pre-configure
diff --git a/sysutils/xraidadmin/Makefile b/sysutils/xraidadmin/Makefile
index 8d23d17151f..accb9f4d571 100644
--- a/sysutils/xraidadmin/Makefile
+++ b/sysutils/xraidadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/22 09:22:15 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:13 wiz Exp $
#
DISTNAME= RAIDAdmin1.3.1archive
@@ -15,9 +15,9 @@ LICENSE= apple-admin-license
RESTRICTED= Redistribution not permitted
NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
WRKSRC= ${WRKDIR}/RAID\ Admin\ 1.3.1
diff --git a/textproc/aspell-gaeilge/Makefile b/textproc/aspell-gaeilge/Makefile
index 5f6a9e7574a..269bd4bd204 100644
--- a/textproc/aspell-gaeilge/Makefile
+++ b/textproc/aspell-gaeilge/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:00 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:13 wiz Exp $
DISTNAME= aspell5-ga-3.5-0
PKGNAME= aspell-gaeilge-3.5.0
PKGREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GNU:=aspell/dict/ga/}
+MASTER_SITES= ${MASTER_SITE_GNU:=aspell/dict/ga/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jschauma@NetBSD.org
diff --git a/textproc/biblook/Makefile b/textproc/biblook/Makefile
index bbd98210cdd..5df4fe1c136 100644
--- a/textproc/biblook/Makefile
+++ b/textproc/biblook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:45 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:13 wiz Exp $
#
DISTNAME= biblook
@@ -15,8 +15,8 @@ MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
MAKE_FLAGS+= CC=${CC:Q}
# override definitions in the package's Makefile via command line
-MAKE_FLAGS+= OPT="${CFLAGS} -Dunix"
-MAKE_FLAGS+= DEF_H_FILES="-DHAVE_STDLIB_H -DHAVE_NETINET_IN_H"
-MAKE_FLAGS+= DEF_MORE='-DMOREPATH="\"/usr/bin/more\"" -DMORE="\"more\""'
+MAKE_FLAGS+= OPT="${CFLAGS} -Dunix"
+MAKE_FLAGS+= DEF_H_FILES="-DHAVE_STDLIB_H -DHAVE_NETINET_IN_H"
+MAKE_FLAGS+= DEF_MORE='-DMOREPATH="\"/usr/bin/more\"" -DMORE="\"more\""'
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/chasen/Makefile.common b/textproc/chasen/Makefile.common
index 52355716f28..b43c638f18b 100644
--- a/textproc/chasen/Makefile.common
+++ b/textproc/chasen/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.5 2005/12/05 23:55:20 rillig Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/02/22 19:27:13 wiz Exp $
#
CHASEN_VERSION= 2.3.3
.include "../../mk/bsd.prefs.mk"
-PKG_SYSCONFSUBDIR?= chasen
+PKG_SYSCONFSUBDIR?= chasen
CHASEN_DICDIR?= ${PREFIX}/share/chasen/dic
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
--with-dicdir=${CHASEN_DICDIR:Q}
diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile
index 169dc27d19a..02eb6ddeaf8 100644
--- a/textproc/dict-client/Makefile
+++ b/textproc/dict-client/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2006/10/03 05:45:54 uebayasi Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:27:13 wiz Exp $
-DISTNAME= dictd-1.9.15
-PKGNAME= dict-client-1.9.15
+DISTNAME= dictd-1.9.15
+PKGNAME= dict-client-1.9.15
PKGREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ftp://ftp.dict.org/pub/dict/
+MASTER_SITES= ftp://ftp.dict.org/pub/dict/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.dict.org/
diff --git a/textproc/dict-dictionaries/Makefile b/textproc/dict-dictionaries/Makefile
index dd6c6412c0c..76f30375ce2 100644
--- a/textproc/dict-dictionaries/Makefile
+++ b/textproc/dict-dictionaries/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2006/11/24 23:04:15 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:13 wiz Exp $
-DISTNAME= #
+DISTNAME= #
PKGNAME= dict-data-1.8.0
PKGREVISION= 1
CATEGORIES= textproc
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index cc35b769f03..690df6c7ff7 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2006/11/21 21:36:43 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:13 wiz Exp $
DISTNAME= glimpse-4.18.0
PKGREVISION= 1
CATEGORIES= textproc databases
-MASTER_SITES= http://webglimpse.net/trial/
+MASTER_SITES= http://webglimpse.net/trial/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://webglimpse.net/
diff --git a/textproc/groff/options.mk b/textproc/groff/options.mk
index 5006a655cb5..5eaa8f47bfe 100644
--- a/textproc/groff/options.mk
+++ b/textproc/groff/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2007/02/02 00:21:37 joerg Exp $
+# $NetBSD: options.mk,v 1.5 2007/02/22 19:27:13 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.groff
PKG_SUPPORTED_OPTIONS= groff-docs x11
@@ -20,7 +20,7 @@ PLIST_SRC+= PLIST.x11
.include "../../mk/xaw.buildlink3.mk"
.include "../../mk/bsd.fast.prefs.mk"
.if ${OPSYS} == "Interix"
-CONFIGURE_ENV+= X_EXTRA_LIBS=-lXext
+CONFIGURE_ENV+= X_EXTRA_LIBS=-lXext
.endif
.else
CONFIGURE_ARGS+= --without-x
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 2a99159ae35..42235f1de5f 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/11/05 01:42:03 dsainty Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:13 wiz Exp $
#
DISTNAME= sed-4.1.1
@@ -26,10 +26,10 @@ TEST_TARGET= check
.include "../../mk/bsd.prefs.mk"
.if defined(GNU_PROGRAM_PREFIX)
-CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
+CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
-BUILD_DEFS+= GNU_PROGRAM_PREFIX
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
+BUILD_DEFS+= GNU_PROGRAM_PREFIX
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 9a9533b4343..ab1fc247a98 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/15 21:12:13 tonio Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:27:13 wiz Exp $
DISTNAME= hevea-1.09
CATEGORIES= textproc
@@ -10,7 +10,7 @@ COMMENT= LaTeX to HTML translator
BUILD_DEPENDS+= ocaml>=3.07:../../lang/ocaml
-DIST_SUBDIR= ${PKGNAME_NOREV}
+DIST_SUBDIR= ${PKGNAME_NOREV}
.include "../../mk/bsd.prefs.mk"
.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index b6471f42de1..f009c12bb2e 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/09/08 07:41:46 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:14 wiz Exp $
#
DISTNAME= html-4.01
@@ -20,7 +20,7 @@ EXTRACT_ONLY= # empty
NO_BUILD= yes
USE_TOOLS+= tar
-INSTDIR= ${PREFIX}/share/sgml/html
+INSTDIR= ${PREFIX}/share/sgml/html
ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog
SGML_CATALOGS= ${INSTDIR}/catalog
diff --git a/textproc/ipadic/Makefile b/textproc/ipadic/Makefile
index 11f30211375..f143208b957 100644
--- a/textproc/ipadic/Makefile
+++ b/textproc/ipadic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/29 06:22:19 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:14 wiz Exp $
#
DISTNAME= ipadic-2.7.0
@@ -6,8 +6,8 @@ PKGREVISION= 2
CATEGORIES= japanese textproc
MASTER_SITES= http://chasen.aist-nara.ac.jp/stable/ipadic/
-MAINTAINER= tech-pkg-ja@jp.NetBSD.org
-HOMEPAGE= http://chasen.aist-nara.ac.jp/
+MAINTAINER= tech-pkg-ja@jp.NetBSD.org
+HOMEPAGE= http://chasen.aist-nara.ac.jp/
COMMENT= Japanese Morphological Dictionary for ChaSen
GNU_CONFIGURE= yes
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 91deaee224a..eff41682a2c 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/10/04 22:01:00 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/22 19:27:14 wiz Exp $
DISTNAME= ISOEnts
PKGNAME= iso8879-1986
@@ -15,9 +15,9 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
USE_TOOLS+= unzip
-NO_MTREE= yes
+NO_MTREE= yes
EXTRACT_ONLY= # empty
-NO_BUILD= yes
+NO_BUILD= yes
INSTDIR= ${PREFIX}/share/sgml/iso8879
diff --git a/textproc/ispell-gaeilge/Makefile b/textproc/ispell-gaeilge/Makefile
index 66caed68e55..f820d5533f2 100644
--- a/textproc/ispell-gaeilge/Makefile
+++ b/textproc/ispell-gaeilge/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:47 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:14 wiz Exp $
DISTNAME= ispell-gaeilge-2.0
CATEGORIES= textproc
-MASTER_SITES= http://borel.slu.edu/~kps/ispell/
+MASTER_SITES= http://borel.slu.edu/~kps/ispell/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://borel.slu.edu/~kps/ispell/
diff --git a/textproc/ja-grep/Makefile b/textproc/ja-grep/Makefile
index d054daa4915..9ce20155219 100644
--- a/textproc/ja-grep/Makefile
+++ b/textproc/ja-grep/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2006/05/10 17:49:17 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:14 wiz Exp $
DISTNAME= grep-2.4.2
PKGNAME= ja-grep-2.4.2
CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_GNU:=grep/}
-PATCH_SITES= http://www.hinadori.atnifty.com/~wills/program/
-PATCHFILES= grep-2.4.2-mlb2.patch.gz
-PATCH_DIST_STRIP= -p1
+PATCH_SITES= http://www.hinadori.atnifty.com/~wills/program/
+PATCHFILES= grep-2.4.2-mlb2.patch.gz
+PATCH_DIST_STRIP= -p1
CONFLICTS+= grep-[0-9]*
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index ebebc826eba..35fb3a0ed8f 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/11/05 17:06:43 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/22 19:27:14 wiz Exp $
#
DISTNAME= libcroco-0.6.1
@@ -17,7 +17,7 @@ USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= libcroco-0.6.pc
+PKGCONFIG_OVERRIDE+= libcroco-0.6.pc
CONFIGURE_ARGS+= --enable-seleng=yes
CONFIGURE_ARGS+= --enable-layeng=yes
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index 96c6a37a517..776cbd5f856 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/07/19 19:14:39 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:14 wiz Exp $
DISTNAME= namazu-2.0.16
CATEGORIES= japanese textproc www
@@ -22,7 +22,7 @@ USE_LANGUAGES= c
USE_LIBTOOL= yes
TEST_TARGET= check
-CONFIGURE_ARGS+= --localstatedir=${DATADIR:Q} \
+CONFIGURE_ARGS+= --localstatedir=${DATADIR:Q} \
--libexecdir=${PREFIX}/libexec/cgi-bin \
--sysconfdir=${PKG_SYSCONFBASE:Q}
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 190e12284fc..392301b1a2e 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/06/26 19:50:28 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/02/22 19:27:15 wiz Exp $
#
DISTNAME= OpenSP-1.5.2
@@ -12,7 +12,7 @@ COMMENT= SGML parser, successor to "sp"
BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
-CONFLICTS+= sp-[0-9]*
+CONFLICTS+= sp-[0-9]*
USE_TOOLS+= gmake msgfmt perl
USE_LANGUAGES= c c++
diff --git a/textproc/p5-Pod-POM/Makefile b/textproc/p5-Pod-POM/Makefile
index e669fa952c4..4115db4f930 100644
--- a/textproc/p5-Pod-POM/Makefile
+++ b/textproc/p5-Pod-POM/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:48 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:27:15 wiz Exp $
#
-DISTNAME= Pod-POM-0.17
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Pod-POM-0.17
+PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5pod
# PKGREVISION= 2
CATEGORIES= textproc perl5
diff --git a/textproc/p5-Text-CharWidth/Makefile b/textproc/p5-Text-CharWidth/Makefile
index 4fa57692795..27f63714b25 100644
--- a/textproc/p5-Text-CharWidth/Makefile
+++ b/textproc/p5-Text-CharWidth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:30:49 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:15 wiz Exp $
-DISTNAME= Text-CharWidth-0.04
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Text-CharWidth-0.04
+PKGNAME= p5-${DISTNAME}
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Text/}
diff --git a/textproc/p5-Text-Format/Makefile b/textproc/p5-Text-Format/Makefile
index c8770c1d10b..00c2b2e49f1 100644
--- a/textproc/p5-Text-Format/Makefile
+++ b/textproc/p5-Text-Format/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/08/06 06:19:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:16 wiz Exp $
#
-DISTNAME= Text-Format0.52
-PKGNAME= p5-Text-Format-0.52
+DISTNAME= Text-Format0.52
+PKGNAME= p5-Text-Format-0.52
SVR4_PKGNAME= p5tfo
PKGREVISION= 2
CATEGORIES= textproc perl5
diff --git a/textproc/p5-Text-Reform/Makefile b/textproc/p5-Text-Reform/Makefile
index d40f3f050ca..60d2ab5a22e 100644
--- a/textproc/p5-Text-Reform/Makefile
+++ b/textproc/p5-Text-Reform/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/06/05 18:33:55 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:16 wiz Exp $
#
-DISTNAME= Text-Reform-1.11
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Text-Reform-1.11
+PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5trf
PKGREVISION= 3
CATEGORIES= textproc perl5
diff --git a/textproc/p5-Text-Shellwords/Makefile b/textproc/p5-Text-Shellwords/Makefile
index 2b57701b3a7..8132f0b4747 100644
--- a/textproc/p5-Text-Shellwords/Makefile
+++ b/textproc/p5-Text-Shellwords/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 12:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:16 wiz Exp $
#
DISTNAME= Text-Shellwords-1.08
@@ -12,7 +12,7 @@ COMMENT= Wrapper around shellwords.pl package
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PERL5_PACKLIST= auto/Text/Shellwords/.packlist
+PERL5_PACKLIST= auto/Text/Shellwords/.packlist
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Unaccent/Makefile b/textproc/p5-Text-Unaccent/Makefile
index 00cff5ea20d..c491d9e23db 100644
--- a/textproc/p5-Text-Unaccent/Makefile
+++ b/textproc/p5-Text-Unaccent/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:30:49 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:16 wiz Exp $
#
-DISTNAME= Text-Unaccent-1.08
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Text-Unaccent-1.08
+PKGNAME= p5-${DISTNAME}
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Text/}
diff --git a/textproc/p5-Text-WrapI18N/Makefile b/textproc/p5-Text-WrapI18N/Makefile
index 45bc99bb906..2cd4b6a82e8 100644
--- a/textproc/p5-Text-WrapI18N/Makefile
+++ b/textproc/p5-Text-WrapI18N/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:30:49 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:16 wiz Exp $
-DISTNAME= Text-WrapI18N-0.06
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Text-WrapI18N-0.06
+PKGNAME= p5-${DISTNAME}
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Text/}
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index 2022d6504e0..aca1284fca8 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:49 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:16 wiz Exp $
#
-DISTNAME= Text-Wrapper-1.000
-PKGNAME= p5-Text-Wrapper-1.0
+DISTNAME= Text-Wrapper-1.000
+PKGNAME= p5-Text-Wrapper-1.0
SVR4_PKGNAME= p5twr
PKGREVISION= 2
CATEGORIES= textproc perl5
diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 212ce0a7d74..0d5c9971dc1 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/11/05 17:06:43 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:16 wiz Exp $
#
DISTNAME= XML-Simple-2.16
@@ -13,11 +13,11 @@ COMMENT= Easy Perl API to read/write XML
PKG_DESTDIR_SUPPORT= user-destdir
-DEPENDS+= p5-XML-SAX-[0-9]*:../../textproc/p5-XML-SAX
-DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-DEPENDS+= p5-XML-NamespaceSupport-[0-9]*:../../textproc/p5-XML-NamespaceSupport
-DEPENDS+= p5-Storable-[0-9]*:../../devel/p5-Storable
-DEPENDS+= p5-Test-Simple-[0-9]*:../../devel/p5-Test-Simple
+DEPENDS+= p5-XML-SAX-[0-9]*:../../textproc/p5-XML-SAX
+DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+DEPENDS+= p5-XML-NamespaceSupport-[0-9]*:../../textproc/p5-XML-NamespaceSupport
+DEPENDS+= p5-Storable-[0-9]*:../../devel/p5-Storable
+DEPENDS+= p5-Test-Simple-[0-9]*:../../devel/p5-Test-Simple
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index 441e40e4d77..d23f57556a5 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/31 00:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:16 wiz Exp $
#
DISTNAME= po4a-0.23
@@ -20,7 +20,7 @@ DEPENDS+= p5-Text-WrapI18N-[0-9]*:../../textproc/p5-Text-WrapI18N
USE_TOOLS+= pkg-config perl:run msgmerge msgfmt
PERL5_MODULE_TYPE= Module::Build
-PERL5_PACKLIST= auto/po4a/.packlist
+PERL5_PACKLIST= auto/po4a/.packlist
REPLACE_PERL= msguntypot po4a po4a-gettextize po4a-normalize \
po4a-translate po4a-updatepo
diff --git a/textproc/py-SimpleParse/Makefile b/textproc/py-SimpleParse/Makefile
index 3906bb3aa15..531d11cc853 100644
--- a/textproc/py-SimpleParse/Makefile
+++ b/textproc/py-SimpleParse/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2006/08/13 23:32:22 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:16 wiz Exp $
#
DISTNAME= SimpleParse-2.0.0
-PKGNAME= ${PYPKGPREFIX}-SimpleParse-2.0.0
+PKGNAME= ${PYPKGPREFIX}-SimpleParse-2.0.0
PKGREVISION= 2
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=simpleparse/}
-EXTRACT_SUFX= .zip
+EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://simpleparse.sourceforge.net/
diff --git a/textproc/py-cmTemplate/Makefile b/textproc/py-cmTemplate/Makefile
index 1e4ebc9d1e2..8a8493d095e 100644
--- a/textproc/py-cmTemplate/Makefile
+++ b/textproc/py-cmTemplate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/27 13:58:53 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:16 wiz Exp $
#
DISTNAME= cmTemplate-0.3.2
-PKGNAME= ${PYPKGPREFIX}-cmTemplate-0.3.2
+PKGNAME= ${PYPKGPREFIX}-cmTemplate-0.3.2
CATEGORIES= textproc python
MASTER_SITES= http://www.bouncingchairs.net/oss/
diff --git a/textproc/py-dtml/Makefile b/textproc/py-dtml/Makefile
index 395655e6f01..7924747de4d 100644
--- a/textproc/py-dtml/Makefile
+++ b/textproc/py-dtml/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2005/09/19 15:25:41 hira Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:16 wiz Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= py-dtml-2.2.2
PKGREVISION= 1
CATEGORIES= textproc python
-MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
+MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile
index 308c04f9419..19f8fb942b9 100644
--- a/textproc/py-expat/Makefile
+++ b/textproc/py-expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:11:06 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:17 wiz Exp $
#
PKGNAME= ${PYPKGPREFIX}-expat-0
@@ -9,7 +9,7 @@ MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://www.python.org/
COMMENT= Python interface to expat
-EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/pyexpat.c
+EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/pyexpat.c
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index c85d7fdcbc3..22a7d352673 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/01/05 13:48:14 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.40 2007/02/22 19:27:17 wiz Exp $
DISTNAME= Sablot-1.0.2
PKGNAME= ${DISTNAME:S/Sablot/sablotron/}
@@ -12,7 +12,7 @@ COMMENT= XML toolkit implementing XSLT, DOM, and XPath
BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
USE_TOOLS+= gmake perl
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index ef9c379840e..dafafa29b8b 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/12/03 19:47:48 abs Exp $
+# $NetBSD: Makefile,v 1.45 2007/02/22 19:27:17 wiz Exp $
#
DISTNAME= scrollkeeper-0.3.14
@@ -21,11 +21,11 @@ USE_TOOLS+= gmake intltool msgfmt
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR:Q}
+CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR:Q}
CONFIGURE_ARGS+= --sharedstatedir=${SCROLLKEEPER_DATADIR:Q}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --with-partial-db-dir=db
-CONFIGURE_ARGS+= --with-xml-catalog=${BUILDLINK_PREFIX.xmlcatmgr}/share/xml/catalog
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --with-partial-db-dir=db
+CONFIGURE_ARGS+= --with-xml-catalog=${BUILDLINK_PREFIX.xmlcatmgr}/share/xml/catalog
.include "../../mk/bsd.prefs.mk"
@@ -54,7 +54,7 @@ XML_ENTRIES+= public "-//Open Source Metadata Framework (OMF) //DTD OMF.dtd V1.1
SUBST_CLASSES+= sk-config sc-gtfd
SUBST_STAGE.sk-config= post-patch
-SUBST_FILES.sk-config= scripts/scrollkeeper-get-index-from-docpath.in \
+SUBST_FILES.sk-config= scripts/scrollkeeper-get-index-from-docpath.in \
scripts/scrollkeeper-get-toc-from-docpath.in \
scripts/scrollkeeper-get-toc-from-id.in \
scripts/scrollkeeper-rebuilddb.in \
@@ -62,7 +62,7 @@ SUBST_FILES.sk-config= scripts/scrollkeeper-get-index-from-docpath.in \
cl/src/update.c \
cl/src/scrollkeeper-install.c \
cl/src/scrollkeeper-uninstall.c
-SUBST_SED.sk-config= -e s,scrollkeeper-config\ ,${PREFIX}/bin/scrollkeeper-config\ ,
+SUBST_SED.sk-config= -e s,scrollkeeper-config\ ,${PREFIX}/bin/scrollkeeper-config\ ,
SUBST_STAGE.sc-gtfd= post-patch
SUBST_FILES.sc-gtfd= libs/install.c
SUBST_SED.sc-gtfd= -e s,scrollkeeper-get-toc-from-docpath\ ,${PREFIX}/bin/scrollkeeper-get-toc-from-docpath\ ,
diff --git a/textproc/tcl-xml/Makefile b/textproc/tcl-xml/Makefile
index 9f0fc58fd89..e86490e1155 100644
--- a/textproc/tcl-xml/Makefile
+++ b/textproc/tcl-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:08 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:17 wiz Exp $
#
DISTNAME= TclXML-1.2
@@ -10,7 +10,7 @@ MAINTAINER= jwise@NetBSD.org
HOMEPAGE= http://www.zveno.com/zm.cgi/in-tclxml/
COMMENT= XML parser implemented entirely in Tcl
-DEPENDS+= tcl>=8.3.2:../../lang/tcl
+DEPENDS+= tcl>=8.3.2:../../lang/tcl
# old name for this package...
CONFLICTS+= TclXML-[0-9]*
diff --git a/time/bbdate/Makefile b/time/bbdate/Makefile
index 97708790ae7..abad52c6ca5 100644
--- a/time/bbdate/Makefile
+++ b/time/bbdate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/01 23:33:56 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:17 wiz Exp $
#
DISTNAME= bbdate-0.2.4
@@ -10,7 +10,7 @@ MAINTAINER= jschauma@NetBSD.org
HOMEPAGE= http://bbtools.windsofstorm.net/available.phtml#bbdate
COMMENT= Display the current date
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
.include "../../x11/libX11/buildlink3.mk"
diff --git a/time/p5-Time-Period/Makefile b/time/p5-Time-Period/Makefile
index 8db4b073540..025fc7fdd89 100644
--- a/time/p5-Time-Period/Makefile
+++ b/time/p5-Time-Period/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:17 wiz Exp $
-DISTNAME= Period-1.20
+DISTNAME= Period-1.20
PKGNAME= p5-Time-${DISTNAME}
SVR4_PKGNAME= p5per
PKGREVISION= 2
diff --git a/time/p5-Time/Makefile b/time/p5-Time/Makefile
index 3f4692a55cb..b239e53d56c 100644
--- a/time/p5-Time/Makefile
+++ b/time/p5-Time/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:17 wiz Exp $
-DISTNAME= Time-modules-2003.1126
+DISTNAME= Time-modules-2003.1126
PKGNAME= p5-${DISTNAME:S/modules-//}
SVR4_PKGNAME= p5tim
PKGREVISION= 1
diff --git a/time/p5-TimeDate/Makefile b/time/p5-TimeDate/Makefile
index c03c9655e4c..34d8c514a19 100644
--- a/time/p5-TimeDate/Makefile
+++ b/time/p5-TimeDate/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2006/07/16 13:23:52 heinz Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:17 wiz Exp $
#
-DISTNAME= TimeDate-1.16
+DISTNAME= TimeDate-1.16
PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5tid
PKGREVISION= 1
diff --git a/time/phoon/Makefile b/time/phoon/Makefile
index e09878d144f..4ebeb5400fd 100644
--- a/time/phoon/Makefile
+++ b/time/phoon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/09/23 22:12:15 schwarz Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:17 wiz Exp $
#
DISTNAME= phoon_01apr1995
-PKGNAME= phoon-19950401
+PKGNAME= phoon-19950401
CATEGORIES= time
MASTER_SITES= http://www.acme.com/software/phoon/
diff --git a/time/projclock/Makefile b/time/projclock/Makefile
index bc1129182ed..b3f5323df6a 100644
--- a/time/projclock/Makefile
+++ b/time/projclock/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:17 wiz Exp $
#
-DISTNAME= pclock0.7
+DISTNAME= pclock0.7
PKGNAME= projclock-0.7
PKGREVISION= 2
CATEGORIES= time
-MASTER_SITES= http://members.optushome.com.au/starters/pclock/
+MASTER_SITES= http://members.optushome.com.au/starters/pclock/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/time/wmclockmon/Makefile b/time/wmclockmon/Makefile
index 41c673c73a0..ec00cd8c0cb 100644
--- a/time/wmclockmon/Makefile
+++ b/time/wmclockmon/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2007/01/16 23:11:52 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:27:17 wiz Exp $
#
DISTNAME= wmclockmon-0.8.1
PKGREVISION= 1
CATEGORIES= time x11
-MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
+MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
MAINTAINER= poff@sixbit.org
HOMEPAGE= http://tnemeth.free.fr/projets/dockapps.html
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index 76801747664..32443a397ca 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:40 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/22 19:27:18 wiz Exp $
#
DISTNAME= wmMoonClock-1.27
@@ -10,16 +10,16 @@ MAINTAINER= tron@NetBSD.org
# HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
COMMENT= Shows lunar ephemeris to fairly high accuracy
-WRKSRC= ${WRKDIR}/${DISTNAME}/Src
+WRKSRC= ${WRKDIR}/${DISTNAME}/Src
USE_TOOLS+= gmake
USE_X11BASE= YES
-MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
+MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
-EXTRA_LOCAL_LIBS= -lsocket
+EXTRA_LOCAL_LIBS= -lsocket
.endif
.include "../../x11/libXext/buildlink3.mk"
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index d1ddb1d913c..d089cfab891 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/02/01 18:02:47 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:27:18 wiz Exp $
#
DISTNAME= amiwm0.20pl48
@@ -12,9 +12,9 @@ HOMEPAGE= http://www.lysator.liu.se/~marcus/amiwm.html
COMMENT= X window manager with Amiga look and feel
LICENSE= amiwm-license
-RESTRICTED= Restrictive copyright (non-commerical use only)
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
+RESTRICTED= Restrictive copyright (non-commerical use only)
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
.include "../../mk/bsd.prefs.mk"
diff --git a/wm/blackbox70/Makefile b/wm/blackbox70/Makefile
index e440d566764..4340528669a 100644
--- a/wm/blackbox70/Makefile
+++ b/wm/blackbox70/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/02/01 21:56:13 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:18 wiz Exp $
#
DISTNAME= blackbox-0.70.1
@@ -15,7 +15,7 @@ CONFLICTS+= blackbox-*
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config
BUILDLINK_DEPMETHOD.libXt?= build
diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile
index 75d8a744cc1..714b15bdf40 100644
--- a/wm/jwm/Makefile
+++ b/wm/jwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/16 23:02:49 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:18 wiz Exp $
#
DISTNAME= jwm-1.8
@@ -28,7 +28,7 @@ SUBST_SED.egdir= -e 's,@@EGDIR@@,${EGDIR},g'
PKG_SYSCONFSUBDIR= jwm
EGDIR= ${PREFIX}/share/examples/jwm
-CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc
+CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc
.include "options.mk"
diff --git a/wm/jwm/options.mk b/wm/jwm/options.mk
index 99ada58a9ea..a01beda043e 100644
--- a/wm/jwm/options.mk
+++ b/wm/jwm/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/08/04 01:08:21 reed Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:27:18 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.jwm
PKG_SUPPORTED_OPTIONS= debug png
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --enable-debug
.if !empty(PKG_OPTIONS:Mpng)
.include "../../graphics/png/buildlink3.mk"
.else
-CONFIGURE_ARGS+= --disable-png
+CONFIGURE_ARGS+= --disable-png
.endif
# TODO: fribidi
diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile
index ee73d84c989..fba8c967af8 100644
--- a/wm/oroborus/Makefile
+++ b/wm/oroborus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:41 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:27:18 wiz Exp $
#
DISTNAME= oroborus_2.0.12-1
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.oroborus.org/
COMMENT= Small and simple window manager for X
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
GNU_CONFIGURE= YES
BUILDLINK_DEPMETHOD.libXt?= build
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 78b037b2cd9..2d0b630473b 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.54 2007/01/07 09:14:15 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2007/02/22 19:27:18 wiz Exp $
-DISTNAME= analog-6.0
+DISTNAME= analog-6.0
CATEGORIES= www
-MASTER_SITES= ${HOMEPAGE} \
+MASTER_SITES= ${HOMEPAGE} \
http://www.web42.com/analog/ \
http://analog.org/loganalysis/ \
http://www.gekko.de/analog/
-MAINTAINER= tron@NetBSD.org
+MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.analog.cx/
COMMENT= Extremely fast program for analysing WWW logfiles
diff --git a/www/ap-Embperl/Makefile b/www/ap-Embperl/Makefile
index 549af564c9a..f8d7f4ece06 100644
--- a/www/ap-Embperl/Makefile
+++ b/www/ap-Embperl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:27:18 wiz Exp $
#
-DISTNAME= HTML-Embperl-1.2.0
-PKGNAME= ap13-Embperl-1.2.0
+DISTNAME= HTML-Embperl-1.2.0
+PKGNAME= ap13-Embperl-1.2.0
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} \
ftp://ftp.dev.ecos.de/pub/perl/embperl/
diff --git a/www/ap-jk/Makefile.common b/www/ap-jk/Makefile.common
index b0ce5dfab8f..dc7f7210f47 100644
--- a/www/ap-jk/Makefile.common
+++ b/www/ap-jk/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/11/15 11:04:04 abs Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/02/22 19:27:18 wiz Exp $
JK_VERSION= 1.2.19
CATEGORIES= www java
@@ -10,8 +10,8 @@ COMMENT= Apache connector for accessing Jakarta Tomcat
CONFLICTS= ap-jk-[0-9]*
-PATCHDIR= ${.CURDIR}/../../www/ap-jk/patches
-DISTINFO_FILE= ${.CURDIR}/../../www/ap-jk/distinfo
+PATCHDIR= ${.CURDIR}/../../www/ap-jk/patches
+DISTINFO_FILE= ${.CURDIR}/../../www/ap-jk/distinfo
WRKSRC= ${WRKDIR}/${DISTNAME}/native
APACHE_MODULE= YES
diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile
index 9c77a3de1ba..356aeaf451f 100644
--- a/www/ap-throttle/Makefile
+++ b/www/ap-throttle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/07 11:51:58 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:18 wiz Exp $
DISTNAME= mod_throttle312
PKGNAME= ap13-throttle-3.1.2
@@ -12,7 +12,7 @@ COMMENT= Apache module for limiting bandwidth usage
CONFLICTS= ap-throttle-[0-9]*
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/ap13-/mod_/}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/ap13-/mod_/}
APACHE_MODULE_NAME= mod_throttle.so
APACHE_MODULE_SRC= mod_throttle.c
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 211bc4d2e7b..94d74ead3d7 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/10/04 22:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/22 19:27:18 wiz Exp $
DISTNAME= modxslt-1.1
PKGNAME= ap13-xslt-1.1
@@ -14,7 +14,7 @@ CONFLICTS= ap-xslt-[0-9]*
WRKSRC= ${WRKDIR}/modxslt
APACHE_MODULE_NAME= mod_xslt.so
-LDFLAGS+= -lsablot
+LDFLAGS+= -lsablot
.include "../../www/apache/module.mk"
diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index 7776d3e720a..b2cfb38ac94 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2006/11/13 11:25:16 abs Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:19 wiz Exp $
-DISTNAME= apache-tomcat-${TOMCAT_VERSION}
+DISTNAME= apache-tomcat-${TOMCAT_VERSION}
CATEGORIES= www java
# The list of sites to download is generated by an apache website.
# The getsite.sh script parses the HTML and extracts the urls.
@@ -15,7 +15,7 @@ USE_JAVA= run
# This needs java 1.5 or higher.
USE_JAVA2= 1.5
-TOMCAT_LIB= ${PREFIX}/tomcat
+TOMCAT_LIB= ${PREFIX}/tomcat
CATALINA_DIR= Catalina/localhost
EGDIR= ${TOMCAT_LIB}/share/examples/apache-tomcat
@@ -31,8 +31,8 @@ EXTRACT_USING= gtar
PKG_SYSCONFDIR.apache-tomcat= ${TOMCAT_LIB}/conf
MAKE_DIRS= ${PKG_SYSCONFDIR.apache-tomcat}/${CATALINA_DIR}
-CONFLICTS+= jakarta-tomcat55-[0-9]*
-CONFLICTS+= jakarta-tomcat-[0-9]*
+CONFLICTS+= jakarta-tomcat55-[0-9]*
+CONFLICTS+= jakarta-tomcat-[0-9]*
RCD_SCRIPTS= tomcat
CFILES= server.xml web.xml tomcat-users.xml
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 1a03a85818b..716ab218cf5 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2007/01/24 19:46:45 epg Exp $
+# $NetBSD: Makefile,v 1.111 2007/02/22 19:27:19 wiz Exp $
.include "Makefile.common"
@@ -108,7 +108,7 @@ RCD_SCRIPTS= apache
REQD_DIRS= ${PREFIX}/share/httpd
REQD_DIRS+= ${PREFIX}/share/httpd/htdocs
-OWN_DIRS= ${VARBASE}/log/httpd
+OWN_DIRS= ${VARBASE}/log/httpd
OWN_DIRS+= ${VARBASE}/db/httpd
OWN_DIRS_PERMS+= ${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
FIX_PERMS= apachectl apxs dbmmanage envvars-std mkcert
diff --git a/www/apache2/options.mk b/www/apache2/options.mk
index 8e01c928110..67d30d215d7 100644
--- a/www/apache2/options.mk
+++ b/www/apache2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/08/30 06:16:27 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2007/02/22 19:27:19 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.apache
PKG_SUPPORTED_OPTIONS= suexec
@@ -19,10 +19,10 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \
--with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q} \
--with-suexec-logfile=${APACHE_SUEXEC_LOGFILE:Q}
-APACHE_MODULES+= suexec
-CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
-BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS
-PLIST_SUBST+= SUEXEC_COMMENT=
+APACHE_MODULES+= suexec
+CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
+BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS
+PLIST_SUBST+= SUEXEC_COMMENT=
.else
-PLIST_SUBST+= SUEXEC_COMMENT="@comment "
+PLIST_SUBST+= SUEXEC_COMMENT="@comment "
.endif
diff --git a/www/august/Makefile b/www/august/Makefile
index ed3741f0c1d..13a4cfd6d4b 100644
--- a/www/august/Makefile
+++ b/www/august/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/10/20 20:25:04 reed Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:19 wiz Exp $
#
DISTNAME= august0.63b.src
@@ -13,7 +13,7 @@ COMMENT= Simple Tk-based HTML editor
NO_BUILD= yes
USE_LANGUAGES= # none
-USE_TOOLS+= wish:run
+USE_TOOLS+= wish:run
INSTALLATION_DIRS= bin share/doc/august
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index 433a8b42bcc..de67e676f8a 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/02/18 11:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:27:19 wiz Exp $
#
DISTNAME= checkbot-1.79
@@ -9,10 +9,10 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://degraaff.org/checkbot/
COMMENT= Verify links on a set of HTML pages
-DEPENDS+= p5-MailTools>=1.03:../../mail/p5-MailTools
-DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net
-DEPENDS+= p5-URI>=1.10:../../www/p5-URI
-DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww
+DEPENDS+= p5-MailTools>=1.03:../../mail/p5-MailTools
+DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net
+DEPENDS+= p5-URI>=1.10:../../www/p5-URI
+DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/www/clearsilver/Makefile.common b/www/clearsilver/Makefile.common
index 92e1d34aff0..1ba63be0092 100644
--- a/www/clearsilver/Makefile.common
+++ b/www/clearsilver/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.7 2005/10/29 19:29:52 epg Exp $
+# $NetBSD: Makefile.common,v 1.8 2007/02/22 19:27:19 wiz Exp $
DISTNAME= clearsilver-0.10.1
-CLEARSILVER_BASE= ${DISTNAME:S/-/-base-/}
+CLEARSILVER_BASE= ${DISTNAME:S/-/-base-/}
CATEGORIES= www
MASTER_SITES= http://www.clearsilver.net/downloads/
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.clearsilver.net/
COMMENT= Fast, powerful, language-neutral HTML template system
DISTINFO_FILE= ${.CURDIR}/../../www/clearsilver/distinfo
-FILESDIR= ${.CURDIR}/../../www/clearsilver/files
+FILESDIR= ${.CURDIR}/../../www/clearsilver/files
PATCHDIR= ${.CURDIR}/../../www/clearsilver/patches
GNU_CONFIGURE= yes
diff --git a/www/drivel/hacks.mk b/www/drivel/hacks.mk
index 6f56f976929..fe9b0ce5665 100644
--- a/www/drivel/hacks.mk
+++ b/www/drivel/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2005/07/12 17:37:52 kristerw Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/02/22 19:27:19 wiz Exp $
.include "../../mk/bsd.prefs.mk"
@@ -6,6 +6,6 @@
# defined, unless _XOPEN_SOURCE_EXTENDED also is defined
.if ${OPSYS} == "NetBSD"
.if empty(OS_VERSION:N1.[56]*)
-CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
+CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
.endif
.endif
diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index e6a581f2ac1..84f9d8feb6b 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/31 21:54:18 adrianp Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:19 wiz Exp $
DISTNAME= drupal-4.7.6
CATEGORIES= www
@@ -27,7 +27,7 @@ SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-install
SUBST_FILES.conf= drupal.conf
SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g"
-SUBST_MESSAGE.conf= Fixing configuration files.
+SUBST_MESSAGE.conf= Fixing configuration files.
.include "../../mk/apachever.mk"
.include "../../lang/php/phpversion.mk"
diff --git a/www/firefox-bin-acroread/Makefile b/www/firefox-bin-acroread/Makefile
index 62c25ce50f0..cae7199934c 100644
--- a/www/firefox-bin-acroread/Makefile
+++ b/www/firefox-bin-acroread/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:19 wiz Exp $
-DISTNAME= MozillaFirebird-bin-acroread-1.0
+DISTNAME= MozillaFirebird-bin-acroread-1.0
PKGREVISION= 1
MAINTAINER= kei@NetBSD.org
diff --git a/www/firefox-bin-acroread5/Makefile b/www/firefox-bin-acroread5/Makefile
index 94bf0030354..42e95d0bb16 100644
--- a/www/firefox-bin-acroread5/Makefile
+++ b/www/firefox-bin-acroread5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:19 wiz Exp $
-DISTNAME= MozillaFirebird-bin-acroread5-1.0
+DISTNAME= MozillaFirebird-bin-acroread5-1.0
PKGREVISION= 1
MAINTAINER= kei@NetBSD.org
diff --git a/www/firefox-bin-acroread7/Makefile b/www/firefox-bin-acroread7/Makefile
index ac6cd04cbce..a8407c5a1a9 100644
--- a/www/firefox-bin-acroread7/Makefile
+++ b/www/firefox-bin-acroread7/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:20 wiz Exp $
-DISTNAME= MozillaFirebird-bin-acroread7-1.0
+DISTNAME= MozillaFirebird-bin-acroread7-1.0
PKGREVISION= 1
MAINTAINER= kei@NetBSD.org
diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common
index 2d146404bac..aa51a54d923 100644
--- a/www/firefox-bin-flash/Makefile.common
+++ b/www/firefox-bin-flash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2007/02/01 13:49:40 ghen Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/02/22 19:27:20 wiz Exp $
DISTNAME= install_flash_player_9_${DISTUNAME}
PKGNAME= ${MOZ_BIN}-flash-${FLASH_VERS:S/r/./}
@@ -8,7 +8,7 @@ MASTER_SITES= http://download.macromedia.com/get/flashplayer/current/
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE?= http://www.flash.com/
-ONLY_FOR_PLATFORM= *-*-i386
+ONLY_FOR_PLATFORM= *-*-i386
DIST_SUBDIR= flash/${FLASH_VERS}
@@ -23,7 +23,7 @@ WRKNAME= install_flash_player_9_${DISTUNAME}
DISTINFO_FILE= ${.CURDIR}/../../www/firefox-bin-flash/distinfo
LICENSE= flash-license
-RESTRICTED= Redistribution not permitted
+RESTRICTED= Redistribution not permitted
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/www/firefox-bin/Makefile.NetBSD.i386 b/www/firefox-bin/Makefile.NetBSD.i386
index a24e88ef917..119d0eef50c 100644
--- a/www/firefox-bin/Makefile.NetBSD.i386
+++ b/www/firefox-bin/Makefile.NetBSD.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.9 2006/06/09 16:37:18 salo Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.10 2007/02/22 19:27:19 wiz Exp $
BUILD_DEFS+= MOZILLA_USE_LINUX
@@ -6,7 +6,7 @@ BUILD_DEFS+= MOZILLA_USE_LINUX
ONLY_FOR_PLATFORM+= NetBSD-*-i386
. include "Makefile.Linux.i386"
. if defined(SUSE_PREFER) && !empty(SUSE_PREFER:M10.0)
-DEPENDS+= suse_compat>=10.0:../../emulators/suse100_compat
+DEPENDS+= suse_compat>=10.0:../../emulators/suse100_compat
. endif
.else
PKG_SKIP_REASON+= "No native pre-built NetBSD binary available."
diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index a32df3a9afa..3f8ad386e40 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/15 15:00:44 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:20 wiz Exp $
#
DISTNAME= geeklog-${VER}
@@ -59,13 +59,13 @@ SUBST_CLASSES+= paths
SUBST_FILES.paths+= ${WRKDIR}/README ${WRKDIR}/createdb.php
SUBST_FILES.paths+= ${WRKSRC}/config.php ${WRKSRC}/emailgeeklogstories
SUBST_FILES.paths+= ${WRKSRC}/public_html/lib-common.php
-SUBST_SED.paths+= -e 's,@GEEKLOG_DIR@,${GEEKLOG_DIR:Q},g'
-SUBST_SED.paths+= -e 's,@GEEKLOG_EXAMPLESDIR@,${GEEKLOG_EXAMPLESDIR:Q},g'
-SUBST_SED.paths+= -e 's,@GEEKLOG_PUBDIR@,${GEEKLOG_PUBDIR:Q},g'
-SUBST_SED.paths+= -e 's,@GEEKLOG_SITESUBDIR@,${GEEKLOG_SITESUBDIR:Q},g'
-SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g'
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX:Q},g'
-SUBST_STAGE.paths= post-configure
+SUBST_SED.paths+= -e 's,@GEEKLOG_DIR@,${GEEKLOG_DIR:Q},g'
+SUBST_SED.paths+= -e 's,@GEEKLOG_EXAMPLESDIR@,${GEEKLOG_EXAMPLESDIR:Q},g'
+SUBST_SED.paths+= -e 's,@GEEKLOG_PUBDIR@,${GEEKLOG_PUBDIR:Q},g'
+SUBST_SED.paths+= -e 's,@GEEKLOG_SITESUBDIR@,${GEEKLOG_SITESUBDIR:Q},g'
+SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g'
+SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX:Q},g'
+SUBST_STAGE.paths= post-configure
SUBST_CLASSES+= conf
SUBST_FILES.conf+= ${WRKDIR}/geeklog.conf
diff --git a/www/geeklog/Makefile.common b/www/geeklog/Makefile.common
index 0cdd94a8339..c78dc08ffaf 100644
--- a/www/geeklog/Makefile.common
+++ b/www/geeklog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/06/18 08:34:05 taca Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/02/22 19:27:20 wiz Exp $
#
GEEKLOG_BASE= share/geeklog
@@ -11,7 +11,7 @@ GEEKLOG_DIR= ${PREFIX}/${GEEKLOG_BASE}
# Geeklog public area
GEEKLOG_PUBDIR= ${PREFIX}/${GEEKLOG_PUB}
-GEEKLOG_DOCDIR= ${PREFIX}/share/doc/geeklog
+GEEKLOG_DOCDIR= ${PREFIX}/share/doc/geeklog
GEEKLOG_EXAMPLESDIR= ${PREFIX}/share/examples/geeklog
GEEKLOG_TMPL_DIR= ${PREFIX}/${GEEKLOG_TMPL}
diff --git a/www/grail/Makefile b/www/grail/Makefile
index b0721daa619..125c7070d71 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:11:24 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:27:20 wiz Exp $
#
DISTNAME= grail-0.6
@@ -11,8 +11,8 @@ MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://grail.sourceforge.net/
COMMENT= Grail(TM) is a web browser written in Python
-NO_CONFIGURE= yes
-NO_BUILD= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
GRAILDIR= share/misc/grail-0.6
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index 21e7f02911d..68738fd5234 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 22:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:20 wiz Exp $
-PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION}
-DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
+PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION}
+DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
PKGREVISION= 2
WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www java
@@ -18,7 +18,7 @@ TOMCAT_VERSION= 4.1.30
USE_JAVA=run
USE_JAVA2=yes
-TOMCAT_LIB= ${PREFIX}/tomcat4
+TOMCAT_LIB= ${PREFIX}/tomcat4
SAMPLECONFDIR= ${TOMCAT_LIB}/conf
PKG_SYSCONFDIR.jakarta-tomcat4= ${SAMPLECONFDIR}
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index 4843e6dcd17..d0022f1a06b 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:20 wiz Exp $
# STOP! Don't update this to a later version of this software.
# The JSDK and Apache Jakarta projects have merged, making the
# jakarta-tomcat package the current version of this software.
@@ -22,7 +22,7 @@ LICENSE= sun-jsdk20-license
USE_JAVA= run
WRKSRC= ${WRKDIR}/JSDK2.0
-BUILD_DEFS+= JSDK_HOME
+BUILD_DEFS+= JSDK_HOME
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index 7932263af33..c20ed543b68 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2007/01/26 02:53:43 markd Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:20 wiz Exp $
DISTNAME= kdewebdev-${_KDE_VERSION}
CATEGORIES= www
-COMMENT= HTML editor and tools suitable for experienced web developers
+COMMENT= HTML editor and tools suitable for experienced web developers
.include "../../meta-pkgs/kde3/Makefile.kde3"
diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk
index 3b472e893d5..02955d42b88 100644
--- a/www/lighttpd/options.mk
+++ b/www/lighttpd/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2006/08/14 22:37:21 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2007/02/22 19:27:20 wiz Exp $
-PKG_OPTIONS_VAR = PKG_OPTIONS.lighttpd
-PKG_SUPPORTED_OPTIONS= bzip fam gdbm inet6 ldap lua mysql ssl memcache
+PKG_OPTIONS_VAR = PKG_OPTIONS.lighttpd
+PKG_SUPPORTED_OPTIONS= bzip fam gdbm inet6 ldap lua mysql ssl memcache
PKG_SUGGESTED_OPTIONS= inet6 ssl
.include "../../mk/bsd.options.mk"
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index f960e528648..e01fa83a2bd 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.84 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile.common,v 1.85 2007/02/22 19:27:20 wiz Exp $
#
# Common include file for communicator and navigator packages
@@ -82,7 +82,7 @@ DEPENDS+= ns-flash>4.0:../../multimedia/ns-flash
. endif
.if ${BINNAME} == "communicator"
-BUILD_DEPENDS= binpatch>=1.0:../../pkgtools/binpatch
+BUILD_DEPENDS= binpatch>=1.0:../../pkgtools/binpatch
post-install:
${SH} ../../www/navigator/files/binpatch-x86-unknown-linux2.2-4.80.sh \
@@ -110,10 +110,10 @@ PKG_FAIL_REASON+= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)"
. endif
NS_VERS= 4.79
PKGNAME= ${BINNAME}-${NS_VERS}
-DISTUNAME= sparc-sun-solaris2.5.1
-DIST_DIR_NAME= supported/sunos551
-WRKNAME= sparc-sun-solaris2.5.1
-VENDOR_NAME= Solaris 2.5.1
+DISTUNAME= sparc-sun-solaris2.5.1
+DIST_DIR_NAME= supported/sunos551
+WRKNAME= sparc-sun-solaris2.5.1
+VENDOR_NAME= Solaris 2.5.1
# powerpc is "unusual"
.elif ${MACHINE_ARCH} == "powerpc"
@@ -194,7 +194,7 @@ SUB= english/${NS_VERS}/unix/${DIST_DIR_NAME}/${DIST_SDIR_NAME}
BUILD_DEFS+= NS_ENCRYPTION
DIST_SUBDIR= netscape
-WRKSRC= ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
+WRKSRC= ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
MOZILLA_HOME= ${PREFIX}/lib/netscape/${NS_NAME}
NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins
diff --git a/www/opera-acroread/Makefile b/www/opera-acroread/Makefile
index 2d65607613a..897672404ac 100644
--- a/www/opera-acroread/Makefile
+++ b/www/opera-acroread/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2006/06/30 13:57:16 salo Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:20 wiz Exp $
-DISTNAME= opera-acroread-1.0
+DISTNAME= opera-acroread-1.0
PKGREVISION= 3
MAINTAINER= jschauma@NetBSD.org
diff --git a/www/opera-acroread5/Makefile b/www/opera-acroread5/Makefile
index 7ca29bd2609..6aa54c42fcf 100644
--- a/www/opera-acroread5/Makefile
+++ b/www/opera-acroread5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2006/06/30 13:57:16 salo Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:27:21 wiz Exp $
-DISTNAME= opera-acroread5-1.0
+DISTNAME= opera-acroread5-1.0
PKGREVISION= 3
MAINTAINER= jschauma@NetBSD.org
diff --git a/www/opera-acroread7/Makefile b/www/opera-acroread7/Makefile
index 5afa4fdf4cd..f6a46fd84b7 100644
--- a/www/opera-acroread7/Makefile
+++ b/www/opera-acroread7/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2006/08/06 05:20:40 kristerw Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:21 wiz Exp $
-DISTNAME= opera-acroread7-1.0
+DISTNAME= opera-acroread7-1.0
PKGREVISION= 2
MAINTAINER= jschauma@NetBSD.org
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index f73852c2d54..dcedc31f738 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/17 13:26:28 obache Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:21 wiz Exp $
DISTNAME= Apache-Session-Wrapper-0.31
PKGNAME= p5-${DISTNAME}
@@ -9,9 +9,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Apache-Session-Wrapper/
COMMENT= Perl5 module doing a wrapper around Apache::Session
-DEPENDS+= p5-Class-Container-[0-9]*:../../devel/p5-Class-Container
-DEPENDS+= p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
-DEPENDS+= p5-Apache-Session>=1.6:../../www/p5-Apache-Session
+DEPENDS+= p5-Class-Container-[0-9]*:../../devel/p5-Class-Container
+DEPENDS+= p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
+DEPENDS+= p5-Apache-Session>=1.6:../../www/p5-Apache-Session
PERL5_MODULE_TYPE= Module::Build
PERL5_PACKLIST= auto/Apache/Session/Wrapper/.packlist
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index ca56a28fdb0..1e2c9acc3bf 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:00 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:21 wiz Exp $
#
-DISTNAME= CGI-Kwiki-0.18
-PKGNAME= p5-${DISTNAME}
+DISTNAME= CGI-Kwiki-0.18
+PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5ckw
PKGREVISION= 2
CATEGORIES= www perl5
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 6cf4ff604ad..630e9ac6f76 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/02/22 19:27:21 wiz Exp $
#
VERS= 3.20
-DISTNAME= CGI.pm-${VERS}
-PKGNAME= p5-CGI-${VERS}
+DISTNAME= CGI.pm-${VERS}
+PKGNAME= p5-CGI-${VERS}
SVR4_PKGNAME= p5cgi
CATEGORIES= www perl5
MASTER_SITES+= ${MASTER_SITE_PERL_CPAN:=CGI/}
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 6118b8be2de..4ae39d55648 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2005/08/06 06:19:38 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:21 wiz Exp $
#
NAME= CGI-Lite-2.02
-DISTNAME= ${NAME}
-PKGNAME= p5-${NAME}
+DISTNAME= ${NAME}
+PKGNAME= p5-${NAME}
SVR4_PKGNAME= p5cgl
PKGREVISION= 1
CATEGORIES= www perl5
diff --git a/www/p5-FCGI/Makefile b/www/p5-FCGI/Makefile
index 38f6d5fe340..efe6633cd7f 100644
--- a/www/p5-FCGI/Makefile
+++ b/www/p5-FCGI/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:31:01 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:21 wiz Exp $
#
PKGVER= 0.67
-DISTNAME= FCGI-${PKGVER}
-PKGNAME= p5-FCGI-${PKGVER}
+DISTNAME= FCGI-${PKGVER}
+PKGNAME= p5-FCGI-${PKGVER}
SVR4_PKGNAME= p5fcg
PKGREVISION= 2
CATEGORIES= www perl5
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index fed51ba1c4f..31c88c7e371 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:27:21 wiz Exp $
DISTNAME= HTML-Mason-1.3101
PKGNAME= p5-HTML-Mason-1.31.1
@@ -11,8 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.masonhq.com/
COMMENT= Perl-based web site development and delivery system
-DEPENDS+= p5-Cache-Cache>=1.0:../../devel/p5-Cache-Cache
-DEPENDS+= p5-Params-Validate>=0.04:../../devel/p5-Params-Validate
+DEPENDS+= p5-Cache-Cache>=1.0:../../devel/p5-Cache-Cache
+DEPENDS+= p5-Params-Validate>=0.04:../../devel/p5-Params-Validate
DEPENDS+= p5-Exception-Class>=1.14:../../devel/p5-Exception-Class
DEPENDS+= p5-Class-Container>=0.10:../../devel/p5-Class-Container
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 6ad32bded6c..db89389dc6a 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:21 wiz Exp $
#
DISTNAME= HTTP-DAV-0.31
@@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://webdav.org/perldav/
COMMENT= HTTP::DAV interface and 'dave'
-DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
DEPENDS+= p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM
PERL5_PACKLIST= auto/HTTP/DAV/.packlist
diff --git a/www/p5-HTTP-Request-Form/Makefile b/www/p5-HTTP-Request-Form/Makefile
index 09571a91878..aee88cb2d8c 100644
--- a/www/p5-HTTP-Request-Form/Makefile
+++ b/www/p5-HTTP-Request-Form/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:21 wiz Exp $
#
DISTNAME= HTTP-Request-Form-0.7
@@ -11,10 +11,10 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTTP/}
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Construct HTTP::Request objects for form processing
-DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
-DEPENDS+= p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
-DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
+DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+= p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
+DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
PERL5_PACKLIST= auto/HTTP/Request/Form/.packlist
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 2c72ad922ec..517c55b185a 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/23 06:07:50 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:27:21 wiz Exp $
DISTNAME= HTTPD-User-Manage-1.58
PKGNAME= p5-${DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://stein.cshl.org/~lstein/user_manage/
COMMENT= Perl script/modules for managing web access control
-PERL5_PACKLIST= auto/HTTPD-User-Manage/.packlist
+PERL5_PACKLIST= auto/HTTPD-User-Manage/.packlist
REPLACE_PERL= user_manage
INSTALLATION_DIRS= bin libexec/cgi-bin share/doc/user_manage
diff --git a/www/p5-Kwiki-Archive-Rcs/Makefile b/www/p5-Kwiki-Archive-Rcs/Makefile
index d604cef57c0..ca43477cf32 100644
--- a/www/p5-Kwiki-Archive-Rcs/Makefile
+++ b/www/p5-Kwiki-Archive-Rcs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Archive-Rcs-0.15
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Archive-Rcs-0.15
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-BreadCrumbs/Makefile b/www/p5-Kwiki-BreadCrumbs/Makefile
index d3aa70b2dca..f8cecda8647 100644
--- a/www/p5-Kwiki-BreadCrumbs/Makefile
+++ b/www/p5-Kwiki-BreadCrumbs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-BreadCrumbs-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-BreadCrumbs-0.12
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Edit-RequireUserName/Makefile b/www/p5-Kwiki-Edit-RequireUserName/Makefile
index ef9b4fb31e2..30495b506b2 100644
--- a/www/p5-Kwiki-Edit-RequireUserName/Makefile
+++ b/www/p5-Kwiki-Edit-RequireUserName/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Edit-RequireUserName-0.02
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Edit-RequireUserName-0.02
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/JPEREGR/}
diff --git a/www/p5-Kwiki-Favorites/Makefile b/www/p5-Kwiki-Favorites/Makefile
index 01d89036251..e2710036a1a 100644
--- a/www/p5-Kwiki-Favorites/Makefile
+++ b/www/p5-Kwiki-Favorites/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Favorites-0.13
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Favorites-0.13
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-HtmlBlocks/Makefile b/www/p5-Kwiki-HtmlBlocks/Makefile
index 6f5725ca602..d68308f47b4 100644
--- a/www/p5-Kwiki-HtmlBlocks/Makefile
+++ b/www/p5-Kwiki-HtmlBlocks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-HtmlBlocks-0.11
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-HtmlBlocks-0.11
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Icons-Gnome/Makefile b/www/p5-Kwiki-Icons-Gnome/Makefile
index e5a91da0587..b8edc3bae3c 100644
--- a/www/p5-Kwiki-Icons-Gnome/Makefile
+++ b/www/p5-Kwiki-Icons-Gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Icons-Gnome-0.14
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Icons-Gnome-0.14
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-NewPage/Makefile b/www/p5-Kwiki-NewPage/Makefile
index 4d782dd6da2..504aaacc25c 100644
--- a/www/p5-Kwiki-NewPage/Makefile
+++ b/www/p5-Kwiki-NewPage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-NewPage-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-NewPage-0.12
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Notify-Mail/Makefile b/www/p5-Kwiki-Notify-Mail/Makefile
index 1efc5ef5287..68efe26054b 100644
--- a/www/p5-Kwiki-Notify-Mail/Makefile
+++ b/www/p5-Kwiki-Notify-Mail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2006/05/01 15:10:12 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Notify-Mail-0.04
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Notify-Mail-0.04
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-PagePrivacy/Makefile b/www/p5-Kwiki-PagePrivacy/Makefile
index 821912b677b..8d7b4df83f4 100644
--- a/www/p5-Kwiki-PagePrivacy/Makefile
+++ b/www/p5-Kwiki-PagePrivacy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-PagePrivacy-0.10
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-PagePrivacy-0.10
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-ParagraphBlocks/Makefile b/www/p5-Kwiki-ParagraphBlocks/Makefile
index 80156bd7bc4..ff4cba239ab 100644
--- a/www/p5-Kwiki-ParagraphBlocks/Makefile
+++ b/www/p5-Kwiki-ParagraphBlocks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-ParagraphBlocks-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-ParagraphBlocks-0.12
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-PreformattedBlocks/Makefile b/www/p5-Kwiki-PreformattedBlocks/Makefile
index 3dc4416d370..4934c0c259c 100644
--- a/www/p5-Kwiki-PreformattedBlocks/Makefile
+++ b/www/p5-Kwiki-PreformattedBlocks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-PreformattedBlocks-0.11
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-PreformattedBlocks-0.11
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-RecentChanges/Makefile b/www/p5-Kwiki-RecentChanges/Makefile
index 1ecf3513756..98c152587fa 100644
--- a/www/p5-Kwiki-RecentChanges/Makefile
+++ b/www/p5-Kwiki-RecentChanges/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-RecentChanges-0.13
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-RecentChanges-0.13
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Revisions/Makefile b/www/p5-Kwiki-Revisions/Makefile
index a4cef4645ac..3624a2d7c35 100644
--- a/www/p5-Kwiki-Revisions/Makefile
+++ b/www/p5-Kwiki-Revisions/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Revisions-0.15
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Revisions-0.15
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Scode/Makefile b/www/p5-Kwiki-Scode/Makefile
index 7a9346dba7f..d079c5cab6a 100644
--- a/www/p5-Kwiki-Scode/Makefile
+++ b/www/p5-Kwiki-Scode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Scode-0.03
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Scode-0.03
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 2
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Search/Makefile b/www/p5-Kwiki-Search/Makefile
index d7732615bd1..b4b52820320 100644
--- a/www/p5-Kwiki-Search/Makefile
+++ b/www/p5-Kwiki-Search/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Search-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Search-0.12
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Simple-Server-HTTP/Makefile b/www/p5-Kwiki-Simple-Server-HTTP/Makefile
index aa799f412e3..82961b1707b 100644
--- a/www/p5-Kwiki-Simple-Server-HTTP/Makefile
+++ b/www/p5-Kwiki-Simple-Server-HTTP/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/02 04:51:01 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Simple-Server-HTTP-0.03
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Simple-Server-HTTP-0.03
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-UserName/Makefile b/www/p5-Kwiki-UserName/Makefile
index 7c7eaf2d881..864603cbe16 100644
--- a/www/p5-Kwiki-UserName/Makefile
+++ b/www/p5-Kwiki-UserName/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-UserName-0.14
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-UserName-0.14
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-UserPreferences/Makefile b/www/p5-Kwiki-UserPreferences/Makefile
index 42b38e0bc81..586a4d3079b 100644
--- a/www/p5-Kwiki-UserPreferences/Makefile
+++ b/www/p5-Kwiki-UserPreferences/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-UserPreferences-0.13
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-UserPreferences-0.13
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Weather/Makefile b/www/p5-Kwiki-Weather/Makefile
index 9d737754317..697eeb40805 100644
--- a/www/p5-Kwiki-Weather/Makefile
+++ b/www/p5-Kwiki-Weather/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Weather-0.05
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Weather-0.05
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Wikiwyg/Makefile b/www/p5-Kwiki-Wikiwyg/Makefile
index 024dcb8ca53..ffbbebddd52 100644
--- a/www/p5-Kwiki-Wikiwyg/Makefile
+++ b/www/p5-Kwiki-Wikiwyg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/02 14:18:43 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Wikiwyg-0.13
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Wikiwyg-0.13
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Zipcode/Makefile b/www/p5-Kwiki-Zipcode/Makefile
index 04cc0d5be85..142184a3cb2 100644
--- a/www/p5-Kwiki-Zipcode/Makefile
+++ b/www/p5-Kwiki-Zipcode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Zipcode-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Zipcode-0.12
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki/Makefile b/www/p5-Kwiki/Makefile
index 97b85706fd2..5cb9d3fe7f8 100644
--- a/www/p5-Kwiki/Makefile
+++ b/www/p5-Kwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/03/14 16:04:46 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-0.38
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-0.38
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 9e446f9e095..504858d5254 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/11/05 17:37:55 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2007/02/22 19:27:24 wiz Exp $
DISTNAME= libwww-perl-5.805
PKGNAME= p5-${DISTNAME:S/-perl-/-/}
@@ -21,7 +21,7 @@ DEPENDS+= p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
DEPENDS+= p5-MIME-Base64>=2.1:../../converters/p5-MIME-Base64
DEPENDS+= p5-Net>=1.09:../../net/p5-Net # for Net::FTP>=2.58
DEPENDS+= p5-URI>=1.10:../../www/p5-URI
-DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
+DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
PERL5_PACKLIST= auto/LWP/.packlist
MAKE_PARAMS= -n
diff --git a/www/py-django/options.mk b/www/py-django/options.mk
index 5a3ad6c9ff6..6e3b50462b2 100644
--- a/www/py-django/options.mk
+++ b/www/py-django/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2007/02/20 11:57:41 joerg Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:27:24 wiz Exp $
-PKG_OPTIONS_VAR = PKG_OPTIONS.django
-PKG_SUPPORTED_OPTIONS= mysql psycopg1 psycopg2 sqlite
+PKG_OPTIONS_VAR = PKG_OPTIONS.django
+PKG_SUPPORTED_OPTIONS= mysql psycopg1 psycopg2 sqlite
PKG_SUGGESTED_OPTIONS= psycopg1
.include "../../mk/bsd.options.mk"
diff --git a/www/py-pcgi/Makefile b/www/py-pcgi/Makefile
index 092899642ab..f450523c0d3 100644
--- a/www/py-pcgi/Makefile
+++ b/www/py-pcgi/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2006/06/25 09:46:53 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:24 wiz Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= py-pcgi-2.2.2
PKGREVISION= 2
CATEGORIES= www python
-MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
+MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/www/py-zpublisher/Makefile b/www/py-zpublisher/Makefile
index 325e133d072..0a3cecd34cb 100644
--- a/www/py-zpublisher/Makefile
+++ b/www/py-zpublisher/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:42 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:24 wiz Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= py-zpublisher-2.2.2
PKGREVISION= 1
CATEGORIES= www python
-MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
+MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index aaff99a7c68..cc942f081ac 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/22 19:27:24 wiz Exp $
DISTNAME= swish-e-2.4.3
PKGREVISION= # empty
@@ -6,8 +6,8 @@ CATEGORIES= www textproc
MASTER_SITES= http://swish-e.org/distribution/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://swish-e.org/
-COMMENT= Simple web indexing for humans - enhanced
+HOMEPAGE= http://swish-e.org/
+COMMENT= Simple web indexing for humans - enhanced
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/www/tinyproxy/options.mk b/www/tinyproxy/options.mk
index ab055b9c4d3..e9406a451c3 100644
--- a/www/tinyproxy/options.mk
+++ b/www/tinyproxy/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/02 17:06:04 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:27:24 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.tinyproxy
PKG_SUPPORTED_OPTIONS+= socks5
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS+= socks5
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Msocks5)
-CONFIGURE_ARGS+= --enable-socks
-BUILDLINK_TRANSFORM+= l:socks:socks5
+CONFIGURE_ARGS+= --enable-socks
+BUILDLINK_TRANSFORM+= l:socks:socks5
.include "../../net/socks5/buildlink3.mk"
.endif
diff --git a/www/wApua/Makefile b/www/wApua/Makefile
index 20f1a0fbcb8..4b7f72fb5b1 100644
--- a/www/wApua/Makefile
+++ b/www/wApua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/14 14:35:49 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:24 wiz Exp $
#
DISTNAME= wApua-0.05.1
@@ -16,7 +16,7 @@ DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net
-PERL5_PACKLIST= auto/wApua/.packlist
+PERL5_PACKLIST= auto/wApua/.packlist
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wApua
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 271b358658b..807fa59245b 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/01/07 09:14:15 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2007/02/22 19:27:24 wiz Exp $
#
DISTNAME= webalizer-2.01-10-src
@@ -16,7 +16,7 @@ COMMENT= Web server log file analysis program
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --enable-dns
CONFIGURE_ENV+= ac_cv_GDLIB=${BUILDLINK_PREFIX.gd}/include
@@ -38,7 +38,7 @@ SUBST_FILES.webalizer= sample.conf webalizer.1
SUBST_SED.webalizer= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
PKG_OPTIONS_VAR= PKG_OPTIONS.webalizer
-PKG_SUPPORTED_OPTIONS= geoip
+PKG_SUPPORTED_OPTIONS= geoip
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgeoip)
diff --git a/www/whisker/Makefile b/www/whisker/Makefile
index 47d7ca77c04..7c87ccdd861 100644
--- a/www/whisker/Makefile
+++ b/www/whisker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:24 wiz Exp $
DISTNAME= whisker-2.1
PKGREVISION= 1
@@ -6,7 +6,7 @@ CATEGORIES= security www
MASTER_SITES= http://www.wiretrip.net/rfp/bins/whisker/
MAINTAINER= adrianp@stindustries.net
-HOMEPAGE= http://www.wiretrip.net/rfp/
+HOMEPAGE= http://www.wiretrip.net/rfp/
COMMENT= URL scanner used to search for known vulnerable CGIs on websites
DEPENDS+= p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index a621a8a2cf9..0d513a2c486 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/07/19 19:48:21 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:24 wiz Exp $
-DISTNAME= wwwcount2.5
-PKGNAME= wwwcount-2.5
+DISTNAME= wwwcount2.5
+PKGNAME= wwwcount-2.5
PKGREVISION= 1
-CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_BACKUP}
+CATEGORIES= www
+MASTER_SITES= ${MASTER_SITE_BACKUP}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.muquit.com/muquit/software/Count/Count.html
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 14b8dbcf63d..33897919ee5 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/10/23 11:06:23 rillig Exp $
+# $NetBSD: Makefile,v 1.68 2007/02/22 19:27:25 wiz Exp $
DISTNAME= wwwoffle-2.9a
PKGREVISION= 1
@@ -17,19 +17,19 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle
-PKG_SYSCONFSUBDIR= wwwoffle
+PKG_SYSCONFSUBDIR= wwwoffle
CONF_FILES+= ${PREFIX}/share/examples/wwwoffle/wwwoffle.conf ${PKG_SYSCONFDIR}/wwwoffle.conf
CONF_FILES_MODE= 0640
PLIST_SUBST+= GZIP_CMD=${GZIP_CMD:Q}
RCD_SCRIPTS= wwwoffled
-SUBST_CLASSES+= fix-paths
-SUBST_STAGE.fix-paths= pre-configure
-SUBST_MESSAGE.fix-paths= Fixing absolute paths.
-SUBST_FILES.fix-paths= cache/search/namazu/scripts/wwwoffle-namazu
-SUBST_FILES.fix-paths+= cache/search/hyperestraier/scripts/wwwoffle-estseek
-SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_CLASSES+= fix-paths
+SUBST_STAGE.fix-paths= pre-configure
+SUBST_MESSAGE.fix-paths= Fixing absolute paths.
+SUBST_FILES.fix-paths= cache/search/namazu/scripts/wwwoffle-namazu
+SUBST_FILES.fix-paths+= cache/search/hyperestraier/scripts/wwwoffle-estseek
+SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g'
.include "options.mk"
diff --git a/www/zope-confera/Makefile b/www/zope-confera/Makefile
index d82d54a7001..93ff93e9a03 100644
--- a/www/zope-confera/Makefile
+++ b/www/zope-confera/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 03:50:43 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:25 wiz Exp $
#
DISTNAME= Confera-1.2.0-nonbin
PKGNAME= zope-confera-1.2.0
PKGREVISION= 1
CATEGORIES= www
-MASTER_SITES= http://www.zope.org/Download/Prereleases/Confera/
+MASTER_SITES= http://www.zope.org/Download/Prereleases/Confera/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/www/zope/Makefile b/www/zope/Makefile
index b47481e871c..9fe536e69c4 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2005/12/30 13:24:34 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:27:25 wiz Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= zope-2.2.2
PKGREVISION= 1
CATEGORIES= www
-MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
+MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 224d92f7cbe..6537645bacd 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/09/10 00:56:53 taca Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:25 wiz Exp $
# FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp
DISTNAME= Zope-2.9.4-final
@@ -15,7 +15,7 @@ COMMENT= Zope, the Z Object Publishing Environment
DEPENDS+= ${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml
-DIST_SUBDIR= zope
+DIST_SUBDIR= zope
PYTHON_VERSIONS_ACCEPTED= 24
RCD_SCRIPTS= ${PKGBASE}29 zeo29
diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile
index d298feeaef0..256828d46e6 100644
--- a/x11/Xfixes/Makefile
+++ b/x11/Xfixes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/07/31 21:29:16 reed Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:27:25 wiz Exp $
#
DISTNAME= libXfixes-2.0.1
@@ -20,7 +20,7 @@ USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= xfixes.pc.in
+PKGCONFIG_OVERRIDE+= xfixes.pc.in
.include "../../mk/bsd.prefs.mk"
.if (${OPSYS} == "Darwin")
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index c2c4ec985f9..39c97ab8a0c 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2007/02/22 19:27:25 wiz Exp $
#
-DISTNAME= XmHTML-1.1.7
+DISTNAME= XmHTML-1.1.7
PKGREVISION= 6
CATEGORIES= x11
-MASTER_SITES= http://www.xs4all.nl/~ripley/XmHTML/dist/
+MASTER_SITES= http://www.xs4all.nl/~ripley/XmHTML/dist/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.xs4all.nl/~ripley/XmHTML/
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index 135db3e0fee..6df3872aa6f 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:27:25 wiz Exp $
#
DISTNAME= libXrandr-1.0.2
@@ -21,7 +21,7 @@ USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= xrandr.pc.in
+PKGCONFIG_OVERRIDE+= xrandr.pc.in
BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index 42ee549c4b0..3ecf052ae71 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile.common,v 1.14 2007/02/22 19:27:26 wiz Exp $
#
DISTNAME= dfm-0.99.9
@@ -7,7 +7,7 @@ MASTER_SITES= http://www.kaisersite.de/dfm/
WRKSRC= ${WRKDIR}/dfm
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-imlib-icons
+CONFIGURE_ARGS+= --enable-imlib-icons
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/imlib/buildlink3.mk"
diff --git a/x11/fixesproto/builtin.mk b/x11/fixesproto/builtin.mk
index cd1705df929..faa3b6bbb16 100644
--- a/x11/fixesproto/builtin.mk
+++ b/x11/fixesproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/12/16 01:04:43 joerg Exp $
+# $NetBSD: builtin.mk,v 1.6 2007/02/22 19:27:26 wiz Exp $
BUILTIN_PKG:= fixesproto
@@ -22,7 +22,7 @@ IS_BUILTIN.fixesproto= no
# Here, we skip checking whether the files are under ${LOCALBASE} since
# we'll consider this X11 package to be built-in even if it's a part
# of one of the pkgsrc-installed X11 distributions.
-#
+#
. if empty(H_XFIXESPROTO:M__nonexistent__) && \
empty(H_XFIXESWIRE:M__nonexistent__)
IS_BUILTIN.fixesproto= yes
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 981f9a529bb..7d53a01633d 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2007/01/02 12:42:45 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2007/02/22 19:27:26 wiz Exp $
DISTNAME= fltk-1.1.7-source
PKGNAME= ${DISTNAME:S/-source//}
@@ -32,10 +32,10 @@ CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL:Q}
CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= ac_cv_have_overlay=yes
.if exists(./descr)
-PLIST_SUBST+= WITH_LINKS="@comment "
+PLIST_SUBST+= WITH_LINKS="@comment "
.else
CONFIGURE_ARGS+= --with-links
-PLIST_SUBST+= WITH_LINKS=""
+PLIST_SUBST+= WITH_LINKS=""
.endif
.include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 02f5e25bfa8..54bb9e82d48 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:27:26 wiz Exp $
#
DISTNAME= gnome-mag-0.13.1
@@ -16,7 +16,7 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= gnome-mag-1.0.pc.in
+PKGCONFIG_OVERRIDE+= gnome-mag-1.0.pc.in
BUILDLINK_DEPMETHOD.libXt?= build
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 90b045874a3..b8dc2bdbe16 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2007/02/02 20:07:38 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2007/02/22 19:27:26 wiz Exp $
#
DISTNAME= gnome-panel-2.16.3
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in
#CPPFLAGS+= -DPANEL_GNOME_LOGO_ICON="\"netbsd-logo-icon-transparent\""
-GCONF2_SCHEMAS= clock.schemas
+GCONF2_SCHEMAS= clock.schemas
GCONF2_SCHEMAS+= fish.schemas
GCONF2_SCHEMAS+= panel-global.schemas
GCONF2_SCHEMAS+= panel-general.schemas
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 6c2f02241e3..b88e5ab5abf 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2007/01/16 20:43:06 joerg Exp $
+# $NetBSD: Makefile,v 1.80 2007/02/22 19:27:26 wiz Exp $
#
DISTNAME= gnome-session-2.16.2
@@ -26,7 +26,7 @@ MAKE_ENV+= REAL_GCONFTOOL=${GCONFTOOL2:Q}
CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-GCONF2_SCHEMAS= gnome-session.schemas
+GCONF2_SCHEMAS= gnome-session.schemas
BUILDLINK_API_DEPENDS.esound+= esound>=0.2.26
BUILDLINK_API_DEPENDS.gnome-keyring+= gnome-keyring>=0.5.1
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index fda62880029..6c65716a226 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2007/01/15 23:30:38 joerg Exp $
+# $NetBSD: Makefile,v 1.75 2007/02/22 19:27:27 wiz Exp $
#
DISTNAME= control-center-2.16.2
@@ -31,7 +31,7 @@ PKGCONFIG_OVERRIDE+= libwindow-settings/gnome-window-settings-2.0.pc
INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
INSTALL_MAKE_FLAGS+= vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
-GCONF2_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas
+GCONF2_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas
GCONF2_SCHEMAS+= apps_gnome_settings_daemon_keybindings.schemas
GCONF2_SCHEMAS+= apps_gnome_settings_daemon_screensaver.schemas
GCONF2_SCHEMAS+= desktop_gnome_font_rendering.schemas
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 40d2d3c2a86..af2ac57288a 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2007/01/13 00:43:41 joerg Exp $
+# $NetBSD: Makefile,v 1.63 2007/02/22 19:27:27 wiz Exp $
#
DISTNAME= gnome-terminal-2.16.1
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_LIBTOOL= YES
-GCONF2_SCHEMAS= gnome-terminal.schemas
+GCONF2_SCHEMAS= gnome-terminal.schemas
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 55b68c78398..56177c8ed92 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/09/16 12:20:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.49 2007/02/22 19:27:27 wiz Exp $
#
DISTNAME= gnopernicus-1.1.1
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --disable-gtk-doc
-PKGCONFIG_OVERRIDE+= gnopernicus-1.0.pc.in
+PKGCONFIG_OVERRIDE+= gnopernicus-1.0.pc.in
GCONF2_SCHEMAS+= brlmonitor.schemas
GCONF2_SCHEMAS+= gnopernicus.schemas
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index afa435b36a0..1295e2c485b 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2007/02/07 20:38:04 abs Exp $
+# $NetBSD: Makefile,v 1.123 2007/02/22 19:27:27 wiz Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGREVISION= 2
@@ -123,8 +123,8 @@ GCC_REQD+= 2.95
#
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc")
-CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g}
-CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
+CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g}
+CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
. endif
diff --git a/x11/kmessage/Makefile b/x11/kmessage/Makefile
index 58fff117da1..1483351895e 100644
--- a/x11/kmessage/Makefile
+++ b/x11/kmessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:27 wiz Exp $
DISTNAME= kmessage-0.1
PKGREVISION= 10
@@ -7,12 +7,12 @@ MASTER_SITES= http://soliton.wins.uva.nl/~wijnhout/kmessage/
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://soliton.wins.uva.nl/~wijnhout/kmessage/
-COMMENT= KMessage is an xmessage clone for KDE
+COMMENT= KMessage is an xmessage clone for KDE
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
BUILDLINK_DEPMETHOD.libXt?= build
diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile
index 66e417cc74e..9eb2deece38 100644
--- a/x11/py-Pmw/Makefile
+++ b/x11/py-Pmw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:31:10 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:27:27 wiz Exp $
#
DISTNAME= Pmw.1.2
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://pmw.sourceforge.net/
COMMENT= Python meta widgets
-PLIST_SRC= ${WRKDIR}/.PLIST_SRC
+PLIST_SRC= ${WRKDIR}/.PLIST_SRC
WRKSRC= ${WRKDIR}/Pmw
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 29fcda6317f..b7cdebca1dd 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/01/19 18:04:03 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/22 19:27:27 wiz Exp $
#
DISTNAME= sip-4.3.2
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= CFLAGS_SHLIB=-fPIC
CONFIGURE_ARGS+= CXXFLAGS_SHLIB=-fPIC
.if ${OPSYS} == "SunOS" && !empty(CC_VERSION:Mgcc*)
# gcc3 uses -mimpure-text to not pass -assert pure-text to the linker
-CONFIGURE_ARGS+= LFLAGS_SHLIB="-shared -mimpure-text"
+CONFIGURE_ARGS+= LFLAGS_SHLIB="-shared -mimpure-text"
.else
CONFIGURE_ARGS+= LFLAGS_SHLIB="-shared"
.endif
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 9ff4a3cc7f9..f467fca115c 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.62 2007/01/10 10:16:01 joerg Exp $
+# $NetBSD: Makefile.common,v 1.63 2007/02/22 19:27:27 wiz Exp $
DISTNAME= qt-x11-free-${QTVERSION}
CATEGORIES= x11
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
LIBQT?= -lqt-mt
MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
-MAKE_ENV+= QTDIR=${WRKSRC:Q}
+MAKE_ENV+= QTDIR=${WRKSRC:Q}
# avoid creating a .qt directory in the users home
# directory
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 7c3c58b0b2d..783ef60bd0f 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:16 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:27 wiz Exp $
DISTNAME= qwt-0.3.0
PKGREVISION= 5
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwt/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwt/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/qwt
diff --git a/x11/randrproto/builtin.mk b/x11/randrproto/builtin.mk
index 8616e4db31f..94fa8856656 100644
--- a/x11/randrproto/builtin.mk
+++ b/x11/randrproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/12/16 01:04:43 joerg Exp $
+# $NetBSD: builtin.mk,v 1.4 2007/02/22 19:27:27 wiz Exp $
# TODO: builtin.mk failed to use native on XFree86
# the two headers are identical with native XFree86
@@ -22,12 +22,12 @@ IS_BUILTIN.randrproto= no
# Here, we skip checking whether the files are under ${LOCALBASE} since
# we'll consider this X11 package to be built-in even if it's a part
# of one of the pkgsrc-installed X11 distributions.
-#
+#
. if empty(H_RANDR:M__nonexistent__)
IS_BUILTIN.randrproto= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.randrproto
+MAKEVARS+= IS_BUILTIN.randrproto
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
diff --git a/x11/wmavgload/Makefile b/x11/wmavgload/Makefile
index 7e6cb4acf98..c74aa872f46 100644
--- a/x11/wmavgload/Makefile
+++ b/x11/wmavgload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:27 wiz Exp $
DISTNAME= wmavgload-0.7.0
PKGREVISION= 1
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.windowmaker.info/pub/contrib/srcs/utils/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Another WindowMaker load gauge
-USE_IMAKE= YES
+USE_IMAKE= YES
NO_INSTALL_MANPAGES= YES
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index bbf609991c3..b3ba68f0aa1 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/02/04 16:27:42 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:28 wiz Exp $
#
DISTNAME= x11vnc-0.8.4
CATEGORIES= x11 net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
MAINTAINER= obata@lins.jp
HOMEPAGE= http://www.karlrunge.com/x11vnc/
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 1a57675c415..a5f6bd3ae6f 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/22 19:27:28 wiz Exp $
DISTNAME= x3270-3213
PKGNAME= x3270-3.2.13
@@ -7,7 +7,7 @@ CATEGORIES= x11
MASTER_SITES= http://www.geocities.com/SiliconValley/Peaks/7814/
EXTRACT_SUFX= .tgz
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.geocities.com/SiliconValley/Peaks/7814/
COMMENT= 3270 Terminal emulator
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile
index 1c092c4e89a..f8fcdc0c054 100644
--- a/x11/xcursor/Makefile
+++ b/x11/xcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/22 19:27:28 wiz Exp $
#
DISTNAME= libXcursor-1.1.2
@@ -21,7 +21,7 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= xcursor.pc.in
+PKGCONFIG_OVERRIDE+= xcursor.pc.in
BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk
index ce395c4d5c7..8e8dd7e329f 100644
--- a/x11/xextproto/builtin.mk
+++ b/x11/xextproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/12/17 19:10:22 joerg Exp $
+# $NetBSD: builtin.mk,v 1.5 2007/02/22 19:27:28 wiz Exp $
BUILTIN_PKG:= xextproto
@@ -20,7 +20,7 @@ IS_BUILTIN.xextproto= no
# Here, we skip checking whether the files are under ${LOCALBASE} since
# we'll consider this X11 package to be built-in even if it's a part
# of one of the pkgsrc-installed X11 distributions.
-#
+#
. if empty(H_XEXTPROTO:M__nonexistent__)
IS_BUILTIN.xextproto= yes
. endif
diff --git a/x11/xgas/Makefile b/x11/xgas/Makefile
index 7162ef0d48d..0028747076c 100644
--- a/x11/xgas/Makefile
+++ b/x11/xgas/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:45 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:28 wiz Exp $
DISTNAME= xgas
-PKGNAME= xgas-1.0
+PKGNAME= xgas-1.0
PKGREVISION= 2
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.tut.ac.jp/.h3/X11/X11R6/contrib/programs/
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.tut.ac.jp/.h3/X11/X11R6/contrib/programs/
-MAINTAINER= nakai@mlab.t.u-tokyo.ac.jp
+MAINTAINER= nakai@mlab.t.u-tokyo.ac.jp
COMMENT= Animated simulation of an ideal gas
-USE_IMAKE= yes
+USE_IMAKE= yes
post-install:
@${CHMOD} 755 ${PREFIX}/bin/xgas
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index aea9a64c828..8b1180ab719 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:45 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:28 wiz Exp $
#
DISTNAME= xkeycaps-2.46
@@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.jwz.org/xkeycaps/
COMMENT= Graphical front-end to xmodmap
-USE_IMAKE= yes
+USE_IMAKE= yes
pre-configure:
.if (${MACHINE_ARCH} == "m68k")
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 852bd07b2df..fe9cdf8ada5 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile.common,v 1.47 2007/02/22 19:27:28 wiz Exp $
#
# This Makefile.common is included by:
#
@@ -8,7 +8,7 @@
# If these packages are updated, please remember to reset any PKGREVISIONs
# in those Makefiles.
-DISTNAME= xlockmore-5.23
+DISTNAME= xlockmore-5.23
CATEGORIES= x11
MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
@@ -51,12 +51,12 @@ CPPFLAGS+= ${DEFINES}
CXXFLAGS+= ${DEFINES}
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --without-motif
-CONFIGURE_ARGS+= --without-editres
-CONFIGURE_ARGS+= --without-dtsaver
-CONFIGURE_ARGS+= --without-rplay
-CONFIGURE_ARGS+= --without-nas
-CONFIGURE_ARGS+= --without-gtk
+CONFIGURE_ARGS+= --without-motif
+CONFIGURE_ARGS+= --without-editres
+CONFIGURE_ARGS+= --without-dtsaver
+CONFIGURE_ARGS+= --without-rplay
+CONFIGURE_ARGS+= --without-nas
+CONFIGURE_ARGS+= --without-gtk
.if ${OPSYS} == "NetBSD"
XLOCK_AUDIOPLAY?= /usr/bin/audioplay
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index b7b961592d1..7a9d78cee88 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:28 wiz Exp $
DISTNAME= xmascot2.5p2
-PKGNAME= xmascot-2.5p2
+PKGNAME= xmascot-2.5p2
PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://cclub.tutcc.tut.ac.jp/pub/xmascot/
diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile
index 39de66928cc..0e08ffe354e 100644
--- a/x11/xnodecor/Makefile
+++ b/x11/xnodecor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/15 18:13:31 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:28 wiz Exp $
DISTNAME= xnodecor-0.1
PKGREVISION= 1
@@ -8,7 +8,7 @@ DISTFILES= xnodecor.c
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= # none
-COMMENT= Borderless or undecorated window support utility
+COMMENT= Borderless or undecorated window support utility
USE_X11BASE= yes
NO_CONFIGURE= yes
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 367dbf53dcc..e8504c406c2 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/12/15 20:33:06 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/22 19:27:28 wiz Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-clients-${XORG_VER}
@@ -26,10 +26,10 @@ USE_TOOLS+= perl:run imake
REPLACE_PERL+= fonts/util/bdftruncate.pl
# XXX TODO: define build's VarDirectory to pkgsrc's VARBASE
-OWN_DIRS= ${VARBASE}/lib/xdm
-OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm/authdir \
+OWN_DIRS= ${VARBASE}/lib/xdm
+OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm/authdir \
${ROOT_USER} ${ROOT_GROUP} 0700
-OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm/authdir/authfiles \
+OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm/authdir/authfiles \
${ROOT_USER} ${ROOT_GROUP} 0700
EGDIR= ${PREFIX}/share/examples/xorg/xdm
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index ff5261c72f8..9c83fd08f57 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:27:29 wiz Exp $
#
DISTNAME= xphoon.tar
@@ -14,7 +14,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Set the root window to the moon in its current phase
WRKSRC= ${WRKDIR}/xphoon
-USE_IMAKE= yes
+USE_IMAKE= yes
MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index fd99ed797ca..1cbe3e9996a 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/01/26 18:22:48 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2007/02/22 19:27:29 wiz Exp $
DISTNAME= xplanet-1.2.0
PKGREVISION= 3
@@ -20,9 +20,9 @@ XPLANET_DIRS= arcs config fonts images markers origin
XPLANET_DIRS+= satellites scripts spice stars
INSTALLATION_DIRS+= ${XPLANET_DIRS:C,.*,share/xplanet/&,g}
-PKG_OPTIONS_VAR= PKG_OPTIONS.xplanet
-PKG_SUPPORTED_OPTIONS= x11
-PKG_SUGGESTED_OPTIONS= x11
+PKG_OPTIONS_VAR= PKG_OPTIONS.xplanet
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 99d73bf8046..41dafe52ba4 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/01/07 09:14:16 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:27:29 wiz Exp $
#
PKGNAME= ${DISTNAME:S/-/-demo-/}
@@ -12,8 +12,8 @@ USE_DIRS+= xdg-1.1
USE_TOOLS+= pkg-config
-CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2}
-CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
+CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2}
+CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
BUILD_DIRS= ${WRKSRC}/utils ${WRKSRC}/driver
diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile
index cdd4fe72d3b..490d371be12 100644
--- a/x11/xservers/Makefile
+++ b/x11/xservers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/04/22 09:22:18 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:29 wiz Exp $
DISTNAME= xservers-3.3.6.5
PKGREVISION= 2
@@ -21,7 +21,7 @@ X11_SUBDIR= X11R6.3
MESSAGE_SUBST+= X11_SUBDIR=${X11_SUBDIR}
-BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/X11R6.3/lib
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/X11R6.3/lib
do-configure:
${SED} -e 's#@PROJECTROOT@#${PREFIX}/${X11_SUBDIR}#' \
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index d647361accf..65d1c77b74d 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:46 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 19:27:29 wiz Exp $
DISTNAME= xsnow-1.42
PKGREVISION= 2
@@ -16,7 +16,7 @@ USE_IMAKE= yes
.if !empty(LOWER_OPSYS:Mirix5*)
# needs snprintf()
. include "../../pkgtools/libnbcompat/buildlink3.mk"
-IMAKEOPTS+= -DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q}
+IMAKEOPTS+= -DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q}
.endif
.include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index fd3c85ac4d9..3b8d4ffa076 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:27:29 wiz Exp $
DISTNAME= xview3.2p1-X11R6
PKGNAME= xview-config-3.2.1
@@ -13,7 +13,7 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
EXTRACT_ELEMENTS= ${DISTNAME}/config
-WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS}
+WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS}
USE_IMAKE= yes
post-extract:
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index c182965f502..472d14a63df 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/12/27 13:37:47 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/22 19:27:30 wiz Exp $
DISTNAME= xview3.2p1-X11R6
PKGNAME= xview-lib-3.2.1
@@ -13,7 +13,7 @@ DEPENDS+= xview-config>=3.2.1nb2:../../x11/xview-config
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
# builds, but binaries in../xview-clients all crash
-NOT_FOR_PLATFORM= *-*-alpha
+NOT_FOR_PLATFORM= *-*-alpha
USE_IMAKE= yes
diff --git a/x11/xview/Makefile b/x11/xview/Makefile
index bd795e32b26..747a4d69664 100644
--- a/x11/xview/Makefile
+++ b/x11/xview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:29 wiz Exp $
#
DISTNAME= xview3.2p1-X11R6
@@ -15,7 +15,7 @@ DEPENDS+= xview-config>=3.2.1:../../x11/xview-config
DEPENDS+= xview-lib>=3.2.1:../../x11/xview-lib
DEPENDS+= xview-clients>=3.2.1:../../x11/xview-clients
-NOT_FOR_PLATFORM= *-*-alpha # broken va_arg handling in xview-lib
+NOT_FOR_PLATFORM= *-*-alpha # broken va_arg handling in xview-lib
USE_X11BASE= yes