summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/advancecomp/hacks.mk4
-rw-r--r--archivers/dar/hacks.mk4
-rw-r--r--archivers/p7zip/Makefile4
-rw-r--r--archivers/par2/hacks.mk4
-rw-r--r--audio/SDL-nas/Makefile4
-rw-r--r--audio/bmp/Makefile4
-rw-r--r--audio/cam/Makefile4
-rw-r--r--audio/cmp3/Makefile6
-rw-r--r--audio/daapd/Makefile6
-rw-r--r--audio/dap/Makefile4
-rw-r--r--audio/eawpatches/Makefile4
-rw-r--r--audio/esound/Makefile4
-rw-r--r--audio/faad2/Makefile4
-rw-r--r--audio/festival/Makefile42
-rw-r--r--audio/festvox-aec/Makefile4
-rw-r--r--audio/gkrellm-xmms/Makefile4
-rw-r--r--audio/gramofile/Makefile4
-rw-r--r--audio/guspatches/Makefile5
-rw-r--r--audio/icecast1/Makefile3
-rw-r--r--audio/juke/Makefile4
-rw-r--r--audio/lame/Makefile4
-rw-r--r--audio/libid3tag/Makefile4
-rw-r--r--audio/libmad/Makefile4
-rw-r--r--audio/libsndfile/Makefile4
-rw-r--r--audio/libvorbis/Makefile4
-rw-r--r--audio/madman/Makefile4
-rw-r--r--audio/madplay/Makefile4
-rw-r--r--audio/moc/distinfo4
-rw-r--r--audio/moc/patches/patch-aa3
-rw-r--r--audio/moss/Makefile4
-rw-r--r--audio/mp3asm/Makefile5
-rw-r--r--audio/mp3blaster/Makefile4
-rw-r--r--audio/mpg123-esound/Makefile4
-rw-r--r--audio/mpg123/Makefile.common4
-rw-r--r--audio/muse/Makefile6
-rw-r--r--audio/musicbox/Makefile4
-rw-r--r--audio/musicpd/Makefile4
-rw-r--r--audio/nspmod/Makefile4
-rw-r--r--audio/oss/Makefile6
-rw-r--r--audio/p5-MP3-Tag/Makefile4
-rw-r--r--audio/portaudio/Makefile3
-rw-r--r--audio/rio500/Makefile7
-rw-r--r--audio/rplay/Makefile3
-rw-r--r--audio/speex/Makefile4
-rw-r--r--audio/spiralloops/Makefile4
-rw-r--r--audio/spiralsynth/Makefile4
-rw-r--r--audio/splay/Makefile5
-rw-r--r--audio/sweep/Makefile4
-rw-r--r--audio/toolame/Makefile4
-rw-r--r--audio/tracker/Makefile4
-rw-r--r--audio/tremor-tools/Makefile4
-rw-r--r--audio/tremor/Makefile4
-rw-r--r--audio/ubs/Makefile8
-rw-r--r--audio/vorbis-tools/Makefile4
-rw-r--r--audio/xamp/Makefile4
-rw-r--r--audio/xmcd/Makefile8
-rw-r--r--audio/xmms-blursk/Makefile4
-rw-r--r--audio/xmms-esound/Makefile4
-rw-r--r--audio/xmms-fmradio/Makefile4
-rw-r--r--audio/xmms-iris/Makefile4
-rw-r--r--audio/xmms-mad/Makefile4
-rw-r--r--audio/xmms-tv-scope/Makefile4
-rw-r--r--audio/xmms/Makefile.common4
-rw-r--r--audio/xsidplay/Makefile4
-rw-r--r--benchmarks/iozone/Makefile18
-rw-r--r--benchmarks/kttcp/Makefile6
-rw-r--r--benchmarks/lmbench/Makefile4
-rw-r--r--benchmarks/lmbench/distinfo6
-rw-r--r--benchmarks/lmbench/patches/patch-ae4
-rw-r--r--benchmarks/lmbench/patches/patch-ak4
-rw-r--r--benchmarks/netio/Makefile4
-rw-r--r--benchmarks/ttcp/Makefile8
-rw-r--r--benchmarks/ttcp/distinfo4
-rw-r--r--benchmarks/ttcp/patches/patch-ab4
-rw-r--r--benchmarks/ubench/Makefile4
-rw-r--r--biology/clustalw/Makefile4
-rw-r--r--biology/hmmer/Makefile4
-rw-r--r--biology/mummer/Makefile6
-rw-r--r--biology/rasmol/Makefile10
-rw-r--r--cad/fastcap/Makefile4
-rw-r--r--cad/fasthenry/Makefile4
-rw-r--r--cad/felt/Makefile8
-rw-r--r--cad/gtkwave/Makefile3
-rw-r--r--cad/magic/Makefile4
-rw-r--r--cad/mcalc/Makefile4
-rw-r--r--cad/mex-wcalc/Makefile4
-rw-r--r--cad/oct-wcalc/Makefile4
-rw-r--r--cad/qcad/Makefile4
-rw-r--r--cad/sci-wcalc/Makefile4
-rw-r--r--cad/simian/Makefile4
-rw-r--r--cad/tkgate/Makefile6
-rw-r--r--cad/wcalc/Makefile.common8
-rw-r--r--chat/aim/Makefile4
-rw-r--r--chat/bitlbee/Makefile3
-rw-r--r--chat/bnc/Makefile7
-rw-r--r--chat/bsflite/Makefile4
-rw-r--r--chat/centericq/Makefile6
-rw-r--r--chat/cgiirc/Makefile4
-rw-r--r--chat/fugu/Makefile4
-rw-r--r--chat/gale/Makefile6
-rw-r--r--chat/goofey/Makefile4
-rw-r--r--chat/gossip/Makefile4
-rw-r--r--chat/gtmess/Makefile4
-rw-r--r--chat/i2cbd/Makefile6
-rw-r--r--chat/icbirc/distinfo4
-rw-r--r--chat/icbirc/patches/patch-aa4
-rw-r--r--chat/iip/Makefile4
-rw-r--r--chat/ircII/Makefile4
-rw-r--r--chat/ircd-hybrid/Makefile8
-rw-r--r--chat/irchat-pj/Makefile4
-rw-r--r--chat/ircservices/Makefile8
-rw-r--r--chat/ircu/Makefile4
-rw-r--r--chat/irssi/Makefile4
-rw-r--r--chat/jabberd/Makefile11
-rw-r--r--chat/jabberd2/Makefile18
-rw-r--r--chat/kadu/Makefile4
-rw-r--r--chat/licq-gui-qt/Makefile4
-rw-r--r--chat/mu-conference/Makefile7
-rw-r--r--chat/p5-POE-Component-IRC/Makefile4
-rw-r--r--chat/psi/Makefile9
-rw-r--r--chat/ser/Makefile4
-rw-r--r--chat/silc-client-icb/Makefile4
-rw-r--r--chat/silc-client/Makefile4
-rw-r--r--chat/silc-server/Makefile6
-rw-r--r--chat/tik/Makefile3
-rw-r--r--chat/weechat/Makefile4
-rw-r--r--chat/xchat-systray-integration/Makefile6
-rw-r--r--chat/ymessenger/Makefile4
-rw-r--r--chat/zephyr-mode/Makefile4
-rw-r--r--chat/zephyr/Makefile3
-rw-r--r--comms/asterisk-sounds-extra/Makefile4
-rw-r--r--comms/asterisk/Makefile3
-rw-r--r--comms/fidogate/Makefile4
-rw-r--r--comms/gkermit/Makefile4
-rw-r--r--comms/hylafax/Makefile6
-rw-r--r--comms/kermit/Makefile4
-rw-r--r--comms/linuxsms/Makefile3
-rw-r--r--comms/lrzsz/Makefile6
-rw-r--r--comms/mgetty+sendfax/Makefile6
-rw-r--r--comms/modemd/Makefile4
-rw-r--r--comms/modemd/distinfo6
-rw-r--r--comms/modemd/patches/patch-ak3
-rw-r--r--comms/modemd/patches/patch-al3
-rw-r--r--comms/pilotmgr/Makefile4
-rw-r--r--converters/base64/Makefile3
-rw-r--r--converters/cbmconvert/Makefile4
-rw-r--r--converters/chef/Makefile4
-rw-r--r--converters/dvi2tty/Makefile4
-rw-r--r--converters/hztty/distinfo4
-rw-r--r--converters/hztty/patches/patch-ab4
-rw-r--r--converters/ja-dvi2tty/Makefile4
-rw-r--r--converters/latex2rtf/Makefile4
-rw-r--r--converters/libiconv/Makefile4
-rw-r--r--converters/p5-chkjis/Makefile3
-rw-r--r--converters/php-iconv/Makefile3
-rw-r--r--converters/rss2html/Makefile4
-rw-r--r--converters/rtf2html/Makefile4
-rw-r--r--converters/txt2man/Makefile6
-rw-r--r--converters/xdeview/Makefile5
-rw-r--r--cross/avr-binutils/Makefile4
-rw-r--r--cross/avr-gcc/Makefile8
-rw-r--r--cross/avr-libc/Makefile13
-rw-r--r--cross/avrdude/Makefile4
-rw-r--r--cross/bfd-crunchide/Makefile4
-rw-r--r--cross/bfd-mdsetimage/Makefile6
-rw-r--r--cross/binutils/Makefile4
-rw-r--r--cross/i386-cygwin32/Makefile4
-rw-r--r--cross/i386-linux/Makefile4
-rw-r--r--cross/i386-mingw32/Makefile6
-rw-r--r--cross/i386-msdosdjgpp/Makefile6
-rw-r--r--cross/i386-netbsdpe/Makefile6
-rw-r--r--cross/mipsEEel-netbsd/Makefile6
-rw-r--r--databases/db/Makefile4
-rw-r--r--databases/db4/Makefile6
-rw-r--r--databases/db4/hacks.mk4
-rw-r--r--databases/dbh/Makefile4
-rw-r--r--databases/gdbm_primitive/Makefile4
-rw-r--r--databases/geneweb/Makefile4
-rw-r--r--databases/gnome-mime-data/Makefile4
-rw-r--r--databases/gramps/Makefile4
-rw-r--r--databases/gramps2/Makefile4
-rw-r--r--databases/gtksql/Makefile4
-rw-r--r--databases/java-db3/Makefile8
-rw-r--r--databases/lbdb/Makefile6
-rw-r--r--databases/libgnomedb/Makefile4
-rw-r--r--databases/libpqxx/Makefile4
-rw-r--r--databases/mysql-client/Makefile.common4
-rw-r--r--databases/mysql-server/Makefile10
-rw-r--r--databases/mysql4-client/Makefile.common4
-rw-r--r--databases/mysql4-server/Makefile10
-rw-r--r--databases/mysql5-server/Makefile8
-rw-r--r--databases/openldap/Makefile4
-rw-r--r--databases/openldap/options.mk4
-rw-r--r--databases/p5-BerkeleyDB/Makefile4
-rw-r--r--databases/p5-DBD-Sybase/Makefile4
-rw-r--r--databases/p5-DBD-postgresql/Makefile6
-rw-r--r--databases/p5-DB_File/Makefile4
-rw-r--r--databases/p5-sybperl/Makefile4
-rw-r--r--databases/php-dba/Makefile3
-rw-r--r--databases/php-dbase/Makefile3
-rw-r--r--databases/php-dbx/Makefile3
-rw-r--r--databases/php-filepro/Makefile3
-rw-r--r--databases/php-mysql/Makefile3
-rw-r--r--databases/php-odbc/Makefile3
-rw-r--r--databases/php-pgsql/Makefile3
-rw-r--r--databases/phpmyadmin/Makefile6
-rw-r--r--databases/postgresql73-client/Makefile3
-rw-r--r--databases/postgresql73-docs/Makefile3
-rw-r--r--databases/postgresql73-plperl/Makefile6
-rw-r--r--databases/postgresql73-pltcl/Makefile9
-rw-r--r--databases/postgresql73-server/Makefile11
-rw-r--r--databases/postgresql74-client/Makefile3
-rw-r--r--databases/postgresql74-contrib/Makefile3
-rw-r--r--databases/postgresql74-plperl/Makefile6
-rw-r--r--databases/postgresql74-plpython/Makefile8
-rw-r--r--databases/postgresql74-server/Makefile11
-rw-r--r--databases/postgresql80-plpython/Makefile4
-rw-r--r--databases/postgresql80-pltcl/Makefile4
-rw-r--r--databases/postgresql80-server/Makefile8
-rw-r--r--databases/postgresql80/Makefile.common4
-rw-r--r--databases/py-pgnotify/Makefile4
-rw-r--r--databases/py-postgresql/Makefile5
-rw-r--r--databases/py-sybase/Makefile4
-rw-r--r--databases/py-table/Makefile4
-rw-r--r--databases/rrdtool/Makefile4
-rw-r--r--databases/sdbm/Makefile4
-rw-r--r--databases/sdbm/distinfo4
-rw-r--r--databases/sdbm/patches/patch-aa6
-rw-r--r--databases/sqsh/Makefile.common4
-rw-r--r--databases/tcl-postgresql73/Makefile8
-rw-r--r--databases/tcl-postgresql74/Makefile8
-rw-r--r--databases/tk-postgresql73/Makefile6
-rw-r--r--databases/unixodbc-DataManager/Makefile8
-rw-r--r--databases/unixodbc-ODBCConfig/Makefile8
-rw-r--r--databases/unixodbc/Makefile6
-rw-r--r--databases/xmysql/Makefile4
-rw-r--r--databases/xmysqladmin/Makefile4
-rw-r--r--databases/xsqlmenu/Makefile4
-rw-r--r--devel/ArX/Makefile4
-rw-r--r--devel/ArX2/Makefile6
-rw-r--r--devel/GConf/Makefile6
-rw-r--r--devel/GConf2/schemas.mk12
-rw-r--r--devel/SDL/Makefile.common6
-rw-r--r--devel/acme/Makefile4
-rw-r--r--devel/adocman/Makefile3
-rw-r--r--devel/aegis/Makefile4
-rw-r--r--devel/allegro/Makefile8
-rw-r--r--devel/apel/Makefile8
-rw-r--r--devel/apr/Makefile4
-rw-r--r--devel/atk/Makefile4
-rw-r--r--devel/automake/Makefile4
-rw-r--r--devel/automake14/Makefile4
-rw-r--r--devel/bcc/Makefile6
-rw-r--r--devel/boehm-gc/Makefile4
-rw-r--r--devel/bonobo/Makefile6
-rw-r--r--devel/bugzilla/Makefile4
-rw-r--r--devel/buildtool-doc/Makefile4
-rw-r--r--devel/buildtool/Makefile6
-rw-r--r--devel/buildtool/buildlink3.mk10
-rw-r--r--devel/cssc/Makefile4
-rw-r--r--devel/cvs/Makefile4
-rw-r--r--devel/cvs2p4/Makefile6
-rw-r--r--devel/cvsgraph/Makefile6
-rw-r--r--devel/cvsps/Makefile4
-rw-r--r--devel/cvsup/Makefile.common4
-rw-r--r--devel/cvsync/Makefile8
-rw-r--r--devel/darcs/distinfo4
-rw-r--r--devel/darcs/patches/patch-aa2
-rw-r--r--devel/ddd/Makefile4
-rw-r--r--devel/diffutils/Makefile4
-rw-r--r--devel/distcc/Makefile8
-rw-r--r--devel/doxygen/Makefile4
-rw-r--r--devel/eclipse/Makefile6
-rw-r--r--devel/elib/Makefile8
-rw-r--r--devel/emacs-ilisp/Makefile4
-rw-r--r--devel/emacs20-elib/Makefile3
-rw-r--r--devel/eric3/Makefile7
-rw-r--r--devel/error/Makefile6
-rw-r--r--devel/error/distinfo6
-rw-r--r--devel/error/patches/patch-ab4
-rw-r--r--devel/error/patches/patch-ac4
-rw-r--r--devel/florist/Makefile4
-rw-r--r--devel/fortran-utils/Makefile6
-rw-r--r--devel/gdb/Makefile4
-rw-r--r--devel/gdb6/Makefile8
-rw-r--r--devel/gettext-lib/Makefile6
-rw-r--r--devel/gettext-m4/Makefile6
-rw-r--r--devel/gettext/Makefile4
-rw-r--r--devel/gindent/Makefile6
-rw-r--r--devel/glib2/Makefile10
-rw-r--r--devel/gmake/Makefile6
-rw-r--r--devel/gnustep-base/Makefile4
-rw-r--r--devel/gnustep-make/Makefile4
-rw-r--r--devel/gnustep-make/gnustep.mk54
-rw-r--r--devel/gtexinfo/Makefile6
-rw-r--r--devel/gtl/Makefile4
-rw-r--r--devel/guile-gtk/Makefile4
-rw-r--r--devel/guile-lib/Makefile6
-rw-r--r--devel/guile14-gtk/Makefile4
-rw-r--r--devel/id-utils/Makefile14
-rw-r--r--devel/jam/Makefile4
-rw-r--r--devel/libFoundation/Makefile4
-rw-r--r--devel/libFoundation/buildlink3.mk10
-rw-r--r--devel/libbonobo/Makefile4
-rw-r--r--devel/libebml/Makefile4
-rw-r--r--devel/libglade/Makefile4
-rw-r--r--devel/libgnome/Makefile4
-rw-r--r--devel/libnet/Makefile4
-rw-r--r--devel/libscsi/Makefile4
-rw-r--r--devel/libstash/Makefile5
-rw-r--r--devel/libstree/Makefile4
-rw-r--r--devel/libstroke/Makefile4
-rw-r--r--devel/libusb/Makefile4
-rw-r--r--devel/m4/Makefile4
-rw-r--r--devel/mantis/Makefile4
-rw-r--r--devel/monotone-server/Makefile7
-rw-r--r--devel/nasm/Makefile6
-rw-r--r--devel/ncurses/Makefile4
-rw-r--r--devel/nspr/Makefile8
-rw-r--r--devel/nss/Makefile6
-rw-r--r--devel/p4-docs/Makefile6
-rw-r--r--devel/p5-Devel-SmallProf/Makefile4
-rw-r--r--devel/p5-File-chdir/Makefile4
-rw-r--r--devel/p5-IO-Pager/Makefile4
-rw-r--r--devel/pango/Makefile4
-rw-r--r--devel/papaya/Makefile6
-rw-r--r--devel/patch/Makefile4
-rw-r--r--devel/pccts/Makefile4
-rw-r--r--devel/pcl-cvs/Makefile4
-rw-r--r--devel/pcre/Makefile4
-rw-r--r--devel/pedisassem/Makefile4
-rw-r--r--devel/php-gettext/Makefile3
-rw-r--r--devel/php-gmp/Makefile3
-rw-r--r--devel/php-pcntl/Makefile3
-rw-r--r--devel/php-posix/Makefile3
-rw-r--r--devel/php-shmop/Makefile3
-rw-r--r--devel/php-sysvsem/Makefile3
-rw-r--r--devel/php-sysvshm/Makefile3
-rw-r--r--devel/pmccabe/Makefile3
-rw-r--r--devel/prcs/Makefile10
-rw-r--r--devel/pwlib/Makefile8
-rw-r--r--devel/py-checker/Makefile6
-rw-r--r--devel/py-curses/Makefile4
-rw-r--r--devel/py-distutils/Makefile4
-rw-r--r--devel/py-expect/Makefile6
-rw-r--r--devel/py-idle/Makefile4
-rw-r--r--devel/py-kjbuckets/Makefile4
-rw-r--r--devel/py-pqueue/Makefile4
-rw-r--r--devel/py-subversion/Makefile6
-rw-r--r--devel/rcs/Makefile6
-rw-r--r--devel/rt3/Makefile.install4
-rw-r--r--devel/ruby-mode/Makefile4
-rw-r--r--devel/ruby-racc/raccversion.mk4
-rw-r--r--devel/ruby-subversion/Makefile4
-rw-r--r--devel/rx/Makefile4
-rw-r--r--devel/sdcc/Makefile4
-rw-r--r--devel/semantic/Makefile4
-rw-r--r--devel/sgi-stl-docs/Makefile4
-rw-r--r--devel/sgi-stl/Makefile4
-rw-r--r--devel/silc-toolkit/Makefile4
-rw-r--r--devel/stlport/Makefile4
-rw-r--r--devel/subversion-base/Makefile8
-rw-r--r--devel/subversion/Makefile.common4
-rw-r--r--devel/swig-perl/Makefile4
-rw-r--r--devel/swig-python/Makefile4
-rw-r--r--devel/sysexits/distinfo2
-rw-r--r--devel/tcllib/Makefile4
-rw-r--r--devel/teem/Makefile6
-rw-r--r--devel/tet3/Makefile6
-rw-r--r--devel/tla/Makefile4
-rw-r--r--devel/tvision/Makefile4
-rw-r--r--devel/ucl/Makefile6
-rw-r--r--devel/unidiff/Makefile4
-rw-r--r--devel/w32api/Makefile4
-rw-r--r--editors/beav/Makefile4
-rw-r--r--editors/bvi/Makefile4
-rw-r--r--editors/ce-doc/Makefile4
-rw-r--r--editors/ce-x11/Makefile4
-rw-r--r--editors/ed/Makefile8
-rw-r--r--editors/elvis-x11/Makefile4
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/emacs/Makefile.common4
-rw-r--r--editors/emacs20/Makefile4
-rw-r--r--editors/hnb/Makefile4
-rw-r--r--editors/jde/Makefile4
-rw-r--r--editors/jed/Makefile4
-rw-r--r--editors/joe/Makefile4
-rw-r--r--editors/lpe/Makefile8
-rw-r--r--editors/lyx-qt/Makefile.common6
-rw-r--r--editors/lyx-xforms/Makefile4
-rw-r--r--editors/manedit/Makefile4
-rw-r--r--editors/mule-ucs/Makefile4
-rw-r--r--editors/ne/Makefile4
-rw-r--r--editors/nvi/Makefile4
-rw-r--r--editors/sam/Makefile4
-rw-r--r--editors/speedbar/Makefile4
-rw-r--r--editors/vim-gtk/Makefile4
-rw-r--r--editors/vim-gtk2/Makefile4
-rw-r--r--editors/vim-lang/Makefile6
-rw-r--r--editors/vim-motif/Makefile8
-rw-r--r--editors/vim-share/Makefile4
-rw-r--r--editors/vim-xaw/Makefile5
-rw-r--r--editors/xemacs-current/options.mk3
-rw-r--r--editors/xemacs/Makefile.common4
-rw-r--r--editors/xemacs/Makefile.pkg4
-rw-r--r--editors/xjed/Makefile4
-rw-r--r--emulators/arnold/Makefile4
-rw-r--r--emulators/atari800/Makefile4
-rw-r--r--emulators/compat12/Makefile12
-rw-r--r--emulators/compat13/Makefile12
-rw-r--r--emulators/compat14-crypto/Makefile14
-rw-r--r--emulators/compat14/Makefile14
-rw-r--r--emulators/compat16/Makefile4
-rw-r--r--emulators/darwin_lib/Makefile4
-rw-r--r--emulators/dosbox/Makefile4
-rw-r--r--emulators/doscmd/Makefile4
-rw-r--r--emulators/fmsx/Makefile4
-rw-r--r--emulators/gens/Makefile4
-rw-r--r--emulators/gpsim-oscilloscope/Makefile3
-rw-r--r--emulators/gpsim-ptyusart/Makefile3
-rw-r--r--emulators/gxemul/Makefile6
-rw-r--r--emulators/hercules/Makefile4
-rw-r--r--emulators/netbsd32_compat14/Makefile14
-rw-r--r--emulators/netbsd32_compat15/Makefile22
-rw-r--r--emulators/netbsd32_compat16/Makefile18
-rw-r--r--emulators/openmsx/Makefile4
-rw-r--r--emulators/palmosemulator/Makefile4
-rw-r--r--emulators/pcemu/Makefile6
-rw-r--r--emulators/peace/Makefile14
-rw-r--r--emulators/pearpc/Makefile4
-rw-r--r--emulators/snes9x/Makefile4
-rw-r--r--emulators/stella/Makefile4
-rw-r--r--emulators/suse91_base/Makefile4
-rw-r--r--emulators/suse91_glx/Makefile3
-rw-r--r--emulators/suse91_gtk2/Makefile6
-rw-r--r--emulators/suse91_slang/Makefile4
-rw-r--r--emulators/suse91_vmware/Makefile4
-rw-r--r--emulators/suse_devel/Makefile6
-rw-r--r--emulators/suse_fileutils/Makefile4
-rw-r--r--emulators/suse_freetype2/Makefile4
-rw-r--r--emulators/suse_linux/arch.mk6
-rw-r--r--emulators/suse_linux/vars.mk6
-rw-r--r--emulators/suse_slang/Makefile4
-rw-r--r--emulators/suse_vmware/Makefile4
-rw-r--r--emulators/tme/distinfo4
-rw-r--r--emulators/tme/patches/patch-aa4
-rw-r--r--emulators/twin/Makefile4
-rw-r--r--emulators/uae/Makefile3
-rw-r--r--emulators/vmware3/Makefile4
-rw-r--r--emulators/wine/Makefile6
-rw-r--r--emulators/xbeeb/Makefile4
-rw-r--r--emulators/xmame/Makefile6
-rw-r--r--emulators/xmess/Makefile6
-rw-r--r--emulators/z26/Makefile4
-rw-r--r--finance/gnucash-docs/Makefile4
-rw-r--r--finance/xfinans/Makefile4
-rw-r--r--fonts/XFree86-fontsEncodings/Makefile4
-rw-r--r--fonts/XFree86-fontsScalable/Makefile5
-rw-r--r--fonts/Xft2/Makefile4
-rw-r--r--fonts/acroread-chsfont/Makefile4
-rw-r--r--fonts/acroread-chtfont/Makefile4
-rw-r--r--fonts/acroread-font-share/Makefile8
-rw-r--r--fonts/acroread-jpnfont/Makefile4
-rw-r--r--fonts/acroread-korfont/Makefile4
-rw-r--r--fonts/acroread5-chsfont/Makefile4
-rw-r--r--fonts/acroread5-chtfont/Makefile4
-rw-r--r--fonts/acroread5-font-share/Makefile8
-rw-r--r--fonts/acroread5-jpnfont/Makefile4
-rw-r--r--fonts/acroread5-korfont/Makefile4
-rw-r--r--fonts/chkfontpath/Makefile4
-rw-r--r--fonts/ec-fonts-mftraced/Makefile6
-rw-r--r--fonts/efont-unicode/Makefile4
-rw-r--r--fonts/freefont-ttf/Makefile4
-rw-r--r--fonts/ghostscript-cidfonts/Makefile8
-rw-r--r--fonts/ghostscript-cmaps/Makefile8
-rw-r--r--fonts/ja-kappa20/Makefile6
-rw-r--r--fonts/ja-shinonome/Makefile6
-rw-r--r--fonts/ko-baekmuk/Makefile4
-rw-r--r--fonts/ko-hanyang/Makefile4
-rw-r--r--fonts/ko-kaist/Makefile4
-rw-r--r--fonts/ko-mizi/Makefile4
-rw-r--r--fonts/mftrace/Makefile6
-rw-r--r--fonts/py-fonttools/Makefile4
-rw-r--r--fonts/ttmkfdir2/Makefile4
-rw-r--r--fonts/vfontcap-kochi/Makefile4
-rw-r--r--fonts/xmbdfed/Makefile3
-rw-r--r--fonts/xorg-fontsEncodings/Makefile.common6
-rw-r--r--games/REminiscence/Makefile4
-rw-r--r--games/abuse/Makefile4
-rw-r--r--games/angband-x11/Makefile4
-rw-r--r--games/colchess-book-colchess/Makefile6
-rw-r--r--games/colchess-book-large/Makefile6
-rw-r--r--games/colchess/Makefile4
-rw-r--r--games/crafty-book-medium/Makefile6
-rw-r--r--games/crafty-book-small/Makefile6
-rw-r--r--games/crafty-doc/Makefile4
-rw-r--r--games/crafty/Makefile4
-rw-r--r--games/dopewars/Makefile6
-rw-r--r--games/exchess-book-medium/Makefile6
-rw-r--r--games/exchess-book-small/Makefile6
-rw-r--r--games/fillets-ng/Makefile4
-rw-r--r--games/fkiss/distinfo4
-rw-r--r--games/fkiss/patches/patch-ad4
-rw-r--r--games/fortunes-calvin/DESCR2
-rw-r--r--games/freeciv-client/Makefile4
-rw-r--r--games/freeciv-server/Makefile6
-rw-r--r--games/freeciv-sounds/Makefile4
-rw-r--r--games/frozen-bubble/Makefile4
-rw-r--r--games/genecys-client/Makefile4
-rw-r--r--games/glaxium/Makefile4
-rw-r--r--games/gnome2-games/Makefile7
-rw-r--r--games/gnuchess-book-medium/Makefile6
-rw-r--r--games/gnuchess-book/Makefile6
-rw-r--r--games/gtkballs/Makefile4
-rw-r--r--games/hugo/Makefile6
-rw-r--r--games/icebreaker/Makefile4
-rw-r--r--games/knightcap-brain/Makefile4
-rw-r--r--games/knightcap/Makefile4
-rw-r--r--games/lbreakout/Makefile4
-rw-r--r--games/level9/Makefile6
-rw-r--r--games/maelstrom-sdl/Makefile4
-rw-r--r--games/maelstrom-x11/Makefile4
-rw-r--r--games/nethack-qt/Makefile4
-rw-r--r--games/nethack-tty/Makefile4
-rw-r--r--games/nethack-x11/Makefile4
-rw-r--r--games/nethack/Makefile4
-rw-r--r--games/nighthawk/Makefile4
-rw-r--r--games/openttd/Makefile6
-rw-r--r--games/powermanga/Makefile4
-rw-r--r--games/qnetwalk/Makefile4
-rw-r--r--games/quake/Makefile6
-rw-r--r--games/quake2forge/Makefile4
-rw-r--r--games/quake6/Makefile6
-rw-r--r--games/rocksndiamonds/Makefile4
-rw-r--r--games/rollemup/Makefile8
-rw-r--r--games/sarien/Makefile4
-rw-r--r--games/sjeng/Makefile4
-rw-r--r--games/sl/Makefile4
-rw-r--r--games/spider/Makefile4
-rw-r--r--games/tileworld/Makefile4
-rw-r--r--games/tuxracer/Makefile4
-rw-r--r--games/wesnoth/Makefile6
-rw-r--r--games/xarchon/Makefile4
-rw-r--r--games/xboard/Makefile4
-rw-r--r--games/xbomb/Makefile6
-rw-r--r--games/xconq/Makefile4
-rw-r--r--games/xdoom/Makefile8
-rw-r--r--games/xemeraldia/Makefile6
-rw-r--r--games/xemeraldia/PLIST4
-rw-r--r--games/xgalaga/Makefile6
-rw-r--r--games/xjump/Makefile4
-rw-r--r--games/xpuyopuyo/Makefile4
-rw-r--r--games/xroach/Makefile6
-rw-r--r--games/xskat/Makefile4
-rw-r--r--games/xsoldier/Makefile4
-rw-r--r--graphics/ImageMagick/Makefile6
-rw-r--r--graphics/MesaDemos/Makefile4
-rw-r--r--graphics/MesaLib/Makefile4
-rw-r--r--graphics/PanoTools/Makefile4
-rw-r--r--graphics/aalib-x11/buildlink3.mk6
-rw-r--r--graphics/barcode/Makefile4
-rw-r--r--graphics/cambevao/Makefile4
-rw-r--r--graphics/cdlabelgen/Makefile6
-rw-r--r--graphics/dia-python/Makefile4
-rw-r--r--graphics/dx/Makefile4
-rw-r--r--graphics/exiv2/Makefile4
-rw-r--r--graphics/freeglut/Makefile4
-rw-r--r--graphics/freetype-lib/Makefile.common8
-rw-r--r--graphics/freetype-utils/Makefile4
-rw-r--r--graphics/freetype2/Makefile6
-rw-r--r--graphics/freetype2/buildlink3.mk4
-rw-r--r--graphics/gdk-pixbuf/Makefile3
-rw-r--r--graphics/gdk-pixbuf/Makefile.common4
-rw-r--r--graphics/gfract/Makefile4
-rw-r--r--graphics/gimp-warp-sharp/Makefile4
-rw-r--r--graphics/gimp1-base/Makefile6
-rw-r--r--graphics/glu/Makefile4
-rw-r--r--graphics/glut/Makefile4
-rw-r--r--graphics/gnome-icon-theme/Makefile4
-rw-r--r--graphics/gnome-icon-theme/buildlink3.mk3
-rw-r--r--graphics/graphviz/Makefile8
-rw-r--r--graphics/hicolor-icon-theme/buildlink3.mk3
-rw-r--r--graphics/iGMT/Makefile4
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/inkscape/Makefile4
-rw-r--r--graphics/jpeg2ps/Makefile8
-rw-r--r--graphics/kbarcode/Makefile4
-rw-r--r--graphics/kdegraphics3/Makefile4
-rw-r--r--graphics/lcms/Makefile4
-rw-r--r--graphics/libcaca/Makefile6
-rw-r--r--graphics/libgdgeda/Makefile4
-rw-r--r--graphics/libungif/Makefile4
-rw-r--r--graphics/lprof/Makefile6
-rw-r--r--graphics/magicpoint/Makefile4
-rw-r--r--graphics/mayavi/Makefile4
-rw-r--r--graphics/netpbm/Makefile12
-rw-r--r--graphics/netpbm/hacks.mk4
-rw-r--r--graphics/ns-cult3d/Makefile4
-rw-r--r--graphics/nvtv/Makefile3
-rw-r--r--graphics/nvtv/Makefile.common4
-rw-r--r--graphics/p5-GD/Makefile4
-rw-r--r--graphics/php-exif/Makefile3
-rw-r--r--graphics/php-gd/Makefile3
-rw-r--r--graphics/phpsview/Makefile3
-rw-r--r--graphics/pixmap/Makefile6
-rw-r--r--graphics/ploticus-examples/Makefile4
-rw-r--r--graphics/png/Makefile10
-rw-r--r--graphics/povray/Makefile4
-rw-r--r--graphics/py-gdchart/Makefile8
-rw-r--r--graphics/py-gimp/Makefile4
-rw-r--r--graphics/py-imagingtk/Makefile6
-rw-r--r--graphics/radiance/Makefile10
-rw-r--r--graphics/s10sh/Makefile4
-rw-r--r--graphics/sane-backends/Makefile.common10
-rw-r--r--graphics/sane-frontends/Makefile6
-rw-r--r--graphics/scigraphica/Makefile4
-rw-r--r--graphics/tuxpaint/Makefile6
-rw-r--r--graphics/urt/Makefile4
-rw-r--r--graphics/vid/Makefile4
-rw-r--r--graphics/vtk-python/Makefile4
-rw-r--r--graphics/wmphoto/Makefile4
-rw-r--r--graphics/xpaint/Makefile6
-rw-r--r--graphics/xpaint/distinfo4
-rw-r--r--graphics/xpaint/patches/patch-af4
-rw-r--r--ham/dpbox/Makefile4
-rw-r--r--ham/tfkiss/Makefile6
-rw-r--r--ham/tlf/Makefile4
-rw-r--r--ham/xlog/Makefile4
-rw-r--r--inputmethod/anthy-elisp/Makefile8
-rw-r--r--inputmethod/canna-dict/Makefile6
-rw-r--r--inputmethod/canna-lib/Makefile6
-rw-r--r--inputmethod/canna-server/MESSAGE10
-rw-r--r--inputmethod/canna-server/Makefile6
-rw-r--r--inputmethod/canna/Makefile.common4
-rw-r--r--inputmethod/imhangul_status_applet/Makefile4
-rw-r--r--inputmethod/ja-freewnn-dict/Makefile4
-rw-r--r--inputmethod/ja-freewnn-server-bin/Makefile6
-rw-r--r--inputmethod/sj3-dict/Makefile6
-rw-r--r--inputmethod/sj3-lib/Makefile4
-rw-r--r--inputmethod/sj3-server-bin/Makefile6
-rw-r--r--inputmethod/skk/Makefile10
-rw-r--r--inputmethod/skkfep/Makefile4
-rw-r--r--inputmethod/skkinput/Makefile4
-rw-r--r--inputmethod/skkserv/Makefile4
-rw-r--r--lang/SmartEiffel/Makefile4
-rw-r--r--lang/blackdown-jdk13/Makefile4
-rw-r--r--lang/blackdown-jre13/Makefile.common4
-rw-r--r--lang/chicken/Makefile4
-rw-r--r--lang/cint/Makefile4
-rw-r--r--lang/clisp/Makefile4
-rw-r--r--lang/drscheme/Makefile4
-rw-r--r--lang/dylan-compiler/Makefile8
-rw-r--r--lang/dylan-interpreter/Makefile.common6
-rw-r--r--lang/eieio/Makefile6
-rw-r--r--lang/elk/Makefile4
-rw-r--r--lang/erlang/Makefile4
-rw-r--r--lang/ezm3/Makefile4
-rw-r--r--lang/f2c/Makefile14
-rw-r--r--lang/f2c/buildlink3.mk10
-rw-r--r--lang/fort77/Makefile4
-rw-r--r--lang/gawk/Makefile4
-rw-r--r--lang/gcc-ssp/Makefile8
-rw-r--r--lang/gcc/Makefile10
-rw-r--r--lang/gcc3-f77/Makefile4
-rw-r--r--lang/gcc3-java/Makefile4
-rw-r--r--lang/gcc3/Makefile.common12
-rw-r--r--lang/gcc34-ada/Makefile16
-rw-r--r--lang/gcc34/Makefile24
-rw-r--r--lang/ghc/Makefile4
-rw-r--r--lang/gpc/Makefile8
-rw-r--r--lang/icon/Makefile6
-rw-r--r--lang/jdk-openjit/Makefile.common6
-rw-r--r--lang/ksi/Makefile4
-rw-r--r--lang/librep/buildlink3.mk4
-rw-r--r--lang/libtcl-nothread/Makefile4
-rw-r--r--lang/mercury/Makefile4
-rw-r--r--lang/mono/Makefile4
-rw-r--r--lang/mpd/Makefile4
-rw-r--r--lang/mzscheme/Makefile4
-rw-r--r--lang/nawk/Makefile6
-rw-r--r--lang/nhc98/Makefile8
-rw-r--r--lang/ocaml/Makefile.common4
-rw-r--r--lang/ocaml/PLIST.stub4
-rw-r--r--lang/onyx/Makefile6
-rw-r--r--lang/opencobol/Makefile4
-rw-r--r--lang/perl5/hacks.mk4
-rw-r--r--lang/php5/MESSAGE3
-rw-r--r--lang/php5/Makefile.common4
-rw-r--r--lang/php5/Makefile.php6
-rw-r--r--lang/pnet/Makefile4
-rw-r--r--lang/py-basicproperty/Makefile4
-rw-r--r--lang/py-funge/Makefile4
-rw-r--r--lang/py-pyrex/Makefile4
-rw-r--r--lang/python15/Makefile4
-rw-r--r--lang/python21/Makefile14
-rw-r--r--lang/python22/Makefile8
-rw-r--r--lang/python23/Makefile4
-rw-r--r--lang/python23/Makefile.common18
-rw-r--r--lang/python24/Makefile20
-rw-r--r--lang/ruby/Makefile.common10
-rw-r--r--lang/ruby/modules.mk4
-rw-r--r--lang/ruby/replace.mk4
-rw-r--r--lang/ruby/rubyversion.mk28
-rw-r--r--lang/ruby18-base/Makefile6
-rw-r--r--lang/sbcl/Makefile6
-rw-r--r--lang/siod/Makefile4
-rw-r--r--lang/smlnj/Makefile.common4
-rw-r--r--lang/snobol/Makefile4
-rw-r--r--lang/sun-jdk13/Makefile4
-rw-r--r--lang/sun-jdk14/Makefile5
-rw-r--r--lang/sun-jdk15/Makefile4
-rw-r--r--lang/sun-jre14/Makefile5
-rw-r--r--lang/sun-jre15/Makefile6
-rw-r--r--lang/swi-prolog-lite/Makefile.common4
-rw-r--r--lang/swi-prolog-packages/Makefile10
-rw-r--r--lang/swi-prolog/Makefile4
-rw-r--r--lang/tcl-itcl-current/Makefile8
-rw-r--r--lang/tcl-itcl/Makefile10
-rw-r--r--lang/tcl-otcl/Makefile4
-rw-r--r--lang/tcl-tclX/Makefile12
-rw-r--r--lang/tcl/Makefile4
-rw-r--r--lang/tcl83/Makefile4
-rw-r--r--lang/tk-tclX/Makefile12
-rw-r--r--lang/ucblogo/Makefile4
-rw-r--r--mail/balsa2/Makefile6
-rw-r--r--mail/bmf/Makefile4
-rw-r--r--mail/clamav/Makefile7
-rw-r--r--mail/clamsmtp/Makefile4
-rw-r--r--mail/coolmail/Makefile4
-rw-r--r--mail/courier-imap/Makefile4
-rw-r--r--mail/cucipop/Makefile8
-rw-r--r--mail/cyrus-imapd/Makefile10
-rw-r--r--mail/cyrus-imapd21/Makefile6
-rw-r--r--mail/dbmail/Makefile4
-rw-r--r--mail/distribute/Makefile6
-rw-r--r--mail/dk-milter/Makefile4
-rw-r--r--mail/dkim-milter/Makefile4
-rw-r--r--mail/dovecot/hacks.mk4
-rw-r--r--mail/drac/Makefile8
-rw-r--r--mail/dspam/Makefile8
-rw-r--r--mail/elm-me/Makefile6
-rw-r--r--mail/elmo/Makefile5
-rw-r--r--mail/evolution/Makefile4
-rw-r--r--mail/exim-html/Makefile6
-rw-r--r--mail/exim/Makefile8
-rw-r--r--mail/exim3/Makefile8
-rw-r--r--mail/exmh/Makefile4
-rw-r--r--mail/faces/Makefile6
-rw-r--r--mail/imap-uw/Makefile6
-rw-r--r--mail/imp4/Makefile6
-rw-r--r--mail/ja-mh/Makefile13
-rw-r--r--mail/ja-mh/distinfo4
-rw-r--r--mail/ja-mh/patches/patch-av4
-rw-r--r--mail/ja-squirrelmail/Makefile4
-rw-r--r--mail/kbiff/Makefile4
-rw-r--r--mail/libesmtp/buildlink3.mk6
-rw-r--r--mail/libetpan/Makefile4
-rw-r--r--mail/mailagent/Makefile15
-rw-r--r--mail/mailcrypt/Makefile4
-rw-r--r--mail/mailgraph/Makefile6
-rw-r--r--mail/mailman/Makefile15
-rw-r--r--mail/mailscanner/Makefile12
-rw-r--r--mail/mailserv/Makefile6
-rw-r--r--mail/mailsync/Makefile4
-rw-r--r--mail/mailwrapper/Makefile6
-rw-r--r--mail/mairix/Makefile4
-rw-r--r--mail/majordomo/Makefile6
-rw-r--r--mail/metamail/Makefile4
-rw-r--r--mail/mew/Makefile8
-rw-r--r--mail/mew3/Makefile8
-rw-r--r--mail/mimedefang/Makefile8
-rw-r--r--mail/mutt-devel/Makefile6
-rw-r--r--mail/mutt/Makefile6
-rw-r--r--mail/nmh/Makefile9
-rw-r--r--mail/nullmailer/Makefile18
-rw-r--r--mail/oe2mbx/Makefile8
-rw-r--r--mail/offlineimap/Makefile4
-rw-r--r--mail/pfqueue/Makefile4
-rw-r--r--mail/php-imap/Makefile5
-rw-r--r--mail/pine/distinfo4
-rw-r--r--mail/pine/patches/patch-ad4
-rw-r--r--mail/popa3d/Makefile6
-rw-r--r--mail/postfix-current/Makefile9
-rw-r--r--mail/postfix/Makefile9
-rw-r--r--mail/postgrey/Makefile9
-rw-r--r--mail/prayer/Makefile12
-rw-r--r--mail/procmail/Makefile4
-rw-r--r--mail/pymsgauth/Makefile4
-rw-r--r--mail/qmail-run/Makefile6
-rw-r--r--mail/qmail/Makefile12
-rw-r--r--mail/qmail/options.mk4
-rw-r--r--mail/ripmime/Makefile4
-rw-r--r--mail/rmail-mime/Makefile6
-rw-r--r--mail/sendmail/Makefile6
-rw-r--r--mail/sendmail/Makefile.common8
-rw-r--r--mail/sendmail812/Makefile.common8
-rw-r--r--mail/smtpfeed/Makefile4
-rw-r--r--mail/spamassassin/Makefile6
-rw-r--r--mail/spamd/Makefile4
-rw-r--r--mail/squirrelmail/Makefile4
-rw-r--r--mail/squirrelmail/plugin.mk4
-rw-r--r--mail/sqwebmail/Makefile4
-rw-r--r--mail/sylpheed-claws/plugins.mk4
-rw-r--r--mail/tmda/Makefile12
-rw-r--r--mail/turba/Makefile4
-rw-r--r--mail/vm/Makefile10
-rw-r--r--mail/wl/Makefile4
-rw-r--r--mail/xmailbox/Makefile6
-rw-r--r--mail/yatsvrs/Makefile8
-rw-r--r--math/R/Makefile6
-rw-r--r--math/calc/Makefile4
-rw-r--r--math/dcdflib.c/Makefile4
-rw-r--r--math/ess/Makefile6
-rw-r--r--math/fftw/Makefile4
-rw-r--r--math/fftw2/Makefile4
-rw-r--r--math/gap/Makefile6
-rw-r--r--math/gap/gap.package.mk4
-rw-r--r--math/gnumeric/Makefile4
-rw-r--r--math/guppi/Makefile4
-rw-r--r--math/octave-current/Makefile6
-rw-r--r--math/octave-current/octave.mk15
-rw-r--r--math/octave-forge/Makefile6
-rw-r--r--math/octave/Makefile4
-rw-r--r--math/octave/octave.mk3
-rw-r--r--math/p5-Math-Pari/Makefile4
-rw-r--r--math/pari/Makefile8
-rw-r--r--math/pspp/Makefile4
-rw-r--r--math/py-Scientific/Makefile10
-rw-r--r--math/py-pytables/Makefile4
-rw-r--r--math/scilab/Makefile16
-rw-r--r--math/scilab/buildlink3.mk6
-rw-r--r--math/snns/Makefile4
-rw-r--r--math/tochnog/Makefile4
-rw-r--r--math/xgap/Makefile4
-rw-r--r--math/xmgr/Makefile4
-rw-r--r--math/yacas/Makefile4
-rw-r--r--mbone/sdr/Makefile4
-rw-r--r--meta-pkgs/XFree86/Makefile4
-rw-r--r--meta-pkgs/XFree86/Makefile.common36
-rw-r--r--meta-pkgs/kde3/kde3.mk8
-rw-r--r--meta-pkgs/xorg/Makefile4
-rw-r--r--meta-pkgs/xorg/Makefile.common38
-rw-r--r--misc/XFree86-dirs/dirs.mk3
-rw-r--r--misc/XFree86-docs/Makefile4
-rw-r--r--misc/XFree86-man/Makefile5
-rw-r--r--misc/asr-manpages/Makefile4
-rw-r--r--misc/bbdb/Makefile4
-rw-r--r--misc/buffer/Makefile4
-rw-r--r--misc/buffer/distinfo4
-rw-r--r--misc/buffer/patches/patch-ac4
-rw-r--r--misc/celestia-gnome/Makefile4
-rw-r--r--misc/celestia-gtk/Makefile4
-rw-r--r--misc/celestia-kde/Makefile4
-rw-r--r--misc/celestia/Makefile.common4
-rw-r--r--misc/chipmunk/Makefile4
-rw-r--r--misc/colorls/Makefile6
-rw-r--r--misc/dialog/Makefile4
-rw-r--r--misc/dirdiff/Makefile4
-rw-r--r--misc/dotfile/Makefile4
-rw-r--r--misc/dpkg/Makefile4
-rw-r--r--misc/dync/Makefile6
-rw-r--r--misc/edict/Makefile4
-rw-r--r--misc/elscreen/Makefile4
-rw-r--r--misc/fd/Makefile4
-rw-r--r--misc/fooseti/Makefile3
-rw-r--r--misc/gnome1-dirs/dirs.mk3
-rw-r--r--misc/gnome2-dirs/dirs.mk3
-rw-r--r--misc/gnuls/Makefile4
-rw-r--r--misc/gone/Makefile4
-rw-r--r--misc/gperiodic/Makefile6
-rw-r--r--misc/heyu/Makefile4
-rw-r--r--misc/iselect/Makefile4
-rw-r--r--misc/ja-man/Makefile8
-rw-r--r--misc/jhd/Makefile4
-rw-r--r--misc/jitterbug/Makefile10
-rw-r--r--misc/kanjidic/Makefile4
-rw-r--r--misc/kanjidic2/Makefile4
-rw-r--r--misc/kdeutils3/Makefile4
-rw-r--r--misc/kodos/Makefile4
-rw-r--r--misc/koffice/Makefile6
-rw-r--r--misc/kp/Makefile4
-rw-r--r--misc/lv/Makefile4
-rw-r--r--misc/most/Makefile4
-rw-r--r--misc/open2300-mysql/Makefile6
-rw-r--r--misc/openoffice-bin/Makefile4
-rw-r--r--misc/openoffice-bin/Makefile.NetBSD.i3864
-rw-r--r--misc/openoffice/Makefile8
-rw-r--r--misc/openoffice/Makefile.NetBSD.i3862
-rw-r--r--misc/openoffice/Makefile.i18n10
-rw-r--r--misc/openoffice2-bin/Makefile8
-rw-r--r--misc/p5-Msgcat/Makefile3
-rw-r--r--misc/pdmenu/Makefile6
-rw-r--r--misc/php-calendar/Makefile3
-rw-r--r--misc/pinfo/Makefile4
-rw-r--r--misc/root/Makefile4
-rw-r--r--misc/rpm/Makefile6
-rw-r--r--misc/tds/Makefile4
-rw-r--r--misc/theme-dirs/dirs.mk3
-rw-r--r--misc/vfu/Makefile6
-rw-r--r--misc/xdg-dirs/dirs.mk3
-rw-r--r--misc/xdg-x11-dirs/dirs.mk3
-rw-r--r--misc/xorg-dirs/dirs.mk3
-rw-r--r--misc/xorg-docs/Makefile4
-rw-r--r--misc/xrolodex/Makefile4
-rw-r--r--misc/xtend/Makefile3
-rw-r--r--misc/xtide/Makefile3
-rw-r--r--multimedia/avidemux/Makefile4
-rw-r--r--multimedia/divxplayer/Makefile4
-rw-r--r--multimedia/dvdauthor/Makefile6
-rw-r--r--multimedia/dvdrip/Makefile4
-rw-r--r--multimedia/ffmpeg/Makefile9
-rw-r--r--multimedia/gst-plugins/Makefile.common3
-rw-r--r--multimedia/gstreamer/Makefile4
-rw-r--r--multimedia/gstreamer/plugins.mk8
-rw-r--r--multimedia/kdemultimedia3/Makefile4
-rw-r--r--multimedia/kmplayer/Makefile4
-rw-r--r--multimedia/libflash/Makefile4
-rw-r--r--multimedia/libmatroska/Makefile4
-rw-r--r--multimedia/libogg/Makefile4
-rw-r--r--multimedia/mmg/Makefile4
-rw-r--r--multimedia/moz-bin-flash/Makefile4
-rw-r--r--multimedia/moz-flash/Makefile6
-rw-r--r--multimedia/mpeg-lib/Makefile6
-rw-r--r--multimedia/mplayer-plugin-firefox/Makefile.common4
-rw-r--r--multimedia/mplayer-plugin-mozilla-gtk2/Makefile4
-rw-r--r--multimedia/mplayer-plugin-mozilla/Makefile4
-rw-r--r--multimedia/mplayer-share/Makefile.common6
-rw-r--r--multimedia/ogle/Makefile4
-rw-r--r--multimedia/p5-xmltv/Makefile4
-rw-r--r--multimedia/py-ming/Makefile4
-rw-r--r--multimedia/xine-ui/Makefile4
-rw-r--r--multimedia/xvidcore/Makefile4
-rw-r--r--net/adns/Makefile4
-rw-r--r--net/airport2basestationconfig/Makefile4
-rw-r--r--net/airportbasestationconfig/Makefile4
-rw-r--r--net/airportmodemutility/Makefile4
-rw-r--r--net/arla/Makefile8
-rw-r--r--net/arpwatch/distinfo8
-rw-r--r--net/arpwatch/patches/patch-ab2
-rw-r--r--net/arpwatch/patches/patch-ac2
-rw-r--r--net/arpwatch/patches/patch-ae2
-rw-r--r--net/batchftp/Makefile4
-rw-r--r--net/bind8/Makefile4
-rw-r--r--net/bind9/Makefile5
-rw-r--r--net/bing/Makefile3
-rw-r--r--net/boinc3-seti/Makefile4
-rw-r--r--net/chrony/Makefile8
-rw-r--r--net/cidr/Makefile4
-rw-r--r--net/cisco-mibs/Makefile4
-rw-r--r--net/citrix_ica/Makefile8
-rw-r--r--net/dc_gui2/distinfo4
-rw-r--r--net/dc_gui2/patches/patch-af4
-rw-r--r--net/dctc/distinfo6
-rw-r--r--net/dctc/patches/patch-ac6
-rw-r--r--net/dctc/patches/patch-ad4
-rw-r--r--net/delegate/Makefile4
-rw-r--r--net/djbdns-run/Makefile4
-rw-r--r--net/driftnet/Makefile6
-rw-r--r--net/ed2k-gtk-gui/Makefile4
-rw-r--r--net/entropy/Makefile6
-rw-r--r--net/ethereal/Makefile4
-rw-r--r--net/ettercap/Makefile4
-rw-r--r--net/firewalk/Makefile4
-rw-r--r--net/freenet-tools/Makefile4
-rw-r--r--net/freeradius/Makefile8
-rw-r--r--net/freewais-sf/Makefile6
-rw-r--r--net/freewais-sf/distinfo4
-rw-r--r--net/freewais-sf/patches/patch-ba4
-rw-r--r--net/ftpproxy/Makefile4
-rw-r--r--net/gftp/Makefile.common4
-rw-r--r--net/gkrellm-multiping/Makefile4
-rw-r--r--net/gnet/Makefile4
-rw-r--r--net/gnet1/Makefile4
-rw-r--r--net/gnugk/Makefile6
-rw-r--r--net/gofish/Makefile6
-rw-r--r--net/gtk-gnutella/Makefile6
-rw-r--r--net/hesiod/Makefile4
-rw-r--r--net/hobbitmon/Makefile22
-rw-r--r--net/hping/Makefile6
-rw-r--r--net/iperf/Makefile4
-rw-r--r--net/ipw/Makefile4
-rw-r--r--net/ishell/Makefile4
-rw-r--r--net/isic/Makefile6
-rw-r--r--net/ja-samba/Makefile16
-rw-r--r--net/kftpgrabber/Makefile4
-rw-r--r--net/kphone/Makefile4
-rw-r--r--net/kphone/distinfo10
-rw-r--r--net/kphone/patches/patch-ac2
-rw-r--r--net/kphone/patches/patch-ad2
-rw-r--r--net/kphone/patches/patch-af2
-rw-r--r--net/kphone/patches/patch-ag2
-rw-r--r--net/lambdamoo/Makefile4
-rw-r--r--net/lftp/Makefile4
-rw-r--r--net/libIDL/Makefile4
-rw-r--r--net/libares/distinfo6
-rw-r--r--net/libares/patches/patch-ab4
-rw-r--r--net/libares/patches/patch-ac4
-rw-r--r--net/mDNSResponder/Makefile6
-rw-r--r--net/mldonkey/Makefile8
-rw-r--r--net/mrstat/Makefile4
-rw-r--r--net/nam/Makefile4
-rw-r--r--net/nasd/Makefile4
-rw-r--r--net/net-snmp/Makefile4
-rw-r--r--net/netdisco/Makefile6
-rw-r--r--net/netpipes/Makefile6
-rw-r--r--net/netsaint-base/Makefile3
-rw-r--r--net/ns/Makefile4
-rw-r--r--net/nsd/Makefile4
-rw-r--r--net/ntp4/Makefile6
-rw-r--r--net/oinkmaster/Makefile5
-rw-r--r--net/openh323/Makefile6
-rw-r--r--net/openvpn/Makefile4
-rw-r--r--net/p5-Net-IPv4Addr/Makefile4
-rw-r--r--net/p5-POE-Component-Client-Ident/Makefile4
-rw-r--r--net/pchar/Makefile4
-rw-r--r--net/php-ftp/Makefile3
-rw-r--r--net/php-snmp/Makefile3
-rw-r--r--net/php-sockets/Makefile3
-rw-r--r--net/php-xmlrpc/Makefile3
-rw-r--r--net/php-yp/Makefile3
-rw-r--r--net/ppp-lzs/Makefile4
-rw-r--r--net/pppd/Makefile6
-rw-r--r--net/proxycheck/Makefile4
-rw-r--r--net/py-ORBit/Makefile6
-rw-r--r--net/py-mimelib/Makefile4
-rw-r--r--net/py-zsi/Makefile4
-rw-r--r--net/pygopherd/Makefile6
-rw-r--r--net/qadsl/Makefile8
-rw-r--r--net/quagga/Makefile4
-rw-r--r--net/radiusd-cistron/Makefile3
-rw-r--r--net/rdist6/Makefile4
-rw-r--r--net/rinetd/Makefile4
-rw-r--r--net/ripe-whois-tools/Makefile8
-rw-r--r--net/ripe-whois/Makefile4
-rw-r--r--net/rp-pppoe/Makefile6
-rw-r--r--net/samba/Makefile18
-rw-r--r--net/scamper/Makefile4
-rw-r--r--net/skype/Makefile4
-rw-r--r--net/smokeping/Makefile4
-rw-r--r--net/snort/Makefile.common6
-rw-r--r--net/socks4/Makefile4
-rw-r--r--net/socks5/Makefile4
-rw-r--r--net/speedtouch/Makefile4
-rw-r--r--net/spread/Makefile12
-rw-r--r--net/stripes/Makefile4
-rw-r--r--net/tcpdstat/Makefile4
-rw-r--r--net/tinyfugue/Makefile4
-rw-r--r--net/tor/Makefile6
-rw-r--r--net/torrentutils/Makefile4
-rw-r--r--net/traceroute-as/Makefile6
-rw-r--r--net/unison-devel/Makefile4
-rw-r--r--net/unison/Makefile4
-rw-r--r--net/userppp/Makefile4
-rw-r--r--net/wap-utils/Makefile6
-rw-r--r--net/whoson/Makefile4
-rw-r--r--net/wimon/Makefile6
-rw-r--r--net/wistumbler2/Makefile.common4
-rw-r--r--net/wu-ftpd/Makefile10
-rw-r--r--net/xipdump/Makefile4
-rw-r--r--net/zebra/Makefile4
-rw-r--r--news/inn/Makefile16
-rw-r--r--news/leafnode/Makefile10
-rw-r--r--news/nntpclnt/Makefile4
-rw-r--r--parallel/GridSim/Makefile4
-rw-r--r--parallel/glunix/Makefile8
-rw-r--r--parallel/glunix/distinfo4
-rw-r--r--parallel/glunix/patches/patch-bv4
-rw-r--r--parallel/mpi-ch/Makefile14
-rw-r--r--parallel/p5-Parallel-Pvm/Makefile6
-rw-r--r--parallel/pvm3/Makefile10
-rw-r--r--parallel/pvm3/arch.mk6
-rw-r--r--parallel/sge/Makefile10
-rw-r--r--pkgtools/dfdisk/Makefile4
-rw-r--r--pkgtools/pkg_filecheck/Makefile6
-rw-r--r--pkgtools/pkg_install-info/Makefile4
-rw-r--r--pkgtools/pkg_select/Makefile4
-rw-r--r--pkgtools/pkgclean/Makefile4
-rw-r--r--pkgtools/pkgdiff/Makefile4
-rw-r--r--pkgtools/pkgfind/Makefile4
-rw-r--r--pkgtools/rpm2pkg/Makefile4
-rw-r--r--pkgtools/shlock/Makefile8
-rw-r--r--pkgtools/x11-links/Makefile4
-rw-r--r--pkgtools/xpkgwedge/Makefile6
-rw-r--r--print/LPRng-core/Makefile8
-rw-r--r--print/acroread/Makefile14
-rw-r--r--print/acroread3/Makefile12
-rw-r--r--print/acroread5/Makefile10
-rw-r--r--print/acroread7/Makefile6
-rw-r--r--print/apsfilter/Makefile4
-rw-r--r--print/auctex/Makefile6
-rw-r--r--print/bg5pdf/Makefile4
-rw-r--r--print/chktex/Makefile6
-rw-r--r--print/cnprint/Makefile4
-rw-r--r--print/cups/Makefile8
-rw-r--r--print/dvipdfm/Makefile4
-rw-r--r--print/dvipdfmx/Makefile4
-rw-r--r--print/dvipdfmx/map.mk4
-rw-r--r--print/ghostscript-esp/Makefile.common4
-rw-r--r--print/ghostscript-gnu-nox11/Makefile4
-rw-r--r--print/ghostscript-gnu-x11/Makefile4
-rw-r--r--print/ghostscript-gnu/Makefile.common8
-rw-r--r--print/ghostscript-nox11/Makefile.common12
-rw-r--r--print/gnome-print/Makefile4
-rw-r--r--print/hpijs/Makefile3
-rw-r--r--print/ijs/Makefile4
-rw-r--r--print/ja-ptex-bin/Makefile10
-rw-r--r--print/ja-vflib-lib/Makefile.common16
-rw-r--r--print/ja-vflib-utils/Makefile4
-rw-r--r--print/ja-vfxdvik/Makefile8
-rw-r--r--print/lgrind/Makefile4
-rw-r--r--print/libgnomeprintui/Makefile4
-rw-r--r--print/lilypond/Makefile6
-rw-r--r--print/poppler/Makefile4
-rw-r--r--print/psutils/Makefile4
-rw-r--r--print/rtf2latex/Makefile4
-rw-r--r--print/tcl-pdflib/Makefile8
-rw-r--r--print/teTeX-bin/Makefile.common8
-rw-r--r--print/teTeX/module.mk6
-rw-r--r--print/teTeX1-bin/Makefile8
-rw-r--r--print/teTeX3-bin/Makefile.common8
-rw-r--r--print/texfamily/Makefile10
-rw-r--r--print/xpdf/Makefile6
-rw-r--r--security/AiSSLtelnet/distinfo4
-rw-r--r--security/AiSSLtelnet/patches/patch-af4
-rw-r--r--security/PAM/Makefile4
-rw-r--r--security/amap/Makefile4
-rw-r--r--security/amavis-perl/Makefile4
-rw-r--r--security/amavis/Makefile4
-rw-r--r--security/amavisd-new/Makefile10
-rw-r--r--security/antonym/distinfo4
-rw-r--r--security/antonym/patches/patch-ab4
-rw-r--r--security/apg/Makefile6
-rw-r--r--security/cfs/Makefile10
-rw-r--r--security/chkrootkit/Makefile4
-rw-r--r--security/courier-authlib/Makefile8
-rw-r--r--security/courier-authlib/Makefile.common6
-rw-r--r--security/cy2-anonymous/Makefile4
-rw-r--r--security/cy2-crammd5/Makefile4
-rw-r--r--security/cy2-digestmd5/Makefile4
-rw-r--r--security/cy2-gssapi/Makefile4
-rw-r--r--security/cy2-login/Makefile4
-rw-r--r--security/cy2-ntlm/Makefile4
-rw-r--r--security/cy2-otp/Makefile4
-rw-r--r--security/cy2-plain/Makefile4
-rw-r--r--security/cy2-sql/Makefile4
-rw-r--r--security/cyrus-sasl2/Makefile6
-rw-r--r--security/cyrus-saslauthd/Makefile6
-rw-r--r--security/destroy/Makefile4
-rw-r--r--security/dropbear/Makefile4
-rw-r--r--security/dsniff-nox11/Makefile4
-rw-r--r--security/fsh/Makefile4
-rw-r--r--security/fwbuilder/Makefile6
-rw-r--r--security/gnome-keyring/Makefile4
-rw-r--r--security/gnu-crypto/Makefile4
-rw-r--r--security/gnupg/Makefile4
-rw-r--r--security/gnupg/hacks.mk6
-rw-r--r--security/gnupg/options.mk4
-rw-r--r--security/gnustep-ssl/Makefile6
-rw-r--r--security/gnutls/Makefile10
-rw-r--r--security/gpgme/Makefile4
-rw-r--r--security/gtk-systrace/Makefile4
-rw-r--r--security/heimdal/Makefile4
-rw-r--r--security/honeyd-arpd/Makefile3
-rw-r--r--security/honeyd/Makefile3
-rw-r--r--security/honeyd/options.mk4
-rw-r--r--security/hydra/Makefile4
-rw-r--r--security/ike-scan/Makefile4
-rw-r--r--security/ipsec-tools/Makefile4
-rw-r--r--security/jessie/Makefile4
-rw-r--r--security/libbf/Makefile4
-rw-r--r--security/libnasl/Makefile4
-rw-r--r--security/mit-krb5/Makefile8
-rw-r--r--security/msu/Makefile4
-rw-r--r--security/msudir/Makefile4
-rw-r--r--security/nessus-core/Makefile6
-rw-r--r--security/nessus-libraries/Makefile6
-rw-r--r--security/nessus-plugins/Makefile6
-rw-r--r--security/nessus/Makefile4
-rw-r--r--security/nikto/Makefile6
-rw-r--r--security/openpam/Makefile4
-rw-r--r--security/openssh+gssapi/Makefile8
-rw-r--r--security/openssh/Makefile9
-rw-r--r--security/openssl/Makefile4
-rw-r--r--security/p0f/Makefile4
-rw-r--r--security/p5-Digest/Makefile3
-rw-r--r--security/p5-Net-DNS-SEC/Makefile4
-rw-r--r--security/pflkm/Makefile4
-rw-r--r--security/php-mcrypt/Makefile3
-rw-r--r--security/php-mhash/Makefile3
-rw-r--r--security/pinepgp/Makefile4
-rw-r--r--security/pks/Makefile8
-rw-r--r--security/prngd/Makefile4
-rw-r--r--security/py-m2crypto/Makefile4
-rw-r--r--security/qca/Makefile3
-rw-r--r--security/smtpd/Makefile20
-rw-r--r--security/sniff/Makefile4
-rw-r--r--security/ssh2/Makefile.common10
-rw-r--r--security/sslwrap/Makefile6
-rw-r--r--security/tct/Makefile4
-rw-r--r--security/tripwire/distinfo8
-rw-r--r--security/tripwire/patches/patch-ae4
-rw-r--r--security/tripwire/patches/patch-af4
-rw-r--r--security/tripwire/patches/patch-ai4
-rw-r--r--security/zebedee/Makefile6
-rw-r--r--shells/ast-ksh/Makefile.common4
-rw-r--r--shells/bash/Makefile4
-rw-r--r--shells/bash2/Makefile4
-rw-r--r--shells/scponly/Makefile32
-rw-r--r--shells/standalone-tcsh/Makefile5
-rw-r--r--shells/zsh3/hacks.mk4
-rw-r--r--sysutils/855resolution/Makefile4
-rw-r--r--sysutils/amanda-common/Makefile.common6
-rw-r--r--sysutils/apcupsd/Makefile4
-rw-r--r--sysutils/aperture/Makefile6
-rw-r--r--sysutils/asapm/Makefile4
-rw-r--r--sysutils/bacula/Makefile4
-rw-r--r--sysutils/bacula/Makefile.common12
-rw-r--r--sysutils/bacula/hacks.mk4
-rw-r--r--sysutils/bchunk/Makefile4
-rw-r--r--sysutils/bkpupsd/Makefile6
-rw-r--r--sysutils/ccze/Makefile4
-rw-r--r--sysutils/cdbkup/Makefile14
-rw-r--r--sysutils/cdrecord-xcdroast/Makefile4
-rw-r--r--sysutils/cdrecord/Makefile8
-rw-r--r--sysutils/cdrtools-ossdvd/Makefile6
-rw-r--r--sysutils/coreutils/MESSAGE.gsu4
-rw-r--r--sysutils/coreutils/Makefile6
-rw-r--r--sysutils/daemontools/Makefile4
-rw-r--r--sysutils/dbus/Makefile.common3
-rw-r--r--sysutils/depot/Makefile6
-rw-r--r--sysutils/dmidecode/distinfo4
-rw-r--r--sysutils/dmidecode/patches/patch-aa2
-rw-r--r--sysutils/duplicity/Makefile6
-rw-r--r--sysutils/dvd+rw-tools/Makefile4
-rw-r--r--sysutils/easydiskpasswd/Makefile4
-rw-r--r--sysutils/fdgw/Makefile6
-rw-r--r--sysutils/findutils/Makefile6
-rw-r--r--sysutils/fixelfprot/Makefile4
-rw-r--r--sysutils/fsv/Makefile4
-rw-r--r--sysutils/gamin/Makefile4
-rw-r--r--sysutils/gkrellm-server/Makefile8
-rw-r--r--sysutils/gkrellm/Makefile12
-rw-r--r--sysutils/gkrellm/Makefile.common4
-rw-r--r--sysutils/gkrellm1/Makefile4
-rw-r--r--sysutils/gnome-vfs/Makefile4
-rw-r--r--sysutils/gnome-vfs2/Makefile.common3
-rw-r--r--sysutils/kdirstat/Makefile4
-rw-r--r--sysutils/lavaps/Makefile9
-rw-r--r--sysutils/libgtop2/Makefile4
-rw-r--r--sysutils/lsof/Makefile4
-rw-r--r--sysutils/radmind/Makefile4
-rw-r--r--sysutils/rdiff-backup/Makefile6
-rw-r--r--sysutils/rfstool/Makefile4
-rw-r--r--sysutils/scsiinfo/Makefile4
-rw-r--r--sysutils/sformat/DESCR15
-rw-r--r--sysutils/sformat/Makefile10
-rw-r--r--sysutils/socket/Makefile4
-rw-r--r--sysutils/sredird/Makefile4
-rw-r--r--sysutils/su2/Makefile4
-rw-r--r--sysutils/sysinfo/Makefile4
-rw-r--r--sysutils/tits/Makefile4
-rw-r--r--sysutils/ups-nut/Makefile6
-rw-r--r--sysutils/user/DESCR6
-rw-r--r--sysutils/user/Makefile4
-rw-r--r--sysutils/user_darwin/DESCR2
-rw-r--r--sysutils/user_darwin/Makefile3
-rw-r--r--sysutils/user_interix/Makefile3
-rw-r--r--sysutils/vifm/Makefile6
-rw-r--r--sysutils/wtail/Makefile4
-rw-r--r--sysutils/xbatt/Makefile4
-rw-r--r--sysutils/xbattbar/Makefile4
-rw-r--r--sysutils/xcdroast/Makefile4
-rw-r--r--sysutils/xentools12/Makefile6
-rw-r--r--sysutils/xentools20/Makefile14
-rw-r--r--sysutils/xenvstat/Makefile4
-rw-r--r--sysutils/xhfs/Makefile7
-rw-r--r--sysutils/xosview/Makefile4
-rw-r--r--sysutils/zidrav/Makefile5
-rw-r--r--textproc/aiksaurus/Makefile4
-rw-r--r--textproc/biblook/Makefile4
-rw-r--r--textproc/chasen-base/Makefile4
-rw-r--r--textproc/dict-dictionaries/Makefile4
-rw-r--r--textproc/docbook-xml/Makefile4
-rw-r--r--textproc/docbook-xsl/Makefile4
-rw-r--r--textproc/docbook/Makefile5
-rw-r--r--textproc/eb/Makefile4
-rw-r--r--textproc/flyspell/Makefile4
-rw-r--r--textproc/fop/Makefile6
-rw-r--r--textproc/freepwing/Makefile4
-rw-r--r--textproc/gdome2/Makefile4
-rw-r--r--textproc/gnome-doc-utils/Makefile4
-rw-r--r--textproc/grep/Makefile4
-rw-r--r--textproc/groff/Makefile8
-rw-r--r--textproc/gsed/Makefile4
-rw-r--r--textproc/helpdeco/Makefile4
-rw-r--r--textproc/html2text/Makefile6
-rw-r--r--textproc/icu/Makefile4
-rw-r--r--textproc/intltool/buildlink3.mk4
-rw-r--r--textproc/iso12083/Makefile4
-rw-r--r--textproc/iso8879/Makefile4
-rw-r--r--textproc/ispell-base/Makefile4
-rw-r--r--textproc/ispell-british/Makefile6
-rw-r--r--textproc/ispell-emacs/Makefile8
-rw-r--r--textproc/ispell-russian/Makefile.common4
-rw-r--r--textproc/ispell-slovak/Makefile4
-rw-r--r--textproc/ispell-spanish/Makefile4
-rw-r--r--textproc/jade/Makefile4
-rw-r--r--textproc/jade/hacks.mk4
-rw-r--r--textproc/libpathan/Makefile4
-rw-r--r--textproc/libxml2/Makefile4
-rw-r--r--textproc/libxslt/Makefile3
-rw-r--r--textproc/namazu2/Makefile4
-rw-r--r--textproc/ndtpd/Makefile4
-rw-r--r--textproc/openjade/Makefile4
-rw-r--r--textproc/p5-XML-Xerces/Makefile4
-rw-r--r--textproc/php-pspell/Makefile3
-rw-r--r--textproc/php-wddx/Makefile3
-rw-r--r--textproc/php4-domxml/Makefile3
-rw-r--r--textproc/php4-xslt/Makefile3
-rw-r--r--textproc/php5-dom/Makefile3
-rw-r--r--textproc/php5-xsl/Makefile3
-rw-r--r--textproc/postgresql-autodoc/Makefile8
-rw-r--r--textproc/py-HappyDoc/Makefile4
-rw-r--r--textproc/py-expat/Makefile4
-rw-r--r--textproc/py-libxslt/Makefile8
-rw-r--r--textproc/py-xml/Makefile6
-rw-r--r--textproc/py-xmltools/Makefile4
-rw-r--r--textproc/rman/Makefile4
-rw-r--r--textproc/robodoc/Makefile4
-rw-r--r--textproc/ruby-eruby/Makefile8
-rw-r--r--textproc/ruby-rdtool/rdversion.mk4
-rw-r--r--textproc/saxon/Makefile8
-rw-r--r--textproc/scrollkeeper/Makefile10
-rw-r--r--textproc/scrollkeeper/omf.mk8
-rw-r--r--textproc/tcl-dom/Makefile6
-rw-r--r--textproc/tcl-xml/Makefile6
-rw-r--r--textproc/tei/Makefile4
-rw-r--r--textproc/vis/Makefile6
-rw-r--r--textproc/xalan-j/Makefile6
-rw-r--r--textproc/xmlcatmgr/Makefile4
-rw-r--r--textproc/xmlcatmgr/catalogs.mk4
-rw-r--r--textproc/xmlindent/Makefile4
-rw-r--r--time/anacron/Makefile14
-rw-r--r--time/gnutime/Makefile4
-rw-r--r--time/ical/Makefile4
-rw-r--r--time/pcal/Makefile6
-rw-r--r--time/pclock/Makefile4
-rw-r--r--time/ptimetracker/Makefile3
-rw-r--r--time/sunclock/Makefile4
-rw-r--r--time/wmmoonclock/Makefile4
-rw-r--r--wm/amiwm/Makefile4
-rw-r--r--wm/blackbox/Makefile4
-rw-r--r--wm/fluxbox/Makefile4
-rw-r--r--wm/flwm/Makefile4
-rw-r--r--wm/fvwm1/Makefile4
-rw-r--r--wm/fvwm2/Makefile6
-rw-r--r--wm/icecc/Makefile6
-rw-r--r--wm/icewm-imlib/Makefile4
-rw-r--r--wm/mlvwm/Makefile4
-rw-r--r--wm/openbox2/Makefile4
-rw-r--r--wm/pekwm/Makefile3
-rw-r--r--wm/qvwm/Makefile4
-rw-r--r--wm/sawfish/Makefile8
-rw-r--r--wm/sawfish/Makefile.common4
-rw-r--r--wm/wampager/Makefile4
-rw-r--r--wm/windowmaker/Makefile5
-rw-r--r--wm/wm2/Makefile4
-rw-r--r--wm/wmii/Makefile3
-rw-r--r--wm/wmthemes/Makefile3
-rw-r--r--wm/wmx/Makefile.common4
-rw-r--r--www/album_themes/Makefile4
-rw-r--r--www/analog/Makefile6
-rw-r--r--www/ap-auth-cookie/Makefile4
-rw-r--r--www/ap-bandwidth/Makefile4
-rw-r--r--www/ap-dav/Makefile4
-rw-r--r--www/ap-dtcl/Makefile6
-rw-r--r--www/ap-fastcgi/Makefile.common4
-rw-r--r--www/ap-iasp/Makefile4
-rw-r--r--www/ap-python/Makefile6
-rw-r--r--www/ap-ruby/Makefile4
-rw-r--r--www/ap-ssl/Makefile6
-rw-r--r--www/ap2-auth-ldap/Makefile4
-rw-r--r--www/apache/Makefile12
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/apache2/buildlink3.mk6
-rw-r--r--www/apc-gui/Makefile4
-rw-r--r--www/awstats/Makefile6
-rw-r--r--www/bkedit/Makefile6
-rw-r--r--www/blur6ex/Makefile4
-rw-r--r--www/cocoon/Makefile4
-rw-r--r--www/communicator/Makefile4
-rw-r--r--www/crawl/Makefile4
-rw-r--r--www/curl/Makefile4
-rw-r--r--www/cvsweb/Makefile4
-rw-r--r--www/drraw/Makefile4
-rw-r--r--www/elinks/Makefile4
-rw-r--r--www/emacs-w3m/Makefile6
-rw-r--r--www/epiphany-extensions/Makefile4
-rw-r--r--www/firefox-bin-acroread/Makefile.common6
-rw-r--r--www/firefox-bin-flash/Makefile.common4
-rw-r--r--www/firefox-bin/Makefile.NetBSD.i3864
-rw-r--r--www/firefox/hacks.mk4
-rw-r--r--www/horde3/Makefile4
-rw-r--r--www/htdig/Makefile4
-rw-r--r--www/htmldoc-x11/Makefile4
-rw-r--r--www/http_load/Makefile4
-rw-r--r--www/iasp/Makefile12
-rw-r--r--www/ijb/Makefile4
-rw-r--r--www/ijb/distinfo4
-rw-r--r--www/ijb/patches/patch-ab4
-rw-r--r--www/instiki/Makefile4
-rw-r--r--www/jakarta-servletapi/Makefile4
-rw-r--r--www/jakarta-tomcat4/Makefile4
-rw-r--r--www/jakarta-tomcat5/Makefile8
-rw-r--r--www/jakarta-tomcat55/Makefile8
-rw-r--r--www/jssi/Makefile4
-rw-r--r--www/kazehakase/Makefile3
-rw-r--r--www/mini_httpd/Makefile4
-rw-r--r--www/mozilla-bin-nightly/Makefile.NetBSD.i3864
-rw-r--r--www/mozilla-bin-nightly/Makefile.common4
-rw-r--r--www/mozilla-bin/Makefile.common8
-rw-r--r--www/mozilla/Makefile.common30
-rw-r--r--www/navigator/Makefile4
-rw-r--r--www/navigator/Makefile.common20
-rw-r--r--www/netscape7-acroread/Makefile.common8
-rw-r--r--www/ns-remote/Makefile4
-rw-r--r--www/opera-acroread/Makefile.common8
-rw-r--r--www/opera/Makefile7
-rw-r--r--www/p5-Apache-Gallery/Makefile10
-rw-r--r--www/p5-CGI-Kwiki/Makefile4
-rw-r--r--www/p5-URI/Makefile4
-rw-r--r--www/php-FastTemplate/Makefile6
-rw-r--r--www/php4-apc/Makefile4
-rw-r--r--www/php4/Makefile6
-rw-r--r--www/php4/Makefile.common4
-rw-r--r--www/php4/Makefile.php4
-rw-r--r--www/privoxy/Makefile6
-rw-r--r--www/py-HTMLgen/Makefile4
-rw-r--r--www/py-curl/Makefile4
-rw-r--r--www/ruby-fcgi/Makefile4
-rw-r--r--www/sarg/Makefile8
-rw-r--r--www/screws/Makefile6
-rw-r--r--www/snownews/Makefile4
-rw-r--r--www/spfc/Makefile4
-rw-r--r--www/surfraw/Makefile6
-rw-r--r--www/tcl-cgi/Makefile4
-rw-r--r--www/thy/Makefile4
-rw-r--r--www/tidy/Makefile4
-rw-r--r--www/w3m/Makefile.common4
-rw-r--r--www/websvn/Makefile4
-rw-r--r--www/wml/Makefile8
-rw-r--r--www/wwwoffle/Makefile4
-rw-r--r--www/zope25-CMFPlone/Makefile4
-rw-r--r--www/zope25-EasyImage/Makefile4
-rw-r--r--www/zope25-JPicture/Makefile4
-rw-r--r--www/zope25-PropertyFolder/Makefile4
-rw-r--r--www/zope25-ZPhotoSlides/Makefile4
-rw-r--r--x11/XF86Setup/Makefile6
-rw-r--r--x11/XFree86-imake/Makefile4
-rw-r--r--x11/XFree86-libs/Makefile6
-rw-r--r--x11/XFree86-server/Makefile4
-rw-r--r--x11/XaoS/Makefile4
-rw-r--r--x11/blt/Makefile6
-rw-r--r--x11/ebuilder/Makefile4
-rw-r--r--x11/eterm/distinfo4
-rw-r--r--x11/eterm/patches/patch-ah4
-rw-r--r--x11/gdm/Makefile8
-rw-r--r--x11/gnome-libs/Makefile6
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gtk/Makefile8
-rw-r--r--x11/gtk2/Makefile6
-rw-r--r--x11/gtk2/modules.mk10
-rw-r--r--x11/gtksourceview/Makefile4
-rw-r--r--x11/kdelibs3/Makefile6
-rw-r--r--x11/lablgtk/Makefile4
-rw-r--r--x11/lesstif/Makefile8
-rw-r--r--x11/openmotif/Makefile4
-rw-r--r--x11/p5-Tk/Makefile4
-rw-r--r--x11/py-gnome2-extras/Makefile4
-rw-r--r--x11/py-gnome2/Makefile4
-rw-r--r--x11/py-gtk2/Makefile4
-rw-r--r--x11/py-qt2-sip/Makefile8
-rw-r--r--x11/py-qt2/Makefile8
-rw-r--r--x11/py-qt3-base/Makefile4
-rw-r--r--x11/py-qt3-base/Makefile.common6
-rw-r--r--x11/py-qt3-sip/Makefile6
-rw-r--r--x11/py-wxWidgets/Makefile4
-rw-r--r--x11/pygtk/Makefile4
-rw-r--r--x11/qt1/Makefile6
-rw-r--r--x11/qt2-designer/Makefile4
-rw-r--r--x11/qt2-docs/Makefile4
-rw-r--r--x11/qt2-examples/Makefile6
-rw-r--r--x11/qt2-libs/Makefile10
-rw-r--r--x11/qt2-libs/Makefile.common24
-rw-r--r--x11/qt2-libs/buildlink3.mk6
-rw-r--r--x11/qt3-docs/Makefile4
-rw-r--r--x11/qt3-libs/Makefile.common6
-rw-r--r--x11/qt3-libs/buildlink3.mk6
-rw-r--r--x11/qt3-mysql/Makefile4
-rw-r--r--x11/qt3-psql/Makefile4
-rw-r--r--x11/qt3-qscintilla/Makefile4
-rw-r--r--x11/qt3-tools/Makefile4
-rw-r--r--x11/qwt/Makefile4
-rw-r--r--x11/ruby-tcltklib/tcltkversion.mk4
-rw-r--r--x11/tk83/Makefile4
-rw-r--r--x11/tkinfo/Makefile4
-rw-r--r--x11/wdm/Makefile4
-rw-r--r--x11/wxGTK/Makefile.common6
-rw-r--r--x11/wxGTK24/Makefile.common4
-rw-r--r--x11/wxhaskell/Makefile4
-rw-r--r--x11/xdesktopwaves/Makefile6
-rw-r--r--x11/xforms/Makefile4
-rw-r--r--x11/xforms/distinfo4
-rw-r--r--x11/xforms/patches/patch-ag4
-rw-r--r--x11/xjman/Makefile4
-rw-r--r--x11/xlockmore-lite/Makefile4
-rw-r--r--x11/xmms-osd/Makefile4
-rw-r--r--x11/xorg-imake/Makefile4
-rw-r--r--x11/xorg-libs/Makefile4
-rw-r--r--x11/xosd/Makefile.common4
-rw-r--r--x11/xpad/Makefile4
-rw-r--r--x11/xpaste/distinfo4
-rw-r--r--x11/xpaste/patches/patch-ab4
-rw-r--r--x11/xphoon/Makefile4
-rw-r--r--x11/xpmroot/Makefile4
-rw-r--r--x11/xscreensaver/Makefile.common6
-rw-r--r--x11/xscribble/Makefile4
-rw-r--r--x11/xservers/Makefile6
-rw-r--r--x11/xview-lib/Makefile4
-rw-r--r--x11/xworld/Makefile6
1531 files changed, 4009 insertions, 4138 deletions
diff --git a/archivers/advancecomp/hacks.mk b/archivers/advancecomp/hacks.mk
index 57724e11219..f7259228bcb 100644
--- a/archivers/advancecomp/hacks.mk
+++ b/archivers/advancecomp/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/21 21:48:32 tv Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:49:47 rillig Exp $
-.ifndef ADVANCECOMP_HACKS_MK
+.if !defined(ADVANCECOMP_HACKS_MK)
ADVANCECOMP_HACKS_MK= # defined
### [Fri Jan 21 21:44:32 UTC 2005 : tv]
diff --git a/archivers/dar/hacks.mk b/archivers/dar/hacks.mk
index 8b5c02bce60..b877fee9d64 100644
--- a/archivers/dar/hacks.mk
+++ b/archivers/dar/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.2 2005/01/24 20:48:35 tv Exp $
+# $NetBSD: hacks.mk,v 1.3 2005/12/05 20:49:47 rillig Exp $
-.ifndef DAR_HACKS_MK
+.if !defined(DAR_HACKS_MK)
DAR_HACKS_MK= # defined
### [Mon Jan 24 16:39:35 UTC 2005 : tv]
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index f3ea90355c3..0e00f62fc79 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/10/08 08:27:42 adam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:47 rillig Exp $
DISTNAME= p7zip_4.29_src_all
PKGNAME= p7zip-4.29
@@ -29,7 +29,7 @@ PLIST_SUBST+= DYNAMIC_7Z="@comment "
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/-/_/}
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
INSTALLATION_DIRS= bin
diff --git a/archivers/par2/hacks.mk b/archivers/par2/hacks.mk
index 5b9feb637be..de600325a9b 100644
--- a/archivers/par2/hacks.mk
+++ b/archivers/par2/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/21 21:48:32 tv Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:49:47 rillig Exp $
-.ifndef PAR2_HACKS_MK
+.if !defined(PAR2_HACKS_MK)
PAR2_HACKS_MK= # defined
### [Fri Jan 21 21:44:32 UTC 2005 : tv]
diff --git a/audio/SDL-nas/Makefile b/audio/SDL-nas/Makefile
index a596fb4a0a0..fac10f1ab2d 100644
--- a/audio/SDL-nas/Makefile
+++ b/audio/SDL-nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/07 10:16:27 adam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:47 rillig Exp $
.include "../../devel/SDL/Makefile.common"
@@ -19,7 +19,7 @@ do-install:
cd ${WRKSRC}/src/audio/nas && ${SHLIBTOOL} --mode=install \
${INSTALL_DATA} libaudio_nas.la ${PREFIX}/lib
-BUILDLINK_DEPENDS.SDL= SDL>=1.2.5nb6
+BUILDLINK_DEPENDS.SDL+= SDL>=1.2.5nb6
.include "../../audio/nas/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index af2caef7212..dbe74f754af 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/19 15:09:37 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:47 rillig Exp $
#
BMP_ENABLE_ENCODERS= yes
@@ -14,7 +14,7 @@ DEPENDS+= unzip-[0-9]*:../../archivers/unzip
# library is loaded, and is the one causing problems. See PR pkg/26846
# for more information.
USE_LANGUAGES= c c++
-LDFLAGS.NetBSD= -lstdc++ -lm
+LDFLAGS.NetBSD+= -lstdc++ -lm
.include "../../audio/id3lib/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index a4704168a51..b09aa3ec2e3 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:47 rillig Exp $
#
DISTNAME= cam-1.02
@@ -25,7 +25,7 @@ CAMLIBS= -lcurses
CAMLIBS+= -lossaudio
.endif
-MAKE_ENV+= CAMLIBS="${CAMLIBS}"
+MAKE_ENV+= CAMLIBS=${CAMLIBS:Q}
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 6a6036e3150..5ee3bea9116 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:47 rillig Exp $
#
DISTNAME= cmp3-2.0pre6
@@ -15,8 +15,8 @@ DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
WRKSRC= ${WRKDIR}/cmp3-kenrevs
USE_TOOLS+= gmake
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
-INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-H]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
+INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-H]*-*
INSTALLATION_DIRS= bin
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index 239920b3207..49316640a71 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/11 12:20:57 tonio Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:47 rillig Exp $
DISTNAME= daapd-0.2.3d
PKGREVISION= 3
@@ -26,9 +26,9 @@ PKG_SUPPORTED_OPTIONS=faad
.if !empty(PKG_OPTIONS:Mfaad)
.include "../../audio/faad2/buildlink3.mk"
- MAKE_ENV+= WITH_FAAD=1
+MAKE_ENV+= WITH_FAAD=1
.else
- MAKE_ENV+= WITH_FAAD=0
+MAKE_ENV+= WITH_FAAD=0
.endif
post-install:
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 426e11e5cbf..d01407b102a 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/10/16 15:14:40 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:47 rillig Exp $
DISTNAME= dap-2.1.2
PKGREVISION= 5
@@ -12,7 +12,7 @@ COMMENT= Digital audio recording and processing package
MAKEFILE= Makefile.netbsd
-MAKE_ENV+= X11PREFIX=${X11PREFIX}
+MAKE_ENV+= X11PREFIX=${X11PREFIX:Q}
USE_LANGUAGES= c c++
INSTALLATION_DIRS= bin
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
index 3a5eb13c023..26dc826f9ad 100644
--- a/audio/eawpatches/Makefile
+++ b/audio/eawpatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/03 14:20:03 ben Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:47 rillig Exp $
#
DISTNAME= eawpats12_full
@@ -12,7 +12,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.stardate.bc.ca/eawpatches/html/
COMMENT= Eric A. Welsh' patches (audio samples) for TiMidity
-BUILD_DEPENDS= unrar-[0-9]*:../../archivers/unrar
+BUILD_DEPENDS+= unrar-[0-9]*:../../archivers/unrar
EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index b850de0c47f..1d77c12b84e 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/07/27 17:16:32 drochner Exp $
+# $NetBSD: Makefile,v 1.58 2005/12/05 20:49:47 rillig Exp $
DISTNAME= esound-0.2.36
CATEGORIES= audio
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --disable-local-sound
.else
.include "../../mk/ossaudio.buildlink3.mk"
MAKE_ENV+= AM_CPPFLAGS='-DDEV_DSP=\"${DEVOSSAUDIO}\"'
-SUBST_CLASSES= oss
+SUBST_CLASSES+= oss
SUBST_STAGE.oss= post-patch
SUBST_FILES.oss= configure
SUBST_SED.oss= -e 's,-lossaudio,${LIBOSSAUDIO},g'
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index e1eea9762b5..15ac68a98b8 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/10/09 03:23:11 ben Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:49:47 rillig Exp $
#
DISTNAME= faad2-2.0
@@ -25,7 +25,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-mp4v2
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/faad2
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
LIBS+= -lm
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 991f0bd7fb2..5cf25583f9a 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/12/03 04:14:05 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/05 20:49:47 rillig Exp $
DISTNAME= festival-1.95-beta
PKGNAME= festival-1.95beta
@@ -44,28 +44,28 @@ PKG_COMPILER= ${PKG_COMPILER_cmd:sh}
.endif
.if empty(PKG_COMPILER)
-PKG_FAIL_REASON= "${CC_VERSION} is not currently supported."
+PKG_FAIL_REASON+= "${CC_VERSION} is not currently supported."
.endif
-MAKE_ENV+= PKG_EST_HOME="${SPEECHTOOLS}" \
- EST_HOME="${SPEECHTOOLS}" \
- PKG_FESTIVAL_BUILD_HOME="${FESTIVAL}" \
- PKG_FESTIVAL_HOME="${FHOME}" \
- PKG_COMPILER="${PKG_COMPILER}" \
- PKG_X11BASE="${X11BASE}" \
- PKG_PREFIX="${PREFIX}" \
- EGCS_CC="${CC}" \
- EGCS_CXX="${CXX}" \
- GCC295_CC="${CC}" \
- GCC295_CXX="${CXX}" \
- GCC28_CC="${CC}" \
- GCC28_CXX="${CXX}" \
- GCC27_CC="${CC}" \
- GCC27_CXX="${CXX}" \
- GCC26_CC="${CC}" \
- GCC26_CXX="${CXX}" \
- CC="${CC}" \
- CXX="${CXX}"
+MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS:Q} \
+ EST_HOME=${SPEECHTOOLS:Q} \
+ PKG_FESTIVAL_BUILD_HOME=${FESTIVAL:Q} \
+ PKG_FESTIVAL_HOME=${FHOME:Q} \
+ PKG_COMPILER=${PKG_COMPILER:Q} \
+ PKG_X11BASE=${X11BASE:Q} \
+ PKG_PREFIX=${PREFIX:Q} \
+ EGCS_CC=${CC:Q} \
+ EGCS_CXX=${CXX:Q} \
+ GCC295_CC=${CC:Q} \
+ GCC295_CXX=${CXX:Q} \
+ GCC28_CC=${CC:Q} \
+ GCC28_CXX=${CXX:Q} \
+ GCC27_CC=${CC:Q} \
+ GCC27_CXX=${CXX:Q} \
+ GCC26_CC=${CC:Q} \
+ GCC26_CXX=${CXX:Q} \
+ CC=${CC:Q} \
+ CXX=${CXX:Q}
INSTALLATION_DIRS= bin libexec man/man1
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index 2da39777703..dd11343a6e7 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:48 rillig Exp $
DISTNAME= voice_aec_di-2.0
PKGNAME= festvox-aec-2.0
@@ -15,7 +15,7 @@ DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
LICENSE= no-commercial-use
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}nb1
WRKSRC= ${WRKDIR}/festival
NO_BUILD= yes
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 85a79231de0..2e6ff6a6973 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:11 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= gkrellmms-2.1.20
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.gkrellm= gkrellm>=2.2.0
+BUILDLINK_DEPENDS.gkrellm+= gkrellm>=2.2.0
WRKSRC= ${WRKDIR}/gkrellmms
MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index af3fb3e76ca..1edf0f2631a 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= gramofile-1.6
@@ -23,7 +23,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bplaysrc/bplay ${PREFIX}/bin/bplay_gramo
cd ${PREFIX}/bin && ${LN} -s bplay_gramo brec_gramo
-SUBST_CLASSES= snd
+SUBST_CLASSES+= snd
SUBST_STAGE.snd= post-patch
SUBST_FILES.snd= bplaysrc/sndfunc.c
SUBST_SED.snd= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
diff --git a/audio/guspatches/Makefile b/audio/guspatches/Makefile
index 041c72a9ec9..58b811f9a35 100644
--- a/audio/guspatches/Makefile
+++ b/audio/guspatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/29 22:16:12 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= dgguspat
@@ -16,9 +16,8 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
EXTRACT_ONLY= # empty
-NO_TOOLS= yes
NO_BUILD= yes
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
do-configure:
${SED} "s|@PREFIX@|${PREFIX}|" < ${FILESDIR}/gravis.cfg > \
diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile
index 928669b9cd8..430c1c150bb 100644
--- a/audio/icecast1/Makefile
+++ b/audio/icecast1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/11 17:21:11 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= icecast-1.3.12
@@ -32,7 +32,6 @@ EGFILES= groups.aut mounts.aut users.aut icecast.conf
.for f in ${EGFILES}
CONF_FILES+= ${EGDIR}/${f}.dist ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
.include "../../mk/bsd.prefs.mk"
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
index 0f19e68eabe..fcb635b4c1e 100644
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/16 15:05:45 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= juke-0.7
@@ -14,7 +14,7 @@ USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
# halfdelay()
-INCOMPAT_CURSES= NetBSD-1.[45]*-* NetBSD-1.6[-_.]* NetBSD-1.6[A-L]-*
+INCOMPAT_CURSES= NetBSD-1.[45]*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-L]-*
EGDIR= ${PREFIX}/share/examples/juke
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index a14c8efe067..7e125558b62 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/09/04 02:37:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= lame-${VERS}
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-vorbis
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
LDFLAGS.SunOS+= -lm
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index c8dac1b1764..a693c1c0aac 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:11 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= libid3tag-0.15.1b
@@ -20,7 +20,7 @@ USE_LIBTOOL= YES
USE_TOOLS+= pkg-config
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
INSTALLATION_DIRS= lib/pkgconfig
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 6014e43a698..ba889893b9f 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:11 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= libmad-0.15.1b
@@ -20,7 +20,7 @@ USE_LIBTOOL= YES
USE_TOOLS+= pkg-config
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
INSTALLATION_DIRS= lib/pkgconfig
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 1534e47de08..1c6e670ef18 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/09/30 13:26:02 adam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:49:48 rillig Exp $
DISTNAME= libsndfile-1.0.12
CATEGORIES= audio
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
# This package compiles with gcc2, but its configure script doesn't know that
CONFIGURE_ENV+= ac_cv_c_struct_hack=yes
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 460c33a6643..11cf8df5d67 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/10/15 18:14:03 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:49:48 rillig Exp $
DISTNAME= libvorbis-1.1.1
CATEGORIES= devel audio
@@ -16,7 +16,7 @@ USE_LIBTOOL= YES
GCC_REQD+= 2.95.3
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
PKGCONFIG_OVERRIDE+= vorbis.pc.in
PKGCONFIG_OVERRIDE+= vorbisenc.pc.in
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index 565d60b6982..7c993fc5dfc 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:48 rillig Exp $
DISTNAME= madman-0.93
PKGREVISION= 2
@@ -11,7 +11,7 @@ COMMENT= Powerful audio manager for large collections
BUILD_DEPENDS+= scons>=0.96:../../devel/scons
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
INSTALLATION_DIRS= bin
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 5686d63d463..89528f3b8b4 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/31 16:16:50 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= madplay-0.15.2b
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.include "options.mk"
diff --git a/audio/moc/distinfo b/audio/moc/distinfo
index 4497afaa4ec..f5ec9c6ca1c 100644
--- a/audio/moc/distinfo
+++ b/audio/moc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/11/19 10:55:37 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2005/12/05 20:49:48 rillig Exp $
SHA1 (moc-2.3.2.tar.bz2) = ca1a331ea9ea3699d76d4771416587190a814516
RMD160 (moc-2.3.2.tar.bz2) = 1da768dbb625bbeedd960eb7c09c0113eeba7482
Size (moc-2.3.2.tar.bz2) = 406058 bytes
-SHA1 (patch-aa) = abf10af1869428886f6616c5fc54a424474efd18
+SHA1 (patch-aa) = 3538c7632571a394a4749065ceb5db09b32e24ae
diff --git a/audio/moc/patches/patch-aa b/audio/moc/patches/patch-aa
index b4eab15f6b1..2765947bf02 100644
--- a/audio/moc/patches/patch-aa
+++ b/audio/moc/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2005/11/19 10:55:37 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/05 20:49:48 rillig Exp $
--- player.c.orig 2005-09-09 08:20:13.000000000 +0000
+++ player.c
@@ -20,4 +20,3 @@ $NetBSD: patch-aa,v 1.1 2005/11/19 10:55:37 xtraeme Exp $
if (tags_changed)
tags_change ();
-
diff --git a/audio/moss/Makefile b/audio/moss/Makefile
index 303186c5d1b..0af542edfaa 100644
--- a/audio/moss/Makefile
+++ b/audio/moss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:48 rillig Exp $
DISTNAME= moss-0.1.13
PKGREVISION= 1
@@ -28,7 +28,7 @@ SUBST_FILES.path= moss.conf.sample
SUBST_SED.path= -e 's,$${PREFIX}/var,${VARBASE},g' \
-e 's,$${PREFIX}/share,${PREFIX}/share,g'
-FILES_SUBST+= INTERPRETER=${PYTHONBIN}
+FILES_SUBST+= INTERPRETER=${PYTHONBIN:Q}
PYDISTUTILSPKG= yes
diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
index 7ffef3ea30b..ced6ac7d256 100644
--- a/audio/mp3asm/Makefile
+++ b/audio/mp3asm/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2005/10/31 15:55:30 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= mp3asm-0.1.3-1
+PKGNAME= mp3asm-0.1.3.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3asm/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= rxg@NetBSD.org
HOMEPAGE= http://mp3asm.sourceforge.net/
-COMMENT= mpeg 1/2/2.5 audio layer 1,2,3 frame level editor
+COMMENT= MPEG 1/2/2.5 audio layer 1,2,3 frame level editor
WRKSRC= ${WRKDIR}/mp3asm-0.1
GNU_CONFIGURE= yes
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 7a066325bda..fe505dccc70 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:49:49 rillig Exp $
DISTNAME= mp3blaster-3.2.0
PKGREVISION= 2
@@ -9,7 +9,7 @@ MAINTAINER= rxg@NetBSD.org
HOMEPAGE= http://www.stack.nl/~brama/mp3blaster.html
COMMENT= MP3 console curses-based player
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile
index 32a831e85cb..da933d961ea 100644
--- a/audio/mpg123-esound/Makefile
+++ b/audio/mpg123-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/03 15:17:14 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:49 rillig Exp $
PKGNAME= mpg123-esound-${MPG123_VERSION}
PKGREVISION= 6
@@ -6,7 +6,7 @@ COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
TARGET_SUFFIX= -esd
-.include "../mpg123/Makefile.common"
+.include "../../audio/mpg123/Makefile.common"
INSTALLATION_DIRS= bin man/man1
diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
index c6ca8ffa2ce..f8a320cf226 100644
--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2005/05/24 13:55:30 rillig Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/12/05 20:49:49 rillig Exp $
DISTNAME= mpg123-0.59r
MPG123_VERSION= 0.59.18
@@ -65,7 +65,7 @@ BUILD_TARGET= ${LOWER_OPSYS}${TARGET_SUFFIX}
CPPFLAGS+= -DINET6
.endif
-MAKE_FLAGS+= PREFIX="${PREFIX}"
+MAKE_FLAGS+= PREFIX=${PREFIX:Q}
pre-patch:
${LN} -s . ${WRKSRC}/mpg123
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 0a76bf8ab66..ae71de9910c 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= MuSE-0.9
@@ -21,10 +21,10 @@ CONFIGURE_ARGS+= --disable-ncurses
CONFIGURE_ARGS+= --disable-lubrify
CONFIGURE_ARGS+= --enable-gtk2
LIBS+= ${LIBOSSAUDIO}
-MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
MAKE_FLAGS+= docsdir=${PREFIX:Q}/share/doc/MuSE
-SUBST_CLASSES= dsp
+SUBST_CLASSES+= dsp
SUBST_STAGE.dsp= post-patch
SUBST_FILES.dsp= src/jmixer.cpp src/libmpeg/fileplayer.cc
SUBST_SED.dsp= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 37c26165fda..c8c1c5963ff 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:49 rillig Exp $
DISTNAME= musicbox-1.01p2
CATEGORIES= audio
@@ -12,7 +12,7 @@ DEPENDS+= mpg123>=0.59.18:../../audio/mpg123
WRKSRC= ${WRKDIR}/musicbox-1.01
CFLAGS+= -D${OPSYS}
-MAKE_ENV+= QT1DIR="${QT1DIR}"
+MAKE_ENV+= QT1DIR=${QT1DIR:Q}
INSTALLATION_DIRS= bin
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index b8b0931c2ea..f7be2096528 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/22 00:01:40 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:49 rillig Exp $
DISTNAME= mpd-0.11.5
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
@@ -21,7 +21,7 @@ USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples/mpd
RCD_SCRIPTS= mpd
-FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO}
+FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO:Q}
LDFLAGS+= ${LIBOSSAUDIO}
SUBST_CLASSES+= config
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index 79e89e7bed2..4bacee4dea1 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2005/10/31 16:11:20 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= nspmod-0.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/sound/players/}
-MAINTAINER= mycroft@NetBSD.ORG
+MAINTAINER= mycroft@NetBSD.org
#HOMEPAGE= http://www.jeton.or.jp/users/toru/www/orgsoft/index.html
COMMENT= MOD/S3M/MTM tracker that does its own DSP, uses VoxWare v2.90+
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 4cbbd1e5ccd..5026fd7217d 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/10/31 16:47:15 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/12/05 20:49:49 rillig Exp $
DISTNAME= oss-${OSS_VERSION} # Overridden below
PKGNAME= oss-${OSS_VERSION}
@@ -39,8 +39,8 @@ MODSTAT= /usr/bin/modstat
CHROOT?= /usr/sbin/chroot
OSSLIBDIR= ${PREFIX}/lib/oss
-FILES_SUBST+= OSSLIBDIR=${OSSLIBDIR}
-FILES_SUBST+= MODSTAT=${MODSTAT}
+FILES_SUBST+= OSSLIBDIR=${OSSLIBDIR:Q}
+FILES_SUBST+= MODSTAT=${MODSTAT:Q}
# OSS needs to find certain files in /etc, so this package can't be
# made to honor ${PKG_SYSCONFDIR}.
diff --git a/audio/p5-MP3-Tag/Makefile b/audio/p5-MP3-Tag/Makefile
index 23622972530..4d4f31b2837 100644
--- a/audio/p5-MP3-Tag/Makefile
+++ b/audio/p5-MP3-Tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/06 06:19:04 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:49 rillig Exp $
DISTNAME= tagged-0.40
PKGNAME= p5-MP3-Tag-0.40
@@ -11,7 +11,7 @@ MAINTAINER= damon@brodiefamily.org
HOMEPAGE= http://tagged.sourceforge.net/
COMMENT= This is a perl module to read/write tags of mp3-files
-DEPENDS= p5-Compress-Zlib-1.*:../../devel/p5-Compress-Zlib
+DEPENDS+= p5-Compress-Zlib-1.*:../../devel/p5-Compress-Zlib
PERL5_PACKLIST= auto/MP3/Tag/.packlist
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index e8fc312c27c..c5f78c298f8 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/31 16:13:06 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:49 rillig Exp $
DISTNAME= portaudio_v18_1
PKGNAME= portaudio-18.1
@@ -17,7 +17,6 @@ USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX}
EXTRACT_CMD_OPTS.zip= -aqo
pre-configure:
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
index cf1789034bd..5f6e7b77bcd 100644
--- a/audio/rio500/Makefile
+++ b/audio/rio500/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/31 16:13:50 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= rio500-0.7
@@ -14,8 +14,9 @@ NOT_FOR_PLATFORM= Interix-*-*
USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-devicepath=/dev --with-deviceentry=urio0
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-devicepath=/dev
+CONFIGURE_ARGS+= --with-deviceentry=urio0
.include "../../devel/glib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 9366148a219..4a8126b3117 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/05/23 08:43:59 rillig Exp $
+# $NetBSD: Makefile,v 1.50 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= rplay-3.3.2
@@ -36,7 +36,6 @@ post-install:
.for f in rplay.conf rplay.helpers rplay.hosts rplay.servers
${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR}
.endfor
-.undef f
.include "../../audio/gsm/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index c31f41df9d0..4fc1113e94b 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= speex-1.0.5
@@ -20,7 +20,7 @@ CONFLICTS= Speex-[0-9]*
CONFIGURE_ARGS+= --with-ogg-dir="${BUILDLINK_PREFIX.libogg}"
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
BUILDLINK_TRANSFORM+= l:gnugetopt:getopt
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index e549e0f6013..09ce01925c9 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/11/07 00:19:14 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= SpiralLoops-2.0.0
@@ -19,7 +19,7 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
USE_LANGUAGES= c++
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
CXXFLAGS+= -DFLTK_1_0_COMPAT
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index fd66f40cee7..8ad6a01e5c1 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= SpiralSynth-2.0.0
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
USE_LANGUAGES= c++
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
INSTALLATION_DIRS= bin
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index 8f4f1ed59a0..180defc8f24 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= splay-0.8.2
@@ -13,7 +13,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c++
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-xsplay --without-pthread
+CONFIGURE_ARGS+= --without-xsplay
+CONFIGURE_ARGS+= --without-pthread
LIBS+= ${LIBOSSAUDIO}
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 58f8db80f3e..1c1d2054289 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= sweep-0.8.3
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --disable-oggtest
CONFIGURE_ARGS+= --disable-vorbistest
CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS}
+MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
index 9948cbd480c..68f6938d451 100644
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/26 17:30:31 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= toolame-02l
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake
TOOLAME_ARCH?=
-MAKE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" ARCH="${TOOLAME_ARCH}"
+MAKE_ENV+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} ARCH=${TOOLAME_ARCH:Q}
BUILD_TARGET= toolame
INSTALLATION_DIRS= bin
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 3f31b67f225..2eaae8e52b1 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/20 01:54:04 kristerw Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 20:49:50 rillig Exp $
DISTNAME= tracker-5.3
PKGREVISION= 1
@@ -17,7 +17,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/tracker
-MAKE_FLAGS= MACHINE=${LOWER_OPSYS} INSTALL="${INSTALL}" \
+MAKE_FLAGS+= MACHINE=${LOWER_OPSYS:Q} INSTALL=${INSTALL:Q} \
INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \
INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \
COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \
diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
index fbdd74aab9f..81dd07a67f6 100644
--- a/audio/tremor-tools/Makefile
+++ b/audio/tremor-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/08 12:35:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:50 rillig Exp $
DISTNAME= vorbis-tools-1.0
PKGNAME= tremor-tools-1.0.0.8
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
--with-ao-prefix=${BUILDLINK_PREFIX.libao}
-PLIST_SUBST+= DISTNAME="${DISTNAME}"
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
PTHREAD_OPTS+= require
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index 0a7a037e2d4..30b5de29748 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 20:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:50 rillig Exp $
DISTNAME= tremor_snapshot_030406
PKGNAME= tremor-1.0.2
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= automake14 gmake
USE_LIBTOOL= yes
-PLIST_SUBST+= DISTNAME=${DISTNAME}
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
pre-configure:
cd ${WRKSRC} && aclocal
diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile
index 59b35e27f76..9eb1e6ce4c0 100644
--- a/audio/ubs/Makefile
+++ b/audio/ubs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= ubs-0.17
@@ -27,9 +27,9 @@ UBS_GROUP?= ubs
PKG_GROUPS= ${UBS_GROUP}
PKG_USERS= ${UBS_USER}:${UBS_GROUP}
-FILES_SUBST+= PREFIX="${PREFIX}"
-FILES_SUBST+= UBS_USER="${UBS_USER}"
-FILES_SUBST+= UBS_GROUP="${UBS_GROUP}"
+FILES_SUBST+= PREFIX=${PREFIX:Q}
+FILES_SUBST+= UBS_USER=${UBS_USER:Q}
+FILES_SUBST+= UBS_GROUP=${UBS_GROUP:Q}
OWN_DIRS_PERMS= ${UBS_BASEDIR} ${UBS_USER} ${UBS_GROUP} 0750
OWN_DIRS_PERMS+= ${UBS_BASEDIR}/var ${UBS_USER} ${UBS_GROUP} 0750
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 0118a82caeb..d7eb23ad8cb 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/10/15 21:24:16 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:49:50 rillig Exp $
DISTNAME= vorbis-tools-1.1.1
CATEGORIES= audio
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
--with-ao-prefix=${BUILDLINK_PREFIX.libao}
-PLIST_SUBST+= DISTNAME="${DISTNAME}"
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
PTHREAD_OPTS+= require
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 7389251498f..c100175176f 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:49:50 rillig Exp $
DISTNAME= xamp-0.8-10
PKGNAME= xamp-0.8.10
@@ -16,7 +16,7 @@ COMMENT= Version of amp (stands for `Audio Mpeg Player') plus a Qt GUI
WRKSRC= ${WRKDIR}/xamp-0.8/xamp-0.8g
DIST_SUBDIR= xamp
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CXXFLAGS=${CFLAGS:M*:Q}
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 1a751a7d323..0e684ccddb8 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/09/21 23:19:14 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.54 2005/12/05 20:49:50 rillig Exp $
DISTNAME= xmcd-3.0.2
PKGREVISION= 5
@@ -23,9 +23,9 @@ USE_IMAKE= yes
MAKE_ENV+= BATCH_BINDIR=${PREFIX}/bin
MAKE_ENV+= BATCH_LIBDIR=${PREFIX}/lib/X11
MAKE_ENV+= BATCH_MANDIR=${PREFIX}/man/man1
-MAKE_ENV+= SHELL=${SH}
+MAKE_ENV+= SHELL=${SH:Q}
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-S]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-S]*-*
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
@@ -36,7 +36,7 @@ ARCH= ${OPSYS}
ARCHBIN= ${PREFIX}/lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}
XMCDDIR= ${PREFIX}/lib/X11/xmcd
-PLIST_SUBST+= ARCH=${ARCH}
+PLIST_SUBST+= ARCH=${ARCH:Q}
_SETUID_ROOT= ${ROOT_USER} ${ROOT_GROUP} 4711
SPECIAL_PERMS= ${ARCHBIN}/cda ${_SETUID_ROOT}
diff --git a/audio/xmms-blursk/Makefile b/audio/xmms-blursk/Makefile
index ac0b5741e2d..a17c517c647 100644
--- a/audio/xmms-blursk/Makefile
+++ b/audio/xmms-blursk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:50 rillig Exp $
DISTNAME= Blursk-1.3
PKGNAME= xmms-blursk-1.3
@@ -19,7 +19,7 @@ USE_LIBTOOL= YES
.include "../../mk/bsd.prefs.mk"
.if !exists(${X11BASE}/include/X11/extensions/Xvlib.h)
-PKG_FAIL_REASON= "${PKGNAME} requires libXv.a"
+PKG_FAIL_REASON+= "${PKGNAME} requires libXv.a"
.endif
post-install:
diff --git a/audio/xmms-esound/Makefile b/audio/xmms-esound/Makefile
index a0000345596..13b125ce296 100644
--- a/audio/xmms-esound/Makefile
+++ b/audio/xmms-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/11/20 22:10:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:50 rillig Exp $
#
.include "../../audio/xmms/Makefile.common"
@@ -11,7 +11,7 @@ COMMENT= XMMS plugin to output sound through the esound daemon
CONFLICTS+= xmms<=1.2.7nb8
-BUILDLINK_DEPENDS.xmms= xmms>=1.2.7nb9
+BUILDLINK_DEPENDS.xmms+= xmms>=1.2.7nb9
BUILD_DIRS= ${WRKSRC}/Output/esd
INSTALL_DIRS= ${WRKSRC}/Output/esd
diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile
index 5aaad7a4f4d..a7cd7063015 100644
--- a/audio/xmms-fmradio/Makefile
+++ b/audio/xmms-fmradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= xmms-FMRadio-1.4
@@ -12,7 +12,7 @@ MAINTAINER= jmcneill@NetBSD.org
HOMEPAGE= http://silicone.free.fr/xmms-FMRadio/
COMMENT= Use a Radio Tuner card in XMMS
-ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-*-* NetBSD-1.6*-* NetBSD-[2-9]*-*
+ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-* NetBSD-1.6*-* NetBSD-[2-9]*-*
BINOWN?= ${ROOT_USER}
BINGRP?= ${ROOT_GROUP}
diff --git a/audio/xmms-iris/Makefile b/audio/xmms-iris/Makefile
index 7f11bc5014a..c230861e419 100644
--- a/audio/xmms-iris/Makefile
+++ b/audio/xmms-iris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= iris-0.11
@@ -18,7 +18,7 @@ USE_LIBTOOL= YES
# Needs libXxf86vm.so which isn't provided on NetBSD currently.
.if !exists(${X11BASE}/lib/libXxf86vm.so)
-PKG_FAIL_REASON= "${PKGNAME} requires libXxf86vm.so"
+PKG_FAIL_REASON+= "${PKGNAME} requires libXxf86vm.so"
.endif
.include "../../audio/xmms/buildlink3.mk"
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index cf4b08daedb..eddf1e11148 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= xmms-mad-0.5.5
@@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config
CPPFLAGS.NetBSD+= -DHAVE_NANOSLEEP=1
-BUILDLINK_DEPENDS.libmad= libmad>=0.15.0bnb1
+BUILDLINK_DEPENDS.libmad+= libmad>=0.15.0bnb1
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/xmms-tv-scope/Makefile b/audio/xmms-tv-scope/Makefile
index 8844daba674..d3f473ab03f 100644
--- a/audio/xmms-tv-scope/Makefile
+++ b/audio/xmms-tv-scope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= tv_scope-0.0.2
@@ -16,7 +16,7 @@ GNU_CONFIGURE= YES
ONLY_FOR_PLATFORM= SunOS-*-* Linux-*-* Darwin-*-*
ONLY_FOR_PLATFORM+= NetBSD-1.6[N-Z]-* NetBSD-1.6Z[A-Z]-*
-ONLY_FOR_PLATFORM+= NetBSD-[2-9]*
+ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-*
.include "../../audio/xmms/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index 9ed98740a18..d968ef8e2d6 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/11/02 15:20:51 joerg Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= xmms-1.2.10
@@ -23,7 +23,7 @@ PATCHDIR= ${.CURDIR}/../../audio/xmms/patches
CONFIGURE_ARGS+= --without-gnome
SHLIBTOOL_OVERRIDE= libtool
-# Broken configure script assumes that iconv_open lives in libc; work around.
+# Broken configure script assumes that iconv_open lives in libc; work around.
CPPFLAGS+= -DHAVE_ICONV_OPEN=1
CONFIGURE_ENV+= ac_cv_func_iconv_open=yes
LDFLAGS+= ${BUILDLINK_LDADD.iconv}
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 34114137a09..4fc98909505 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= xsidplay-1.6.5.1a
@@ -15,7 +15,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
CONFIGURE_ARGS+= --with-qt-dir=${QTDIR}
CONFIGURE_ENV+= DISABLE_ESD_TEST=yes
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index d791a0e8bed..d2e92299e47 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/10/31 17:26:02 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:49:51 rillig Exp $
DISTNAME= iozone3_248
PKGNAME= iozone-3.248
@@ -22,20 +22,20 @@ MAKEFILE= makefile
.include "../../mk/bsd.prefs.mk"
.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux"
- BUILD_TARGET= ${LOWER_OPSYS}
+BUILD_TARGET= ${LOWER_OPSYS}
.elif (${OPSYS} == "SunOS")
- BUILD_TARGET= Solaris
+BUILD_TARGET= Solaris
.elif (${OPSYS} == "Darwin")
- BUILD_TARGET= macosx
+BUILD_TARGET= macosx
.elif (${OPSYS} == "IRIX")
- BUILD_TARGET= ${OPSYS}${ABI:M64}
+BUILD_TARGET= ${OPSYS}${ABI:M64}
.elif (${OPSYS} == "BSDOS")
- BUILD_TARGET= bsdi
+BUILD_TARGET= bsdi
.elif (${OPSYS} == "AIX")
- BUILD_TARGET= ${OPSYS}
+BUILD_TARGET= ${OPSYS}
.else
- # XXX: generic should work, but specific target would be better
- BUILD_TARGET= generic
+# XXX: generic should work, but specific target would be better
+BUILD_TARGET= generic
.endif
INSTALLATION_DIRS= bin man/man1
diff --git a/benchmarks/kttcp/Makefile b/benchmarks/kttcp/Makefile
index 6a330beee05..bbcb6c5c0ea 100644
--- a/benchmarks/kttcp/Makefile
+++ b/benchmarks/kttcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/23 08:53:42 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:51 rillig Exp $
DISTNAME= kttcp-${VERSION}
CATEGORIES= benchmarks net
@@ -6,11 +6,11 @@ MASTER_SITES= # empty
DISTFILES= # empty
MAINTAINER= thorpej@NetBSD.org
-COMMENT= kttcp kernel network throughput benchmark
+COMMENT= Kernel network throughput benchmark
VERSION= 20020711
-ONLY_FOR_PLATFORM= NetBSD-1.6[B-Z]*-* NetBSD-[2-9]*
+ONLY_FOR_PLATFORM= NetBSD-1.6[B-Z]*-* NetBSD-[2-9]*-*
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index b6bc549f160..2d13efd7a83 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/16 19:10:38 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:51 rillig Exp $
DISTNAME= lmbench-2alpha11
PKGNAME= lmbench-2.11a
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_TOOLS+= gmake perl:run
BUILD_TARGET= build
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
INSTALLATION_DIRS= man/man1 man/man3 man/man8
diff --git a/benchmarks/lmbench/distinfo b/benchmarks/lmbench/distinfo
index 80ab4c89cad..4003416c40c 100644
--- a/benchmarks/lmbench/distinfo
+++ b/benchmarks/lmbench/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/05/23 08:55:56 rillig Exp $
+$NetBSD: distinfo,v 1.9 2005/12/05 20:49:51 rillig Exp $
SHA1 (lmbench-2alpha11.tgz) = 7480815b8f8d4000647db59eb6160e9dbac06490
RMD160 (lmbench-2alpha11.tgz) = 361401104fd5ea3a6e0a26a754ffd66fb2d9e9d6
@@ -7,10 +7,10 @@ SHA1 (patch-aa) = 0f16f206d56cfdfdd870d21afcef46e3b8e2c53a
SHA1 (patch-ab) = b25c659fd808535738591892c552b062bb7e7e8f
SHA1 (patch-ac) = 2aa73fbf3119db95ca483f676bd3f3c2fd25c8f6
SHA1 (patch-ad) = a196e6a4734de9a0d698d38f1691b1146bda45a2
-SHA1 (patch-ae) = 9a1475b04bb51f2d36edf8f6cf572235a31c55e0
+SHA1 (patch-ae) = 6d55be411c3b1e02fb269a24c1fd115e6e86855a
SHA1 (patch-af) = 9390d4b6fa950beb0020b44ad520dd22a8a2178e
SHA1 (patch-ag) = cf5d1f3cf24b9fb6ab4a1a84ad8a44fda858add4
SHA1 (patch-ah) = 3784e219af5be023bc7fe00dd8656f5af100279c
SHA1 (patch-ai) = 81f3695239b96dfa848a6bc47f739038efc79dca
SHA1 (patch-aj) = c0ddc2b95dab57b96f886dedcd6f253eadd9bf70
-SHA1 (patch-ak) = 347fc345f90872e922faace9fc651b5d8033dc64
+SHA1 (patch-ak) = 486db292921675cac78b8e266da84ca04ed8d697
diff --git a/benchmarks/lmbench/patches/patch-ae b/benchmarks/lmbench/patches/patch-ae
index 33ead658987..cfb6db094e1 100644
--- a/benchmarks/lmbench/patches/patch-ae
+++ b/benchmarks/lmbench/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2004/05/23 23:28:29 danw Exp $
+$NetBSD: patch-ae,v 1.3 2005/12/05 20:49:51 rillig Exp $
--- src/lmdd.c.orig Fri Jul 31 15:55:18 1998
+++ src/lmdd.c
-@@ -40,7 +40,6 @@ char *id = "$Id: lmdd.c,v 1.23 1997/12/0
+@@ -40,7 +40,6 @@
#include <stdlib.h>
#include <signal.h>
#include <string.h>
diff --git a/benchmarks/lmbench/patches/patch-ak b/benchmarks/lmbench/patches/patch-ak
index 4a378bb5046..a345f87d9e3 100644
--- a/benchmarks/lmbench/patches/patch-ak
+++ b/benchmarks/lmbench/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2004/06/16 04:33:51 minskim Exp $
+$NetBSD: patch-ak,v 1.2 2005/12/05 20:49:51 rillig Exp $
--- src/lmhttp.c.orig 1998-07-31 14:55:18.000000000 -0500
+++ src/lmhttp.c
-@@ -17,6 +17,7 @@ char *id = "$Id: s.lmhttp.c 1.6 98/06/29
+@@ -17,6 +17,7 @@
#include <sys/sysmp.h>
#include <sys/syssgi.h>
#endif
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index 75bf8bd3548..3d33bc6f7ec 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/10 07:03:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:51 rillig Exp $
DISTNAME= netio123
PKGNAME= netio-1.23
@@ -14,7 +14,7 @@ LICENSE= no-commercial-use
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
-MAKE_FLAGS+= CC="${CC}" CFLAGS="-DUNIX ${PTHREAD_CFLAGS} ${CFLAGS}" \
+MAKE_FLAGS+= CC=${CC:Q} CFLAGS="-DUNIX ${PTHREAD_CFLAGS} ${CFLAGS}" \
LFLAGS="${PTHREAD_LDFLAGS} ${LDFLAGS}" \
LIBS="${PTHREAD_LIBS} ${LIBS}" O=.o OUT=-o X=
diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile
index 828905cd367..92fbca139a6 100644
--- a/benchmarks/ttcp/Makefile
+++ b/benchmarks/ttcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/07/30 15:50:38 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:51 rillig Exp $
DISTNAME= ttcp
PKGNAME= ${DISTNAME}-1.12
@@ -14,15 +14,15 @@ COMMENT= TCP testing and performance measuring tool
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} \
- MANOWN=${MANOWN} MANGRP=${MANGRP}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \
+ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q}
.include "../../mk/bsd.prefs.mk"
MANCOMPRESSED_IF_MANZ= YES
.if (${OPSYS} == Darwin)
-MAKE_FLAGS= CFLAGS="-Din_addr_t=\"unsigned long\""
+MAKE_FLAGS+= CFLAGS="-Din_addr_t=\"unsigned long\""
.endif
INSTALLATION_DIRS= bin man/cat1 man/man1
diff --git a/benchmarks/ttcp/distinfo b/benchmarks/ttcp/distinfo
index 1bec744ec56..9386104aab4 100644
--- a/benchmarks/ttcp/distinfo
+++ b/benchmarks/ttcp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/11/07 13:55:32 joerg Exp $
+$NetBSD: distinfo,v 1.9 2005/12/05 20:49:51 rillig Exp $
SHA1 (ttcp.tar.Z) = 33a60af208eff3dc9ae745060f44b24c4e74aa7e
RMD160 (ttcp.tar.Z) = b5cb1a8efe0f716d25d58a4950f35bac47b17668
Size (ttcp.tar.Z) = 18163 bytes
SHA1 (patch-aa) = a9717aa9fd5f8cdff1a39c9b7d6ab17abbe399ad
-SHA1 (patch-ab) = 402874d81ec7c76b7279d4d4e79a5b851bf95804
+SHA1 (patch-ab) = b72ffd575ed97f62977743518c2b887182fe5595
diff --git a/benchmarks/ttcp/patches/patch-ab b/benchmarks/ttcp/patches/patch-ab
index 3baa876d734..264a3c9c1c9 100644
--- a/benchmarks/ttcp/patches/patch-ab
+++ b/benchmarks/ttcp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2005/11/07 13:55:32 joerg Exp $
+$NetBSD: patch-ab,v 1.7 2005/12/05 20:49:51 rillig Exp $
--- ttcp.c.orig 1997-02-27 21:30:23.000000000 +0000
+++ ttcp.c
-@@ -55,6 +55,7 @@ static char RCSid[] = "ttcp.c $Revision:
+@@ -55,6 +55,7 @@
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/time.h> /* struct timeval */
diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile
index 918da5a2372..780b2370205 100644
--- a/benchmarks/ubench/Makefile
+++ b/benchmarks/ubench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/03 05:57:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:51 rillig Exp $
#
DISTNAME= ubench-0.32
@@ -11,7 +11,7 @@ COMMENT= The Unix Benchmark utility
BUILD_TARGET= ubench
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-configure
SUBST_FILES.path= Makefile
SUBST_SED.path= -e "s,/usr/local,${PREFIX},"
diff --git a/biology/clustalw/Makefile b/biology/clustalw/Makefile
index a9142313149..3700ef71ec6 100644
--- a/biology/clustalw/Makefile
+++ b/biology/clustalw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/19 15:42:49 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:51 rillig Exp $
DISTNAME= clustalw1.83.UNIX
PKGNAME= clustalw-1.83
@@ -16,7 +16,7 @@ MAKEFILE= makefile
BUILD_TARGET= clustalw
WRKSRC= ${WRKDIR}/clustalw1.83
-MAKE_FLAGS+= CC="${CC}"
+MAKE_FLAGS+= CC=${CC:Q}
INSTALLATION_DIRS= bin
diff --git a/biology/hmmer/Makefile b/biology/hmmer/Makefile
index 04ae3199ad9..f159ded3fb8 100644
--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:51 rillig Exp $
#
DISTNAME= hmmer-2.3.2
@@ -13,6 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-MAKE_FLAGS+= MKDIR="${MKDIR}"
+MAKE_FLAGS+= MKDIR=${MKDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/biology/mummer/Makefile b/biology/mummer/Makefile
index 48c8c9b814b..4f81b15684b 100644
--- a/biology/mummer/Makefile
+++ b/biology/mummer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:38 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:51 rillig Exp $
#
DISTNAME= MUMmer3.15
@@ -14,8 +14,8 @@ COMMENT= System for aligning whole genome sequences
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_TOOLS+= gmake perl:run
-MAKE_ENV+= SH="${SH}"
-MAKE_ENV+= PERL="${PERL5}"
+MAKE_ENV+= SH=${SH:Q}
+MAKE_ENV+= PERL=${PERL5:Q}
INSTALLATION_DIRS= bin
do-install:
diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile
index e89955571ee..d320b93881a 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/10/31 17:53:26 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:49:51 rillig Exp $
DISTNAME= RasMol_2.7.3
PKGNAME= rasmol-2.7.3
@@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_IMAKE= YES
USE_TOOLS+= gunzip
-MAKE_ENV+= DEPTHDEF="${DEPTHDEF}"
+MAKE_ENV+= DEPTHDEF=${DEPTHDEF:Q}
.include "../../mk/bsd.prefs.mk"
@@ -22,11 +22,11 @@ GCC_REQD+= 2.95.3
.endif
.if defined(RASMOL_DEPTH)
-.if ${RASMOL_DEPTH} == 32
+. if ${RASMOL_DEPTH} == 32
DEPTHDEF= -DTHIRTYTWOBIT
-.else if ${RASMOL_DEPTH} == 16
+. elif ${RASMOL_DEPTH} == 16
DEPTHDEF= -DSIXTEENBIT
-.endif
+. endif
.endif
DEPTHDEF?= -DEIGHTBIT
diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index 952bd8a0ac1..ff12faf78c5 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:51 rillig Exp $
#
DISTNAME= fastcap-2.0-18Sep92
@@ -16,7 +16,7 @@ EXTRACT_USING= gtar # cannot be extracted with pax as tar
WRKSRC= ${WRKDIR}
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./config
-CONFIGURE_ARGS= 4
+CONFIGURE_ARGS+= 4
TEX_DEPMETHOD= build
TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index 984557f53c7..fe958ef8248 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/10/23 22:24:11 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:51 rillig Exp $
#
DISTNAME= fasthenry-3.0-12Nov96
@@ -30,7 +30,7 @@ DEPENDS+= libffm-[0-9]*:../../math/libffm
LIBS+= -lffm
.endif
LIBS+= -lm
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
GCC_REQD+= 2.95.3
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 55c5f18b713..b14af87353b 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:49:51 rillig Exp $
DISTNAME= felt-3.05.src
PKGNAME= felt-3.05
@@ -17,9 +17,9 @@ WRKSRC= ${WRKDIR}/FElt-3.05
USE_X11BASE= yes
XAW_TYPE?= 3d
-MAKE_ENV+= CCOPTS="${CFLAGS}"
-MAKE_ENV+= LDOPTS="${LDFLAGS}"
-MAKE_ENV+= SH="${SH}"
+MAKE_ENV+= CCOPTS=${CFLAGS:M*:Q}
+MAKE_ENV+= LDOPTS=${LDFLAGS:M*:Q}
+MAKE_ENV+= SH=${SH:Q}
USE_GNU_READLINE= # uses remove_history() and history_list()
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index fb72512575f..268abfe0b2e 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/08/22 12:25:00 cube Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:51 rillig Exp $
#
DISTNAME= gtkwave-2.0.0pre5
-PKGNAME= gtkwave-2.0.0pre5
CATEGORIES= cad
MASTER_SITES= ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 70d1bb66219..8ccc8c3b18b 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/22 15:28:35 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:52 rillig Exp $
#
DISTNAME= magic-7.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://vlsi.cornell.edu/magic/
COMMENT= Integrated circuit layout system
USE_TOOLS+= gmake
-MAKE_ENV+= MAGIC_HOME=${PREFIX}
+MAKE_ENV+= MAGIC_HOME=${PREFIX:Q}
.include "../../mk/endian.mk"
.if ${MACHINE_ENDIAN} == "big"
diff --git a/cad/mcalc/Makefile b/cad/mcalc/Makefile
index df3efa7f900..655de902b85 100644
--- a/cad/mcalc/Makefile
+++ b/cad/mcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/17 02:52:35 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:52 rillig Exp $
#
DISTNAME= mcalc-1.5
@@ -15,7 +15,7 @@ NO_BUILD= yes
MCALCBASE?= share/${PKGNAME}
-PLIST_SUBST+= MCALCBASE=${MCALCBASE}
+PLIST_SUBST+= MCALCBASE=${MCALCBASE:Q}
MESSAGE_SUBST+= MCALCBASE=${MCALCBASE}
do-install:
diff --git a/cad/mex-wcalc/Makefile b/cad/mex-wcalc/Makefile
index c690c29f23c..b7388287564 100644
--- a/cad/mex-wcalc/Makefile
+++ b/cad/mex-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/02 00:00:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:52 rillig Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -64,7 +64,7 @@ MEX_SUFX?= ${_MEX_SUFX}
MATLAB_MEX?= ${_MATLAB_MEX}
-PLIST_SUBST+= MEX_SUFX=${MEX_SUFX}
+PLIST_SUBST+= MEX_SUFX=${MEX_SUFX:Q}
.if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
MATLAB_DIR!= ${MATLAB_MEX} -v 2>/dev/null | ${AWK} '/[ \t]MATLAB[ \t]/ {print $$NF}'
diff --git a/cad/oct-wcalc/Makefile b/cad/oct-wcalc/Makefile
index d20949b6ed0..0e30ef823b1 100644
--- a/cad/oct-wcalc/Makefile
+++ b/cad/oct-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/01 03:53:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:52 rillig Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --without-scilab
# the octave-forge mex script, not any c++ code
# explicitly present in wcalc. The fortran part
# also comes from ocatve, not from wcalc.
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
USE_LANGUAGES= c c++ fortran
.include "../../math/octave/octave.mk"
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index efdee9004b4..52045bc90dc 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/12/03 02:37:28 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:49:52 rillig Exp $
DISTNAME= qcad-1.5.4-src
PKGNAME= qcad-1.5.4
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.qcad.org/
COMMENT= 2D CAD System
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
MAKE_ENV+= QTDIR=${BUILDLINK_PREFIX.qt3}
INSTALLATION_DIRS= bin
diff --git a/cad/sci-wcalc/Makefile b/cad/sci-wcalc/Makefile
index a146b34db74..bc7ecf5bcf6 100644
--- a/cad/sci-wcalc/Makefile
+++ b/cad/sci-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/01 03:52:50 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:52 rillig Exp $
#
.include "../../cad/wcalc/Makefile.common"
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --without-matlab
CONFIGURE_ARGS+= --without-octave
CONFIGURE_ARGS+= --with-scilab=${SCI}
-PLIST_SUBST+= SCIVERSION=${SCIVERSION}
+PLIST_SUBST+= SCIVERSION=${SCIVERSION:Q}
MESSAGE_SUBST+= SCIVERSION=${SCIVERSION}
.include "../../cad/libwcalc/buildlink3.mk"
diff --git a/cad/simian/Makefile b/cad/simian/Makefile
index 9de641503dc..0b93324adce 100644
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/03 19:56:36 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:52 rillig Exp $
#
DISTNAME= simian_12_98
@@ -18,7 +18,7 @@ NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
USE_LANGUAGES= c++
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
WRKSRC= ${WRKDIR}/Simian
BUILD_DIRS= src
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 44754876a09..9e7e1cd3525 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:52 rillig Exp $
#
DISTNAME= tkgate-1.6i
@@ -19,8 +19,8 @@ USE_TOOLS+= gm4
TKGATE_SITENAME= Earth
-CONFIGURE_ENV+= BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}"
-CONFIGURE_ENV+= PREFIX="${PREFIX}"
+CONFIGURE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q}
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
SUBST_CLASSES+= tkgate
SUBST_MESSAGE.tkgate= "Fixing paths in configuration files."
diff --git a/cad/wcalc/Makefile.common b/cad/wcalc/Makefile.common
index df93f916f76..bbb74deb593 100644
--- a/cad/wcalc/Makefile.common
+++ b/cad/wcalc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/12/01 23:58:16 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:49:52 rillig Exp $
#
DISTNAME= wcalc-0.9
@@ -46,6 +46,6 @@ MESSAGE_SUBST+= WCALC_HTMLPATH=${WCALC_HTMLPATH}
MESSAGE_SUBST+= WCALC_DIR=${WCALC_DIR}
# and the PLIST too
-PLIST_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR}
-PLIST_SUBST+= WCALC_HTMLDIR=${WCALC_HTMLDIR}
-PLIST_SUBST+= WCALC_DIR=${WCALC_DIR}
+PLIST_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR:Q}
+PLIST_SUBST+= WCALC_HTMLDIR=${WCALC_HTMLDIR:Q}
+PLIST_SUBST+= WCALC_DIR=${WCALC_DIR:Q}
diff --git a/chat/aim/Makefile b/chat/aim/Makefile
index a98496a8d89..162dc738ecd 100644
--- a/chat/aim/Makefile
+++ b/chat/aim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:52 rillig Exp $
DISTNAME= aim-1.5.286
CATEGORIES= chat
@@ -23,7 +23,7 @@ NO_BUILD= YES
EXTRACT_ONLY= # nothing
PLIST_SRC= ${WRKDIR}/PLIST.rpm
-PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
DIST_SUBDIR= .
RPMFILES= ${DISTFILES}
diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index 45a16a55402..3b9dd616739 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/11/12 19:51:24 tonio Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:52 rillig Exp $
#
DISTNAME= bitlbee-0.99
@@ -48,7 +48,6 @@ do-install:
.for f in AUTHORS FAQ README TODO
${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCDIR}
.endfor
-.undef f
PKG_OPTIONS_VAR= PKG_OPTIONS.bitlbee
PKG_SUPPORTED_OPTIONS= inet6
diff --git a/chat/bnc/Makefile b/chat/bnc/Makefile
index c87161ab219..0d645be10b7 100644
--- a/chat/bnc/Makefile
+++ b/chat/bnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/16 17:49:41 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:52 rillig Exp $
DISTNAME= bnc2.9.4
PKGNAME= ${DISTNAME:S/bnc/&-/}
@@ -12,9 +12,8 @@ COMMENT= Simple IRC relay proxy with support for virtual hosting
DEPENDS+= dialog-[0-9]*:../../misc/dialog
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS= --with-ssl
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-ssl
INSTALLATION_DIRS= bin
diff --git a/chat/bsflite/Makefile b/chat/bsflite/Makefile
index 1bb5205b175..9457ffa386f 100644
--- a/chat/bsflite/Makefile
+++ b/chat/bsflite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/29 04:50:39 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:52 rillig Exp $
DISTNAME= bsflite-0.80
CATEGORIES= chat
@@ -19,6 +19,6 @@ do-install:
${PREFIX}/share/examples/bsflite
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index f226a072583..e90df3e215b 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/12/03 17:04:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.56 2005/12/05 20:49:52 rillig Exp $
#
DISTNAME= centericq-4.21.0
@@ -19,13 +19,13 @@ USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ssl --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
-LIBS= ${LDFLAGS}
+LIBS+= ${LDFLAGS}
REPLACE_PERL= misc/cicqconv
INCOMPAT_CURSES+= NetBSD-1.[45]*-* NetBSD-1.6-* NetBSD-1.6.[1-9]-*
INCOMPAT_CURSES+= NetBSD-1.6_*-* NetBSD-1.6.[1-9]_*-* NetBSD-1.6[A-T]-*
-INCOMPAT_CURSES+= NetBSD-2.* NetBSD-3.* # see PR 29060
+INCOMPAT_CURSES+= NetBSD-2.*-* NetBSD-3.*-* # see PR 29060
.include "../../mk/bsd.prefs.mk"
diff --git a/chat/cgiirc/Makefile b/chat/cgiirc/Makefile
index bf394e5e75d..9fd9ca9096f 100644
--- a/chat/cgiirc/Makefile
+++ b/chat/cgiirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:52 rillig Exp $
DISTNAME= cgiirc-0.5.6
CATEGORIES= chat
@@ -55,14 +55,12 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/docs/${f} \
${PREFIX}/share/examples/cgiirc/${f}
. endfor
-. undef f
${INSTALL_DATA} ${WRKSRC}/cgiirc.config ${PREFIX}/share/examples/cgiirc
${INSTALL_DATA} ${WRKDIR}/cgiirc.conf ${PREFIX}/share/examples/cgiirc
. for f in ${EGFILES}
${INSTALL_DATA} ${WRKSRC}/${f} \
${PREFIX}/share/examples/cgiirc/${f}
. endfor
-. undef f
${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${CGIIRC}
${INSTALL_DATA} ${WRKSRC}/formats/* ${CGIIRC}/formats/
${INSTALL_DATA} ${WRKSRC}/images/*.gif ${CGIIRC}/images/
diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile
index 3ab98be4991..60ee64976c2 100644
--- a/chat/fugu/Makefile
+++ b/chat/fugu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/10/16 19:12:27 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:52 rillig 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
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= vi_cv_path_python=${PYTHONBIN}
+CONFIGURE_ENV+= vi_cv_path_python=${PYTHONBIN:Q}
LDFLAGS+= -L${BUILDLINK_PREFIX.py-Pmw}/lib \
${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.py-Pmw}/lib
CPPFLAGS+= -I${BUILDLINK_PREFIX.py-Pmw}/include \
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 11e0cf58f57..31aa7130891 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/09/07 13:58:16 adam Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:52 rillig Exp $
DISTNAME= gale-0.99fruit
PKGNAME= gale-0.99f
@@ -15,8 +15,8 @@ USE_GNU_READLINE= yes # needs rl_named_function()
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+= PROG_GLIB_CONFIG="${GLIB_CONFIG}"
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ENV+= PROG_GLIB_CONFIG=${GLIB_CONFIG:Q}
CPPFLAGS+= -I${BUILDLINK_PREFIX.rsaref}/include/rsaref
CPPFLAGS+= -I${BUILDLINK_PREFIX.libwww}/include/w3c-libwww
diff --git a/chat/goofey/Makefile b/chat/goofey/Makefile
index 04fcaa3d673..8132a4c8735 100644
--- a/chat/goofey/Makefile
+++ b/chat/goofey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:52 rillig Exp $
#
DISTNAME= goofey-3.15
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.csse.monash.edu.au/~tym/goofey.html
COMMENT= Text-based client for goofey, a flexible short message system
NO_CONFIGURE= yes
-LDFLAGS.SunOS= -lnsl -lsocket
+LDFLAGS.SunOS+= -lnsl -lsocket
INSTALLATION_DIRS= bin man/man1
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 305d61a5017..bf400a5b9f1 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/08/25 20:16:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= gossip-0.9
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://gossip.imendio.org/
COMMENT= GTK2 Jabber Instant Messaging client
-BUILD_DEPENDS= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
+BUILD_DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
diff --git a/chat/gtmess/Makefile b/chat/gtmess/Makefile
index 5639b647a79..759dd98cacd 100644
--- a/chat/gtmess/Makefile
+++ b/chat/gtmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/06 15:54:26 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= gtmess-0.91
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_search_iconv=${BUILDLINK_LDADD.iconv:Q}
-INCOMPAT_CURSES= NetBSD-1.*
+INCOMPAT_CURSES= NetBSD-1.*-*
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
diff --git a/chat/i2cbd/Makefile b/chat/i2cbd/Makefile
index 7943c960e1d..4d1bfdba5df 100644
--- a/chat/i2cbd/Makefile
+++ b/chat/i2cbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/19 18:12:36 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= i2cbd-2.0_BETA1
@@ -16,7 +16,7 @@ USE_PKGINSTALL= YES
BUILD_DEFS+= ICBD_OWNER
ICBD_OWNER?= ${ROOT_USER}
-PLIST_SUBST+= ICBD_OWNER=${ICBD_OWNER}
+PLIST_SUBST+= ICBD_OWNER=${ICBD_OWNER:Q}
PKG_SYSCONFSUBDIR= icbd
EGDIR= ${PREFIX}/share/examples/i2cbd
@@ -26,7 +26,6 @@ CONF_FILES_PERMS= # empty
CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
${ICBD_OWNER} ${ROOT_GROUP} 644
.endfor
-.undef f
CONF_FILES_PERMS+= /dev/null /var/log/icbd.log \
${ICBD_OWNER} ${ROOT_GROUP} 644
@@ -42,7 +41,6 @@ post-install:
.for f in ${EGFILES}
${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR}
.endfor
-.undef f
${INSTALL_SCRIPT} ${WRKDIR}/icbd.sh ${PREFIX}/etc/rc.d/icbd
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/icbirc/distinfo b/chat/icbirc/distinfo
index becc7071a61..9ccf4dc16e6 100644
--- a/chat/icbirc/distinfo
+++ b/chat/icbirc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/03/10 13:22:01 tv Exp $
+$NetBSD: distinfo,v 1.7 2005/12/05 20:49:53 rillig Exp $
SHA1 (icbirc-1.8.tar.gz) = 99ff8674b189fdf8a86b6acd2bc19418b888c38b
RMD160 (icbirc-1.8.tar.gz) = 769c35949b79b9e401d99026800e61063e6d1103
Size (icbirc-1.8.tar.gz) = 11061 bytes
-SHA1 (patch-aa) = ee8e182618cb0563a9244b57de307f2f8a710f09
+SHA1 (patch-aa) = 97441a0fb639095fc9e10290aa0d8b125f59285b
diff --git a/chat/icbirc/patches/patch-aa b/chat/icbirc/patches/patch-aa
index 53217d3f010..873c81da7a6 100644
--- a/chat/icbirc/patches/patch-aa
+++ b/chat/icbirc/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/03/10 13:22:01 tv Exp $
+$NetBSD: patch-aa,v 1.5 2005/12/05 20:49:53 rillig Exp $
--- icbirc.c.orig Thu Nov 18 16:14:28 2004
+++ icbirc.c
-@@ -35,6 +35,7 @@ static const char rcsid[] = "$Id: icbirc
+@@ -35,6 +35,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/chat/iip/Makefile b/chat/iip/Makefile
index cf8bbdeb3ee..ebe2923860e 100644
--- a/chat/iip/Makefile
+++ b/chat/iip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 08:53:54 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= iip-1.1.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.invisiblenet.net/iip/
COMMENT= The Invisible IRC Project
BUILD_DIRS= ${WRKSRC}/src
-MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} LDFLAGS=${LDFLAGS:Q}
+MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} LDFLAGS=${LDFLAGS:M*:Q}
MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}" "${CPPFLAGS:Q}" -I."
do-install:
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 59f82f8806f..b68e12eb16d 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/06/02 22:21:18 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:49:53 rillig Exp $
DISTNAME= ircii-${VERS}
PKGNAME= ircII-${VERS}
@@ -18,7 +18,7 @@ CONFLICTS= blackened-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
VERS= 20040820
-PLIST_SUBST+= VERS=${VERS}
+PLIST_SUBST+= VERS=${VERS:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index aa7c1b7c585..8c256bd07b9 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/16 22:59:19 adrianp Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:49:53 rillig Exp $
DISTNAME= ircd-hybrid-7.1.3
EXTRACT_SUFX= .tgz
@@ -35,9 +35,9 @@ OWN_DIRS_PERMS+= ${VARBASE}/log/ircd-hybrid/logs \
OWN_DIRS_PERMS+= ${VARBASE}/run/ircd-hybrid \
${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0770
-FILES_SUBST+= IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER}
-FILES_SUBST+= IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP}
-FILES_SUBST+= VARBASE=${VARBASE}
+FILES_SUBST+= IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER:Q}
+FILES_SUBST+= IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP:Q}
+FILES_SUBST+= VARBASE=${VARBASE:Q}
PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::ircd-hybrid\ User::${NOLOGIN}
PKG_GROUPS= ${IRCD_HYBRID_IRC_GROUP}
diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile
index 2b400f45015..fd2cde63a08 100644
--- a/chat/irchat-pj/Makefile
+++ b/chat/irchat-pj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:28 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:53 rillig Exp $
DISTNAME= irchat-pj-2.4.24.22
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -21,6 +21,6 @@ PKG_FAIL_REASON+= "Unknown Emacs flavor"
.endif
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS="${LIBS}"
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index 5e397b44379..6e173e88d17 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/30 17:47:54 adrianp Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= ircservices-5.0.56
@@ -18,9 +18,9 @@ USE_TOOLS+= gmake grep gsed perl
RCD_SCRIPTS= ircservices
PKG_GROUPS= services
-CONFIGURE_ARGS= -prefix ${PREFIX}
+CONFIGURE_ARGS+= -prefix ${PREFIX:Q}
-SUBST_CLASSES= install utils conf
+SUBST_CLASSES+= install
SUBST_STAGE.install= post-patch
SUBST_FILES.install= install-script tools/ircservices-chk.in
SUBST_SED.install= -e "s|/bin/cp|${CP}|g" \
@@ -30,6 +30,7 @@ SUBST_SED.install= -e "s|/bin/cp|${CP}|g" \
-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" \
@@ -37,6 +38,7 @@ SUBST_SED.utils= -e "s|chgrp|${CHGRP}|g" \
-e "s|find|${FIND}|g"
SUBST_MESSAGE.utils= "Fixing paths of hard-coded utilities."
+SUBST_CLASSES+= conf
SUBST_STAGE.conf= post-patch
SUBST_FILES.conf= data/example-ircservices.conf data/example-modules.conf
SUBST_SED.conf= -e "s|/usr/local|${PREFIX}|g" \
diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile
index 40efa2ad1a0..52010b9e222 100644
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/29 19:05:12 adrianp Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= ircu2.10.11.07
@@ -41,7 +41,7 @@ SPECIAL_PERMS+= ${PKG_SYSCONFDIR} ${IRCD_USER} ${IRCD_GROUP} 0700
RCD_SCRIPTS= ircd
-FILES_SUBST+= IRCD_USER=${IRCD_USER}
+FILES_SUBST+= IRCD_USER=${IRCD_USER:Q}
MESSAGE_SUBST+= IRCD_USER=${IRCD_USER}
MESSAGE_SUBST+= IRCD_GROUP=${IRCD_GROUP}
PKG_GROUPS= ${IRCD_GROUP}
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index 287187bee4c..08983247983 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/10/31 09:18:45 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:49:53 rillig Exp $
DISTNAME= ${IRSSI_DISTNAME}
PKGREVISION= 7
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-terminfo \
--sysconfdir=${PKG_SYSCONFDIR}
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
EGDIR= ${PREFIX}/share/examples/irssi
CONF_FILES= ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index 2f6a99d8e71..49ccda38632 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/10/22 12:36:34 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= jabber-1.4.2
@@ -40,15 +40,14 @@ BUILD_DEFS+= JABBERD_USER JABBERD_GROUP \
PKG_GROUPS= ${JABBERD_GROUP}
PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}::Jabberd\ user
-FILES_SUBST+= JABBERD_USER="${JABBERD_USER}"
-FILES_SUBST+= JABBERD_GROUP="${JABBERD_GROUP}"
-FILES_SUBST+= JABBERD_SPOOLDIR="${JABBERD_SPOOLDIR}"
-FILES_SUBST+= JABBERD_PIDDIR="${JABBERD_PIDDIR}"
+FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q}
+FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q}
+FILES_SUBST+= JABBERD_SPOOLDIR=${JABBERD_SPOOLDIR:Q}
+FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
.for f in ${JABBERD_LOGDIR} ${JABBERD_SPOOLDIR} ${JABBERD_PIDDIR}
OWN_DIRS_PERMS+= ${f} ${JABBERD_USER} ${JABBERD_GROUP} 750
.endfor
-.undef f
CONF_FILES= ${EGDIR}/jabber.xml ${PKG_SYSCONFDIR}/jabber.xml
CONF_FILES+= ${EGDIR}/platform-settings \
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 01770dfd3af..42f99d19799 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/10/20 11:47:18 xtraeme Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= jabberd-2.0s10
@@ -18,7 +18,7 @@ USE_PKGINSTALL= yes
BUILDLINK_DEPENDS.openssl+= openssl>=0.9.6b
BUILDLINK_TRANSFORM.db4= -e "s,/db4/,/,g"
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= configure
SUBST_MESSAGE.path= "Fixing configure script."
@@ -42,10 +42,10 @@ PKG_SYSCONFSUBDIR= jabberd
RCD_SCRIPTS= jabberd c2s sm resolver router s2s
JABBERD_USER?= jabberd
JABBERD_GROUP?= jabberd
-FILES_SUBST+= JABBERD_USER=${JABBERD_USER}
-FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP}
-FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR}
-FILES_SUBST+= JABBERD_LOGDIR=${JABBERD_LOGDIR}
+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}
@@ -61,20 +61,17 @@ DBFILES= db-setup.mysql db-setup.pgsql
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
CONF_FILES+= ${EGDIR}/roster.xml ${PKG_SYSCONFDIR}/roster.xml
-.undef f
.include "options.mk"
.for f in ${JABBERD_LOGDIR} ${JABBERD_DBDIR} ${JABBERD_PIDDIR}
OWN_DIRS_PERMS+= ${f} ${JABBERD_USER} ${JABBERD_GROUP} 770
.endfor
-.undef f
post-extract:
.for f in ${FILES}
@${MV} ${WRKSRC}/etc/${f}.dist.in ${WRKSRC}/etc/${f}.in
.endfor
-.undef f
@${MV} ${WRKSRC}/etc/jabberd.cfg.dist.in ${WRKSRC}/etc/jabberd.cfg.in
pre-configure:
@@ -88,7 +85,6 @@ pre-configure:
-e "s|@DBDIR@|${JABBERD_DBDIR}|g" \
${WRKSRC}/etc/${f}.in > ${WRKSRC}/etc/${f}
.endfor
-.undef f
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
@@ -99,11 +95,9 @@ post-install:
.for f in ${DBFILES}
${INSTALL_DATA} ${WRKSRC}/tools/${f} ${EGDIR}
.endfor
-.undef f
.for f in jabberd.cfg ${FILES}
${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR}
.endfor
-.undef f
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
diff --git a/chat/kadu/Makefile b/chat/kadu/Makefile
index 29d83cb6cbb..0a5af5c7179 100644
--- a/chat/kadu/Makefile
+++ b/chat/kadu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/20 14:49:05 adam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:53 rillig Exp $
DISTNAME= kadu-0.4.1
CATEGORIES= chat
@@ -13,7 +13,7 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-existing-libgadu=${BUILDLINK_PREFIX.ekg}
-CONFIGURE_ENV+= X11BASE="${X11BASE}"
+CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
LIBS+= ${LIBOSSAUDIO}
WRKSRC= ${WRKDIR}/kadu
diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile
index bdb025a72a7..07fa59f87dd 100644
--- a/chat/licq-gui-qt/Makefile
+++ b/chat/licq-gui-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/19 10:01:16 grant Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= licq-1.2.6
@@ -22,7 +22,7 @@ NOT_FOR_PLATFORM= NetBSD-*-*
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= # defined
+LIBTOOL_OVERRIDE= # none
SHLIBTOOL_OVERRIDE= libtool */libtool */*/libtool
WRKSRC= ${WRKDIR:=/${DISTNAME}/plugins/qt-gui}
diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile
index 05c2ae2cb8d..f342dd90fc6 100644
--- a/chat/mu-conference/Makefile
+++ b/chat/mu-conference/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:53 rillig Exp $
#
DISTNAME= mu-conference-0.6.0
@@ -26,8 +26,8 @@ RCD_SCRIPTS= muc
BUILD_DEFS+= JABBERD_USER JABBERD_LOGDIR JABBERD_PIDDIR
JABBERD_USER?= jabberd
-FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR}
-FILES_SUBST+= JABBERD_USER=${JABBERD_USER}
+FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
+FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q}
EGDIR= ${PREFIX}/share/examples/jabberd
CONF_FILES+= ${EGDIR}/muc-jcr.xml ${PKG_SYSCONFDIR}/muc-jcr.xml
@@ -56,4 +56,3 @@ do-install:
.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
-
diff --git a/chat/p5-POE-Component-IRC/Makefile b/chat/p5-POE-Component-IRC/Makefile
index 7ce2533ee79..d2debf241dd 100644
--- a/chat/p5-POE-Component-IRC/Makefile
+++ b/chat/p5-POE-Component-IRC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/10/14 09:46:54 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= POE-Component-IRC-4.71
@@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=POE/}
MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://search.cpan.org/~bingos/${DISTNAME}/
-COMMENT= Fully event-driven IRC client module.
+COMMENT= Fully event-driven IRC client module
DEPENDS+= p5-POE>=0.17:../../devel/p5-POE
DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index ad3d2ab9c9b..f61fcf1aa97 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/10/01 22:02:00 jdolecek Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:49:54 rillig Exp $
PSI_VERSION= 0.9.3
DISTNAME= psi-${PSI_VERSION}
@@ -26,9 +26,10 @@ HAS_CONFIGURE= yes
CONFIG_SHELL= ${SH}
-CONFIGURE_ARGS= --prefix="${PREFIX}" --qtdir="${QTDIR}"
-CONFIGURE_ARGS+= --with-qca-inc="${BUILDLINK_PREFIX.qca}/include" \
- --with-qca-lib="${BUILDLINK_PREFIX.qca}/lib"
+CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --qtdir=${QTDIR:Q}
+CONFIGURE_ARGS+= --with-qca-inc=${BUILDLINK_PREFIX.qca:Q}/include
+CONFIGURE_ARGS+= --with-qca-lib=${BUILDLINK_PREFIX.qca:Q}/lib
LANG_FILES= psi_zh.qm psi_nl.qm psi_sk.qm psi_fr.qm psi_cs.qm \
psi_de.qm psi_et.qm psi_pl.qm psi_mk.qm psi_el.qm \
diff --git a/chat/ser/Makefile b/chat/ser/Makefile
index 80e941bdece..95bb87cc48e 100644
--- a/chat/ser/Makefile
+++ b/chat/ser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/08 02:20:07 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= ser-0.8.14_src
@@ -23,7 +23,7 @@ REQD_DIRS= ${EGDIR}
MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
MAKE_ENV+= cfg-prefix=${PREFIX}/share/examples
-MAKE_ENV+= EGDIR=${EGDIR}
+MAKE_ENV+= EGDIR=${EGDIR:Q}
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/silc-client-icb/Makefile b/chat/silc-client-icb/Makefile
index 86c0e63d3f4..7389a1a3e9f 100644
--- a/chat/silc-client-icb/Makefile
+++ b/chat/silc-client-icb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= irssi-icb-0.14
@@ -20,7 +20,7 @@ GNU_CONFIGURE= YES
IRSSI_DIR= ${WRKDIR}/${SILC_CLIENT_DISTNAME}/irssi
-CONFIGURE_ARGS= --with-irssi=${IRSSI_DIR}
+CONFIGURE_ARGS+= --with-irssi=${IRSSI_DIR:Q}
post-extract:
${CP} ${SILC_CLIENT_CONFIG_H} ${IRSSI_DIR}/config.h
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 75845eae132..0345f7c591d 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/09/17 17:06:27 salo Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= ${SILC_CLIENT_DISTNAME}
@@ -26,7 +26,7 @@ SHLIBTOOL_OVERRIDE= libtool */libtool */*/*/libtool
PKG_SYSCONFSUBDIR?= ${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-MAKE_ENV+= examplesdir=${EGDIR}
+MAKE_ENV+= examplesdir=${EGDIR:Q}
CONF_FILES+= ${EGDIR}/silc.conf.default ${PKG_SYSCONFDIR}/silc.conf
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 2da34292713..38129f07d83 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/09/13 22:02:24 salo Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= silc-server-1.0
@@ -32,7 +32,7 @@ PKG_USERS= ${SILCD_USER}:${SILCD_GROUP}::SILC\ Server\ user
PKG_SYSCONFSUBDIR?= ${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-MAKE_ENV+= examplesdir=${EGDIR}
+MAKE_ENV+= examplesdir=${EGDIR:Q}
CONF_FILES_MODE= 0600
CONF_FILES+= ${EGDIR}/silcd.conf.default \
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+= --enable-shared
# XXX: Avoid an ICE in gcc2 on sparc64
#
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.if ${MACHINE_ARCH} != "i386"
CONFIGURE_ARGS+= --disable-asm
diff --git a/chat/tik/Makefile b/chat/tik/Makefile
index ecbfa0a47ae..d47ea712202 100644
--- a/chat/tik/Makefile
+++ b/chat/tik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= tik-0.90
@@ -63,4 +63,3 @@ do-install:
${PREFIX}/share/examples/tik
.include "../../mk/bsd.pkg.mk"
-
diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index cf05cd52e35..9542e68d2c7 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= weechat-0.0.6
@@ -18,7 +18,7 @@ BUILD_USES_MSGFMT= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-INCOMPAT_CURSES+= NetBSD-1.*
+INCOMPAT_CURSES+= NetBSD-1.*-*
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile
index ed0ace539e9..6b0fe9f4560 100644
--- a/chat/xchat-systray-integration/Makefile
+++ b/chat/xchat-systray-integration/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:54 rillig Exp $
DISTNAME= xchat-systray-integration-2.4.5-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -9,7 +9,7 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://blight.altervista.org/index.php?act=Systray
COMMENT= Systray icon plugin for X-Chat
-DEPENDS= xchat>=2.0:../../chat/xchat
+DEPENDS+= xchat>=2.0:../../chat/xchat
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_TOOLS+= gmake pkg-config
@@ -17,7 +17,7 @@ USE_TOOLS+= gmake pkg-config
# We build a shared object, so ensure that the object files are PIC.
CFLAGS+= -fPIC
-MAKE_ENV+= prefix=${PREFIX}
+MAKE_ENV+= prefix=${PREFIX:Q}
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/ymessenger/Makefile b/chat/ymessenger/Makefile
index 96dff8f3509..f0e0aba7722 100644
--- a/chat/ymessenger/Makefile
+++ b/chat/ymessenger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/24 22:46:08 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:54 rillig Exp $
DISTNAME= ymessenger-0.93.0
CATEGORIES= chat
@@ -28,7 +28,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
EXTRACT_ONLY= # empty
NO_BUILD= yes
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
RPMFILES= ${DISTFILES}
diff --git a/chat/zephyr-mode/Makefile b/chat/zephyr-mode/Makefile
index a1984a3a222..8fe99c83291 100644
--- a/chat/zephyr-mode/Makefile
+++ b/chat/zephyr-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:28 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= zephyr-mode-2.5.20
@@ -10,7 +10,7 @@ MAINTAINER= sommerfeld@NetBSD.org
HOMEPAGE= http://www-2.cs.cmu.edu/People/dkindred/zephyr-mode/zephyr.html
COMMENT= CMU Emacs-based Zephyr client
-DEPENDS= tzc>=2.6.15:../../chat/tzc
+DEPENDS+= tzc>=2.6.15:../../chat/tzc
NO_BUILD= yes
diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile
index 9abdfde1e81..c789edd6c86 100644
--- a/chat/zephyr/Makefile
+++ b/chat/zephyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= zephyr-20010518
@@ -38,7 +38,6 @@ pre-install:
.for f in ${ZEPHYR_DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${ZEPHYR_DOCDIR}
.endfor
-.undef f
.include "../../devel/readline/buildlink3.mk"
.include "../../net/hesiod/buildlink3.mk"
diff --git a/comms/asterisk-sounds-extra/Makefile b/comms/asterisk-sounds-extra/Makefile
index af1c758801d..265e0c11187 100644
--- a/comms/asterisk-sounds-extra/Makefile
+++ b/comms/asterisk-sounds-extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/10/10 17:16:15 hira Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:54 rillig Exp $
#
VER= 1.0.9
@@ -11,6 +11,6 @@ MASTER_SITES= http://ftp1.digium.com/pub/asterisk/ \
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://ftp.digium.com/pub/asterisk/
-COMMENT= Asterisk IVR and miscellaneous sound files.
+COMMENT= Asterisk IVR and miscellaneous sound files
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 736113b06a0..a4f780138d6 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/10 21:45:08 rh Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:54 rillig Exp $
DISTNAME= asterisk-1.0.9
CATEGORIES= comms net audio
@@ -79,7 +79,6 @@ CONF_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
telcordia-1.adsi
CONF_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
.endfor
-.undef _file_
PTHREAD_OPTS+= require native
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index 8ec0442806a..e8c78870d0d 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/08/23 11:48:47 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= fidogate-4.4.10
@@ -11,7 +11,7 @@ COMMENT= FidoNet (FTN) <-> Internet mail and news gateway
USE_PKGINSTALL= yes
USE_TOOLS+= gmake perl:run
-MAKE_ENV= DEBUG="${CFLAGS} -Werror"
+MAKE_ENV+= DEBUG="${CFLAGS} -Werror"
BUILDLINK_SETENV.CC= CC="cc ${_STRIPFLAG_CC}"
USE_MAKEINFO= YES
diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile
index 10139a70549..1332a1e4f74 100644
--- a/comms/gkermit/Makefile
+++ b/comms/gkermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:54 rillig Exp $
#
DISTNAME= gku100
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
BUILD_TARGET= posix
MAKEFILE= makefile
-MAKE_ENV+= KFLAGS="${CFLAGS}"
+MAKE_ENV+= KFLAGS=${CFLAGS:M*:Q}
INSTALLATION_DIRS= bin man/man1
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 3be2d084f47..a9140fee262 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/11/28 06:41:20 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/05 20:49:54 rillig Exp $
VERS= 4.2.2
DISTNAME= hylafax-${VERS}
@@ -24,8 +24,8 @@ CONFIGURE_ARGS+= --with-MAKE=${MAKE_PROGRAM}
CONFIGURE_ARGS+= --with-INSTALL="" --nointeractive
CONFIGURE_ARGS+= --with-ZLIBINC=-I${BUILDLINK_PREFIX.zlib}/include
CONFIGURE_ARGS+= --with-LIBZ="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
-CONFIGURE_ENV+= PREFIX="${PREFIX}" OPTIMIZER="${CFLAGS}"
-CONFIGURE_ENV+= FAXUID="${FAXUSER}" FAXGID="${FAXGROUP}"
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q} OPTIMIZER=${CFLAGS:M*:Q}
+CONFIGURE_ENV+= FAXUID=${FAXUSER:Q} FAXGID=${FAXGROUP:Q}
MANCOMPRESSED= yes
FAXUSER?= uucp
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index ab4616991ef..81ef2505698 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/12/02 17:01:35 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2005/12/05 20:49:54 rillig Exp $
DISTNAME= cku211
PKGNAME= kermit-8.0.211
@@ -17,7 +17,7 @@ LICENSE= kermit-license
WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
BUILD_DEFS+= KFLAGS LIBS MANINSTALL
-MAKE_ENV+= KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
+MAKE_ENV+= KFLAGS=${KFLAGS:Q} LIBS=${LIBS:M*:Q}
MAKE_ENV+= SSLINC=${SSLINC:Q} SSLLIB=${SSLLIB:Q}
MAKEFILE= makefile
diff --git a/comms/linuxsms/Makefile b/comms/linuxsms/Makefile
index 44446993adb..cc62f14423f 100644
--- a/comms/linuxsms/Makefile
+++ b/comms/linuxsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:55 rillig Exp $
#
DISTNAME= linuxsms-0.65
@@ -23,6 +23,5 @@ do-install:
.for f in BUGS CHANGES README README.ES TODO
${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/linuxsms
.endfor
-.undef f
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index fe81e68b39e..f12382419e8 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:49:55 rillig Exp $
DISTNAME= lrzsz-0.12.20
CATEGORIES= comms
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
-.ifdef (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix")
+.if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix")
. include "../../devel/gettext-lib/buildlink3.mk"
LOCALE_SUFFIX= mo
.else
@@ -23,6 +23,6 @@ CONFIGURE_ARGS+= --with-catgets
LOCALE_SUFFIX= cat
.endif
-PLIST_SUBST+= LOCALE_SUFFIX=${LOCALE_SUFFIX}
+PLIST_SUBST+= LOCALE_SUFFIX=${LOCALE_SUFFIX:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 35745d08728..9b28308158f 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/07/01 10:16:28 hira Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/05 20:49:55 rillig Exp $
DISTNAME= mgetty1.1.31-Jul24
PKGNAME= mgetty-1.1.31
@@ -21,13 +21,13 @@ USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-MAKE_ENV= MGETTY_CONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+= MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q}
USE_MAKEINFO= YES
INFO_FILES= mgetty.info
PKG_SYSCONFSUBDIR= mgetty+sendfax
-.ifndef CONF_FILES
+.if !defined(CONF_FILES)
. for cfg in dialin.config \
faxheader \
faxrunq.config \
diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile
index 6c2660e5423..cb83b50d226 100644
--- a/comms/modemd/Makefile
+++ b/comms/modemd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:55 rillig Exp $
DISTNAME= modemd-970221
PKGNAME= modemd-19970221
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.vix.com/pub/modemd/
MAINTAINER= tsarna@NetBSD.org
COMMENT= Replacement getty for dialup ttys and a modem server
-MANCOMPRESSED_IF_MANZ= # defined
+MANCOMPRESSED_IF_MANZ= yes
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/modemd
diff --git a/comms/modemd/distinfo b/comms/modemd/distinfo
index 2d4a2075f79..4f7ddb91d59 100644
--- a/comms/modemd/distinfo
+++ b/comms/modemd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 16:05:30 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/12/05 20:49:55 rillig Exp $
SHA1 (modemd-970221.tar.gz) = 104f8e596f711e349203b2da8c4f2ecf40d490c3
RMD160 (modemd-970221.tar.gz) = ade5d735e5fd07b91006cf1334a41a43dca7e3d9
@@ -13,6 +13,6 @@ SHA1 (patch-ag) = 8d93d4da055170a19336e127017dfe42501a0538
SHA1 (patch-ah) = 9294419cd64c3b5cc9ebadc3a4c135a0a969262d
SHA1 (patch-ai) = 8e81c1e522979f616f2f4aafd5dd65400a6330fa
SHA1 (patch-aj) = 5616eff4fa6bc17377d2a433bbbaf2ca83909b94
-SHA1 (patch-ak) = 94e41ab3462933f3ddfa9ab0a235d39974dc779e
-SHA1 (patch-al) = 926b9ec9af6a7c5a4a460b448f4957913c411fe5
+SHA1 (patch-ak) = 089a0217e119e2f6e1138e35f81661d92e71f780
+SHA1 (patch-al) = a75de09e5df044b66b034a4ca9aa2148d0c68576
SHA1 (patch-am) = d740f41abf89f760431f32ca7ffa25bf1b3bd4e1
diff --git a/comms/modemd/patches/patch-ak b/comms/modemd/patches/patch-ak
index 4f352cf43f7..854bf80b128 100644
--- a/comms/modemd/patches/patch-ak
+++ b/comms/modemd/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 10:36:46 agc Exp $
+$NetBSD: patch-ak,v 1.3 2005/12/05 20:49:55 rillig Exp $
--- common/atparse.c.orig Thu Jun 18 16:48:18 1998
+++ common/atparse.c Thu Jun 18 16:48:50 1998
@@ -7,4 +7,3 @@ $NetBSD: patch-ak,v 1.2 1998/08/07 10:36:46 agc Exp $
+#ifdef __NetBSD__
+#include <stdlib.h>
+#endif
-
diff --git a/comms/modemd/patches/patch-al b/comms/modemd/patches/patch-al
index 806c3a7196b..505c6c25434 100644
--- a/comms/modemd/patches/patch-al
+++ b/comms/modemd/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.2 1998/08/07 10:36:46 agc Exp $
+$NetBSD: patch-al,v 1.3 2005/12/05 20:49:55 rillig Exp $
--- incoming/modemd.c.orig Thu Jun 18 16:50:31 1998
+++ incoming/modemd.c Thu Jun 18 16:51:08 1998
@@ -7,4 +7,3 @@ $NetBSD: patch-al,v 1.2 1998/08/07 10:36:46 agc Exp $
+#ifdef __NetBSD__
+#include <stdlib.h>
+#endif
-
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index bc239f08f97..adbfa72d4c6 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/08/05 20:31:52 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:49:55 rillig Exp $
DISTNAME= pilotmgr-1.107p2
PKGNAME= pilotmgr-1.107.2
@@ -22,7 +22,7 @@ NO_BUILD= YES
USE_TOOLS+= perl:run
CONFIGURE_ARGS= </dev/null
-CONFIGURE_ENV+= PERL="${LOCALBASE}/bin/perl" WRKDIR="${WRKDIR}"
+CONFIGURE_ENV+= PERL="${LOCALBASE}/bin/perl" WRKDIR=${WRKDIR:Q}
CONFIGURE_SCRIPT= ./Setup
PM_PERL_DIR= ${PREFIX}/lib/${DISTNAME:C/-.*$//}
diff --git a/converters/base64/Makefile b/converters/base64/Makefile
index 43f795cb86b..6d359997d20 100644
--- a/converters/base64/Makefile
+++ b/converters/base64/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:08 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:55 rillig Exp $
#
DISTNAME= base64-1.3
-PKGNAME= ${DISTNAME}
PKGREVISION= 1
CATEGORIES= converters
MASTER_SITES= http://www.fourmilab.ch/webtools/base64/
diff --git a/converters/cbmconvert/Makefile b/converters/cbmconvert/Makefile
index 8396f6e269f..24abd8b8b82 100644
--- a/converters/cbmconvert/Makefile
+++ b/converters/cbmconvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:55 rillig Exp $
DISTNAME= cbmconvert-2.0.5
CATEGORIES= converters archivers
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Converts files to and from various C64/C128/CBM formats
BUILD_TARGET= unix
-MAKE_FLAGS= CFLAGS="${CFLAGS}"
+MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
INSTALLATION_DIRS= bin
do-install:
diff --git a/converters/chef/Makefile b/converters/chef/Makefile
index 336dbc0695e..84c2e568260 100644
--- a/converters/chef/Makefile
+++ b/converters/chef/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/17 17:12:05 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:55 rillig Exp $
#
DISTNAME= chef.l
@@ -17,7 +17,7 @@ NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
-MAKE_ENV+= BINDIR=${PREFIX}/bin BINOWN=${BINOWN} BINGRP=${BINGRP}
+MAKE_ENV+= BINDIR=${PREFIX}/bin BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
INSTALLATION_DIRS= bin
diff --git a/converters/dvi2tty/Makefile b/converters/dvi2tty/Makefile
index 2527252e552..a18edbe95cf 100644
--- a/converters/dvi2tty/Makefile
+++ b/converters/dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:55 rillig Exp $
#
DISTNAME= dvi2tty
@@ -12,7 +12,7 @@ COMMENT= Program for previewing DVI files
LICENSE= no-commercial-use
-MAKE_FLAGS+= CFLAGS="${CFLAGS}"
+MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
INSTALLATION_DIRS= bin man/man1
diff --git a/converters/hztty/distinfo b/converters/hztty/distinfo
index 8c60137616d..0a19f86c6dc 100644
--- a/converters/hztty/distinfo
+++ b/converters/hztty/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 16:12:33 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/05 20:49:55 rillig Exp $
SHA1 (hztty-2.0.tar.gz) = db2d13f4f9d3918c1feef3ac8fb4bb24326a28ef
RMD160 (hztty-2.0.tar.gz) = e9e1250ad55fff042e62b9a99c75315641f9e73b
Size (hztty-2.0.tar.gz) = 229189 bytes
SHA1 (patch-aa) = 9091f33afb6eb5a8ca98ca937bf7e5488a337111
-SHA1 (patch-ab) = 90b052c3978838379cdf4ec4db7924419cdd8908
+SHA1 (patch-ab) = 62d4491dd23a81d514074f3f70d3cfda2d0a284d
SHA1 (patch-ac) = 6260fa7d189b8516f747e3f6fa846f1213c69d63
diff --git a/converters/hztty/patches/patch-ab b/converters/hztty/patches/patch-ab
index 0581187b747..bed3a09e840 100644
--- a/converters/hztty/patches/patch-ab
+++ b/converters/hztty/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/01/19 16:11:41 tv Exp $
+$NetBSD: patch-ab,v 1.3 2005/12/05 20:49:55 rillig Exp $
--- tty.c.orig 1995-01-29 15:24:55.000000000 -0500
+++ tty.c
-@@ -26,7 +26,7 @@ static char *rcs_id="$Id: tty.c,v 2.1 19
+@@ -26,7 +26,7 @@
# define TTYDEV "/dev/pty/ttyxx"
#else /* !hpux */
# define PTYCHAR1 "pqrstuvwxyzPQRSTUVWXYZ"
diff --git a/converters/ja-dvi2tty/Makefile b/converters/ja-dvi2tty/Makefile
index 6a3a1d49d3e..7c07b6c65e7 100644
--- a/converters/ja-dvi2tty/Makefile
+++ b/converters/ja-dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:55 rillig Exp $
DISTNAME= dvi2tty5.0
PKGNAME= ja-dvi2tty-5.0
@@ -15,7 +15,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Program for previewing DVI files (ASCII Japanese TeX)
-DEPENDS= ja-less>=358:../../misc/ja-less
+DEPENDS+= ja-less>=358:../../misc/ja-less
DIST_SUBDIR= ja-dvi2tty
diff --git a/converters/latex2rtf/Makefile b/converters/latex2rtf/Makefile
index f6fe25ce146..d6e51f10f98 100644
--- a/converters/latex2rtf/Makefile
+++ b/converters/latex2rtf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/21 16:34:37 reed Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:55 rillig Exp $
#
DISTNAME= latex2rtf-1.9.16a
@@ -11,7 +11,7 @@ HOMEPAGE= http://latex2rtf.sourceforge.net/
COMMENT= LaTeX to RTF converter
USE_TOOLS+= perl
-MAKE_FLAGS+= XCFLAGS="${CFLAGS}"
+MAKE_FLAGS+= XCFLAGS=${CFLAGS:M*:Q}
INFO_FILES= latex2rtf.info
INSTALLATION_DIRS= share/doc/latex2rtf ${INFO_DIR}
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 33d304ed1ed..9cee1c021e8 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/10/02 06:09:47 taca Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:49:55 rillig Exp $
DISTNAME= libiconv-1.10
PKGREVISION= 3
@@ -24,7 +24,7 @@ TEST_TARGET= check
EGDIR= ${PREFIX}/share/examples/libiconv
REQD_FILES= ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
-MAKE_ENV+= PAX="${PAX}"
+MAKE_ENV+= PAX=${PAX:Q}
.include "../../mk/compiler.mk"
diff --git a/converters/p5-chkjis/Makefile b/converters/p5-chkjis/Makefile
index 19141502bbd..4d75252d1f6 100644
--- a/converters/p5-chkjis/Makefile
+++ b/converters/p5-chkjis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/10/10 17:13:46 hira Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:55 rillig Exp $
#
DISTNAME= chkjis
@@ -24,7 +24,6 @@ USE_TOOLS+= perl:run
NO_BUILD= yes
NO_CONFIGURE= yes
PERL5_CONFIGURE= no
-NO_WRAPPER= yes
do-install:
${INSTALL_DATA_DIR} ${PERL5_INSTALLVENDORLIB}
diff --git a/converters/php-iconv/Makefile b/converters/php-iconv/Makefile
index 3e40dbfb393..e6649767f2d 100644
--- a/converters/php-iconv/Makefile
+++ b/converters/php-iconv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/06/01 19:03:45 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:55 rillig Exp $
MODNAME= iconv
CATEGORIES+= converters
-PKGREVISION= # empty
COMMENT= PHP extension for character set conversion
diff --git a/converters/rss2html/Makefile b/converters/rss2html/Makefile
index 9e41ce33530..48d32457be2 100644
--- a/converters/rss2html/Makefile
+++ b/converters/rss2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/29 04:40:47 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:56 rillig Exp $
#
DISTNAME= rss2html-0.7.2
@@ -16,6 +16,6 @@ USE_TOOLS+= gmake
INSTALLATION_DIRS+= bin
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/rtf2html/Makefile b/converters/rtf2html/Makefile
index f3094c2fd8c..666e169ea28 100644
--- a/converters/rtf2html/Makefile
+++ b/converters/rtf2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:56 rillig Exp $
#
DISTNAME= rtf2html
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.45.free.net/~vitus/ice/catdoc/
COMMENT= Rich Text to HTML file converter
BUILD_TARGET= rtf2html
-MAKE_FLAGS+= CFLAGS="${CFLAGS}"
+MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
INSTALLATION_DIRS= bin
diff --git a/converters/txt2man/Makefile b/converters/txt2man/Makefile
index 501742f035a..519d09fe325 100644
--- a/converters/txt2man/Makefile
+++ b/converters/txt2man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:27:39 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:56 rillig Exp $
#
DISTNAME= txt2man-1.4.2
@@ -7,10 +7,10 @@ MASTER_SITES= http://mvertes.free.fr/download/
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://mvertes.free.fr/
-COMMENT= txt2man converts flat ASCII text to man page format
+COMMENT= Convert flat ASCII text to man page format
NO_BUILD= YES
-MAKE_FLAGS+= prefix="${PREFIX}"
+MAKE_FLAGS+= prefix=${PREFIX:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 714cc68fb53..b052acba6cd 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/06/01 18:02:41 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 20:49:56 rillig Exp $
DISTNAME= uudeview-0.5.20
PKGNAME= xdeview-0.5.20
@@ -11,7 +11,8 @@ HOMEPAGE= http://www.fpx.de/fp/Software/UUDeview/
COMMENT= X11 program for uu/xx/Base64/BinHex de-/encoding
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-tcl="${LOCALBASE}" --enable-tk="${LOCALBASE}"
+CONFIGURE_ARGS+= --enable-tcl=${LOCALBASE:Q}
+CONFIGURE_ARGS+= --enable-tk=${LOCALBASE:Q}
LDFLAGS+= -s -lX11
BUILD_TARGET= xdeview
diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index b82551ee872..520799b6eca 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:44 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:56 rillig Exp $
DISTNAME= binutils-2.13.2.1
PKGNAME= avr-binutils-2.13.2.1
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_MAKEINFO= YES
-CONFIGURE_ARGS= --target=avr
+CONFIGURE_ARGS+= --target=avr
# Prevent the need to run texi2pod.pl and pod2man hence
# the need for perl as build dependency.
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 4d721f873ba..f166a040aa5 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:56 rillig Exp $
DISTNAME= gcc-3.3.2003.05.11
PKGNAME= avr-gcc-3.3.2003.05.11
@@ -25,12 +25,12 @@ USE_BZIP2= yes
USE_TOOLS+= bison gmake lex perl tar
USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS= --target=avr --prefix=${PREFIX}
+CONFIGURE_ARGS+= --target=avr
MAN_AUX= gcc-man.2003.05.11.gz
-MAKE_FLAGS= LANGUAGES="c c++"
-MAKE_ENV= MACHINE_ARCH=avr
+MAKE_FLAGS+= LANGUAGES="c c++"
+MAKE_ENV+= MACHINE_ARCH=avr
pre-build:
if perl -e 'use 1.10 Pod::Man' >/dev/null 2>/dev/null ; \
diff --git a/cross/avr-libc/Makefile b/cross/avr-libc/Makefile
index 654b31c5189..ccd262b62d3 100644
--- a/cross/avr-libc/Makefile
+++ b/cross/avr-libc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/15 08:45:54 wennmach Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:56 rillig Exp $
DISTNAME= avr-libc-1.2.5
CATEGORIES= cross
@@ -12,7 +12,6 @@ COMMENT= C and math library for Atmel AVR 8-bit microcontrollers
BUILD_DEPENDS+= avr-binutils-*:../../cross/avr-binutils
BUILD_DEPENDS+= avr-gcc-*:../../cross/avr-gcc
-BUILD_DEPENDS+= gmake-*:../../devel/gmake
BUILD_DEPENDS+= doxygen-*:../../devel/doxygen
BUILD_DEPENDS+= transfig-*:../../print/transfig
BUILD_DEPENDS+= netpbm-*:../../graphics/netpbm
@@ -21,7 +20,7 @@ USE_BZIP2= yes
USE_TOOLS+= gmake
HAS_CONFIGURE= yes
CONFIGURE_ENV+= CC=${LOCALBASE}/bin/avr-gcc
-CONFIGURE_ENV+= PREFIX=${PREFIX}
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
CONFIGURE_ARGS+= --enable-doc
CONFIGURE_ARGS+= --disable-versioned-doc
# avr-libc's method to build the man pages seems to be broken
@@ -34,10 +33,10 @@ do-build:
do-install:
(cd ${WRKSRC}; ./domake MAKE=${GMAKE} install)
- ${MKDIR} ${PREFIX}/share/doc/avr-libc
- ${MKDIR} ${PREFIX}/share/doc/avr-libc/examples
- ${MKDIR} ${PREFIX}/share/doc/avr-libc/examples/demo
- ${MKDIR} ${PREFIX}/share/doc/avr-libc/examples/twitest
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc/examples
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc/examples/demo
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc/examples/twitest
${INSTALL_DATA} \
${WRKSRC}/LICENSE \
${WRKSRC}/AUTHORS \
diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile
index f1c97eb55f8..884787e977d 100644
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:56 rillig Exp $
DISTNAME= avrdude-4.1.0
PKGREVISION= 2
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
INFO_FILES= avrdude.info
USE_MAKEINFO= yes
-CONFIGURE_ARGS= --disable-versioned-doc
+CONFIGURE_ARGS+= --disable-versioned-doc
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/tex.buildlink3.mk"
diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile
index 021664be8f2..73ba0d12bc9 100644
--- a/cross/bfd-crunchide/Makefile
+++ b/cross/bfd-crunchide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/05 11:05:33 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:56 rillig Exp $
DISTNAME= bfd-crunchide-1.1
PKGREVISION= 1
@@ -18,7 +18,7 @@ NO_CONFIGURE= yes
USE_CROSSBASE= yes
CPPFLAGS+= -I${PREFIX}/include
-MAKE_ENV+= LIBS="${BFD_LIBS}"
+MAKE_ENV+= LIBS=${BFD_LIBS:Q}
BFD_LIBS= ${PREFIX}/lib/libbfd.a ${PREFIX}/lib/libiberty.a ${PREFIX}/lib/libintl.a
diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile
index 357ef4b48d2..017690b7379 100644
--- a/cross/bfd-mdsetimage/Makefile
+++ b/cross/bfd-mdsetimage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/05 11:06:40 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:56 rillig Exp $
DISTNAME= bfd-mdsetimage-1.15.1
CATEGORIES= cross
@@ -16,8 +16,8 @@ NO_CONFIGURE= yes
USE_CROSSBASE= yes
BFD_VERSION= 2.9.1
CPPFLAGS+= -I${PREFIX}/include
-MAKE_ENV+= BFD_VERSION=${BFD_VERSION} \
- LIBS="${BFD_LIBS}"
+MAKE_ENV+= BFD_VERSION=${BFD_VERSION:Q} \
+ LIBS=${BFD_LIBS:Q}
FIX_RPATH+= BFD_LIBS
BFD_LIBS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd -liberty -lintl
diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
index 072e11efe81..629d643345f 100644
--- a/cross/binutils/Makefile
+++ b/cross/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/06/20 01:46:01 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:49:56 rillig Exp $
#
# GNU binutils configured to hold `as many targets as the cross system is
# capable of using'. Configures and builds everything except gas, which
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --target=i386-linux
MAKE_ARGS+= CFLAGS="${CFLAGS}"
BUILD_TARGET= all-binutils all-ld
-PLIST_SUBST= LOCALBASE=${LOCALBASE}
+PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q}
BINDIR= ${PREFIX}/libexec/binutils
diff --git a/cross/i386-cygwin32/Makefile b/cross/i386-cygwin32/Makefile
index 9f1c5dfe95e..f12fb3fc99d 100644
--- a/cross/i386-cygwin32/Makefile
+++ b/cross/i386-cygwin32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/07/09 20:48:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:56 rillig Exp $
#
DISTVERSION= 1.0.0.0
@@ -32,4 +32,4 @@ post-configure:
${CP} ${FILESDIR}/featuretest.h ${CROSS_SYS_INCLUDE}/sys/
${CP} ${FILESDIR}/limits.h ${CROSS_SYS_INCLUDE}/
-.include "../COMMON/cross.mk"
+.include "../../cross/COMMON/cross.mk"
diff --git a/cross/i386-linux/Makefile b/cross/i386-linux/Makefile
index 079cbe38696..d064b6182be 100644
--- a/cross/i386-linux/Makefile
+++ b/cross/i386-linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/18 12:16:13 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:56 rillig Exp $
#
DISTVERSION= 2.0.7.1
@@ -57,4 +57,4 @@ post-install:
${LN} -sf libdb.so libndbm.so; \
${LN} -sf libbsd-compat.a libbsd.a
-.include "../COMMON/cross.mk"
+.include "../../cross/COMMON/cross.mk"
diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile
index 3f11892a9fe..66a95ad6607 100644
--- a/cross/i386-mingw32/Makefile
+++ b/cross/i386-mingw32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:49:56 rillig Exp $
DISTNAME= cross-${TARGET_ARCH}-3.2
CROSS_DISTFILES=
@@ -21,7 +21,7 @@ CROSS_DISTFILES+= gcc-${GCC_VERSION}.tar.gz gcc-3.3.3-20040217-1-src.diff.gz \
MASTER_SITES+= ${MASTER_SITE_GNU:=gcc/releases/gcc-3.3.3/}
GCC_WIN32_PATCH= ${WRKDIR}/gcc-3.3.3-20040217-1-src.diff
GCC_WRKSRC= ${WRKDIR}/gcc-${GCC_VERSION}
-PLIST_SUBST+= GCC_VERSION=${GCC_VERSION}
+PLIST_SUBST+= GCC_VERSION=${GCC_VERSION:Q}
CROSS_DISTFILES+= mingw-runtime-3.2.tar.gz
MINGW_WRKSRC= ${WRKDIR}/mingw-runtime-3.2
CROSS_DISTFILES+= w32api-2.5.tar.gz
@@ -68,7 +68,7 @@ bu-configure:
cd ${BINUTILS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
--prefix=${PREFIX} --target=${TARGET_ARCH} --disable-nls
gcc-configure:
- -${MKDIR} ${GCC_WRKSRC}/${TARGET_ARCH}
+ ${MKDIR} ${GCC_WRKSRC}/${TARGET_ARCH}
cd ${GCC_WRKSRC}/${TARGET_ARCH} && ${SETENV} ${CONFIGURE_ENV} ../configure \
--prefix=${PREFIX} --target=${TARGET_ARCH} \
--with-gnu-as --with-gnu-ld --disable-multilib --disable-nls \
diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile
index ee5b5afe1b4..6b512c79ec8 100644
--- a/cross/i386-msdosdjgpp/Makefile
+++ b/cross/i386-msdosdjgpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/18 11:42:23 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:56 rillig Exp $
#
DISTVERSION= 2.02.0
@@ -15,7 +15,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.delorie.com/djgpp/
COMMENT= Cross-compile environment for MS-DOS on 386 and higher
-BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip
+BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
SITES_wmemu2b.zip= http://ftp.delorie.com/pub/djgpp/beta/ \
ftp://ftp.delorie.com/pub/djgpp/beta/ \
@@ -66,4 +66,4 @@ do-install:
${LN} -f ${TARGET_DIR}/bin/stubedit ${PREFIX}/bin/${TARGET_ARCH}-stubify
${INSTALL_DATA} ${WRKSRC}/bin/wmemu387.dxe ${TARGET_DIR}/lib/
-.include "../COMMON/cross.mk"
+.include "../../cross/COMMON/cross.mk"
diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index f141801bda9..ec6d2527cef 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/24 19:29:57 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:56 rillig Exp $
DISTVERSION= 3.3.3
MAINTAINER= peace-sacrifice@hauN.org
@@ -35,8 +35,8 @@ DISTFILES+= ${GCC_DISTNAME}.tar.gz
USE_TOOLS+= gmake
USE_MAKEINFO= YES
GCC_LANGUAGES= c,c++
-CONFIGURE_ENV= ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
- CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= ${SETENV} CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} \
+ CXXFLAGS=${CXXFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q}
GCC_CONFIGURE_ARGS= --with-gnu-ld --with-gnu-as -disable-multilib \
--enable-threads=posix --disable-shared --with-system-zlib \
--enable-languages=${GCC_LANGUAGES} --with-headers=yes \
diff --git a/cross/mipsEEel-netbsd/Makefile b/cross/mipsEEel-netbsd/Makefile
index ad726d9a196..2eeea9005af 100644
--- a/cross/mipsEEel-netbsd/Makefile
+++ b/cross/mipsEEel-netbsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/14 22:25:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:56 rillig Exp $
DISTNAME= cross-${TARGET_ARCH}-${DISTVERSION}
TARGET_ARCH= mipsEEel-netbsd
@@ -24,8 +24,8 @@ WRKSRC= ${WRKDIR}
# for other cross compilers.
#USE_CROSSBASE= yes
TARGET_DIR= ${PREFIX}/cross-ps2
-PLIST_SUBST+= SUBDIR="cross-ps2" TARGET_ARCH="${TARGET_ARCH}" \
- GCC_VERSION="${GCC_VERSION}"
+PLIST_SUBST+= SUBDIR="cross-ps2" TARGET_ARCH=${TARGET_ARCH:Q} \
+ GCC_VERSION=${GCC_VERSION:Q}
#
# binutils
diff --git a/databases/db/Makefile b/databases/db/Makefile
index 7a307121af5..f10192c88a1 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 22:06:28 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:49:56 rillig Exp $
DISTNAME= db-2.7.7
PKGREVISION= 2
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.sleepycat.com/
COMMENT= Sleepycat Software's Berkeley DB version 2
-NO_PKGTOOLS_REQD_CHECK= # defined (needed for pkgtools/pkg_install)
+NO_PKGTOOLS_REQD_CHECK= yes # (needed for pkgtools/pkg_install)
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index 84d396e9bd1..bb469850fd9 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/11/04 18:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:49:57 rillig Exp $
DISTNAME= db-4.3.29
PKGNAME= ${DISTNAME:S/db/db4/}
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --program-transform-name=s,db_,db4_,
# NetBSD-sparc64-1.6*'s f77 makes configure failing and as f77 is not
# needed for this package the following does no harm on other platform.
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
# Along with a hack in patch-ab, this forces shlib detection via
# the pkgsrc-supplied libtool only.
@@ -37,7 +37,7 @@ OPSYSVARS+= LIBSO_LIBS
LIBSO_LIBS.Interix+= -lrpclib
LIBS.Interix+= -lrpclib # needed for in-tree programs, too
LIBSO_LIBS.SunOS+= -lnsl -lrt
-CONFIGURE_ENV+= LIBSO_LIBS="${LIBSO_LIBS}"
+CONFIGURE_ENV+= LIBSO_LIBS=${LIBSO_LIBS:Q}
# DB4 only want pthreads because it's really after POSIX 1003.1
# inter-process mutexes. In this case, we only care to use the native
diff --git a/databases/db4/hacks.mk b/databases/db4/hacks.mk
index 161dadbc279..31e6f7d5ae6 100644
--- a/databases/db4/hacks.mk
+++ b/databases/db4/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2005/07/01 15:32:51 tron Exp $
+# $NetBSD: hacks.mk,v 1.4 2005/12/05 20:49:57 rillig Exp $
### [Sun Mar 14 19:32:40 UTC 2004 : jlam]
### GCC 3.3.x and older versions have an optimization bug on powerpc that's
@@ -15,7 +15,7 @@ _GCC_IS_TOO_OLD!= \
else \
${ECHO} "no"; \
fi
-MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD}
+MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD:Q}
. endif
. if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS])
PKG_HACKS+= powerpc-codegen
diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile
index d53d6a79cc7..716c2514297 100644
--- a/databases/dbh/Makefile
+++ b/databases/dbh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:57 rillig Exp $
DISTNAME= dbh-1.0.24
CATEGORIES= databases
@@ -13,7 +13,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dbh
diff --git a/databases/gdbm_primitive/Makefile b/databases/gdbm_primitive/Makefile
index ded9b0ee50e..31e478517f5 100644
--- a/databases/gdbm_primitive/Makefile
+++ b/databases/gdbm_primitive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:57 rillig Exp $
#
DISTNAME= gdbm-prim-1.15
@@ -13,7 +13,7 @@ HOMEPAGE= http://homepage.mac.com/leffert/FileSharing.html
COMMENT= Shell primitives for working with GDBMs
EXTRACT_CMD= ${_DFLT_EXTRACT_CMD}
-MAKE_ENV+= BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}"
+MAKE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q}
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
.include "../../databases/gdbm/buildlink3.mk"
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index 89fb062d0cf..e8c64f9bae0 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:49:57 rillig Exp $
#
DISTNAME= geneweb-4.10
@@ -10,7 +10,7 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://cristal.inria.fr/~ddr/GeneWeb/
COMMENT= GeneWeb is a comprehensive genealogy database application
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}nb1
USE_PKGINSTALL= yes
USE_TOOLS+= gmake
diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index e3ec0aeafbb..ee6b9689927 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:57 rillig Exp $
#
DISTNAME= gnome-mime-data-2.4.2
@@ -24,7 +24,7 @@ GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= gnome-mime-data-2.0.pc.in
-CONFIGURE_ARGS= --sysconfdir="${PKG_SYSCONFDIR}"
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
EGDIR= ${PREFIX}/share/examples/gnome-mime-data
CONF_FILES= ${EGDIR}/gnome-vfs-mime-magic \
diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index 66c560a3f7f..5e4b55e5ee5 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:57 rillig Exp $
#
DISTNAME= gramps-1.0.11
@@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
# i18n support with other python versions appears to not work
PYTHON_VERSION_REQD= 23
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 568d5571f03..482262db6e7 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/09/08 17:55:52 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:57 rillig Exp $
#
DISTNAME= gramps-2.0.8
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
# disable gconf schema and mime type processing
CONFIGURE_ARGS+= --disable-mime-install --enable-packager-mode
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
# i18n support with other python versions appears to not work
PYTHON_VERSIONS_ACCEPTED= 24 23
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index b58446b4811..993bc1a8ca2 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2005/12/05 20:49:57 rillig Exp $
#
DISTNAME= gtksql-0.3
@@ -14,7 +14,7 @@ HOMEPAGE= http://www.multimania.com/bbrox/GtkSQL/
COMMENT= Query tool for PostgreSQL written with GTK
USE_X11BASE= yes
-MAKE_ENV+= MCFLAGS="${CFLAGS}"
+MAKE_ENV+= MCFLAGS=${CFLAGS:M*:Q}
PGSQL_VERSION_REQD= 73
diff --git a/databases/java-db3/Makefile b/databases/java-db3/Makefile
index ca7d6e201b1..d69ecf7b8a6 100644
--- a/databases/java-db3/Makefile
+++ b/databases/java-db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/29 06:45:28 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:57 rillig Exp $
DISTNAME= db-3.3.11
PKGNAME= java-db3-3.11.2
@@ -32,9 +32,9 @@ CONFIGURE_ARGS+= --program-transform-name=s,db_,db3_,
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db3
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-java
-CONFIGURE_ENV+= JAVAC="${JAVAC}"
-CONFIGURE_ENV+= JAVACABS="${JAVACABS}"
-CONFIGURE_ENV+= JAR="${JAR}"
+CONFIGURE_ENV+= JAVAC=${JAVAC:Q}
+CONFIGURE_ENV+= JAVACABS=${JAVACABS:Q}
+CONFIGURE_ENV+= JAR=${JAR:Q}
CPPFLAGS+= ${BUILDLINK_CPPFLAGS.${PKG_JVM}}
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index db00f1e2f8b..4e83bb63bad 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/12 17:43:42 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:57 rillig Exp $
DISTNAME= lbdb_0.31
PKGNAME= ${DISTNAME:S/_/-/}
@@ -23,8 +23,8 @@ CONFIGURE_ARGS+= --without-evolution-addressbook-export
CONFIGURE_ARGS+= --without-pgp
CONFIGURE_ARGS+= --without-pgpk
-CONFIGURE_ENV+= SH=${TOOLS_SH}
-CONFIGURE_ENV+= AWK=${TOOLS_AWK}
+CONFIGURE_ENV+= SH=${TOOLS_SH:Q}
+CONFIGURE_ENV+= AWK=${TOOLS_AWK:Q}
.include "options.mk"
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 4ab7174e113..e67025be714 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/09/23 20:08:05 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:49:57 rillig Exp $
#
DISTNAME= libgnomedb-1.2.2
@@ -20,7 +20,7 @@ GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= libgnomedb.pc.in
-CONFIGURE_ARGS= --enable-gtk-doc=no
+CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
GCONF2_SCHEMAS= libgnomedb.schemas
diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile
index 1f04415dda8..13cb5cf2ae4 100644
--- a/databases/libpqxx/Makefile
+++ b/databases/libpqxx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/27 01:57:26 markd Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:57 rillig Exp $
#
.include "../../databases/libpqxx/Makefile.common"
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --disable-thread-safety
.endif
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.include "../../mk/pgsql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 485cdaa41f1..740c3f85a05 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.50 2005/11/09 19:49:52 tv Exp $
+# $NetBSD: Makefile.common,v 1.51 2005/12/05 20:49:57 rillig Exp $
DISTNAME= mysql-4.0.26
CATEGORIES= databases
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --enable-assembler
.endif
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
CPPFLAGS+= -Dunix
CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index f3ed6ef1ed4..cba393d7a9d 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/10/03 14:24:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.67 2005/12/05 20:49:57 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 1
@@ -7,7 +7,7 @@ COMMENT= MySQL 4, a free SQL database (server)
CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
-.include "../mysql-client/Makefile.common"
+.include "../../databases/mysql-client/Makefile.common"
CONFIGURE_ARGS+= --with-libwrap
@@ -26,9 +26,9 @@ PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL
PKG_GROUPS= ${MYSQL_GROUP}
RCD_SCRIPTS= mysqld
-FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD} \
- MYSQL_DATADIR=${MYSQL_DATADIR} \
- MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
+ MYSQL_DATADIR=${MYSQL_DATADIR:Q} \
+ MYSQL_USER=${MYSQL_USER:Q} MYSQL_GROUP=${MYSQL_GROUP:Q}
MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \
MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
BUILD_DEFS+= MYSQL_DATADIR
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 75dfe58eef6..3d5450b91dd 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2005/11/09 19:48:44 tv Exp $
+# $NetBSD: Makefile.common,v 1.47 2005/12/05 20:49:57 rillig Exp $
DISTNAME= mysql-4.1.15
CATEGORIES= databases
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+= --enable-assembler
.endif
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
CPPFLAGS+= -Dunix
CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 1c1e72620a4..f182f28b591 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/10/29 14:14:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:57 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
#PKGREVISION= 1
@@ -7,7 +7,7 @@ COMMENT= MySQL 4, a free SQL database (server)
CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
-.include "../mysql4-client/Makefile.common"
+.include "../../databases/mysql4-client/Makefile.common"
CONFIGURE_ARGS+= --with-libwrap
@@ -26,9 +26,9 @@ PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL
PKG_GROUPS= ${MYSQL_GROUP}
RCD_SCRIPTS= mysqld
-FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD} \
- MYSQL_DATADIR=${MYSQL_DATADIR} \
- MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
+ MYSQL_DATADIR=${MYSQL_DATADIR:Q} \
+ MYSQL_USER=${MYSQL_USER:Q} MYSQL_GROUP=${MYSQL_GROUP:Q}
MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \
MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
BUILD_DEFS+= MYSQL_DATADIR
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index 49175b864b0..df9eb361121 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:58 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
#PKGREVISION= 1
@@ -25,9 +25,9 @@ PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL
PKG_GROUPS= ${MYSQL_GROUP}
RCD_SCRIPTS= mysqld
-FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD} \
- MYSQL_DATADIR=${MYSQL_DATADIR} \
- MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
+ MYSQL_DATADIR=${MYSQL_DATADIR:Q} \
+ MYSQL_USER=${MYSQL_USER:Q} MYSQL_GROUP=${MYSQL_GROUP:Q}
MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \
MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
BUILD_DEFS+= MYSQL_DATADIR
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index f67075660f0..ae9f49334f0 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2005/11/19 18:41:15 joerg Exp $
+# $NetBSD: Makefile,v 1.104 2005/12/05 20:49:58 rillig Exp $
DISTNAME= openldap-2.3.11
PKGREVISION= 1
@@ -19,7 +19,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
TEST_TARGET= test
-MAKE_ENV+= LIBMODE=${LIBMODE}
+MAKE_ENV+= LIBMODE=${LIBMODE:Q}
OPENLDAP_ETCDIR= ${PKG_SYSCONFDIR}/openldap
OPENLDAP_MODULEDIR= ${PREFIX}/lib/openldap
OPENLDAP_VARDIR= ${VARBASE}/openldap
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk
index d96bcc02648..68078ecab67 100644
--- a/databases/openldap/options.mk
+++ b/databases/openldap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2005/10/26 15:08:13 jlam Exp $
+# $NetBSD: options.mk,v 1.14 2005/12/05 20:49:58 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openldap
PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= bdb
###
### Whether to build with the Berkeley DB based slapd backends.
-###
+###
### NOTE: that option is enabled, because the openldap server needs
### to have local storage support to work as standalone.
###
diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile
index cffe55e2bf7..5b9b812470b 100644
--- a/databases/p5-BerkeleyDB/Makefile
+++ b/databases/p5-BerkeleyDB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/06 06:19:06 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:58 rillig Exp $
#
DISTNAME= BerkeleyDB-0.26
@@ -19,7 +19,7 @@ PERL5_PACKLIST= auto/BerkeleyDB/.packlist
MAKE_ENV+= BERKELEYDB_INCLUDE="${BDBBASE}/include/${BDB_TYPE}"
MAKE_ENV+= BERKELEYDB_LIB="${BDBBASE}/lib"
-MAKE_ENV+= BERKELEYDB_NAME="${BDB_LIBS}"
+MAKE_ENV+= BERKELEYDB_NAME=${BDB_LIBS:Q}
.include "../../mk/bdb.buildlink3.mk"
.include "../../lang/perl5/module.mk"
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index bf83fb310d7..50fc50d9a76 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/06 06:19:06 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:58 rillig Exp $
#
DISTNAME= DBD-Sybase-0.94
@@ -29,7 +29,7 @@ _SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds
.endif
PERL5_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib
-MAKE_ENV+= SYBASE=${_SYBASE}
+MAKE_ENV+= SYBASE=${_SYBASE:Q}
.if !defined(USE_SYBASE_OPENCLIENT)
. include "../../databases/freetds/buildlink3.mk"
diff --git a/databases/p5-DBD-postgresql/Makefile b/databases/p5-DBD-postgresql/Makefile
index b05f69251ea..2569d3dcc53 100644
--- a/databases/p5-DBD-postgresql/Makefile
+++ b/databases/p5-DBD-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/08/06 06:19:06 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 20:49:58 rillig Exp $
#
VER= 1.41
@@ -22,8 +22,8 @@ PGPREFIX= ${PREFIX}/${PGUSER}
POSTGRES_INCLUDE= ${PGSQL_PREFIX}/include/postgresql
POSTGRES_LIB= ${PGSQL_PREFIX}/lib
-MAKE_ENV+= POSTGRES_INCLUDE="${POSTGRES_INCLUDE}"
-MAKE_ENV+= POSTGRES_LIB="${POSTGRES_LIB}"
+MAKE_ENV+= POSTGRES_INCLUDE=${POSTGRES_INCLUDE:Q}
+MAKE_ENV+= POSTGRES_LIB=${POSTGRES_LIB:Q}
.include "../../databases/p5-DBI/buildlink3.mk"
.include "../../lang/perl5/module.mk"
diff --git a/databases/p5-DB_File/Makefile b/databases/p5-DB_File/Makefile
index 2c097b7a10f..4ad577b7406 100644
--- a/databases/p5-DB_File/Makefile
+++ b/databases/p5-DB_File/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/11 20:14:51 heinz Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:58 rillig Exp $
DISTNAME= DB_File-1.814
PKGNAME= p5-${DISTNAME}
@@ -14,7 +14,7 @@ PERL5_PACKLIST= auto/DB_File/.packlist
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bdb.buildlink3.mk"
-MAKE_ENV+= DB_FILE_NAME="${BDB_LIBS}"
+MAKE_ENV+= DB_FILE_NAME=${BDB_LIBS:Q}
MAKE_ENV+= DB_FILE_INCLUDE="${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}"
MAKE_ENV+= DB_FILE_LIB="${BDBBASE}/lib"
.if empty(BDB_TYPE:Mdb1)
diff --git a/databases/p5-sybperl/Makefile b/databases/p5-sybperl/Makefile
index 2fdaa796186..c6263e9dfb6 100644
--- a/databases/p5-sybperl/Makefile
+++ b/databases/p5-sybperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/08/06 06:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:58 rillig Exp $
#
DISTNAME= sybperl-2.16
@@ -28,7 +28,7 @@ _SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds
.endif
PERL5_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib
-MAKE_ENV+= SYBASE=${_SYBASE}
+MAKE_ENV+= SYBASE=${_SYBASE:Q}
.if !defined(USE_SYBASE_OPENCLIENT)
. include "../../databases/freetds/buildlink3.mk"
diff --git a/databases/php-dba/Makefile b/databases/php-dba/Makefile
index e57744dc3e8..2d140b0fe19 100644
--- a/databases/php-dba/Makefile
+++ b/databases/php-dba/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $
MODNAME= dba
CATEGORIES+= databases
-PKGREVISION= # empty
COMMENT= PHP extension for DBM database access
diff --git a/databases/php-dbase/Makefile b/databases/php-dbase/Makefile
index e6ed0ed1783..e5d5f675d5b 100644
--- a/databases/php-dbase/Makefile
+++ b/databases/php-dbase/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $
MODNAME= dbase
CATEGORIES+= databases
-PKGREVISION= # empty
COMMENT= PHP extension for dBase database access
diff --git a/databases/php-dbx/Makefile b/databases/php-dbx/Makefile
index 55f6e6735f7..dba614663a8 100644
--- a/databases/php-dbx/Makefile
+++ b/databases/php-dbx/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/10/09 10:09:15 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:49:58 rillig Exp $
MODNAME= dbx
PECL_VERSION= 1.1.0
CATEGORIES+= databases
-PKGREVISION= # empty
COMMENT= PHP database abstraction layer extension
MAINTAINER= jdolecek@NetBSD.org
diff --git a/databases/php-filepro/Makefile b/databases/php-filepro/Makefile
index ec1f5d5941b..e1ab1a02633 100644
--- a/databases/php-filepro/Makefile
+++ b/databases/php-filepro/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $
MODNAME= filepro
CATEGORIES+= databases
-PKGREVISION= # empty
COMMENT= PHP extension for read-only filePro database access
diff --git a/databases/php-mysql/Makefile b/databases/php-mysql/Makefile
index 8f1901c2c37..2dd31358bf3 100644
--- a/databases/php-mysql/Makefile
+++ b/databases/php-mysql/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $
MODNAME= mysql
CATEGORIES+= databases
-PKGREVISION= # empty
COMMENT= PHP extension for MySQL databases
MAINTAINER= tech-pkg@NetBSD.org
diff --git a/databases/php-odbc/Makefile b/databases/php-odbc/Makefile
index 10bf9274d5a..7ec5f98bdb4 100644
--- a/databases/php-odbc/Makefile
+++ b/databases/php-odbc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $
MODNAME= odbc
CATEGORIES+= databases
-PKGREVISION= # empty
COMMENT= PHP extension for ODBC access
diff --git a/databases/php-pgsql/Makefile b/databases/php-pgsql/Makefile
index 6b3bf5f662b..f5200fb326e 100644
--- a/databases/php-pgsql/Makefile
+++ b/databases/php-pgsql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $
MODNAME= pgsql
-PKGREVISION= # empty
CATEGORIES+= databases
COMMENT= PHP extension for PostgreSQL databases
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 47691c6b4e8..5bd9eec87a3 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/11/21 13:47:42 tron Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:49:58 rillig Exp $
DISTNAME= phpMyAdmin-${DIST_VERSION}
PKGNAME= phpmyadmin-${DIST_VERSION:S/-//}
@@ -13,8 +13,8 @@ COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW
DEPENDS+= php-mbstring>=4.3.3:../../misc/php-mbstring
DEPENDS+= php-mysql{,i}>=4.3.3:../../databases/php-mysql
-PLIST_SUBST+= CP="${CP}" DIST_VERSION=${DIST_VERSION} \
- PMCONFFILE=${PMCONFFILE} TEST="${TEST}"
+PLIST_SUBST+= CP=${CP:Q} DIST_VERSION=${DIST_VERSION:Q} \
+ PMCONFFILE=${PMCONFFILE:Q} TEST=${TEST:Q}
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \
PMDIR=${PMDIR} EXDIR=${EXDIR}
diff --git a/databases/postgresql73-client/Makefile b/databases/postgresql73-client/Makefile
index c757a49f9d0..a127b177f79 100644
--- a/databases/postgresql73-client/Makefile
+++ b/databases/postgresql73-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:58 rillig Exp $
PKGNAME= postgresql73-client-${BASE_VERS}
-PKGREVISION= # empty
SVR4_PKGNAME= pstgc
COMMENT= PostgreSQL database client programs
diff --git a/databases/postgresql73-docs/Makefile b/databases/postgresql73-docs/Makefile
index c96ceca48dd..1ac1aadb819 100644
--- a/databases/postgresql73-docs/Makefile
+++ b/databases/postgresql73-docs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $
PKGNAME= postgresql73-docs-${BASE_VERS}
SVR4_PKGNAME= pstgd
-PKGREVISION= # empty
COMMENT= PostgreSQL database system documentation
diff --git a/databases/postgresql73-plperl/Makefile b/databases/postgresql73-plperl/Makefile
index 7a7abd38a46..11950ac70ce 100644
--- a/databases/postgresql73-plperl/Makefile
+++ b/databases/postgresql73-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/07 18:19:16 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:58 rillig Exp $
PKGNAME= postgresql73-plperl-${BASE_VERS}
COMMENT= PL/Perl procedural language for the PostgreSQL backend
@@ -6,7 +6,7 @@ COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql73-server>=${BASE_VERS}:../../databases/postgresql73-server
-.include "../postgresql73/Makefile.common"
+.include "../../databases/postgresql73/Makefile.common"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-perl
@@ -14,7 +14,7 @@ CONFIGURE_ARGS+= --with-perl
BUILD_DIRS= ${WRKSRC}/src/pl/plperl
MAKEFILE= GNUmakefile
-.include "../postgresql73-lib/buildlink3.mk"
+.include "../../databases/postgresql73-lib/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql73-pltcl/Makefile b/databases/postgresql73-pltcl/Makefile
index d0b2f060053..6423c668d53 100644
--- a/databases/postgresql73-pltcl/Makefile
+++ b/databases/postgresql73-pltcl/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:59 rillig Exp $
PKGNAME= postgresql73-pltcl-${BASE_VERS}
-PKGREVISION= # empty
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
DEPENDS+= postgresql73-server>=${BASE_VERS}:../../databases/postgresql73-server
-.include "../postgresql73/Makefile.common"
+.include "../../databases/postgresql73/Makefile.common"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-tcl
CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
-CONFIGURE_ENV+= TCLSH="${TCLSH}"
+CONFIGURE_ENV+= TCLSH=${TCLSH:Q}
TCLSH= ${LOCALBASE}/bin/tclsh
BUILD_DIRS= ${WRKSRC}/src/pl/tcl
-.include "../postgresql73-lib/buildlink3.mk"
+.include "../../databases/postgresql73-lib/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 02f63d7aab5..c736fa80da5 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2005/08/23 11:48:47 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:59 rillig Exp $
PKGNAME= postgresql73-server-${BASE_VERS}
-PKGREVISION= # empty
SVR4_PKGNAME= pstgs
COMMENT= PostgreSQL database server programs
@@ -42,10 +41,10 @@ CONFIGURE_ARGS+= --with-pam
PGUSER?= pgsql
PGGROUP?= pgsql
PGHOME?= ${PREFIX}/${PGUSER}
-FILES_SUBST+= PGUSER=${PGUSER}
-FILES_SUBST+= PGGROUP=${PGGROUP}
-FILES_SUBST+= PGHOME=${PGHOME}
-BUILD_DEFS= PGUSER PGGROUP PGHOME
+FILES_SUBST+= PGUSER=${PGUSER:Q}
+FILES_SUBST+= PGGROUP=${PGGROUP:Q}
+FILES_SUBST+= PGHOME=${PGHOME:Q}
+BUILD_DEFS+= PGUSER PGGROUP PGHOME
PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
PKG_GROUPS= ${PGGROUP}
diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile
index fcdc3341b17..df3644f1566 100644
--- a/databases/postgresql74-client/Makefile
+++ b/databases/postgresql74-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2005/12/02 21:01:34 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:59 rillig Exp $
PKGNAME= postgresql74-client-${BASE_VERS}
-PKGREVISION= # empty
SVR4_PKGNAME= pstgc
COMMENT= PostgreSQL database client programs
diff --git a/databases/postgresql74-contrib/Makefile b/databases/postgresql74-contrib/Makefile
index 2e566d3f230..a0ae8ce3719 100644
--- a/databases/postgresql74-contrib/Makefile
+++ b/databases/postgresql74-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2005/12/02 21:01:34 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:59 rillig Exp $
PKGNAME= postgresql74-contrib-${BASE_VERS}
-PKGREVISION= # empty
SVR4_PKGNAME= pstgc
COMMENT= PostgreSQL database contrib programs
diff --git a/databases/postgresql74-plperl/Makefile b/databases/postgresql74-plperl/Makefile
index dc501aedb13..a016210931e 100644
--- a/databases/postgresql74-plperl/Makefile
+++ b/databases/postgresql74-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/06 06:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:00 rillig Exp $
PKGNAME= postgresql74-plperl-${BASE_VERS}
PKGREVISION= 2
@@ -7,7 +7,7 @@ COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server
-.include "../postgresql74/Makefile.common"
+.include "../../databases/postgresql74/Makefile.common"
PERL5_CONFIGURE= NO
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+= --with-perl
BUILD_DIRS= ${WRKSRC}/src/pl/plperl
MAKEFILE= GNUmakefile
-.include "../postgresql74-lib/buildlink3.mk"
+.include "../../databases/postgresql74-lib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../lang/perl5/module.mk"
diff --git a/databases/postgresql74-plpython/Makefile b/databases/postgresql74-plpython/Makefile
index dc22b4d61fb..b7893abd648 100644
--- a/databases/postgresql74-plpython/Makefile
+++ b/databases/postgresql74-plpython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:00 rillig Exp $
PKGNAME= postgresql74-plpython-${BASE_VERS}
@@ -7,16 +7,16 @@ COMMENT= PL/Python procedural language for the PostgreSQL backend
DEPENDS+= postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server
-.include "../postgresql74/Makefile.common"
+.include "../../databases/postgresql74/Makefile.common"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-python
-CONFIGURE_ENV+= PYTHON="${PYTHONBIN}"
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
BUILD_DIRS= ${WRKSRC}/src/pl/plpython
.include "../../security/openssl/buildlink3.mk"
-.include "../postgresql74-lib/buildlink3.mk"
+.include "../../databases/postgresql74-lib/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 2d9e62a78a7..e779dfbfd1d 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2005/12/02 21:01:34 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:00 rillig Exp $
PKGNAME= postgresql74-server-${BASE_VERS}
-PKGREVISION= # empty
SVR4_PKGNAME= pstgs
COMMENT= PostgreSQL database server programs
@@ -42,10 +41,10 @@ CONFIGURE_ARGS+= --with-pam
PGUSER?= pgsql
PGGROUP?= pgsql
PGHOME?= ${PREFIX}/${PGUSER}
-FILES_SUBST+= PGUSER=${PGUSER}
-FILES_SUBST+= PGGROUP=${PGGROUP}
-FILES_SUBST+= PGHOME=${PGHOME}
-BUILD_DEFS= PGUSER PGGROUP PGHOME
+FILES_SUBST+= PGUSER=${PGUSER:Q}
+FILES_SUBST+= PGGROUP=${PGGROUP:Q}
+FILES_SUBST+= PGHOME=${PGHOME:Q}
+BUILD_DEFS+= PGUSER PGGROUP PGHOME
PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
PKG_GROUPS= ${PGGROUP}
diff --git a/databases/postgresql80-plpython/Makefile b/databases/postgresql80-plpython/Makefile
index d8efb4c7206..302adef9b0c 100644
--- a/databases/postgresql80-plpython/Makefile
+++ b/databases/postgresql80-plpython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/06 06:25:12 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:00 rillig Exp $
PKGNAME= postgresql80-plpython-${BASE_VERS}
COMMENT= PL/Python procedural language for the PostgreSQL backend
@@ -8,7 +8,7 @@ DEPENDS+= postgresql80-server>=${BASE_VERS}:../../databases/postgresql80-server
.include "../../databases/postgresql80/Makefile.common"
CONFIGURE_ARGS+= --with-python
-CONFIGURE_ENV+= PYTHON="${PYTHONBIN}"
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
BUILD_DIRS= ${WRKSRC}/src/pl/plpython
diff --git a/databases/postgresql80-pltcl/Makefile b/databases/postgresql80-pltcl/Makefile
index 86c19663e44..a5065caa2ca 100644
--- a/databases/postgresql80-pltcl/Makefile
+++ b/databases/postgresql80-pltcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/06 06:25:51 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:00 rillig Exp $
PKGNAME= postgresql80-pltcl-${BASE_VERS}
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
@@ -9,7 +9,7 @@ DEPENDS+= postgresql80-server>=${BASE_VERS}:../../databases/postgresql80-server
CONFIGURE_ARGS+= --with-tcl
CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
-CONFIGURE_ENV+= TCLSH="${TCLSH}"
+CONFIGURE_ENV+= TCLSH=${TCLSH:Q}
TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
BUILD_DIRS= ${WRKSRC}/src/pl/tcl
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 926ac28dc72..b643cd8abc4 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/10/23 20:16:52 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:00 rillig Exp $
PKGNAME= postgresql80-server-${BASE_VERS}
COMMENT= PostgreSQL database server programs
@@ -56,9 +56,9 @@ PKG_SUPPORTED_OPTIONS= pam
PGUSER?= pgsql
PGGROUP?= pgsql
PGHOME?= ${PREFIX}/${PGUSER}
-FILES_SUBST+= PGUSER=${PGUSER}
-FILES_SUBST+= PGGROUP=${PGGROUP}
-FILES_SUBST+= PGHOME=${PGHOME}
+FILES_SUBST+= PGUSER=${PGUSER:Q}
+FILES_SUBST+= PGGROUP=${PGGROUP:Q}
+FILES_SUBST+= PGHOME=${PGHOME:Q}
BUILD_DEFS+= PGUSER PGGROUP PGHOME
PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common
index 6feb32a75aa..e5b3544d875 100644
--- a/databases/postgresql80/Makefile.common
+++ b/databases/postgresql80/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/10/23 20:16:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:00 rillig Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -9,7 +9,7 @@
# <lang>-postgresql client-side interface to PostgreSQL
# postgresql-<lang> server-side module for PostgreSQL backend
-.include "../postgresql80/Makefile.mirrors"
+.include "../../databases/postgresql80/Makefile.mirrors"
DISTNAME?= postgresql-${DIST_VERS}
CATEGORIES+= databases
diff --git a/databases/py-pgnotify/Makefile b/databases/py-pgnotify/Makefile
index b31d8a38abf..ea7606a9544 100644
--- a/databases/py-pgnotify/Makefile
+++ b/databases/py-pgnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:46 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:00 rillig Exp $
#
DISTNAME= pgnotify-0.1
@@ -18,7 +18,7 @@ MAKE_ENV+= BINDIR=${PREFIX}/bin
USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index 7f64d444c53..78f610e5aee 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/09/07 11:42:27 darcy Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:00 rillig Exp $
DISTNAME= PyGreSQL-3.7
PKGNAME= ${PYPKGPREFIX}-postgresql-3.7
@@ -18,7 +18,7 @@ MAKEFILE= GNUmakefile
MAKE_ENV+= INSTALLED_LIBPQ=1
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
PYDISTUTILSPKG= yes
PYBINMODULE= yes
@@ -34,4 +34,3 @@ post-install:
.include "../../lang/python/extension.mk"
.include "../../mk/pgsql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
-
diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index 8b5f14c4e7b..a0a0990db3f 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/01 00:29:06 reed Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:00 rillig Exp $
#
DISTNAME= sybase-0.36
@@ -18,7 +18,7 @@ PYSETUPBUILDARGS= build_ext -D HAVE_FREETDS=61 -U WANT_BULKCOPY
PYDISTUTILSPKG= yes
SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds
-MAKE_ENV+= SYBASE=${SYBASE}
+MAKE_ENV+= SYBASE=${SYBASE:Q}
post-patch:
${SED} "s|\(runtime_library_dirs = \)None|\1['${SYBASE}'+'/lib']|" \
diff --git a/databases/py-table/Makefile b/databases/py-table/Makefile
index f3a7ddd53b1..a4e01443918 100644
--- a/databases/py-table/Makefile
+++ b/databases/py-table/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:46 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= pytable-0.8.3a
@@ -17,7 +17,7 @@ MAKE_ENV+= BINDIR=${PREFIX}/bin
USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index f4af5bf4b11..b4a8239d253 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/10/12 19:24:42 abs Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= rrdtool-1.2.11
@@ -19,7 +19,7 @@ USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
PTHREAD_OPTS+= require
-CONFIGURE_ARGS= --enable-shared
+CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --with-perl-options=${MAKE_PARAMS:Q}
PERL5_CONFIGURE= NO
diff --git a/databases/sdbm/Makefile b/databases/sdbm/Makefile
index 959cea8f20f..7b1af15cb31 100644
--- a/databases/sdbm/Makefile
+++ b/databases/sdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/05/16 17:04:42 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= sdbm
@@ -14,7 +14,7 @@ COMMENT= Substitute DBM, an implementation of the `real' ndbm library
WRKSRC= ${WRKDIR}
MAKE_ENV+= LIBDIR=${PREFIX}/lib NOLINT=1 \
- LIBOWN=${LIBOWN} LIBGRP=${LIBGRP}
+ LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q}
post-extract:
@cd ${WRKDIR} && ${SH} sdbm.shar >/dev/null
diff --git a/databases/sdbm/distinfo b/databases/sdbm/distinfo
index e9d8e2818e6..1c7745ac5c9 100644
--- a/databases/sdbm/distinfo
+++ b/databases/sdbm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 16:33:10 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/12/05 20:50:01 rillig Exp $
SHA1 (sdbm.tar.Z) = ebeb769b308a00853b0119f32dda781829e1d712
RMD160 (sdbm.tar.Z) = 33a48f642ad81bb15a7ce4440dca605e97774afa
Size (sdbm.tar.Z) = 63557 bytes
-SHA1 (patch-aa) = b5434430d01134c2ba580a609b6a9c3f7be86e50
+SHA1 (patch-aa) = cbac91086cf9b149b62d63f7f3b3435786ac6090
SHA1 (patch-ab) = 76594d681bc8733e75703123312bd8c82afed333
SHA1 (patch-ac) = 9b1265bceada93f6a4cb4c4ed2b01e4a6b75c96c
SHA1 (patch-ad) = bfc801d5b42902fd75d66d3b775d2a52d7c93921
diff --git a/databases/sdbm/patches/patch-aa b/databases/sdbm/patches/patch-aa
index 7dac558a992..7e49d599fc2 100644
--- a/databases/sdbm/patches/patch-aa
+++ b/databases/sdbm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/04/28 00:20:22 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2005/12/05 20:50:01 rillig Exp $
--- sdbm.c.orig 2004-04-27 19:10:43.000000000 -0500
+++ sdbm.c
-@@ -25,6 +25,10 @@ static char rcsid[] = "$Id: sdbm.c,v 1.1
+@@ -25,6 +25,10 @@
#endif
#include <errno.h>
#include <string.h>
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.4 2004/04/28 00:20:22 minskim Exp $
#ifdef __STDC__
#include <stddef.h>
-@@ -35,17 +39,6 @@ static char rcsid[] = "$Id: sdbm.c,v 1.1
+@@ -35,17 +39,6 @@
#endif
/*
diff --git a/databases/sqsh/Makefile.common b/databases/sqsh/Makefile.common
index 0dc949c9a9e..416fd588a3e 100644
--- a/databases/sqsh/Makefile.common
+++ b/databases/sqsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:01 rillig Exp $
DISTNAME= sqsh-2.1-src
CATEGORIES= databases
@@ -34,7 +34,7 @@ MAKE_FLAGS+= SYBASE_LIBS=-lct
.endif
LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib
-CONFIGURE_ENV+= SYBASE="${_SYBASE}"
+CONFIGURE_ENV+= SYBASE=${_SYBASE:Q}
CONFIGURE_ENV+= INCDIRS="${BUILDLINK_PREFIX.readline}/include"
CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_PREFIX.readline}/lib"
diff --git a/databases/tcl-postgresql73/Makefile b/databases/tcl-postgresql73/Makefile
index e39c86210cb..81b37c555b3 100644
--- a/databases/tcl-postgresql73/Makefile
+++ b/databases/tcl-postgresql73/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2005/07/29 05:39:00 grant Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:01 rillig Exp $
PKGNAME= tcl-postgresql73-${BASE_VERS}
PKGREVISION= 1
COMMENT= Tcl interface to PostgreSQL
-.include "../postgresql73/Makefile.common"
+.include "../../databases/postgresql73/Makefile.common"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-tcl
CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
-CONFIGURE_ENV+= TCLSH="${TCLSH}"
+CONFIGURE_ENV+= TCLSH=${TCLSH:Q}
TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
MAKE_ENV+= INSTALLED_LIBPQ=1
USE_TOOLS+= gtar
@@ -23,7 +23,7 @@ post-install:
${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \
`${SED} -e "s|#.*||" ${FILESDIR}/man.tcl`
-.include "../postgresql73-lib/buildlink3.mk"
+.include "../../databases/postgresql73-lib/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/tcl-postgresql74/Makefile b/databases/tcl-postgresql74/Makefile
index a7ece7cf109..f447de14ae8 100644
--- a/databases/tcl-postgresql74/Makefile
+++ b/databases/tcl-postgresql74/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2005/12/02 21:01:34 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:01 rillig Exp $
PKGNAME= tcl-postgresql74-${BASE_VERS}
COMMENT= Tcl interface to PostgreSQL
-.include "../postgresql74/Makefile.common"
+.include "../../databases/postgresql74/Makefile.common"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-tcl
CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
-CONFIGURE_ENV+= TCLSH="${TCLSH}"
+CONFIGURE_ENV+= TCLSH=${TCLSH:Q}
TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
MAKE_ENV+= INSTALLED_LIBPQ=1
@@ -20,7 +20,7 @@ post-install:
cd ${PREFIX}/man && ${TAR} -zxf ${WRKSRC}/doc/man.tar.gz \
`${SED} -e "s|#.*||" ${FILESDIR}/man.tcl`
-.include "../postgresql74-lib/buildlink3.mk"
+.include "../../databases/postgresql74-lib/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/tk-postgresql73/Makefile b/databases/tk-postgresql73/Makefile
index fe454942bfc..5d771a4d41e 100644
--- a/databases/tk-postgresql73/Makefile
+++ b/databases/tk-postgresql73/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/08/16 23:41:54 grant Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:01 rillig Exp $
PKGNAME= tk-postgresql73-${BASE_VERS}
PKGREVISION= 1
COMMENT= Tk interface to PostgreSQL
-.include "../postgresql73/Makefile.common"
+.include "../../databases/postgresql73/Makefile.common"
USE_TOOLS+= gtar
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
@@ -12,7 +12,7 @@ CONFIGURE_ARGS+= --with-tcl
CONFIGURE_ARGS+= --with-tk
CONFIGURE_ARGS+= --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib
CONFIGURE_ARGS+= --with-tkconfig=${BUILDLINK_PREFIX.tk}/lib
-CONFIGURE_ENV+= TCLSH="${TCLSH}"
+CONFIGURE_ENV+= TCLSH=${TCLSH:Q}
TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
MAKE_ENV+= INSTALLED_LIBPQ=1 INSTALLED_LIBPGTCL=1
diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile
index 20df4bac9b3..861b8c57242 100644
--- a/databases/unixodbc-DataManager/Makefile
+++ b/databases/unixodbc-DataManager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:01 rillig Exp $
PKGNAME= unixodbc-DataManager-${ODBC_BASE_VERS}
PKGREVISION= 4
@@ -13,9 +13,9 @@ CONFIGURE_ARGS+= --with-extra-libs="${_EXTRA_LIBS}"
CONFIGURE_ARGS+= --disable-rpath
CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic"
-CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV+= ac_cv_have_x="${_AC_CV_HAVE_X}"
-CONFIGURE_ENV+= ac_cv_have_qt="${_AC_CV_HAVE_QT}"
+CONFIGURE_ENV+= USER_LDFLAGS=${LDFLAGS:M*:Q}
+CONFIGURE_ENV+= ac_cv_have_x=${_AC_CV_HAVE_X:Q}
+CONFIGURE_ENV+= ac_cv_have_qt=${_AC_CV_HAVE_QT:Q}
MAKE_FLAGS+= DataManager_DEPENDENCIES=""
diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile
index a1169216d1d..9257d228575 100644
--- a/databases/unixodbc-ODBCConfig/Makefile
+++ b/databases/unixodbc-ODBCConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:01 rillig Exp $
PKGNAME= unixodbc-ODBCConfig-${ODBC_BASE_VERS}
PKGREVISION= 4
@@ -13,9 +13,9 @@ CONFIGURE_ARGS+= --with-extra-libs="${_EXTRA_LIBS}"
CONFIGURE_ARGS+= --disable-rpath
CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic"
-CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV+= ac_cv_have_x="${_AC_CV_HAVE_X}"
-CONFIGURE_ENV+= ac_cv_have_qt="${_AC_CV_HAVE_QT}"
+CONFIGURE_ENV+= USER_LDFLAGS=${LDFLAGS:M*:Q}
+CONFIGURE_ENV+= ac_cv_have_x=${_AC_CV_HAVE_X:Q}
+CONFIGURE_ENV+= ac_cv_have_qt=${_AC_CV_HAVE_QT:Q}
MAKE_FLAGS+= ODBCConfig_DEPENDENCIES=""
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 690ba2fded4..be3f59a9b7b 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/09 21:21:10 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:01 rillig Exp $
PKGNAME= unixodbc-${ODBC_BASE_VERS}
PKGREVISION= 5
@@ -12,8 +12,8 @@ USE_PKGINSTALL= yes
USE_TOOLS+= flex # to get libodbctxt.la
CONFIGURE_ARGS+= --disable-gui
-PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR}
-FILES_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR}
+PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR:Q}
+FILES_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR:Q}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index 13b458f1fc3..572495c82d7 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= xmysql-1.10
@@ -12,7 +12,7 @@ COMMENT= Graphical front end to the MySQL database engine
BUILDLINK_DEPENDS.mysql-client= mysql-client>=3.23.35
-MAKE_ENV+= X11PREFIX=${X11PREFIX}
+MAKE_ENV+= X11PREFIX=${X11PREFIX:Q}
BUILD_TARGET= xmysql
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 6442cdaa030..25f7d11bbcb 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= xmysqladmin-1.0
@@ -16,7 +16,7 @@ COMMENT= Graphical front end for administering MySQL databases
BUILDLINK_DEPENDS.mysql-client= mysql-client>=3.23.35
-MAKE_ENV+= X11PREFIX=${X11PREFIX}
+MAKE_ENV+= X11PREFIX=${X11PREFIX:Q}
BUILD_TARGET= xmysqladmin
diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile
index 7defb2350ba..8f566c557fd 100644
--- a/databases/xsqlmenu/Makefile
+++ b/databases/xsqlmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= xsqlmenu-2.10
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.jlab.org/~saw/xsqlmenu/
COMMENT= X based GUI for MySQL
USE_TOOLS+= gmake
-MAKE_ENV+= MAKE=${MAKE_PROGRAM}
+MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q}
INSTALLATION_DIRS= bin
diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index e7b251a345b..df8b1bb1512 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:14 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= ArX-1.0.20
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= ARXDIFF=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff
CONFIGURE_ARGS+= ARXPATCH=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
CONFIGURE_ARGS+= ARXTAR=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar
-CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG}
+CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG:Q}
IMG_FILES= ArX001.png ArX002.png ArX003.png ArX004.png
DOC_FILES= ArX.html ArX.pdf ${IMG_FILES}
diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile
index 822e6836772..21d53ff234b 100644
--- a/devel/ArX2/Makefile
+++ b/devel/ArX2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/23 18:39:06 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= ArX-2.2.3
@@ -21,9 +21,9 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= ARXDIFF=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}diff
CONFIGURE_ARGS+= ARXPATCH=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
CONFIGURE_ARGS+= ARXTAR=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}tar
-CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG}
+CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG:Q}
# XXX Python is needed for build only; this is handled by devel/scons
-CONFIGURE_ARGS+= ARXPYTHON=${TRUE}
+CONFIGURE_ARGS+= ARXPYTHON=${TRUE:Q}
IMG_FILES= ArX001.png ArX002.png ArX003.png ArX004.png
DOC_FILES= ArX.html ArX.pdf ${IMG_FILES}
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index c2c549ae224..2f6dbc0805e 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= GConf-1.0.9
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://advogato.org/proj/GConf/
COMMENT= Configuration database system used by GNOME
-BUILD_DEPENDS= gtk-doc-[0-9]*:../../textproc/gtk-doc
+BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
BUILD_USES_MSGFMT= yes
USE_PKGLOCALEDIR= YES
@@ -21,7 +21,7 @@ MAKE_FLAGS+= AM_MAKEFLAGS="BDBBACKEND="
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= gconf.pc.in
-PLIST_SUBST+= LOCALBASE=${LOCALBASE}
+PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q}
pre-build:
${RM} -f ${WRKSRC}/gconf/libxml
diff --git a/devel/GConf2/schemas.mk b/devel/GConf2/schemas.mk
index 6011bd15eac..78420df3b09 100644
--- a/devel/GConf2/schemas.mk
+++ b/devel/GConf2/schemas.mk
@@ -1,4 +1,4 @@
-# $NetBSD: schemas.mk,v 1.10 2005/03/24 22:42:58 jlam Exp $
+# $NetBSD: schemas.mk,v 1.11 2005/12/05 20:50:01 rillig 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
@@ -42,11 +42,11 @@ CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${GCONF2_SCHEMAS_DIR}
.if (defined(GCONF2_SCHEMAS) && !empty(GCONF2_SCHEMAS)) || \
(defined(GCONF2_ENTRIES) && !empty(GCONF2_ENTRIES))
-FILES_SUBST+= GCONFTOOL2="${GCONFTOOL2}"
-FILES_SUBST+= GCONF2_CONFIG_SOURCE="${GCONF2_CONFIG_SOURCE}"
-FILES_SUBST+= GCONF2_ENTRIES="${GCONF2_ENTRIES}"
-FILES_SUBST+= GCONF2_SCHEMAS="${GCONF2_SCHEMAS}"
-FILES_SUBST+= GCONF2_SCHEMAS_DIR="${GCONF2_SCHEMAS_DIR}"
+FILES_SUBST+= GCONFTOOL2=${GCONFTOOL2:Q}
+FILES_SUBST+= GCONF2_CONFIG_SOURCE=${GCONF2_CONFIG_SOURCE:Q}
+FILES_SUBST+= GCONF2_ENTRIES=${GCONF2_ENTRIES:Q}
+FILES_SUBST+= GCONF2_SCHEMAS=${GCONF2_SCHEMAS:Q}
+FILES_SUBST+= GCONF2_SCHEMAS_DIR=${GCONF2_SCHEMAS_DIR:Q}
INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../devel/GConf2/files/install.tmpl
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl
USE_PKGINSTALL= YES
diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
index 6b3a20e88a1..a104c4ca16c 100644
--- a/devel/SDL/Makefile.common
+++ b/devel/SDL/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/09/07 10:15:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:50:01 rillig Exp $
DISTNAME= SDL-1.2.9
CATEGORIES= devel games
@@ -39,7 +39,7 @@ MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
# finding various libraries. This ensure that any unusual -Wl,-R options
# are noted correctly in the generated sdl-config.
#
-CONFIGURE_ENV+= SYSTEM_LIBS="${LDFLAGS}"
+CONFIGURE_ENV+= SYSTEM_LIBS=${LDFLAGS:M*:Q}
# buildlink passthru the directories required for the Cocoa framework
# on Darwin if they exist.
@@ -55,7 +55,7 @@ BUILDLINK_PASSTHRU_DIRS+= ${_dir_}
.include "../../mk/ossaudio.buildlink3.mk"
. if defined(HAVE_OSS) && ${HAVE_OSS} == "YES"
AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
-MAKE_ENV+= AM_CFLAGS="${AM_CFLAGS}"
+MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q}
.endif
# Irix comes with GL, which works fine for SDL
diff --git a/devel/acme/Makefile b/devel/acme/Makefile
index ce31230f963..4c28858f9cb 100644
--- a/devel/acme/Makefile
+++ b/devel/acme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:01 rillig Exp $
#
DISTNAME= acme085_linux
@@ -19,7 +19,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
WRKTOP= ${WRKDIR}/acme085
ACME_LIB= ${PREFIX}/share/acme
-MAKE_ENV+= ACME_LIB=${ACME_LIB}
+MAKE_ENV+= ACME_LIB=${ACME_LIB:Q}
INSTALLATION_DIRS= bin
diff --git a/devel/adocman/Makefile b/devel/adocman/Makefile
index be9349286b7..7aa58e7618f 100644
--- a/devel/adocman/Makefile
+++ b/devel/adocman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= adocman-0.10
@@ -30,7 +30,6 @@ do-install:
.for f in LICENSE README TODO adocman.html xml_export.html
${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/html/adocman
.endfor
-.undef f
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 91a8f817d08..d27c3e302f9 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= aegis-4.15
@@ -11,6 +11,6 @@ COMMENT= Aegis is a transaction base software configuration management system
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS= --with-nlsdir=${_PKGLOCALEDIR}
+CONFIGURE_ARGS+= --with-nlsdir=${_PKGLOCALEDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 1be494c2a63..1b11396978b 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/11 14:17:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:02 rillig Exp $
DISTNAME= allegro-4.1.18
PKGREVISION= 1
@@ -25,14 +25,16 @@ LIBS+= ${LIBOSSAUDIO}
.include "options.mk"
-SUBST_CLASSES= oss path
+SUBST_CLASSES+= oss
SUBST_STAGE.oss= post-patch
SUBST_FILES.oss= src/unix/uoss.c setup/setup.c
SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
SUBST_MESSAGE.oss= "Fixing harcoded audio device."
+
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= src/unix/umodules.c src/unix/usystem.c
-SUBST_SED.path= -e "s,@@PREFIX@@,${PREFIX},g"
+SUBST_SED.path= -e "s,@@PREFIX@@,${PREFIX},g"
SUBST_MESSAGE.path= "Fixing harcoded path"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/devel/apel/Makefile b/devel/apel/Makefile
index 2f9edef8876..4d2edcfff35 100644
--- a/devel/apel/Makefile
+++ b/devel/apel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:28 uebayasi Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:02 rillig Exp $
DISTNAME= apel-10.6
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -14,9 +14,9 @@ COMMENT= Portable Emacs Library
PLIST_SRC= ${PKGDIR}/PLIST.${EMACS_FLAVOR}
-MAKE_FLAGS+= EMACS=${EMACS_FLAVOR}
-MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX}
-MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX}
+MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q}
+MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q}
+MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
# apel is included in xemacs-packages
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 68e9c6ad706..f850afd8fd2 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/10/17 10:28:46 tron Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:02 rillig Exp $
.include "../../www/apache2/Makefile.common"
@@ -19,7 +19,7 @@ BUILD_DIRS= ${WRKSRC}/apr ${WRKSRC}/apr-util
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LIBS="${LIBS}"
+CONFIGURE_ENV+= LIBS=${LIBS:M*:Q}
LIBS.SunOS+= -lnsl
APR_CONFIGURE_ARGS= \
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index d98778a9859..27adf9df4d5 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/10/02 12:15:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= atk-1.10.3
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir="${PREFIX}/share/doc"
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
# glib-mkenums overflows a 2048kb stack on atkobject.h
UNLIMIT_RESOURCES= stacksize
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 05ebb65c3a3..bd0c87a6135 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2005/08/06 06:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= automake-1.9.6
@@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/automake/automake.html
COMMENT= GNU Standards-compliant Makefile generator
-DEPENDS= autoconf>=2.58:../../devel/autoconf
+DEPENDS+= autoconf>=2.58:../../devel/autoconf
USE_TOOLS+= gm4:run perl:run
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index fdecc366f76..74b967c9ccd 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/16 19:10:38 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= automake-1.4-p6
@@ -10,7 +10,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/automake/automake.html
COMMENT= GNU Standards-compliant Makefile generator (old version)
-DEPENDS= autoconf213>=2.13:../../devel/autoconf213
+DEPENDS+= autoconf213>=2.13:../../devel/autoconf213
CONFLICTS= automake<1.6
diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index a05033d0e82..8bfa76a11d7 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/11/07 19:23:30 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:02 rillig Exp $
DISTNAME= bcc
PKGNAME= bcc-95.3.12
@@ -10,8 +10,8 @@ COMMENT= Bruce Evans' C compiler (with as and ld); can do 16-bit code
NOT_FOR_PLATFORM= *-*-alpha *-*-x86_64 # Severe LP64 problems
NOT_FOR_PLATFORM+= Interix-*-* # no <a.out.h>
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} \
- MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q} \
+ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} MANMODE=${MANMODE:Q}
MANCOMPRESSED_IF_MANZ= yes
do-configure:
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 6387561b120..1216aa2192b 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/10/04 16:44:13 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2005/12/05 20:50:02 rillig Exp $
DISTNAME= gc6.6
PKGNAME= ${DISTNAME:S/gc/boehm-gc-/}
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-cplusplus
INSTALLATION_DIRS= man/man3
-MAKE_ENV+= COPTS=${CFLAGS:Q}
+MAKE_ENV+= COPTS=${CFLAGS:M*:Q}
#TEST_TARGET= check
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 70e6f974f2b..77672a3e825 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/05/22 20:07:49 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:02 rillig Exp $
DISTNAME= bonobo-1.0.22
CATEGORIES= devel
@@ -19,8 +19,8 @@ USE_PKGLOCALEDIR= yes
USE_X11BASE= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
-CONFIGURE_ENV+= X11BASE="${X11BASE}"
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q}
+CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
CONFIGURE_ARGS+= --enable-gtk-doc=no
PKGCONFIG_OVERRIDE= libefs/libefs.pc.in
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 55065f6f10e..002a18dcdb2 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/02 11:35:57 adrianp Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= bugzilla-2.20
@@ -45,7 +45,7 @@ PAX_DIRS= Bugzilla skins template
REPLACE_PERL= *.pl *.cgi
-SUBST_CLASSES= conf
+SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-install
SUBST_FILES.conf= bugzilla.conf localconfig Bugzilla/BugMail.pm
SUBST_SED.conf= -e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g" \
diff --git a/devel/buildtool-doc/Makefile b/devel/buildtool-doc/Makefile
index e73e1644ac7..93d35f73855 100644
--- a/devel/buildtool-doc/Makefile
+++ b/devel/buildtool-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= buildtool-doc-0.16
@@ -15,7 +15,7 @@ BUILD_DEPENDS+= docbook-xsl>=1.61.3:../../textproc/docbook-xsl
CONFIGURE_ARGS+= --dir-html=${PREFIX}/share/doc/buildtool-doc/html
-CONFIGURE_ENV+= CATALOG_FILE="${XML_DEFAULT_CATALOG}"
+CONFIGURE_ENV+= CATALOG_FILE=${XML_DEFAULT_CATALOG:Q}
CONFIGURE_ENV+= DOCBOOK_XSL="${PREFIX}/share/xsl/docbook"
BUILDLINK_DEPMETHOD.libxml2?= build
diff --git a/devel/buildtool/Makefile b/devel/buildtool/Makefile
index 8b16462999f..1298bd0943c 100644
--- a/devel/buildtool/Makefile
+++ b/devel/buildtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= buildtool-0.16
@@ -17,9 +17,9 @@ TEST_TARGET= test
PKG_SYSCONFSUBDIR= buildtool
-CONFIGURE_ARGS= -p ${PREFIX}
+CONFIGURE_ARGS+= -p ${PREFIX}
CONFIGURE_ARGS+= -c ${PKG_SYSCONFDIR}
-CONFIGURE_ENV+= SH="${SH}"
+CONFIGURE_ENV+= SH=${SH:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/buildtool/pkgflags
diff --git a/devel/buildtool/buildlink3.mk b/devel/buildtool/buildlink3.mk
index 0c5f6aed43f..8fd661f1843 100644
--- a/devel/buildtool/buildlink3.mk
+++ b/devel/buildtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/05/16 05:09:21 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/12/05 20:50:02 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BUILDTOOL_BUILDLINK3_MK:= ${BUILDTOOL_BUILDLINK3_MK}+
@@ -20,10 +20,10 @@ USE_TOOLS+= m4
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ${BUILDTOOL} config
-CONFIGURE_ENV+= BT_FLAGS_CC=${CFLAGS:Q}
-CONFIGURE_ENV+= BT_FLAGS_CPP=${CPPFLAGS:Q}
-CONFIGURE_ENV+= BT_FLAGS_CXX=${CXXFLAGS:Q}
-CONFIGURE_ENV+= BT_FLAGS_LD=${LDFLAGS:Q}
+CONFIGURE_ENV+= BT_FLAGS_CC=${CFLAGS:M*:Q}
+CONFIGURE_ENV+= BT_FLAGS_CPP=${CPPFLAGS:M*:Q}
+CONFIGURE_ENV+= BT_FLAGS_CXX=${CXXFLAGS:M*:Q}
+CONFIGURE_ENV+= BT_FLAGS_LD=${LDFLAGS:M*:Q}
CONFIGURE_ENV+= BT_PROG_AWK=${TOOLS_AWK:Q}
CONFIGURE_ENV+= BT_PROG_CC=${CC:Q}
CONFIGURE_ENV+= BT_PROG_CXX=${CXX:Q}
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile
index 2af0e72899f..d9cce02f3f4 100644
--- a/devel/cssc/Makefile
+++ b/devel/cssc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/29 04:24:03 grant Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= CSSC-1.0.1
@@ -14,7 +14,7 @@ COMMENT= GNU workalike for the source code control system SCCS
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--enable-binary
-CONFIGURE_ENV+= CONFIG_DIFF_COMMAND="${TOOLS_DIFF}"
+CONFIGURE_ENV+= CONFIG_DIFF_COMMAND=${TOOLS_DIFF:Q}
USE_TOOLS+= diff
TEST_TARGET= check
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 8678e950dbf..4be9188a5cb 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2005/12/02 17:10:04 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= cvs-1.11.20
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
.include "options.mk"
-CONFIGURE_ENV+= perl_path=${PERL5}
+CONFIGURE_ENV+= perl_path=${PERL5:Q}
INFO_FILES= cvs.info cvsclient.info
USE_MAKEINFO= yes
diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index 00a12439d55..18061fad40a 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:02 rillig Exp $
#
DISTNAME= cvs2p4-2.3.3
@@ -23,8 +23,8 @@ NO_BUILD= yes
DOCDIR= share/doc/${PKGBASE}
EGDIR= share/examples/${PKGBASE}
LIBDIR= lib/perl5
-PLIST_SUBST+= DOCDIR=${DOCDIR}
-PLIST_SUBST+= EGDIR=${EGDIR}
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
+PLIST_SUBST+= EGDIR=${EGDIR:Q}
FILES_SUBST+= P4ROOT=${P4ROOT:Q}
FILES_SUBST+= P4PORT=${P4PORT:Q}
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 6b6d767b333..52173eea26f 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/16 06:57:45 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= cvsgraph-1.5.1
@@ -17,11 +17,11 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES= ${EGDIR}/cvsgraph.conf ${PKG_SYSCONFDIR}/cvsgraph.conf
-PLIST_SUBST+= PKGBASE=${PKGBASE}
+PLIST_SUBST+= PKGBASE=${PKGBASE:Q}
BUILD_TARGET= cvsgraph
-SUBST_CLASSES= man
+SUBST_CLASSES+= man
SUBST_STAGE.man= pre-install
SUBST_FILES.man= cvsgraph.1
SUBST_SED.man= -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"
diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index d96025adc09..b7704756cc7 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/29 03:39:06 grant Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= cvsps-2.1
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake
INSTALLATION_DIRS= bin man/man1
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvsup/Makefile.common b/devel/cvsup/Makefile.common
index 902fc4968f7..3d8e9c32c12 100644
--- a/devel/cvsup/Makefile.common
+++ b/devel/cvsup/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/06/05 09:49:01 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/12/05 20:50:03 rillig Exp $
DISTNAME= cvsup-snap-16.1h
PKGREVISION= 1
@@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= DragonFly-*-i386 FreeBSD-*-i386 Linux-*-i386 \
.include "../../mk/bsd.prefs.mk"
-MAKE_FLAGS+= PREFIX=${PREFIX} M3FLAGS="${M3FLAGS}"
+MAKE_FLAGS+= PREFIX=${PREFIX:Q} M3FLAGS=${M3FLAGS:Q}
M3BIN= ${PREFIX}/ezm3/bin/m3build
diff --git a/devel/cvsync/Makefile b/devel/cvsync/Makefile
index a27632a4ed9..2aa0ebfc946 100644
--- a/devel/cvsync/Makefile
+++ b/devel/cvsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2005/10/01 08:56:46 agc Exp $
+# $NetBSD: Makefile,v 1.78 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= cvsync-0.24.19
@@ -15,9 +15,9 @@ USE_PKGINSTALL= YES
USE_TOOLS+= gmake
INSTALLATION_DIRS= bin man/man1
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
-MAKE_ENV+= MANMODE=${MANMODE}
-MAKE_ENV+= PTHREAD_TYPE=${PTHREAD_TYPE}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q}
+MAKE_ENV+= MANMODE=${MANMODE:Q}
+MAKE_ENV+= PTHREAD_TYPE=${PTHREAD_TYPE:Q}
MAKE_ENV+= PTHREAD_PREFIX=${BUILDLINK_PREFIX.pthread}
EGDIR= ${PREFIX}/share/examples/cvsync
diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo
index 58350465a47..44be99b5e72 100644
--- a/devel/darcs/distinfo
+++ b/devel/darcs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/11/22 12:57:48 augustss Exp $
+$NetBSD: distinfo,v 1.6 2005/12/05 20:50:03 rillig Exp $
SHA1 (darcs-1.0.4.tar.gz) = 71ab71a9fa94db74ba3b79fa65b797a129a652f2
RMD160 (darcs-1.0.4.tar.gz) = 5b8e4b2396c1cd7a373e103aa90d8a47802a43de
Size (darcs-1.0.4.tar.gz) = 950528 bytes
-SHA1 (patch-aa) = cb4698c96299b9efcb1cc03a5551912785524ea3
+SHA1 (patch-aa) = 88a11e03384ced43a3d9a8559234acc42e67a791
diff --git a/devel/darcs/patches/patch-aa b/devel/darcs/patches/patch-aa
index 280d1aeba84..9a64c8a777f 100644
--- a/devel/darcs/patches/patch-aa
+++ b/devel/darcs/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.4 2005/12/05 20:50:03 rillig Exp $
+
*** GNUmakefile.orig Sun Nov 13 22:28:27 2005
--- GNUmakefile Tue Nov 22 12:54:49 2005
***************
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index f3c108a92a0..796b2d5baf6 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/08/04 11:26:34 martti Exp $
+# $NetBSD: Makefile,v 1.67 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= ddd-3.3.11
@@ -20,7 +20,7 @@ USE_X11BASE= YES
GCC_REQD+= 3.0
CONFIGURE_ARGS+= --with-ncurses=no
-CONFIGURE_ENV+= COMPFACE="${FALSE}"
+CONFIGURE_ENV+= COMPFACE=${FALSE:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index cf063bc4e3f..12c6fbb1dbd 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/05/18 11:58:04 recht Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= diffutils-2.8.1
@@ -19,7 +19,7 @@ INFO_FILES= diff.info
.if defined(GNU_PROGRAM_PREFIX)
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${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/devel/distcc/Makefile b/devel/distcc/Makefile
index 6414b19fa81..a25820ca3c4 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/10/10 09:53:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:03 rillig Exp $
PKGNAME= ${DISTNAME}
PKGREVISION= 1
@@ -17,9 +17,9 @@ PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}::Distccd\ user
DISTCC_PIDDIR?= ${VARBASE}/run/distccd
OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER} ${DISTCC_GROUP} 0750
-FILES_SUBST+= DISTCC_PIDDIR=${DISTCC_PIDDIR}
-FILES_SUBST+= DISTCC_USER=${DISTCC_USER}
-FILES_SUBST+= DISTCC_GROUP=${DISTCC_GROUP}
+FILES_SUBST+= DISTCC_PIDDIR=${DISTCC_PIDDIR:Q}
+FILES_SUBST+= DISTCC_USER=${DISTCC_USER:Q}
+FILES_SUBST+= DISTCC_GROUP=${DISTCC_GROUP:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/distcc
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 8fa501bbab8..f1ab2182492 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/11/29 04:40:38 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:03 rillig Exp $
DISTNAME= doxygen-1.4.5.src
PKGNAME= doxygen-1.4.5
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --install ${INSTALL}
CONFIGURE_ARGS+= --dot ${PREFIX}/bin/dot
CONFIGURE_ARGS+= --prefix ${PREFIX}
CONFIGURE_ARGS+= --docdir ${PREFIX}/share/doc
-MAKE_ENV+= PKGSRC_CFLAGS="${CFLAGS}"
+MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:M*:Q}
SUBST_CLASSES+= pybin
SUBST_STAGE.pybin= pre-configure
diff --git a/devel/eclipse/Makefile b/devel/eclipse/Makefile
index 1b9eeaee6a5..bcc8209c930 100644
--- a/devel/eclipse/Makefile
+++ b/devel/eclipse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/19 15:42:56 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= ${PKGNAME}
@@ -17,8 +17,8 @@ DEPENDS+= apache-ant>=1.4.1:../../devel/apache-ant
PKG_JVMS_ACCEPTED= sun-jdk15 sun-jdk14
-MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME}
-MAKE_ENV+= ANT_HOME=${PREFIX}
+MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME:Q}
+MAKE_ENV+= ANT_HOME=${PREFIX:Q}
VERSION= 3.0.1
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index d393f5e0a95..02918e07e87 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:28 uebayasi Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= elib-1.0
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION?= 2
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://jde.sunsite.dk/
@@ -16,9 +16,9 @@ CONFLICTS+= emacs20-elib-[0-9]*
BUILD_ENV+= EMACS=${EMACS_FLAVOR}
-MAKEFLAGS+= EMACS=${EMACS_FLAVOR}
+MAKEFLAGS+= EMACS=${EMACS_FLAVOR:Q}
-NO_CONFIGURE= # set
+NO_CONFIGURE= yes
USE_TOOLS+= gmake
USE_MAKEINFO= YES
diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile
index 0ae3f959ddc..e0efd3a534f 100644
--- a/devel/emacs-ilisp/Makefile
+++ b/devel/emacs-ilisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:28 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= ilisp-20021222
@@ -10,7 +10,7 @@ MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/ilisp/
COMMENT= Emacs interface to embedded Lisp process
-MAKE_ENV+= EMACS=${EMACS_BIN}
+MAKE_ENV+= EMACS=${EMACS_BIN:Q}
BUILD_TARGET= compile
SITELISP= ${EMACS_LISPPREFIX}/ilisp
diff --git a/devel/emacs20-elib/Makefile b/devel/emacs20-elib/Makefile
index 26e61eac026..75682e1aa61 100644
--- a/devel/emacs20-elib/Makefile
+++ b/devel/emacs20-elib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2003/11/18 16:29:50 cube Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:03 rillig Exp $
PKGNAME= emacs20-${DISTNAME}
-PKGREVISION= # defined
DISTINFO_FILE= ${.CURDIR}/../../devel/elib/distinfo
PATCHDIR= ${.CURDIR}/../../devel/elib/patches
diff --git a/devel/eric3/Makefile b/devel/eric3/Makefile
index 9d16302c90d..41524ff08ee 100644
--- a/devel/eric3/Makefile
+++ b/devel/eric3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/10/05 16:34:00 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= eric-3.7.2
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.die-offenbachs.de/detlev/eric3.html
COMMENT= Python IDE
-DEPENDS= ${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules
+DEPENDS+= ${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules
DEPENDS+= ${PYPKGPREFIX}-qt3-qscintilla>=3.11:../../x11/py-qt3-qscintilla
NO_BUILD= yes
@@ -18,7 +18,8 @@ USE_LANGUAGES=
PY_PATCHPLIST= yes
PYTHON_VERSIONS_ACCEPTED= 24 23 22
-CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PREFIX}/${PYSITELIB}
+CONFIGURE_ARGS+= -b ${PREFIX:Q}/bin
+CONFIGURE_ARGS+= -d ${PREFIX:Q}/${PYSITELIB:Q}
do-install:
(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
diff --git a/devel/error/Makefile b/devel/error/Makefile
index 029b2cd8c7f..6801bdccc67 100644
--- a/devel/error/Makefile
+++ b/devel/error/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 05:32:17 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= error-0.0
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.gw.com/pub/people/christos/
MAINTAINER= christos@NetBSD.org
COMMENT= Insert compiler errors in source files as comments
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} \
- MANOWN=${MANOWN} MANGRP=${MANGRP}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \
+ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/error/distinfo b/devel/error/distinfo
index 4cd0e207fac..a638042a261 100644
--- a/devel/error/distinfo
+++ b/devel/error/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/06/21 21:02:16 jlam Exp $
+$NetBSD: distinfo,v 1.3 2005/12/05 20:50:03 rillig Exp $
SHA1 (error-0.0.tar.gz) = b791825e6864e9459401d2bc780521a7411f1ce2
RMD160 (error-0.0.tar.gz) = 8546498a08045c44eb1a5693447954640d2bf9e4
Size (error-0.0.tar.gz) = 25818 bytes
SHA1 (patch-aa) = 8a5addfb206d969b8cf5d2ff8b1505f28d499f02
-SHA1 (patch-ab) = bb50e813ff1730d79d87b629144674795cae58f2
-SHA1 (patch-ac) = d53fd3b4c241bfc254e21d1ab9abaa99712ba404
+SHA1 (patch-ab) = d07451d05915be0fdc0e941befc292d26807fa8d
+SHA1 (patch-ac) = 4077d23e2a155ff022e767eacdabb0a3eb815415
diff --git a/devel/error/patches/patch-ab b/devel/error/patches/patch-ab
index eb26b186ca8..a1fec56de92 100644
--- a/devel/error/patches/patch-ab
+++ b/devel/error/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/06/21 21:02:16 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/05 20:50:03 rillig Exp $
--- strlcat.c.orig 2005-05-10 16:48:24.000000000 -0400
+++ strlcat.c
-@@ -35,6 +35,7 @@ __RCSID("$NetBSD: strlcat.c,v 1.16 2003/
+@@ -35,6 +35,7 @@
size_t
strlcat(char *dst, const char *src, size_t siz);
diff --git a/devel/error/patches/patch-ac b/devel/error/patches/patch-ac
index 11a544d113b..f4c985f47d6 100644
--- a/devel/error/patches/patch-ac
+++ b/devel/error/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/06/21 21:02:16 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2005/12/05 20:50:03 rillig Exp $
--- strlcpy.c.orig 2005-05-10 16:48:24.000000000 -0400
+++ strlcpy.c
-@@ -34,6 +34,7 @@ __RCSID("$NetBSD: strlcpy.c,v 1.14 2003/
+@@ -34,6 +34,7 @@
#include <string.h>
size_t
strlcpy(char *dst, const char *src, size_t siz);
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
index ee91d375d28..4489308083c 100644
--- a/devel/florist/Makefile
+++ b/devel/florist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 20:08:00 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:03 rillig Exp $
#
DISTNAME= florist-3.15p-src
@@ -23,7 +23,7 @@ USE_TOOLS+= autoconf213 gmake
# 1) lang/gcc34-ada and 2) lang/gcc34 built with Ada option
# If USE_GCC_34=YES this package will use gcc34. Otherwise,
# it will use gcc34-ada
-BUILD_DEFS= USE_GCC_34
+BUILD_DEFS+= USE_GCC_34
USE_GCC_34?= NO
post-extract:
diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile
index 571ddc93b01..c9554fe125f 100644
--- a/devel/fortran-utils/Makefile
+++ b/devel/fortran-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/19 18:39:23 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:03 rillig Exp $
DISTNAME= fortran-utils-1.1
CATEGORIES= devel
@@ -11,7 +11,7 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
WRKSRC= ${WRKDIR}/fortran-utils
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} \
- MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q} \
+ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} MANMODE=${MANMODE:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 17b9d475c8d..deef6faf4f1 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/17 19:03:34 kristerw Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:04 rillig Exp $
#
DISTNAME= gdb-5.3
@@ -20,7 +20,7 @@ REPLACE_LOCALEDIR_PATTERNS+= Make-in
INSTALL_TARGET= install install-info
TEST_TARGET= check
INFO_FILES= bfd.info gdb.info gdbint.info mmalloc.info stabs.info
-CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:Q}
+CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index 91b43502a25..654762c7916 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/17 19:03:34 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:04 rillig Exp $
#
DISTNAME= gdb-6.2.1
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM= Darwin-*-*
BUILD_USES_MSGFMT= yes
-USE_TOOLS= autoconf213 gmake
+USE_TOOLS+= autoconf213 gmake
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_PKGLOCALEDIR= yes
@@ -38,10 +38,10 @@ pre-configure:
cd ${WRKSRC}/gdb; autoheader; autoconf
do-test:
- if `${PKG_INFO} -qe dejagnu` ;then \
+ if ${PKG_INFO} -qe dejagnu; then \
(cd ${WRKSRC} && ${GMAKE} check); \
else \
- ${ECHO} dejagnu is required for the test target; \
+ ${ECHO} "dejagnu is required for the test target"; \
fi
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 63eb666d6da..94c7c22d451 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/08/21 02:31:27 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:04 rillig Exp $
DISTNAME= gettext-0.11.5
PKGNAME= gettext-lib-0.11.5
@@ -20,8 +20,8 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-included-gettext
-CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
BUILD_TARGET= all-yes
INSTALL_TARGET= install-exec
diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile
index ba5d129fc92..ae9d3f9ec55 100644
--- a/devel/gettext-m4/Makefile
+++ b/devel/gettext-m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:23 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:04 rillig Exp $
DISTNAME= gettext-0.11.5
PKGNAME= gettext-m4-0.11.5
@@ -17,8 +17,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-included-gettext
-CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
BUILD_DIRS= ${WRKSRC}/m4
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index ee6cd185616..8a2c2d3ed39 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/04/11 21:45:23 tv Exp $
+# $NetBSD: Makefile,v 1.64 2005/12/05 20:50:04 rillig Exp $
DISTNAME= gettext-0.11.5
PKGREVISION= 5
@@ -25,7 +25,7 @@ CONFIGURE_ENV+= HAVE_GCJ_IN_PATH=
CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH=
CONFIGURE_ENV+= HAVE_JIKES_IN_PATH=
-MAKE_ENV+= OPSYS="${OPSYS}"
+MAKE_ENV+= OPSYS=${OPSYS:Q}
TEST_TARGET= check
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index c3c1523c150..e7e2def4155 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/09/28 20:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:04 rillig Exp $
#
DISTNAME= indent-2.2.8a
@@ -22,9 +22,9 @@ INFO_FILES= indent.info
.include "../../mk/bsd.prefs.mk"
.if defined(GNU_PROGRAM_PREFIX)
-CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX}
+CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 599e003dc5b..7719ba02c0a 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2005/11/25 21:30:17 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2005/12/05 20:50:04 rillig Exp $
DISTNAME= glib-2.8.4
PKGNAME= ${DISTNAME:S/glib/glib2/}
@@ -34,7 +34,7 @@ PKGCONFIG_OVERRIDE+= gthread-2.0-uninstalled.pc.in
PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
+CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
@@ -43,9 +43,9 @@ CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
-CONFIGURE_ENV+= PERL_PATH=${PERL5}
+CONFIGURE_ENV+= PERL_PATH=${PERL5:Q}
.include "options.mk"
@@ -57,7 +57,7 @@ CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
.if ${OPSYS} == "FreeBSD"
-SUBST_CLASSES= thr
+SUBST_CLASSES+= thr
SUBST_STAGE.thr= post-patch
SUBST_FILES.thr= gthread/Makefile.in
. if ${OS_VERSION:R} >= 5
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 8f6798548e5..1806d73f713 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2005/04/11 21:45:24 tv Exp $
+# $NetBSD: Makefile,v 1.61 2005/12/05 20:50:04 rillig Exp $
DISTNAME= make-3.80
PKGNAME= gmake-3.80
@@ -26,7 +26,7 @@ TEST_TARGET= check
.if defined(GNU_PROGRAM_PREFIX)
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
@@ -39,7 +39,7 @@ PLIST_SRC= ${PKGDIR}/PLIST
GMAKE_LOCALE?= yes
BUILD_DEFS+= GMAKE_LOCALE
-MAKEFLAGS+= GMAKE_LOCALE=${GMAKE_LOCALE}
+MAKEFLAGS+= GMAKE_LOCALE=${GMAKE_LOCALE:Q}
.if !empty(GMAKE_LOCALE:M[yY][eE][sS])
USE_PKGLOCALEDIR= yes
PLIST_SRC+= ${PKGDIR}/PLIST.locale
diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index ebb3000a563..c36df05b81e 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/11/28 22:12:24 rh Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:04 rillig Exp $
DISTNAME= gnustep-base-1.11.1
CATEGORIES= devel gnustep
@@ -11,7 +11,7 @@ COMMENT= GNUstep foundation classes
PTHREAD_LIBS= -lpthread
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
pre-configure:
${SED} 's|@PREFIX@|${PREFIX}|g' <${FILESDIR}/openapp >${WRKDIR}/openapp
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 20e67465fc3..e102465dc7c 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/09/30 23:10:52 rh Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:04 rillig Exp $
DISTNAME= gnustep-make-1.11.1
CATEGORIES= devel gnustep
@@ -10,7 +10,7 @@ COMMENT= GNUstep makefile package
PKG_INSTALLATION_TYPES= overwrite pkgviews
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
.include "../../mk/x11.buildlink3.mk"
.include "gnustep.mk"
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 691972b710e..48e71c8d053 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gnustep.mk,v 1.5 2005/07/29 12:57:14 adam Exp $
+# $NetBSD: gnustep.mk,v 1.6 2005/12/05 20:50:04 rillig Exp $
.if !defined(GNUSTEP_MK)
GNUSTEP_MK= #defined
@@ -56,35 +56,35 @@ MAKEFILE= GNUmakefile
GNU_CONFIGURE= yes
.endif
-MAKE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}"
-MAKE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
-MAKE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}"
-MAKE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}"
-MAKE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
-MAKE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}"
-MAKE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}"
-MAKE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}"
-MAKE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}"
-MAKE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}"
-MAKE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}"
-MAKE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}"
-MAKE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}"
+MAKE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q}
+MAKE_ENV+= GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
+MAKE_ENV+= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q}
+MAKE_ENV+= GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q}
+MAKE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q}
+MAKE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q}
+MAKE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q}
+MAKE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q}
+MAKE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
+MAKE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
+MAKE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
+MAKE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
+MAKE_ENV+= GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q}
.if defined(GNU_CONFIGURE) || defined(HAS_CONFIGURE)
GNU_CONFIGURE_PREFIX?= ${GNUSTEP_ROOT}
-CONFIGURE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}"
-CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
-CONFIGURE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}"
-CONFIGURE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}"
-CONFIGURE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
-CONFIGURE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}"
-CONFIGURE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}"
-CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}"
-CONFIGURE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}"
-CONFIGURE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}"
-CONFIGURE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}"
-CONFIGURE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}"
-CONFIGURE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}"
+CONFIGURE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q}
+CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
+CONFIGURE_ENV+= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q}
+CONFIGURE_ENV+= GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q}
+CONFIGURE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q}
+CONFIGURE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q}
+CONFIGURE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q}
+CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q}
+CONFIGURE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
+CONFIGURE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
+CONFIGURE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
+CONFIGURE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
+CONFIGURE_ENV+= GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q}
.endif # GNU_CONFIGURE
.endif # !NO_GNUSTEP_ENV
diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index cfd80a0298d..d8a57fe1212 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/10/10 15:14:49 salo Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:50:04 rillig Exp $
DISTNAME= texinfo-4.8
PKGNAME= g${DISTNAME}
@@ -19,13 +19,13 @@ TEST_TARGET= check
PLIST_SRC= ${PKGDIR}/PLIST
PKGSRC_INFOPATH= ${PREFIX}/${INFO_DIR}:${X11BASE}/info:${LOCALBASE}/info
-MAKE_ENV+= PKGSRC_INFOPATH="${PKGSRC_INFOPATH}"
+MAKE_ENV+= PKGSRC_INFOPATH=${PKGSRC_INFOPATH:Q}
.include "../../mk/bsd.prefs.mk"
TEXINFO_LOCALE?= yes
BUILD_DEFS+= TEXINFO_LOCALE
-MAKEFLAGS+= TEXINFO_LOCALE=${TEXINFO_LOCALE}
+MAKEFLAGS+= TEXINFO_LOCALE=${TEXINFO_LOCALE:Q}
.if !empty(TEXINFO_LOCALE:M[yY][eE][sS])
USE_PKGLOCALEDIR= yes
PLIST_SRC+= ${PKGDIR}/PLIST.locale
diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile
index 452a08dda4f..b2c44b864e1 100644
--- a/devel/gtl/Makefile
+++ b/devel/gtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/09/28 20:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:04 rillig Exp $
DISTNAME= GTL-1.2.1
PKGNAME= gtl-1.2.1
@@ -19,7 +19,7 @@ CONFLICTS= gtl0-[0-9]*
LICENSE= no-commercial-use
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
+CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
DOCDIR= ${PREFIX}/share/doc/GTL
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index ee6fb258d0a..833988e7e5e 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/09/28 20:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:04 rillig Exp $
#
DISTNAME= guile-gtk-0.40.91
@@ -12,7 +12,7 @@ COMMENT= Library to make GTK 1.2 accessible from guile
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
# Skip glade, because it pulls in gnome-libs.
# Later, make a new package for just the glade parts,
diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile
index 23ef784beae..e08166efce5 100644
--- a/devel/guile-lib/Makefile
+++ b/devel/guile-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/10 19:01:24 gdt Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:04 rillig Exp $
DISTNAME= guile-lib-0.1.2
CATEGORIES= devel
@@ -15,9 +15,9 @@ HAS_CONFIGURE= yes
CONFIGURE_DIRS= ${WRKSRC}/build
BUILD_DIRS= ${WRKSRC}/build
CONFIGURE_SCRIPT= ../src/configure
-CONFIGURE_ARGS= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
USE_MAKEINFO= yes
TEXINFO_REQD= 4.2
INFO_FILES= guile-library.info
diff --git a/devel/guile14-gtk/Makefile b/devel/guile14-gtk/Makefile
index 46bd86fa6d4..10028814ac5 100644
--- a/devel/guile14-gtk/Makefile
+++ b/devel/guile14-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/09/28 20:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:04 rillig Exp $
#
DISTNAME= guile-gtk-0.19
@@ -18,7 +18,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --datadir=${PREFIX}/${GUILE14_SUBDIR}/share
PLIST_SUBST+= GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
.include "../../lang/guile14/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 43761b185b2..c11602b4470 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/10/31 02:02:16 dbj Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:04 rillig Exp $
DISTNAME= id-utils-3.2
PKGREVISION= 6
@@ -20,11 +20,11 @@ GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
-.ifdef USE_XEMACS
+.if defined(USE_XEMACS)
EMACS= ${LOCALBASE}/bin/xemacs
BUILD_DEPENDS+= xemacs-[0-9]*:../../editors/xemacs
BUILD_DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages
-.elifdef USE_EMACS
+.elif defined(USE_EMACS)
EMACS= ${LOCALBASE}/bin/emacs
BUILD_DEPENDS+= emacs-[0-9]*:../../editors/emacs
.endif
@@ -43,12 +43,12 @@ CLISPDIR?= '@comment '
# so configure won't search further for emacs
EMACS?= ${FALSE:S|^false$|/usr/bin/false|}
-CONFIGURE_ENV+= EMACS=${EMACS}
+CONFIGURE_ENV+= EMACS=${EMACS:Q}
BUILD_DEFS+= EMACS
-MAKE_ENV+= BSD_SETENV=${SETENV}
+MAKE_ENV+= BSD_SETENV=${SETENV:Q}
-PLIST_SUBST+= LISPDIR=${LISPDIR}
-PLIST_SUBST+= CLISPDIR=${CLISPDIR}
+PLIST_SUBST+= LISPDIR=${LISPDIR:Q}
+PLIST_SUBST+= CLISPDIR=${CLISPDIR:Q}
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/jam/Makefile b/devel/jam/Makefile
index 63c519bda4a..cf6fff09ced 100644
--- a/devel/jam/Makefile
+++ b/devel/jam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:46 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:04 rillig Exp $
#
DISTNAME= jam-2.5
@@ -13,7 +13,7 @@ COMMENT= Program construction tool, like make(1)
CONFLICTS= acunia-jam-[0-9]*
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}nb1
WRKSRC= ${WRKDIR}
DOCDIR= share/doc/${PKGBASE}
diff --git a/devel/libFoundation/Makefile b/devel/libFoundation/Makefile
index 6eac15ce1fd..297cc008953 100644
--- a/devel/libFoundation/Makefile
+++ b/devel/libFoundation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/10/01 04:25:32 rh Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:05 rillig Exp $
#
DISTNAME= libFoundation-1.0.72-r107
@@ -19,7 +19,7 @@ MAKE_ENV+= ADDITIONAL_OBJCFLAGS="-I${WRKSRC} -I."
MAKE_ENV+= FOUNDATION_LIB="fd"
MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
-PLIST_SUBST+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU}
+PLIST_SUBST+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q}
LIBF_HOST_OS= ${GNUSTEP_HOST:C/.*-//}
diff --git a/devel/libFoundation/buildlink3.mk b/devel/libFoundation/buildlink3.mk
index 3d7a8415cfe..14a5e86dfad 100644
--- a/devel/libFoundation/buildlink3.mk
+++ b/devel/libFoundation/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/10/01 04:25:32 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/05 20:50:05 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBFOUNDATION_BUILDLINK3_MK:= ${LIBFOUNDATION_BUILDLINK3_MK}+
@@ -60,10 +60,10 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Header
FOUNDATION_LIB?= fd
ADDITIONAL_INCLUDE_DIRS+=-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU
.if !defined(NO_FOUNDATION_ENV)
-CONFIGURE_ENV+= FOUNDATION_LIB="${FOUNDATION_LIB}"
-CONFIGURE_ENV+= ADDITIONAL_INCLUDE_DIRS="${ADDITIONAL_INCLUDE_DIRS}"
-MAKE_ENV+= FOUNDATION_LIB="${FOUNDATION_LIB}"
-MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS="${ADDITIONAL_INCLUDE_DIRS}"
+CONFIGURE_ENV+= FOUNDATION_LIB=${FOUNDATION_LIB:Q}
+CONFIGURE_ENV+= ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q}
+MAKE_ENV+= FOUNDATION_LIB=${FOUNDATION_LIB:Q}
+MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q}
.endif
.endif # LIBFOUNDATION_BUILDLINK3_MK
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index c4bf42cf7c3..62716f37bf3 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/08/21 11:24:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:05 rillig Exp $
DISTNAME= libbonobo-2.10.1
CATEGORIES= devel gnome
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+= bonobo-activation/bonobo-activation-2.0.pc.in
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV+= PERL_PATH="${TOOLS_PERL5}"
+CONFIGURE_ENV+= PERL_PATH=${TOOLS_PERL5:Q}
PKG_SYSCONFSUBDIR= bonobo-activation
EGDIR= ${PREFIX}/share/examples/bonobo-activation
diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile
index f097beec145..f472c556de2 100644
--- a/devel/libebml/Makefile
+++ b/devel/libebml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/11/04 18:41:31 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:05 rillig Exp $
#
DISTNAME= libebml-0.7.5
@@ -17,7 +17,7 @@ USE_LANGUAGES= c++
NO_CONFIGURE= yes
MAKEFLAGS+= prefix=${PREFIX:Q}
-MAKE_ENV+= CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q}
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} RANLIB=${RANLIB:Q}
BUILD_DIRS= make/linux
BUILD_TARGET= staticlib
INSTALL_TARGET= install_headers install_staticlib
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 0c4aba70670..a89768df53d 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.57 2005/12/05 20:50:05 rillig Exp $
DISTNAME= libglade-0.17
PKGREVISION= 7
@@ -15,7 +15,7 @@ USE_X11BASE= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-MAKE_ENV+= DISPLAY=${DISPLAY}
+MAKE_ENV+= DISPLAY=${DISPLAY:Q}
.include "../../textproc/libxml/buildlink3.mk"
.include "../../x11/gnome-libs/buildlink3.mk"
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index a210054a9f2..b96750980a3 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/10/10 13:42:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:05 rillig Exp $
#
DISTNAME= libgnome-2.12.0.1
@@ -10,7 +10,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Core GNOME2 library (non-graphical)
-DEPENDS= docbook>=4.2:../../textproc/docbook
+DEPENDS+= docbook>=4.2:../../textproc/docbook
BUILD_USES_MSGFMT= YES
BUILDLINK_DEPENDS.esound+= esound>=0.2.26
diff --git a/devel/libnet/Makefile b/devel/libnet/Makefile
index f4da127cddc..f82e7969c2a 100644
--- a/devel/libnet/Makefile
+++ b/devel/libnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/09/28 20:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:05 rillig Exp $
#
DISTNAME= libnet-1.0.2a
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/l/L/}
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LIBNET_CONFIG_CFLAGS="-I${PREFIX}/include" \
- LIBNET_CONFIG_LIBS="${LDFLAGS}"
+ LIBNET_CONFIG_LIBS=${LDFLAGS:M*:Q}
INSTALLATION_DIRS= bin lib share/examples
diff --git a/devel/libscsi/Makefile b/devel/libscsi/Makefile
index c0887473c2b..b72d9fd2807 100644
--- a/devel/libscsi/Makefile
+++ b/devel/libscsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/10/31 19:57:24 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:05 rillig Exp $
#
DISTNAME= libscsi-1.6
@@ -12,7 +12,7 @@ NOT_FOR_PLATFORM= Interix-*-*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-MAKE_ENV= LIBDIR=${PREFIX}/lib MANDIR=${PREFIX}/man NOPIC=1 NOPROFILE=1
+MAKE_ENV+= LIBDIR=${PREFIX:Q}/lib MANDIR=${PREFIX:Q}/man NOPIC=1 NOPROFILE=1
MANCOMPRESSED_IF_MANZ= yes
diff --git a/devel/libstash/Makefile b/devel/libstash/Makefile
index 466141ea46b..29176bbffa1 100644
--- a/devel/libstash/Makefile
+++ b/devel/libstash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:43:31 martti Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:05 rillig Exp $
#
DISTNAME= libstash_s19990912a
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.sqrl.org/sqrl/
COMMENT= Collection of programming support routines and useful algorithms
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --without-pthreads --disable-shared
+CONFIGURE_ARGS+= --without-pthreads
+CONFIGURE_ARGS+= --disable-shared
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libstree/Makefile b/devel/libstree/Makefile
index 6d6ac1da159..a1515670c6d 100644
--- a/devel/libstree/Makefile
+++ b/devel/libstree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:28 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:05 rillig Exp $
#
DISTNAME= libstree-0.4.0
@@ -11,6 +11,6 @@ HOMEPAGE= http://www.cl.cam.ac.uk/~cpk25/libstree/
COMMENT= Suffix tree library
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc/html
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index a9035df98b4..6b0848c6900 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:05 rillig Exp $
#
DISTNAME= libstroke-0.5.1
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 0fb2f3df75d..0dbcf9856b0 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/10/25 15:52:33 heinz Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:05 rillig Exp $
DISTNAME= libusb-0.1.10a
CATEGORIES= devel
@@ -9,7 +9,7 @@ HOMEPAGE= http://libusb.sourceforge.net/
COMMENT= USB access library
USE_LANGUAGES= c c++
-GCC_REQD= 3.3
+GCC_REQD+= 3.3
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-build-docs
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 50a8ed44b29..afca729db11 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/10/25 13:14:32 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:05 rillig Exp $
DISTNAME= m4-1.4.4
CATEGORIES= devel
@@ -20,7 +20,7 @@ TEST_TARGET= check
.if defined(GNU_PROGRAM_PREFIX)
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
diff --git a/devel/mantis/Makefile b/devel/mantis/Makefile
index 9bbd11ac182..74087e7c5e6 100644
--- a/devel/mantis/Makefile
+++ b/devel/mantis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/03 09:50:56 adrianp Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:05 rillig Exp $
DISTNAME= mantis-1.0.0rc3
CATEGORIES= devel www
@@ -37,7 +37,7 @@ CONF_FILES+= ${EGDIR}/mantis.conf ${PKG_SYSCONFDIR}/mantis.conf \
SPECIAL_PERMS= ${MANTIS_HOME}/config_inc.php ${APACHE_USER} ${SHAREGRP} 0400
MANTIS_EG= config_inc.php mantis.conf mantis_offline.php.sample
-SUBST_CLASSES= conf
+SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-install
SUBST_FILES.conf= mantis.conf
SUBST_SED.conf= -e "s|@MANTIS_HOME@|${MANTIS_HOME}|g"
diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile
index 745a04a8cc5..5627163c913 100644
--- a/devel/monotone-server/Makefile
+++ b/devel/monotone-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/12/02 17:56:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:05 rillig Exp $
#
DISTNAME= monotone-server-0.24
@@ -46,8 +46,8 @@ SUBST_SED.vars+= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
SUBST_SED.vars+= -e 's|@SH@|${SH}|g'
SUBST_SED.vars+= -e 's|@VARBASE@|${VARBASE}|g'
-FILES_SUBST+= MONOTONE_GROUP=${MONOTONE_GROUP}
-FILES_SUBST+= MONOTONE_USER=${MONOTONE_USER}
+FILES_SUBST+= MONOTONE_GROUP=${MONOTONE_GROUP:Q}
+FILES_SUBST+= MONOTONE_USER=${MONOTONE_USER:Q}
INSTALLATION_DIRS= sbin
@@ -55,7 +55,6 @@ do-extract:
.for f in branches.conf hooks.conf monotone-server-init.sh
${CP} ${FILESDIR}/${f} ${WRKSRC}
.endfor
-.undef f
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/monotone-server-init.sh \
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 26b1e092dcd..96178e92f20 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:09 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:05 rillig Exp $
DISTNAME= nasm-0.98.39
PKGREVISION= 1
@@ -21,8 +21,8 @@ INFO_FILES= nasm.info
BUILD_TARGET= everything
INSTALL_TARGET= install_everything
-MAKE_ENV+= PERL5="${PERL5}" \
- INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
+MAKE_ENV+= PERL5=${PERL5:Q} \
+ INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
INSTALLATION_DIRS= bin info man/man1 share/doc/html
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 84a0d64c6f5..5cab7dbf203 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/10/20 00:01:32 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2005/12/05 20:50:05 rillig Exp $
DISTNAME= ncurses-${NC_VERS}
NC_VERS= 5.5
@@ -39,7 +39,7 @@ PLIST_SUBST+= NOT_SUNOS=""
TERMINFODIR= share/terminfo
.endif
-PLIST_SUBST+= TERMINFODIR="${TERMINFODIR}"
+PLIST_SUBST+= TERMINFODIR=${TERMINFODIR:Q}
CONFIGURE_ARGS+= --with-default-terminfo-dir=${PREFIX}/${TERMINFODIR}
CONFIGURE_ARGS+= --with-terminfo-dirs=${PREFIX}/${TERMINFODIR}
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index bd9d0104672..6aab3854386 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/10/16 11:15:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:05 rillig Exp $
DISTNAME= nspr-4.4.1
PKGREVISION= 2
@@ -16,9 +16,9 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-debug
-MAKE_ENV= DIST=${WRKSRC}/dist
+MAKE_ENV+= DIST=${WRKSRC:Q}/dist
CONFIGURE_SCRIPT= ../configure
-CONFIGURE_ENV= LIBRUNPATH=${PREFIX}/lib/nspr
+CONFIGURE_ENV+= LIBRUNPATH=${PREFIX:Q}/lib/nspr
.include "../../mk/bsd.prefs.mk"
@@ -29,7 +29,7 @@ SO_SUFFIX= dylib
.else
SO_SUFFIX= so.1.0
.endif
-PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX}
+PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
INSTALLATION_DIRS= bin
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 389393f22af..2c071ebdd6a 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/10/16 11:15:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:06 rillig Exp $
DISTNAME= nss-3.9.2
PKGREVISION= 3
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/security/nss
USE_TOOLS+= gmake perl
DIST= ${WRKSRC}/../../dist
BUILD_TARGET= nss_build_all
-MAKE_ENV= LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
+MAKE_ENV+= LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
MAKE_ENV+= LIBRUNPATH=${PREFIX}/lib BUILD_OPT=1
.include "../../mk/bsd.prefs.mk"
@@ -36,7 +36,7 @@ SO_SUFFIX= dylib
.else
SO_SUFFIX= so.1.0
.endif
-PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX}
+PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "gcc"
MAKEFLAGS+= NS_USE_GCC=YES
diff --git a/devel/p4-docs/Makefile b/devel/p4-docs/Makefile
index 501d2a85a3f..916a4c23dd2 100644
--- a/devel/p4-docs/Makefile
+++ b/devel/p4-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $
#
DISTNAME= p4-docs
@@ -40,8 +40,8 @@ EXTRACT_CMD.zip= ${LOCALBASE}/bin/unzip -Laq $${extract_file} \
DOCDIR= share/doc/p4
HTMLDIR= share/doc/html/p4
-PLIST_SUBST+= DOCDIR=${DOCDIR}
-PLIST_SUBST+= HTMLDIR=${HTMLDIR}
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
+PLIST_SUBST+= HTMLDIR=${HTMLDIR:Q}
INSTALLATION_DIRS= man/man1
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index 69b23d18160..787d98d1572 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/06 06:19:10 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:06 rillig Exp $
#
DISTNAME= Devel-SmallProf-1.15
@@ -12,7 +12,7 @@ MAINTAINER= bad@NetBSD.org
HOMEPAGE= http://search.cpan.org/~salva/Devel-SmallProf-1.15/
COMMENT= Perl5 module for line-by-line profiling perl programs
-DEPENDS= p5-Time-HiRes>=1.20:../../time/p5-Time-HiRes
+DEPENDS+= p5-Time-HiRes>=1.20:../../time/p5-Time-HiRes
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/devel/p5-File-chdir/Makefile b/devel/p5-File-chdir/Makefile
index 965e582f196..3cbb6daf60f 100644
--- a/devel/p5-File-chdir/Makefile
+++ b/devel/p5-File-chdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/22 16:47:39 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:06 rillig Exp $
#
DISTNAME= File-chdir-0.06
@@ -6,7 +6,7 @@ PKGNAME= p5-${DISTNAME}
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MS/MSCHWERN/}
-MAINTAINER= sommerfeld@netbsd.org
+MAINTAINER= sommerfeld@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/File-chdir/
COMMENT= Perl module with a more sensible way to change directories
diff --git a/devel/p5-IO-Pager/Makefile b/devel/p5-IO-Pager/Makefile
index bda1885c3eb..a9d0c0bef40 100644
--- a/devel/p5-IO-Pager/Makefile
+++ b/devel/p5-IO-Pager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/22 16:45:32 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:06 rillig Exp $
#
DISTNAME= IO-Pager-0.06
@@ -7,7 +7,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/J/JP/JPIERCE/}
EXTRACT_SUFX= .tgz
-MAINTAINER= sommerfeld@netbsd.org
+MAINTAINER= sommerfeld@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/IO-Pager-0.06/
COMMENT= Perl module for paged I/O to the terminal
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 13de19642a8..bc9fce32935 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/11/30 18:09:40 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2005/12/05 20:50:06 rillig Exp $
#
DISTNAME= pango-1.10.2
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ARGS+= --with-qt=no
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
diff --git a/devel/papaya/Makefile b/devel/papaya/Makefile
index 365226f23b7..bf878e80107 100644
--- a/devel/papaya/Makefile
+++ b/devel/papaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:09 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:06 rillig Exp $
#
DISTNAME= papaya-0.1.7
@@ -17,8 +17,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= # empty
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= sh_command=${TOOLS_SH}
-CONFIGURE_ENV+= tar_command=${TOOLS_TAR}
+CONFIGURE_ENV+= sh_command=${TOOLS_SH:Q}
+CONFIGURE_ENV+= tar_command=${TOOLS_TAR:Q}
USE_TOOLS+= sh perl:run tar
INFO_FILES= papaya.info
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 56fc6a3b39f..d2faadd6c4c 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 19:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:06 rillig Exp $
#
DISTNAME= patch-2.5.4
@@ -27,7 +27,7 @@ GNU_CONFIGURE= yes
.if defined(GNU_PROGRAM_PREFIX)
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
diff --git a/devel/pccts/Makefile b/devel/pccts/Makefile
index d909ffe85b5..bea22d85e1b 100644
--- a/devel/pccts/Makefile
+++ b/devel/pccts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:06 rillig Exp $
#
DISTNAME= pccts133mr22
@@ -14,7 +14,7 @@ COMMENT= Purdue Compiler Construction Tool Set
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/pccts
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
MAKEFILE= makefile
BUILD_TARGET=
diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile
index 69964fade2d..408f1d6d5bf 100644
--- a/devel/pcl-cvs/Makefile
+++ b/devel/pcl-cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:06 rillig Exp $
#
DISTNAME= pcl-cvs-2.9.9
@@ -20,7 +20,7 @@ EMACS_VERSIONS_ACCEPTED= emacs20
.include "../../mk/emacs.mk"
-MAKE_ENV+= PREFIX=${PREFIX}
+MAKE_ENV+= PREFIX=${PREFIX:Q}
BUILD_TARGET= default
INFO_FILES= pcl-cvs.info
MESSAGE_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index c9598e77980..af1d8eac023 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/10/14 09:37:46 adam Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:06 rillig Exp $
DISTNAME= pcre-6.4
PKGREVISION= 1
@@ -25,6 +25,6 @@ TEST_TARGET= test
# Avoid an ICE in gcc2 on sparc64
# use CONFIGURE_ARGS instead of the usual CONFIGURE_ENV as the latter just
# won't work with -this- configure
-CONFIGURE_ARGS+= F77=${FALSE}
+CONFIGURE_ARGS+= F77=${FALSE:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/pedisassem/Makefile b/devel/pedisassem/Makefile
index ad011fd1ba8..79d70ba2c35 100644
--- a/devel/pedisassem/Makefile
+++ b/devel/pedisassem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/30 17:13:21 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:06 rillig Exp $
DISTNAME= dsasmsrc
PKGNAME= pedisassem-0.23
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}
# LP64 problems
NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 *-*-x86_64
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
INSTALLATION_DIRS= bin
diff --git a/devel/php-gettext/Makefile b/devel/php-gettext/Makefile
index 83e27ac2e3e..f2ea66a8d7d 100644
--- a/devel/php-gettext/Makefile
+++ b/devel/php-gettext/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $
MODNAME= gettext
CATEGORIES+= devel
-PKGREVISION= # empty
COMMENT= PHP extension for gettext support
diff --git a/devel/php-gmp/Makefile b/devel/php-gmp/Makefile
index 334f5abc480..85eefd14049 100644
--- a/devel/php-gmp/Makefile
+++ b/devel/php-gmp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $
MODNAME= gmp
CATEGORIES+= devel math
-PKGREVISION= # empty
COMMENT= PHP extension for arbitrary precision math
diff --git a/devel/php-pcntl/Makefile b/devel/php-pcntl/Makefile
index 657555f089f..a8c041241ed 100644
--- a/devel/php-pcntl/Makefile
+++ b/devel/php-pcntl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/23 21:45:21 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:06 rillig Exp $
MODNAME= pcntl
CATEGORIES+= devel
-PKGREVISION= # empty
COMMENT= PHP extension for Process Control functions
diff --git a/devel/php-posix/Makefile b/devel/php-posix/Makefile
index ae5e2461f82..f33ce8e9fc6 100644
--- a/devel/php-posix/Makefile
+++ b/devel/php-posix/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $
MODNAME= posix
CATEGORIES+= devel
-PKGREVISION= # empty
COMMENT= PHP extension for POSIX-like functions
diff --git a/devel/php-shmop/Makefile b/devel/php-shmop/Makefile
index 780be86b076..f16bd394739 100644
--- a/devel/php-shmop/Makefile
+++ b/devel/php-shmop/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $
MODNAME= shmop
CATEGORIES+= devel
-PKGREVISION= # empty
COMMENT= PHP extension for simple SysV shared memory operations
diff --git a/devel/php-sysvsem/Makefile b/devel/php-sysvsem/Makefile
index 2629ea20719..d23dc419c2e 100644
--- a/devel/php-sysvsem/Makefile
+++ b/devel/php-sysvsem/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $
MODNAME= sysvsem
CATEGORIES+= devel
-PKGREVISION= # empty
COMMENT= PHP extension for SysV semaphore support
diff --git a/devel/php-sysvshm/Makefile b/devel/php-sysvshm/Makefile
index d558f76bb9c..a3ccca3d3b9 100644
--- a/devel/php-sysvshm/Makefile
+++ b/devel/php-sysvshm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $
MODNAME= sysvshm
CATEGORIES+= devel
-PKGREVISION= # empty
COMMENT= PHP extension for SysV shared memory support
diff --git a/devel/pmccabe/Makefile b/devel/pmccabe/Makefile
index 35d933e859e..00ab98c6e0d 100644
--- a/devel/pmccabe/Makefile
+++ b/devel/pmccabe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/11/03 13:39:25 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:06 rillig Exp $
DISTNAME= pmccabe_2.2-3
PKGNAME= pmccabe-2.2.3
@@ -6,7 +6,6 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_DEBIAN:pool/main/p/pmccabe/}
MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE=
COMMENT= Measures the McCabe cyclomatic complexity of C and C++
WRKSRC= ${WRKDIR}/pmccabe
diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index 8c8e9c89fef..a92f39e489b 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/06/24 17:53:22 kristerw Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:07 rillig Exp $
DISTNAME= prcs-1.3.3
PKGREVISION= 2
@@ -14,11 +14,11 @@ CONFIGURE_ENV+= lispdir=${PREFIX}/share/examples/prcs
INFO_FILES= prcs.info
USE_LANGUAGES= c c++
CONFIGURE_ENV+= EMACS=no
-CONFIGURE_ENV+= SYS_GDIFF_COMMAND_PATH="${TOOLS_DIFF}"
-CONFIGURE_ENV+= SYS_TAR_COMMAND_PATH="${TOOLS_TAR}"
-CONFIGURE_ENV+= SYS_LS_COMMAND_PATH="${TOOLS_LS}"
+CONFIGURE_ENV+= SYS_GDIFF_COMMAND_PATH=${TOOLS_DIFF:Q}
+CONFIGURE_ENV+= SYS_TAR_COMMAND_PATH=${TOOLS_TAR:Q}
+CONFIGURE_ENV+= SYS_LS_COMMAND_PATH=${TOOLS_LS:Q}
USE_TOOLS+= diff ls tar
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 0ec2404ba8e..3faf626ea8c 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:07 rillig Exp $
DISTNAME= pwlib-v1_8_3-src
PKGNAME= pwlib-1.8.3
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/openh323/
COMMENT= Portable Windows Libary
-BUILD_DEPENDS= bison-[0-9]*:../../devel/bison
+BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
WRKSRC= ${WRKDIR}/pwlib
USE_TOOLS+= gmake tar
@@ -24,9 +24,9 @@ CONFIGURE_ARGS+= --disable-expat --disable-video --disable-qos
PTHREAD_OPTS+= require
BUILD_TARGET= opt
-MAKE_ENV+= PWLIBDIR="${WRKSRC}" CC="${CC}" CPLUS="${CXX}"
+MAKE_ENV+= PWLIBDIR=${WRKSRC:Q} CC=${CC:Q} CPLUS=${CXX:Q}
-FILES_SUBST+= LIBTOOL="${LIBTOOL}"
+FILES_SUBST+= LIBTOOL=${LIBTOOL:Q}
FILES_SUBST+= PTHREADS_PREFIX="${BUILDLINK_PREFIX.pthread}"
post-extract:
diff --git a/devel/py-checker/Makefile b/devel/py-checker/Makefile
index 02c40654806..6f4ee2731e4 100644
--- a/devel/py-checker/Makefile
+++ b/devel/py-checker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:37 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:07 rillig Exp $
DISTNAME= pychecker-0.8.14
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,8 +10,8 @@ HOMEPAGE= http://pychecker.sourceforge.net/
COMMENT= Python code checker
PYDISTUTILSPKG= # defined
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index 1f33463e168..423b0bdc60f 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:45:37 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:07 rillig Exp $
#
PKGNAME= ${PYPKGPREFIX}-curses-0
@@ -20,7 +20,7 @@ PY_PATCHPLIST= yes
PY_SETUP_SUBST= NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
-BUILDLINK_DEPENDS.python23= python23>=2.3nb2
+BUILDLINK_DEPENDS.python23+= python23>=2.3nb2
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
do-patch:
diff --git a/devel/py-distutils/Makefile b/devel/py-distutils/Makefile
index 26eba2ccffb..0fad2334afa 100644
--- a/devel/py-distutils/Makefile
+++ b/devel/py-distutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/22 09:16:01 recht Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:07 rillig Exp $
#
DISTNAME= Distutils-1.0.2
@@ -12,7 +12,7 @@ COMMENT= Distribution Utilities for Python
PYTHON_VERSIONS_ACCEPTED= 15
PYSITELIB= lib/python1.5/site-packages
-PLIST_SUBST+= PYSITELIB=${PYSITELIB}
+PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
PYTHON_DISTUTILS_BOOTSTRAP= yes
do-build:
diff --git a/devel/py-expect/Makefile b/devel/py-expect/Makefile
index e939c324f34..82e491534f4 100644
--- a/devel/py-expect/Makefile
+++ b/devel/py-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/31 22:44:23 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:07 rillig Exp $
#
DISTNAME= ExpectPy-1.9b1
@@ -16,11 +16,11 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-python=${BUILDLINK_PREFIX.${PYPACKAGE}} \
--with-expect=${BUILDLINK_PREFIX.tcl-expect} \
--with-tcl --enable-shared
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
CONFIGURE_ENV+= PYTH_CONFIGDIR=${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/config
INSTALL_TARGET= installshared
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYLIB=${PYLIB} PYPKGPREFIX=${PYPKGPREFIX}
+PLIST_SUBST+= PYLIB=${PYLIB:Q} PYPKGPREFIX=${PYPKGPREFIX:Q}
EXAMPLESDIR= ${PREFIX}/share/examples/${PYPKGPREFIX}-expect
EXAMPLESFILES= ask.py glob.py ping.py telnet.py xping.py
diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile
index f10b4000f80..0f3ed73de4a 100644
--- a/devel/py-idle/Makefile
+++ b/devel/py-idle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:07 rillig Exp $
#
PKGNAME= ${PYPKGPREFIX}-idle-0
@@ -11,7 +11,7 @@ COMMENT= IDLE - The Integrated DeveLopment Environment for Python
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
do-patch:
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index 41f293799a1..97af085745d 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:37 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:07 rillig Exp $
#
DISTNAME= gadfly-1.0.0
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/kjbuckets
PYDISTUTILSPKG= yes
PYBINMODULE= yes
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
KJBDOCDIR= ${PREFIX}/share/doc/${PYPKGPREFIX}-kjbuckets
diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile
index 57f08392979..9b519cde26a 100644
--- a/devel/py-pqueue/Makefile
+++ b/devel/py-pqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:37 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:07 rillig Exp $
#
DISTNAME= PQueue-0.2
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
BUILD_TARGET= default
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
PYQ_DOCDIR= ${PREFIX}/share/doc/${PYPKGPREFIX}-PQueue
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 4f4a84f97b1..e5a96b0ed99 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/23 22:58:26 epg Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:07 rillig Exp $
PKGNAME= ${PYPKGPREFIX}-subversion-${SVNVER}
COMMENT= Python bindings and tools for Subversion
@@ -7,7 +7,7 @@ COMMENT= Python bindings and tools for Subversion
SHLIBTOOL_OVERRIDE= libtool
-CONFIGURE_ENV+= PYTHON2=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON2=${PYTHONBIN:Q}
PY_PATCHPLIST= YES
PYBINMODULE= YES
@@ -16,7 +16,7 @@ PYTHON_PATCH_SCRIPTS= tools/hook-scripts/mailer/mailer.py
BUILD_TARGET= swig-py-lib swig-py
INSTALL_TARGET= install-swig-py
-MAKE_ENV+= EXTRA_CPPFLAGS="${BUILDLINK_CPPFLAGS}"
+MAKE_ENV+= EXTRA_CPPFLAGS=${BUILDLINK_CPPFLAGS:Q}
MAKE_FLAGS+= swig_pydir=${LOCALBASE}/${PYSITELIB}/libsvn \
swig_pydir_extra=${LOCALBASE}/${PYSITELIB}/svn
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index 049d0c78f80..c863785af74 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/10/31 19:59:52 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:07 rillig Exp $
#
DISTNAME= rcs-5.7
@@ -12,12 +12,12 @@ COMMENT= GNU Revision Control System - version control software
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
-DEPENDS= diffutils>=2.7:../../devel/diffutils
+DEPENDS+= diffutils>=2.7:../../devel/diffutils
CONFIGURE_ARGS+= --with-diffutils=gdiff
.endif
GNU_CONFIGURE= yes
-CONFIGURE_ENV= PATH=${LOCALBASE}/bin:$$PATH
+CONFIGURE_ENV+= PATH=${LOCALBASE}/bin:"$$PATH"
CONFIGURE_HAS_MANDIR= no
post-install:
diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install
index 43edfb23796..efef8ad2957 100644
--- a/devel/rt3/Makefile.install
+++ b/devel/rt3/Makefile.install
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.install,v 1.1.1.1 2004/08/03 15:33:50 cube Exp $
+# $NetBSD: Makefile.install,v 1.2 2005/12/05 20:50:07 rillig Exp $
RT_SHARE_DIR= ${PREFIX}/share/rt3
RT_EXAMPLE_DIR= ${PREFIX}/share/examples/rt3
@@ -40,7 +40,7 @@ ${ROOT_USER} ${RT_GROUP} 0500
INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL
FILES_SUBST+= RTVARDIR=${RT_VAR_DIR:Q} RTLOCALDIR=${RT_LOCAL_DIR:Q}
-FILES_SUBST+= WEBUSER=${APACHE_USER} WEBGROUP=${APACHE_GROUP}
+FILES_SUBST+= WEBUSER=${APACHE_USER:Q} WEBGROUP=${APACHE_GROUP:Q}
do-install:
@${ECHO} "=> Configuration files"
diff --git a/devel/ruby-mode/Makefile b/devel/ruby-mode/Makefile
index 198642f90f5..daabf856d5b 100644
--- a/devel/ruby-mode/Makefile
+++ b/devel/ruby-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:07 rillig Exp $
#
DISTNAME= ${RUBY_DISTNAME}
@@ -18,7 +18,7 @@ RUBY_NOVERSION= yes
NO_CONFIGURE= yes
SRCS= ruby-mode.el rubydb3x.el inf-ruby.el
-PLIST_SUBST+= SITE_LISP=${SITE_LISP}
+PLIST_SUBST+= SITE_LISP=${SITE_LISP:Q}
do-build:
for f in ${SRCS}; do \
diff --git a/devel/ruby-racc/raccversion.mk b/devel/ruby-racc/raccversion.mk
index 5749bd8a77e..ff49bf00a2d 100644
--- a/devel/ruby-racc/raccversion.mk
+++ b/devel/ruby-racc/raccversion.mk
@@ -1,6 +1,6 @@
-# $NetBSD: raccversion.mk,v 1.1 2004/11/27 15:22:15 taca Exp $
-.ifndef _RUBY_RACCVERSION_MK
+# $NetBSD: raccversion.mk,v 1.2 2005/12/05 20:50:07 rillig Exp $
+.if !defined(_RUBY_RACCVERSION_MK)
_RUBY_RACCVERSION_MK= # defined
.if ${RUBY_NAME} != "ruby${RUBY_VER_DEFAULT}"
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index f7fb8310a62..7786b5f4697 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/11/03 07:20:08 taca Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:07 rillig Exp $
PKGNAME= ${RUBY_PKGPREFIX}-subversion-${SVNVER}
PKGREVISION= 1
@@ -9,7 +9,7 @@ COMMENT= Ruby bindings for Subversion
USE_RUBY_DIST_SUBDIR= no
REPLACE_RUBY_DIRS= ${WRKSRC}/tools
-CONFIGURE_ENV+= RUBY=${RUBY}
+CONFIGURE_ENV+= RUBY=${RUBY:Q}
BUILD_TARGET= swig-rb-lib swig-rb
INSTALL_TARGET= install-swig-rb
diff --git a/devel/rx/Makefile b/devel/rx/Makefile
index 9808b084905..e68c6a71293 100644
--- a/devel/rx/Makefile
+++ b/devel/rx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/09/28 20:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:07 rillig Exp $
DISTNAME= rx-1.5
PKGREVISION= 1
@@ -21,7 +21,7 @@ INFO_FILES= rx.info
#
RX_MAJOR= 0
RX_MINOR= 0
-MAKE_ENV+= RX_MAJOR="${RX_MAJOR}" RX_MINOR="${RX_MINOR}"
+MAKE_ENV+= RX_MAJOR=${RX_MAJOR:Q} RX_MINOR=${RX_MINOR:Q}
post-install:
cd ${WRKSRC}/doc; ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index fcefce2c434..3c59ba702d5 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/07/16 19:10:38 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:07 rillig Exp $
DISTNAME= sdcc-2.4.0
PKGNAME= ${DISTNAME:S/-src//}
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share/sdcc
# needed for some arch's. -fdollars-in-identifiers is enabled
# by default on some, not on others
CPPFLAGS+= -fdollars-in-identifiers
-CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
CONFIGURE_ENV+= sdcc_cv_CCggdb="no"
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index 62f4b27e705..e522296d642 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/09/28 17:06:53 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:07 rillig Exp $
#
DISTNAME= semantic-1.4.2
@@ -23,7 +23,7 @@ USE_TOOLS+= gmake
INFO_FILES= semantic.info
OTHER_INFO= semantic.info-1 semantic.info-2
-MAKE_ENV+= EMACS=${EMACS_FLAVOR}
+MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q}
# XXX cd ${WRKSRC}; ${MAKE} -V semantic_LISP
SRCS= semantic.el semantic-util.el semantic-bnf.el semantic-ctxt.el
diff --git a/devel/sgi-stl-docs/Makefile b/devel/sgi-stl-docs/Makefile
index 1b6ea769ecc..25cfae092f6 100644
--- a/devel/sgi-stl-docs/Makefile
+++ b/devel/sgi-stl-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $
DISTNAME= STL_doc
PKGNAME= sgi-stl-docs-3.3
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.sgi.com/tech/stl/
COMMENT= SGI Standard Template Library Programmer's Guide
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/devel/sgi-stl/Makefile b/devel/sgi-stl/Makefile
index 1efe1fd691c..5d4370a9ad5 100644
--- a/devel/sgi-stl/Makefile
+++ b/devel/sgi-stl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:07 rillig Exp $
DISTNAME= stl
PKGNAME= sgi-stl-3.3
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.sgi.com/tech/stl/
COMMENT= SGI Standard Template Library
WRKSRC= ${WRKDIR}
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index 06e2edbf89b..10d8f275b3d 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/09/17 03:39:41 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $
#
DISTNAME= silc-toolkit-0.9.13
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --without-libtoolfix
# XXX: Avoid an ICE in gcc2 on sparc64
#
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
# lib/silcclient/client_attrs.c causes an ICE with xlc on Darwin.
NOT_FOR_COMPILER+= xlc
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 574a06e9556..6073d228cda 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:08 rillig Exp $
DISTNAME= STLport-4.6
PKGNAME= stlport-4.6
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
NO_CONFIGURE= yes
BUILD_DIRS= ${WRKSRC}/src
-MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
MAKEFILE= gcc-libtool.mak
PTHREAD_OPTS+= require
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 4b256c12599..1688f046fc9 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2005/07/06 21:18:14 epg Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:08 rillig Exp $
PKGNAME= subversion-base-${SVNVER}
COMMENT= Version control system, base programs and libraries
PKG_INSTALLATION_TYPES= overwrite pkgviews
-.include "../subversion/Makefile.common"
+.include "../../devel/subversion/Makefile.common"
BUILD_USES_MSGFMT= yes
@@ -26,7 +26,7 @@ PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
CONFIGURE_ARGS+= --without-berkeley-db
.endif
-SUBST_CLASSES= paths
+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"
@@ -55,6 +55,6 @@ post-install:
# Use this target to update the build-outputs.mk hack for sub-packages.
svn-build-outputs-hack:
cd ${WRKSRC} && ./gen-make.py --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc
- mv ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
+ ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 86f3b3fdac9..60dd91eb688 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/05/23 22:58:26 epg Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/12/05 20:50:08 rillig Exp $
DISTNAME= subversion-${SVNVER}
CATEGORIES= devel
@@ -27,6 +27,6 @@ CONFIGURE_ARGS+= --with-ssl
MAKE_FLAGS+= SWIG_LIBSWIG_DIR=${BUILDLINK_DIR}/share/swig/1.3
-BUILDLINK_DEPENDS.subversion-base= subversion-base>=${SVNVER}
+BUILDLINK_DEPENDS.subversion-base+= subversion-base>=${SVNVER}
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/swig-perl/Makefile b/devel/swig-perl/Makefile
index 906398d511a..7f31e141cae 100644
--- a/devel/swig-perl/Makefile
+++ b/devel/swig-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/06 06:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:08 rillig Exp $
PKGNAME= swig-perl-${SWIG_VERSION}
PKGREVISION= 2
@@ -6,7 +6,7 @@ COMMENT= Simplified Wrapper and Interface Generator, Perl runtime
PKG_INSTALLATION_TYPES= overwrite pkgviews
-.include "../swig-build/Makefile.common"
+.include "../../devel/swig-build/Makefile.common"
CONFIGURE_ARGS+= --with-perl5=${PERL5}
diff --git a/devel/swig-python/Makefile b/devel/swig-python/Makefile
index c06b3605e1d..b6523b892e5 100644
--- a/devel/swig-python/Makefile
+++ b/devel/swig-python/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2004/12/03 15:14:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $
PKGNAME= swig-python-${SWIG_VERSION}
PKGREVISION= 1
COMMENT= Simplified Wrapper and Interface Generator, Python runtime
-.include "../swig-build/Makefile.common"
+.include "../../devel/swig-build/Makefile.common"
PYTHON_VERSIONS_INCOMPATIBLE= 21 21pth 20 15
diff --git a/devel/sysexits/distinfo b/devel/sysexits/distinfo
deleted file mode 100644
index b73e480fcee..00000000000
--- a/devel/sysexits/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/31 15:53:19 tv Exp $
-
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index fb299b0e678..beeb7ccf889 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:08 rillig Exp $
#
DISTNAME= tcllib-1.7
@@ -13,7 +13,7 @@ COMMENT= Collection of utility modules for Tcl
GNU_CONFIGURE= yes
NO_BUILD= yes
-SUBST_CLASSES= fix
+SUBST_CLASSES+= fix
SUBST_STAGE.fix= post-patch
SUBST_FILES.fix= modules/doctools/mpformats/_html.tcl
SUBST_SED.fix= -e "s,/usr/bin/wget -q -O,${FETCH_CMD} -V -o,g"
diff --git a/devel/teem/Makefile b/devel/teem/Makefile
index 866dabfd7bd..4f6645e625e 100644
--- a/devel/teem/Makefile
+++ b/devel/teem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:48 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $
#
DISTNAME= teem-1.8.0-src
@@ -31,10 +31,10 @@ do-configure:
.elif ${OPSYS} == "Linux" && ${MACHINE_ARCH} == "i386"
TEEM_ARCH=linux.32
.else
-PKG_FAIL_REASON="Support for this platform has not yet been added."
+PKG_FAIL_REASON+= "Support for this platform has not yet been added."
.endif
-MAKE_ENV+= TEEM_ARCH=${TEEM_ARCH} \
+MAKE_ENV+= TEEM_ARCH=${TEEM_ARCH:Q} \
TEEM_PNG=1 TEEM_BZIP2=1 TEEM_ZLIB=1 TEEM_PTHREAD=1 \
TEEM_PNG_IPATH="-I${BUILDLINK_PREFIX.png}/include" \
TEEM_PNG_LPATH="-L${BUILDLINK_PREFIX.png}/lib" \
diff --git a/devel/tet3/Makefile b/devel/tet3/Makefile
index ae0426a74c6..6101e934dcb 100644
--- a/devel/tet3/Makefile
+++ b/devel/tet3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:38 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:08 rillig Exp $
DISTNAME= tet3.3h-unsup.src
PKGNAME= tet3-3.3h
@@ -33,10 +33,10 @@ post-install:
.include "../../mk/pthread.buildlink3.mk"
-PTHREAD_OPTS= native # only native threads make sense
+PTHREAD_OPTS+= native # only native threads make sense
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native"
-PKG_SKIP_REASON= "Native threads are needed for this package"
+PKG_SKIP_REASON+= "Native threads are needed for this package"
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index e109e973892..da0628d4b02 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/09/28 14:31:06 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:08 rillig Exp $
#
DISTNAME= tla-1.3.3
@@ -37,7 +37,7 @@ post-install:
# Install arch documentation.
${INSTALL_DATA_DIR} ${DOCDIR}
cd ${WRKDIR}/${DISTNAME}/src/docs-tla && \
- find . \( -name \*.css -or -name \*.html \
+ ${FIND} . \( -name \*.css -or -name \*.html \
-or -name \*.txt \) -print \
| ${PAX} -rwppm ${DOCDIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index bd5341d346c..3712c0cea65 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:08 rillig Exp $
#
DISTNAME= tvision-0.8
@@ -15,7 +15,7 @@ COMMENT= Turbo Vision C++ CUI library for UNIX
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ucl/Makefile b/devel/ucl/Makefile
index b980b2d93c2..b3e19e5dfa3 100644
--- a/devel/ucl/Makefile
+++ b/devel/ucl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/24 10:55:20 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:08 rillig Exp $
#
DISTNAME= ucl-1.02
@@ -17,10 +17,10 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-shared=yes
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
# Avoid path to build directory in example Makefile
-SUBST_CLASSES= example
+SUBST_CLASSES+= example
SUBST_STAGE.example= post-patch
SUBST_FILES.example= examples/Makefile.in
SUBST_SED.example= -e "s|@MAKEINFO@||g"
diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile
index 6de1ffb705d..ac435b62f53 100644
--- a/devel/unidiff/Makefile
+++ b/devel/unidiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:48 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:09 rillig Exp $
#
DISTNAME= part01
@@ -12,7 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= #
COMMENT= Converts between uni-diffs and context diffs
-BUILD_DEPENDS= gsharutils>=4.2.1:../../archivers/gsharutils
+BUILD_DEPENDS+= gsharutils>=4.2.1:../../archivers/gsharutils
WRKSRC= ${WRKDIR}
EXTRACT_CMD= zcat ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar
diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 4a3f7a121c1..e9fa4f4967f 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/05/24 00:12:21 kristerw Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:09 rillig Exp $
DISTNAME= w32api-2.5-src
PKGNAME= w32api-2.5
@@ -19,7 +19,7 @@ PE_CC= ${CROSSBASE}/bin/i386-netbsdpe-cc -I${WRKSRC}/include
PE_AR= ${CROSSBASE}/bin/i386-netbsdpe-ar
CRTWRKSRC= ${WRKDIR}/pe-crt-1.2.1
PE_CPPFLAGS+= -I${WRKSRC}/include
-MAKE_FLAGS+= PE_CPPFLAGS="${PE_CPPFLAGS}"
+MAKE_FLAGS+= PE_CPPFLAGS=${PE_CPPFLAGS:Q}
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index b248695de2a..7876e22ba6f 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:09 rillig Exp $
DISTNAME= beav_1.40-11
PKGNAME= beav-1.40.11
@@ -9,7 +9,7 @@ MAINTAINER= bad@NetBSD.org
COMMENT= Binary Editor And Viewer, a full featured binary file editor
WRKSRC= ${WRKDIR}/beav-1.40
-MAKE_ENV+= SED="${SED}"
+MAKE_ENV+= SED=${SED:Q}
pre-patch:
${MV} ${WRKSRC}/beav.1 ${WRKSRC}/beav.1.in
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index c66fb93ae55..2cbcc242874 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:09 rillig Exp $
#
DISTNAME= bvi-1.3.2.src
@@ -13,7 +13,7 @@ COMMENT= Vi-like editor for binary files
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
GNU_CONFIGURE= YES
-MAKE_ENV+= SHELL=${SH}
+MAKE_ENV+= SHELL=${SH:Q}
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/editors/ce-doc/Makefile b/editors/ce-doc/Makefile
index ca546d8918b..5f9d4baee47 100644
--- a/editors/ce-doc/Makefile
+++ b/editors/ce-doc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:09 rillig Exp $
#
-.include "../ce/Makefile.common"
+.include "../../editors/ce/Makefile.common"
PKGNAME= ce-doc-${VERSION}
COMMENT+= , documentation
diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile
index 5c88a9d389b..be36b9497b7 100644
--- a/editors/ce-x11/Makefile
+++ b/editors/ce-x11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:09 rillig Exp $
#
-.include "../ce/Makefile.common"
+.include "../../editors/ce/Makefile.common"
PKGNAME= ce-x11-${VERSION}
COMMENT+= , X11 version
diff --git a/editors/ed/Makefile b/editors/ed/Makefile
index 2ed8204804d..252afdcd18c 100644
--- a/editors/ed/Makefile
+++ b/editors/ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/10/16 05:07:58 reed Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:09 rillig Exp $
DISTNAME= ed-0.2
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= GNU version of line-oriented text editor
GNU_CONFIGURE= YES
CONFIGURE_HAS_INFODIR= NO
CONFIGURE_HAS_MANDIR= NO
-MAKE_ENV+= INFO_DIR=${INFO_DIR}
+MAKE_ENV+= INFO_DIR=${INFO_DIR:Q}
.include "../../mk/bsd.prefs.mk"
@@ -20,9 +20,9 @@ INFO_FILES= ${GNU_PROGRAM_PREFIX}ed.info
.if defined(GNU_PROGRAM_PREFIX)
# the ./configure accepts --program-prefix, but doesn't use
-MAKE_ENV+= binprefix="${GNU_PROGRAM_PREFIX}"
+MAKE_ENV+= binprefix=${GNU_PROGRAM_PREFIX:Q}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${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 e59015cd789..be424f1e1cf 100644
--- a/editors/elvis-x11/Makefile
+++ b/editors/elvis-x11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:09 rillig Exp $
#
-.include "../elvis/Makefile.common"
+.include "../../editors/elvis/Makefile.common"
PKGNAME= elvis-x11-2.2.0
PKGREVISION= 2
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 18e9d8d5711..4a75af91898 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2005/10/05 13:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2005/12/05 20:50:09 rillig Exp $
DISTNAME= emacs-${EMACSVERSION}a
PKGREVISION= 1
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-jpeg
.include "../../graphics/tiff/buildlink3.mk"
CONFIGURE_ARGS+= --with-tiff
# need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs)
-BUILDLINK_DEPENDS.libungif= libungif>=4.1.0.1
+BUILDLINK_DEPENDS.libungif+= libungif>=4.1.0.1
.include "../../graphics/libungif/buildlink3.mk"
CONFIGURE_ARGS+= --with-gif
.include "../../graphics/png/buildlink3.mk"
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common
index 05880a9d53f..5ca6064e7aa 100644
--- a/editors/emacs/Makefile.common
+++ b/editors/emacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/10/14 08:59:50 hiramatsu Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:50:09 rillig Exp $
MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
MAINTAINER= markd@NetBSD.org
@@ -17,7 +17,7 @@ PLIST_SRC= ${.CURDIR}/../../editors/emacs/PLIST
# needed for 21.4a, can probably go away on next update
EMACSVERSION= 21.4
WRKSRC= ${WRKDIR}/emacs-${EMACSVERSION}
-PLIST_SUBST+= EMACSVERSION=${EMACSVERSION}
+PLIST_SUBST+= EMACSVERSION=${EMACSVERSION:Q}
MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index c3bb072bd74..7b57a418f34 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/30 10:16:38 markd Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:09 rillig Exp $
DISTNAME= emacs-20.7
PKGREVISION= 5
@@ -76,7 +76,7 @@ CONFIGURE_ARGS+=--with-ipv6
.else
CONFIGURE_ARGS+=--without-ipv6
.endif
-MAKE_ENV+= INSTALL_STRIP=${_STRIPFLAG_INSTALL}
+MAKE_ENV+= INSTALL_STRIP=${_STRIPFLAG_INSTALL:Q}
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-3.*)
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index 2649e5e1b18..0427e8c7612 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/01 18:52:03 kristerw Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:09 rillig Exp $
#
DISTNAME= hnb-1.9.17
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://hnb.sourceforge.net/
COMMENT= Hierarchical data organizer
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-U]-*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-U]-*
USE_TOOLS+= gmake
diff --git a/editors/jde/Makefile b/editors/jde/Makefile
index e9931bd89ec..1a4d2f99d54 100644
--- a/editors/jde/Makefile
+++ b/editors/jde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/10/24 19:32:00 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:09 rillig Exp $
#
DISTNAME= jde-2.3.2
@@ -27,7 +27,7 @@ EMACS_VERSIONS_ACCEPTED=emacs21 # XXX Won't compile with emacs20...
PKG_DEFAULT_JVM= sun-jdk14
BUILD_ENV+= EMACS=${EMACS}
-MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX}
+MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
NO_CONFIGURE= yes
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 0f7d77837c0..05b27dfff88 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2003/07/13 13:51:33 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:09 rillig Exp $
#
PKGNAME= jed-0.99.16
PKGREVISION= 1
-.include "../jed/Makefile.common"
+.include "../../editors/jed/Makefile.common"
COMMENT= Extensible folding editor with Emacs/WordStar/EDT emulations
CONFLICTS= xjed-[0-9]*
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 926b4cd285f..b7ce3e50e64 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/19 08:29:52 adam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:09 rillig Exp $
DISTNAME= joe-3.3
CATEGORIES= editors
@@ -11,7 +11,7 @@ COMMENT= Joe's own editor
USE_PKGINSTALL= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sysconfdir="${PREFIX}/share/examples"
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/share/examples
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 052d2fd42b3..f3c66bdc2d0 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:56 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:09 rillig Exp $
#
DISTNAME= lpe-1.2.6
@@ -21,9 +21,9 @@ GNU_CONFIGURE= YES
SHLIBTOOL_OVERRIDE= libtool
-CONFIGURE_ENV= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
-MAKE_ENV= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
-CFLAGS= -DPREFIX="\"{PREFIX}\""
+CONFIGURE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
+MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
+CFLAGS+= -DPREFIX=\"{PREFIX:Q}\"
post-patch:
@cd ${WRKSRC}/man && \
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index ac6f2d7eb4e..cfef8450504 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2005/11/18 16:47:35 reed Exp $
+# $NetBSD: Makefile.common,v 1.32 2005/12/05 20:50:09 rillig Exp $
#
DISTNAME= lyx-1.3.6
@@ -61,8 +61,8 @@ CXXFLAGS+= -fno-exceptions
|| ${MACHINE_ARCH} == "m68k")
CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g}
CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
+CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
. endif
.endif
diff --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile
index 86c0a7c0e30..ea7b668363f 100644
--- a/editors/lyx-xforms/Makefile
+++ b/editors/lyx-xforms/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/11/18 16:47:35 reed Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:10 rillig Exp $
#
-.include "../lyx-qt/Makefile.common"
+.include "../../editors/lyx-qt/Makefile.common"
PKGNAME= ${DISTNAME:S/lyx-/lyx-xforms-/}
PKGREVISION= 1
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 2a33e9b8e47..9c517981de5 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:10 rillig Exp $
#
DISTNAME= manedit-0.5.6
@@ -13,7 +13,7 @@ COMMENT= UNIX Manual (man, manpage) page editor, viewer, and browser for X11
WRKSRC= ${WRKDIR}/${DISTNAME}/manedit
-MAKE_ENV+= CPP="${CXX}"
+MAKE_ENV+= CPP=${CXX:Q}
# The FreeBSD makefile may be used as "generic UNIX".
MAKEFILE= Makefile.FreeBSD
diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile
index 7c2425db42a..36f5d3120f7 100644
--- a/editors/mule-ucs/Makefile
+++ b/editors/mule-ucs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 14:31:06 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:10 rillig Exp $
DISTNAME= Mule-UCS-0.84
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT= Another encoding conversion mechanism for Emacs
# Mule 4.1 feature required by Mule-UCS was added to 20.7nb1.
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
-BUILDLINK_DEPENDS.emacs20= emacs>=20.7nb1
+BUILDLINK_DEPENDS.emacs20+= emacs>=20.7nb1
do-build:
@cd ${WRKSRC}; \
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index 8946056914d..4e15d384f2a 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:10 rillig Exp $
DISTNAME= ne-1.31
CATEGORIES= editors
@@ -8,7 +8,7 @@ DISTFILES= ${DISTNAME}.tar.gz ne.manpage.1 NE.spec.ascii NE.changes.spec
MAINTAINER= bjh@mail.dotcom.fr
COMMENT= Re-write of Phoenix E. A sensible light-weight editor
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
WRKSRC= ${WRKDIR}/src
EXTRACT_ONLY= ${DISTNAME}.tar.gz
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index 5bdfe51eb9b..ccfd35c8bf8 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/09/11 18:08:02 schmonz Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:10 rillig Exp $
#
DISTNAME= nvi-1.81.5
@@ -29,7 +29,7 @@ GNU_CONFIGURE= YES
CONFIGURE_SCRIPT= ../dist/configure
CONFIGURE_ARGS+= --with-db3=${BUILDLINK_PREFIX.db3}
CONFIGURE_ARGS+= --program-transform-name='s,^,n,'
-CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH}
+CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH:Q}
USE_TOOLS+= sh
USE_LIBTOOL= YES
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index b5c3372ee0f..643628354dc 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:10 rillig Exp $
DISTNAME= sam
PKGNAME= sam-4.3
@@ -17,7 +17,7 @@ EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
MANCOMPRESSED= yes
USE_X11BASE= yes
-MAKE_ENV+= X11PREFIX=${X11PREFIX}
+MAKE_ENV+= X11PREFIX=${X11PREFIX:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 853f40bf897..865e32eb4fc 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:29 uebayasi Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:10 rillig Exp $
#
DISTNAME= speedbar-0.14beta4
@@ -14,7 +14,7 @@ COMMENT= Directory and code browser for emacs
BUILD_ENV+= EMACS=${EMACS}
-NO_CONFIGURE= # set
+NO_CONFIGURE= yes
USE_TOOLS+= gmake
INFO_FILES= speedbar.info
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index f934ccd13a6..96ec56c012a 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2005/07/19 10:18:59 grant Exp $
+# $NetBSD: Makefile,v 1.51 2005/12/05 20:50:10 rillig Exp $
PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
COMMENT= Vim editor (vi clone) with X11 GTK+ GUI
-.include "../vim-share/Makefile.common"
+.include "../../editors/vim-share/Makefile.common"
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index f24a28b2ca9..19f6e6450fa 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:18:59 grant Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:10 rillig Exp $
PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
COMMENT= Vim editor (vi clone) with X11 GTK2 GUI
-.include "../vim-share/Makefile.common"
+.include "../../editors/vim-share/Makefile.common"
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
diff --git a/editors/vim-lang/Makefile b/editors/vim-lang/Makefile
index f1ae532b967..f04c8e66fd0 100644
--- a/editors/vim-lang/Makefile
+++ b/editors/vim-lang/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/07/19 10:18:59 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:10 rillig Exp $
PKGNAME= vim-lang-${VIM_VERSION}.${VIM_PATCHLEVEL}
-.include "../vim-share/Makefile.common"
+.include "../../editors/vim-share/Makefile.common"
COMMENT= Language files for the vim editor (vi clone)
@@ -11,6 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-sha
BUILD_TARGET= languages
INSTALL_TARGET= install-languages
-PLIST_SUBST+= VIM_SUBDIR="${VIM_SUBDIR}"
+PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index f1c381f532d..540b841413a 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2005/07/19 10:18:59 grant Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:10 rillig Exp $
PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
COMMENT= Vim editor (vi clone) with X11 Motif GUI
-.include "../vim-share/Makefile.common"
+.include "../../editors/vim-share/Makefile.common"
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
@@ -14,8 +14,8 @@ CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
CONFIGURE_ARGS+= --enable-gui=motif
CONFIGURE_ARGS+= --with-tlib=ncurses
-CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}"
-MAKE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}"
+CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
BUILD_TARGET= vim
INSTALL_TARGET= installvimbin
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 79f1f417d5c..3bf4e66166e 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/07 08:21:36 martti Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:10 rillig Exp $
PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -13,7 +13,7 @@ INSTALL_TARGET= installruntime installmacros installtutor installtools
USE_TOOLS+= awk
INSTALL_MAKE_FLAGS+= TOOLS_AWK="${TOOLS_AWK}"
-PLIST_SUBST+= VIM_SUBDIR="${VIM_SUBDIR}"
+PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR:Q}
do-build:
@cd ${WRKSRC}/xxd && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 6403aa4cd95..d59f42f0d51 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2005/07/19 10:18:59 grant Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:10 rillig Exp $
PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
-#PKGREVISION= 1
-.include "../vim-share/Makefile.common"
+.include "../../editors/vim-share/Makefile.common"
COMMENT= Vim editor (vi clone) with X11 Athena GUI
diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk
index fb50cf48028..3fc7c0fe7ad 100644
--- a/editors/xemacs-current/options.mk
+++ b/editors/xemacs-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/01/22 13:03:06 magick Exp $
+# $NetBSD: options.mk,v 1.5 2005/12/05 20:50:10 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs
PKG_SUPPORTED_OPTIONS= esound ldap xface canna
@@ -31,4 +31,3 @@ CONFIGURE_ARGS+= --without-canna
#.else
CONFIGURE_ARGS+= --with-sound=none
#.endif
-
diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
index 6b1df16cfb9..934c08337cb 100644
--- a/editors/xemacs/Makefile.common
+++ b/editors/xemacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2005/12/05 20:50:10 rillig Exp $
DISTNAME= xemacs-21.4.17
CATEGORIES= editors
@@ -17,7 +17,7 @@ USE_TOOLS+= gtar
DIST_SUBDIR= xemacs
EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-PLIST_SUBST+= DISTNAME="${DISTNAME}"
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
MESSAGE_SUBST+= DISTNAME="${DISTNAME}"
.include "options.mk"
diff --git a/editors/xemacs/Makefile.pkg b/editors/xemacs/Makefile.pkg
index 606be3e3210..f4d9be214c8 100644
--- a/editors/xemacs/Makefile.pkg
+++ b/editors/xemacs/Makefile.pkg
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.pkg,v 1.2 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile.pkg,v 1.3 2005/12/05 20:50:10 rillig Exp $
.include "../../mk/bsd.prefs.mk"
.if !defined(XEMACS_PREFIX)
XEMACS_PREFIX!= ${MAKE} XEMACS_PREFIX= EVAL_PREFIX=_XEMACS_PREFIX=xemacs \
VARNAME=_XEMACS_PREFIX show-var
-MAKEFLAGS+= XEMACS_PREFIX=${XEMACS_PREFIX}
+MAKEFLAGS+= XEMACS_PREFIX=${XEMACS_PREFIX:Q}
.endif
.if (${XEMACS_PREFIX} == ${X11BASE})
diff --git a/editors/xjed/Makefile b/editors/xjed/Makefile
index bed76696aac..64a490e2e91 100644
--- a/editors/xjed/Makefile
+++ b/editors/xjed/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:10 rillig Exp $
#
PKGNAME= xjed-0.99.16
-.include "../jed/Makefile.common"
+.include "../../editors/jed/Makefile.common"
COMMENT= Extensible folding editor with Emacs/WordStar/EDT emulations, X11 version
CONFLICTS= jed-[0-9]*
diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
index 079068bd6a4..d12dcb610e1 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/03 21:40:13 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:10 rillig Exp $
#
DISTNAME= arnsrc27012002
@@ -23,7 +23,7 @@ BUILD_TARGET= arnold
SHAREDIR= ${PREFIX}/share/arnold
DOCDIR= ${PREFIX}/share/doc/arnold
-MAKE_ENV+= SHAREDIR=${SHAREDIR}
+MAKE_ENV+= SHAREDIR=${SHAREDIR:Q}
INSTALLATION_DIRS= bin
do-install:
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 532459080e5..5abe64523d9 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:10 rillig Exp $
DISTNAME= atari800-1.3.6
CATEGORIES= emulators
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
.include "options.mk"
# override HOME to avoid picking up a bad ${HOME}/.atari800 during the build
-MAKE_FLAGS+= HOME=${WRKSRC}
+MAKE_FLAGS+= HOME=${WRKSRC:Q}
post-extract:
@cd ${WRKDIR} && ${LOCALBASE}/bin/unzip -Lqo ${DISTDIR}/xf25.zip
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index f8e5ca0a844..926decf678a 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/23 09:27:48 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= compat12-${MACHINE_ARCH}
@@ -20,10 +20,10 @@ USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+= LDCONFIG=${LDCONFIG}
+FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+= LDCONFIG=${LDCONFIG:Q}
.include "../../mk/bsd.prefs.mk"
@@ -37,7 +37,7 @@ LOCALBASE= /usr
COMPAT_LIBDIR= lib
.endif
-PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
+PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index 76377a4e226..6b7a6605f7b 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= compat13-${MACHINE_ARCH}${PKGMINOR}
@@ -23,10 +23,10 @@ USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+= LDCONFIG=${LDCONFIG}
+FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+= LDCONFIG=${LDCONFIG:Q}
.include "../../mk/bsd.prefs.mk"
@@ -46,7 +46,7 @@ PKGMINOR= nb1
PKGMINOR=
.endif
-PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
+PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile
index fd936faee1d..2abb088618a 100644
--- a/emulators/compat14-crypto/Makefile
+++ b/emulators/compat14-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= compat14-crypto-${MACHINE_ARCH}-${VERSION}
@@ -27,11 +27,11 @@ USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
-FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+= LDCONFIG=${LDCONFIG}
+FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
+FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+= LDCONFIG=${LDCONFIG:Q}
.include "../../mk/bsd.prefs.mk"
@@ -47,7 +47,7 @@ COMPAT_LIBDIR= lib
COMPAT_XLIBDIR= X11R6/lib
.endif
-PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
+PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
# note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink.
# FIXME.
diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile
index 0b1fc882f25..24ecb8e4cc5 100644
--- a/emulators/compat14/Makefile
+++ b/emulators/compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= compat14-${MACHINE_ARCH}-${VERSION}
@@ -25,11 +25,11 @@ USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
-FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+= LDCONFIG=${LDCONFIG}
+FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
+FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+= LDCONFIG=${LDCONFIG:Q}
.include "../../mk/bsd.prefs.mk"
@@ -45,7 +45,7 @@ COMPAT_LIBDIR= lib
COMPAT_XLIBDIR= X11R6/lib
.endif
-PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
+PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
# note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink.
# FIXME.
diff --git a/emulators/compat16/Makefile b/emulators/compat16/Makefile
index 7eb3371577e..7998f78ffbe 100644
--- a/emulators/compat16/Makefile
+++ b/emulators/compat16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/23 15:09:30 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= compat16-${MACHINE_ARCH}-${VERSION}
@@ -22,7 +22,7 @@ SHLIB_HANDLING= NO
EMULSUBDIR= emul/netbsd16
-PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${EMULSUBDIR}
diff --git a/emulators/darwin_lib/Makefile b/emulators/darwin_lib/Makefile
index 90250cd716e..28aaf8da6f1 100644
--- a/emulators/darwin_lib/Makefile
+++ b/emulators/darwin_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/23 09:29:08 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:11 rillig Exp $
DISTNAME= darwin_lib-6.6.2
CATEGORIES= emulators
@@ -15,7 +15,7 @@ MAINTAINER= abacau@yahoo.com.au
HOMEPAGE= http://www.opendarwin.org/
COMMENT= Darwin compatibility libraries (including X11)
-BUILD_DEPENDS= rpm2pkg>=1.3:../../pkgtools/rpm2pkg
+BUILD_DEPENDS+= rpm2pkg>=1.3:../../pkgtools/rpm2pkg
ONLY_FOR_PLATFORM= NetBSD-1.6Z*-powerpc NetBSD-1.6Z*-i386 \
NetBSD-[2-9]*-powerpc NetBSD-[2-9]*-i386
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 36f15d7c3e7..a24341f52dd 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:11 rillig Exp $
DISTNAME= dosbox-0.63
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= Multi-platform DOS emulator using SDL
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
-SUBST_CLASSES= fixme
+SUBST_CLASSES+= fixme
SUBST_STAGE.fixme= post-patch
SUBST_FILES.fixme= docs/dosbox.1
SUBST_SED.fixme= -e s,/usr/share/,${PREFIX}/share/,g
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index b5183eb710a..a5e8ac6b55c 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:14:40 agc Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= doscmd-19960502-2
@@ -13,7 +13,7 @@ COMMENT= MS-DOS emulator (NetBSD/i386 only)
ONLY_FOR_PLATFORM= NetBSD-1.[345]*-i386
WRKSRC= ${WRKDIR}/doscmd
-MAKE_ENV= X11BASE=${X11BASE}
+MAKE_ENV+= X11BASE=${X11BASE:Q}
MANCOMPRESSED_IF_MANZ= yes
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 496ec09131b..cea9b846ab8 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:11 rillig Exp $
DISTNAME= fMSX24.tar
PKGNAME= fmsx-2.4
@@ -27,7 +27,7 @@ DEFS+= -DMITSHM -D${CUR_DEPTH} -DSOUND
DEFS+= -DSUN_AUDIO
.endif
-MAKE_ENV= DEFS="${DEFS}"
+MAKE_ENV+= DEFS=${DEFS:Q}
INSTALLATION_DIRS= bin
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index 8a56b156a74..0f98a1f424c 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= gens-rc3
@@ -14,7 +14,7 @@ COMMENT= Sega Genesis emulator with Sega CD support
BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
# contains i386 assembler sources
-ONLY_FOR_PLATFORM= *-i386
+ONLY_FOR_PLATFORM= *-*-i386
WRKSRC= ${WRKDIR}/GensForLinux
GNU_CONFIGURE= yes
diff --git a/emulators/gpsim-oscilloscope/Makefile b/emulators/gpsim-oscilloscope/Makefile
index e81901d4290..390f0903079 100644
--- a/emulators/gpsim-oscilloscope/Makefile
+++ b/emulators/gpsim-oscilloscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/09/19 09:10:23 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= oscilloscope-0.1.2
@@ -10,7 +10,6 @@ MAINTAINER= bouyer@NetBSD.org
COMMENT= Oscilloscope module for gpsim
GNU_CONFIGURE= YES
-USE_BUILDLINK3= YES
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/emulators/gpsim-ptyusart/Makefile b/emulators/gpsim-ptyusart/Makefile
index d35fe66e14d..a8d9146478d 100644
--- a/emulators/gpsim-ptyusart/Makefile
+++ b/emulators/gpsim-ptyusart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/09/19 09:10:23 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= ptyusart-0.3.2
@@ -12,7 +12,6 @@ COMMENT= Pseudo-tty module for gpsim
ONLY_FOR_PLATFORM= NetBSD-*-*
GNU_CONFIGURE= YES
-USE_BUILDLINK3= YES
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index a0276129102..dd6fb1775d6 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/26 19:03:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= gxemul-0.3.7
@@ -23,7 +23,7 @@ do-install:
.for f in README HISTORY BUGS TODO RELEASE LICENSE
${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PKGBASE}
.endfor
- cd ${WRKSRC}/doc && ${PAX} -rwppm . ${PREFIX}/share/doc/${PKGBASE}
+ cd ${WRKSRC}/doc && ${PAX} -rwppm . ${PREFIX}/share/doc/${PKGBASE}
PKG_OPTIONS_VAR= PKG_OPTIONS.gxemul
PKG_SUPPORTED_OPTIONS= x11
@@ -33,7 +33,7 @@ PKG_SUGGESTED_OPTIONS= x11
.if !empty(PKG_OPTIONS:Mx11)
GLOBAL_LDFLAGS= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-SUBST_CLASSES= x11
+SUBST_CLASSES+= x11
SUBST_STAGE.x11= post-patch
SUBST_FILES.x11= configure
SUBST_SED.x11= -e "s|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS}|g" \
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index 28880c92266..20d3d358cba 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:11 rillig Exp $
DISTNAME= hercules-2.11
PKGREVISION= 2
@@ -13,7 +13,7 @@ DEPENDS+= hercules-images-[0-9]*:../../emulators/hercules-images
USE_TOOLS+= gmake
MAKEFILE= makefile
-MAKE_ENV+= HOST_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= HOST_ARCH=${MACHINE_ARCH:Q}
PTHREAD_OPTS+= require
diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile
index 48afb0fdb62..851beca791f 100644
--- a/emulators/netbsd32_compat14/Makefile
+++ b/emulators/netbsd32_compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= compat14-${MACHINE32_ARCH}-${VERSION}
@@ -33,11 +33,11 @@ USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
-FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+= LDCONFIG=${LDCONFIG}
+FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
+FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+= LDCONFIG=${LDCONFIG:Q}
.include "../../mk/bsd.prefs.mk"
@@ -45,7 +45,7 @@ EMULSUBDIR= emul/aout
COMPAT_LIBDIR= ${EMULSUBDIR}/usr/lib
COMPAT_XLIBDIR= ${EMULSUBDIR}/usr/X11R6/lib
-PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
+PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile
index 5ab6c76b18e..86b204d1509 100644
--- a/emulators/netbsd32_compat15/Makefile
+++ b/emulators/netbsd32_compat15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:21 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:11 rillig Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
@@ -27,12 +27,12 @@ USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR}
-FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
-FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+= LDCONFIG=${LDCONFIG}
+FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q}
+FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
+FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+= LDCONFIG=${LDCONFIG:Q}
.include "../../mk/bsd.prefs.mk"
@@ -41,23 +41,23 @@ COMPAT_LIBDIR= ${EMULSUBDIR}/usr/lib
COMPAT_LIBEXECDIR= ${EMULSUBDIR}/usr/libexec
COMPAT_XLIBDIR= ${EMULSUBDIR}/usr/X11R6/lib
-PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
+PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
# XXX using pax to copy symlinks properly.
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
- (cd ${WRKDIR}/lib; pax -rwv lib*.so* ${PREFIX}/${COMPAT_LIBDIR}; \
+ (cd ${WRKDIR}/lib; ${PAX} -rwv lib*.so* ${PREFIX}/${COMPAT_LIBDIR}; \
${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBDIR}/lib*.so*; \
${CHMOD} 555 ${PREFIX}/${COMPAT_LIBDIR}/lib*.so* )
if [ -d ${WRKDIR}/X11R6/lib ]; then \
${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_XLIBDIR}; \
- (cd ${WRKDIR}/X11R6/lib; pax -rwv lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
+ (cd ${WRKDIR}/X11R6/lib; ${PAX} -rwv lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so*; \
${CHMOD} 555 ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so* ) \
fi
if [ -d ${WRKDIR}/libexec ]; then \
${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBEXECDIR}; \
- (cd ${WRKDIR}/libexec; pax -rwv ld.*so ${PREFIX}/${COMPAT_LIBEXECDIR}; \
+ (cd ${WRKDIR}/libexec; ${PAX} -rwv ld.*so ${PREFIX}/${COMPAT_LIBEXECDIR}; \
${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so; \
${CHMOD} 555 ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so ) \
fi
diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile
index ccd55d93f0f..d6c9834f127 100644
--- a/emulators/netbsd32_compat16/Makefile
+++ b/emulators/netbsd32_compat16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:21 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:11 rillig Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
@@ -36,10 +36,10 @@ USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR}
-FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+= LDCONFIG=${LDCONFIG}
+FILES_SUBST+= COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR:Q}
+FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+= LDCONFIG=${LDCONFIG:Q}
.include "../../mk/bsd.prefs.mk"
@@ -48,16 +48,16 @@ COMPAT_LIBDIR= ${PREFIX}/${EMULSUBDIR}/usr/lib
COMPAT_LIBEXECDIR= ${PREFIX}/${EMULSUBDIR}/usr/libexec
COMPAT_XLIBDIR= ${PREFIX}/${EMULSUBDIR}/usr/X11R6/lib
-PLIST_SUBST+= COMPAT_EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+= COMPAT_EMULSUBDIR=${EMULSUBDIR:Q}
# XXX using pax to copy symlinks properly.
do-install:
${INSTALL_DATA_DIR} ${COMPAT_LIBDIR}
${INSTALL_DATA_DIR} ${COMPAT_XLIBDIR}
${INSTALL_DATA_DIR} ${COMPAT_LIBEXECDIR}
- (cd ${WRKDIR}/usr/lib; pax -rwv lib*.so* i18n/lib*.so* ${COMPAT_LIBDIR})
- (cd ${WRKDIR}/usr/X11R6/lib; pax -rwv lib*.so* ${COMPAT_XLIBDIR})
- (cd ${WRKDIR}/usr/libexec; pax -rwv ld.*so ${COMPAT_LIBEXECDIR})
+ (cd ${WRKDIR}/usr/lib; ${PAX} -rwv lib*.so* i18n/lib*.so* ${COMPAT_LIBDIR})
+ (cd ${WRKDIR}/usr/X11R6/lib; ${PAX} -rwv lib*.so* ${COMPAT_XLIBDIR})
+ (cd ${WRKDIR}/usr/libexec; ${PAX} -rwv ld.*so ${COMPAT_LIBEXECDIR})
${CHOWN} ${ROOT_USER}:${ROOT_GROUP} \
${COMPAT_LIBDIR}/lib*.so* ${COMPAT_LIBDIR}/i18n/lib*.so* \
${COMPAT_XLIBDIR}/lib*.so* ${COMPAT_LIBEXECDIR}/ld.*so
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 78996851ea8..97545909c75 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/27 12:04:04 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= openmsx-0.5.2
@@ -22,7 +22,7 @@ post-extract:
@${ECHO_MSG} "OPENMSX_STRIP:=true" > \
${WRKSRC}/build/flavour-pkgsrc.mk
-SUBST_CLASSES= prefix
+SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= post-patch
SUBST_FILES.prefix= build/custom.mk
SUBST_SED.prefix= -e "s,/opt/openMSX,${PREFIX}/openmsx,"
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 9e8999e33d6..65493ee8235 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:10 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:11 rillig Exp $
#
DISTNAME= emulator_src_${POSE_VERSION}
@@ -36,7 +36,7 @@ USE_TOOLS+= gmake perl
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-fltk=${BUILDLINK_PREFIX.fltk}
-CONFIGURE_ENV+= PACKAGE_SKINS_DIR=${POSE_SKINS_DIR}
+CONFIGURE_ENV+= PACKAGE_SKINS_DIR=${POSE_SKINS_DIR:Q}
# Assumes too much about how to build va_list's from scratch
NOT_FOR_PLATFORM= *-*-powerpc
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 3c4556bb419..00920e40f78 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:11 rillig Exp $
DISTNAME= pcemu1.01alpha
PKGNAME= pcemu-1.01a
@@ -10,14 +10,14 @@ MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ \
MAINTAINER= eric@fox.phoenix.az.us
COMMENT= 8086 PC emulator, by David Hedley
-MAKE_ENV+= FILESDIR=${FILESDIR}
+MAKE_ENV+= FILESDIR=${FILESDIR:Q}
.include "../../mk/x11.buildlink3.mk"
do-configure:
cd ${WRKSRC}; \
${MKDIR} ${WRKSRC}/bootstrap; \
- sh < ${FILESDIR}/bootstrap.shar
+ ${SH} < ${FILESDIR}/bootstrap.shar
post-configure:
${SED} -e 's|/usr/local|${PREFIX}|g' < ${WRKSRC}/bootstrap/help.txt > \
diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
index 3366414e035..5e55f99a76b 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/09 14:25:49 kent Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:12 rillig Exp $
#
PEACE_VERSION= 0.0.20050609
DISTNAME= peace-${PEACE_VERSION}
@@ -17,17 +17,17 @@ DEPENDS+= icu>=2.4nb1:../../textproc/icu
# DEPENDS+= perl5:../../lang/perl5
# DEPENDS+= cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
-BUILD_DEPENDS= cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
+BUILD_DEPENDS+= cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
BUILD_DEPENDS+= w32api>=2.5:../../devel/w32api
BUILD_DEPENDS+= x11-links-*:../../pkgtools/x11-links
CPPFLAGS+= -I${WRKDIR}/cross/i386-netbsdpe/include
-LDFLAGS= -L${WRKSRC}/lib
+LDFLAGS+= -L${WRKSRC}/lib
PECOFFDIR= ${PREFIX}/emul/pecoff
-MAKE_FLAGS+= PECOFFDIR=${PECOFFDIR} \
- LOCALBASE=${LOCALBASE} \
- CROSSBASE=${CROSSBASE} \
- X11BASE=${X11BASE} \
+MAKE_FLAGS+= PECOFFDIR=${PECOFFDIR:Q} \
+ LOCALBASE=${LOCALBASE:Q} \
+ CROSSBASE=${CROSSBASE:Q} \
+ X11BASE=${X11BASE:Q} \
CHECK_DEPENDENTS=NO
MAKE_COMMAND= ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index 65d74967f89..b99eaed3247 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/27 16:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:12 rillig Exp $
#
DISTNAME= pearpc-0.3.1
@@ -39,7 +39,7 @@ do-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/ppccfg.example ${EGDIR}
-SUBST_CLASSES= conf
+SUBST_CLASSES+= conf
SUBST_STAGE.conf= post-patch
SUBST_FILES.conf= ppccfg.example
SUBST_SED.conf= -e "s|\"nvram\"|\"/tmp/nvram\"|"
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 2e0fff90312..2ae7cdf7509 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/11/17 14:21:02 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:12 rillig Exp $
DISTNAME= s9xs139
PKGNAME= snes9x-1.39
@@ -15,7 +15,7 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
WRKSRC= ${WRKDIR}/release
USE_TOOLS+= gmake
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
INSTALLATION_DIRS= bin
do-install:
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 6a1f123c167..5fc99ef247e 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:12 rillig Exp $
STELLA_VERSION= 1.4.1
DISTNAME= stella-${STELLA_VERSION}-src
@@ -27,7 +27,7 @@ BUILD_TARGET= linux
GCC_REQD+= 3.0
.endif
-MAKE_ENV= CXXFLAGS="${CXXFLAGS} -fno-rtti"
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:Q}\ -fno-rtti
DOCDIR=${PREFIX}/share/doc/html/stella
DATADIR=${PREFIX}/share/stella
diff --git a/emulators/suse91_base/Makefile b/emulators/suse91_base/Makefile
index 86bd560c56f..2a92e987a7d 100644
--- a/emulators/suse91_base/Makefile
+++ b/emulators/suse91_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/06 14:52:43 salo Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:12 rillig Exp $
DISTNAME= suse_base-${SUSE_VERSION}
PKGREVISION= 8
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
EXTRACT_ONLY= # empty
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR} LINUX_LIB=${LINUX_LIB}
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
.if exists(Makefile.${MACHINE_ARCH})
.include "Makefile.${MACHINE_ARCH}"
diff --git a/emulators/suse91_glx/Makefile b/emulators/suse91_glx/Makefile
index a8af3294e1f..7f8adb3453c 100644
--- a/emulators/suse91_glx/Makefile
+++ b/emulators/suse91_glx/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2005/05/15 16:44:33 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:12 rillig Exp $
DISTNAME= suse_glx-${SUSE_VERSION}
-PKGREVISION= # empty
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE91}
DISTFILES= ${RPMFILES}
diff --git a/emulators/suse91_gtk2/Makefile b/emulators/suse91_gtk2/Makefile
index 7ba775102af..5303cb4a2fd 100644
--- a/emulators/suse91_gtk2/Makefile
+++ b/emulators/suse91_gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/27 18:02:01 salo Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:12 rillig Exp $
DISTNAME= suse_gtk2-${SUSE_VERSION}
PKGREVISION= 4
@@ -30,8 +30,8 @@ RPMFILES= atk-1.4.1-124.${SUSE_ARCH}.rpm \
pango-1.2.5-170.${SUSE_ARCH}.rpm
# Initialize gtk/pango modules.
-FILES_SUBST+= EMULDIR=${EMULDIR}
-PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR}
+FILES_SUBST+= EMULDIR=${EMULDIR:Q}
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL
.include "../../emulators/suse91_linux/Makefile.common"
diff --git a/emulators/suse91_slang/Makefile b/emulators/suse91_slang/Makefile
index d23aa68a9a5..ddbf1b2bf2d 100644
--- a/emulators/suse91_slang/Makefile
+++ b/emulators/suse91_slang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:12 rillig Exp $
DISTNAME= suse_slang-${SUSE_VERSION}
CATEGORIES= emulators
@@ -23,5 +23,5 @@ post-install:
${LN} -sf ${PREFIX}/${EMULSUBDIR}/usr/lib/libslang-utf8.so.1 \
${PREFIX}/${EMULSUBDIR}/usr/lib/libslang.so.1
-.include "../suse91_linux/Makefile.common"
+.include "../../emulators/suse91_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_vmware/Makefile b/emulators/suse91_vmware/Makefile
index 9a32db0de03..8a65af42173 100644
--- a/emulators/suse91_vmware/Makefile
+++ b/emulators/suse91_vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:12 rillig Exp $
DISTNAME= suse_vmware-${SUSE_VERSION}
CATEGORIES= emulators
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST= EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
RPMFILES= grep-2.5.1-416.i586.rpm
RPMIGNOREPATH= usr
diff --git a/emulators/suse_devel/Makefile b/emulators/suse_devel/Makefile
index b02aa394380..a6d24a87bfb 100644
--- a/emulators/suse_devel/Makefile
+++ b/emulators/suse_devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:12 rillig Exp $
DISTNAME= suse_devel-${SUSE_VERSION}
CATEGORIES= emulators
@@ -23,7 +23,7 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= binutils.rpm cpp.rpm g77.rpm gcc.rpm gpp.rpm make.rpm
-.include "../suse_linux/arch.mk"
+.include "../../emulators/suse_linux/arch.mk"
.if ${SUSE_ARCH} == "i386"
RPMFILES+= glibc-devel-2.2.4-78.${SUSE_ARCH}.rpm bin86.rpm
@@ -33,5 +33,5 @@ RPMFILES+= glibc-devel-2.2.4-69.${SUSE_ARCH}.rpm
RPMFILES+= glibc.rpm
.endif
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_fileutils/Makefile b/emulators/suse_fileutils/Makefile
index fb940f99d34..fd286a4d428 100644
--- a/emulators/suse_fileutils/Makefile
+++ b/emulators/suse_fileutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:12 rillig Exp $
DISTNAME= suse_fileutils-${SUSE_VERSION}
CATEGORIES= emulators
@@ -20,5 +20,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= fileutils.rpm
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_freetype2/Makefile b/emulators/suse_freetype2/Makefile
index 433a8da33b0..ac1c17e8107 100644
--- a/emulators/suse_freetype2/Makefile
+++ b/emulators/suse_freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:12 rillig Exp $
DISTNAME= freetype2
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -22,5 +22,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES+= freetype2-2.0.4-52.${SUSE_ARCH}.rpm
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_linux/arch.mk b/emulators/suse_linux/arch.mk
index a995738943f..c643986048a 100644
--- a/emulators/suse_linux/arch.mk
+++ b/emulators/suse_linux/arch.mk
@@ -1,7 +1,7 @@
-# $NetBSD: arch.mk,v 1.1 2002/11/25 11:01:16 schmonz Exp $
+# $NetBSD: arch.mk,v 1.2 2005/12/05 20:50:12 rillig Exp $
-.ifndef SUSE_ARCH_MK
-SUSE_ARCH_MK=1
+.if !defined(SUSE_ARCH_MK)
+SUSE_ARCH_MK= # defined
.include "../../mk/bsd.prefs.mk"
diff --git a/emulators/suse_linux/vars.mk b/emulators/suse_linux/vars.mk
index 8ed70cc071a..12270ff4f57 100644
--- a/emulators/suse_linux/vars.mk
+++ b/emulators/suse_linux/vars.mk
@@ -1,7 +1,7 @@
-# $NetBSD: vars.mk,v 1.1 2005/04/03 21:23:15 jdolecek Exp $
+# $NetBSD: vars.mk,v 1.2 2005/12/05 20:50:12 rillig Exp $
-.ifndef SUSE_VARS_MK
-SUSE_VARS_MK=1
+.if !defined(SUSE_VARS_MK)
+SUSE_VARS_MK= # defined
SUSE_VERSION= 7.3
SUSE_DIR_PREFIX= suse
diff --git a/emulators/suse_slang/Makefile b/emulators/suse_slang/Makefile
index 0ef4402f6cb..bf454b1fff9 100644
--- a/emulators/suse_slang/Makefile
+++ b/emulators/suse_slang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:12 rillig Exp $
DISTNAME= slang
PKGREVISION= 1
@@ -21,5 +21,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_vmware/Makefile b/emulators/suse_vmware/Makefile
index e79b2f60063..afa7e1b499d 100644
--- a/emulators/suse_vmware/Makefile
+++ b/emulators/suse_vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:12 rillig Exp $
DISTNAME= fileutils-4.1-154.i386
PKGNAME= suse_vmware-${SUSE_VERSION}
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST= EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
RPMIGNOREPATH= usr
diff --git a/emulators/tme/distinfo b/emulators/tme/distinfo
index 1da745e33e5..da750d3ada7 100644
--- a/emulators/tme/distinfo
+++ b/emulators/tme/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/07/27 07:29:26 skrll Exp $
+$NetBSD: distinfo,v 1.5 2005/12/05 20:50:12 rillig Exp $
SHA1 (tme-0.4.tar.gz) = 7a1a2c6aa05527b11f81925e4931e7250f5be308
RMD160 (tme-0.4.tar.gz) = a5b5ac56c8247f94cd96c92a04a6cb132ba92931
Size (tme-0.4.tar.gz) = 1448981 bytes
-SHA1 (patch-aa) = 0f8cdd5efe8dab297d6369c7d6508bd1902c3bc2
+SHA1 (patch-aa) = 0fe6c37472caa876c253b9e8bb4e09cd278e5def
SHA1 (patch-ac) = 885286eb6893d5af9769791805d054212b6d0db5
SHA1 (patch-ad) = 3f5adbaa94e5b97ded14e9a05cce912ed01f406f
SHA1 (patch-ae) = 2f472a55f5afd1c0079349ce49bd3eb251ea9d76
diff --git a/emulators/tme/patches/patch-aa b/emulators/tme/patches/patch-aa
index c02f761c36d..f1523dd5c06 100644
--- a/emulators/tme/patches/patch-aa
+++ b/emulators/tme/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/07/27 07:29:26 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/05 20:50:12 rillig Exp $
--- tme/threads.h.orig 2003-06-27 21:09:10.000000000 +0000
+++ tme/threads.h
-@@ -41,6 +41,7 @@ _TME_RCSID("$Id: threads.h,v 1.6 2003/06
+@@ -41,6 +41,7 @@
/* includes: */
#include <errno.h>
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 1cda943fd28..984a85392c5 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/01 20:08:00 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:12 rillig Exp $
#
DISTNAME= twin-src-3.1.14
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/twin
GNU_CONFIGURE= yes
USE_TOOLS+= autoconf213 gmake
BUILD_TARGET= depend world
-CONFIGURE_ARGS= --enable-debugger
+CONFIGURE_ARGS+= --enable-debugger
.include "../../mk/x11.buildlink3.mk"
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 3bc10861608..248908f5279 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2005/10/14 22:15:49 kristerw Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:12 rillig Exp $
DISTNAME= uae-0.8.25
-PKGNAME= ${DISTNAME}
CATEGORIES= emulators
MASTER_SITES= http://www.freiburg.linux.de/~uae/bin/sources/develop/
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index ad641aa91e8..a15231c799a 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:12 rillig Exp $
DISTNAME= VMware-workstation-3.2.1-2242
PKGNAME= vmware-3.2.1pl1
@@ -95,5 +95,5 @@ post-install:
${ECHO} "xkeymap.usekeycodeMapIfXFree86 = true"; \
) > ${VMWARE_CFG_DIR}/config
-.include "../suse_linux/Makefile.application"
+.include "../../emulators/suse_linux/Makefile.application"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 76a618628c3..0265b9e6ae3 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2005/10/26 08:32:59 adam Exp $
+# $NetBSD: Makefile,v 1.94 2005/12/05 20:50:13 rillig Exp $
DISTNAME= wine-0.9
CATEGORIES= emulators
@@ -13,7 +13,7 @@ COMMENT= Free implementation of Windows on Unix (still alpha)
BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge
ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+= FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386
+ONLY_FOR_PLATFORM+= FreeBSD-*-i386 Linux-*-i386 SunOS-*-i386 Darwin-*-i386
WRKSRC= ${WRKDIR}/${DISTNAME:S/W/w/}
USE_LIBTOOL= yes
@@ -30,7 +30,7 @@ REPLACE_PERL= tools/winemaker tools/winedump/function_grep.pl
# buildlink directory, so prepend all of the LDFLAGS necessary to link
# against the libraries.
#
-CONFIGURE_ENV+= X_LIBS="${LDFLAGS}"
+CONFIGURE_ENV+= X_LIBS=${LDFLAGS:M*:Q}
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\""
LIBS+= ${LDFLAGS}
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
index ccab5fd6617..7481ae747a2 100644
--- a/emulators/xbeeb/Makefile
+++ b/emulators/xbeeb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= xbeeb-0.3.6
@@ -18,7 +18,7 @@ MAN_PAGE= ${WRKDIR}/xbeeb.1
XBEEBROOT= share/xbeeb
MESSAGE_SUBST+= XBEEBROOT=${XBEEBROOT}
-PLIST_SUBST+= XBEEBROOT=${XBEEBROOT}
+PLIST_SUBST+= XBEEBROOT=${XBEEBROOT:Q}
INSTALLATION_DIRS= bin man/man1
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 2bcad6bf750..27aa8a2fafa 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2005/12/03 10:57:48 kristerw Exp $
+# $NetBSD: Makefile,v 1.139 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= xmame-0.102
@@ -28,7 +28,7 @@ SPOOLDIR= ${VARBASE}/games/${TARGET}
MAKE_FLAGS+= TARGET="${TARGET:S/x//}"
MAKE_FLAGS+= LIBS="${LDFLAGS} ${LIBS}"
-MAKE_FLAGS+= CFLAGS="${CFLAGS}"
+MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
MAKE_FLAGS+= X11INC= X11LIB=
# Network support is broken since xmame-0.85
@@ -56,7 +56,7 @@ MAME_ARCH.DragonFly?= dragonfly
MAME_ARCH.${OPSYS}?= generic
.endif
-MAKE_FLAGS+= DISPLAY_METHOD="${MAME_DISP_METHOD}"
+MAKE_FLAGS+= DISPLAY_METHOD=${MAME_DISP_METHOD:Q}
MAKE_FLAGS+= MY_CPU="${MAME_CPU.${MACHINE_ARCH}}"
MAKE_FLAGS+= ARCH="${MAME_ARCH.${OPSYS}}"
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 095e918efac..a045a76c80b 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2005/12/03 10:58:22 kristerw Exp $
+# $NetBSD: Makefile,v 1.79 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= xmame-0.102
@@ -29,7 +29,7 @@ SPOOLDIR= ${VARBASE}/games/${TARGET}
MAKE_FLAGS+= TARGET="${TARGET:S/x//}"
MAKE_FLAGS+= LIBS="${LDFLAGS} ${LIBS}"
-MAKE_FLAGS+= CFLAGS="${CFLAGS}"
+MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
MAKE_FLAGS+= X11INC= X11LIB=
# Network support is broken since xmame-0.85
@@ -57,7 +57,7 @@ MAME_ARCH.DragonFly?= dragonfly
MAME_ARCH.${OPSYS}?= generic
.endif
-MAKE_FLAGS+= DISPLAY_METHOD="${MAME_DISP_METHOD}"
+MAKE_FLAGS+= DISPLAY_METHOD=${MAME_DISP_METHOD:Q}
MAKE_FLAGS+= MY_CPU="${MAME_CPU.${MACHINE_ARCH}}"
MAKE_FLAGS+= ARCH="${MAME_ARCH.${OPSYS}}"
diff --git a/emulators/z26/Makefile b/emulators/z26/Makefile
index 1234ec226a4..f342aa0fb7a 100644
--- a/emulators/z26/Makefile
+++ b/emulators/z26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/21 03:49:56 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= z26v213
@@ -12,7 +12,7 @@ COMMENT= Atari 2600 Emulator
BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
-ONLY_FOR_PLATFORM+= *-i386
+ONLY_FOR_PLATFORM+= *-*-i386
WRKSRC= ${WRKDIR}/z26_snapshot-20040523
USE_TOOLS+= gmake perl
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index 2c298f846d2..1bfd1ad3ace 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/06 06:19:19 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:13 rillig Exp $
DISTNAME= gnucash-docs-1.8.5
CATEGORIES= finance
@@ -9,7 +9,7 @@ MAINTAINER= jdolecek@NetBSD.org
HOMEPAGE= http://www.gnucash.org/
COMMENT= Documentation for GnuCash - personal double-entry accounting program
-BUILD_DEPENDS= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
BUILDLINK_DEPMETHOD.libxml2= build
BUILDLINK_DEPMETHOD.libxslt= build
diff --git a/finance/xfinans/Makefile b/finance/xfinans/Makefile
index 4aed74bfe3f..f682571cd21 100644
--- a/finance/xfinans/Makefile
+++ b/finance/xfinans/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/08 16:49:35 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= xfinans-5.9
@@ -9,7 +9,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.io.com/~acroyear/xfinans/
COMMENT= Xfinans is a useful financial tracking, and account balancing tool
-DEPENDS= gnuplot>=3.7:../../graphics/gnuplot
+DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
WRKSRC= ${WRKDIR}/Xfinans/Src
USE_IMAKE= yes
diff --git a/fonts/XFree86-fontsEncodings/Makefile b/fonts/XFree86-fontsEncodings/Makefile
index e6cc29cbae2..1ab59c20aa1 100644
--- a/fonts/XFree86-fontsEncodings/Makefile
+++ b/fonts/XFree86-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:21 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:13 rillig Exp $
DISTNAME= XFree86-${XF_VER}-src-4
PKGNAME= XFree86-fontsEncodings-${XF_VER}
@@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 Encoding fonts
-BUILD_DEPENDS= XFree86-clients>=${XF_VER}:../../x11/XFree86-clients
+BUILD_DEPENDS+= XFree86-clients>=${XF_VER}:../../x11/XFree86-clients
NO_XFREE86_TARGETS= yes
WRKSRC= ${WRKDIR}/xc/fonts/encodings
diff --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile
index 48622ac6279..dd066242975 100644
--- a/fonts/XFree86-fontsScalable/Makefile
+++ b/fonts/XFree86-fontsScalable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:21 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:13 rillig Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-fontsScalable-${XF_VER}
@@ -22,7 +22,6 @@ do-install:
.for fnt in ${FONT_TYPES}
${INSTALL_DATA_DIR} ${X11ROOT}/lib/X11/fonts/${fnt}
.endfor
-.undef fnt
${INSTALL_DATA} ${WRKDIR}/xc/fonts/scaled/Speedo/font0*.spd \
${X11ROOT}/lib/X11/fonts/Speedo
${INSTALL_DATA} ${WRKDIR}/xc/fonts/scaled/Speedo/COPYRIGHT \
@@ -35,13 +34,11 @@ do-install:
${INSTALL_DATA} ${WRKDIR}/xc/fonts/scaled/Type1/*.${f} \
${X11ROOT}/lib/X11/fonts/Type1
.endfor
-.undef f
# because fonts.mk does not do this yet
.for fnt in ${FONT_TYPES}
${X11ROOT}/bin/mkfontscale ${X11ROOT}/lib/X11/fonts/${fnt}
${X11ROOT}/bin/mkfontdir ${X11ROOT}/lib/X11/fonts/${fnt}
.endfor
-.undef fnt
${X11ROOT}/bin/mkfontdir -e ${X11ROOT}/lib/X11/fonts/encodings \
-e ${X11ROOT}/lib/X11/fonts/encodings/large \
${X11ROOT}/lib/X11/fonts/Speedo \
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index deddbcfa720..2fcfdc4e965 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/10/15 16:55:32 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:13 rillig Exp $
DISTNAME= libXft-2.1.7
PKGNAME= Xft2-2.1.7
@@ -17,7 +17,7 @@ USE_LIBTOOL= YES
USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE= xft.pc.in
-MAKE_ENV+= EGREP="${EGREP}"
+MAKE_ENV+= EGREP=${EGREP:Q}
BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2
BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2
diff --git a/fonts/acroread-chsfont/Makefile b/fonts/acroread-chsfont/Makefile
index 456eb9002ab..f45a2f992e5 100644
--- a/fonts/acroread-chsfont/Makefile
+++ b/fonts/acroread-chsfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= chsfont
@@ -12,4 +12,4 @@ DEPENDS+= acroread-font-share-4.0:../../fonts/acroread-font-share
WRKSRC= ${WRKDIR}/CHSKIT
TAR_FILE= ${WRKSRC}/LANGCHS.TAR
-.include "../acroread-font-share/Makefile.common"
+.include "../../fonts/acroread-font-share/Makefile.common"
diff --git a/fonts/acroread-chtfont/Makefile b/fonts/acroread-chtfont/Makefile
index 6cbaec1f3a5..b340f0328b7 100644
--- a/fonts/acroread-chtfont/Makefile
+++ b/fonts/acroread-chtfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= chtfont
@@ -12,4 +12,4 @@ DEPENDS+= acroread-font-share-4.0:../../fonts/acroread-font-share
WRKSRC= ${WRKDIR}/CHTKIT
TAR_FILE= ${WRKSRC}/LANGCHT.TAR
-.include "../acroread-font-share/Makefile.common"
+.include "../../fonts/acroread-font-share/Makefile.common"
diff --git a/fonts/acroread-font-share/Makefile b/fonts/acroread-font-share/Makefile
index 3ebf65c90d4..4709343d7d4 100644
--- a/fonts/acroread-font-share/Makefile
+++ b/fonts/acroread-font-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= font-share
@@ -11,9 +11,9 @@ COMMENT= Asian Font Packs for Acrobat Reader 4.0 (common base)
WRKSRC= ${WRKDIR}/KORKIT
TAR_FILE= ${WRKSRC}/LANGCOM.TAR
-PLIST_SUBST+= MKDIR="${MKDIR}" CHOWN="${CHOWN}" CHMOD="${CHMOD}" \
- SHAREOWN="${SHAREOWN}" SHAREGRP="${SHAREGRP}" \
- SHAREMODE="${SHAREMODE}"
+PLIST_SUBST+= MKDIR=${MKDIR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \
+ SHAREOWN=${SHAREOWN:Q} SHAREGRP=${SHAREGRP:Q} \
+ SHAREMODE=${SHAREMODE:Q}
pre-install:
@${INSTALL_DATA_DIR} ${PREFIX}/Acrobat4/Resource
diff --git a/fonts/acroread-jpnfont/Makefile b/fonts/acroread-jpnfont/Makefile
index c6943f7428f..0caf519802d 100644
--- a/fonts/acroread-jpnfont/Makefile
+++ b/fonts/acroread-jpnfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:16 agc Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= jpnfont
@@ -23,4 +23,4 @@ _FETCH_MESSAGE= \
${ECHO} " http://www.adobe.com/prodindex/acrobat/readstep.html"; \
${ECHO} "======================================================="
-.include "../acroread-font-share/Makefile.common"
+.include "../../fonts/acroread-font-share/Makefile.common"
diff --git a/fonts/acroread-korfont/Makefile b/fonts/acroread-korfont/Makefile
index f03528c1103..b6ab6da37ec 100644
--- a/fonts/acroread-korfont/Makefile
+++ b/fonts/acroread-korfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:16 agc Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= korfont
@@ -12,4 +12,4 @@ DEPENDS+= acroread-font-share-4.0:../../fonts/acroread-font-share
WRKSRC= ${WRKDIR}/KORKIT
TAR_FILE= ${WRKSRC}/LANGKOR.TAR
-.include "../acroread-font-share/Makefile.common"
+.include "../../fonts/acroread-font-share/Makefile.common"
diff --git a/fonts/acroread5-chsfont/Makefile b/fonts/acroread5-chsfont/Makefile
index 9e49c8b6f88..615e966c23d 100644
--- a/fonts/acroread5-chsfont/Makefile
+++ b/fonts/acroread5-chsfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= chsfont
@@ -12,4 +12,4 @@ DEPENDS+= acroread5-font-share-5.0:../../fonts/acroread5-font-share
WRKSRC= ${WRKDIR}/CHSKIT
TAR_FILE= ${WRKSRC}/LANGCHS.TAR
-.include "../acroread5-font-share/Makefile.common"
+.include "../../fonts/acroread5-font-share/Makefile.common"
diff --git a/fonts/acroread5-chtfont/Makefile b/fonts/acroread5-chtfont/Makefile
index 4aaf3aad1b8..9a5c8df8474 100644
--- a/fonts/acroread5-chtfont/Makefile
+++ b/fonts/acroread5-chtfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/21 07:00:57 snj Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= chtfont
@@ -12,4 +12,4 @@ DEPENDS+= acroread5-font-share-5.0:../../fonts/acroread5-font-share
WRKSRC= ${WRKDIR}/CHTKIT
TAR_FILE= ${WRKSRC}/LANGCHT.TAR
-.include "../acroread5-font-share/Makefile.common"
+.include "../../fonts/acroread5-font-share/Makefile.common"
diff --git a/fonts/acroread5-font-share/Makefile b/fonts/acroread5-font-share/Makefile
index 5f5429d0822..befb2378559 100644
--- a/fonts/acroread5-font-share/Makefile
+++ b/fonts/acroread5-font-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:13 rillig Exp $
#
DISTNAME= font-share
@@ -11,8 +11,8 @@ COMMENT= Asian Font Packs for Acrobat Reader 5 (common base)
WRKSRC= ${WRKDIR}/KORKIT
TAR_FILE= ${WRKSRC}/LANGCOM.TAR
-PLIST_SUBST+= MKDIR="${MKDIR}" CHOWN="${CHOWN}" CHMOD="${CHMOD}" \
- SHAREOWN="${SHAREOWN}" SHAREGRP="${SHAREGRP}" \
- SHAREMODE="${SHAREMODE}"
+PLIST_SUBST+= MKDIR=${MKDIR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \
+ SHAREOWN=${SHAREOWN:Q} SHAREGRP=${SHAREGRP:Q} \
+ SHAREMODE=${SHAREMODE:Q}
.include "./Makefile.common"
diff --git a/fonts/acroread5-jpnfont/Makefile b/fonts/acroread5-jpnfont/Makefile
index d09eee0f78e..c6836e0134f 100644
--- a/fonts/acroread5-jpnfont/Makefile
+++ b/fonts/acroread5-jpnfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:16 agc Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= jpnfont
@@ -12,4 +12,4 @@ DEPENDS+= acroread5-font-share-5.0:../../fonts/acroread5-font-share
WRKSRC= ${WRKDIR}/JPNKIT
TAR_FILE= ${WRKSRC}/LANGJPN.TAR
-.include "../acroread5-font-share/Makefile.common"
+.include "../../fonts/acroread5-font-share/Makefile.common"
diff --git a/fonts/acroread5-korfont/Makefile b/fonts/acroread5-korfont/Makefile
index 0c69eed6643..e4b28de6193 100644
--- a/fonts/acroread5-korfont/Makefile
+++ b/fonts/acroread5-korfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:17 agc Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= korfont
@@ -12,4 +12,4 @@ DEPENDS+= acroread5-font-share-5.0:../../fonts/acroread5-font-share
WRKSRC= ${WRKDIR}/KORKIT
TAR_FILE= ${WRKSRC}/LANGKOR.TAR
-.include "../acroread5-font-share/Makefile.common"
+.include "../../fonts/acroread5-font-share/Makefile.common"
diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index ce2e488ca54..3bef15603d4 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= chkfontpath-1.9.7
@@ -12,7 +12,7 @@ COMMENT= Command line tool to manage X server's font path
BUILD_DEPENDS+= rpm2cpio>=1.1:../../converters/rpm2cpio
-MAKE_ENV+= VERSION=${PKGVERSION}
+MAKE_ENV+= VERSION=${PKGVERSION:Q}
USE_TOOLS+= gmake gtar
INSTALLATION_DIRS= bin man/man8
diff --git a/fonts/ec-fonts-mftraced/Makefile b/fonts/ec-fonts-mftraced/Makefile
index 0d105451c1c..7f6960942d4 100644
--- a/fonts/ec-fonts-mftraced/Makefile
+++ b/fonts/ec-fonts-mftraced/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/13 05:30:10 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= ec-fonts-mftraced-1.0.8
@@ -14,8 +14,8 @@ USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
-MAKE_ENV+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX}
-MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX}
+MAKE_ENV+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:Q}
+MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q}
.include "../../fonts/mftrace/buildlink3.mk"
.include "../../print/teTeX/module.mk"
diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile
index 051734f0607..270f1ea9ef8 100644
--- a/fonts/efont-unicode/Makefile
+++ b/fonts/efont-unicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/11/08 18:22:09 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:14 rillig Exp $
DISTNAME= efont-unicode-bdf-0.4.2
PKGNAME= ${DISTNAME:S/-bdf//}
@@ -14,7 +14,7 @@ USE_X11BASE= YES
USE_TOOLS+= gzip mkfontdir:run
MESSAGE_SUBST+= FONTDIR=${FONTDIR}
-PLIST_SUBST+= FONTDIR=${FONTDIR}
+PLIST_SUBST+= FONTDIR=${FONTDIR:Q}
FONTS= b10 b10_b b10_bi b10_i\
b12 b12_b b12_bi b12_i\
diff --git a/fonts/freefont-ttf/Makefile b/fonts/freefont-ttf/Makefile
index ebddf459e96..6b468923e3a 100644
--- a/fonts/freefont-ttf/Makefile
+++ b/fonts/freefont-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/20 00:59:45 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= freefont-ttf
@@ -10,7 +10,7 @@ MAINTAINER= reed@reedmedia.net
HOMEPAGE= http://www.nongnu.org/freefont/
COMMENT= Free UCS Outline Fonts: FreeMono, FreeSans, and FreeSerif
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile
index b04b9a7ba32..a9708c711e2 100644
--- a/fonts/ghostscript-cidfonts/Makefile
+++ b/fonts/ghostscript-cidfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:20 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:14 rillig Exp $
DISTNAME= ghostscript-cidfonts-20000901
PKGREVISION= 1
@@ -25,9 +25,9 @@ USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
-FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR}
-FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR}
-FILES_SUBST+= PKG_INFO=${PKG_TOOLS_BIN}/pkg_info
+FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q}
+FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q}
+FILES_SUBST+= PKG_INFO=${PKG_INFO:Q}
REQD_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont
diff --git a/fonts/ghostscript-cmaps/Makefile b/fonts/ghostscript-cmaps/Makefile
index 6828d1d1d9c..93d61651e1e 100644
--- a/fonts/ghostscript-cmaps/Makefile
+++ b/fonts/ghostscript-cmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/11/28 06:41:20 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:14 rillig Exp $
DISTNAME= ghostscript-cmaps-20020913
PKGREVISION= 1
@@ -25,9 +25,9 @@ USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
-FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR}
-FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR}
-FILES_SUBST+= PKG_INFO=${PKG_TOOLS_BIN}/pkg_info
+FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q}
+FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q}
+FILES_SUBST+= PKG_INFO=${PKG_INFO:Q}
REQD_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CMap
diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile
index d4c976fea54..5b8ec868a8d 100644
--- a/fonts/ja-kappa20/Makefile
+++ b/fonts/ja-kappa20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:14 rillig Exp $
DISTNAME= Kappa20-0.394
PKGNAME= ja-kappa20-0.394
@@ -18,8 +18,8 @@ USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= FONTDIR=${FONTDIR}
-FILES_SUBST+= ALIAS_KAPPA=${ALIAS_KAPPA}
+FILES_SUBST+= FONTDIR=${FONTDIR:Q}
+FILES_SUBST+= ALIAS_KAPPA=${ALIAS_KAPPA:Q}
# do not build experimental JIS X 0213 font.
BUILD_TARGET= default
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index 478ae1a677d..656b5189efc 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:10 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= shinonome-0.9.10-src
@@ -23,8 +23,8 @@ USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= FONTDIR=${FONTDIR}
-FILES_SUBST+= ALIAS_SHINONOME=${ALIAS_SHINONOME}
+FILES_SUBST+= FONTDIR=${FONTDIR:Q}
+FILES_SUBST+= ALIAS_SHINONOME=${ALIAS_SHINONOME:Q}
CONFIGURE_ARGS+= --with-fontdir=${FONTDIR}
CONFIGURE_ARGS+= --disable-progressbar
diff --git a/fonts/ko-baekmuk/Makefile b/fonts/ko-baekmuk/Makefile
index a8c91072776..a2ad4850e4d 100644
--- a/fonts/ko-baekmuk/Makefile
+++ b/fonts/ko-baekmuk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/08 18:22:09 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= baekmuk-2.0
@@ -16,7 +16,7 @@ CONFLICTS+= ksc5601fonts-[0-9]*
USE_X11BASE= yes
USE_TOOLS+= gzip mkfontdir:run
-MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
+MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
# fonts
BAEKMUK_BDF= batang10.bdf batang10b.bdf batang12.bdf batang12b.bdf \
diff --git a/fonts/ko-hanyang/Makefile b/fonts/ko-hanyang/Makefile
index 38de6dd5a6f..c4b775ccc9a 100644
--- a/fonts/ko-hanyang/Makefile
+++ b/fonts/ko-hanyang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/11/08 18:22:09 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= hanyang-font-pcf
@@ -16,7 +16,7 @@ USE_X11BASE= yes
USE_TOOLS+= gzip mkfontdir:run
EXTRACT_ONLY= # empty
-MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
+MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
# fonts
EXTRACT_ONLY+= hanyang-font-pcf.tar.gz
diff --git a/fonts/ko-kaist/Makefile b/fonts/ko-kaist/Makefile
index 4b3014a7cb3..bf55a8a032e 100644
--- a/fonts/ko-kaist/Makefile
+++ b/fonts/ko-kaist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/11/08 18:22:09 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= ko-kaist-20010718
@@ -16,7 +16,7 @@ USE_X11BASE= yes
USE_TOOLS+= gzip gunzip mkfontdir:run
EXTRACT_ONLY= # empty
-MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
+MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
FONTDIR=${PREFIX}/lib/X11/fonts/local
diff --git a/fonts/ko-mizi/Makefile b/fonts/ko-mizi/Makefile
index f28ebd827fc..b8d3234f194 100644
--- a/fonts/ko-mizi/Makefile
+++ b/fonts/ko-mizi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/08 18:22:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= xfntmizi-1.1-2.noarch
@@ -17,7 +17,7 @@ CONFLICTS+= ksc5601fonts-[0-9]*
USE_X11BASE= yes
USE_TOOLS+= gzip gunzip mkfontdir:run
-MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
+MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
# fonts
MIZI_PCF= mzgt16e.pcf mzgt16h1.pcf mzmj16h.pcf mzpg16h.pcf mzsm16h.pcf \
diff --git a/fonts/mftrace/Makefile b/fonts/mftrace/Makefile
index 5b7bfb00488..ba874d79671 100644
--- a/fonts/mftrace/Makefile
+++ b/fonts/mftrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/08 19:49:52 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:14 rillig Exp $
DISTNAME= mftrace-1.1.1
PKGREVISION= 1
@@ -16,10 +16,10 @@ DEPENDS+= t1utils>=1.27:../../fonts/t1utils
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
MAKEFILE= GNUmakefile
-PLIST_SUBST+= PYSITELIB=${PYSITELIB}
+PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
INSTALLATION_DIRS= bin man/man1 ${PYSITELIB}
diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile
index ffad3444d00..41ff8e346b5 100644
--- a/fonts/py-fonttools/Makefile
+++ b/fonts/py-fonttools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/27 16:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= fonttools-2.0b1
@@ -14,7 +14,7 @@ COMMENT= Library for manipulating fonts
WRKSRC= ${WRKDIR}/fonttools
PYDISTUTILSPKG= yes
-PLIST_SUBST+= FONTTOOLSPTH=${FONTTOOLSPTH}
+PLIST_SUBST+= FONTTOOLSPTH=${FONTTOOLSPTH:Q}
.include "../../lang/python/extension.mk"
.if !empty(PYPKGPREFIX:M*pth)
diff --git a/fonts/ttmkfdir2/Makefile b/fonts/ttmkfdir2/Makefile
index d1d5402a9a9..9266851b63a 100644
--- a/fonts/ttmkfdir2/Makefile
+++ b/fonts/ttmkfdir2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:14 rillig Exp $
#
DISTNAME= ttmkfdir2.20021109
@@ -19,7 +19,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake lex
USE_LANGUAGES= c c++
-MAKE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG}
+MAKE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}
LDFLAGS+= ${BUILDLINK_LDADD.getopt}
INSTALLATION_DIRS= bin
diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile
index ae141e641bb..fa092332497 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:14 rillig Exp $
DISTNAME= vfontcap-kochi-0.0
PKGREVISION= 1
@@ -22,7 +22,7 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
VFONTCAPDIR= ${PREFIX}/share/VFlib/2.24.2
-FILES_SUBST+= VFONTCAPDIR=${VFONTCAPDIR}
+FILES_SUBST+= VFONTCAPDIR=${VFONTCAPDIR:Q}
INSTALLATION_DIRS= share/VFlib/2.24.2
diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile
index 3c04d042dee..b4cb2c39b4e 100644
--- a/fonts/xmbdfed/Makefile
+++ b/fonts/xmbdfed/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:14 rillig Exp $
DISTNAME= xmbdfed-4.5
-PKGREVISION= #
CATEGORIES= fonts graphics x11
MASTER_SITES= ftp://crl.nmsu.edu/CLR/multiling/General/
diff --git a/fonts/xorg-fontsEncodings/Makefile.common b/fonts/xorg-fontsEncodings/Makefile.common
index ccdf9fc704a..42b24248fd0 100644
--- a/fonts/xorg-fontsEncodings/Makefile.common
+++ b/fonts/xorg-fontsEncodings/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2005/05/23 20:53:28 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/12/05 20:50:15 rillig Exp $
-.ifndef XORG_FONTSENCODINGS_COMMON
-XORG_FONTSENCODINGS_COMMON= defined
+.if !defined(XORG_FONTSENCODINGS_COMMON)
+XORG_FONTSENCODINGS_COMMON= # defined
BUILD_DEPENDS+= xorg-clients>=${XORG_VER}:../../x11/xorg-clients
diff --git a/games/REminiscence/Makefile b/games/REminiscence/Makefile
index 07ff884a1c0..f3016623570 100644
--- a/games/REminiscence/Makefile
+++ b/games/REminiscence/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/08 00:10:21 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:15 rillig Exp $
#
DISTNAME= REminiscence-0.1.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://membres.lycos.fr/cyxdown/reminiscence/
COMMENT= Engine to play Flashback by Delphine Software
BUILD_TARGET= rs
-MAKE_ENV+= DEFINES="${DEFINES}"
+MAKE_ENV+= DEFINES=${DEFINES:Q}
.include "../../mk/endian.mk"
.if ${MACHINE_ENDIAN} == "big"
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index ec8d144b7ea..c0b5bc4021a 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:15 rillig Exp $
DISTNAME= abuse_pd
PKGNAME= abuse-2.0
@@ -13,7 +13,7 @@ COMMENT= Full color 320x200 arcade quality platform shooter
USE_X11BASE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${X11_LDFLAGS}"
+CONFIGURE_ENV+= LDFLAGS=${X11_LDFLAGS:Q}
USE_TOOLS+= gmake gtar
USE_LANGUAGES+= c c++
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index 6ce0c4c2d25..6c593557739 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/11/10 06:30:53 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:15 rillig Exp $
#
DISTNAME= angband-3.0.3
@@ -16,7 +16,7 @@ CONFLICTS= angband-tty-[0-9]*
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
INCOMPAT_CURSES+= NetBSD-1.6[A-M]-*
SPOILERFILE= angband-spoilers.tar.gz
diff --git a/games/colchess-book-colchess/Makefile b/games/colchess-book-colchess/Makefile
index 0f3ba4b28e0..9a13d57d07a 100644
--- a/games/colchess-book-colchess/Makefile
+++ b/games/colchess-book-colchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:15 rillig Exp $
DISTNAME= colchess
PKGNAME= ${CHESS_ENGINE}-book-${DIST_SUBDIR}
@@ -20,8 +20,8 @@ DIST_SUBDIR= colchess-7.0
NO_CONFIGURE= yes
NO_BUILD= yes
-PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
-PLIST_SUBST+= BOOK_FILE=${BOOK_FILE}
+PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q}
+PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q}
BOOKDIR= ${PREFIX}/share/${CHESS_ENGINE}
BOOK_FILE= book.dat
diff --git a/games/colchess-book-large/Makefile b/games/colchess-book-large/Makefile
index 1190b4e27bf..6974a13a0d6 100644
--- a/games/colchess-book-large/Makefile
+++ b/games/colchess-book-large/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:15 rillig Exp $
DISTNAME= book_large
PKGNAME= ${CHESS_ENGINE}-book-large-20000512
@@ -18,8 +18,8 @@ CHESS_ENGINE= colchess
DIST_SUBDIR= chessbooks
NO_CONFIGURE= yes
-PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
-PLIST_SUBST+= BOOK_FILE=${BOOK_FILE}
+PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q}
+PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q}
BOOKDIR= ${PREFIX}/share/${CHESS_ENGINE}
BOOK_FILE= book.dat
diff --git a/games/colchess/Makefile b/games/colchess/Makefile
index a3fd4ccc26c..e3cc2c2820e 100644
--- a/games/colchess/Makefile
+++ b/games/colchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/10 06:32:38 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:15 rillig Exp $
DISTNAME= colchess
PKGNAME= ${DISTNAME}-7.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.ast.cam.ac.uk/~cmf/chess/colchess/
COMMENT= Chess analysis engine
DIST_SUBDIR= ${PKGNAME_NOREV}
-MAKE_ENV+= PREFIX="${PREFIX}"
+MAKE_ENV+= PREFIX=${PREFIX:Q}
NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}/ColChess
diff --git a/games/crafty-book-medium/Makefile b/games/crafty-book-medium/Makefile
index 284c1fbeefb..630184712d5 100644
--- a/games/crafty-book-medium/Makefile
+++ b/games/crafty-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:15 rillig Exp $
DISTNAME= medium
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -18,8 +18,8 @@ CHESS_ENGINE= crafty
DIST_SUBDIR= chessbooks
NO_CONFIGURE= yes
-PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
-PLIST_SUBST+= BOOK_FILE=${BOOK_FILE}
+PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q}
+PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q}
BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE}
PGN_FILE= book.txt
diff --git a/games/crafty-book-small/Makefile b/games/crafty-book-small/Makefile
index 68741b74224..b88b072c5f1 100644
--- a/games/crafty-book-small/Makefile
+++ b/games/crafty-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:15 rillig Exp $
DISTNAME= small
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -18,8 +18,8 @@ CHESS_ENGINE= crafty
DIST_SUBDIR= chessbooks
NO_CONFIGURE= yes
-PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
-PLIST_SUBST+= BOOK_FILE=${BOOK_FILE}
+PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q}
+PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q}
BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE}
PGN_FILE= ${DISTNAME}.txt
diff --git a/games/crafty-doc/Makefile b/games/crafty-doc/Makefile
index 3f893350b81..4b33c151a49 100644
--- a/games/crafty-doc/Makefile
+++ b/games/crafty-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:15 rillig Exp $
DISTNAME= crafty-doc-18.0
CATEGORIES= games
@@ -8,7 +8,7 @@ DISTFILES= crafty.doc.ps
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Documentation for Crafty chess engine
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index d5644711dcb..5236b7b07c5 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:15 rillig Exp $
DISTNAME= crafty-18.15
CATEGORIES= games
@@ -46,7 +46,7 @@ BUILD_TARGET= generic
CRAFTY_OPTS= -DBOOKDIR=\\\"${BOOKDIR}\\\"
CRAFTY_OPTS+= -DTBDIR=\\\"${TBDIR}\\\"
-MAKE_ENV+= opt="${CRAFTY_OPTS}"
+MAKE_ENV+= opt=${CRAFTY_OPTS:Q}
BOOKDIR= ${PREFIX}/lib/crafty
TBDIR= ${PREFIX}/share/egtb
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index d8183466bf9..002b036a517 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 20:50:15 rillig Exp $
DISTNAME= dopewars-1.5.10
CATEGORIES= games
@@ -22,8 +22,8 @@ CONFIGURE_ARGS+= --without-esd
CONFIGURE_ARGS+= --without-sdl
CONFIGURE_ARGS+= --localstatedir=${VARBASE}/games
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
-INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
+INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-*
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/games/exchess-book-medium/Makefile b/games/exchess-book-medium/Makefile
index 173d9f7cf72..2e18dc92b68 100644
--- a/games/exchess-book-medium/Makefile
+++ b/games/exchess-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:15 rillig Exp $
DISTNAME= medium
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -18,8 +18,8 @@ CHESS_ENGINE= exchess
DIST_SUBDIR= chessbooks
NO_CONFIGURE= yes
-PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
-PLIST_SUBST+= BOOK_FILE=${BOOK_FILE}
+PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q}
+PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q}
BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE}
PGN_FILE= book.txt
diff --git a/games/exchess-book-small/Makefile b/games/exchess-book-small/Makefile
index 399774a380c..872dfd137fb 100644
--- a/games/exchess-book-small/Makefile
+++ b/games/exchess-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:15 rillig Exp $
DISTNAME= small
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -18,8 +18,8 @@ CHESS_ENGINE= exchess
DIST_SUBDIR= chessbooks
NO_CONFIGURE= yes
-PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
-PLIST_SUBST+= BOOK_FILE=${BOOK_FILE}
+PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q}
+PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q}
BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE}
PGN_FILE= ${DISTNAME}.txt
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 71d5710bd1a..478aa354f3c 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/09/04 05:00:36 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:15 rillig Exp $
#
DISTNAME= fillets-ng-0.6.0
@@ -15,7 +15,7 @@ DEPENDS+= fillets-ng-data-0.6.1:../../games/fillets-ng-data
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-SUBST_CLASSES= man
+SUBST_CLASSES+= man
SUBST_STAGE.man= post-patch
SUBST_FILES.man= fillets.6
SUBST_MESSAGE.man= "Fixing documentation path in the manual page."
diff --git a/games/fkiss/distinfo b/games/fkiss/distinfo
index b3f88e6a7f4..07598316ded 100644
--- a/games/fkiss/distinfo
+++ b/games/fkiss/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/06/16 13:05:55 hira Exp $
+$NetBSD: distinfo,v 1.9 2005/12/05 20:50:16 rillig Exp $
SHA1 (fkiss-0.33.tar.gz) = df07895a6b2053ca505dce49f5a6ac3f745f4386
RMD160 (fkiss-0.33.tar.gz) = a34f3fba759e64079b4926926af368c502dc35ae
@@ -8,6 +8,6 @@ RMD160 (fkiss-0.33a.diff) = f0d221efc08a4ad27312493def0911698909770d
Size (fkiss-0.33a.diff) = 8909 bytes
SHA1 (patch-ab) = b22fcd06b72b85ae413ecb970e43d76532ecc65e
SHA1 (patch-ac) = db3e28fec1a4b1a7ff620023bbf6cf70b6dd99af
-SHA1 (patch-ad) = b6d7f79864a48e4dfb52c30cd9d31c1bbe069a34
+SHA1 (patch-ad) = f2a63883a36a53215253c3cd0c30ce1f4b759401
SHA1 (patch-ae) = 4eafc6445da6d2512cfc66df88015287320a6fc6
SHA1 (patch-af) = 68ede499a9747228497c91ae462504ff94097c38
diff --git a/games/fkiss/patches/patch-ad b/games/fkiss/patches/patch-ad
index fb3708d2f6f..ef8bf0d3cc9 100644
--- a/games/fkiss/patches/patch-ad
+++ b/games/fkiss/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2003/12/04 03:22:49 ben Exp $
+$NetBSD: patch-ad,v 1.5 2005/12/05 20:50:16 rillig Exp $
--- sound.c.orig 2001-11-11 23:05:37.000000000 -0800
+++ sound.c
-@@ -57,6 +57,12 @@ char id_sound[] = "$Id: sound.c,v 1.21 2
+@@ -57,6 +57,12 @@
# include <machine/soundcard.h>
#endif
diff --git a/games/fortunes-calvin/DESCR b/games/fortunes-calvin/DESCR
index c8792d2da6e..1f8c2c37d7d 100644
--- a/games/fortunes-calvin/DESCR
+++ b/games/fortunes-calvin/DESCR
@@ -1,2 +1,2 @@
A compilation of quotes from Bill Watterson's fantastic "Calvin and Hobbes"
-Comic Books.
+Comic Books.
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 0a1072aedb0..785a7640b69 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/24 10:45:32 adam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:16 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
COMMENT= Freeciv client with Xaw interface
@@ -11,7 +11,7 @@ CONFLICTS= freeciv-client-gtk<=1.11.4
CONFIGURE_ARGS+= --disable-make-data
CONFIGURE_ARGS+= --disable-server
-.include "../freeciv-share/Makefile.common"
+.include "../../games/freeciv-share/Makefile.common"
.include "options.mk"
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 586035834e8..b156c8bdcb6 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/24 10:43:32 adam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:16 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= Freeciv game server
@@ -12,9 +12,9 @@ CONFIGURE_ARGS+= --with-readline
LIBS+= -ltermcap
# Uses rl_filename_completion_function() which was introduced in readline-4.2
-BUILDLINK_DEPENDS.readline= readline>=4.2
+BUILDLINK_DEPENDS.readline+= readline>=4.2
-.include "../freeciv-share/Makefile.common"
+.include "../../games/freeciv-share/Makefile.common"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/games/freeciv-sounds/Makefile b/games/freeciv-sounds/Makefile
index 13326993a30..146f46728fb 100644
--- a/games/freeciv-sounds/Makefile
+++ b/games/freeciv-sounds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/24 10:44:07 adam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:16 rillig Exp $
DISTNAME= stdsounds3
PKGNAME= freeciv-sounds-3.0
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.freeciv.org/
COMMENT= Freeciv sound sets
-DEPENDS= freeciv-share-[0-9]*:../../games/freeciv-share
+DEPENDS+= freeciv-share-[0-9]*:../../games/freeciv-share
WRKSRC= ${WRKDIR}/data
NO_BUILD= yes
diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index 20b04b52110..d04a0004de0 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/11/17 15:21:57 tonio Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:16 rillig Exp $
#
DISTNAME= frozen-bubble-1.0.0
@@ -15,7 +15,7 @@ DEPENDS+= p5-SDL>=1.19.2:../../devel/p5-SDL
USE_TOOLS+= gmake perl:run
-MAKE_ENV+= PERL5="${PERL5}" CP="${CP}" INSTALLDIRS="vendor"
+MAKE_ENV+= PERL5=${PERL5:Q} CP=${CP:Q} INSTALLDIRS="vendor"
REPLACE_PERL= frozen-bubble*
PERL5_PACKLIST= auto/fb_c_stuff/.packlist
diff --git a/games/genecys-client/Makefile b/games/genecys-client/Makefile
index ad1a7631d9e..fd66c5b37dd 100644
--- a/games/genecys-client/Makefile
+++ b/games/genecys-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/23 04:02:48 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:16 rillig Exp $
#
DISTNAME= genecys-0.2
@@ -11,7 +11,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.genecys.org/
COMMENT= Client for Genecys MMORPG
-DEPENDS= genecys-data>=0.2:../../games/genecys-data
+DEPENDS+= genecys-data>=0.2:../../games/genecys-data
GNU_CONFIGURE= yes
#CONFIGURE_DIRS= ${WRKSRC}/common ${WRKSRC}/client
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index c7bfaf6d353..8c5b8f2f09a 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:16 rillig Exp $
#
DISTNAME= glaxium_0.5
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
BUILD_TARGET= glaxium
-SUBST_CLASSES= bill
+SUBST_CLASSES+= bill
SUBST_STAGE.bill= post-configure
SUBST_FILES.bill= conf.h
SUBST_SED.bill= -e "s,share\/games,share,g"
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 468c753fef1..f61cbf735b4 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/11/25 21:23:15 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2005/12/05 20:50:16 rillig Exp $
DISTNAME= gnome-games-2.12.1
PKGREVISION= 1
@@ -26,7 +26,7 @@ USE_PKGINSTALL= yes
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
+CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
# This package installs files in sysconfdir but does not read them directly,
# so the following configuration argument is safe.
@@ -39,9 +39,8 @@ CONF_FILES=
sound/events/iagno.soundlist
CONF_FILES+= ${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile}
.endfor
-.undef conffile
-FILES_SUBST+= INSTALL="${INSTALL}"
+FILES_SUBST+= INSTALL=${INSTALL:Q}
GCONF2_SCHEMAS= aisleriot.schemas
GCONF2_SCHEMAS+= blackjack.schemas
diff --git a/games/gnuchess-book-medium/Makefile b/games/gnuchess-book-medium/Makefile
index c6f21fd3ef2..3ec2e44f190 100644
--- a/games/gnuchess-book-medium/Makefile
+++ b/games/gnuchess-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:16 rillig Exp $
DISTNAME= medium
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -19,8 +19,8 @@ CHESS_ENGINE= gnuchess
DIST_SUBDIR= chessbooks
NO_CONFIGURE= yes
-PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
-PLIST_SUBST+= BOOK_FILE=${BOOK_FILE}
+PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q}
+PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q}
BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE}
PGN_FILE= book.txt
diff --git a/games/gnuchess-book/Makefile b/games/gnuchess-book/Makefile
index 9ba2cbaf83d..2b5c511810d 100644
--- a/games/gnuchess-book/Makefile
+++ b/games/gnuchess-book/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:16 rillig Exp $
#
DISTNAME= book_1.01.pgn
@@ -19,8 +19,8 @@ WRKSRC= ${WRKDIR}
CHESS_ENGINE= gnuchess
NO_CONFIGURE= yes
-PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
-PLIST_SUBST+= BOOK_FILE=${BOOK_FILE}
+PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q}
+PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q}
BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE}
PGN_FILE= ${DISTNAME}
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 345805b60e4..625e6d15849 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:16 rillig Exp $
DISTNAME= gtkballs-3.1.5
CATEGORIES= games
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE}/games
USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
-PLIST_SUBST+= VARBASE=${VARBASE}
+PLIST_SUBST+= VARBASE=${VARBASE:Q}
post-install:
${MV} ${PREFIX}/man/man6/gtkballs.6x ${PREFIX}/man/man6/gtkballs.6
diff --git a/games/hugo/Makefile b/games/hugo/Makefile
index c22d7ae8431..2ba71fe8d6f 100644
--- a/games/hugo/Makefile
+++ b/games/hugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:16 rillig Exp $
#
DISTNAME= hugov31_unix_source
@@ -16,8 +16,8 @@ SITES_hugolib.zip=${MASTER_SITE_IFARCHIVE:=programming/hugo/library/}
DIST_SUBDIR= ${PKGNAME_NOREV}
USE_TOOLS+= gmake
# uses halfkey (present since 1.6M)
-INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]* NetBSD-1.5* NetBSD-1.6 NetBSD-1.6.*
-INCOMPAT_CURSES+= NetBSD-1.6[A-L]*
+INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-* NetBSD-1.6.*-*
+INCOMPAT_CURSES+= NetBSD-1.6[A-L]*-*
WRKSRC= ${WRKDIR}/hugov3.1.02
LIBDIR= ${PREFIX}/share/hugo
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index d9ffa1037cb..b63e55900b5 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:16 rillig Exp $
#
DISTNAME= icebreaker-1.9.7
@@ -13,7 +13,7 @@ COMMENT= Penguin capturing simulation
USE_TOOLS+= gmake
MAKE_ENV+= mandir="${PREFIX}/man" highscoredir="/var/games"
-MAKE_ENV+= prefix="${PREFIX}"
+MAKE_ENV+= prefix=${PREFIX:Q}
INSTALLATION_DIRS= bin man/man6
diff --git a/games/knightcap-brain/Makefile b/games/knightcap-brain/Makefile
index 981cac89870..8779b817576 100644
--- a/games/knightcap-brain/Makefile
+++ b/games/knightcap-brain/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:16 rillig Exp $
DISTNAME= new_brain
PKGNAME= knightcap-brain-19980616
@@ -13,7 +13,7 @@ COMMENT= Book of losing moves for KnightCap
ONLY_FOR_PLATFORMS= *-*-i386
WRKSRC= ${WRKDIR}
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile
index f99b53aed73..1b9fb369f59 100644
--- a/games/knightcap/Makefile
+++ b/games/knightcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:16 rillig Exp $
DISTNAME= KnightCap-3.6
PKGNAME= knightcap-3.6
@@ -15,7 +15,7 @@ BUILD_TARGET= KnightCap
WRKSRC= ${WRKDIR}/Export
MAKE_ENV+= MESA=${BUILDLINK_PREFIX.MesaLib}
-MAKE_ENV+= DEFINES="${DEFINES}"
+MAKE_ENV+= DEFINES=${DEFINES:Q}
DEFINES= -DTB_DIR=\\\"${TBDIR}\\\"
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index e134e212403..4115b9073d7 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:16 rillig Exp $
DISTNAME= lbreakout-010315
PKGREVISION= 5
@@ -10,7 +10,7 @@ HOMEPAGE= http://lgames.sourceforge.net/
COMMENT= Breakout-style arcade game
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS:Q}
CONFIGURE_ARGS+= --disable-sound
.include "../../devel/SDL/buildlink3.mk"
diff --git a/games/level9/Makefile b/games/level9/Makefile
index a0c542200ef..bfa7b8afc30 100644
--- a/games/level9/Makefile
+++ b/games/level9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/11/01 14:39:45 dillo Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:16 rillig Exp $
DISTNAME= Level9_4.0_Source
PKGNAME= level9-4.0
@@ -12,8 +12,8 @@ COMMENT= Curses port of the Level 9 text adventure interpreter
WRKSRC= ${WRKDIR}/Unix
# uses halfkey (present since 1.6M)
-INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]* NetBSD-1.5* NetBSD-1.6-* NetBSD-1.6.*
-INCOMPAT_CURSES+= NetBSD-1.6[A-L]*
+INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-* NetBSD-1.6.*-*
+INCOMPAT_CURSES+= NetBSD-1.6[A-L]*-*
INSTALLATION_DIRS= bin
diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile
index b192b77fd30..b4f5d91b806 100644
--- a/games/maelstrom-sdl/Makefile
+++ b/games/maelstrom-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:17 rillig Exp $
#
DISTNAME= Maelstrom-3.0.5
@@ -15,7 +15,7 @@ CONFLICTS= maelstrom-x11-[0-9]* maelstrom-[0-9]*
GNU_CONFIGURE= YES
-MAKE_ENV+= CP=${CP}
+MAKE_ENV+= CP=${CP:Q}
post-install:
${RM} ${PREFIX}/share/doc/Maelstrom/Docs/Makefile \
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index 57d850f838e..2481db04f7a 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:52 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:17 rillig Exp $
DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz
PKGNAME= maelstrom-x11-2.0.6
@@ -22,7 +22,7 @@ EXTRACT_ONLY= ${DISTNAME}
WRKSRC= ${WRKDIR}/Maelstrom
USE_X11BASE= YES
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} XPMDIR=${BUILDLINK_PREFIX.xpm}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.xpm}
post-install:
cd ${PREFIX}/share/maelstrom && \
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index f91027af791..f738f16a4e3 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2005/11/24 20:32:34 rillig Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/05 20:50:17 rillig Exp $
#
-.include "../nethack-lib/Makefile.common"
+.include "../../games/nethack-lib/Makefile.common"
PKGNAME= nethack-qt-${NETHACK_VERSION}
PKGREVISION= 3
diff --git a/games/nethack-tty/Makefile b/games/nethack-tty/Makefile
index 2a8063540b0..b7f190f4446 100644
--- a/games/nethack-tty/Makefile
+++ b/games/nethack-tty/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/09/22 14:55:07 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:17 rillig Exp $
#
-.include "../nethack-lib/Makefile.common"
+.include "../../games/nethack-lib/Makefile.common"
PKGNAME= nethack-tty-${NETHACK_VERSION}
PKGREVISION= 1
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 6889a036c65..4d780f0d5f8 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2005/11/24 20:33:38 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:17 rillig Exp $
#
-.include "../nethack-lib/Makefile.common"
+.include "../../games/nethack-lib/Makefile.common"
PKGNAME= nethack-x11-${NETHACK_VERSION}
PKGREVISION= 1
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 596b7007be5..d0a31875599 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2005/09/22 14:55:07 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:17 rillig Exp $
# Needed so configure/patch rules don't get pulled in
NO_BUILD= yes
NO_CONFIGURE= yes
-.include "../nethack-lib/Makefile.common"
+.include "../../games/nethack-lib/Makefile.common"
DISTNAME= nethack-all-${NETHACK_VERSION}
CATEGORIES+= x11
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index e9b675bfd20..9c692208026 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:17 rillig Exp $
#
DISTNAME= nighthawk-2.1
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/nighthawk
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
-MAKE_ENV+= OSTYPE=${OPSYS}
+MAKE_ENV+= OSTYPE=${OPSYS:Q}
CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" \
-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" \
-DVARBASE="\"${VARBASE}\""
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 7112adc8bb0..343cea10ca1 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/26 16:35:05 rpaulo Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:17 rillig Exp $
DISTNAME= openttd-0.4.0.1-source
PKGNAME= openttd-0.4.0.1
@@ -14,14 +14,14 @@ USE_TOOLS+= gmake pkg-config
DATA_DIR= ${PREFIX}/share/games/openttd
-MAKE_ENV+= PREFIX=${PREFIX}
+MAKE_ENV+= PREFIX=${PREFIX:Q}
MAKE_ENV+= INSTALL=1
MAKE_ENV+= BINARY_DIR=bin
MAKE_ENV+= DATA_DIR=share/games/openttd
MAKE_ENV+= USE_HOMEDIR=1
MAKE_ENV+= PERSONAL_DIR=.openttd
MAKE_ENV+= WITH_NETWORK=1
-MAKE_ENV+= X11BASE=${X11BASE}
+MAKE_ENV+= X11BASE=${X11BASE:Q}
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index b8e92236321..fb9497d63d8 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/12 08:41:56 hira Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:17 rillig Exp $
#
DISTNAME= powermanga-0.79
@@ -13,7 +13,7 @@ COMMENT= Arcade 2D shoot-em-up game
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-MAKE_ENV+= TOUCH=${TOUCH} WRKSRC=${WRKSRC}
+MAKE_ENV+= TOUCH=${TOUCH:Q} WRKSRC=${WRKSRC:Q}
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index 377e8b059f1..6a049aaa083 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/20 11:38:20 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:17 rillig Exp $
#
DISTNAME= qnetwalk-1.2
@@ -27,7 +27,7 @@ do-configure:
(cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qnetwalk.pro)
# Fix hardcoded paths
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_MESSAGE.path= "Fixing hardcoded paths."
SUBST_STAGE.path= pre-configure
SUBST_FILES.path= qnetwalk.pro main.cpp mainwindow.cpp
diff --git a/games/quake/Makefile b/games/quake/Makefile
index ced2b632829..f080ddd296d 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:17 rillig Exp $
DISTNAME= q1source
PKGNAME= quake-2.30
@@ -18,11 +18,11 @@ ONLY_FOR_PLATFORM= *-*-i386
WRKSRC= ${WRKDIR}
USE_TOOLS+= gmake
-MAKE_ENV+= MAINDIR=${WRKSRC}
+MAKE_ENV+= MAINDIR=${WRKSRC:Q}
MAKE_ENV+= MESA_DIR=${BUILDLINK_PREFIX.Mesa}
-MAKE_ENV+= X11BASE=${X11BASE}
+MAKE_ENV+= X11BASE=${X11BASE:Q}
LDFLAGS+= ${LIBOSSAUDIO}
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 29dc1bd177a..b89ea470c38 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/08/10 01:33:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:17 rillig Exp $
#
DISTNAME= quake2-0.3
@@ -25,7 +25,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/docs/README* ${PREFIX}/share/doc/quake2forge
${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/quake2forge
-SUBST_CLASSES= snd data
+SUBST_CLASSES+= snd data
SUBST_STAGE.snd= post-patch
SUBST_FILES.snd= src/snd.c
SUBST_SED.snd= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index 2644b2e1273..fef3ed78d44 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:52 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:17 rillig Exp $
DISTNAME= quake-v6-bsd-kame
PKGNAME= quake6-0.0
@@ -10,7 +10,7 @@ MAINTAINER= itojun@kame.net
HOMEPAGE= http://www.viagenie.qc.ca/en/ipv6-quake.shtml
COMMENT= Quake over IPv6
-DEPENDS= quakedata-[0-9]*:../../games/quakedata
+DEPENDS+= quakedata-[0-9]*:../../games/quakedata
WRKSRC= ${WRKDIR}/quakeforge
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
BUILD_DEFS+= USE_INET6
.include "../../mk/bsd.prefs.mk"
.if !(defined(USE_INET6) && ${USE_INET6} == "YES")
-PKG_FAIL_REASON= "${PKGNAME} requires IPv6 support"
+PKG_FAIL_REASON+= "${PKGNAME} requires IPv6 support"
.endif
# "bindir" setting is very non-standard for GNU autoconf
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 32636b5f673..f6075dfa36b 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/16 15:35:51 adam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:17 rillig Exp $
DISTNAME= rocksndiamonds-3.1.1
CATEGORIES= games x11
@@ -14,7 +14,7 @@ USE_TOOLS+= gmake
INSTALLATION_DIRS= man/man6
PLIST_SRC= ${WRKDIR}/PLIST ../rocksndiamonds/PLIST
-PLIST_SUBST+= SCORE_PATH=${SCORE_PATH}
+PLIST_SUBST+= SCORE_PATH=${SCORE_PATH:Q}
PLIST_SUBST+= ROCK_INSTALL_DIR="${INSTALL} -d -o ${RND_USER} -g ${RND_GROUP} -m 775"
PKG_GROUPS= ${RND_GROUP}
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index f9c02ff4157..67136ed1d85 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/15 18:27:51 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:17 rillig Exp $
DISTNAME= Rollemup
PKGNAME= rollemup-1.0
@@ -37,8 +37,8 @@ ONLY_FOR_PLATFORM= *-*-i386
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
-DEPENDS= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
+DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
CHECK_SHLIBS= no
.endif
@@ -61,7 +61,7 @@ do-install:
@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
@(cd ${PREFIX}; \
${FIND} ${GAMES_DIR}/Rollemup -type f -print >> ${PLIST_SRC}; \
- for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d -print | sort -r`; do \
+ for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d -print | ${SORT} -r`; do \
${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \
done)
@${CHOWN} ${ROOT_USER}:games ${PREFIX}/bin/Rollemup
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index 2c5abe4183d..a944d63fd79 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:17 rillig Exp $
#
DISTNAME= sarien-0.7.0
@@ -14,7 +14,7 @@ GNU_CONFIGURE= YES
USE_PKGINSTALL= YES
USE_TOOLS+= gmake
-CONFIGURE_ARGS= --with-sdl
+CONFIGURE_ARGS+= --with-sdl
CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
EGDIR= ${PREFIX}/share/examples/sarien
diff --git a/games/sjeng/Makefile b/games/sjeng/Makefile
index fec91267b16..be9631859ba 100644
--- a/games/sjeng/Makefile
+++ b/games/sjeng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:57 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:17 rillig Exp $
DISTNAME= Sjeng-Free-11.0
PKGNAME= sjeng-11.0
@@ -24,7 +24,7 @@ DOCDIR= ${PREFIX}/share/doc/sjeng
EGDIR= ${PREFIX}/share/examples/sjeng
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
.endif
post-build:
diff --git a/games/sl/Makefile b/games/sl/Makefile
index 20caa5d8d26..c99da088920 100644
--- a/games/sl/Makefile
+++ b/games/sl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/24 18:24:45 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:17 rillig Exp $
#
DISTNAME= sl
@@ -17,7 +17,7 @@ COMMENT= Animated SL that runs across the terminal when you type `sl'
DIST_SUBDIR= ${PKGNAME_NOREV}
-BUILD_DEPENDS= nkf-[0-9]*:../../converters/nkf
+BUILD_DEPENDS+= nkf-[0-9]*:../../converters/nkf
INSTALLATION_DIRS= bin man/ja_JP.EUC/man1
diff --git a/games/spider/Makefile b/games/spider/Makefile
index 8d72d06e435..0e68ab34d5c 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/05/12 21:56:52 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:18 rillig Exp $
DISTNAME= spider
PKGNAME= spider-1.1
@@ -6,7 +6,7 @@ CATEGORIES= games x11
MASTER_SITES= ftp://ftp.uni-koeln.de/windows/xcontrib/
MAINTAINER= tech-pkg@NetBSD.org
-COMMENT= solitaire card game from xcontrib
+COMMENT= Solitaire card game from xcontrib
USE_IMAKE= yes
INSTALL_TARGET= install install.doc
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 3fe0db01ada..7158826ee38 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:52 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:18 rillig Exp $
DISTNAME= tworld-1.2.1
PKGNAME= ${DISTNAME:S/^t/tile/}
@@ -15,7 +15,7 @@ GNU_CONFIGURE= YES
BUILD_TARGET= tworld
-MAKE_ENV+= ECHO="${ECHO}" DATE="${DATE}"
+MAKE_ENV+= ECHO=${ECHO:Q} DATE=${DATE:Q}
.include "../../devel/SDL/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 7efce3744a3..5777766375e 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/02 23:02:06 reed Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:18 rillig Exp $
#
DISTNAME= tuxracer-0.61
@@ -19,7 +19,7 @@ GNU_CONFIGURE= YES
CFLAGS+= -DGLX_GLXEXT_PROTOTYPES
CONFIGURE_ARGS+= --with-data-dir=${PREFIX}/share/tuxracer
CONFIGURE_ARGS+= --with-tcl-libs=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
post-install:
@-${MKDIR} ${PREFIX}/share/doc/html/tuxracer ${PREFIX}/share/examples/tuxracer ${PREFIX}/share/tuxracer
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index c1cc0a956d7..9259ea12e4c 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/10/20 10:41:09 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:18 rillig Exp $
DISTNAME= wesnoth-1.0.1
CATEGORIES= games
@@ -14,8 +14,8 @@ CONFIGURE_ARGS+= --prefix=${PREFIX}
UNLIMIT_RESOURCES+= datasize
-BUILDLINK_DEPENDS.SDL= SDL>=1.2.7
-BUILDLINK_DEPENDS.SDL_mixer= SDL_mixer>=1.2.5nb3
+BUILDLINK_DEPENDS.SDL+= SDL>=1.2.7
+BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb3
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index e1bf8b39f97..2967317a931 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:52 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/12/05 20:50:18 rillig Exp $
#
DISTNAME= xarchon-0.60
@@ -18,7 +18,7 @@ USE_LANGUAGES= c c++
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+= CC="${CC}"
+CONFIGURE_ENV+= CC=${CC:Q}
.endif
#HF#DEPENDS+= glade-[0-9]*:../../devel/glade
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 9f6b62c6731..16578105571 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:18 rillig Exp $
DISTNAME= xboard-4.2.6
PKGREVISION= 2
@@ -11,7 +11,7 @@ COMMENT= Graphical frontend for chess engines and servers
CONFIGURE_ARGS+= --enable-xpm
CONFIGURE_ARGS+= --enable-zippy # interface to ICS
-CONFIGURE_ENV+= PERLPATH="${PERL5}"
+CONFIGURE_ENV+= PERLPATH=${PERL5:Q}
GNU_CONFIGURE= yes
USE_TOOLS+= perl:run
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 214d3c13565..8910e2e4424 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:52 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:18 rillig Exp $
DISTNAME= xbomb-2.1a
CATEGORIES= games x11
@@ -13,7 +13,7 @@ COMMENT= Square, hexagonal, and triangual minesweeper clone
USE_TOOLS+= gmake
BUILD_TARGET= xbomb
-MAKE_ENV+= SCORE_PATH="${SCORE_PATH}"
+MAKE_ENV+= SCORE_PATH=${SCORE_PATH:Q}
SCORE_PATH= ${VARBASE}/games/xbomb
SCORE_USER= games
@@ -21,7 +21,7 @@ SCORE_GROUP= games
PKG_USERS= ${SCORE_USER}:${SCORE_GROUP}
PKG_GROUPS= ${SCORE_GROUP}
-PLIST_SUBST+= SCORE_PATH=${SCORE_PATH}
+PLIST_SUBST+= SCORE_PATH=${SCORE_PATH:Q}
PLIST_SUBST+= GAME_DIR="${INSTALL} -d -o ${SCORE_USER} -g ${SCORE_GROUP} -m 775"
.include "../../mk/x11.buildlink3.mk"
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 71a344f3c63..230ff7080f9 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:03 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:18 rillig Exp $
DISTNAME= xconq-7.4.1
PKGREVISION= 4
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+= --enable-alternate-scoresdir=${VARBASE}/games/xconq/scores
CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_PREFIX.tk}/lib"
-MAKE_ENV+= LOCALBASE="${LOCALBASE}"
+MAKE_ENV+= LOCALBASE=${LOCALBASE:Q}
USE_MAKEINFO= YES
INFO_FILES= hacking.info xcdesign.info xconq.info
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 299b92d1330..f06b7f7c1c1 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/19 15:25:33 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 20:50:18 rillig Exp $
DISTNAME= linuxdoom-1.10
PKGNAME= xdoom-1.10
@@ -12,7 +12,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.idsoftware.com/archives/doomarc.html
COMMENT= 3D shoot-em-up for 8-bit X11 displays
-BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip
+BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
LICENSE= xdoom-license
@@ -21,11 +21,11 @@ EXTRACT_ONLY= doomsrc.zip
EXTRACT_CMD= unzip -qo ${DISTDIR}/${EXTRACT_ONLY}
USE_X11BASE= yes
USE_TOOLS+= gmake gunzip
-MAKE_ENV+= X11BASE=${X11BASE} INSTALL_PREFIX=${PREFIX}
+MAKE_ENV+= X11BASE=${X11BASE:Q} INSTALL_PREFIX=${PREFIX:Q}
.include "../../mk/bsd.prefs.mk"
-.ifdef ${OPSYS} == "Linux"
+.if ${OPSYS} == "Linux"
CFLAGS+= -DLINUX
.endif
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index 542ca6d82fb..ebdf42daa22 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/24 21:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:18 rillig Exp $
DISTNAME= xemeraldia-0.3
PKGNAME= xemeraldia-0.31
@@ -16,8 +16,8 @@ USE_IMAKE= yes
BUILD_TARGET= xemeraldia
GAMES_DIR= share/games
-MAKE_ENV+= GAMES_DIR="${GAMES_DIR}"
-PLIST_SUBST= GAMES_DIR="${GAMES_DIR}"
+MAKE_ENV+= GAMES_DIR=${GAMES_DIR:Q}
+PLIST_SUBST= GAMES_DIR=${GAMES_DIR:Q}
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/${GAMES_DIR}/xemeraldia
diff --git a/games/xemeraldia/PLIST b/games/xemeraldia/PLIST
index d513dda7b0c..572a7c3368a 100644
--- a/games/xemeraldia/PLIST
+++ b/games/xemeraldia/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:29:43 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/12/05 20:50:18 rillig Exp $
bin/xemeraldia
lib/X11/app-defaults/XEmeraldia
@exec ${MKDIR} %D/${GAMES_DIR}/xemeraldia
@exec touch -f %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores
@exec ${CHMOD} 666 %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores
@unexec ${RM} -f %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores
-@unexec ${RMDIR} %D/${GAMES_DIR}/xemeraldia
+@dirrm ${GAMES_DIR}/xemeraldia
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index a78ba3f0879..c7f21cba7e9 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/11/05 17:15:52 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:18 rillig Exp $
DISTNAME= xgalaga-2.0.34
PKGREVISION= 2
@@ -14,8 +14,8 @@ GNU_CONFIGURE= YES
GNU_CONFIGURE_PREFIX= ${PREFIX}/share/xgalaga
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/bin
SETGIDGAME= yes
-MAKE_ENV+= GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP} \
- GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE}
+MAKE_ENV+= GAMEOWN=${GAMEOWN:Q} GAMEGRP=${GAMEGRP:Q} \
+ GAMEMODE=${GAMEMODE:Q} GAMEDATAMODE=${GAMEDATAMODE:Q}
post-install:
${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/xgalaga/README
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index 784e2b506aa..ed417504008 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/06 19:25:23 tonio Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:18 rillig Exp $
DISTNAME= xjump_2.7.5.orig
PKGNAME= xjump-2.7.5
@@ -14,7 +14,7 @@ COMMENT= Jumping game for X
WRKSRC= ${WRKDIR}/xjump-2.7.5.orig
BUILD_TARGET= xjump
INSTALLATION_DIRS= bin
-MAKE_ENV+= VARBASE=${VARBASE}
+MAKE_ENV+= VARBASE=${VARBASE:Q}
do-install:
${INSTALL_GAME} ${WRKSRC}/xjump ${PREFIX}/bin/xjump
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index b4098af4546..55bb3e0c994 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/06/01 20:08:00 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:18 rillig Exp $
DISTNAME= xpuyopuyo-0.9.1
PKGREVISION= 5
@@ -18,7 +18,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-gnome # install desktop and pixmap files
-CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="${GNOME_CONFIG}"
+CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=${GNOME_CONFIG:Q}
GNOME_CONFIG= ${WRKDIR}/gnome-config
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index 26cb51675ca..1c29732c42b 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/14 16:38:17 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:18 rillig Exp $
#
DISTNAME= xroach
@@ -12,8 +12,8 @@ COMMENT= Cockroaches hide under your windows
DIST_SUBDIR= xroach-4.4
DECOMPRESS_CMD= ${CAT}
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} \
- MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q} \
+ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} MANMODE=${MANMODE:Q}
MANCOMPRESSED_IF_MANZ= yes
.include "../../mk/x11.buildlink3.mk"
diff --git a/games/xskat/Makefile b/games/xskat/Makefile
index e16d703f13b..2ef8cf445fb 100644
--- a/games/xskat/Makefile
+++ b/games/xskat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:18 rillig Exp $
DISTNAME= xskat-3.4
PKGREVISION= 1
@@ -14,7 +14,7 @@ USE_IMAKE= yes
.include "../../mk/bsd.pkg.mk"
.if defined(DEFAULT_IRC_SERVER)
-MAKE_ENV+= IRC_SERVER=${DEFAULT_IRC_SERVER}
+MAKE_ENV+= IRC_SERVER=${DEFAULT_IRC_SERVER:Q}
.else
MAKE_ENV+= IRC_SERVER=irc.fu-berlin.de
.endif
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index a0646b5b230..9e39a6b0f1a 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:18 rillig Exp $
#
DISTNAME= xsoldier-0.96
@@ -13,7 +13,7 @@ USE_PKGINSTALL= YES
USE_IMAKE= YES
NO_INSTALL_MANPAGES= YES
-MAKE_ENV+= BINOWN=${BINOWN}
+MAKE_ENV+= BINOWN=${BINOWN:Q}
CONF_FILES_PERMS= ${PREFIX}/share/xsoldier/xsoldier.score.dist \
/var/games/xsoldier \
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index bbc125d3c28..b44ea8c25e5 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2005/11/29 08:51:17 adam Exp $
+# $NetBSD: Makefile,v 1.133 2005/12/05 20:50:18 rillig Exp $
.include "Makefile.common"
@@ -21,8 +21,8 @@ PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in
GCC_REQD+= 2.95.3
-PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER}
-PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER}
+PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER:Q}
+PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER:Q}
.include "options.mk"
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index b79a3e649d1..af28d4a9af7 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/10/29 01:34:39 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:19 rillig Exp $
PKGNAME= MesaDemos-${MESA_VERSION}
COMMENT= OpenGL examples and Demos
@@ -6,7 +6,7 @@ COMMENT= OpenGL examples and Demos
PATCHDIR= ${.CURDIR}/patches
DISTINFO_FILE= ${.CURDIR}/distinfo
-.include "../Mesa/Makefile.common"
+.include "../../graphics/Mesa/Makefile.common"
USE_LANGUAGES= c c++
MAKE_FLAGS+= LIB_DEP=""
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 46b34f65c6c..8183ddd1042 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2005/11/08 16:41:30 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:19 rillig Exp $
PKGNAME= MesaLib-${MESA_VERSION}
PKGREVISION= 3
COMMENT= Graphics library similar to SGI's OpenGL
-.include "../Mesa/Makefile.common"
+.include "../../graphics/Mesa/Makefile.common"
INSTLIBS= ${WRKSRC}/src/mesa/libGL.la \
${WRKSRC}/src/glw/libGLw.la \
diff --git a/graphics/PanoTools/Makefile b/graphics/PanoTools/Makefile
index e7446a91f7f..d73ea5c57d1 100644
--- a/graphics/PanoTools/Makefile
+++ b/graphics/PanoTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/16 06:57:57 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:19 rillig Exp $
#
DISTNAME= PanoTools
@@ -81,7 +81,7 @@ EMULSUBDIR=
.endif
EMULDIR= ${PREFIX}/${EMULSUBDIR}
-PLIST_SUBST+= EMULSUBDIR="${EMULSUBDIR}"
+PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk
index 2c9b100ffb5..067ceab5beb 100644
--- a/graphics/aalib-x11/buildlink3.mk
+++ b/graphics/aalib-x11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/06/01 18:02:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/12/05 20:50:19 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AALIB_X11_BUILDLINK3_MK:= ${AALIB_X11_BUILDLINK3_MK}+
@@ -19,8 +19,8 @@ BUILDLINK_TRANSFORM.aalib-x11+= -e "s|/aalib-x11.h|/aalib.h|g"
BUILDLINK_TRANSFORM+= l:aa:aa-x11
AALIB_CONFIG= ${BUILDLINK_PREFIX.aalib-x11}/bin/aalib-x11-config
-CONFIGURE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}"
-MAKE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}"
+CONFIGURE_ENV+= AALIB_CONFIG=${AALIB_CONFIG:Q}
+MAKE_ENV+= AALIB_CONFIG=${AALIB_CONFIG:Q}
.endif # AALIB_X11_BUILDLINK3_MK
.include "../../mk/x11.buildlink3.mk"
diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index c53600a0fef..feefc3c428d 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/18 14:44:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:19 rillig Exp $
#
DISTNAME= barcode-0.98
@@ -10,7 +10,7 @@ HOMEPAGE= http://ar.linux.it/software/barcode/
COMMENT= Create bar codes as EPS (program and library)
GNU_CONFIGURE= YES
-MAKE_ENV+= AWK="${AWK}"
+MAKE_ENV+= AWK=${AWK:Q}
INFO_FILES= barcode.info
diff --git a/graphics/cambevao/Makefile b/graphics/cambevao/Makefile
index a972205962f..119cb188611 100644
--- a/graphics/cambevao/Makefile
+++ b/graphics/cambevao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:01 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:19 rillig Exp $
#
DISTNAME= cambevao-2.2
@@ -10,7 +10,7 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://core.de/~coto/projects/cambevao/
COMMENT= Grabs images as jpg from bktr and ov511+ based USB webcams
-MAKE_ENV= prefix=${PREFIX}
+MAKE_ENV+= prefix=${PREFIX:Q}
RCD_SCRIPTS= cambevao
USE_PKGINSTALL= yes
diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index 32e51c81547..0f691e04f02 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:10 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:19 rillig Exp $
DISTNAME= cdlabelgen-2.7.0
CATEGORIES= graphics
@@ -12,8 +12,8 @@ COMMENT= Generate frontcards and traycards for CDs
USE_TOOLS+= perl:run
USE_LANGUAGES= # empty
-MAKE_ENV+= SED="${SED}"
-MAKE_ENV+= MV="${MV}"
+MAKE_ENV+= SED=${SED:Q}
+MAKE_ENV+= MV=${MV:Q}
post-extract:
cd ${WRKSRC} && ${CHMOD} go+r *
diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile
index 767d5971ba8..78f8c5f4c8a 100644
--- a/graphics/dia-python/Makefile
+++ b/graphics/dia-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/20 18:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:19 rillig Exp $
#
DIA_SUBPKG= -python
@@ -7,7 +7,7 @@ DIA_SUBPKG= -python
COMMENT+= (Python plugin)
CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-python/--with-python/g}
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_PATCH_SCRIPTS= po-checktrans.py
PYTHON_PATCH_SCRIPTS+= plug-ins/python/gtkcons.py
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index d78e854bd5c..72308d9ef1d 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/06/25 00:11:31 kristerw Exp $
+# $NetBSD: Makefile,v 1.34 2005/12/05 20:50:19 rillig Exp $
DISTNAME= dx-4.3.2
PKGREVISION= 3
@@ -13,7 +13,7 @@ USE_X11BASE= yes
USE_TOOLS+= gmake lex sh
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-javadx
-CONFIGURE_ENV+= bsh_path="${TOOLS_SH}"
+CONFIGURE_ENV+= bsh_path=${TOOLS_SH:Q}
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 0b2b408ef11..266c4d26462 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:05 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:19 rillig Exp $
#
DISTNAME= exiv2-0.6.1
@@ -10,7 +10,7 @@ HOMEPAGE= http://home.arcor.de/ahuggel/exiv2/
COMMENT= Image metadata manipulation
USE_LANGUAGES= c c++
-GCC_REQD= 3.3
+GCC_REQD+= 3.3
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 8faae31aee6..837db29170e 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:55 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:19 rillig Exp $
#
DISTNAME= freeglut-2.2.0
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-replace-glut
+CONFIGURE_ARGS+= --disable-replace-glut
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common
index 66e3d4e3a98..bff29e4069a 100644
--- a/graphics/freetype-lib/Makefile.common
+++ b/graphics/freetype-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2005/09/28 21:55:32 rillig Exp $
+# $NetBSD: Makefile.common,v 1.31 2005/12/05 20:50:19 rillig Exp $
DISTNAME= freetype-${FT_VERS}
FT_VERS= 1.3.1
@@ -12,13 +12,13 @@ CONFLICTS= freetype-1.[12]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-BUILD_USES_MSGFMT= # defined
+BUILD_USES_MSGFMT= yes
USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= # defined
+USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-locale-dir=${PREFIX}/${PKGLOCALEDIR}/locale
DISTINFO_FILE= ${.CURDIR}/../../graphics/freetype-lib/distinfo
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index f75f54b6b6d..b1f1485d6a6 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:55 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:19 rillig Exp $
-.include "../freetype-lib/Makefile.common"
+.include "../../graphics/freetype-lib/Makefile.common"
PKGNAME= freetype-utils-${FT_VERS}
PKGREVISION= 1
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 5fc1ff840c8..476ad67ad33 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2005/11/19 14:11:30 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2005/12/05 20:50:19 rillig Exp $
DISTNAME= freetype-2.1.10
PKGNAME= freetype2-2.1.10
@@ -23,14 +23,14 @@ GNU_CONFIGURE= yes
CONFIGURE_DIRS= ${WRKSRC}/builds/unix
BUILD_DIRS= ${WRKSRC}
CONFIGURE_ARGS+= --includedir=${PREFIX}/include
-CONFIGURE_ENV+= ac_cv_path_GREP="${GREP}" ac_cv_path_EGREP="${EGREP}"
+CONFIGURE_ENV+= ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q}
PKGCONFIG_OVERRIDE= builds/unix/freetype2.in
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
-PKG_OPTIONS_VAR+= PKG_OPTIONS.freetype2
+PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2
PKG_SUPPORTED_OPTIONS= truetype
.include "../../mk/bsd.options.mk"
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index 2b46ec4e69e..d4b1e981f5c 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2004/10/03 00:14:50 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2005/12/05 20:50:20 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREETYPE2_BUILDLINK3_MK:= ${FREETYPE2_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.freetype2?= ../../graphics/freetype2
BUILDLINK_INCDIRS.freetype2?= include/freetype2
FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
-CONFIGURE_ENV+= FREETYPE_CONFIG="${FREETYPE_CONFIG}"
+CONFIGURE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}
.endif # FREETYPE2_BUILDLINK3_MK
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index ba3f06c9793..375ec965358 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2005/11/26 09:40:49 salo Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:20 rillig Exp $
#
.include "Makefile.common"
-PKGNAME= ${DISTNAME}
PKGREVISION= 6
COMMENT= The GNOME image loading library
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index 4e535115acc..47204ffdd7d 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2005/06/01 18:02:55 jlam Exp $
+# $NetBSD: Makefile.common,v 1.44 2005/12/05 20:50:20 rillig Exp $
DISTNAME= gdk-pixbuf-${VER}.0
CATEGORIES= graphics devel
@@ -18,7 +18,7 @@ USE_LIBTOOL= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV+= path_rgb_txt="${X11BASE}/lib/X11/rgb.txt"
-PLIST_SUBST+= LOCALBASE=${LOCALBASE}
+PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q}
DISTINFO_FILE= ${.CURDIR}/../gdk-pixbuf/distinfo
PATCHDIR= ${.CURDIR}/../gdk-pixbuf/patches
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 816ff02561e..e6ba6abde5a 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:17 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:20 rillig Exp $
#
DISTNAME= gfract-0.30
@@ -15,7 +15,7 @@ BUILD_TARGET= gfract
PKG_INSTALLATION_TYPES= overwrite pkgviews
-SUBST_CLASSES= prefix
+SUBST_CLASSES+= prefix
SUBST_MESSAGE.prefix= "Fixing prefix."
SUBST_STAGE.prefix= post-extract
SUBST_FILES.prefix= main.cpp
diff --git a/graphics/gimp-warp-sharp/Makefile b/graphics/gimp-warp-sharp/Makefile
index 26a25d4c528..09c70495ba2 100644
--- a/graphics/gimp-warp-sharp/Makefile
+++ b/graphics/gimp-warp-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/06/16 06:57:58 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:20 rillig Exp $
DISTNAME= warp-sharp
PKGNAME= gimp-${DISTNAME}-1.4
@@ -10,7 +10,7 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://www.home.unix-ag.org/simon/gimp/warp-sharp.html
COMMENT= Image sharpening script for GIMP
-DEPENDS= gimp>=2.0:../../graphics/gimp
+DEPENDS+= gimp>=2.0:../../graphics/gimp
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile
index 49681f1ac31..2c3ec2ce205 100644
--- a/graphics/gimp1-base/Makefile
+++ b/graphics/gimp1-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/23 18:58:30 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:20 rillig Exp $
#
DISTNAME= gimp-1.2.5
@@ -41,8 +41,8 @@ CONFIGURE_ENV+= GAP_DECODE_MPEG="gap_decode_mpeg"
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
-MAKE_ENV+= X11BASE=${X11BASE}
-PLIST_SUBST+= LOCALBASE=${LOCALBASE}
+MAKE_ENV+= X11BASE=${X11BASE:Q}
+PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q}
.include "options.mk"
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index b5d7c679abc..722ddef370a 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/07 14:21:42 minskim Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:20 rillig Exp $
PKGNAME= ${DISTNAME:C/MesaLib/glu/}
PKGREVISION= 1
@@ -7,7 +7,7 @@ COMMENT= GLU polygon tessellation facility for Mesa
CONFLICTS+= Mesa-glx-[0-9]*
CONFLICTS+= Mesa<3.2.1
-.include "../Mesa/Makefile.common"
+.include "../../graphics/Mesa/Makefile.common"
USE_LANGUAGES= c c++
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index efc30287705..e1fef6c21e5 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/06/07 14:31:48 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:20 rillig Exp $
PKGNAME= ${DISTNAME:S/MesaLib/glut/}
PKGREVISION= 3
@@ -7,7 +7,7 @@ COMMENT= GLUT Graphics library similar to SGI's OpenGL
CONFLICTS+= Mesa-glx-[0-9]*
CONFLICTS+= Mesa<3.2.1
-.include "../Mesa/Makefile.common"
+.include "../../graphics/Mesa/Makefile.common"
BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
BUILDLINK_DEPENDS.glu+= glu>=${MESA_VERSION}
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index 1133af77500..94ff7816b9d 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/10/12 21:46:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:20 rillig Exp $
#
DISTNAME= gnome-icon-theme-2.12.1
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE= gnome-icon-theme.pc.in
-BUILDLINK_DEPENDS.hicolor-icon-theme= hicolor-icon-theme>=0.5
+BUILDLINK_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.5
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk
index d20f3a4a69c..4a971b5f147 100644
--- a/graphics/gnome-icon-theme/buildlink3.mk
+++ b/graphics/gnome-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/07/16 19:10:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/12/05 20:50:20 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_ICON_THEME_BUILDLINK3_MK:= ${GNOME_ICON_THEME_BUILDLINK3_MK}+
@@ -27,7 +27,6 @@ dirs!= ${GREP} "^@dirrm" ${.CURDIR}/../../graphics/gnome-icon-theme/PLIST | \
PRINT_PLIST_AWK+= /^@dirrm ${d:S/\//\\\//g}$$/ \
{ print "@comment in gnome-icon-theme: " $$0; next; }
. endfor
-. undef d
. undef dirs
.endif # GNOME_ICON_THEME_BUILDLINK3_MK
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 5172b708d94..a4ec0dc57d5 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/11/19 07:36:35 minskim Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:20 rillig Exp $
DISTNAME= graphviz-2.6
PKGREVISION= 1
@@ -30,9 +30,9 @@ PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in
BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter
.endif
-CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH}
-CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH}
-CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
+CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q}
+CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q}
+CONFIGURE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q}
# build fails when PHP and/or Ruby are also installed
CONFIGURE_ENV+= ac_cv_prog_PHP=
CONFIGURE_ENV+= ac_cv_prog_RUBY=
diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk
index d10db0d7020..295296228ef 100644
--- a/graphics/hicolor-icon-theme/buildlink3.mk
+++ b/graphics/hicolor-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/06 13:47:41 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/12/05 20:50:20 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HICOLOR_ICON_THEME_BUILDLINK3_MK:= ${HICOLOR_ICON_THEME_BUILDLINK3_MK}+
@@ -22,7 +22,6 @@ dirs!= ${GREP} "^@dirrm" ${.CURDIR}/../../graphics/hicolor-icon-theme/PLIST | \
PRINT_PLIST_AWK+= /^@dirrm ${d:S/\//\\\//g}$$/ \
{ print "@comment in hicolor-icon-theme: " $$0; next; }
. endfor
-. undef d
. undef dirs
.endif # HICOLOR_ICON_THEME_BUILDLINK3_MK
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index 9d16c92c43b..fdbd2e3d148 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/11/28 06:41:20 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:20 rillig Exp $
DISTNAME= igmt_v1.2
PKGNAME= iGMT-1.2
@@ -19,7 +19,7 @@ DEPENDS+= ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
WRKSRC= ${WRKDIR}/igmt_1.2
NO_BUILD= yes
-USE_TOOLS= gs:run
+USE_TOOLS+= gs:run
GMT_PREFIX_DEFAULT= ${LOCALBASE}
EVAL_PREFIX+= GMT_PREFIX=GMT
EVAL_PREFIX+= TK_PREFIX=tk
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 16cd2687901..08e27821ab0 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2005/06/01 18:02:56 jlam Exp $
+# $NetBSD: Makefile,v 1.95 2005/12/05 20:50:20 rillig Exp $
DISTNAME= imlib-1.9.15
PKGREVISION= 2
@@ -20,7 +20,7 @@ UNLIMIT_RESOURCES= datasize
CPPFLAGS+= -DENABLE_NLS
CONFIGURE_ENV+= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
-CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}"
+CONFIGURE_ENV+= X_LDFLAGS=${X_LDFLAGS:Q}
CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}"
PKG_SYSCONFSUBDIR= imlib
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index c9528b55970..2e6d577b021 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:18 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:20 rillig Exp $
DISTNAME= imlib2-1.2.0
PKGREVISION= 3
@@ -15,7 +15,7 @@ GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= imlib2.pc.in
-LIBS.SunOS= -lm
+LIBS.SunOS+= -lm
.include "options.mk"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index d5c60d606cd..cdd009856be 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/04 13:51:38 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:20 rillig Exp $
DISTNAME= inkscape-0.43
CATEGORIES= graphics
@@ -13,7 +13,7 @@ COMMENT= Scalable Vector Graphics (SVG) editor
BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
.endif
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/graphics/jpeg2ps/Makefile b/graphics/jpeg2ps/Makefile
index 8ee4200b02a..f19de7d91ea 100644
--- a/graphics/jpeg2ps/Makefile
+++ b/graphics/jpeg2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 04:49:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:21 rillig Exp $
#
DISTNAME= jpeg2ps-1.9
@@ -10,9 +10,9 @@ HOMEPAGE= http://www.pdflib.com/products/more/jpeg2ps/
COMMENT= Convert jpeg images to PostScript level 2 or 3
-RESTRICTED= may not be sold
-NO_SRC_ON_CD= ${RESTRICTED}
-NO_BIN_ON_CD= ${RESTRICTED}
+RESTRICTED= "may not be sold"
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
INSTALLATION_DIRS= bin man/man1
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index b4ed740a1be..437bb4ba5eb 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:20 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:21 rillig Exp $
DISTNAME= kbarcode-1.8.1
PKGREVISION= 2
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
DEPENDS+= barcode-[0-9]*:../../graphics/barcode
# Works only with KDE 3.3.x
-BUILDLINK_DEPENDS.kdelibs= kdelibs>=3.3.0
+BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.3.0
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 66b9df17412..be4cc3244d9 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/11/28 06:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:21 rillig Exp $
DISTNAME= kdegraphics-${_KDE_VERSION}
CATEGORIES= graphics
@@ -9,7 +9,7 @@ COMMENT= Graphics programs for the KDE integrated X11 desktop
USE_DIRS+= xdg-1.1
USE_TOOLS+= gs:run
-BUILDLINK_DEPENDS.lcms= lcms>=1.12
+BUILDLINK_DEPENDS.lcms+= lcms>=1.12
REPLACE_PERL= kghostview/update-to-xt-names.pl
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index c7ef63348fb..48f1cafdbf0 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:21 rillig Exp $
DISTNAME= lcms-1.14
CATEGORIES= graphics
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --without-tiff
CONFIGURE_ARGS+= --without-zlib
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
PKGCONFIG_OVERRIDE= lcms.pc.in
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index dc7010ec514..98212ee49ed 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/28 19:21:02 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:21 rillig Exp $
#
DISTNAME= libcaca-0.9
@@ -14,7 +14,7 @@ COMMENT= Graphics library that outputs text instead of pixels, in colour
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-Q]-*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
.include "options.mk"
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --disable-doc
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Linux"
-LDFLAGS= -ldl
+LDFLAGS+= -ldl
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index ce57f3783c1..3d447a1f4cc 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:21 rillig Exp $
#
DISTNAME= libgdgeda-2.0.15
@@ -12,7 +12,7 @@ COMMENT= Modified version of the gd packages for use with gEDA
PKG_INSTALLATION_TYPES= overwrite pkgviews
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}nb2
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index c64d49a5792..431be3013f2 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/11/05 13:32:36 adrianp Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:21 rillig Exp $
DISTNAME= libungif-4.1.3
PKGREVISION= 3
@@ -18,7 +18,7 @@ USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-x
+CONFIGURE_ARGS+= --without-x
CONFIGURE_ENV+= ac_cv_lib_X11_main=no
DOCDIR= ${PREFIX}/share/doc/libungif
diff --git a/graphics/lprof/Makefile b/graphics/lprof/Makefile
index 5638eb3ec43..5f677c74e30 100644
--- a/graphics/lprof/Makefile
+++ b/graphics/lprof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/11/16 12:36:58 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:21 rillig Exp $
#
DISTNAME= lprof-1.10.1
@@ -12,8 +12,8 @@ COMMENT= ICC Profile generation tool (for IT8.7 targets)
USE_TOOLS+= gmake
-MAKE_ENV+= BASEDIR=${PREFIX} QTDIR=${PREFIX}/qt3
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= BASEDIR=${PREFIX:Q} QTDIR=${PREFIX}/qt3
+MAKE_ENV+= LDFLAGS=${LDFLAGS:M*:Q}
BUILDLINK_DEPMETHOD.qt3-tools= build
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 699037c40d2..360aefdd3dc 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/07/16 01:19:11 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2005/12/05 20:50:21 rillig Exp $
DISTNAME= magicpoint-1.10a
PKGREVISION= 7
@@ -26,7 +26,7 @@ PKG_SUGGESTED_OPTIONS= xft2
CONFIGURE_ARGS+= --enable-freetype-charset16
CONFIGURE_ARGS+= --enable-locale
CONFIGURE_ARGS+= --enable-gif
-CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
+CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
CONFIGURE_ENV+= mgp_cv_path_perl=${TOOLS_PERL5:Q}
MGP_RENDERING_ENGINES= freetype graphics/freetype-lib \
diff --git a/graphics/mayavi/Makefile b/graphics/mayavi/Makefile
index 883f3bad1b7..afc4058e5fa 100644
--- a/graphics/mayavi/Makefile
+++ b/graphics/mayavi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/10/06 18:08:15 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:21 rillig Exp $
#
DISTNAME= MayaVi-1.5
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://mayavi.sourceforge.net/
COMMENT= Scientific data visualizer written in Python
-DEPENDS= vtk-python>=4.2:../../graphics/vtk-python
+DEPENDS+= vtk-python>=4.2:../../graphics/vtk-python
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 23ff49ddcd4..33c77232a10 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2005/10/19 09:30:08 adam Exp $
+# $NetBSD: Makefile,v 1.127 2005/12/05 20:50:21 rillig Exp $
DISTNAME= netpbm-10.30
CATEGORIES= graphics
@@ -14,16 +14,16 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_TOOLS+= bash:run gmake lex perl
INSTALL_TARGET= install-dev install-run
-MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" \
- pkgdir="${STAGEDIR}"
+MAKE_ENV+= INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
+ pkgdir=${STAGEDIR:Q}
MAKEFILE= GNUmakefile
PLIST_SRC= ${WRKDIR}/PLIST_STAGE
REPLACE_PERL= editor/ppmfade editor/ppmshadow editor/pnmquant \
generator/ppmrainbow manweb editor/pnmflip editor/ppmquant
STAGEDIR= ${WRKDIR}/staging
-LIBS.SunOS= -lsocket -lnsl
-MAKE_ENV+= NETWORKLD="${LIBS}"
+LIBS.SunOS+= -lsocket -lnsl
+MAKE_ENV+= NETWORKLD=${LIBS:M*:Q}
# Several of the netpbm shell scripts use bashisms, so force using
# bash for all of the shell scripts.
@@ -47,7 +47,7 @@ MAKE_ENV+= BUILD_FIASCO=N
.endif
MAKE_ENV+= JASPERLIB="${LDFLAGS} -ljasper"
-MAKE_ENV+= JASPERHDR_DIR=${CPPFLAGS:Q}
+MAKE_ENV+= JASPERHDR_DIR=${CPPFLAGS:M*:Q}
.include "../../graphics/jasper/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/netpbm/hacks.mk b/graphics/netpbm/hacks.mk
index 90cd6498a43..0afe5dd841a 100644
--- a/graphics/netpbm/hacks.mk
+++ b/graphics/netpbm/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/24 20:48:05 tv Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:21 rillig Exp $
-.ifndef NETPBM_HACKS_MK
+.if !defined(NETPBM_HACKS_MK)
NETPBM_HACKS_MK= # defined
### [historic : ???]
diff --git a/graphics/ns-cult3d/Makefile b/graphics/ns-cult3d/Makefile
index 8a6e6d78596..6f280bd2f41 100644
--- a/graphics/ns-cult3d/Makefile
+++ b/graphics/ns-cult3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/11/02 15:55:19 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:21 rillig Exp $
#
DISTNAME= Cult3D_NS4_5.2b1
@@ -20,7 +20,7 @@ CHECK_SHLIBS= no
CRYPTO= yes
do-install:
- ${MKDIR} ${PREFIX}/lib/netscape
+ ${INSTALL_DATA_DIR} ${PREFIX:Q}/lib/netscape
cd ${WRKSRC} ; ${ECHO} ${PREFIX}/lib/netscape | ./install.sh
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ns-cult3d.txt
diff --git a/graphics/nvtv/Makefile b/graphics/nvtv/Makefile
index 271ee60f200..55c1e5e94e6 100644
--- a/graphics/nvtv/Makefile
+++ b/graphics/nvtv/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:43 reed Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:21 rillig Exp $
-PKGNAME= ${DISTNAME}
PKGREVISION= 2
.include "Makefile.common"
diff --git a/graphics/nvtv/Makefile.common b/graphics/nvtv/Makefile.common
index 379a6ad2be2..dc4886924f0 100644
--- a/graphics/nvtv/Makefile.common
+++ b/graphics/nvtv/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:46:07 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:21 rillig 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-GD/Makefile b/graphics/p5-GD/Makefile
index 5eea5c8c88f..b5938a4f38e 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/11/24 19:02:52 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:21 rillig Exp $
DISTNAME= GD-2.30
PKGNAME= p5-${DISTNAME}
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.gd+= gd>=2.0.28
PERL5_PACKLIST= auto/GD/.packlist
PERL5_OPTIONS+= threads
-MAKE_ENV+= GD_LIBS="${LDFLAGS}"
+MAKE_ENV+= GD_LIBS=${LDFLAGS:M*:Q}
MAKE_PARAMS+= -lib_gd_path=${BUILDLINK_PREFIX.gd}
.include "../../graphics/gd/buildlink3.mk"
diff --git a/graphics/php-exif/Makefile b/graphics/php-exif/Makefile
index 620002cc597..b4991a1b3a3 100644
--- a/graphics/php-exif/Makefile
+++ b/graphics/php-exif/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:07 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:22 rillig Exp $
MODNAME= exif
CATEGORIES+= graphics
-PKGREVISION= # empty
COMMENT= PHP extension to extract information from EXIF headers
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index e9cd7d11a1f..7dfc77bcbdb 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:07 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:22 rillig Exp $
MODNAME= gd
-PKGREVISION= # empty
CATEGORIES+= graphics
COMMENT= PHP extension for GD graphics library
diff --git a/graphics/phpsview/Makefile b/graphics/phpsview/Makefile
index 10d69f85ed9..24cebcf3255 100644
--- a/graphics/phpsview/Makefile
+++ b/graphics/phpsview/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/10/16 12:47:24 jdolecek Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:22 rillig Exp $
#
DISTNAME= pwc-9.0.2
PKGNAME= phpsview-${DISTNAME:C/.*-//}
-PKGREVISION= # empty
CATEGORIES= graphics x11
MASTER_SITES= http://www.smcc.demon.nl/webcam/
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 2cc5239e3e0..8118bdadb51 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:08 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:22 rillig Exp $
DISTNAME= pixmap2.6
PKGNAME= pixmap-2.6.4
@@ -18,8 +18,8 @@ COMMENT= Pixmap editor based on XPM library
WRKSRC= ${WRKDIR}/pixmap
USE_IMAKE= YES
-MAKE_ENV+= LOCAL_LDFLAGS="${LDFLAGS}"
-MAKE_ENV+= MOTIFBASE="${MOTIFBASE}"
+MAKE_ENV+= LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
+MAKE_ENV+= MOTIFBASE=${MOTIFBASE:Q}
.include "../../graphics/xpm/buildlink3.mk"
.include "../../mk/motif.buildlink3.mk"
diff --git a/graphics/ploticus-examples/Makefile b/graphics/ploticus-examples/Makefile
index 2eff3acbbb2..c3b0222e931 100644
--- a/graphics/ploticus-examples/Makefile
+++ b/graphics/ploticus-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:57 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:22 rillig Exp $
#
DISTNAME= plnode141
@@ -14,7 +14,7 @@ COMMENT= Examples for the ploticus data plotting suite
NO_CONFIGURE= YES
NO_BUILD= YES
-DIST_SUBDIR= ${PKGNAME:S/-examples//}
+DIST_SUBDIR= ${PKGNAME_NOREV:S/-examples//}
EXDIR= ${PREFIX}/share/examples/ploticus
.include "../../mk/x11.buildlink3.mk"
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 178b96cb5a8..356fec2b010 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2005/11/04 11:58:54 rillig Exp $
+# $NetBSD: Makefile,v 1.72 2005/12/05 20:50:22 rillig Exp $
# On update, don't forget to increase shared library major/minor's in
# accordance with changes (patch-aa).
@@ -25,15 +25,15 @@ LIBPNG_SO_MAJOR= 3
LIBPNG_SO_MINOR= 2
MAKEFILE= scripts/makefile.std
-MAKE_ENV+= REALCC="${CC}"
-MAKE_ENV+= LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR}
-MAKE_ENV+= LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR}
+MAKE_ENV+= REALCC=${CC:Q}
+MAKE_ENV+= LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR:Q}
+MAKE_ENV+= LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR:Q}
INSTALLATION_DIRS= include lib/pkgconfig man/man3 man/man5
PKGCONFIG_OVERRIDE= scripts/libpng.pc.in
-SUBST_CLASSES= pc
+SUBST_CLASSES+= pc
SUBST_STAGE.pc= post-patch
SUBST_FILES.pc= scripts/libpng.pc.in
SUBST_SED.pc= -e 's,@PREFIX@,${PREFIX},'
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 556e6b38a50..eee0e97a13f 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/11/18 14:15:03 adam Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:22 rillig Exp $
DISTNAME= povray-3.6.1
PKGREVISION= 2
@@ -13,7 +13,7 @@ COMMENT= Persistence of Vision Ray Tracer
LICENSE= povray-license
-BUILDLINK_DEPENDS.zlib= zlib>=1.2.1
+BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1
USE_LANGUAGES= c c++
USE_PKGINSTALL= yes
diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile
index 1b4634e315d..6517d443cbc 100644
--- a/graphics/py-gdchart/Makefile
+++ b/graphics/py-gdchart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/16 06:57:58 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:22 rillig Exp $
#
DISTNAME= gdchart-py-0.6
@@ -12,12 +12,12 @@ HOMEPAGE= http://athani.pair.com/msteed/software/gdchart/
COMMENT= Python interface to GDChart
USE_TOOLS+= gmake
-MAKE_ENV= GD_INCLUDE=${LOCALBASE}/include \
+MAKE_ENV+= GD_INCLUDE=${LOCALBASE}/include \
GDCHART_INCLUDE=${LOCALBASE}/include \
PYTHON_INCLUDE=${LOCALBASE}/${PYINC} \
HAVE_LIBFREETYPE=1 \
- LOCALBASE=${LOCALBASE}
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
+ LOCALBASE=${LOCALBASE:Q}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
MODULE_FILES= chart.py gdchart.so
EXAMPLE_FILES= test.html test.py CHANGES
EXAMPLE_DIR= ${PREFIX}/share/examples/${PYPKGPREFIX}-gdchart
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 4c16845cd6f..f7eaff79653 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:08 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:22 rillig Exp $
#
DISTNAME= pygimp-1.2
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.daa.com.au/~james/pygimp/
COMMENT= Python interface to the GIMP
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile
index 250a8985bbf..7bc74c9925a 100644
--- a/graphics/py-imagingtk/Makefile
+++ b/graphics/py-imagingtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/10/12 14:48:44 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:22 rillig Exp $
#
DISTNAME= Imaging-1.1.5
@@ -12,10 +12,10 @@ COMMENT= Tk support for the Python Imaging Library (PIL)
DIST_SUBDIR= python
PYDISTUTILSPKG= yes
-BUILDLINK_DEPENDS.python20= python20>=2.0.1nb4
+BUILDLINK_DEPENDS.python20+= python20>=2.0.1nb4
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index 1b3c0027d69..ba50982a873 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:57 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:22 rillig Exp $
#
DISTNAME= rad3R6P1
@@ -44,10 +44,10 @@ PKGSRC_ARCH= 3
PLIST_SUBST+= USE_GL=""
.endif
-MAKE_ENV+= MV="${MV}" RM="${RM}" CP="${CP}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- RANLIB="${RANLIB}" AR="${AR}"
+MAKE_ENV+= MV=${MV:Q} RM=${RM:Q} CP=${CP:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ RANLIB=${RANLIB:Q} AR=${AR:Q}
do-configure:
.for patchee in ${PATCHEES}
diff --git a/graphics/s10sh/Makefile b/graphics/s10sh/Makefile
index faba742df46..c34ce820143 100644
--- a/graphics/s10sh/Makefile
+++ b/graphics/s10sh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:59 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:22 rillig Exp $
#
DISTNAME= s10sh-0.2.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.kyuzz.org/antirez/s10sh
COMMENT= USB/serial userspace driver for Canon PowerShot cameras
HAS_CONFIGURE= yes
-CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q}
INSTALLATION_DIRS= bin
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 9004844b8f3..f466764d2a5 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/09/27 09:29:56 wiz Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/12/05 20:50:22 rillig Exp $
CATEGORIES?= graphics
MASTER_SITES?= ftp://ftp.mostang.com/pub/sane/${DISTNAME}/ \
@@ -13,10 +13,10 @@ SANE_MAJOR?= 1
SANE_MINOR?= 0
SANE_MICRO?= 16
SANE_VERSION= ${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
-PLIST_SUBST+= SANE_MAJOR=${SANE_MAJOR}
-PLIST_SUBST+= SANE_MINOR=${SANE_MINOR}
-PLIST_SUBST+= SANE_MICRO=${SANE_MICRO}
-PLIST_SUBST+= SANE_VERSION=${SANE_VERSION}
+PLIST_SUBST+= SANE_MAJOR=${SANE_MAJOR:Q}
+PLIST_SUBST+= SANE_MINOR=${SANE_MINOR:Q}
+PLIST_SUBST+= SANE_MICRO=${SANE_MICRO:Q}
+PLIST_SUBST+= SANE_VERSION=${SANE_VERSION:Q}
CONFLICTS+= sane<=1.0.3
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 708de2ced1f..c031715a598 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2005/11/25 21:23:15 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:22 rillig Exp $
-.include "../sane-backends/Makefile.common"
+.include "../../graphics/sane-backends/Makefile.common"
DISTNAME= sane-frontends-${SANE_VERSION}
PKGREVISION= 1
@@ -8,7 +8,7 @@ SANE_MICRO= 13
COMMENT= Frontends for access to scanners, digitals camera, frame grabbers etc
-BUILDLINK_DEPENDS.sane= sane-backends>=${SANE_VERSION}
+BUILDLINK_DEPENDS.sane+= sane-backends>=${SANE_VERSION}
USE_X11BASE= YES
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 9929cbcc520..0f875d43fbf 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/06/01 18:02:57 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:22 rillig Exp $
#
DISTNAME= scigraphica-0.8.0
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-readline-include-path=${BUILDLINK_PREFIX.readline}/inclu
CONFIGURE_ARGS+= --with-readline-path=${BUILDLINK_PREFIX.readline}/lib
CONFIGURE_ARGS+= --with-termcap-include-path=${BUILDLINK_PREFIX.readline}/include
CONFIGURE_ARGS+= --with-termcap-path=${BUILDLINK_PREFIX.readline}/lib
-CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN:Q}
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 48feae0b918..3af10e6c162 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:07 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:22 rillig Exp $
#
DISTNAME= tuxpaint-0.9.14
@@ -22,13 +22,13 @@ BUILDLINK_DEPENDS.SDL_image+= SDL_image>=1.2.4
CONFLICTS+= tuxpaint-stamps<2003.12.23
-MAKE_ENV+= CONFDIR="${PKG_SYSCONFDIR}" CP="${CP}" CHMOD="${CHMOD}"
+MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR:Q} CP=${CP:Q} CHMOD=${CHMOD:Q}
EGDIR= ${PREFIX}/share/examples/tuxpaint
CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
# this uses iconv and png functions directly, so link against them
# explicitly.
-MAKE_ENV+= LIBS="${LIBS}"
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
LIBS+= -liconv
LIBS+= -lpng
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 8d6f1823c8a..6485f5784b1 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:58 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:23 rillig Exp $
DISTNAME= urt
PKGNAME= urt-3.1b1
@@ -19,7 +19,7 @@ EXTRACT_ONLY= urt-3.1b.tar.Z
WRKSRC= ${WRKDIR}
USE_LIBTOOL= yes
CONFIGURE_SCRIPT=./Configure
-CONFIGURE_ARGS= config/urt
+CONFIGURE_ARGS+= config/urt
HAS_CONFIGURE= yes
MAKEFILE= makefile
BUILD_TARGET=
diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile
index a7d35592860..55d8f503eea 100644
--- a/graphics/vid/Makefile
+++ b/graphics/vid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:59 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:23 rillig Exp $
#
DISTNAME= vid-1.0.1
@@ -14,7 +14,7 @@ BUILD_TARGET= vid
DOCDIR= share/doc/${PKGBASE}
-PLIST_SUBST+= DOCDIR=${DOCDIR}
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
INSTALLATION_DIRS= bin
diff --git a/graphics/vtk-python/Makefile b/graphics/vtk-python/Makefile
index 6b1626bcaec..df132a6ac6a 100644
--- a/graphics/vtk-python/Makefile
+++ b/graphics/vtk-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/01/23 20:41:46 recht Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:23 rillig Exp $
#
PKGNAME= vtk-python-${VTKDIST_VERSION}
@@ -38,7 +38,7 @@ post-install:
${RM} -f ${PREFIX}/bin/vtkpython
${LN} -s ${PYTHONBIN} ${PREFIX}/bin/vtkpython
-DEPENDS= vtk>=${VTK_VERSION}:../../graphics/vtk
+DEPENDS+= vtk>=${VTK_VERSION}:../../graphics/vtk
.include "../../graphics/vtk/Makefile.vtkdist"
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index 1627eae0d20..626863fe4fd 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/03 22:12:35 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:23 rillig Exp $
#
DISTNAME= wmphoto-0.3a
@@ -12,7 +12,7 @@ COMMENT= Dock-app that can show you a photo
BUILD_DIRS= wmphoto
USE_X11BASE= YES
USE_TOOLS+= gmake
-MAKE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
+MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmphoto
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 00857315458..56408cf4b21 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/09/06 14:53:36 adam Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:23 rillig Exp $
DISTNAME= xpaint-2.7.8
CATEGORIES= graphics x11
@@ -11,10 +11,10 @@ COMMENT= Simple paint program
USE_IMAKE= yes
USE_TOOLS+= gmake
-MAKE_ENV+= XMKMF="${XMKMF}"
+MAKE_ENV+= XMKMF=${XMKMF:Q}
BUILD_TARGET= xaw3dg
-SUBST_CLASSES= foo
+SUBST_CLASSES+= foo
SUBST_STAGE.foo= pre-configure
SUBST_FILES.foo= Local.config configure
SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" \
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 688f80fb09b..f3cabc059ea 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2005/09/07 14:10:16 adam Exp $
+$NetBSD: distinfo,v 1.17 2005/12/05 20:50:23 rillig Exp $
SHA1 (xpaint-2.7.8.tar.bz2) = 5573996f293838abd892faaa73a31239c03f9b9a
RMD160 (xpaint-2.7.8.tar.bz2) = edf4cdd5ee3f2af1d49eb4bb6618fc2dc3c138ff
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = 653a8873434093b4fc27e57a26e850ca23ec3556
SHA1 (patch-ac) = 78ba5e1c2b0bb5e9abfd12783454d5b30499d5f0
SHA1 (patch-ad) = dc12b553353bb5f8e70251ace8bf874c13aaa24f
SHA1 (patch-ae) = 5ecb812e962701a6d5f068bb7744c5115b2eb263
-SHA1 (patch-af) = b2338fb83ef693a02645012a9d2a2b0eb46daa52
+SHA1 (patch-af) = 3ad4c245351ff63f1a8c989fcc77cbb51af9b275
SHA1 (patch-ag) = 5191cb57084a746fec33dec105a8fe1750c6d8ae
diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af
index 5c6c2f7a0a0..d17b3401049 100644
--- a/graphics/xpaint/patches/patch-af
+++ b/graphics/xpaint/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.11 2005/09/07 14:10:16 adam Exp $
+$NetBSD: patch-af,v 1.12 2005/12/05 20:50:23 rillig Exp $
--- Local.config.orig 2005-04-30 21:33:14.000000000 +0000
+++ Local.config
-@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.18 2005/03/2
+@@ -9,7 +9,7 @@
XCOMM Local customization
DESTDIR =
diff --git a/ham/dpbox/Makefile b/ham/dpbox/Makefile
index 5af83e35b3f..912c9a44a12 100644
--- a/ham/dpbox/Makefile
+++ b/ham/dpbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:08 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:23 rillig Exp $
#
DISTNAME= dpbox-60000
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/dpbox-6.00.00/source
USE_TOOLS+= gmake
MAKEFILE= Makefile.netbsd
-MAKE_ENV+= prefix="${PREFIX}"
+MAKE_ENV+= prefix=${PREFIX:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/ham/tfkiss/Makefile b/ham/tfkiss/Makefile
index db725a521a6..c892290ecbb 100644
--- a/ham/tfkiss/Makefile
+++ b/ham/tfkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:08 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:23 rillig Exp $
#
DISTNAME= tfkiss-1.2.4
@@ -12,6 +12,8 @@ COMMENT= Software implementation of TheFirmware for use with TNT
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-xpid --enable-flexnet --enable-axip
+CONFIGURE_ARGS+= --enable-xpid
+CONFIGURE_ARGS+= --enable-flexnet
+CONFIGURE_ARGS+= --enable-axip
.include "../../mk/bsd.pkg.mk"
diff --git a/ham/tlf/Makefile b/ham/tlf/Makefile
index de61ccbd6dc..82783213d42 100644
--- a/ham/tlf/Makefile
+++ b/ham/tlf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:08 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:23 rillig Exp $
#
DISTNAME= tlf-0.9.20
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
BUILD_USES_MSGFMT=yes
PTHREAD_OPTS+= require
-CONFIGURE_ARGS= --enable-hamlib
+CONFIGURE_ARGS+= --enable-hamlib
post-patch:
${ECHO} SC_DEVICE=/dev/tty00 >> ${WRKSRC}/share/logcfg.dat
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index fbaface0de8..e5a1afdabab 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/08/16 12:35:49 wulf Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:23 rillig Exp $
#
DISTNAME= xlog-1.2.2
@@ -13,7 +13,7 @@ GNU_CONFIGURE= yes
USE_PKGLOCALEDIR=yes
USE_TOOLS+= gmake pkg-config
-CONFIGURE_ARGS= --enable-hamlib
+CONFIGURE_ARGS+= --enable-hamlib
.include "../../ham/hamlib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/inputmethod/anthy-elisp/Makefile b/inputmethod/anthy-elisp/Makefile
index ae532a37caf..20299b6b28a 100644
--- a/inputmethod/anthy-elisp/Makefile
+++ b/inputmethod/anthy-elisp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/10/01 12:47:55 taya Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:23 rillig Exp $
.include "../../inputmethod/anthy/Makefile.common"
PKGNAME= ${EMACS_PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION}
-CATEGORIES= inputmethod editor
+CATEGORIES= inputmethod editors
PKGREVISION= 1
MAINTAINER= taya@NetBSD.org
@@ -11,8 +11,8 @@ COMMENT= Emacs lisp files for inputmethod/anthy
DEPENDS+= anthy>=${ANTHY_VERSION}:../../inputmethod/anthy
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= EMACS=${EMACS_BIN}
-EMACS_USE_LEIM= # defined (for emacs21/emacs20)
+CONFIGURE_ENV+= EMACS=${EMACS_BIN:Q}
+EMACS_USE_LEIM= yes # (for emacs21/emacs20)
.include "../../mk/emacs.mk"
.if ${EMACS_FLAVOR} == "xemacs"
diff --git a/inputmethod/canna-dict/Makefile b/inputmethod/canna-dict/Makefile
index d279eb123c1..313452e7490 100644
--- a/inputmethod/canna-dict/Makefile
+++ b/inputmethod/canna-dict/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2005/07/19 10:17:17 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:23 rillig Exp $
#
-.include "../canna/Makefile.common"
+.include "../../inputmethod/canna/Makefile.common"
CANNA_MODULE= dict
@@ -32,7 +32,7 @@ do-build:
do-install:
@cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install
-.include "../canna/Makefile.include"
+.include "../../inputmethod/canna/Makefile.include"
# Need to set this here _after_ bsd.pkg.mk
PREFIX= ${IMDICTDIR}
diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile
index 2f1dd3ee584..ac2c0bf8bbd 100644
--- a/inputmethod/canna-lib/Makefile
+++ b/inputmethod/canna-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2003/05/31 08:28:34 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:23 rillig Exp $
#
-.include "../canna/Makefile.common"
+.include "../../inputmethod/canna/Makefile.common"
CANNA_MODULE= lib
@@ -27,4 +27,4 @@ do-configure:
post-configure:
@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
-.include "../canna/Makefile.include"
+.include "../../inputmethod/canna/Makefile.include"
diff --git a/inputmethod/canna-server/MESSAGE b/inputmethod/canna-server/MESSAGE
index 03c198fa6eb..f93d7250182 100644
--- a/inputmethod/canna-server/MESSAGE
+++ b/inputmethod/canna-server/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2005/09/28 14:15:49 rillig Exp $
+$NetBSD: MESSAGE,v 1.5 2005/12/05 20:50:23 rillig Exp $
If you want Canna server to boot automatically,
@@ -8,10 +8,10 @@ If you want Canna server to boot automatically,
canna=YES canna_flags="-u ${CANNA_USER}"
-canna_flags="-u ${CANNA_USER}" is not required, but recommended. Note that our
-Canna package no longer uses setuid(2) to make the server run as user
-"${CANNA_USER}", owing to the implementation of "-u" option (3.6 and above). See
-cannaserver(1M).
+canna_flags="-u ${CANNA_USER}" is not required, but recommended. Note
+that our Canna package no longer uses setuid(2) to make the server run
+as user "${CANNA_USER}", owing to the implementation of "-u" option (3.6
+and above). See cannaserver(1M).
Also note that by default cannaserver(1M) no longer allows connections
through tcp port 5680. You need to explicitly specify the port by the
diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile
index c99dd5dd218..99b4980f89d 100644
--- a/inputmethod/canna-server/Makefile
+++ b/inputmethod/canna-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:47 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:23 rillig Exp $
#
-.include "../canna/Makefile.common"
+.include "../../inputmethod/canna/Makefile.common"
PKGREVISION= 1
@@ -39,4 +39,4 @@ do-configure:
.include "../../devel/nbitools/buildlink3.mk"
.include "../../inputmethod/canna-lib/buildlink3.mk"
-.include "../canna/Makefile.include"
+.include "../../inputmethod/canna/Makefile.include"
diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common
index a2e6d93be95..b924694bc87 100644
--- a/inputmethod/canna/Makefile.common
+++ b/inputmethod/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/05/17 22:22:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/12/05 20:50:23 rillig Exp $
#
# Canna common makefile.
#
@@ -16,7 +16,7 @@ FILESDIR= ${.CURDIR}/../canna/files
DISTINFO_FILE= ${.CURDIR}/../canna/distinfo
PATCHDIR= ${.CURDIR}/../canna/patches
-.include "../canna/Makefile.version"
+.include "../../inputmethod/canna/Makefile.version"
USE_TOOLS+= imake
CANNA_SPOOL= ${DESTDIR}/var/spool/canna
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 1b699e1beab..1c3fc152959 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/17 00:04:02 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:23 rillig Exp $
#
DISTNAME= imhangul_status_applet-0.3
@@ -9,7 +9,7 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://imhangul.kldp.net/\#APPLET
COMMENT= GNOME2 applet to show imhangul status
-DEPENDS= imhangul>=0.9.6:../../inputmethod/imhangul
+DEPENDS+= imhangul>=0.9.6:../../inputmethod/imhangul
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1 gnome2-1.5
diff --git a/inputmethod/ja-freewnn-dict/Makefile b/inputmethod/ja-freewnn-dict/Makefile
index 5f0fa93204a..a1ebaf8bf34 100644
--- a/inputmethod/ja-freewnn-dict/Makefile
+++ b/inputmethod/ja-freewnn-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/19 10:17:17 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:23 rillig Exp $
#
PKGNAME= ja-FreeWnn-dict-1.10
@@ -24,4 +24,4 @@ PATCHDIR= ${.CURDIR}/../ja-freewnn-lib/patches
NO_MTREE= YES
INSTALLATION_PREFIX= ${IMDICTDIR}
-.include "../ja-freewnn-lib/Makefile.common"
+.include "../../inputmethod/ja-freewnn-lib/Makefile.common"
diff --git a/inputmethod/ja-freewnn-server-bin/Makefile b/inputmethod/ja-freewnn-server-bin/Makefile
index ebb4c80830b..32140129a04 100644
--- a/inputmethod/ja-freewnn-server-bin/Makefile
+++ b/inputmethod/ja-freewnn-server-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/08/23 11:48:48 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:23 rillig Exp $
#
PKGNAME= ja-FreeWnn-server-bin-1.10
@@ -30,5 +30,5 @@ BUILD_DEFS+= FREEWNN_USER FREEWNN_GROUP
PKG_GROUPS= ${FREEWNN_GROUP}
PKG_USERS= ${FREEWNN_USER}:${FREEWNN_GROUP}::Freewnn\ user
-.include "../ja-freewnn-lib/buildlink3.mk"
-.include "../ja-freewnn-lib/Makefile.common"
+.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
+.include "../../inputmethod/ja-freewnn-lib/Makefile.common"
diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile
index 06a525cb166..1d719b02bfc 100644
--- a/inputmethod/sj3-dict/Makefile
+++ b/inputmethod/sj3-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/09/28 18:22:11 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:23 rillig Exp $
#
DISTNAME= sj3-2.0.1.20
@@ -25,8 +25,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
NO_MTREE= YES
SJ3OWNER?= daemon
SJ3GROUP?= daemon
-MAKE_ENV+= SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} \
- IMDICTDIR=${IMDICTDIR} LOCAL_LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
+ IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
INSTALL_SRC= ${PKGDIR}/INSTALL
INSTALL_FILE= ${WRKDIR}/INSTALL
diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile
index 20139d6931d..27b6fefbde3 100644
--- a/inputmethod/sj3-lib/Makefile
+++ b/inputmethod/sj3-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/28 18:22:11 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:24 rillig Exp $
DISTNAME= sj3-2.0.1.20
PKGNAME= sj3-lib-2.0.1.20
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../mk/bsd.prefs.mk"
-MAKE_ENV+= IMDICTDIR=${IMDICTDIR}
+MAKE_ENV+= IMDICTDIR=${IMDICTDIR:Q}
pre-configure:
@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
diff --git a/inputmethod/sj3-server-bin/Makefile b/inputmethod/sj3-server-bin/Makefile
index a914ad13dec..e128f33e48b 100644
--- a/inputmethod/sj3-server-bin/Makefile
+++ b/inputmethod/sj3-server-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 18:22:11 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:24 rillig Exp $
#
DISTNAME= sj3-2.0.1.20
@@ -23,8 +23,8 @@ USE_PKGINSTALL= YES
BUILD_DEFS+= SJ3OWNER SJ3GROUP
SJ3OWNER?= daemon
SJ3GROUP?= daemon
-MAKE_ENV+= SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} \
- IMDICTDIR=${IMDICTDIR} LOCAL_LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
+ IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
RCD_SCRIPTS= sj3
diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile
index 91f33161869..086344da485 100644
--- a/inputmethod/skk/Makefile
+++ b/inputmethod/skk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:24 rillig Exp $
#
DISTNAME= ddskk-12.2.0
@@ -19,21 +19,21 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox xemacs214 emacs20 xemacs215
.include "../../mk/emacs.mk"
.include "options.mk"
-DEPENDS= ${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
+DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
.if ${EMACS_FLAVOR} == "emacs"
-EMACS_USE_LEIM= # defined
+EMACS_USE_LEIM= yes
BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs
.else
BUILD_DEPENDS+= xemacs-packages>=1.10:../../editors/xemacs-packages
.endif
-MAKEFLAGS= EMACS=${EMACS_BIN}
+MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
BUILD_TARGET= elc
INFO_FILES= skk.info
# SKK-CFG was copied from ${FILESDIR} during post-extract.
-SUBST_CLASSES= cfg
+SUBST_CLASSES+= cfg
SUBST_STAGE.cfg= do-configure
SUBST_FILES.cfg= SKK-CFG
SUBST_SED.cfg= -e 's|@PREFIX@|${PREFIX}|g' \
diff --git a/inputmethod/skkfep/Makefile b/inputmethod/skkfep/Makefile
index 5e84a8954fa..ececb3c2bea 100644
--- a/inputmethod/skkfep/Makefile
+++ b/inputmethod/skkfep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/09/28 16:51:32 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:24 rillig Exp $
DISTNAME= skkfep0.86c
PKGNAME= skkfep-0.86c
@@ -13,7 +13,7 @@ BUILD_DEFS+= USE_INET6
WRKSRC= ${WRKDIR}/skkfep
NO_CONFIGURE= yes
-MAKE_ENV= MAKE_FLAGS='EXECBASE=${LOCALBASE} CC=${CC}'
+MAKE_ENV+= MAKE_FLAGS=EXECBASE=${LOCALBASE:Q}\ CC=${CC:Q}
DESCR_SRC= ${WRKDIR}/DESCR
INSTALL_FILE= ${WRKDIR}/INSTALL
diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile
index 5ba57192a6f..a3bcce115f1 100644
--- a/inputmethod/skkinput/Makefile
+++ b/inputmethod/skkinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/06 03:53:27 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:24 rillig Exp $
DISTNAME= skkinput-2.06.3
CATEGORIES= japanese inputmethod
@@ -12,7 +12,7 @@ BUILD_DEFS+= USE_INET6
USE_IMAKE= YES
-PLIST_SUBST= PKGBASE=${LOCALBASE}
+PLIST_SUBST+= PKGBASE=${LOCALBASE:Q}
DESCR_SRC= ${WRKDIR}/DESCR
INSTALL_FILE= ${WRKDIR}/INSTALL
diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile
index d5d2bd49011..ae0753e05fc 100644
--- a/inputmethod/skkserv/Makefile
+++ b/inputmethod/skkserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:24 rillig Exp $
DISTNAME= skk9.6
PKGNAME= skkserv-3.9.4
@@ -37,7 +37,7 @@ SKKSERV_GID?= 65534 # nogroup
.endif
SKKSERV_UID?= 32767 # nobody
SKKSERV_GID?= 32766 # nogroup
-MAKE_ENV= SKKUID=${SKKSERV_UID} SKKGID=${SKKSERV_GID}
+MAKE_ENV+= SKKUID=${SKKSERV_UID:Q} SKKGID=${SKKSERV_GID:Q}
# tmp for building dictionary. ~16MB required. mfs would be much faster.
TMPDIR?= ${WRKDIR}
diff --git a/lang/SmartEiffel/Makefile b/lang/SmartEiffel/Makefile
index 3351c736bbb..651f511c5d3 100644
--- a/lang/SmartEiffel/Makefile
+++ b/lang/SmartEiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/06/17 04:49:47 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:24 rillig Exp $
DISTNAME= se
PKGNAME= SmartEiffel-2.0
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/SmartEiffel
DIST_SUBDIR= ${PKGNAME_NOREV}
-MAKE_ENV= SmartEiffel=${WRKSRC}/sys/system.se
+MAKE_ENV+= SmartEiffel=${WRKSRC:Q}/sys/system.se
# This package relies heavily on GCC.
ONLY_FOR_COMPILER= gcc
diff --git a/lang/blackdown-jdk13/Makefile b/lang/blackdown-jdk13/Makefile
index 1cc5d88765a..d66b380d885 100644
--- a/lang/blackdown-jdk13/Makefile
+++ b/lang/blackdown-jdk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/15 11:53:20 veego Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:24 rillig Exp $
#
BD_BASENAME= j2sdk
@@ -7,7 +7,7 @@ PKGNAME= blackdown-jdk13-1
PKGREVISION= 5
COMMENT= Linux port of the Blackdown Java(tm) Runtime Environment
-DEPENDS= blackdown-jre13>=1:../../lang/blackdown-jre13
+DEPENDS+= blackdown-jre13>=1:../../lang/blackdown-jre13
.include "../../lang/blackdown-jre13/Makefile.common"
diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index a5d143d8434..2df3c8c81a2 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/07/15 18:27:51 jlam Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/12/05 20:50:24 rillig Exp $
#
RELVERSION= 1.3.1
@@ -46,7 +46,7 @@ CHECK_SHLIBS= NO # This would use NetBSD ldd on Linux shlibs.
JVM_HOME= ${PREFIX}/java/blackdown-${RELVERSION}
USE_TOOLS+= gunzip
-PLIST_SUBST+= BLACKDOWN_ARCH=${BLACKDOWN_ARCH}
+PLIST_SUBST+= BLACKDOWN_ARCH=${BLACKDOWN_ARCH:Q}
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \
Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index f7a8b7e7508..5660c3cb91b 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/11/20 13:44:46 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:24 rillig Exp $
#
DISTNAME= chicken-2.2
@@ -17,6 +17,6 @@ INFO_FILES= chicken.info
MAKE_FLAGS+= MAKEINFO=${TRUE:Q}
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index b5569e35c42..e4ed88a08d4 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/09 21:24:12 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:24 rillig Exp $
DISTNAME= cint5.15
PKGNAME= cint-5.15.174
@@ -11,7 +11,7 @@ HOMEPAGE= http://root.cern.ch/root/Cint.html
COMMENT= C/C++ interpreter
#same distribution file name for minor versions
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
WRKSRC= ${WRKDIR}
GCC_REQD+= 3.0
PTHREAD_OPTS+= native
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 26fcf1a3e9d..90c9cd16a27 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/08/31 12:12:32 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2005/12/05 20:50:24 rillig Exp $
DISTNAME= clisp-2.33.2
PKGREVISION= 1
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_PKGLOCALEDIR= YES
-CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
+CONFIGURE_ENV+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} CPPFLAGS=${CPPFLAGS:M*:Q} \
gt_cv_func_gnugettext2_libintl=yes
GNU_CONFIGURE= YES
UNLIMIT_RESOURCES= stacksize
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index ab771e0596a..801d4a1a88a 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/10/23 21:37:32 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:24 rillig Exp $
#
DISTNAME= plt-${DRSCHEME_VERSION}-src-unix
@@ -20,7 +20,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.drscheme.org/
COMMENT= R4RS-compliant and nearly R5RS-compliant scheme tailored for teaching
-CONFLICTS+= mzscheme-[0-9]*:../../lang/mzscheme
+CONFLICTS+= mzscheme-[0-9]*
WRKSRC= ${WRKDIR}/plt/src
USE_TOOLS+= gmake perl:run
diff --git a/lang/dylan-compiler/Makefile b/lang/dylan-compiler/Makefile
index 5caa920aa3e..f955f911453 100644
--- a/lang/dylan-compiler/Makefile
+++ b/lang/dylan-compiler/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/10/03 14:25:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:24 rillig Exp $
#
PKGNAME= dylan-compiler-${DYLAN_VERSION}
-PATCHDIR= ${.CURDIR}/../dylan-interpreter/patches
-DISTINFO_FILE= ${.CURDIR}/../dylan-interpreter/distinfo
+PATCHDIR= ${.CURDIR}/../../lang/dylan-interpreter/patches
+DISTINFO_FILE= ${.CURDIR}/../../lang/dylan-interpreter/distinfo
CONFIGURE_ARGS+= --enable-mindy-bootstrap
@@ -16,4 +16,4 @@ pre-build:
@${ECHO_MSG} "You could try the dylan interpreter, in ${.CURDIR}/../dylan-interpreter"
@${ECHO_MSG} "********************************** WARNING ***********************************"
-.include "../dylan-interpreter/Makefile.common"
+.include "../../lang/dylan-interpreter/Makefile.common"
diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common
index 8d076fe3afe..b3fc040322f 100644
--- a/lang/dylan-interpreter/Makefile.common
+++ b/lang/dylan-interpreter/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2005/07/16 19:10:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.22 2005/12/05 20:50:24 rillig Exp $
#
DISTNAME= gwydion-dylan-${DYLAN_VERSION}
@@ -39,8 +39,8 @@ ALT_ARCH= ppc
ALT_ARCH= ${MACHINE_ARCH}
.endif
-PLIST_SUBST+= ALT_ARCH=${ALT_ARCH}
-PLIST_SUBST+= DYLAN_VERSION=${DYLAN_VERSION}
+PLIST_SUBST+= ALT_ARCH=${ALT_ARCH:Q}
+PLIST_SUBST+= DYLAN_VERSION=${DYLAN_VERSION:Q}
post-patch:
cd ${WRKSRC}; \
diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index 64dcc57435d..c8f4cf0f1b4 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:24 rillig Exp $
#
DISTNAME= eieio-0.17
@@ -16,9 +16,9 @@ COMMENT= Enhanced Integration of Emacs Interpreted Objects
DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages
.endif
-MAKEFLAGS+= EMACS=${EMACS_BIN}
+MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
-NO_CONFIGURE= # set
+NO_CONFIGURE= yes
USE_TOOLS+= gmake
INFO_FILES= eieio.info
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 814beebc843..bcc0d260b81 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/10/15 23:07:21 tonio Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:25 rillig Exp $
DISTNAME= elk-3.99.6
CATEGORIES= lang
@@ -11,7 +11,7 @@ COMMENT= Embeddable Scheme interpreter
GNU_CONFIGURE=yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= WITH_XAW="${ELK_AWK}"
+CONFIGURE_ENV+= WITH_XAW=${ELK_AWK:Q}
.include "options.mk"
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index bf98887cf05..521ba9acef9 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:11 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:25 rillig Exp $
DISTNAME= otp_src_R9C-0
PKGNAME= erlang-9.2
@@ -19,7 +19,7 @@ USE_JAVA2= yes
CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
-SUBST_CLASSES= target
+SUBST_CLASSES+= target
SUBST_STAGE.target= post-patch
SUBST_FILES.target= make/target.mk
SUBST_SED.target= -e "s|=.*config.guess)|= ${MACHINE_GNU_PLATFORM}|"
diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile
index 220da22f1af..2d5cf226532 100644
--- a/lang/ezm3/Makefile
+++ b/lang/ezm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/05 09:47:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:25 rillig Exp $
DISTNAME= ezm3-1.1
PKGREVISION= 1
@@ -14,7 +14,7 @@ DIST_SUBDIR= ezm3
USE_TOOLS+= gmake
INSTALL_TARGET= all
MAKE_ARGS+= M3OPTIONS="-DBUILD_ALL -DSHIP_ALL"
-PLIST_SUBST+= TARGET=${TARGET} TARGETDIR=${TARGETDIR}
+PLIST_SUBST+= TARGET=${TARGET:Q} TARGETDIR=${TARGETDIR:Q}
# XXX CFLAGS has to be empty, because if it's not, the build
# XXX process will fail.
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 8e417668d20..4caacd015fb 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/12/01 13:06:07 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:25 rillig Exp $
DISTNAME= f2c-20001205
PKGREVISION= 8
@@ -26,10 +26,10 @@ CONFLICTS= egcs-current-19980608
F2CMAJOR= 0
F2CMINOR= 0
-MAKE_ENV+= F2CMAJOR=${F2CMAJOR} F2CMINOR=${F2CMINOR}
-MAKE_ENV+= LIBOWN=${LIBOWN} LIBGRP=${LIBGRP}
-MAKE_ENV+= AWK=${AWK}
-MAKE_ENV+= ECHO=${ECHO}
+MAKE_ENV+= F2CMAJOR=${F2CMAJOR:Q} F2CMINOR=${F2CMINOR:Q}
+MAKE_ENV+= LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q}
+MAKE_ENV+= AWK=${AWK:Q}
+MAKE_ENV+= ECHO=${ECHO:Q}
WRKSRC= ${WRKDIR}/f2c
USE_LIBTOOL= yes
@@ -40,7 +40,7 @@ USE_TOOLS+= gunzip
post-extract:
@${RM} ${WRKSRC}/index.html
@for f in ${WRKSRC}/*.gz ; do \
- if test "$$f" = "${WRKSRC}/00lastchange.gz" ; then \
+ if ${TEST} "$$f" = "${WRKSRC}/00lastchange.gz" ; then \
${ECHO} "Skipping $$f" ; \
else \
${GUNZIP_CMD} $$f ; \
@@ -59,7 +59,7 @@ do-configure:
@${CP} -f ${WRKSRC}/f2c.h ${WRKSRC}/libI77/f2c.h
.include "../../mk/bsd.prefs.mk"
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/f2c/buildlink3.mk b/lang/f2c/buildlink3.mk
index 43fbc0df4ca..ba5bc297250 100644
--- a/lang/f2c/buildlink3.mk
+++ b/lang/f2c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/01/28 23:37:42 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/12/05 20:50:25 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
F2C_BUILDLINK3_MK:= ${F2C_BUILDLINK3_MK}+
@@ -19,9 +19,9 @@ BUILDLINK_PKGSRCDIR.f2c?= ../../lang/f2c
# The f2c-f77 script takes some environment variables to override hardcoded
# values for the compiler and C preprocessor.
#
-CONFIGURE_ENV+= CC_f2c="${CC}"
-CONFIGURE_ENV+= CPP="${CPP}"
-MAKE_ENV+= CC_f2c="${CC}"
-MAKE_ENV+= CPP="${CPP}"
+CONFIGURE_ENV+= CC_f2c=${CC:Q}
+CONFIGURE_ENV+= CPP=${CPP:Q}
+MAKE_ENV+= CC_f2c=${CC:Q}
+MAKE_ENV+= CPP=${CPP:Q}
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile
index e2250c9231c..5a820042e24 100644
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:11 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:25 rillig Exp $
#
DISTNAME= fort77-1.14a
@@ -19,7 +19,7 @@ F2CPKGHASNOSHAREDLIB=
.endif
.if exists(/usr/bin/fort77)
-PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution"
+PKG_SKIP_REASON+= "${PKGNAME} is part of your ${OPSYS} distribution"
.endif
BUILD_TARGET= test
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 2d578379cd2..00e7db0a088 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/09/05 16:58:22 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:25 rillig Exp $
#
DISTNAME= gawk-3.1.5
@@ -20,7 +20,7 @@ TEST_TARGET= check
INFO_FILES= gawk.info gawkinet.info
-MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
LDFLAGS.IRIX+= -lgen
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 9bfc39d8ada..71d9e562b23 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/11/09 21:25:39 tv Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:25 rillig Exp $
DISTNAME= gcc-2.95.3
PKGNAME= gcc-ssp-2.95.3.13
@@ -34,17 +34,17 @@ USE_TOOLS+= gmake
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ${WRKSRC}/configure
-CONFIGURE_ARGS= --host=${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX}
CONFIGURE_ARGS+= --enable-shared
USE_TOOLS+= chmod
-MAKE_ENV+= ac_cv_prog_chmod="${TOOLS_CHMOD}"
+MAKE_ENV+= ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
CONFIGURE_DIRS= ${WRKDIR}/objdir
BUILD_DIRS= ${CONFIGURE_DIRS}
-FILES_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} GCC_PREFIX=${GCC_PREFIX}
+FILES_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} GCC_PREFIX=${GCC_PREFIX:Q}
MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV}
INFO_DIR= ${GCC_PREFIX:S|^${PREFIX}/||}/info
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 00ebda18e52..16580743bd5 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2005/11/09 21:25:39 tv Exp $
+# $NetBSD: Makefile,v 1.83 2005/12/05 20:50:25 rillig Exp $
DISTNAME= gcc-2.95.3
PKGREVISION= 6
@@ -23,19 +23,19 @@ MAKEFLAGS+= GMAKE_LOCALE=no
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ${WRKSRC}/configure
-CONFIGURE_ARGS= --host=${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX}
CONFIGURE_ARGS+= --enable-shared
USE_TOOLS+= chmod
-MAKE_ENV+= ac_cv_prog_chmod="${TOOLS_CHMOD}"
+MAKE_ENV+= ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
CONFIGURE_DIRS= ${WRKDIR}/objdir
BUILD_DIRS= ${CONFIGURE_DIRS}
-FILES_SUBST+= DISTNAME=${DISTNAME} GCC_PREFIX=${GCC_PREFIX}
+FILES_SUBST+= DISTNAME=${DISTNAME:Q} GCC_PREFIX=${GCC_PREFIX:Q}
MESSAGE_SUBST+= DISTNAME=${DISTNAME}
-PLIST_SUBST+= DISTNAME=${DISTNAME}
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
INFO_DIR= ${GCC_PREFIX:S|^${PREFIX}/||}/info
INFO_FILES= chill.info cpp.info g77.info gcc.info
diff --git a/lang/gcc3-f77/Makefile b/lang/gcc3-f77/Makefile
index 9abf8db1b7e..76d77d9c2b9 100644
--- a/lang/gcc3-f77/Makefile
+++ b/lang/gcc3-f77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/19 00:10:45 kristerw Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:25 rillig Exp $
PKGNAME= gcc3${GCC3_PKGMODIF}-f77-${GCC_VERSION}
PKGREVISION= 1
@@ -11,7 +11,7 @@ INSTLIBS= libf2c/libg2c.la
.include "../../lang/gcc3/language.mk"
USE_TOOLS+= chmod
-MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod="${TOOLS_CHMOD}"
+MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
CONFIGURE_ARGS+= --enable-languages="f77"
ONLY_FOR_COMPILER= gcc
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index 5ecabe0c702..eae1a2a6433 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/16 06:58:00 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:25 rillig Exp $
PKGNAME= gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
COMMENT= GNU Compiler Collection, v3 - Java compiler
@@ -56,6 +56,6 @@ do-install:
. if ${MACHINE_ARCH} == "alpha"
CONFIG_CFLAGS= ${CFLAGS:C/-O[0-9]*//g}
CONFIG_CPPFLAGS= ${CPPFLAGS:C/-O[0-9]*//g}
-CONFIGURE_ENV+= CFLAGS="${CONFIG_CFLAGS}" CPPFLAGS="${CONFIG_CPPFLAGS}"
+CONFIGURE_ENV+= CFLAGS=${CONFIG_CFLAGS:Q} CPPFLAGS=${CONFIG_CPPFLAGS:Q}
. endif
.endif
diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common
index 518dd9a980a..3fea3b23d81 100644
--- a/lang/gcc3/Makefile.common
+++ b/lang/gcc3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:08:09 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:25 rillig Exp $
GCC_VERSION= 3.3.5
DISTNAME= gcc-${GCC_VERSION}
@@ -31,9 +31,9 @@ GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
GCC_SUBPREFIX= ${GCC3_INSTALLTO_SUBPREFIX}
GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX}
-PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX}
-FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX}
-FILES_SUBST+= PKGNAME=${PKGNAME}
+PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX:Q}
+FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX:Q}
+FILES_SUBST+= PKGNAME=${PKGNAME:Q}
MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX}
BUILDLINK_PASSTHRU_RPATHDIRS+= ${GCC_PREFIX}
@@ -57,7 +57,7 @@ PTHREAD_OPTS+= require native
GCC_PLATFORM= ${MACHINE_GNU_PLATFORM}
.endif
CONFIGURE_ARGS+= --host=${GCC_PLATFORM}
-PLIST_SUBST+= GCC_PLATFORM=${GCC_PLATFORM}
+PLIST_SUBST+= GCC_PLATFORM=${GCC_PLATFORM:Q}
.if ${OPSYS} == "AIX"
CONFIGURE_ARGS+= --disable-aix64
@@ -83,7 +83,7 @@ AS_VERSION!= ${AS_PATH} --version | ${AWK} '{ \
}'
USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
. endif
-MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS}
+MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q}
. endif
.endif
diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile
index db30872a4f5..b2e5415c5ad 100644
--- a/lang/gcc34-ada/Makefile
+++ b/lang/gcc34-ada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/05 10:30:06 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:25 rillig Exp $
#
DISTNAME= gcc-${GCC_VERSION}
@@ -45,7 +45,7 @@ AS_VERSION!= ${AS} --version | ${AWK} '{ \
}'
USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
. endif
-MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS}
+MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q}
. endif
.endif
.if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS])
@@ -71,14 +71,14 @@ ALT_GCC_RTS!= ${ALT_GCC} --print-file-name=adalib
. if !empty(ALT_GCC_RTS)
RALT_GCC_RTS= ${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%}
. else
-PKG_SKIP_REASON= "${ALT_GCC} does not appear to be an Ada compiler"
+PKG_SKIP_REASON+= "${ALT_GCC} does not appear to be an Ada compiler"
. endif
. else
-PKG_SKIP_REASON= "Missing bootstrap Ada compiler"
+PKG_SKIP_REASON+= "Missing bootstrap Ada compiler"
. endif
.endif
.if !defined(USE_GCC34) && !defined(ALT_GCC)
-PKG_SKIP_REASON= "An Ada bootstrap compiler must be specified"
+PKG_SKIP_REASON+= "An Ada bootstrap compiler must be specified"
.endif
# Make location overridable, to allow ping-pong bootstraps.
@@ -94,9 +94,9 @@ GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_
CONFIGURE_ARGS+= --host=${GCC_PLATFORM}
GCC_ARCHSUBDIR= ${GCC_SUBPREFIX}/lib/gcc/${GCC_PLATFORM}/${GCC_VERSION}
GCC_ARCHDIR= ${PREFIX}/${GCC_ARCHSUBDIR}
-PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX}
-FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX}
-FILES_SUBST+= PKGNAME=${PKGNAME}
+PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX:Q}
+FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX:Q}
+FILES_SUBST+= PKGNAME=${PKGNAME:Q}
MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX}
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX}
PTHREAD_OPTS+= require native
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 9236c22d91c..7e4b7f1a6ad 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/11/05 08:43:44 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:25 rillig Exp $
#
DISTNAME= gcc-${GCC_VERSION}
@@ -40,7 +40,7 @@ AS_VERSION!= ${AS_PATH} --version | ${AWK} '{ \
}'
USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
. endif
-MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS}
+MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q}
. endif
.endif
.if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS])
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --with-gnu-ld
# Optional languages - change as required
# If BUILD_ADA is YES, then you'll need to specify
# an Ada in the "Ada bootstrap compiler section"
-BUILD_DEFS= BUILD_ADA BUILD_CXX BUILD_F77 \
+BUILD_DEFS+= BUILD_ADA BUILD_CXX BUILD_F77 \
BUILD_JAVA BUILD_OBJC
BUILD_ADA?= NO
BUILD_CXX?= YES
@@ -91,15 +91,15 @@ MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
.include "../../devel/gmp/buildlink3.mk"
CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
USE_TOOLS+= chmod
-MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod="${TOOLS_CHMOD}"
+MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
.endif
# GNU pth is useless here
.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
# ADA tasking strictly requires native threads
-PTHREAD_OPTS= require native
+PTHREAD_OPTS+= require native
.else
-PTHREAD_OPTS= native
+PTHREAD_OPTS+= native
.endif
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native"
@@ -110,7 +110,7 @@ USE_PKGINSTALL= YES
USE_TOOLS+= gmake
HAS_CONFIGURE= YES # no GNU_CONFIGURE!
CONFIG_SHELL?= ${SH}
-CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
+CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q}
USE_MAKEINFO= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
@@ -129,20 +129,20 @@ ALT_GCC_RTS!= ${ALT_GCC} --print-file-name=adalib
. if !empty(ALT_GCC_RTS)
RALT_GCC_RTS= ${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%}
. else
-PKG_SKIP_REASON= "${ALT_GCC} does not appear to be an Ada compiler"
+PKG_SKIP_REASON+= "${ALT_GCC} does not appear to be an Ada compiler"
. endif
. else
-PKG_SKIP_REASON= "Missing bootstrap Ada compiler"
+PKG_SKIP_REASON+= "Missing bootstrap Ada compiler"
. endif
. endif
. if !defined(USE_GCC34ADA) && !defined(ALT_GCC)
-PKG_SKIP_REASON= "An Ada bootstrap compiler must be specified to BUILD_ADA"
+PKG_SKIP_REASON+= "An Ada bootstrap compiler must be specified to BUILD_ADA"
. endif
.endif
GCC_SUBPREFIX= gcc34
GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
-FILES_SUBST+= PKGNAME=${PKGNAME}
+FILES_SUBST+= PKGNAME=${PKGNAME:Q}
MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX}
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX}
CPPFLAGS+= -I${BUILDLINK_DIR}/include
@@ -152,7 +152,7 @@ CFLAGS+= -I${BUILDLINK_DIR}/include
GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//}
CONFIGURE_ARGS+= --host=${GCC_PLATFORM}
ABI_BASELINE_PAIR= ${GCC_PLATFORM:C/--/-/}
-MAKE_ENV+= ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR}
+MAKE_ENV+= ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR:Q}
.endif # NetBSD
post-patch:
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 07b52524625..e810ebbd1a6 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/10/14 18:47:28 kristerw Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:25 rillig Exp $
DISTNAME= ghc-6.4.1
CATEGORIES= lang
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.5*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ghc=${WRKDIR}/bootstrap/bin/ghc
-CONFIGURE_ENV+= PerlCmd=${PERL5}
+CONFIGURE_ENV+= PerlCmd=${PERL5:Q}
USE_GNU_READLINE= yes # uses the UNDO_ constants
USE_TOOLS+= gmake perl:run
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index 754e36973e3..d01b9e9c1a6 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/11/09 21:26:45 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:25 rillig Exp $
DISTNAME= gpc-2.1
PKGREVISION= 3
@@ -22,7 +22,7 @@ NOT_FOR_PLATFORM+= Interix-*-*
WRKSRC= ${WRKDIR}/gcc-2.95.3
USE_TOOLS+= gmake
-USE_NCURSES= # defined
+USE_NCURSES= yes
PLIST_SRC= PLIST
.include "../../mk/bsd.prefs.mk"
@@ -41,13 +41,13 @@ GPC_SUBPREFIX= ${_GCC_SUBPREFIX}/
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ${WRKSRC}/configure
-CONFIGURE_ARGS= --host=${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
CONFIGURE_ARGS+= --prefix=${GPC_PREFIX}
CONFIGURE_ARGS+= --infodir=${PREFIX}/info
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-languages=pascal
-PLIST_SUBST+= GPC_SUBPREFIX=${GPC_SUBPREFIX}
+PLIST_SUBST+= GPC_SUBPREFIX=${GPC_SUBPREFIX:Q}
CONFIGURE_DIRS= ${WRKDIR}/objdir
BUILD_DIRS= ${CONFIGURE_DIRS}
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index fbf2760f9cf..608d639ff4a 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:58 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:25 rillig Exp $
DISTNAME= icon.v942src
PKGNAME= icon-9.4.2
@@ -35,7 +35,7 @@ NAME= sun_gcc
. elif !empty(CC_VERSION:MSun)
NAME= sun_sunc
. else
-PKG_FAIL_REASON= "${PKGNAME} does not know about ${CC_VERSION}"
+PKG_FAIL_REASON+= "${PKGNAME} does not know about ${CC_VERSION}"
. endif
. if ${MACHINE_ARCH} == "sparc"
@@ -45,7 +45,7 @@ PTHREAD_OPTS+= require native
. endif
.else
-PKG_FAIL_REASON= "${PKGNAME} does not have the correct config name for this system"
+PKG_FAIL_REASON+= "${PKGNAME} does not have the correct config name for this system"
.endif
.include "../../mk/x11.buildlink3.mk"
diff --git a/lang/jdk-openjit/Makefile.common b/lang/jdk-openjit/Makefile.common
index 48d08d787d7..e4ebbf662e7 100644
--- a/lang/jdk-openjit/Makefile.common
+++ b/lang/jdk-openjit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:08:10 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:50:25 rillig Exp $
OPENJIT_VERSION=1.1.16
@@ -10,7 +10,7 @@ MAINTAINER= tv@pobox.com
HOMEPAGE= http://www.openjit.org/
COMMENT= Reflective JIT compiler for Java
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
@@ -18,7 +18,7 @@ USE_TOOLS+= gmake
CONFIGURE_ARGS+=--with-jdk=${PKG_JAVA_HOME}
-PLIST_SUBST+= CLASSDIR=${CLASSDIR} JRELIB=${JRELIB} JAVADIR=${PKG_JAVA_HOME:C|^${PREFIX}/||}
+PLIST_SUBST+= CLASSDIR=${CLASSDIR:Q} JRELIB=${JRELIB:Q} JAVADIR=${PKG_JAVA_HOME:C|^${PREFIX}/||}
PKGDIR= ${.CURDIR}/../../lang/jdk-openjit
DISTINFO_FILE= ${PKGDIR}/distinfo
diff --git a/lang/ksi/Makefile b/lang/ksi/Makefile
index 0a38ba1c870..bf1458b375b 100644
--- a/lang/ksi/Makefile
+++ b/lang/ksi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:26 rillig Exp $
DISTNAME= ksi-3.4.1
PKGREVISION= 3
@@ -12,7 +12,7 @@ COMMENT= Portable, embeddable Scheme implementation written in C
CPPFLAGS+= -Dunix
GNU_CONFIGURE= yes
INFO_FILES= ksi-lang.info ksi-lib.info ksi.info
-MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
+MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
USE_GNU_READLINE= # uses rl_event_hook() interface
USE_LIBTOOL= yes
USE_MAKEINFO= YES
diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk
index ba4619ea9eb..392cc3faa8a 100644
--- a/lang/librep/buildlink3.mk
+++ b/lang/librep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:15:01 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/12/05 20:50:26 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBREP_BUILDLINK3_MK:= ${LIBREP_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+= librep
BUILDLINK_DEPENDS.librep+= librep>=0.17
BUILDLINK_RECOMMENDED.librep+= librep>=0.17nb1
BUILDLINK_PKGSRCDIR.librep?= ../../lang/librep
-MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL}
+MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL:Q}
.endif # LIBREP_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/lang/libtcl-nothread/Makefile b/lang/libtcl-nothread/Makefile
index dba9c06c99b..3c39806aa63 100644
--- a/lang/libtcl-nothread/Makefile
+++ b/lang/libtcl-nothread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:58:00 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:26 rillig Exp $
#
DISTNAME= tcl8.4.6-src
@@ -15,7 +15,7 @@ DEPENDS+= tcl>=8.4.6nb5:../../lang/tcl
WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix
GNU_CONFIGURE= yes
-MAKE_ENV+= TOUCH="${TOUCH}"
+MAKE_ENV+= TOUCH=${TOUCH:Q}
MAKE_ENV+= NOTHREAD_SUFX=-nothread
USE_LIBTOOL= yes
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index c25778672c8..a8262c59060 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/12 21:33:17 kristerw Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:26 rillig Exp $
DISTNAME= mercury-compiler-0.11.0
PKGNAME= mercury-0.11.0
@@ -22,7 +22,7 @@ INFO_FILES+= mercury_user_guide.info
# Some of the scripts test CC and use special settings for gcc.
CONFIGURE_ENV+= CC=gcc
-CONFIGURE_ENV+= HOSTNAMECMD=${TOOLS_HOSTNAME_CMD}
+CONFIGURE_ENV+= HOSTNAMECMD=${TOOLS_HOSTNAME_CMD:Q}
USE_TOOLS+= hostname
MAKE_ENV+= READLINE_PREFIX=${BUILDLINK_PREFIX.readline}
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 055e49e946e..a9f0835110d 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:18 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:26 rillig Exp $
DISTNAME= mono-1.1.8.3
PKGREVISION= 1
@@ -29,7 +29,7 @@ EXTRACT_USING= gtar
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-MAKE_FLAGS+= PERL=${PERL5}
+MAKE_FLAGS+= PERL=${PERL5:Q}
UNLIMIT_RESOURCES= datasize
UNLIMIT_RESOURCES+= stacksize
UNLIMIT_RESOURCES+= memorysize
diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile
index 30f7b272d95..e1821e886b7 100644
--- a/lang/mpd/Makefile
+++ b/lang/mpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/10/19 08:45:24 is Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:26 rillig Exp $
#
PKGNAME= mpd-1.0.1
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.cs.arizona.edu/mpd/download/
EXTRACT_SUFX= .tgz
DIST_SUBDIR= mpd-language
-CONFLICTS= audio/musicpd
+CONFLICTS+= musicpd-[0-9]*
MAINTAINER= is@NetBSD.org
HOMEPAGE= http://www.cs.arizona.edu/mpd/
diff --git a/lang/mzscheme/Makefile b/lang/mzscheme/Makefile
index 33d29d4d327..33820d7ac84 100644
--- a/lang/mzscheme/Makefile
+++ b/lang/mzscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/09/24 02:30:57 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:26 rillig Exp $
DISTNAME= mzscheme-205.src.unix
PKGNAME= mzscheme-205
@@ -9,7 +9,7 @@ MAINTAINER= pooka@NetBSD.org
HOMEPAGE= http://www.plt-scheme.org/software/mzscheme/
COMMENT= R5RS-compliant scheme
-CONFLICTS+= drscheme*:../drscheme
+CONFLICTS+= drscheme-[0-9]*
WRKSRC= ${WRKDIR}/plt/src
GNU_CONFIGURE= yes
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index f87813ea15f..b0d96d2a466 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/22 19:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:26 rillig Exp $
#
DISTNAME= awk
@@ -15,13 +15,13 @@ MAINTAINER= cjep@NetBSD.org
HOMEPAGE= http://cm.bell-labs.com/who/bwk/
COMMENT= Brian Kernighan's pattern-directed scanning and processing language
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_TOOLS+= yacc
WRKSRC= ${WRKDIR}
CFLAGS+= ${CPPFLAGS}
-MAKE_FLAGS+= CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+= CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:M*:Q}
BUILD_TARGET= a.out
INSTALLATION_DIRS= bin man/man1
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index faaef23f9e5..86a7400d853 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:10 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:26 rillig Exp $
DISTNAME= nhc98src-1.18.tar.gz
PKGNAME= nhc98-1.18
@@ -17,8 +17,8 @@ NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 *-*-x86_64
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
-INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
+INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-*
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --buildwith=gcc --installdir=${PREFIX} \
@@ -28,7 +28,7 @@ USE_TOOLS+= gmake
BUILD_TARGET= default
HARCH= `${WRKSRC}/script/harch`
-PLIST_SUBST+= HARCH=${HARCH}
+PLIST_SUBST+= HARCH=${HARCH:Q}
post-extract:
@${FIND} ${WRKSRC}/docs -type d -name \*CVS\* -print | ${XARGS} ${RM} -rf
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 4a8a0aae6d9..796db89b058 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2005/09/04 13:57:50 tonio Exp $
+# $NetBSD: Makefile.common,v 1.12 2005/12/05 20:50:26 rillig Exp $
DISTNAME= ocaml-3.08.4
CATEGORIES= lang
@@ -17,7 +17,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS+= -prefix ${PREFIX}
CONFIGURE_ARGS+= -libs "${LDFLAGS}"
CONFIGURE_ARGS+= -with-pthread
-CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS} \
+CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS:Q} \
BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}}
CPPFLAGS+= -DDB_DBM_HSEARCH
diff --git a/lang/ocaml/PLIST.stub b/lang/ocaml/PLIST.stub
index abd01f65c1e..7ca7a465e71 100644
--- a/lang/ocaml/PLIST.stub
+++ b/lang/ocaml/PLIST.stub
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.stub,v 1.1 2005/02/04 21:35:51 adrianp Exp $
+@comment $NetBSD: PLIST.stub,v 1.2 2005/12/05 20:50:26 rillig Exp $
lib/ocaml/stublibs/dllbigarray.so
lib/ocaml/stublibs/dllmldbm.so
lib/ocaml/stublibs/dllnums.so
@@ -6,5 +6,5 @@ lib/ocaml/stublibs/dllstr.so
lib/ocaml/stublibs/dllthreads.so
lib/ocaml/stublibs/dllunix.so
lib/ocaml/stublibs/dllvmthreads.so
-@unexec ${RMDIR} %D/lib/ocaml/stublibs
+@dirrm lib/ocaml/stublibs
@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}
diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile
index 1ccac42ad58..13935a1421b 100644
--- a/lang/onyx/Makefile
+++ b/lang/onyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:26 rillig Exp $
DISTNAME= onyx-${VERS}
PKGREVISION= 1
@@ -13,7 +13,7 @@ COMMENT= Embeddable stack-based threaded interpreted language
BUILD_DEPENDS+= cook-[0-9]*:../../devel/cook
# needs EL_CLIENTDATA in /usr/include/histedit.h
-ONLY_FOR_PLATFORM= NetBSD-1.5[YZ]*-* NetBSD-1.6*-* NetBSD-1.7*-* NetBSD-[2-9]*
+ONLY_FOR_PLATFORM= NetBSD-1.5[YZ]*-* NetBSD-1.6*-* NetBSD-1.7*-* NetBSD-[2-9]*-*
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-pcre-prefix=${BUILDLINK_PREFIX.pcre}
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-pcre-prefix=${BUILDLINK_PREFIX.pcre}
BUILDLINK_DEPENDS.pcre?= pcre>=4.0
VERS= 5.1.1
-PLIST_SUBST+= VERS=${VERS}
+PLIST_SUBST+= VERS=${VERS:Q}
do-build:
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} cook)
diff --git a/lang/opencobol/Makefile b/lang/opencobol/Makefile
index 26af76ebd71..cb120f487d5 100644
--- a/lang/opencobol/Makefile
+++ b/lang/opencobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:26 rillig Exp $
#
DISTNAME= open-cobol-0.23
@@ -28,7 +28,7 @@ CONF_FILES= ${EGDIR}/libconf.conf ${PKG_SYSCONFDIR}/libconf.conf
.include "../../mk/bsd.prefs.mk"
-SUBST_CLASSES= lnk
+SUBST_CLASSES+= lnk
SUBST_STAGE.lnk= post-patch
SUBST_FILES.lnk= configure
SUBST_SED.lnk= -e "s|COBC_LIBS=\"\"|COBC_LIBS=\"\$$LDFLAGS\"|g" \
diff --git a/lang/perl5/hacks.mk b/lang/perl5/hacks.mk
index c65ce0aee4b..1aa7403fbdb 100644
--- a/lang/perl5/hacks.mk
+++ b/lang/perl5/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2005/06/24 06:43:45 jlam Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:26 rillig Exp $
.include "../../mk/compiler.mk"
@@ -16,7 +16,7 @@ _GCC_IS_TOO_OLD!= \
else \
${ECHO} "no"; \
fi
-MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD}
+MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD:Q}
. endif
. if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS])
PKG_HACKS+= sparc64-codegen
diff --git a/lang/php5/MESSAGE b/lang/php5/MESSAGE
index 56649187689..9903a4c390f 100644
--- a/lang/php5/MESSAGE
+++ b/lang/php5/MESSAGE
@@ -1,7 +1,6 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2005/10/08 16:51:50 jdolecek Exp $
+$NetBSD: MESSAGE,v 1.5 2005/12/05 20:50:26 rillig Exp $
Note php-openssl has been removed as separate package as of 5.0.5nb1, the
main PHP5 package has it built-in now.
===========================================================================
-
diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common
index 094cbc1e583..777cedf9ce1 100644
--- a/lang/php5/Makefile.common
+++ b/lang/php5/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/12/03 18:53:57 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/12/05 20:50:26 rillig Exp $
#
DISTNAME?= php-${PHP_BASE_VERS}
@@ -17,7 +17,7 @@ HOMEPAGE?= http://www.php.net/
PHP_BASE_VERS= 5.1.1
PHP_EXTENSION_DIR= lib/php/20040412
-PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
+PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
PKG_SYSCONFVAR?= php
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index 919dd5bb53c..3dfc50fd3be 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.php,v 1.15 2005/12/03 18:53:57 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.16 2005/12/05 20:50:26 rillig Exp $
#
.include "../../lang/php5/Makefile.common"
DISTINFO_FILE= ${.CURDIR}/../../lang/php5/distinfo
-BUILD_DEFS= USE_INET6
+BUILD_DEFS+= USE_INET6
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -13,7 +13,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
PHP_EXTENSION_DIR= lib/php/20040412
-PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
+PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/lang/pnet/Makefile b/lang/pnet/Makefile
index 68aebe0a873..b54ea3bbeeb 100644
--- a/lang/pnet/Makefile
+++ b/lang/pnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:26 rillig Exp $
DISTNAME= pnet-0.6.6
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= pancake@phreaker.net
HOMEPAGE= http://www.dotgnu.org/
COMMENT= DotGNU Portable.NET (development tools)
-BUILD_DEPENDS= treecc>=0.2.6:../../devel/treecc
+BUILD_DEPENDS+= treecc>=0.2.6:../../devel/treecc
CONFLICTS= mono-[0-9]*
diff --git a/lang/py-basicproperty/Makefile b/lang/py-basicproperty/Makefile
index 23ed6dcdc64..5f120a51a71 100644
--- a/lang/py-basicproperty/Makefile
+++ b/lang/py-basicproperty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:26 rillig Exp $
#
DISTNAME= basicproperty-0.6.3a
@@ -15,7 +15,7 @@ MAKE_ENV+= BINDIR=${PREFIX}/bin
USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/py-funge/Makefile b/lang/py-funge/Makefile
index db2d711776e..7c3c3d3898b 100644
--- a/lang/py-funge/Makefile
+++ b/lang/py-funge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:26 rillig Exp $
DISTNAME= pyfunge-0.2-beta1
PKGNAME= ${PYPKGPREFIX}-funge-0.2beta1
@@ -15,7 +15,7 @@ NO_CONFIGURE= yes
PYTHON_VERSIONS_ACCEPTED?= 23
WRKSRC?= ${WRKDIR}/PyFunge
-PLIST_SUBST+= PYSITELIB=${PYSITELIB}
+PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
diff --git a/lang/py-pyrex/Makefile b/lang/py-pyrex/Makefile
index 5787ef50b98..9c3aca2407f 100644
--- a/lang/py-pyrex/Makefile
+++ b/lang/py-pyrex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:26 rillig Exp $
DISTNAME= Pyrex-0.9.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/P/p/}
@@ -7,7 +7,7 @@ MASTER_SITES= http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/
MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/
-COMMENT= A Language for Writing Python Extension Modules
+COMMENT= Language for Writing Python Extension Modules
PYTHON_VERSIONS_ACCEPTED= 23 22
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index c992ec2d4c6..42f42dc7082 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/03 01:35:36 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:27 rillig Exp $
#
DISTNAME= py152
@@ -35,7 +35,7 @@ PY_PLATNAME= ${LOWER_OPSYS:C/\..*//}
.else
PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
.endif
-PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME}
+PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
post-patch:
${RM} -f ${WRKSRC}/Lib/test/test_fcntl.py.orig
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 6ed92fa250f..15c92823f8c 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/11/16 19:18:58 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:27 rillig Exp $
#
DISTNAME= Python-2.1.3
@@ -17,7 +17,7 @@ CONFLICTS+= python-[0-9]*
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
.if ${PTHREAD_TYPE} == "pth"
CONFIGURE_ARGS+= --with-pth
@@ -45,7 +45,7 @@ PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
.else
PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
.endif
-PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME}
+PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
PLAT_SOCKET= "@comment "
PLAT_TERMIOS= "@comment "
@@ -57,7 +57,7 @@ PLAT_SOCKET= ""
PLAT_TERMIOS= ""
. endif
.endif
-PLIST_SUBST+= PLAT_SOCKET=${PLAT_SOCKET} PLAT_TERMIOS=${PLAT_TERMIOS}
+PLIST_SUBST+= PLAT_SOCKET=${PLAT_SOCKET:Q} PLAT_TERMIOS=${PLAT_TERMIOS:Q}
# bsddb.so is not built on Solaris (or IRIX?)
BSDDB=
@@ -65,13 +65,13 @@ BSDDB=
BSDDB= "@comment "
.else
.include "../../mk/bdb.buildlink3.mk"
-MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
+MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q}
MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
.endif
-PLIST_SUBST+= BSDDB=${BSDDB}
+PLIST_SUBST+= BSDDB=${BSDDB:Q}
-PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
+PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
post-extract:
${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index aa4ee9b356c..03ec4644efc 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/11/16 19:18:58 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:27 rillig Exp $
#
DISTNAME= Python-2.2.3
@@ -17,7 +17,7 @@ CONFLICTS+= python-[0-9]*
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
.if ${PTHREAD_TYPE} == "pth"
CONFIGURE_ARGS+= --with-pth
@@ -34,7 +34,7 @@ PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.${OPSYS}
PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.common_end
.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
-PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}
+PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:Q}
.elif ${OPSYS} == "IRIX"
PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:C/\..*//}
.elif ${OPSYS} == "SunOS"
@@ -43,7 +43,7 @@ PLIST_SUBST+= PY_PLATNAME=sunos${OS_VERSION:C/\..*//}
PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
.endif
-PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
+PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
INSTALL_TARGET= altinstall
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 128224f9730..80da4710c29 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/11/16 19:18:59 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:27 rillig Exp $
#
PKGNAME= python23-2.3.5
@@ -8,7 +8,7 @@ CONFLICTS+= python-[0-9]*
#PKG_INSTALLATION_TYPES= overwrite pkgviews
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
.if ${PTHREAD_TYPE} == "pth"
CONFIGURE_ARGS+= --with-pth
diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common
index 0180eba6936..b327f0f164b 100644
--- a/lang/python23/Makefile.common
+++ b/lang/python23/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/07/03 19:49:06 recht Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/12/05 20:50:27 rillig Exp $
#
DISTNAME= Python-2.3.5
@@ -13,10 +13,10 @@ COMMENT= Interpreted, interactive, object-oriented programming language
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= OPT="${CFLAGS}"
+CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q}
# fdatasync()
-LIBS.SunOS= -lrt
+LIBS.SunOS+= -lrt
.include "../../mk/bsd.prefs.mk"
@@ -35,7 +35,7 @@ PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
.else
PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
.endif
-PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME}
+PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
# the dl module isn't built for 64 bit archs and Darwin
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \
@@ -62,8 +62,8 @@ OSSAUDIODEV_SUBST=
EXTRA_SO_SUBST=
.endif
-PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST}
-PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST}
+PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST:Q}
+PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST:Q}
# Make sure python modules can link correctly
.if ${OPSYS} == "Darwin"
@@ -80,7 +80,7 @@ PLIST_SUBST+= BSDDBMODULE="@comment "
PLIST_SUBST+= NOSHLIB="@comment "
.else
. include "../../mk/bdb.buildlink3.mk"
-MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
+MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q}
MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
PLIST_SUBST+= BSDDBMODULE=
@@ -94,10 +94,10 @@ PLIST_SUBST+= NISMODULE=
.endif
.if defined(BUILDLINK_TRANSFORM)
-MAKE_ENV+= PY_BDB_TRANSFORM="${BUILDLINK_TRANSFORM}"
+MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
.endif
-PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
+PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
TEST_TARGET= test
INSTALL_TARGET= altinstall
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 49f01426422..0a3b35b5818 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/16 19:18:59 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:27 rillig Exp $
#
DISTNAME= Python-2.4.2
@@ -19,16 +19,16 @@ CONFLICTS+= python-[0-9]*
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= OPT="${CFLAGS}"
+CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q}
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink3.mk"
.if ${PTHREAD_TYPE} == "pth"
CONFIGURE_ARGS+= --with-pth
.endif
# fdatasync()
-LIBS.SunOS= -lrt
+LIBS.SunOS+= -lrt
PY_VER_SUFFIX= 2.4
@@ -49,7 +49,7 @@ PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
.else
PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
.endif
-PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME}
+PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
# the dl module isn't built for 64 bit archs and Darwin
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \
@@ -76,8 +76,8 @@ OSSAUDIODEV_SUBST=
EXTRA_SO_SUBST=
.endif
-PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST}
-PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST}
+PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST:Q}
+PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST:Q}
# Make sure python modules can link correctly
.if ${OPSYS} == "Darwin"
@@ -94,7 +94,7 @@ PLIST_SUBST+= BSDDBMODULE="@comment "
PLIST_SUBST+= NOSHLIB="@comment "
.else
. include "../../mk/bdb.buildlink3.mk"
-MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
+MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q}
MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
PLIST_SUBST+= BSDDBMODULE=
@@ -103,10 +103,10 @@ PLIST_SUBST+= NISMODULE=
.endif
.if defined(BUILDLINK_TRANSFORM)
-MAKE_ENV+= PY_BDB_TRANSFORM="${BUILDLINK_TRANSFORM}"
+MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
.endif
-PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
+PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
TEST_TARGET= test
INSTALL_TARGET= altinstall
diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common
index 326e27c25c2..31540c430c5 100644
--- a/lang/ruby/Makefile.common
+++ b/lang/ruby/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/03/06 16:42:30 taca Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/12/05 20:50:27 rillig Exp $
#
# Ruby base distribution common definition
@@ -36,10 +36,10 @@ DIST_SUBDIR?= ${RUBY_DIST_SUBDIR}
#
# PLIST substitution
#
-PLIST_SUBST+= RUBY_SHLIBVER="${RUBY_SHLIBVER}" \
- RUBY_SHLIBMAJOR="${RUBY_SHLIBMAJOR}" \
- RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR} \
- RUBY_NAME="${RUBY_NAME}"
+PLIST_SUBST+= RUBY_SHLIBVER=${RUBY_SHLIBVER:Q} \
+ RUBY_SHLIBMAJOR=${RUBY_SHLIBMAJOR:Q} \
+ RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR:Q} \
+ RUBY_NAME=${RUBY_NAME:Q}
# Common macros.
.if ${OPSYS} == "NetBSD"
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk
index 861d04cd8ca..8d62c1d4107 100644
--- a/lang/ruby/modules.mk
+++ b/lang/ruby/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.12 2005/11/02 07:44:24 taca Exp $
+# $NetBSD: modules.mk,v 1.13 2005/12/05 20:50:27 rillig Exp $
.if !defined(_RUBY_MODULE_MK)
_RUBY_MODULE_MK= # defined
@@ -16,7 +16,7 @@ DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base
.include "../../lang/ruby/buildlink3.mk"
.endif
-CONFIGURE_ENV+= RUBY=${RUBY} RDOC=${RDOC}
+CONFIGURE_ENV+= RUBY=${RUBY:Q} RDOC=${RDOC:Q}
#
# extconf.rb support
diff --git a/lang/ruby/replace.mk b/lang/ruby/replace.mk
index 4d783b0a505..5e83b3584ef 100644
--- a/lang/ruby/replace.mk
+++ b/lang/ruby/replace.mk
@@ -1,7 +1,7 @@
-# $NetBSD: replace.mk,v 1.2 2005/11/02 07:44:33 taca Exp $
+# $NetBSD: replace.mk,v 1.3 2005/12/05 20:50:27 rillig Exp $
#
-.ifndef _RUBY_REPLACE_MK
+.if !defined(_RUBY_REPLACE_MK)
_RUBY_REPLACE_MK= # defined
# fix shebang line.
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index 5d9c9905ef4..5060813f0df 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,7 +1,7 @@
-# $NetBSD: rubyversion.mk,v 1.17 2005/11/10 00:17:36 minskim Exp $
+# $NetBSD: rubyversion.mk,v 1.18 2005/12/05 20:50:27 rillig Exp $
#
-.ifndef _RUBYVERSION_MK
+.if !defined(_RUBYVERSION_MK)
_RUBYVERSION_MK= # defined
.include "../../mk/bsd.prefs.mk"
@@ -183,12 +183,12 @@ DIST_SUBDIR?= ${_RUBY_DIST_SUBDIR}
#
# MAKE_ENV
#
-MAKE_ENV+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
- RUBY_VERSION="${RUBY_VERSION}" \
- RUBY_VERSION_DEFAULT="${RUBY_VERSION_DEFAULT}"
+MAKE_ENV+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
+ RUBY_VERSION=${RUBY_VERSION:Q} \
+ RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q}
-MAKEFLAGS+= RUBY_VERSION="${RUBY_VERSION}" \
- RUBY_VERSION_DEFAULT="${RUBY_VERSION_DEFAULT}"
+MAKEFLAGS+= RUBY_VERSION=${RUBY_VERSION:Q} \
+ RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q}
# PLIST
#
@@ -206,9 +206,9 @@ PLIST_RUBY_DIRS= RUBY_LIBDIR="${RUBY_LIBDIR}" \
#
# substitutions
#
-FILES_SUBST+= RUBY="${RUBY}" RUBY_NAME="${RUBY_NAME}" \
- RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
- RUBY_VER="${RUBY_VER}" \
+FILES_SUBST+= RUBY=${RUBY:Q} RUBY_NAME=${RUBY_NAME:Q} \
+ RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} \
+ RUBY_VER=${RUBY_VER:Q} \
${PLIST_RUBY_DIRS}
MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
@@ -216,10 +216,10 @@ MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
-PLIST_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
- RUBY_VERSION="${RUBY_VERSION}" \
- RUBY_VER_DIR="${RUBY_VER_DIR}" \
- RUBY_DLEXT="${RUBY_DLEXT}" \
+PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
+ RUBY_VERSION=${RUBY_VERSION:Q} \
+ RUBY_VER_DIR=${RUBY_VER_DIR:Q} \
+ RUBY_DLEXT=${RUBY_DLEXT:Q} \
${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
.endif # _RUBY_MK
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 347ec36a661..4fe874c1475 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/11/08 11:18:02 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:27 rillig Exp $
#
DISTNAME= ${RUBY_DISTNAME}
@@ -24,7 +24,7 @@ TEST_TARGET= test
CONFIGURE_ARGS+= --enable-shared \
--with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
--with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
-CONFIGURE_ENV+= PREFIX="${PREFIX}"
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
INSTALL_TARGET= install install-doc
WRKSRC= ${RUBY_WRKSRC}
@@ -42,7 +42,7 @@ MAKE_DIRS+= ${RUBY_SITERIDIR}
CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
.endif
-FILES_SUBST+= DATE=${DATE}
+FILES_SUBST+= DATE=${DATE:Q}
#
# IRIX work around should be fixed.
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 746ba4ae4a3..7f9a38d1596 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/02 05:22:05 jonb Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:27 rillig Exp $
DISTNAME= ${PKGNAME}-source
PKGNAME= sbcl-0.9.1
@@ -20,7 +20,7 @@ ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386
USE_TOOLS+= gmake gtar:run
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/${PKGNAME}/
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/
#
# Bootstrap section.
@@ -38,7 +38,7 @@ BUILD_DEPENDS+= clisp-[0-9]*:../../lang/clisp
.endif
.if !defined(SBCL_BOOT_SYSTEM)
-PKG_SKIP_REASON= "Sorry, need a Common Lisp system"
+PKG_SKIP_REASON+= "Sorry, need a Common Lisp system"
.endif
post-patch:
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index b7532f269f2..61d6b1f278e 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/05 10:25:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:27 rillig Exp $
DISTNAME= siod
PKGNAME= siod-3.0
@@ -13,7 +13,7 @@ COMMENT= Small-footprint implementation of the Scheme programming language
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= ${OPSYS}
-MAKE_ENV+= CC="${CC}"
+MAKE_ENV+= CC=${CC:Q}
CPPFLAGS+= -Dunix=1
.include "../../mk/bsd.prefs.mk"
diff --git a/lang/smlnj/Makefile.common b/lang/smlnj/Makefile.common
index 6370415ef6b..a1c56a9350b 100644
--- a/lang/smlnj/Makefile.common
+++ b/lang/smlnj/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2004/06/22 20:34:11 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:27 rillig Exp $
# smlnj also supports hppa, sparc, ppc, mlrisc & alpha
# pkg support for those platforms, and say, solaris-x86
@@ -28,4 +28,4 @@ NLFFI= "@comment "
BOX= ${MACHINE_ARCH}
.endif
-PLIST_SUBST+= BOX=${BOX} OS=${OS} NLFFI=${NLFFI}
+PLIST_SUBST+= BOX=${BOX:Q} OS=${OS:Q} NLFFI=${NLFFI:Q}
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index a46eb470202..ad745938670 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:51 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:27 rillig Exp $
#
DISTNAME= snobol-0.99.4
@@ -12,7 +12,7 @@ MAINTAINER= refling@comet.lbl.gov
HOMEPAGE= http://people.ne.mediaone.net/philbudne/snobol.html
COMMENT= Macro implementation of SNOBOL4 in C
-BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip
+BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 12ec222ef92..81ce7ab9962 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/10/10 14:59:20 jschauma Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:27 rillig Exp $
DISTNAME= j2sdk-1_3_1_16-linux-i586
PKGNAME= sun-jdk13-1.0.16
@@ -8,7 +8,7 @@ COMMENT= Sun's Java(tm) Development Kit 1.3.1
SHORT= JDK
-DEPENDS= sun-jre13>=1.0.16:../../lang/sun-jre13
+DEPENDS+= sun-jre13>=1.0.16:../../lang/sun-jre13
JAVA_CLASSPATH= ${JAVA_HOME}/src.jar
JAVA_WRAPPERS= appletviewer extcheck idlj jar jarsigner \
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 719ec07c776..064366c6cb5 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2005/09/17 16:44:54 dillo Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:27 rillig Exp $
DISTNAME= j2sdk-1_4_2_09-linux-i586
PKGNAME= sun-jdk14-2.9
-PKGREVISION= # none
MASTER_SITES= # empty
COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
SHORT= SDK
-DEPENDS= sun-jre14>=2.9:../../lang/sun-jre14
+DEPENDS+= sun-jre14>=2.9:../../lang/sun-jre14
WRKSRC= ${WRKDIR}/j2sdk1.4.2_09
JAVA_WRAPPERS= appletviewer extcheck idlj jar jarsigner \
diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile
index 8bda73b8b9a..e5c5f9d7711 100644
--- a/lang/sun-jdk15/Makefile
+++ b/lang/sun-jdk15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/01 15:39:27 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:27 rillig Exp $
DISTNAME= jdk-1_5_0_06-linux-i586
PKGNAME= sun-jdk15-5.0.6
@@ -6,7 +6,7 @@ MASTER_SITES= # empty
SHORT_NAME= JDK
-DEPENDS= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15
+DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15
WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//}
JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index dd6222a3c99..1a26342cce0 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2005/10/11 15:49:48 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:27 rillig Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
DISTNAME= j2re-1_4_2_09-linux-i586
PKGNAME= sun-jre14-2.9
-PKGREVISION= # none
MASTER_SITES= # empty
COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.2
@@ -52,7 +51,7 @@ do-configure:
pre-install:
.if !empty(PKG_OPTIONS:Msun-jre-jce)
- cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
+ cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security
${SED} 's/@SUN_JRE14_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC}
.else
${SED} '/@SUN_JRE14_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC}
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index 2afe851f307..38a0816bb4d 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/01 15:39:27 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:27 rillig Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
@@ -42,7 +42,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip
.endif
post-extract:
- -${MKDIR} ${WRKSRC}/.systemPrefs
+ ${MKDIR} ${WRKSRC}/.systemPrefs
${TOUCH} ${WRKSRC}/.systemPrefs/.system.lock
${TOUCH} ${WRKSRC}/.systemPrefs/.systemRootModFile
@@ -54,7 +54,7 @@ do-configure:
pre-install:
.if !empty(PKG_OPTIONS:Msun-jre-jce)
- cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
+ cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security
${SED} 's/@SUN_JRE15_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC}
.else
${SED} '/@SUN_JRE15_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC}
diff --git a/lang/swi-prolog-lite/Makefile.common b/lang/swi-prolog-lite/Makefile.common
index a7ec9ab153e..4df520ff0bb 100644
--- a/lang/swi-prolog-lite/Makefile.common
+++ b/lang/swi-prolog-lite/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/05/27 22:37:04 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:50:28 rillig Exp $
SWIPLVERS= 5.2.13
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}
+PLIST_SUBST+= APPEND_ELF=${APPEND_ELF:Q}
diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile
index 495b0fc0e38..de593a27f33 100644
--- a/lang/swi-prolog-packages/Makefile
+++ b/lang/swi-prolog-packages/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2005/09/28 14:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:28 rillig Exp $
-.include "../swi-prolog-lite/Makefile.common"
+.include "../../lang/swi-prolog-lite/Makefile.common"
PKGNAME= swi-prolog-packages-${SWIPLVERS}
PKGREVISION= 1
@@ -24,7 +24,7 @@ post-configure:
cd ${WRKSRC}/packages; \
${SETENV} \
CPP=${CPP} \
- gmake configure
+ ${GMAKE} configure
pre-build:
${LN} -sf ${LOCALBASE}/bin/plld ${WRKSRC}/src
@@ -49,14 +49,14 @@ DISPLAY= :2
. endif #Xvfb
.endif #DISPLAY
-MAKE_ENV+= DISPLAY=${DISPLAY}
+MAKE_ENV+= DISPLAY=${DISPLAY:Q}
post-install: teardownx
teardownx:
${ECHO} teardownx: Xvfb-PID: `${CAT} ${WRKDIR}/.Xvfb.pid`
sleep 5
-kill `${CAT} ${WRKDIR}/.Xvfb.pid`
- rm -f ${WRKDIR}/.Xvfb.pid
+ ${RM} -f ${WRKDIR}/.Xvfb.pid
.include "../../lang/swi-prolog-lite/buildlink3.mk"
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index cb744bfe297..516580d2aab 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2005/07/19 10:02:11 grant Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 20:50:28 rillig Exp $
-.include "../swi-prolog-lite/Makefile.common"
+.include "../../lang/swi-prolog-lite/Makefile.common"
PKGNAME= swi-prolog-${SWIPLVERS}
PKGREVISION= 1
diff --git a/lang/tcl-itcl-current/Makefile b/lang/tcl-itcl-current/Makefile
index 20f84d7cbdc..a824175324d 100644
--- a/lang/tcl-itcl-current/Makefile
+++ b/lang/tcl-itcl-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/13 20:06:24 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:28 rillig Exp $
DISTNAME= tcl-itcl-20040920
PKGNAME= ${DISTNAME:S/itcl/itcl-current/}
@@ -18,9 +18,9 @@ WRKSRC= ${WRKDIR}/tcl-itcl-${ITCL_VERS}
ITCL_VERS= 3.3
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
- --with-tk=${BUILDLINK_PREFIX.tk}/lib \
- --enable-shared
+CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl:Q}/lib
+CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk:Q}/lib
+CONFIGURE_ARGS+= --enable-shared
MAKE_ENV+= TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl
diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile
index e85fca51201..5b25efea232 100644
--- a/lang/tcl-itcl/Makefile
+++ b/lang/tcl-itcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/26 04:22:38 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:28 rillig Exp $
DISTNAME= itcl3.2.1_src
PKGNAME= tcl-itcl-3.2.1
@@ -18,10 +18,10 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
WRKSRC= ${WRKDIR}/itcl3.2.1
-CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
- --with-tk=${BUILDLINK_PREFIX.tk}/lib \
- --enable-shared
-CONFIGURE_ENV+= AR="${AR}"
+CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl:Q}/lib
+CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk:Q}/lib
+CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ENV+= AR=${AR:Q}
MAKE_ENV+= TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl
diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile
index 0610a48b1dd..bebdcf5e650 100644
--- a/lang/tcl-otcl/Makefile
+++ b/lang/tcl-otcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:28 rillig Exp $
DISTNAME= otcl-1.9
PKGNAME= tcl-${DISTNAME}
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; echo $$TCL_LIBS'`"
+CONFIGURE_ARGS+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`"
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index 5338b41ccab..14aa96f7f5c 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/16 01:15:32 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:28 rillig Exp $
#
DISTNAME= tclx8.3.5-src
@@ -30,12 +30,12 @@ TEST_TARGET= test
.include "../../mk/bsd.prefs.mk"
PKGSRC_TCL_SRC_DIR= ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl${TCL_VERSION}
-CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR="${PKGSRC_TCL_SRC_DIR}"
+CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR:Q}
-MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
- SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
- SHAREGRP=${SHAREGRP} \
- TCLX_PREFIX=${PREFIX}
+MAKE_ENV+= GTAR=${GTAR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \
+ SHAREMODE=${SHAREMODE:Q} SHAREOWN=${SHAREOWN:Q} \
+ SHAREGRP=${SHAREGRP:Q} \
+ TCLX_PREFIX=${PREFIX:Q}
INSTALLATION_DIRS= bin include
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 5df5698e080..b2ae7b92a69 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/10/07 18:38:34 reed Exp $
+# $NetBSD: Makefile,v 1.56 2005/12/05 20:50:28 rillig Exp $
DISTNAME= tcl${TCL_VERSION}-src
PKGNAME= tcl-${TCL_VERSION}
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-MAKE_ENV+= TOUCH="${TOUCH}"
+MAKE_ENV+= TOUCH=${TOUCH:Q}
INSTALL_TARGET= install
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 11d4474a345..44f6e875428 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/04 09:56:09 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:28 rillig Exp $
#
DISTNAME= tcl8.3.4
@@ -21,7 +21,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
CONFIGURE_DIRS= unix
BUILD_DIRS= ${CONFIGURE_DIRS}
-MAKE_ENV+= TOUCH="${TOUCH}"
+MAKE_ENV+= TOUCH=${TOUCH:Q}
TEST_TARGET= test
USE_LIBTOOL= yes
diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index d09325d62da..4a96140629e 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/09/08 21:32:35 minskim Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:28 rillig Exp $
#
DISTNAME= tclx8.3.5-src
@@ -32,12 +32,12 @@ TEST_TARGET= test
PKGSRC_TCL_SRC_DIR="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl${TCL_VERSION}"
PKGSRC_TK_SRC_DIR="${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk${TK_VERSION}"
-CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR="${PKGSRC_TCL_SRC_DIR}" \
- PKGSRC_TK_SRC_DIR="${PKGSRC_TK_SRC_DIR}"
+CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR:Q} \
+ PKGSRC_TK_SRC_DIR=${PKGSRC_TK_SRC_DIR:Q}
-MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
- SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
- SHAREGRP=${SHAREGRP} \
+MAKE_ENV+= GTAR=${GTAR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \
+ SHAREMODE=${SHAREMODE:Q} SHAREOWN=${SHAREOWN:Q} \
+ SHAREGRP=${SHAREGRP:Q} \
TCLX_PREFIX=${BUILDLINK_PREFIX.tcl-tclX}
FILESDIR= ${.CURDIR}/../../lang/tcl-tclX/files
diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile
index dc2027c9522..4cc8d153cb1 100644
--- a/lang/ucblogo/Makefile
+++ b/lang/ucblogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:28 rillig Exp $
DISTNAME= ucblogo-5.3
PKGREVISION= 1
@@ -14,7 +14,7 @@ COMMENT= Brian Harvey's logo language interpreter
MAKEFILE= makefile
GNU_CONFIGURE= yes
# otherwise ./configure guesses -L incorrectly
-LIBS= -L${X11BASE}/lib
+LIBS+= -L${X11BASE}/lib
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucblogo
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 0e3a0585b1c..5edc6f89fc1 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:19 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/12/05 20:50:28 rillig Exp $
DISTNAME= balsa-2.2.6
PKGREVISION= 2
@@ -20,11 +20,11 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl pkg-config
-CONFIGURE_ARGS= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
+CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme:Q}/bin/gpgme-config
CONFIGURE_ARGS+= --disable-more-warnings
CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-pcre
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ENV+= ac_cv_lib_iconv_iconv_open=yes
EGDIR= ${PREFIX}/share/examples/balsa
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index 9b7da3e2e9b..952bd85b24c 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/10/24 23:07:49 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:28 rillig Exp $
#
DISTNAME= bmf-0.9.4
@@ -12,6 +12,6 @@ COMMENT= Self contained and extremely efficient Bayesian mail filter
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --without-mysql
-MAKE_ENV+= DESTDIR=${PREFIX} BINDIR=/bin MANDIR=/man
+MAKE_ENV+= DESTDIR=${PREFIX:Q} BINDIR=/bin MANDIR=/man
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 63fc7eaab9a..ecf82ee0d6f 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/11/04 03:47:49 grant Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/05 20:50:28 rillig Exp $
DISTNAME= clamav-${CLAMAV_VERSION}
PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP
-FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER}
+FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER:Q}
MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER}
USE_PKGINSTALL= yes
@@ -39,7 +39,7 @@ PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\ User
VIRUSDBDIR= ${VARBASE}/clamav
EGDIR= ${PREFIX}/share/examples/clamav
-FILES_SUBST+= VIRUSDBDIR=${VIRUSDBDIR}
+FILES_SUBST+= VIRUSDBDIR=${VIRUSDBDIR:Q}
OWN_DIRS_PERMS= ${VIRUSDBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775
CONF_FILES= # empty
@@ -51,7 +51,6 @@ CONF_FILES+= ${EGDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_}
CONF_FILES_PERMS+= ${EGDIR}/${_file_} ${VIRUSDBDIR}/${_file_} \
${CLAMAV_USER} ${CLAMAV_GROUP} 0664
.endfor
-.undef _file_
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
index cfc136e7f02..39eff47c9db 100644
--- a/mail/clamsmtp/Makefile
+++ b/mail/clamsmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/02 08:48:37 xtraeme Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:28 rillig Exp $
DISTNAME= clamsmtp-1.6
CATEGORIES= mail
@@ -15,7 +15,7 @@ USE_PKGINSTALL= yes
RCD_SCRIPTS= clamsmtpd
MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE}
-FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER}
+FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER:Q}
# Doesn't work with GNU pth (missing required mutex features)
PTHREAD_OPTS+= require native
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index bf09aa3bdf0..f70458db6aa 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/07 21:17:07 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:29 rillig Exp $
DISTNAME= coolmail-1.3
PKGREVISION= 1
@@ -14,7 +14,7 @@ EXTRA_LIBS.*= -lcompat
EXTRA_LIBS.Interix= -lSM
EXTRA_LIBS.IRIX= # empty
MAKE_ENV+= EXTRA_LIBS=${EXTRA_LIBS:Q}
-MAKE_ENV+= X11BASE=${PREFIX}
+MAKE_ENV+= X11BASE=${PREFIX:Q}
USE_X11BASE= yes
.include "../../mk/x11.buildlink3.mk"
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 593655adbb6..cb85576f192 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/11/11 07:33:05 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:29 rillig Exp $
DISTNAME= courier-imap-4.0.6
CATEGORIES= mail
@@ -32,7 +32,7 @@ INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
GEN_FILES= imapd imapd-ssl pop3d pop3d-ssl
SSLCNF_FILES= imapd.cnf pop3d.cnf
-FILES_SUBST+= SSLCERTS=${SSLCERTS}
+FILES_SUBST+= SSLCERTS=${SSLCERTS:Q}
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
USE_PKGINSTALL= yes
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 2f9c69c7d73..7a21d713931 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:29 rillig Exp $
#
DISTNAME= cucipop-1.31
@@ -17,8 +17,8 @@ USE_PKGINSTALL= YES
LICENSE= cucipop-license
-MAKE_ENV+= ROOT_USER="${ROOT_USER}"
-MAKE_ENV+= ROOT_GROUP="${ROOT_GROUP}"
+MAKE_ENV+= ROOT_USER=${ROOT_USER:Q}
+MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP:Q}
REQD_DIRS+= ${PREFIX}/share/cucipop/bulletins
SPECIAL_PERMS+= ${PREFIX}/sbin/cucipop ${ROOT_USER} ${ROOT_GROUP} 2755
@@ -32,7 +32,7 @@ PKG_SUPPORTED_OPTIONS= db inet6
.if !empty(PKG_OPTIONS:Mdb)
BDB_ACCEPTED= db2
CFLAGS+= -DUSE_DB
-MAKE_ENV+= LIBS=${BDB_LIBS}
+MAKE_ENV+= LIBS=${BDB_LIBS:Q}
. include "../../mk/bdb.buildlink3.mk"
.endif
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index e868aa8237f..65641bd6994 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/08/08 16:50:59 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2005/12/05 20:50:29 rillig Exp $
DISTNAME= cyrus-imapd-2.2.12
PKGREVISION= 2
@@ -27,8 +27,8 @@ CYRUS_USER?= cyrus
CYRUS_GROUP?= mail
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
-FILES_SUBST+= CYRUS_USER=${CYRUS_USER}
-FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP}
+FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
+FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER}
@@ -106,7 +106,7 @@ PLIST_SUBST+= IDLED=
PLIST_SUBST+= IDLED="@comment "
.endif
-MAKE_ENV+= PERL=${PERL5}
+MAKE_ENV+= PERL=${PERL5:Q}
HTMLDIR= ${PREFIX}/share/doc/html/cyrus-imapd
EGDIR= ${PREFIX}/share/examples/cyrus-imapd
@@ -125,7 +125,7 @@ PERL5_PACKLIST= \
.include "../../security/tcp_wrappers/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ENV+= BDB_TYPE=${BDB_TYPE}
+CONFIGURE_ENV+= BDB_TYPE=${BDB_TYPE:Q}
# Only imap/mupdate needs to be build with pthreads support, so selectively
# enable it via patches for just that one program.
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 491b24dd0fa..49522ffc666 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:29 rillig Exp $
DISTNAME= cyrus-imapd-2.1.18
SVR4_PKGNAME= cimap
@@ -29,8 +29,8 @@ CYRUS_USER?= cyrus
CYRUS_GROUP?= mail
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
-FILES_SUBST+= CYRUS_USER=${CYRUS_USER}
-FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP}
+FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
+FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q}
CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER}
CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP}
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 160abaa3c30..295c4c0ea64 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:29 rillig Exp $
#
DISTNAME= dbmail-2.0.1
@@ -21,7 +21,7 @@ EGDIR= ${PREFIX}/share/examples/dbmail
CONF_FILES= ${EGDIR}/dbmail.conf ${PKG_SYSCONFDIR}/dbmail.conf
RCD_SCRIPTS= dbmail dbmailimapd dbmaillmtpd dbmailpop3d
-PLIST_SUBST+= SQLDB=${SQLDB}
+PLIST_SUBST+= SQLDB=${SQLDB:Q}
SUBST_CLASSES+= sysconf
SUBST_STAGE.sysconf= do-configure
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 3974a40fa19..c1b90ed7c7c 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/08 13:25:38 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:29 rillig Exp $
DISTNAME= distribute-2.1-pl19
PKGNAME= distribute-2.1.26
@@ -35,8 +35,8 @@ MAKE_ENV+= DEFAULTCONFIG='-DDEF_SEQ_PATH="\"${MAILINGLIST_DIR}\"" \
-DDEF_MAJORDOMO_RECIPIENT_PATH="\"${MAJORDOMO_LIST_DIR}\"" \
-DDEF_DOMAINNAME="\"${DEF_DOMAINNAME}\"" \
-DDEF_ARCHIVE_PATH="\"${ARCHIVE_DIR}\""' \
- INSTALL="${INSTALL}" \
- INSTALL_MAN="${INSTALL_MAN}"
+ INSTALL=${INSTALL:Q} \
+ INSTALL_MAN=${INSTALL_MAN:Q}
pre-build:
${TOUCH} ${WRKSRC}/logging.h ${WRKSRC}/strsep.c
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 4694179d72f..f89dcf8beae 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/21 16:22:04 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:29 rillig Exp $
DISTNAME= dk-milter-0.3.0
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= Open source implementation of DomainKeys for sendmail
BUILDLINK_DEPENDS.libmilter+= libmilter>=8.13.0
LICENSE= no-profit
-MAKE_ENV+= M4="${M4}"
+MAKE_ENV+= M4=${M4:Q}
RCD_SCRIPTS= dk-milter
USE_BUILTIN.libmilter= no
USE_TOOLS+= gm4
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index d9d157990cc..96d5eee0d3d 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:29 rillig Exp $
DISTNAME= dkim-milter-0.1.1
CATEGORIES= mail
@@ -11,7 +11,7 @@ COMMENT= Open source DKIM filter software from Sendmail, Inc
BUILDLINK_DEPENDS.libmilter+= libmilter>=8.13.0
LICENSE= no-profit
-MAKE_ENV+= M4="${M4}"
+MAKE_ENV+= M4=${M4:Q}
RCD_SCRIPTS= dkim-milter
USE_BUILTIN.libmilter= no
USE_TOOLS+= gm4
diff --git a/mail/dovecot/hacks.mk b/mail/dovecot/hacks.mk
index 454b2c7dba2..f397b35e85f 100644
--- a/mail/dovecot/hacks.mk
+++ b/mail/dovecot/hacks.mk
@@ -1,9 +1,9 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/08 19:58:16 schmonz Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:29 rillig Exp $
.include "../../mk/compiler.mk"
# Avoid an ICE in gcc2 on sparc64
.if !empty(CC_VERSION:Mgcc-*)
PKG_HACKS+= sparc64-gcc2-ice
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.endif
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 7b408596773..0aad23db867 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:29 rillig Exp $
#
DISTNAME= drac
@@ -14,9 +14,9 @@ COMMENT= Dynamic Relay Authorization Control
WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
-MAKE_ENV+= MKDIR="${MKDIR}"
-MAKE_ENV+= INSTALL="${INSTALL}"
-MAKE_ENV+= RANLIB="${RANLIB}"
+MAKE_ENV+= MKDIR=${MKDIR:Q}
+MAKE_ENV+= INSTALL=${INSTALL:Q}
+MAKE_ENV+= RANLIB=${RANLIB:Q}
MAKE_ENV+= EBIN="${LOCALBASE}/libexec"
MAKE_ENV+= MAN="${LOCALBASE}/man/man"
MAKE_ENV+= EXAMPLES="${LOCALBASE}/share/examples/drac"
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index c5c32f10daa..b8728b6d92e 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/12/02 08:10:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:29 rillig Exp $
DISTNAME= dspam-3.6.2
CATEGORIES= mail
@@ -97,9 +97,9 @@ OWN_DIRS_PERMS= ${DSPAM_HOME} ${DSPAM_USER} ${DSPAM_WWWGROUP} 0775
OWN_DIRS_PERMS+= ${DSPAM_LOGDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0775
OWN_DIRS_PERMS+= ${DSPAM_PIDDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0770
-FILES_SUBST+= DSPAM_USER=${DSPAM_USER}
-FILES_SUBST+= DSPAM_GROUP=${DSPAM_GROUP}
-FILES_SUBST+= DSPAM_PIDDIR=${DSPAM_PIDDIR}
+FILES_SUBST+= DSPAM_USER=${DSPAM_USER:Q}
+FILES_SUBST+= DSPAM_GROUP=${DSPAM_GROUP:Q}
+FILES_SUBST+= DSPAM_PIDDIR=${DSPAM_PIDDIR:Q}
SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-install
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 9b5d97437c3..b7eee4f2490 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/20 19:13:58 kristerw Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:29 rillig Exp $
DISTNAME= elm-2.4ME+93
PKGNAME= elm-me-2.4.93
@@ -18,8 +18,8 @@ WRKSRC= ${WRKDIR}/elm2.4.ME+.93
USE_PKGINSTALL= YES
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ksh ./Configure
-CONFIGURE_ENV= PREFIX="${PREFIX}" RUN_AS_BATCH=yes
-CONFIGURE_ARGS= -S
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q} RUN_AS_BATCH=yes
+CONFIGURE_ARGS+= -S
INSTALL_DIRS= ${WRKSRC} ${WRKSRC}/nls
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 5f712a0c53b..4e0b652559b 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/08/29 17:53:49 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:29 rillig Exp $
#
DISTNAME= elmo-1.3.2
-PKGREVISION= # empty
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=elmo/}
@@ -20,7 +19,7 @@ CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
# I get segmentation faults when not compiled with debug enabled
CONFIGURE_ARGS+= --enable-debug
-SUBST_CLASSES= tux
+SUBST_CLASSES+= tux
SUBST_STAGE.tux= post-patch
SUBST_FILES.tux= configure
SUBST_SED.tux= -e "s|==|=|"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 66954818c67..8bb2defd927 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2005/12/04 09:09:47 hira Exp $
+# $NetBSD: Makefile,v 1.95 2005/12/05 20:50:29 rillig Exp $
DISTNAME= evolution-2.4.1
PKGREVISION= 1
@@ -24,7 +24,7 @@ PKG_SUPPORTED_OPTIONS= inet6 krb4 krb5 ssl
# function name conflicts with libsoftokn3 provided by Mozilla NSS. These
# cause runtime crashes, so don't allow these options to be specified
# together.
-PKG_FAIL_REASON= "Kerberos support conflicts with SSL"
+PKG_FAIL_REASON+= "Kerberos support conflicts with SSL"
.endif
GNU_CONFIGURE= YES
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index f49c7a7a833..3612af7e1be 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/17 17:06:12 abs Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:30 rillig Exp $
DISTNAME= exim-html-4.50
CATEGORIES= mail net
@@ -11,8 +11,8 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.exim.org/
COMMENT= HTML documentation for the Exim mail transfer agent
-NO_CONFIGURE=
-NO_BUILD=
+NO_CONFIGURE= yes
+NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/exim
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 6232247875b..75e2bdcfe31 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2005/10/16 14:10:57 abs Exp $
+# $NetBSD: Makefile,v 1.71 2005/12/05 20:50:30 rillig Exp $
DISTNAME= exim-4.54
PKGREVISION= 1
@@ -18,12 +18,12 @@ USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
MAKE_ENV+= SSLBASE=${SSLBASE:Q}
-MAKE_ENV+= INST_CHOWN=${CHOWN}
+MAKE_ENV+= INST_CHOWN=${CHOWN:Q}
MAKE_FLAGS+= FULLECHO=''
.include "../../mk/bsd.prefs.mk"
-BUILD_DEFS= EXIM_USER EXIM_GROUP EXIM_DB
+BUILD_DEFS+= EXIM_USER EXIM_GROUP EXIM_DB
PKG_GROUPS= ${EXIM_GROUP}
PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}::Exim\ mail\ server\ user:${VARBASE}/mail:${NOLOGIN}
@@ -33,7 +33,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/exim
CONF_FILES= ${EXAMPLESDIR}/aliases ${PKG_SYSCONFDIR}/aliases
CONF_FILES+= ${EXAMPLESDIR}/configure ${PKG_SYSCONFDIR}/configure
MESSAGE_SUBST+= EXAMPLESDIR="${EXAMPLESDIR}"
-PLIST_SUBST+= DISTNAME="${DISTNAME}"
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
RCD_SCRIPTS= exim
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index aabeab82e7d..ed7998702fe 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/23 11:48:48 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:30 rillig Exp $
DISTNAME= exim-3.36
PKGREVISION= 4
@@ -36,7 +36,7 @@ PKG_GROUPS= ${EXIM_GROUP}
USE_TOOLS+= gzip gzcat perl:run
FILES_SUBST+= GZIP_CMD="${GZIP_CMD:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"
-FILES_SUBST+= GZCAT="${GZCAT}"
+FILES_SUBST+= GZCAT=${GZCAT:Q}
_LOOKUP_LIBS+= ${LDFLAGS}
@@ -61,8 +61,8 @@ BDB_ACCEPTED= db1 db3 db2 # does not compile with db4
DBMLIB+= ${LDFLAGS} ${BDB_LIBS}
MAKE_ENV+= DBMLIB=${DBMLIB:Q}
-MAKE_ENV+= LOOKUP_INCLUDE="${LOOKUP_INCLUDE}"
-MAKE_ENV+= LOOKUP_LIBS="${LOOKUP_LIBS}"
+MAKE_ENV+= LOOKUP_INCLUDE=${LOOKUP_INCLUDE:Q}
+MAKE_ENV+= LOOKUP_LIBS=${LOOKUP_LIBS:Q}
pre-patch:
${MKDIR} ${WRKSRC}/Local
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index f271aeab360..343f9bf2c34 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:30 rillig Exp $
DISTNAME= exmh-2.6.3
CATEGORIES= mail tk
@@ -14,7 +14,7 @@ DEPENDS+= metamail>=2.7:../../mail/metamail
.include "../../mk/bsd.prefs.mk"
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
WISH= wish
TCLSH= tclsh
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 4855cb43ef8..f21333f0340 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/09/29 14:29:26 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2005/12/05 20:50:31 rillig Exp $
DISTNAME= faces-1.6.1
PKGREVISION= 3
@@ -23,8 +23,8 @@ USE_X11BASE= YES
USE_LIBTOOL= YES
USE_TOOLS+= perl:run
-MAKE_FLAGS+= PREFIX="${PREFIX}"
-MAKE_FLAGS+= CCOMP="${CFLAGS}"
+MAKE_FLAGS+= PREFIX=${PREFIX:Q}
+MAKE_FLAGS+= CCOMP=${CFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index cb9778e3375..a3f88d32126 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2005/11/24 19:04:34 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2005/12/05 20:50:31 rillig Exp $
#
# ATTENTION:
# The Kerberos support in this software is known to be problematic. If you
@@ -83,8 +83,8 @@ BUILD_TARGET+= EXTRACFLAGS="${CFLAGS}"
. if ${MACHINE_ARCH} == "alpha"
CPPFLAGS:= ${CPPFLAGS:C/-O[0-9]*/-O/g}
CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q}
+CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
. endif
.endif
diff --git a/mail/imp4/Makefile b/mail/imp4/Makefile
index 91add70ed64..6ffb5fca563 100644
--- a/mail/imp4/Makefile
+++ b/mail/imp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/18 12:38:11 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:32 rillig Exp $
DISTNAME= imp-h3-${IMPVER}
PKGNAME= imp-${IMPVER}
@@ -58,7 +58,7 @@ CONF_FILES_PERMS+= ${IMPDIR}/config/trailer.txt.dist \
${IMPDIR}/config/trailer.txt \
${APACHE_USER} ${ROOT_GROUP} 0440
-SUBST_CLASSES= files
+SUBST_CLASSES+= files
SUBST_STAGE.files= post-build
SUBST_FILES.files= imp.conf.dist
SUBST_SED.files= -e "s|@IMPDIR@|${IMPDIR}|g"
@@ -84,12 +84,10 @@ do-install:
. for d in ${PAXDIRS}
${INSTALL_DATA_DIR} ${IMPDIR}/${d}
. endfor
-. undef d
. for d in ${PAXDIRS}
cd ${WRKSRC}/${d} && ${PAX} -rw . ${IMPDIR}/${d}
. endfor
-. undef d
${INSTALL_DATA} ${WRKSRC}/config/*.dist ${IMPDIR}/config
${INSTALL_DATA} ${WRKSRC}/*.php ${IMPDIR}
diff --git a/mail/ja-mh/Makefile b/mail/ja-mh/Makefile
index 39919e69133..363c26fa458 100644
--- a/mail/ja-mh/Makefile
+++ b/mail/ja-mh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/10/07 18:42:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:32 rillig Exp $
DISTNAME= mh-6.8.4-JP-3.05
PKGNAME= ja-mh6-3.05
@@ -16,7 +16,7 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://www.chem.eng.himeji-tech.ac.jp/mh-plus/
COMMENT= Rand MH mail handling system + Japanese patches
-DEPENDS= ja-less>=332:../../misc/ja-less
+DEPENDS+= ja-less>=332:../../misc/ja-less
CONFLICTS= nmh-[0-9]* ja-mh-*_JP_*
@@ -24,10 +24,11 @@ CONFLICTS= nmh-[0-9]* ja-mh-*_JP_*
MANCOMPRESSED= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-batchmode \
- --libexecdir=${PREFIX}/libexec/mh \
- --enable-jmandir=${PREFIX}/${PKGMANDIR}/ja_JP.EUC \
- --enable-apop=${PREFIX}/etc/pop.auth --enable-rpop
+CONFIGURE_ARGS+= --enable-batchmode
+CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/libexec/mh
+CONFIGURE_ARGS+= --enable-jmandir=${PREFIX:Q}/${PKGMANDIR:Q}/ja_JP.EUC
+CONFIGURE_ARGS+= --enable-apop=${PREFIX:Q}/etc/pop.auth
+CONFIGURE_ARGS+= --enable-rpop
post-install:
${LN} -sf libmh.so.3.2 ${PREFIX}/lib/libmh.so.3
diff --git a/mail/ja-mh/distinfo b/mail/ja-mh/distinfo
index 90471589e99..eb08dcb145c 100644
--- a/mail/ja-mh/distinfo
+++ b/mail/ja-mh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/03/17 09:09:36 wiz Exp $
+$NetBSD: distinfo,v 1.8 2005/12/05 20:50:32 rillig Exp $
SHA1 (mh-6.8.4-JP-3.05.tar.gz) = cb531f80be4326cd56d33d6fa9efba4d2d63d0ce
RMD160 (mh-6.8.4-JP-3.05.tar.gz) = a092a9447370a09f770121baa2ae7eced130ff0f
@@ -20,5 +20,5 @@ SHA1 (patch-al) = 59bd51d6b67beb0492b3a3d3acc05242474bac7b
SHA1 (patch-as) = 786c7bf7988806023d9fd5a2ced5a9d31550ff54
SHA1 (patch-at) = 5594d3beac4e911cfa3ff277d4ae034a6dccdccb
SHA1 (patch-au) = 3788f6ca9362a97323cc6bf0f942f2ba949e1c46
-SHA1 (patch-av) = e3e33d7e2ab065028244d60734e3dba4fd950b12
+SHA1 (patch-av) = 2f25ebe4272bbad270b6286d2eb1dce5ddae690e
SHA1 (patch-aw) = 8cfee271b0549e6886e29ae74e4e547dccc20230
diff --git a/mail/ja-mh/patches/patch-av b/mail/ja-mh/patches/patch-av
index c8a47ca060a..6f5eacc0628 100644
--- a/mail/ja-mh/patches/patch-av
+++ b/mail/ja-mh/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.1 2004/11/29 05:09:43 taca Exp $
+$NetBSD: patch-av,v 1.2 2005/12/05 20:50:32 rillig Exp $
--- uip/dropsbr.c.orig 1998-04-24 06:02:00.000000000 +0900
+++ uip/dropsbr.c
-@@ -20,6 +20,9 @@ static char ident[] = "@(#)$Id: dropsbr.
+@@ -20,6 +20,9 @@
#undef NULLVP
#include <netinet/in.h>
#else
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index 452ae7417fc..e9f895da9dd 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:14:35 martti Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:33 rillig Exp $
DISTNAME= squirrelmail-1.4.5
PKGNAME= ja-${DISTNAME}
@@ -40,7 +40,7 @@ ATTACHMENTS_DIR= ${DATADIR}/attachments
USER_PREFS_DIR= ${DATADIR}/data
MESSAGE_SUBST+= SMDIR=${SMDIR}
-FILES_SUBST+= SMDIR=${SMDIR}
+FILES_SUBST+= SMDIR=${SMDIR:Q}
CONF_FILES= ${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
CONF_FILES+= ${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 8858371ffa8..c75af41d31f 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
DISTNAME= kbiff-3.7.1
PKGREVISION= 1
@@ -8,7 +8,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.granroth.org/kbiff/index.html
-COMMENT= A new mail notification utility for KDE
+COMMENT= Mail notification utility for KDE
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk
index 885e3040de4..273deb53655 100644
--- a/mail/libesmtp/buildlink3.mk
+++ b/mail/libesmtp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:12:53 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/12/05 20:50:33 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBESMTP_BUILDLINK3_MK:= ${LIBESMTP_BUILDLINK3_MK}+
@@ -17,8 +17,8 @@ BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp
LIBESMTP= -lesmtp
-CONFIGURE_ENV+= LIBESMTP="${LIBESMTP}"
-MAKE_ENV+= LIBESMTP="${LIBESMTP}"
+CONFIGURE_ENV+= LIBESMTP=${LIBESMTP:Q}
+MAKE_ENV+= LIBESMTP=${LIBESMTP:Q}
.endif # LIBESMTP_BUILDLINK3_MK
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 4f03d51fbe1..db93898139f 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/05 20:55:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= libetpan-0.38
@@ -12,7 +12,7 @@ COMMENT= Really nice mail library
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-SUBST_CLASSES= conf
+SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-configure
SUBST_FILES.conf= libetpan-config.in
SUBST_SED.conf= -e "s|@COMPILERFLAGS@|${COMPILER_RPATH_FLAG}|g"
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 84163cb3451..255ec44788e 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mailagent-3.0.73
CATEGORIES= mail
@@ -14,12 +14,13 @@ INTERACTIVE_STAGE= configure
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
-CONFIGURE_ARGS= -dres \
- -Dperlpath='${PERL5}' \
- -Dutmp='/var/run/utmp' \
- -Dprefix='${PREFIX}' -Dmansrc='${PREFIX}/man/man1' \
- -Dnotifypatches='false'
-MAKE_ENV= PATH=`${DIRNAME} ${PERL5}`:${PATH}
+CONFIGURE_ARGS+= -dres
+CONFIGURE_ARGS+= -Dperlpath=${PERL5:Q}
+CONFIGURE_ARGS+= -Dutmp='/var/run/utmp'
+CONFIGURE_ARGS+= -Dprefix=${PREFIX:Q}
+CONFIGURE_ARGS+= -Dmansrc=${PREFIX:Q}/man/man1
+CONFIGURE_ARGS+= -Dnotifypatches='false'
+MAKE_ENV+= PATH=`${DIRNAME} ${PERL5}`:${PATH}
INSTALL_TARGET= install install.man
pre-extract:
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 0905b5cb0b2..515859525fd 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mailcrypt-3.5.8
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT= Emacs frontend for PGP and GPG
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
GNU_CONFIGURE= yes
-MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX}
+MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
INFO_FILES= mailcrypt.info
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index 09a3b4e4771..ed72c40d620 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/14 08:27:55 kleink Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= mailgraph-1.12
@@ -30,8 +30,8 @@ DOCDIR= share/doc/${PKGBASE}
OWN_DIRS+= ${PREFIX}/${DOCDIR}
RCD_SCRIPTS= mailgraph
-PLIST_SUBST+= CGIDIR="${CGIDIR}"
-PLIST_SUBST+= DOCDIR="${DOCDIR}"
+PLIST_SUBST+= CGIDIR=${CGIDIR:Q}
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
SUBST_CLASSES+= defs
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 9076ced6b58..1bd395f3dfe 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2005/12/03 23:00:06 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mailman-2.1.6
-PKGREVISION= # empty
CATEGORIES= mail www
MASTER_SITES= http://www.list.org/ \
${MASTER_SITE_GNU:=mailman/}
@@ -21,7 +20,7 @@ MESSAGE_SUBST+= DOCDIR=${DOCDIR}
GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${EXECDIR}
-MAKE_FLAGS+= DIRSETGID=${TRUE}
+MAKE_FLAGS+= DIRSETGID=${TRUE:Q}
EXECDIR= ${PREFIX}/lib/mailman
MAILMAN_DATADIR?= ${VARBASE}/db/mailman
@@ -35,11 +34,11 @@ MAILMAN_CGIEXT?= .cgi
MESSAGE_SUBST+= EXECDIR=${EXECDIR}
MESSAGE_SUBST+= MAILMAN_USER=${MAILMAN_USER}
-FILES_SUBST+= EXECDIR=${EXECDIR}
-FILES_SUBST+= MAILMAN_USER=${MAILMAN_USER}
-FILES_SUBST+= MAILMAN_GROUP=${MAILMAN_GROUP}
-FILES_SUBST+= MAILMAN_DATADIR=${MAILMAN_DATADIR}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+FILES_SUBST+= EXECDIR=${EXECDIR:Q}
+FILES_SUBST+= MAILMAN_USER=${MAILMAN_USER:Q}
+FILES_SUBST+= MAILMAN_GROUP=${MAILMAN_GROUP:Q}
+FILES_SUBST+= MAILMAN_DATADIR=${MAILMAN_DATADIR:Q}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//}
PKG_GROUPS= ${MAILMAN_GROUP}
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 91ac824bdf7..331b6ddbc97 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:12 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= MailScanner-4.30.3-2
@@ -23,7 +23,7 @@ DEPENDS+= p5-MIME-tools>=0:../../mail/p5-MIME-tools
DEPENDS+= tnef>=1.0:../../mail/tnef
NO_BUILD= YES
-USE_TOOLS= perl:run
+USE_TOOLS+= perl:run
REPLACE_PERL= bin/MailScanner
DOCSDIR= ${LOCALBASE}/share/doc/MailScanner
@@ -34,10 +34,10 @@ LIBEXECDIR= ${LOCALBASE}/libexec/MailScanner
OWN_DIRS= ${PKG_SYSCONFDIR}/CustomFunctions
OWN_DIRS+= ${PKG_SYSCONFDIR}/rules
-PLIST_SUBST+= DOCSDIR=${DOCSDIR}
-PLIST_SUBST+= EGDIR=${EGDIR}
-PLIST_SUBST+= LIBDIR=${LIBDIR}
-PLIST_SUBST+= LIBEXECDIR=${LIBEXECDIR}
+PLIST_SUBST+= DOCSDIR=${DOCSDIR:Q}
+PLIST_SUBST+= EGDIR=${EGDIR:Q}
+PLIST_SUBST+= LIBDIR=${LIBDIR:Q}
+PLIST_SUBST+= LIBEXECDIR=${LIBEXECDIR:Q}
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
index 27a3f4960a9..d56f9e7bf5b 100644
--- a/mail/mailserv/Makefile
+++ b/mail/mailserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:12 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= mailserv
@@ -24,7 +24,6 @@ CONF_FILES=
majordomo-share majordomo mlp pmdf smartlist subscribe
CONF_FILES+= ${EGDIR}/${cf}.cf ${PKG_SYSCONFDIR}/${cf}.cf
.endfor
-.undef cf
INSTALLATION_DIRS= libexec/cgi-bin
@@ -39,7 +38,6 @@ do-configure:
-e "s|/usr/local/bin/perl|${PREFIX}/bin/perl|g" \
-e "s|/usr/bin/perl|${PREFIX}/bin/perl|g"
.endfor
-.undef file
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cgi-bin/mailserv
@@ -52,11 +50,9 @@ do-install:
cd ${PREFIX}/libexec/cgi-bin/mailserv && \
${LN} -s mailserv ${cf}
.endfor
-.undef cf
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailserv
.for doc in ChangeLog LICENSE README
${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/mailserv
.endfor
-.undef doc
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 014de3272a6..65301165aa2 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/31 03:06:17 grant Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= mailsync_5.2.1.orig
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://mailsync.sourceforge.net/
COMMENT= Mailsync is a way of synchronizing a collection of mailboxes
-WRKSRC= ${WRKDIR}/${PKGNAME}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_TOOLS+= gmake
USE_LANGUAGES+= c c++
GNU_CONFIGURE= yes
diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index b8526952613..d96b894e184 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/08/10 21:49:04 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mailwrapper-19990412
PKGREVISION= 4
@@ -6,7 +6,7 @@ CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= tech-pkg@NetBSD.org
-COMMENT= wrapper to support arbitrary Mail Transport Agents
+COMMENT= Wrapper to support arbitrary Mail Transport Agents
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
@@ -19,7 +19,7 @@ INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
EGDIR= ${PREFIX}/share/examples/mailwrapper
MAILWRAPPER_BACKUP_SFX= .pkgsrc.mailwrapper
-FILES_SUBST+= MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX}
+FILES_SUBST+= MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX:Q}
MAILWRAPPEES= /usr/bin/mailq \
/usr/bin/newaliases /usr/sbin/newaliases \
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 1217077147b..afd148680d6 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2005/10/18 01:24:25 simonb Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= mairix-0.16.1
CATEGORIES= mail
MASTER_SITES= http://www.rpcurnow.force9.co.uk/mairix/
-MAINTAINER= simonb@NetBSD.ORG
+MAINTAINER= simonb@NetBSD.org
HOMEPAGE= http://www.rc0.org.uk/mairix/
COMMENT= Program for indexing and searching email messages
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 80d068c03e7..7adcd82781a 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/23 22:56:16 he Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
DISTNAME= majordomo-1.94.5
PKGREVISION= 1
@@ -39,8 +39,8 @@ MAJORDOMO_HOMEDIR?= /home
MAJORDOMO_USER?= majordom
MAJORDOMO_GROUP?= majordom
-PLIST_SUBST= HOME=${MAJORDOMO_HOMEDIR} \
- MAJORDOMO_USER=${MAJORDOMO_USER}
+PLIST_SUBST+= HOME=${MAJORDOMO_HOMEDIR:Q} \
+ MAJORDOMO_USER=${MAJORDOMO_USER:Q}
MESSAGE_SUBST+= HOME=${MAJORDOMO_HOMEDIR} \
MAJORDOMO_USER=${MAJORDOMO_USER} \
MAJORDOMO_GROUP=${MAJORDOMO_GROUP}
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index fb1612a128f..1447df0339a 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/06/03 21:11:07 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mm2.7
PKGNAME= metamail-2.7
@@ -20,7 +20,7 @@ USE_PKGINSTALL= YES
CFLAGS.Linux+= -DLINUX
CFLAGS.SunOS+= -DSYSV
-MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} CHMOD=${CHMOD} SED=${SED}
+MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} CHMOD=${CHMOD:Q} SED=${SED:Q}
EGDIR= ${PREFIX}/share/examples/metamail
CONF_FILES= ${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 23995a811bc..2d5cd51b8aa 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.66 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mew-4.2
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -19,12 +19,12 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215
MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib
-MAKE_FLAGS+= prefix=${PREFIX}
-MAKE_FLAGS+= EMACS=${EMACS_BIN}
+MAKE_FLAGS+= prefix=${PREFIX:Q}
+MAKE_FLAGS+= EMACS=${EMACS_BIN:Q}
MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX}/mew
MAKE_FLAGS+= etcdir=${PREFIX}/share/mew
-SUBST_CLASSES= local
+SUBST_CLASSES+= local
SUBST_STAGE.local= post-configure
SUBST_FILES.local= Makefile bin/configure info/Makefile
SUBST_SED.local= -e 's|/usr/local|${PREFIX}|g'
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index d486ac36e20..b68dfd7ef42 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mew-3.3
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -19,12 +19,12 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215
MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib
-MAKE_FLAGS+= prefix=${PREFIX}
-MAKE_FLAGS+= EMACS=${EMACS_BIN}
+MAKE_FLAGS+= prefix=${PREFIX:Q}
+MAKE_FLAGS+= EMACS=${EMACS_BIN:Q}
MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX}/mew
MAKE_FLAGS+= etcdir=${PREFIX}/share/mew
-SUBST_CLASSES= local
+SUBST_CLASSES+= local
SUBST_STAGE.local= post-configure
SUBST_FILES.local= Makefile bin/configure info/Makefile
SUBST_SED.local= -e 's|/usr/local|${PREFIX}|g'
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index c467f1a36ce..e153e73d4d6 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:13 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mimedefang-2.52
PKGREVISION= 1
@@ -35,9 +35,9 @@ PKG_USERS= ${DEFANG_USER}:${DEFANG_GROUP}
EGDIR= ${PREFIX}/share/examples/mimedefang
SHAREDIR= ${PREFIX}/share/mimedefang
-FILES_SUBST+= SHAREDIR=${SHAREDIR}
-FILES_SUBST+= DEFANG_USER=${DEFANG_USER}
-FILES_SUBST+= DEFANG_SPOOLDIR=${DEFANG_SPOOLDIR}
+FILES_SUBST+= SHAREDIR=${SHAREDIR:Q}
+FILES_SUBST+= DEFANG_USER=${DEFANG_USER:Q}
+FILES_SUBST+= DEFANG_SPOOLDIR=${DEFANG_SPOOLDIR:Q}
RCD_SCRIPTS= mimedefang-multiplexor mimedefang
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 9b783e51920..36a97ef3b2b 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/10/05 20:08:32 tonio Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mutt-1.5.11
PKGREVISION= 2
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--without-included-gettext \
--enable-pop \
--enable-imap
-MAKE_ENV+= CHGRP=${CHGRP}
+MAKE_ENV+= CHGRP=${CHGRP:Q}
.if (${OPSYS} == "SunOS")
CONFIGURE_ARGS+= --without-wc-funcs
@@ -52,7 +52,7 @@ DOCDIR= ${PREFIX}/share/doc/mutt
EGDIR= ${PREFIX}/share/examples/mutt
CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-FILES_SUBST+= DOCDIR=${DOCDIR}
+FILES_SUBST+= DOCDIR=${DOCDIR:Q}
.if exists(${WRKSRC}/mutt_dotlock)
PLIST_SUBST+= MUTT_DOTLOCK=
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 7b156b47420..605a01a16f7 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2005/09/22 15:30:44 tron Exp $
+# $NetBSD: Makefile,v 1.129 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mutt-1.4.2.1i
PKGNAME= ${DISTNAME:C/i$//}
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--without-included-gettext \
--enable-pop \
--enable-imap
-MAKE_ENV+= CHGRP=${CHGRP}
+MAKE_ENV+= CHGRP=${CHGRP:Q}
.if ${OPSYS} == "SunOS"
CONFIGURE_ARGS+= --without-wc-funcs
@@ -55,7 +55,7 @@ DOCDIR= ${PREFIX}/share/doc/mutt
EGDIR= ${PREFIX}/share/examples/mutt
CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-FILES_SUBST+= DOCDIR=${DOCDIR}
+FILES_SUBST+= DOCDIR=${DOCDIR:Q}
.if exists(${WRKSRC}/mutt_dotlock)
PLIST_SUBST+= MUTT_DOTLOCK=
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index bbc4d8fa3da..cf2236f0854 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:50:34 rillig Exp $
DISTNAME= nmh-1.0.4
PKGREVISION= 6
@@ -33,18 +33,18 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --enable-nmh-pop
CONFIGURE_ARGS+= --with-mts=${NMH_MTA}
-.ifdef NMH_EDITOR
+.if defined(NMH_EDITOR)
CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR}
.endif
-.ifdef NMH_PAGER
+.if defined(NMH_PAGER)
CONFIGURE_ARGS+= --with-pager=${NMH_PAGER}
.endif
.if defined(KERBEROS)
PKG_USE_KERBEROS= yes
.if ${OPSYS} == "NetBSD"
-LIBS= -lroken -lcrypt -lcom_err
+LIBS+= -lroken -lcrypt -lcom_err
.endif
CONFIGURE_ARGS+= --with-krb4
.else
@@ -87,7 +87,6 @@ CONF_FILES= # empty
tmac.h
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
# This hopefully makes sure the permissions and ownership are right.
pre-install:
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 26c293d38d7..cfd33e11411 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/20 02:20:45 schmonz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:34 rillig Exp $
DISTNAME= nullmailer-1.00
CATEGORIES= mail
@@ -25,16 +25,16 @@ NULLMAILER_USER?= nullmail
PKG_GROUPS?= ${NULLMAILER_GROUP}
PKG_USERS?= ${NULLMAILER_USER}:${NULLMAILER_GROUP}
-MAKE_ENV+= NULLMAILER_GROUP=${NULLMAILER_GROUP}
-MAKE_ENV+= NULLMAILER_USER=${NULLMAILER_USER}
+MAKE_ENV+= NULLMAILER_GROUP=${NULLMAILER_GROUP:Q}
+MAKE_ENV+= NULLMAILER_USER=${NULLMAILER_USER:Q}
-PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} \
- NULLMAILER_GROUP=${NULLMAILER_GROUP} \
- NULLMAILER_USER=${NULLMAILER_USER}
+PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} \
+ NULLMAILER_GROUP=${NULLMAILER_GROUP:Q} \
+ NULLMAILER_USER=${NULLMAILER_USER:Q}
-FILES_SUBST+= VARBASE=${VARBASE} \
- NULLMAILER_GROUP=${NULLMAILER_GROUP} \
- NULLMAILER_USER=${NULLMAILER_USER}
+FILES_SUBST+= VARBASE=${VARBASE:Q} \
+ NULLMAILER_GROUP=${NULLMAILER_GROUP:Q} \
+ NULLMAILER_USER=${NULLMAILER_USER:Q}
RCD_SCRIPTS= nullmailer
diff --git a/mail/oe2mbx/Makefile b/mail/oe2mbx/Makefile
index 90503856635..c6d01370b91 100644
--- a/mail/oe2mbx/Makefile
+++ b/mail/oe2mbx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/01 03:00:17 reed Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:34 rillig Exp $
#
DISTNAME= oe2mbx-1.21
@@ -12,9 +12,9 @@ COMMENT= Outlook Express messages to the Unix mailbox format converter
WRKSRC= ${WRKDIR}/liboe-0.92
MAKEFILE= makefile
-MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_LIB="${INSTALL_LIB}" \
- INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_LIB=${INSTALL_LIB:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
BUILD_TARGET= liboe oe2mbx
INSTALLATION_DIRS= bin lib include
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 31bf99babc8..e9c5c2ddbf0 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:21 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:34 rillig Exp $
#
DISTNAME= offlineimap_${_OFFLINEIMAP_VER}
@@ -18,7 +18,7 @@ _OFFLINEIMAP_VER= 4.0.6
PYTHON_VERSIONS_ACCEPTED= 22 23
PYDISTUTILSPKG= yes
PYTHON_PATCH_SCRIPTS= bin/offlineimap
-PLIST_SUBST+= PYSITELIB=${PYSITELIB}
+PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
INSTALLATION_DIRS= man/man1 share/examples/offlineimap
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 3a7cc131cc7..18dd8edd8f7 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:22 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:34 rillig Exp $
#
DISTNAME= pfqueue-0.1.4
@@ -10,7 +10,7 @@ HOMEPAGE= http://pfqueue.sourceforge.net/
COMMENT= Real-time queue scanner for postfix
GNU_CONFIGURE= yes
-INCOMPAT_CURSES= NetBSD-1.*
+INCOMPAT_CURSES= NetBSD-1.*-*
INSTALLATION_DIRS= bin man/man1
diff --git a/mail/php-imap/Makefile b/mail/php-imap/Makefile
index 592fb76c1eb..dc260d3a0bd 100644
--- a/mail/php-imap/Makefile
+++ b/mail/php-imap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2005/04/20 12:03:25 kim Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:34 rillig Exp $
MODNAME= imap
-PKGREVISION= # empty
CATEGORIES+= mail
COMMENT= PHP extension for IMAP (Internet Mailbox Access Protocol)
@@ -18,7 +17,7 @@ CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no
# PHP_OPENSSL is set. For a self contained extension build like for
# this package this is not the case of course.
-CONFIGURE_ENV+= PHP_OPENSSL=${SSLBASE}
+CONFIGURE_ENV+= PHP_OPENSSL=${SSLBASE:Q}
.include "../../mail/imap-uw/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index 6b524c7ab82..ca28b0a6b4a 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2005/08/24 04:13:46 tv Exp $
+$NetBSD: distinfo,v 1.31 2005/12/05 20:50:34 rillig Exp $
SHA1 (pine4.63.tar.bz2) = ad235c1fad7cc8adfff5c69cea8eb267afa648c9
RMD160 (pine4.63.tar.bz2) = b04a6f5134aeae6b0a5663acbfa4e812c3fc7762
@@ -6,7 +6,7 @@ Size (pine4.63.tar.bz2) = 3083721 bytes
SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
SHA1 (patch-ab) = cfac4d24763dbd4285e03c6c25891469c5ac1953
SHA1 (patch-ac) = 870d7d414e25b37e47c5f62447210fe7800c733b
-SHA1 (patch-ad) = 68e3238369bcdf49867e2facc876a8f434136228
+SHA1 (patch-ad) = 48a9a7b4014bfc5499aef3e52a929f6f56a67562
SHA1 (patch-ae) = 0faf3a4161cba517a559a776d2a3a7fcb5116570
SHA1 (patch-af) = 1cd12e0b7aea804528730ed7323e7ea1ac385466
SHA1 (patch-ag) = 74d7e2dc9b986148825335f6f2b52bde963f9a67
diff --git a/mail/pine/patches/patch-ad b/mail/pine/patches/patch-ad
index 1490fab35eb..3950f2d7170 100644
--- a/mail/pine/patches/patch-ad
+++ b/mail/pine/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.11 2005/01/25 10:08:59 adam Exp $
+$NetBSD: patch-ad,v 1.12 2005/12/05 20:50:34 rillig Exp $
--- pine/signals.c.orig 2004-11-04 22:33:05.000000000 +0000
+++ pine/signals.c
-@@ -53,6 +53,7 @@ static char rcsid[] = "$Id: signals.c,v
+@@ -53,6 +53,7 @@
====*/
#include "headers.h"
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index c5a6c0c4a04..6ac94a9234e 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/06/16 06:58:03 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:34 rillig Exp $
#
DISTNAME= popa3d-1.0
@@ -23,8 +23,8 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
RCD_SCRIPTS= popa3d
-FILES_SUBST+= POPA3D_USER=${POPA3D_USER}
-FILES_SUBST+= POPA3D_GROUP=${POPA3D_GROUP}
+FILES_SUBST+= POPA3D_USER=${POPA3D_USER:Q}
+FILES_SUBST+= POPA3D_GROUP=${POPA3D_GROUP:Q}
SUBST_CLASSES+= params
SUBST_STAGE.params= post-patch
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index ced57cf7337..cce44f3888a 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/12/04 06:30:37 martti Exp $
+# $NetBSD: Makefile,v 1.50 2005/12/05 20:50:34 rillig Exp $
DISTNAME= postfix-2.3-20051128
#PKGREVISION= 1
@@ -72,7 +72,7 @@ LIBEXECDIR= ${PREFIX}/libexec/postfix
DOCDIR= ${PREFIX}/share/doc/postfix
EXAMPLEDIR= ${PREFIX}/share/examples/postfix
-FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
+FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q}
MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
MESSAGE_SUBST+= DOCDIR=${DOCDIR}
@@ -83,8 +83,8 @@ MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
PLIST_SRC+= ${PKGDIR}/PLIST
BUILD_TARGET= # empty
-MAKE_ENV= CC="${CC}" OPT="${CFLAGS}"
-MAKE_ENV+= AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:M*:Q}
+MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
USE_PKGINSTALL= yes
RCD_SCRIPTS= postfix
@@ -103,7 +103,6 @@ CONF_FILES_PERMS= # empty
CONF_FILES_PERMS+= ${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
${ROOT_USER} ${ROOT_GROUP} 755
.endfor
-.undef _file_
.if !empty(PKG_OPTIONS:Msasl)
MAKE_DIRS+= ${SASLLIBDIR}
CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 8704b8c4050..b0bbe5a04c1 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2005/12/01 06:46:40 martti Exp $
+# $NetBSD: Makefile,v 1.170 2005/12/05 20:50:34 rillig Exp $
DISTNAME= postfix-2.2.6
#PKGREVISION= 1
@@ -69,7 +69,7 @@ LIBEXECDIR= ${PREFIX}/libexec/postfix
DOCDIR= ${PREFIX}/share/doc/postfix
EXAMPLEDIR= ${PREFIX}/share/examples/postfix
-FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
+FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q}
MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
MESSAGE_SUBST+= DOCDIR=${DOCDIR}
@@ -80,8 +80,8 @@ MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
PLIST_SRC+= ${PKGDIR}/PLIST
BUILD_TARGET= # empty
-MAKE_ENV= CC="${CC}" OPT="${CFLAGS}"
-MAKE_ENV+= AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:M*:Q}
+MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
USE_PKGINSTALL= yes
RCD_SCRIPTS= postfix
@@ -100,7 +100,6 @@ CONF_FILES_PERMS= # empty
CONF_FILES_PERMS+= ${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
${ROOT_USER} ${ROOT_GROUP} 755
.endfor
-.undef _file_
.if !empty(PKG_OPTIONS:Msasl)
MAKE_DIRS+= ${SASLLIBDIR}
CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index 2cfd05d2227..f281fdacb4e 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= postgrey-1.21
-PKGREVISION= # empty
CATEGORIES= mail
MASTER_SITES= http://isg.ee.ethz.ch/tools/postgrey/pub/ \
http://isg.ee.ethz.ch/tools/postgrey/pub/old/
@@ -45,10 +44,10 @@ OWN_DIRS+= ${PREFIX}/${EGDIR}
OWN_DIRS_PERMS+= ${POSTGREY_DBDIR} \
${POSTGREY_USER} ${POSTGREY_GROUP} 0775
-FILES_SUBST+= PERL="${PERL5}"
+FILES_SUBST+= PERL=${PERL5:Q}
-PLIST_SUBST+= DOCDIR="${DOCDIR}"
-PLIST_SUBST+= EGDIR="${EGDIR}"
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
+PLIST_SUBST+= EGDIR=${EGDIR:Q}
SUBST_CLASSES+= postgrey
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index d2de6a26658..08ff6d9a3ca 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:13 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= prayer-1.0.12
@@ -16,11 +16,11 @@ PRAYER_GROUP= prayer
PKG_GROUPS= ${PRAYER_GROUP}
PKG_USERS= ${PRAYER_USER}:${PRAYER_GROUP}
-MAKE_ENV+= EGDIR="${EGDIR}"
-MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
+MAKE_ENV+= EGDIR=${EGDIR:Q}
+MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
MAKE_ENV+= BUILDLINK_PREFIX.db4="${BUILDLINK_PREFIX.db4}"
MAKE_ENV+= BUILDLINK_PREFIX.imap-uw="${BUILDLINK_PREFIX.imap-uw}"
-MAKE_ENV+= SSLCERTS="${SSLCERTS}"
+MAKE_ENV+= SSLCERTS=${SSLCERTS:Q}
PKG_SYSCONFSUBDIR= prayer
EGDIR= ${PREFIX}/share/examples/prayer
@@ -37,8 +37,8 @@ VAR_PREFIX= ${VARBASE}/spool/prayer
OWN_DIRS+= ${EGDIR}
OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
-FILES_SUBST+= OPSYS="${OPSYS}"
-FILES_SUBST+= VAR_PREFIX="${VAR_PREFIX}"
+FILES_SUBST+= OPSYS=${OPSYS:Q}
+FILES_SUBST+= VAR_PREFIX=${VAR_PREFIX:Q}
post-patch:
${FIND} ${WRKSRC} -name CVS -type d -print | ${SORT} -r | \
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index e0e392b4627..252e736d85d 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/06/16 06:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= procmail-3.22
@@ -12,7 +12,7 @@ COMMENT= Local mail delivery agent
PKG_INSTALLATION_TYPES= overwrite pkgviews
-MAKE_ENV+= SHELL=${SH} CHMOD=${CHMOD}
+MAKE_ENV+= SHELL=${SH:Q} CHMOD=${CHMOD:Q}
INSTALL_TARGET= install-suid install.man
UNLIMIT_RESOURCES= datasize
diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
index e3eb76bef5b..b0984c8fa89 100644
--- a/mail/pymsgauth/Makefile
+++ b/mail/pymsgauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= pymsgauth-2.1.0
@@ -25,7 +25,7 @@ PYTHON_PATCH_SCRIPTS= ${PYMSGAUTH_PROGRAMS} *.py
USE_PKGINSTALL= yes
INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL
DEINSTALL_EXTRA_TMPL+= ${PKGDIR}/DEINSTALL
-FILES_SUBST+= SHAREDIR=${SHAREDIR}
+FILES_SUBST+= SHAREDIR=${SHAREDIR:Q}
INSTALLATION_DIRS= ${SHAREDIR} ${DOCDIR} ${HTMLDOCDIR} ${EGDIR} bin
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index ed95e8c366f..4fcee5030e0 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= qmail-run-20050415
@@ -21,8 +21,8 @@ NO_CHECKSUM= yes
USE_PKGINSTALL= yes
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA}
-FILES_SUBST+= PKGNAME=${PKGNAME}
+FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
+FILES_SUBST+= PKGNAME=${PKGNAME:Q}
RCD_SCRIPTS= qmail qmailpop3d qmailqread qmailsend qmailsmtpd
INSTALLATION_DIRS= bin share/doc/qmail-run share/examples/qmail-run
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 7f29cbfbedc..c6086bf834e 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/08/19 04:44:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= netqmail-1.05
@@ -49,11 +49,11 @@ DOCDIR= ${PREFIX}/share/doc/qmail
EGDIR= ${PREFIX}/share/examples/qmail
SHAREDIR= ${PREFIX}/share/qmail
MESSAGE_SUBST+= DOCDIR=${DOCDIR} EGDIR=${EGDIR}
-FILES_SUBST+= DOCDIR=${DOCDIR} EGDIR=${EGDIR} SHAREDIR=${SHAREDIR}
-FILES_SUBST+= QMAILDIR=${QMAILDIR} QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR}
-FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA}
-FILES_SUBST+= VIRUSCAN_SIGS_SRCFILE=${VIRUSCAN_SIGS_SRCFILE}
-FILES_SUBST+= PKGNAME=${PKGNAME}
+FILES_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} SHAREDIR=${SHAREDIR:Q}
+FILES_SUBST+= QMAILDIR=${QMAILDIR:Q} QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q}
+FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
+FILES_SUBST+= VIRUSCAN_SIGS_SRCFILE=${VIRUSCAN_SIGS_SRCFILE:Q}
+FILES_SUBST+= PKGNAME=${PKGNAME:Q}
PLIST_SRC= ${PKGDIR}/PLIST
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index b17f3977cb0..9257a42f979 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2005/10/05 05:46:54 schmonz Exp $
+# $NetBSD: options.mk,v 1.18 2005/12/05 20:50:35 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
PKG_SUPPORTED_OPTIONS+= darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
@@ -40,7 +40,7 @@ DARWINSUFX= .doc
.else
DARWINSUFX= # empty
.endif
-PLIST_SUBST+= DARWINSUFX=${DARWINSUFX}
+PLIST_SUBST+= DARWINSUFX=${DARWINSUFX:Q}
.if !empty(PKG_OPTIONS:Mqmail-netqmail)
NETQMAIL_PATCH= netqmail-1.05.tar.gz
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index e36f0fe3f74..aaeb54d2795 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= ripmime-1.4.0.2
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.pldaniels.com/ripmime/
COMMENT= Extract the attached files out of a MIME encoded email package
PKGMANDIR?= man
-MAKE_ENV+= PKGMANDIR=${PKGMANDIR}
+MAKE_ENV+= PKGMANDIR=${PKGMANDIR:Q}
INSTALLATION_DIRS= bin ${PKGMANDIR}
diff --git a/mail/rmail-mime/Makefile b/mail/rmail-mime/Makefile
index aceb7b880aa..4f64b30d652 100644
--- a/mail/rmail-mime/Makefile
+++ b/mail/rmail-mime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= rmail-mime-1.13.0
@@ -9,12 +9,12 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/semi/rmail-mime/
MAINTAINER= jschauma@NetBSD.org
COMMENT= MIME-capabilities for RMAIL in Emacs
-DEPENDS= ${EMACS_PKGNAME_PREFIX}semi>=1.14.4:../../devel/semi
+DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi>=1.14.4:../../devel/semi
.include "../../mk/emacs.mk"
SITE_LISP= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}
-PLIST_SUBST+= SITE_LISP=${SITE_LISP}
+PLIST_SUBST+= SITE_LISP=${SITE_LISP:Q}
do-build:
cd ${WRKSRC}; ${EMACS_BIN} --no-init-file --no-site-file -batch \
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index e433e1133b2..eaf992449ec 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.80 2005/12/05 20:50:35 rillig Exp $
.include "../../mail/sendmail/Makefile.common"
@@ -11,9 +11,9 @@ MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
SMRSH_CMDDIR?= ${PREFIX}/libexec/sm.bin
-PLIST_SUBST+= SMRSH_CMDDIR=${SMRSH_CMDDIR}
+PLIST_SUBST+= SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
-SUBST_CLASSES= paths
+SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-build
SUBST_FILES.paths= ../mailer.conf include/sm/conf.h smrsh/smrsh.8
SUBST_SED.paths= -e "s|@@PREFIX@@|${PREFIX}|g" \
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 75d68eae93f..73fea46e4dc 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2005/10/14 08:36:02 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.30 2005/12/05 20:50:35 rillig Exp $
#
# Makefile fragment shared with libmilter
#
@@ -20,9 +20,9 @@ PATCHDIR?= ${.CURDIR}/../../mail/sendmail/patches
DIST_VERS= 8.13.5
-MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
- BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
- BUILDLINK_DIR="${BUILDLINK_DIR}"
+MAKE_ENV+= BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
+ BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
+ BUILDLINK_DIR=${BUILDLINK_DIR:Q}
SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
BUILD_DEFS+= SMRSH_CMDDIR
diff --git a/mail/sendmail812/Makefile.common b/mail/sendmail812/Makefile.common
index 9f2c69a6f32..df353e8a484 100644
--- a/mail/sendmail812/Makefile.common
+++ b/mail/sendmail812/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/08/04 12:30:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:50:35 rillig Exp $
#
# Makefile fragment shared with libmilter
#
@@ -20,9 +20,9 @@ PATCHDIR= ${.CURDIR}/../../mail/sendmail812/patches
DIST_VERS= 8.12.11
-MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
- BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
- BUILDLINK_DIR="${BUILDLINK_DIR}"
+MAKE_ENV+= BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
+ BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
+ BUILDLINK_DIR=${BUILDLINK_DIR:Q}
SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
DESCR_SRC= ${WRKDIR}/.DESCR_SRC
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 646871cbbb8..3047280c9c3 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/11/07 20:35:20 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:35 rillig Exp $
DISTNAME= smtpfeed-1.18
PKGREVISION= 1
@@ -17,7 +17,7 @@ COMMENT= SMTP Fast Exploding External Deliverer for Sendmail
#DEPENDS+= sendmail>=8.9.3:../../mail/sendmail
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec
+CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/libexec
# use bind8?
#CONFIGURE_ARGS+= --with-bind8
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index a3685edc65c..40fc789f50f 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/11/22 13:03:22 rillig Exp $
+# $NetBSD: Makefile,v 1.65 2005/12/05 20:50:35 rillig Exp $
DISTNAME= Mail-SpamAssassin-3.1.0
PKGNAME= spamassassin-3.1.0
@@ -111,8 +111,8 @@ _INTERPRETER_SUPPORT= YES
.endif
# These variables are substituted in netbsd-rc-script.sh.
-FILES_SUBST+= _INTERPRETER_SUPPORT="${_INTERPRETER_SUPPORT}"
-FILES_SUBST+= OPSYS="${OPSYS}"
+FILES_SUBST+= _INTERPRETER_SUPPORT=${_INTERPRETER_SUPPORT:Q}
+FILES_SUBST+= OPSYS=${OPSYS:Q}
post-extract:
@# correct bad SA permissions
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index 5c9a8a31548..ac988318600 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:35 rillig Exp $
DISTNAME= spamd-20050726
CATEGORIES= mail
@@ -22,7 +22,7 @@ RCD_SCRIPTS= pfspamd
CONF_FILES= ${PREFIX}/share/examples/spamd/spamd.conf \
${PKG_SYSCONFDIR}/spamd.conf
-SUBST_CLASSES= fix
+SUBST_CLASSES+= fix
SUBST_STAGE.fix= post-patch
SUBST_FILES.fix= spamd/spamd.8
SUBST_FILES.fix+= spamd-setup/spamd-setup.c spamd-setup/spamd-setup.8
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 7a6f8cf311c..574e59c945f 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/12/05 20:13:38 martti Exp $
+# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:35 rillig Exp $
DISTNAME= squirrelmail-1.4.5
PKGREVISION= 3
@@ -34,7 +34,7 @@ ATTACHMENTS_DIR= ${DATADIR}/attachments
USER_PREFS_DIR= ${DATADIR}/data
MESSAGE_SUBST+= SMDIR=${SMDIR}
-FILES_SUBST+= SMDIR=${SMDIR}
+FILES_SUBST+= SMDIR=${SMDIR:Q}
CONF_FILES= ${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
CONF_FILES+= ${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
diff --git a/mail/squirrelmail/plugin.mk b/mail/squirrelmail/plugin.mk
index 2523b7e1484..07339face9e 100644
--- a/mail/squirrelmail/plugin.mk
+++ b/mail/squirrelmail/plugin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugin.mk,v 1.1 2005/07/06 12:21:17 martti Exp $
+# $NetBSD: plugin.mk,v 1.2 2005/12/05 20:50:35 rillig Exp $
DISTNAME?= ${PLUGIN_NAME}-${PLUGIN_VERSION}
PKGNAME= sm-${PLUGIN_NAME}-${PLUGIN_VERSION}
@@ -15,7 +15,7 @@ FULL_PLUGIN_DIR= ${PREFIX}/${PLUGIN_DIR}
INSTALLATION_DIRS+= ${PLUGIN_DIR}
-PLIST_SUBST+= PLUGIN_DIR=${PLUGIN_DIR}
+PLIST_SUBST+= PLUGIN_DIR=${PLUGIN_DIR:Q}
do-install:
cd ${WRKSRC} && \
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 65a86bbdb61..8066541a16a 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/11/11 07:45:03 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:35 rillig Exp $
DISTNAME= sqwebmail-5.0.6
CATEGORIES= mail www
@@ -6,7 +6,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jlam@NetBSD.org
-COMMENT= webmail CGI for access to maildir-style mailboxes
+COMMENT= Webmail CGI for access to maildir-style mailboxes
HOMEPAGE= http://www.courier-mta.org/sqwebmail/
DEPENDS+= courier-maildir>=0.52.1:../../mail/courier-maildir
diff --git a/mail/sylpheed-claws/plugins.mk b/mail/sylpheed-claws/plugins.mk
index c46217fe52f..abda83894b8 100644
--- a/mail/sylpheed-claws/plugins.mk
+++ b/mail/sylpheed-claws/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.6 2005/11/04 11:10:57 rillig Exp $
+# $NetBSD: plugins.mk,v 1.7 2005/12/05 20:50:35 rillig Exp $
#
.include "../../mail/sylpheed-claws/Makefile.common"
@@ -28,6 +28,6 @@ CONFIGURE_ARGS+= --disable-mathml-viewer-plugin
CONFIGURE_ARGS+= --disable-pgpmime-plugin
PLIST_SRC= ${.CURDIR}/../../mail/sylpheed-claws/PLIST.plugins
-PLIST_SUBST+= PLUGIN_NAME=${PLUGIN_NAME}
+PLIST_SUBST+= PLUGIN_NAME=${PLUGIN_NAME:Q}
MESSAGE_SRC+= ${.CURDIR}/../../mail/sylpheed-claws/MESSAGE.plugins
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 3a38789dbdc..2c3c3ff962a 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:36 rillig Exp $
#
DISTNAME= tmda-1.0.3
@@ -23,16 +23,16 @@ PKG_GROUPS= tofmipd
PKG_USERS= tofmipd:tofmipd::TMDA\ ofmipd\ User
RCD_SCRIPTS= tofmipd
-FILES_SUBST+= PYTHONBIN=${PYTHONBIN}
+FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q}
SHAREDIR= share/${PKGBASE}
DOCDIR= share/doc/${PKGBASE}
CONTRIBDIR= share/doc/${PKGBASE}/contrib
HTMLDIR= share/doc/html/${PKGBASE}
-PLIST_SUBST+= SHAREDIR="${SHAREDIR}"
-PLIST_SUBST+= DOCDIR="${DOCDIR}"
-PLIST_SUBST+= CONTRIBDIR="${CONTRIBDIR}"
-PLIST_SUBST+= HTMLDIR="${HTMLDIR}"
+PLIST_SUBST+= SHAREDIR=${SHAREDIR:Q}
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
+PLIST_SUBST+= CONTRIBDIR=${CONTRIBDIR:Q}
+PLIST_SUBST+= HTMLDIR=${HTMLDIR:Q}
TMDA_PROGRAMS= bin/tmda-*
TMDA_DOCS= CODENAMES COPYING CRYPTO ChangeLog INSTALL README THANKS UPGRADE
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 337b81a5b41..bea0679fe4c 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/10/18 12:13:49 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:36 rillig Exp $
DISTNAME= turba-h3-${TURBAVER}
PKGNAME= turba-${TURBAVER}
@@ -28,7 +28,7 @@ REPLACE_PERL= ${WRKSRC}/scripts/ldap/addou.pl
USE_PKGINSTALL= YES
PKG_SYSCONFSUBDIR?= httpd
-SUBST_CLASSES= files
+SUBST_CLASSES+= files
SUBST_STAGE.files= post-build
SUBST_FILES.files= turba.conf.dist
SUBST_SED.files= -e "s|@TURBADIR@|${TURBADIR}|g"
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 78e0a32675e..55398e13534 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/08/28 04:31:00 uebayasi Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:36 rillig Exp $
DISTNAME= vm-7.19
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -36,12 +36,12 @@ BINDIR= ${PREFIX}/bin
INFO_FILES= vm.info
PLIST_SRC= ${PKGDIR}/PLIST.emacs
.endif
-MAKEFLAGS+= EMACS=${EMACS_BIN}
+MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
MAKE_ENV+= LISPDIR=${EMACS_LISPPREFIX}/vm
-MAKE_ENV+= INFODIR=${INFODIR}
-MAKE_ENV+= PIXMAPDIR=${PIXMAPDIR}
-MAKE_ENV+= BINDIR=${BINDIR}
+MAKE_ENV+= INFODIR=${INFODIR:Q}
+MAKE_ENV+= PIXMAPDIR=${PIXMAPDIR:Q}
+MAKE_ENV+= BINDIR=${BINDIR:Q}
do-install:
${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/vm
diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index c3c1e55a126..598fcb328ce 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:36 rillig Exp $
DISTNAME= wl-2.14.0
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+= ${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
# XXX please someone adjust paths and PLIST for XEmacs...
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
-MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX}
+MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q}
MAKE_FLAGS+= PIXMAPDIR=${PREFIX}/share/wl
INSTALL_TARGET= install install-info
INFO_FILES= wl.info wl-ja.info
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index a6d66d39b3c..3f02ee2b005 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:36 rillig Exp $
#
DISTNAME= xmailbox-2.5
@@ -11,8 +11,8 @@ COMMENT= Enhanced xbiff, with pixmap and sound support
USE_IMAKE= YES
-MAKE_ENV+= INSTALL_PROGRAM='${INSTALL_PROGRAM}'
-MAKE_ENV+= INSTALL_MAN='${INSTALL_MAN}'
+MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
+MAKE_ENV+= INSTALL_MAN=${INSTALL_MAN:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/xmailbox
diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile
index 1f95405c3b0..f417a44cdb4 100644
--- a/mail/yatsvrs/Makefile
+++ b/mail/yatsvrs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/23 21:45:16 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:36 rillig Exp $
#
DISTNAME= yatsvrs-5.00p6
@@ -29,9 +29,9 @@ CONFIGURE_ARGS+= --enable-shadow-password
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
INSTALL_FILE= ${WRKDIR}/INSTALL
-FILES_SUBST+= DEFAULT_ADMIN=${DEFAULT_YATADMIN}
-FILES_SUBST+= YATSVR_MINGID=${YATSVR_MINGID}
-FILES_SUBST+= YATSVR_MAXGID=${YATSVR_MAXGID}
+FILES_SUBST+= DEFAULT_ADMIN=${DEFAULT_YATADMIN:Q}
+FILES_SUBST+= YATSVR_MINGID=${YATSVR_MINGID:Q}
+FILES_SUBST+= YATSVR_MAXGID=${YATSVR_MAXGID:Q}
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
diff --git a/math/R/Makefile b/math/R/Makefile
index 5a070b1cc61..5613a6cef0b 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/12/01 23:11:26 joerg Exp $
+# $NetBSD: Makefile,v 1.76 2005/12/05 20:50:36 rillig Exp $
DISTNAME= R-2.1.1
PKGREVISION= 1
@@ -49,7 +49,7 @@ CONFIGURE_ENV+= ac_cv_lib_blas_dgemm_=yes
CONFIGURE_ENV+= GETWD=${TOOLS_PWD_CMD:Q}
CONFIGURE_ENV+= lt_cv_path_LD=${LD:Q}
-CONFIGURE_ENV+= lt_cv_path_SED="${TOOLS_SED}"
+CONFIGURE_ENV+= lt_cv_path_SED=${TOOLS_SED:Q}
# Package assumes it can append to files (specifically DESCRIPTION) that have
# been installed SHAREMODE
@@ -67,7 +67,7 @@ R_PAPERSIZE?= A4
.if (${R_PAPERSIZE} == "Letterdj")
R_PAPERSIZE= Letter
.endif
-CONFIGURE_ENV+= R_PAPERSIZE="${R_PAPERSIZE}"
+CONFIGURE_ENV+= R_PAPERSIZE=${R_PAPERSIZE:Q}
# These macros are used during the build, so strip off the -o,-g flags.
#
diff --git a/math/calc/Makefile b/math/calc/Makefile
index fcf2669c4ae..9d5e0e48d75 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:36 rillig Exp $
DISTNAME= calc-2.02f
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT= Advanced Calculator for GNU Emacs
.include "../../mk/emacs.mk"
-MAKE_ENV+= EMACS=${EMACS_FLAVOR}
+MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q}
USE_MAKEINFO= YES
INFO_FILES= calc.info
diff --git a/math/dcdflib.c/Makefile b/math/dcdflib.c/Makefile
index f973e883dd7..90b7ef54765 100644
--- a/math/dcdflib.c/Makefile
+++ b/math/dcdflib.c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/08/26 22:22:47 reed Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:36 rillig Exp $
DISTNAME= dcdflib.c-1.1
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Library of C Routines for Cumulative Distribution Functions
WRKSRC= ${WRKDIR}/dcdflib.c/src
DIST_SUBDIR= ${PKGNAME_NOREV}
-MAKE_ENV+= LIBOWN=${LIBOWN} LIBGRP=${LIBGRP}
+MAKE_ENV+= LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q}
INSTALLATION_DIRS= include share/doc/dcdflib.c
diff --git a/math/ess/Makefile b/math/ess/Makefile
index f4a07fe0a31..f5f3291bbba 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:36 rillig Exp $
DISTNAME= ess-5.1.24
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -9,7 +9,7 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://software.biostat.washington.edu/statsoft/ess/
COMMENT= Emacs Speaks Statistics
-MAKEFLAGS+= EMACS=${EMACS_BIN}
+MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
USE_MAKEINFO= YES
USE_TOOLS+= perl
@@ -25,7 +25,7 @@ INFO_FILES= ess.info
INSTALLATION_DIRS= ${INFODIR}
MAKE_ENV+= LISPDIR=${EMACS_LISPPREFIX}/ess
-PLIST_SUBST+= INFODIR=${INFODIR}
+PLIST_SUBST+= INFODIR=${INFODIR:Q}
do-install:
${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/ess
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index b79acd6383f..f8d16f9ab32 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:36 rillig Exp $
.if (${MACHINE_ARCH} == "powerpc")
DISTNAME= fftw-3.0.1-fma
@@ -20,7 +20,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= fftw.pc.in
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-shared
+CONFIGURE_ARGS+= --enable-shared
USE_LANGUAGES= fortran
USE_TOOLS+= gmake
INFO_FILES= fftw3.info
diff --git a/math/fftw2/Makefile b/math/fftw2/Makefile
index 28ff7dc9c16..2744eaf17d2 100644
--- a/math/fftw2/Makefile
+++ b/math/fftw2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:36 rillig Exp $
DISTNAME= fftw-2.1.5
PKGNAME= fftw2-2.1.5
@@ -14,7 +14,7 @@ COMMENT= Collection of fast C routines to compute DFTs
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-shared
+CONFIGURE_ARGS+= --enable-shared
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS+= --enable-i386-hacks
.endif
diff --git a/math/gap/Makefile b/math/gap/Makefile
index 78d5afa1b85..4ab0bbfa66e 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:36 rillig Exp $
#
DISTNAME= gap4r3
@@ -23,13 +23,13 @@ LICENSE= no-commercial-use
USE_TOOLS+= gtar
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= PREFIX=${PREFIX}
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
BUILD_TARGET= default
GAP_DIRECTORY= ${PREFIX}/lib/gap4.3
GAP_PLATFORM= ${MACHINE_GNU_PLATFORM}-${CC}
-PLIST_SUBST= GAP_PLATFORM=${GAP_PLATFORM}
+PLIST_SUBST+= GAP_PLATFORM=${GAP_PLATFORM:Q}
INSTALLATION_DIRS= bin
diff --git a/math/gap/gap.package.mk b/math/gap/gap.package.mk
index bbdddc7d77e..14a6a9d19e8 100644
--- a/math/gap/gap.package.mk
+++ b/math/gap/gap.package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gap.package.mk,v 1.12 2005/10/23 22:27:07 rillig Exp $
+# $NetBSD: gap.package.mk,v 1.13 2005/12/05 20:50:36 rillig Exp $
#
# Set GAP_PKG_NAME in your Makefile. More may appear here later.
@@ -11,4 +11,4 @@ GAP_PKG_ROOT= ${GAP_DIRECTORY}/pkg
GAP_PKG_DIRECTORY= ${GAP_PKG_ROOT}/${GAP_PKG_NAME}
GAP_PLATFORM= ${MACHINE_GNU_PLATFORM}-${CC}
-PLIST_SUBST+= GAP_PLATFORM=${GAP_PLATFORM}
+PLIST_SUBST+= GAP_PLATFORM=${GAP_PLATFORM:Q}
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 1c409d06a90..ceeaa91fc0a 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2005/11/25 21:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2005/12/05 20:50:36 rillig Exp $
#
DISTNAME= gnumeric-1.4.3
@@ -19,7 +19,7 @@ USE_LIBTOOL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-python
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_VERSIONS_ACCEPTED= 24 23
GCONF2_SCHEMAS= gnumeric-dialogs.schemas gnumeric-general.schemas \
gnumeric-plugins.schemas
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 3f6dc9a91e0..a5f57141874 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/10/22 13:25:18 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2005/12/05 20:50:36 rillig Exp $
DISTNAME= Guppi-0.40.3
PKGNAME= ${DISTNAME:S/G/g/}
@@ -16,7 +16,7 @@ COMMENT= Plot program with integrated statistics capabilities
# only left here for gnucash
# works only with gnumeric-1.0.x (gnome1 based)
-CONFIGURE_ARGS= --disable-gnumeric
+CONFIGURE_ARGS+= --disable-gnumeric
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 1da62482d6d..9ecce2fa3c4 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/07/09 18:39:30 kristerw Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:36 rillig Exp $
DISTNAME= octave-${OCTAVE_VER}
PKGNAME= octave-current-${OCTAVE_VER}
@@ -30,7 +30,7 @@ USE_MAKEINFO= yes
USE_TOOLS+= gmake perl
GNU_CONFIGURE= yes
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
USE_LANGUAGES= c c++ fortran
# needed for loading of shared objects such as those in the
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --disable-shared
.include "options.mk"
GNU_PLATFORM_DIR!= ${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM}
-PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR}
+PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q}
INFO_FILES= octave.info liboctave.info
LIBOCTAVE_INFO= liboctave.info liboctave.info-1 \
diff --git a/math/octave-current/octave.mk b/math/octave-current/octave.mk
index 17a148ab85c..2e623babc5f 100644
--- a/math/octave-current/octave.mk
+++ b/math/octave-current/octave.mk
@@ -1,21 +1,20 @@
-# $NetBSD: octave.mk,v 1.3 2005/04/01 10:15:19 adam Exp $
+# $NetBSD: octave.mk,v 1.4 2005/12/05 20:50:37 rillig Exp $
.include "../../mk/bsd.prefs.mk"
OCTAVE_CONFIG= ${LOCALBASE}/bin/octave-config
# OCTAVE_VARS is a list of variables to define in the make environment.
-# This may be overridden in an octave add-on package Makefile.
+# This may be overridden in an octave add-on package Makefile.
OCTAVE_VARS?= LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR VERSION
# Set OCT_<var> to the value of <var> as returned by octave-config.
.if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
-. if exists(${OCTAVE_CONFIG})
+. if exists(${OCTAVE_CONFIG})
. for _var_ in ${OCTAVE_VARS}
. if !defined(OCT_${_var_})
-OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_}
-. endif
+OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_}
+. endif
. endfor
-. undef _var_
-. endif
-.endif
+. endif
+.endif
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index cfee039de0a..ea52673ff21 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/04 13:12:21 adam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:37 rillig Exp $
DISTNAME= octave-forge-2005.06.13
CATEGORIES= math
@@ -19,7 +19,7 @@ BUILD_TARGET= # empty
TEST_DIRS= ${WRKSRC}
TEST_TARGET= check
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
USE_LANGUAGES= c c++ fortran
.include "../../math/octave/octave.mk"
@@ -27,7 +27,7 @@ USE_LANGUAGES= c c++ fortran
PLIST_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR:S/${LOCALBASE}\///}
PLIST_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR:S/${LOCALBASE}\///}
PLIST_SUBST+= OCT_LOCALVERARCHLIBDIR=${OCT_LOCALVERARCHLIBDIR:S/${LOCALBASE}\///}
-PLIST_SUBST+= OCT_VERSION=${OCT_VERSION}
+PLIST_SUBST+= OCT_VERSION=${OCT_VERSION:Q}
MESSAGE_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR}
MESSAGE_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR}
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 91e547d145c..6e4021c9b6a 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/11/29 13:11:05 adam Exp $
+# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:36 rillig Exp $
DISTNAME= octave-${OCTAVE_VER}
CATEGORIES= math
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --enable-dl
.include "options.mk"
GNU_PLATFORM_DIR!= ${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM}
-PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR}
+PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q}
INFO_FILES= octave.info liboctave.info
LIBOCTAVE_INFO= liboctave.info liboctave.info-1 \
diff --git a/math/octave/octave.mk b/math/octave/octave.mk
index f652010302c..8bf35e3874a 100644
--- a/math/octave/octave.mk
+++ b/math/octave/octave.mk
@@ -1,4 +1,4 @@
-# $NetBSD: octave.mk,v 1.3 2005/08/04 13:15:13 adam Exp $
+# $NetBSD: octave.mk,v 1.4 2005/12/05 20:50:36 rillig Exp $
.include "../../mk/bsd.prefs.mk"
@@ -16,6 +16,5 @@ OCTAVE_VARS?= LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR VERSION
OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_}
. endif
. endfor
-. undef _var_
. endif
.endif
diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index b69dea29cd4..c28d2cd7efc 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/06 06:19:23 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:37 rillig Exp $
#
DISTNAME= Math-Pari-2.010501
@@ -15,7 +15,7 @@ COMMENT= Perl5 interface to the pari math library
# XXX: to use or not to use...
#DEPENDS+= gnuplot-[0-9]*:../../graphics/gnuplot
-GCC_REQD= 2.95
+GCC_REQD+= 2.95
MAKE_ENV+= MP_NOGNUPLOT=1
PERL5_PACKLIST= auto/Math/Pari/.packlist
#TEST_TARGET= # the tests need looking at
diff --git a/math/pari/Makefile b/math/pari/Makefile
index e072af8bd9a..e4d28e67eff 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:37 rillig Exp $
DISTNAME= pari-2.1.6
CATEGORIES= math
@@ -20,9 +20,9 @@ CONFIGURE_SCRIPT= ${WRKSRC}/Configure
CONFIGURE_ARGS+= --graphic=X11
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --share-prefix=${PREFIX}/share
-CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
-CONFIGURE_ENV+= PERL5=${PERL5}
-CONFIGURE_ENV+= X11BASE=${X11BASE}
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q}
+CONFIGURE_ENV+= PERL5=${PERL5:Q}
+CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
TEST_TARGET= test-compat bench
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index de1bdf1f412..df96bed3732 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:30 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:37 rillig Exp $
#
DISTNAME= pspp-0.3.0
@@ -22,7 +22,7 @@ BUILD_USES_MSGFMT= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -Dunix=1
-CONFIGURE_ARGS= --sysconfdir="${PKG_SYSCONFDIR}"
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
INFO_FILES= pspp.info
diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index 44b7b69b343..37f3b118d48 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:37 rillig Exp $
DISTNAME= ScientificPython-2.4.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//}
@@ -13,16 +13,16 @@ COMMENT= Python modules for scientific computing
CONFLICTS+= py-Scientific-*
-BUILDLINK_DEPENDS.python20= python20>=2.0.1nb1
-BUILDLINK_DEPENDS.python21= python21>=2.1.1nb1
+BUILDLINK_DEPENDS.python20+= python20>=2.0.1nb1
+BUILDLINK_DEPENDS.python21+= python21>=2.1.1nb1
PYDISTUTILSPKG= yes
PYBINMODULE= yes
-MAKE_ENV+= NETCDF_PREFIX=${LOCALBASE}
+MAKE_ENV+= NETCDF_PREFIX=${LOCALBASE:Q}
EVAL_PREFIX+= NETCDFPREFIX=netcdf MPICHPREFIX=mpich
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PLIST_SUBST+= OSVER=${OS_VERSION:C/^(.).*/\1/}
post-build:
diff --git a/math/py-pytables/Makefile b/math/py-pytables/Makefile
index 99bbbea01b2..c30ca7ace60 100644
--- a/math/py-pytables/Makefile
+++ b/math/py-pytables/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:37 rillig Exp $
#
DISTNAME= pytables-0.9.1
@@ -15,7 +15,7 @@ PYDISTUTILSPKG= yes
PYSETUPBUILDARGS= --hdf5=${BUILDLINK_PREFIX.hdf5}
PYSETUPINSTALLARGS= --hdf5=${BUILDLINK_PREFIX.hdf5}
PYTHON_VERSIONS_ACCEPTED= 24 23 22
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
post-extract:
cd ${WRKSRC}/utils; \
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 5f2269378ec..998869e1526 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/10/26 04:09:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.67 2005/12/05 20:50:37 rillig Exp $
#
DISTNAME= ${SCIBASE}-src
@@ -37,14 +37,14 @@ CONFIGURE_ENV+= TCL_CONFIG_SH=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
CONFIGURE_ENV+= TK_CONFIG_SH=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
# override HOME to avoid picking up a bad ${HOME}/.scilab during the build
-MAKE_ENV+= HOME=${WRKSRC}
-MAKE_ENV+= PVM_ROOT=${PVM_ROOT}
-CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
+MAKE_ENV+= HOME=${WRKSRC:Q}
+MAKE_ENV+= PVM_ROOT=${PVM_ROOT:Q}
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q}
PVM_ROOT?= ${LOCALBASE}/pvm3
-CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT}
-CONFIGURE_ENV+= X11BASE=${X11BASE}
-PLIST_SUBST+= SCIBASE=${SCIBASE}
+CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT:Q}
+CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
+PLIST_SUBST+= SCIBASE=${SCIBASE:Q}
UNWRAP_FILES+= Makemex config/configuration config/Makeso.incl
@@ -107,7 +107,7 @@ GCC_REQD+= 2.95.3
# the "SCI=0 && unset SCI" is done because some of the tests really will
# fail if SCI is set to anything.
-MAKE_ENV+= SCI=${WRKSRC}
+MAKE_ENV+= SCI=${WRKSRC:Q}
do-test:
cd ${WRKSRC}/tests && \
${MAKE_ENV} ${MAKE_PROGRAM} tests 2>&1 | \
diff --git a/math/scilab/buildlink3.mk b/math/scilab/buildlink3.mk
index 7beaa3d01ef..d39dabe85a6 100644
--- a/math/scilab/buildlink3.mk
+++ b/math/scilab/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/10/26 04:09:37 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/05 20:50:37 rillig Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -24,8 +24,8 @@ BUILDLINK_FILES.scilab+= lib/scilab-${SCIVERSION}/Version.incl
.include "../../x11/tk/buildlink3.mk"
SCI= ${BUILDLINK_DIR}/lib/scilab-3.1.1
-CONFIGURE_ENV+= SCI=${SCI}
-MAKE_ENV+= SCI=${SCI}
+CONFIGURE_ENV+= SCI=${SCI:Q}
+MAKE_ENV+= SCI=${SCI:Q}
SCIVERSION= 3.1.1
diff --git a/math/snns/Makefile b/math/snns/Makefile
index ffda57bdd2d..82374b9155f 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/17 04:49:47 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:37 rillig Exp $
DISTNAME= SNNSv4.2
PKGNAME= snns-4.2
@@ -10,7 +10,7 @@ HOMEPAGE= http://www-ra.informatik.uni-tuebingen.de/SNNS/
COMMENT= Software simulator for neural networks
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --enable-global
+CONFIGURE_ARGS+= --enable-global
XGUILOADPATH= ${PREFIX}/share/snns
diff --git a/math/tochnog/Makefile b/math/tochnog/Makefile
index 5eedf534a24..1a828dc1d4f 100644
--- a/math/tochnog/Makefile
+++ b/math/tochnog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:20 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:37 rillig Exp $
DISTNAME= tochnog-20010429
CATEGORIES= math
@@ -15,7 +15,7 @@ EXTRACT_ONLY= tn.tar.gz
MAKEFILE= makefile
BUILD_TARGET= netbsd
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
INSTALLATION_DIRS= bin
diff --git a/math/xgap/Makefile b/math/xgap/Makefile
index 08f40732367..2447f714d17 100644
--- a/math/xgap/Makefile
+++ b/math/xgap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:20 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:37 rillig Exp $
#
DISTNAME= xgap4r16
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${GAP_PKG_NAME}
GNU_CONFIGURE= YES
BUILD_TARGET= default
-CONFIGURE_ENV+= GAP_DIRECTORY=${GAP_DIRECTORY}
+CONFIGURE_ENV+= GAP_DIRECTORY=${GAP_DIRECTORY:Q}
GAP_PKG_NAME= xgap
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index c0ca0b539a2..04c468c965e 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:37 rillig Exp $
DISTNAME= xmgr-4.1.2
PKGREVISION= 1
@@ -14,7 +14,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://plasma-gate.weizmann.ac.il/Xmgr/
COMMENT= Powerful XY plotting tool for workstations or X-terminals using X
-BUILD_DEPENDS= bison-[0-9]*:../../devel/bison
+BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
USE_X11BASE= YES
USE_LANGUAGES= fortran
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 5fa2d5b00e0..da3ef64e1ca 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/10/25 17:55:56 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:37 rillig Exp $
#
DISTNAME= yacas-1.0.59
@@ -6,7 +6,7 @@ CATEGORIES= math
MASTER_SITES= http://yacas.sourceforge.net/backups/
MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://yacas.sourceforge.net
+HOMEPAGE= http://yacas.sourceforge.net/
COMMENT= Yet Another Computer Algebra System
USE_LANGUAGES= c c++
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 8712e4b1969..b914ef89aee 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/06/17 03:50:20 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:37 rillig Exp $
#
DISTNAME= sdr-3.0
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --enable-ipv6
.if exists(/usr/include/sys/inttypes.h)
EXTRA_FLAGS+= -DHAVE_SYS_INTTYPES_H
-MAKE_FLAGS+= EXTRA_FLAGS="${EXTRA_FLAGS}"
+MAKE_FLAGS+= EXTRA_FLAGS=${EXTRA_FLAGS:Q}
.endif
.if ${OPSYS} == "SunOS"
diff --git a/meta-pkgs/XFree86/Makefile b/meta-pkgs/XFree86/Makefile
index 20dd02c6988..b872440cc06 100644
--- a/meta-pkgs/XFree86/Makefile
+++ b/meta-pkgs/XFree86/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/10/10 17:22:05 reed Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:37 rillig Exp $
DISTNAME= # empty
PKGNAME= XFree86-${XF_VER}
@@ -10,7 +10,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 meta-package
-DEPENDS= XFree86-imake>=4.4.0:../../x11/XFree86-imake
+DEPENDS+= XFree86-imake>=4.4.0:../../x11/XFree86-imake
DEPENDS+= XFree86-libs>=4.4.0:../../x11/XFree86-libs
DEPENDS+= XFree86-clients>=4.4.0:../../x11/XFree86-clients
DEPENDS+= XFree86-server>=4.4.0:../../x11/XFree86-server
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common
index e50d9b5554b..a8c90eae9b7 100644
--- a/meta-pkgs/XFree86/Makefile.common
+++ b/meta-pkgs/XFree86/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/09/28 19:20:30 rillig Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:50:37 rillig Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -104,21 +104,21 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX}
.if !defined(XFREE86_ONLY_DIRS) || empty(XFREE86_ONLY_DIRS:M[Yy][Ee][Ss])
-PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR}
-PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB}
-PLIST_SUBST+= XF86RUSH=${XF86RUSH}
-PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS}
-PLIST_SUBST+= LIBDRI=${LIBDRI}
-PLIST_SUBST+= MAN_DIR=${MAN_DIR}
-PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR}
-PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX}
-PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX}
-PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR}
-PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX}
-PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR}
-PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX}
-PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR}
-PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX}
+PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR:Q}
+PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB:Q}
+PLIST_SUBST+= XF86RUSH=${XF86RUSH:Q}
+PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS:Q}
+PLIST_SUBST+= LIBDRI=${LIBDRI:Q}
+PLIST_SUBST+= MAN_DIR=${MAN_DIR:Q}
+PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR:Q}
+PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX:Q}
+PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX:Q}
+PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR:Q}
+PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX:Q}
+PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR:Q}
+PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX:Q}
+PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR:Q}
+PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX:Q}
CHECK_X11_TYPE?= yes
@@ -134,7 +134,7 @@ WRKSRC?= ${WRKDIR}/xc
X11ROOT?= ${LOCALBASE}/${X11ROOT_PREFIX}
PREPEND_PATH= ${X11ROOT}/bin # Make sure we have this in PATH :)
-PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX}
+PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX:Q}
MESSAGE_SUBST+= X11ROOT=${X11ROOT}
#
@@ -204,7 +204,6 @@ post-extract:
@${MV} ${WRKSRC}/config/cf/${F}.cf \
${WRKSRC}/config/cf/${F}.cf.in
. endfor
-. undef F
. endif
@@ -220,7 +219,6 @@ pre-configure:
${WRKSRC}/config/cf/${F}.cf.in > \
${WRKSRC}/config/cf/${F}.cf
. endfor
-. undef F
. endif
diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk
index e713d74a7f3..8575a984f37 100644
--- a/meta-pkgs/kde3/kde3.mk
+++ b/meta-pkgs/kde3/kde3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: kde3.mk,v 1.9 2005/06/01 18:03:04 jlam Exp $
+# $NetBSD: kde3.mk,v 1.10 2005/12/05 20:50:37 rillig Exp $
#
# This Makefile fragment is included by packages that use the KDE3
# configure-and-build process.
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --with-xinerama
.endif
-CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= USER_LDFLAGS=${LDFLAGS:M*:Q}
LDFLAGS+= -L${QTDIR}/lib
_KDE3_EXTRA_INCLUDES?= ${LOCALBASE}/include:${X11BASE}/include
@@ -71,8 +71,8 @@ _KDE3_EXTRA_INCLUDES?= ${LOCALBASE}/include:${X11BASE}/include
KDE_CONFIG_SITE?= ${KDEDIR}/share/kde/config.site \
${PKG_SYSCONFDIR}/kde/config.site
-CONFIGURE_ENV+= KDEDIR="${KDEDIR}"
-CONFIGURE_ENV+= CONFIG_SITE="${KDE_CONFIG_SITE}"
+CONFIGURE_ENV+= KDEDIR=${KDEDIR:Q}
+CONFIGURE_ENV+= CONFIG_SITE=${KDE_CONFIG_SITE:Q}
CONFIGURE_ENV+= kde_appsdir="${KDEDIR}/share/kde/applnk"
CONFIGURE_ENV+= kde_cgidir="${KDEDIR}/kde-cgi-bin"
CONFIGURE_ENV+= kde_confdir="${KDEDIR}/share/kde/config"
diff --git a/meta-pkgs/xorg/Makefile b/meta-pkgs/xorg/Makefile
index f19538c7590..066c81ff3a0 100644
--- a/meta-pkgs/xorg/Makefile
+++ b/meta-pkgs/xorg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/29 18:46:42 reed Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:37 rillig Exp $
DISTNAME= # empty
PKGNAME= xorg-${XORG_VER}
@@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org meta-package
-DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake
+DEPENDS+= xorg-imake>=${XORG_VER}:../../x11/xorg-imake
DEPENDS+= xorg-libs>=${XORG_VER}:../../x11/xorg-libs
DEPENDS+= xorg-server>=${XORG_VER}:../../x11/xorg-server
DEPENDS+= xorg-clients>=${XORG_VER}:../../x11/xorg-clients
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index c4ca34e9bf0..d7812ad782b 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2005/10/05 00:31:23 reed Exp $
+# $NetBSD: Makefile.common,v 1.36 2005/12/05 20:50:37 rillig Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -124,22 +124,22 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX}
.if !defined(XORG_ONLY_DIRS) || empty(XORG_ONLY_DIRS:M[Yy][Ee][Ss])
-PLIST_SUBST+= DARWIN_QUARTZ=${DARWIN_QUARTZ}
-PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR}
-PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB}
-PLIST_SUBST+= XF86RUSH=${XF86RUSH}
-PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS}
-PLIST_SUBST+= LIBDRI=${LIBDRI}
-PLIST_SUBST+= MAN_DIR=${MAN_DIR}
-PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR}
-PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX}
-PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX}
-PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR}
-PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX}
-PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR}
-PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX}
-PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR}
-PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX}
+PLIST_SUBST+= DARWIN_QUARTZ=${DARWIN_QUARTZ:Q}
+PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR:Q}
+PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB:Q}
+PLIST_SUBST+= XF86RUSH=${XF86RUSH:Q}
+PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS:Q}
+PLIST_SUBST+= LIBDRI=${LIBDRI:Q}
+PLIST_SUBST+= MAN_DIR=${MAN_DIR:Q}
+PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR:Q}
+PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX:Q}
+PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX:Q}
+PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR:Q}
+PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX:Q}
+PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR:Q}
+PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX:Q}
+PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR:Q}
+PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX:Q}
CHECK_X11_TYPE?= yes
@@ -156,7 +156,7 @@ X11ROOT?= ${LOCALBASE}/${X11ROOT_PREFIX}
PREPEND_PATH+= ${X11ROOT}/bin # Make sure we have this in PATH :)
EGDIR?= ${LOCALBASE}/share/examples/xorg
-PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX}
+PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX:Q}
MESSAGE_SUBST+= X11ROOT=${X11ROOT}
.if ${OPSYS} != "Darwin"
@@ -269,7 +269,6 @@ post-extract:
. for F in ${SYSTEMS}
@${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in
. endfor
-. undef F
. endif
. if !target(pre-configure)
@@ -285,7 +284,6 @@ pre-configure:
${WRKSRC}/config/cf/${F}.cf.in > \
${WRKSRC}/config/cf/${F}.cf
. endfor
-. undef F
. endif
. if !target(do-configure)
diff --git a/misc/XFree86-dirs/dirs.mk b/misc/XFree86-dirs/dirs.mk
index 194d5fa8a54..b37e3fbfd57 100644
--- a/misc/XFree86-dirs/dirs.mk
+++ b/misc/XFree86-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.5 2005/06/04 11:20:22 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.6 2005/12/05 20:50:38 rillig Exp $
#
.if !defined(DIRS_XFREE86_MK)
@@ -35,7 +35,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \
{ print "@comment in XFree86-dirs: "$$0; next; }
. endfor
-. undef dir
.endif
.endif # !defined(DIRS_XFREE86_MK)
diff --git a/misc/XFree86-docs/Makefile b/misc/XFree86-docs/Makefile
index ba8e025055e..4ff12d642db 100644
--- a/misc/XFree86-docs/Makefile
+++ b/misc/XFree86-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/10 17:22:05 reed Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:38 rillig Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-docs-${XF_VER}
@@ -10,7 +10,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 Documentation
-DEPENDS= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
+DEPENDS+= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
USE_LANGUAGES= # empty
NO_XFREE86_TARGETS= yes
diff --git a/misc/XFree86-man/Makefile b/misc/XFree86-man/Makefile
index 3551452abc7..030082ebdd9 100644
--- a/misc/XFree86-man/Makefile
+++ b/misc/XFree86-man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/10/10 17:22:05 reed Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:38 rillig Exp $
DISTNAME= XFree86-${XF_VER}-src-1
PKGNAME= XFree86-man-${XF_VER}
@@ -10,7 +10,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 Manuals
-DEPENDS= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
+DEPENDS+= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
USE_LANGUAGES= # empty
NO_XFREE86_TARGETS= yes
@@ -28,7 +28,6 @@ pre-configure:
.for F in general X11 GL GL/gl GL/glx GLU GLw Xv Xau Xt Xext Xext/dbe Xi
@${LN} -sf ${WRKSRC}/host.def ${WRKSRC}/${F}/
.endfor
-.undef F
do-configure:
(cd ${WRKSRC} ; \
diff --git a/misc/asr-manpages/Makefile b/misc/asr-manpages/Makefile
index f8afaf014f7..da32db02bc9 100644
--- a/misc/asr-manpages/Makefile
+++ b/misc/asr-manpages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/31 20:53:15 reed Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:38 rillig Exp $
#
DISTNAME= asr.pages
@@ -13,7 +13,7 @@ COMMENT= alt.sysadmin.recovery man page distribution
NO_CONFIGURE= yes
NO_BUILD= yes
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
INSTALLATION_DIRS= man/man1 man/man2 man/man3 man5 man/man8
do-install:
diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile
index 5eeebed8d08..5475ec81f98 100644
--- a/misc/bbdb/Makefile
+++ b/misc/bbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:38 rillig Exp $
#
DISTNAME= bbdb-2.34
@@ -20,7 +20,7 @@ BUILD_TARGET= all mhe
USE_MAKEINFO= yes
INFO_FILES= bbdb.info
INFO_DIR= ${INFODIR}
-PLIST_SUBST+= INFODIR=${INFODIR}
+PLIST_SUBST+= INFODIR=${INFODIR:Q}
.include "../../mk/emacs.mk"
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 2b258961ba5..5089537f50d 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/03/24 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:38 rillig Exp $
DISTNAME= buffer-1.17
CATEGORIES= misc
@@ -12,7 +12,7 @@ COMMENT= Buffer sporadic binary I/O for faster tape use
.if ${OPSYS} == "SunOS"
CPPFLAGS+= -DSYS5
-MAKE_ENV+= CC="${CC}"
+MAKE_ENV+= CC=${CC:Q}
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/buffer/distinfo b/misc/buffer/distinfo
index 924febe5302..0c5665195b9 100644
--- a/misc/buffer/distinfo
+++ b/misc/buffer/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/11/10 17:31:47 joerg Exp $
+$NetBSD: distinfo,v 1.6 2005/12/05 20:50:38 rillig Exp $
SHA1 (buffer-1.17.tar.gz) = 88201f677485880cd508430015b7ce7d9663b6e7
RMD160 (buffer-1.17.tar.gz) = c7f87873f8f74b900609ef495ebabc8596729fb8
Size (buffer-1.17.tar.gz) = 17131 bytes
SHA1 (patch-aa) = 8b1a563728b6a67e49123e2c48d9d39d55a91476
SHA1 (patch-ab) = 70c28daab40f6c5ab2fae5d19fc0e98fdefbdf69
-SHA1 (patch-ac) = 53a3f7730e62a244109243b1262e26dd5687c223
+SHA1 (patch-ac) = 2edead52c6a79a04e11ddabef1e140ac24d7d379
diff --git a/misc/buffer/patches/patch-ac b/misc/buffer/patches/patch-ac
index 91abd3fdd5f..86668613e7e 100644
--- a/misc/buffer/patches/patch-ac
+++ b/misc/buffer/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2005/08/27 20:43:40 minskim Exp $
+$NetBSD: patch-ac,v 1.3 2005/12/05 20:50:38 rillig Exp $
--- buffer.c.orig 1994-10-04 09:44:53.000000000 -0700
+++ buffer.c
-@@ -118,6 +118,4 @@ static char *rcsid = "$Header: /a/swan/h
+@@ -118,6 +118,4 @@
#endif
-extern char *shmat();
diff --git a/misc/celestia-gnome/Makefile b/misc/celestia-gnome/Makefile
index 26db4b3a3de..2527cb2824e 100644
--- a/misc/celestia-gnome/Makefile
+++ b/misc/celestia-gnome/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2005/09/04 05:00:36 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:38 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-gnome-/}
PKGREVISION= 2
COMMENT= GNOME frontend for free real-time 3D space simulator
-DEPENDS= celestia-${CELESTIA_VERS}*:../../misc/celestia
+DEPENDS+= celestia-${CELESTIA_VERS}*:../../misc/celestia
CELESTIA_PROGPREFIX= g
diff --git a/misc/celestia-gtk/Makefile b/misc/celestia-gtk/Makefile
index abb193902c4..cfd368dd905 100644
--- a/misc/celestia-gtk/Makefile
+++ b/misc/celestia-gtk/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2005/09/04 05:00:36 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:38 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-gtk-/}
PKGREVISION= 1
COMMENT= GTK frontend for free real-time 3D space simulator
-DEPENDS= celestia-${CELESTIA_VERS}*:../../misc/celestia
+DEPENDS+= celestia-${CELESTIA_VERS}*:../../misc/celestia
CONFIGURE_ARGS+= --with-gtk
diff --git a/misc/celestia-kde/Makefile b/misc/celestia-kde/Makefile
index 0fb8556ad90..6c6302e94bf 100644
--- a/misc/celestia-kde/Makefile
+++ b/misc/celestia-kde/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2005/09/28 14:31:08 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:38 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-kde-/}
PKGREVISION= 1
COMMENT= KDE frontend for free real-time 3D space simulator
-DEPENDS= celestia-${CELESTIA_VERS}*:../../misc/celestia
+DEPENDS+= celestia-${CELESTIA_VERS}*:../../misc/celestia
CONFIGURE_ARGS+= --with-kde
diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common
index f005ace56d8..80f40dda62e 100644
--- a/misc/celestia/Makefile.common
+++ b/misc/celestia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/06/20 06:02:30 hira Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/12/05 20:50:38 rillig Exp $
DISTNAME= celestia-${CELESTIA_VERS}
CATEGORIES= misc x11
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-lua --with-glut
CONFIGURE_ARGS+= --program-prefix=${CELESTIA_PROGPREFIX}
.endif
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
CXXFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile
index c79e6f1797e..94edb2f7f2f 100644
--- a/misc/chipmunk/Makefile
+++ b/misc/chipmunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/17 03:50:21 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:38 rillig Exp $
#
DISTNAME= chipmunk-1.4
@@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386
BUILD_TARGET= chipmunk
-MAKE_ENV+= CONFIG_OPTIONS="${CPPFLAGS}"
+MAKE_ENV+= CONFIG_OPTIONS=${CPPFLAGS:M*:Q}
MAKE_ENV+= EXTRA_LIBS=-li386
INSTALLATION_DIRS= sbin
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index ec4e154f50d..bfb3eda38ed 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/26 22:31:49 reed Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:38 rillig Exp $
DISTNAME= ls
PKGNAME= colorls-2.2
@@ -14,8 +14,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
MANCOMPRESSED_IF_MANZ= yes
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} \
- MANOWN=${MANOWN} MANGRP=${MANGRP}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \
+ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q}
INSTALLATION_DIRS= bin man/man1 man/cat1
pre-patch:
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index ce5a9ebfb6d..ca4bda0ca9b 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/11/08 13:25:12 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:38 rillig Exp $
DISTNAME= dialog-1.0-20050911
PKGNAME= ${DISTNAME:C/-2/.2/}
@@ -14,7 +14,7 @@ COMMENT= Display dialog boxes from shell scripts
GNU_CONFIGURE= yes
MAKEFILE= makefile
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-P]-*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-P]-*
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/misc/dirdiff/Makefile b/misc/dirdiff/Makefile
index 993733339e2..16e983a6204 100644
--- a/misc/dirdiff/Makefile
+++ b/misc/dirdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:38 rillig Exp $
#
DISTNAME= dirdiff-1.6
@@ -6,7 +6,7 @@ PKGREVISION= 2
CATEGORIES= misc tk
MASTER_SITES= http://samba.org/ftp/paulus/
-DEPENDS= tk>=8.3.4:../../x11/tk
+DEPENDS+= tk>=8.3.4:../../x11/tk
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://samba.org/ftp/paulus/
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index cda33e65d23..98e9d0b2769 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/03/24 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:38 rillig Exp $
DISTNAME= dotfile-2.4.1
CATEGORIES= misc tk
@@ -16,7 +16,7 @@ BUILD_DEFS+= DOTFILE_LANG
DOTFILE_LANG?= english
GNU_CONFIGURE= yes
-NO_BUILD=
+NO_BUILD= yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGNAME}
diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index eae033b786d..d4bfbf80fff 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:14 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:38 rillig Exp $
#
DISTNAME= ${PKGNAME:S,-,_,}
@@ -12,7 +12,7 @@ COMMENT= Package maintenance system for Debian
BUILD_USES_MSGFMT= yes
-WRKSRC= ${WRKDIR}/${PKGNAME}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/misc/dync/Makefile b/misc/dync/Makefile
index 34cfd016792..b2b07b029b6 100644
--- a/misc/dync/Makefile
+++ b/misc/dync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/08 21:09:36 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:38 rillig Exp $
#
DISTNAME= dync-1.1
@@ -13,7 +13,7 @@ COMMENT= awk-like utility with C as language
GNU_CONFIGURE= yes
BUILD_TARGET= tst
USE_TOOLS+= file_cmd
-CONFIGURE_ENV+= FILE_CMD="${TOOLS_FILE_CMD}"
-CONFIGURE_ENV+= ac_cv_path_LDCONFIG="${TOOLS_LDCONFIG}"
+CONFIGURE_ENV+= FILE_CMD=${TOOLS_FILE_CMD:Q}
+CONFIGURE_ENV+= ac_cv_path_LDCONFIG=${TOOLS_LDCONFIG:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/edict/Makefile b/misc/edict/Makefile
index 44888b6a62a..5ed63495f04 100644
--- a/misc/edict/Makefile
+++ b/misc/edict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/01/03 15:44:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= edict
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
EXTRACT_ONLY= edict.gz
-NO_BUILD= # nothing to do
+NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/edict
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 5deb5b9a90c..f890b835ce0 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= elscreen-1.3.2
@@ -10,7 +10,7 @@ MAINTAINER= uebayasi@NetBSD.org
HOMEPAGE= http://www.morishima.net/~naoto/j/software/elscreen/
COMMENT= Window manager within Emacs
-NO_BUILD= # Defined
+NO_BUILD= yes
do-install:
@${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/elscreen
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index dbb9a589129..48b52975a62 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/11/10 00:35:08 grant Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= FD-1.03u
@@ -10,7 +10,7 @@ MAINTAINER= nobu@psrc.isac.co.jp
COMMENT= File and directory management tool
MANLANG= ja
-MAKE_ENV= LANG=${MANLANG}
+MAKE_ENV+= LANG=${MANLANG:Q}
DOCS= README FAQ HISTORY ToAdmin
# require maintainer signature for binary package distributions
diff --git a/misc/fooseti/Makefile b/misc/fooseti/Makefile
index b79f9f07d6a..4cef548f8d5 100644
--- a/misc/fooseti/Makefile
+++ b/misc/fooseti/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= fooseti-0.6.6
@@ -23,7 +23,6 @@ post-install:
.for doc in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/fooseti
.endfor
-.undef doc
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome1-dirs/dirs.mk b/misc/gnome1-dirs/dirs.mk
index 9af11eb1742..0306076fee6 100644
--- a/misc/gnome1-dirs/dirs.mk
+++ b/misc/gnome1-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2005/06/04 11:20:22 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.4 2005/12/05 20:50:39 rillig Exp $
#
# This file is intended to be included by mk/dirs.mk, not directly by packages.
#
@@ -20,7 +20,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \
{ print "@comment in gnome1-dirs: " $$0; next; }
. endfor
-. undef dir
.endif
.endif # !defined(DIRS_GNOME1_MK)
diff --git a/misc/gnome2-dirs/dirs.mk b/misc/gnome2-dirs/dirs.mk
index 56b42bab779..597a1ea788a 100644
--- a/misc/gnome2-dirs/dirs.mk
+++ b/misc/gnome2-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2005/06/04 11:20:23 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.4 2005/12/05 20:50:39 rillig Exp $
#
# This file is intended to be included by mk/dirs.mk, not directly by packages.
#
@@ -25,7 +25,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \
{ print "@comment in gnome2-dirs: " $$0; next; }
. endfor
-. undef dir
.endif
.endif # !defined(DIRS_GNOME2_MK)
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index c962f276afb..4408d5efa7c 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:21 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= coreutils-5.2.1
@@ -16,7 +16,7 @@ CONFLICTS= coreutils-[0-9]* linuxls-[0-9]*
GNU_CONFIGURE= YES
-PLIST_SUBST+= GNU_PROGRAM_PREFIX="${GNU_PROGRAM_PREFIX}"
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
INSTALLATION_DIRS= bin man/man1
diff --git a/misc/gone/Makefile b/misc/gone/Makefile
index 3e405b08e5c..8af82f7d870 100644
--- a/misc/gone/Makefile
+++ b/misc/gone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/10/13 15:52:00 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= gone-1.3.5
@@ -10,6 +10,6 @@ HOMEPAGE= http://jaguar.ir.miami.edu/~marcus/
COMMENT= Terminal locking utility with many improvements over lock(1)
GNU_CONFIGURE= yes
-CONFIGURE_ENV= with_setuid=no
+CONFIGURE_ENV+= with_setuid=no
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index ceaf3703e64..d3c674091ad 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/09/28 19:51:27 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:39 rillig Exp $
DISTNAME= gperiodic-2.0.8
CATEGORIES= misc x11
@@ -19,11 +19,11 @@ BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
-MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
BUILD_TARGET= gperiodic
LIBS+= -lintl
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index 0a635b91a57..5732ef96987 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/02 21:07:26 abs Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= x10_heyu
@@ -15,7 +15,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
WRKSRC= ${WRKDIR}/heyu.dir
CONFIGURE_SCRIPT= ./Configure
-MAKE_ENV+= DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE}
+MAKE_ENV+= DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE:Q}
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/heyu
diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index fdf4a75e8aa..516abc230a4 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/09/28 19:51:27 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= iselect-1.2.0
@@ -13,7 +13,7 @@ COMMENT= Curses based Interactive Selection Tool
GNU_CONFIGURE= yes
post-configure:
- touch ${WRKSRC}/config_ac.h.in
+ ${TOUCH} ${WRKSRC}/config_ac.h.in
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/ja-man/Makefile b/misc/ja-man/Makefile
index 131f7fea925..5f0e37b252c 100644
--- a/misc/ja-man/Makefile
+++ b/misc/ja-man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:39 rillig Exp $
DISTNAME= NetBSD1.3I-jman-19990531
PKGNAME= ja-man-19990531
@@ -9,12 +9,12 @@ MAINTAINER= sakamoto@NetBSD.org
HOMEPAGE= ftp://ftp.spa.is.uec.ac.jp/pub/NetBSD/jman/index.html
COMMENT= Japanese on-line manual pages of NetBSD
-DEPENDS= ja-less>=332:../../misc/ja-less
+DEPENDS+= ja-less>=332:../../misc/ja-less
DEPENDS+= ja-groff-0.99:../../textproc/ja-groff
JAMANDIR= ja_JP.EUC
-PLIST_SUBST+= JAMANDIR=${JAMANDIR}
-MAKE_ENV+= JAMANDIR=${JAMANDIR}
+PLIST_SUBST+= JAMANDIR=${JAMANDIR:Q}
+MAKE_ENV+= JAMANDIR=${JAMANDIR:Q}
PLIST_SRC= ${WRKDIR}/PLIST
diff --git a/misc/jhd/Makefile b/misc/jhd/Makefile
index f0cded030ea..38dd7c41091 100644
--- a/misc/jhd/Makefile
+++ b/misc/jhd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:21 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:39 rillig Exp $
DISTNAME= jhd-2.3
CATEGORIES= japanese misc
@@ -7,7 +7,7 @@ MASTER_SITES= ftp://ftp.iamas.ac.jp/pub1/UNIX/File/
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
COMMENT= Japanese Hexadecimal Dump
-BUILD_DEPENDS= nkf-1.7:../../converters/nkf
+BUILD_DEPENDS+= nkf-1.7:../../converters/nkf
INSTALLATION_DIRS= bin man/ja_JP.EUC/man1
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 27b879585be..9932f9f2a4b 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/02/09 09:17:50 wennmach Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:39 rillig Exp $
DISTNAME= jitterbug-1.6.2
PKGREVISION= 1
@@ -49,11 +49,11 @@ JB_FQHOSTNAME= ${JB_LONGNAME}
JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME}
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-MESSAGE_SUBST+= JB_USER=${JB_USER} \
- JB_PACKAGE=${JB_PACKAGE} \
- JB_LOCALMAIL=${JB_LOCALMAIL}
+MESSAGE_SUBST+= JB_USER=${JB_USER:Q} \
+ JB_PACKAGE=${JB_PACKAGE:Q} \
+ JB_LOCALMAIL=${JB_LOCALMAIL:Q}
pre-extract:
@(if [ "X${JB_HOSTNAME}" = "X${JB_LONGNAME}" ]; then \
diff --git a/misc/kanjidic/Makefile b/misc/kanjidic/Makefile
index f6be458ef93..90ad4340024 100644
--- a/misc/kanjidic/Makefile
+++ b/misc/kanjidic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/08/17 11:10:56 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= kanjidic
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
EXTRACT_ONLY= kanjidic.gz
-NO_BUILD= # nothing to do
+NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/kanjidic
diff --git a/misc/kanjidic2/Makefile b/misc/kanjidic2/Makefile
index c205ed2b2bc..f13a584d30c 100644
--- a/misc/kanjidic2/Makefile
+++ b/misc/kanjidic2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/09/15 08:11:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:39 rillig Exp $
#
DISTNAME= kanjidic2
@@ -23,7 +23,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
EXTRACT_ONLY= kanjidic2.xml.gz kanjidic2_dtd.gz kanjidic2_xsd.gz
WRKSRC= ${WRKDIR}
-NO_BUILD= # nothing to do
+NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/kanjidic2
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 2ffd52955af..39676778006 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/04/11 21:46:35 tv Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:39 rillig Exp $
DISTNAME= kdeutils-${_KDE_VERSION}
COMMENT= Utilities for the KDE integrated X11 desktop
@@ -12,7 +12,7 @@ USE_PKGINSTALL= YES
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
-MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
.if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*)
CPPFLAGS+= -DARK_TAR="\"/usr/bin/tar\""
diff --git a/misc/kodos/Makefile b/misc/kodos/Makefile
index 8198ffbdb2c..9189ac55240 100644
--- a/misc/kodos/Makefile
+++ b/misc/kodos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:35 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:39 rillig Exp $
DISTNAME= kodos-2.4.2
CATEGORIES= misc python
@@ -8,7 +8,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://kodos.sourceforge.net/
COMMENT= GUI for creating, testing and debugging Python REs
-DEPENDS= ${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules
+DEPENDS+= ${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules
DEPENDS+= ${PYPKGPREFIX}-qt3-sip>=4.0rc3:../../x11/py-qt3-sip
PYDISTUTILSPKG= yes
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 8b162926063..81236553e46 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/11/25 21:23:15 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2005/12/05 20:50:39 rillig Exp $
DISTNAME= koffice-1.4.2
PKGREVISION= 1
@@ -26,8 +26,8 @@ GCC_REQD+= 2.95.3
PTHREAD_OPTS+= require
PYTHON_VERSIONS_ACCEPTED= 24 23 # needs shared library
-CONFIGURE_ENV+= PYTHONDIR="${LOCALBASE}"
-CONFIGURE_ENV+= PYVERSSUFFIX="${PYVERSSUFFIX}"
+CONFIGURE_ENV+= PYTHONDIR=${LOCALBASE:Q}
+CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
REPLACE_PERL+= lib/store/fix_storage.pl
REPLACE_PERL+= admin/config.pl
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 2401c2b19fe..a6d7c680b75 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:40 rillig Exp $
DISTNAME= kp-0.96
CATEGORIES= misc tk
@@ -7,7 +7,7 @@ MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/kp/
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= The Keyboard Practicer, touch-type training program
-DEPENDS= tk>=8.3.2:../../x11/tk
+DEPENDS+= tk>=8.3.2:../../x11/tk
.include "../../mk/x11.buildlink3.mk"
diff --git a/misc/lv/Makefile b/misc/lv/Makefile
index ad17baeb86a..14e48701db4 100644
--- a/misc/lv/Makefile
+++ b/misc/lv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/03 17:43:47 christos Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:40 rillig Exp $
DISTNAME= lv451
PKGNAME= lv-4.51
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ../src/configure
-MAKE_ENV+= LN=${LN}
+MAKE_ENV+= LN=${LN:Q}
INSTALLATION_DIRS= lib/lv
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/most/Makefile b/misc/most/Makefile
index 295227a69c4..65040f6e1f8 100644
--- a/misc/most/Makefile
+++ b/misc/most/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/29 20:08:29 darcy Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:40 rillig Exp $
DISTNAME= most-4.9.0
CATEGORIES= misc
@@ -10,7 +10,7 @@ HOMEPAGE= http://space.mit.edu/~davis/most.html
COMMENT= Pager (like less) which has support for windows and binary files
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-x
+CONFIGURE_ARGS+= --without-x
.include "../../devel/libslang/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/open2300-mysql/Makefile b/misc/open2300-mysql/Makefile
index 919be8fb329..a0375f256ce 100644
--- a/misc/open2300-mysql/Makefile
+++ b/misc/open2300-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/31 14:03:28 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:40 rillig Exp $
#
PKGNAME= ${DISTNAME:S/-/-mysql-/}
@@ -12,7 +12,7 @@ INSTALL_TARGET= install-mysql
LIBS+= -lmysqlclient
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.include "../../mk/mysql.buildlink3.mk"
-.include "../open2300/Makefile.common"
+.include "../../misc/open2300/Makefile.common"
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile
index 3652c54f89c..efabd641b97 100644
--- a/misc/openoffice-bin/Makefile
+++ b/misc/openoffice-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/10 20:08:09 mrauch Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:40 rillig Exp $
PKGNAME= openoffice-bin-${OO_VER}
PKGREVISION= 1
@@ -16,7 +16,7 @@ HOMEPAGE= http://www.openoffice.org/
COMMENT= Integrated office productivity suite (binary pkg)
OO_VER= 1.1.5
-PLIST_SUBST+= VER=${OO_VER}
+PLIST_SUBST+= VER=${OO_VER:Q}
MESSAGE_SUBST+= VER=${OO_VER}
NO_BUILD= yes
diff --git a/misc/openoffice-bin/Makefile.NetBSD.i386 b/misc/openoffice-bin/Makefile.NetBSD.i386
index c5bb082e77a..3ac367f747f 100644
--- a/misc/openoffice-bin/Makefile.NetBSD.i386
+++ b/misc/openoffice-bin/Makefile.NetBSD.i386
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2005/02/26 01:22:16 dmcmahill Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.3 2005/12/05 20:50:40 rillig Exp $
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"
+PKG_FAIL_REASON+= "please mount /emul/linux/proc or /proc"
.endif
.include "../../emulators/suse_linux/Makefile.application"
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index 084ce42ac34..5cceaa393e4 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2005/10/03 16:03:19 mrauch Exp $
+# $NetBSD: Makefile,v 1.72 2005/12/05 20:50:40 rillig Exp $
DISTNAME= openoffice-1.1.5
CATEGORIES= misc
@@ -21,7 +21,7 @@ BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
WRKSRC= ${WRKDIR}/OOo_1.1.5/config_office
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
USE_LANGUAGES+= c c++
.include "../../mk/bsd.prefs.mk"
@@ -45,8 +45,8 @@ TEMP?= ${WRKDIR}
UNLIMIT_RESOURCES+= datasize
PLIST_SRC+= PLIST.common
-PLIST_SUBST+= OPENOFFICE_DLLSUFFIX=${OPENOFFICE_DLLSUFFIX}
-PLIST_SUBST+= OPENOFFICE_VERSION=${OPENOFFICE_VERSION}
+PLIST_SUBST+= OPENOFFICE_DLLSUFFIX=${OPENOFFICE_DLLSUFFIX:Q}
+PLIST_SUBST+= OPENOFFICE_VERSION=${OPENOFFICE_VERSION:Q}
.if exists(${PKGDIR}/PLIST.${OPSYS})
PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS}
. endif
diff --git a/misc/openoffice/Makefile.NetBSD.i386 b/misc/openoffice/Makefile.NetBSD.i386
index 57882025c8c..d71b76d48a7 100644
--- a/misc/openoffice/Makefile.NetBSD.i386
+++ b/misc/openoffice/Makefile.NetBSD.i386
@@ -1,3 +1,5 @@
+# $NetBSD: Makefile.NetBSD.i386,v 1.2 2005/12/05 20:50:40 rillig Exp $
+
OPENOFFICE_DLLSUFFIX= bi
OPENOFFICE_OUTPATH= unxbsdi2
OPENOFFICE_SETFILE= NetBSDIntel
diff --git a/misc/openoffice/Makefile.i18n b/misc/openoffice/Makefile.i18n
index 28e6edbcc53..1cf4b196789 100644
--- a/misc/openoffice/Makefile.i18n
+++ b/misc/openoffice/Makefile.i18n
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i18n,v 1.4 2005/10/03 16:03:19 mrauch Exp $
+# $NetBSD: Makefile.i18n,v 1.5 2005/12/05 20:50:40 rillig Exp $
.if ${PKG_LANG:C/_.*//} == "afrikaans"
OPENOFFICE_ISOCODE= af
@@ -180,7 +180,7 @@ SITES_helpcontent_${OPENOFFICE_LANGCODE}_unix.tgz=${MASTER_SITE_OPENOFFICE:=cont
.endif
PLIST_SRC+= PLIST.i18n.${OPENOFFICE_LANGCODE}
-PLIST_SUBST+= OPENOFFICE_ISOCODE=${OPENOFFICE_ISOCODE}
-PLIST_SUBST+= OPENOFFICE_LANG=${OPENOFFICE_LANG}
-PLIST_SUBST+= OPENOFFICE_LANGCODE=${OPENOFFICE_LANGCODE}
-PLIST_SUBST+= OPENOFFICE_HELPCODE=${OPENOFFICE_HELPCODE}
+PLIST_SUBST+= OPENOFFICE_ISOCODE=${OPENOFFICE_ISOCODE:Q}
+PLIST_SUBST+= OPENOFFICE_LANG=${OPENOFFICE_LANG:Q}
+PLIST_SUBST+= OPENOFFICE_LANGCODE=${OPENOFFICE_LANGCODE:Q}
+PLIST_SUBST+= OPENOFFICE_HELPCODE=${OPENOFFICE_HELPCODE:Q}
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index 9431ce177a1..0aab411a897 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/01 13:26:43 mrauch Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:40 rillig Exp $
PKGNAME= openoffice-bin-2.0.0
PKGREVISION= 3
@@ -16,9 +16,9 @@ RPM2PKG= ${PREFIX}/sbin/rpm2pkg
RPM2PKGARGS= -d ${PREFIX} -f ${WRKDIR}/PLIST.nouniq -s 1
OO_VER= 2.0
-PLIST_SUBST+= VER=${OO_VER}
+PLIST_SUBST+= VER=${OO_VER:Q}
MESSAGE_SUBST+= VER=${OO_VER}
-FILES_SUBST+= VER=${OO_VER}
+FILES_SUBST+= VER=${OO_VER:Q}
NO_CONFIGURE= yes
NO_BUILD= yes
@@ -50,7 +50,7 @@ DEINSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL
.if ${OPSYS} == "NetBSD"
. if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
. if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
+PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
. endif
DISTNAME= OOo_2.0.0_SolarisSparc_install
WRKSRC= ${WRKDIR}/OOO680_m3_native_packed-1_en-US.8968/packages
diff --git a/misc/p5-Msgcat/Makefile b/misc/p5-Msgcat/Makefile
index 2812ab1ad63..11720bba4b9 100644
--- a/misc/p5-Msgcat/Makefile
+++ b/misc/p5-Msgcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/08/06 06:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:40 rillig Exp $
#
DISTNAME= Msgcat-1.01
@@ -9,7 +9,6 @@ CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Locale/}
MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE=
COMMENT= Perl5 module to use the message catalog functions
WRKSRC= ${WRKDIR}/Msgcat
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index d8770052e16..b1489a8589d 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:14 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:40 rillig Exp $
#
DISTNAME= pdmenu_1.2.65
@@ -18,8 +18,8 @@ USE_TOOLS+= gmake perl:run
REPLACE_PERL= examples/showdir.pl
-CONFIGURE_ENV= SLANG_LIB_LOC="${BUILDLINK_PREFIX.libslang}/lib" \
- SLANG_H_LOC="${BUILDLINK_PREFIX.libslang}/include/slang.h"
+CONFIGURE_ENV+= SLANG_LIB_LOC=${BUILDLINK_PREFIX.libslang:Q}/lib
+CONFIGURE_ENV+= SLANG_H_LOC=${BUILDLINK_PREFIX.libslang:Q}/include/slang.h
pre-install:
${SED} "s,.B /etc/pdmenurc,.B ${PREFIX}/etc/pdmenurc,g" \
diff --git a/misc/php-calendar/Makefile b/misc/php-calendar/Makefile
index 6fb96aa540b..c3b60a620bf 100644
--- a/misc/php-calendar/Makefile
+++ b/misc/php-calendar/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:39 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:40 rillig Exp $
MODNAME= calendar
CATEGORIES+= misc
-PKGREVISION= # empty
COMMENT= PHP extension for calendar conversion support
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index cf67949a192..a6d8a283314 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/10/05 13:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:40 rillig Exp $
#
DISTNAME= pinfo-0.6.1
@@ -18,7 +18,7 @@ USE_PKGINSTALL= yes
INFO_FILES= pinfo.info
-CPPFLAGS= -DDFLT_INFOPATH="\"/usr/share/info:${X11BASE}/info:${LOCALBASE}/info:/usr/local/info\""
+CPPFLAGS+= -DDFLT_INFOPATH="\"/usr/share/info:${X11BASE}/info:${LOCALBASE}/info:/usr/local/info\""
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/misc/root/Makefile b/misc/root/Makefile
index 23caf913ca7..cb188df11f2 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/17 03:50:22 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:40 rillig Exp $
DISTNAME= root_v2.23.08.source
PKGNAME= root-2.23
@@ -16,7 +16,7 @@ BUILDLINK_PASSTHRU_DIRS=${PREFIX}/root/lib
USE_TOOLS+= gmake
BUILD_TARGET= netbsd
-MAKE_ENV= LD_LIBRARY_PATH=${WRKDIR}/lib ROOTSYS=${WRKDIR}
+MAKE_ENV+= LD_LIBRARY_PATH=${WRKDIR:Q}/lib ROOTSYS=${WRKDIR:Q}
.if (${MACHINE_ARCH} == "arm")
BROKEN= Compilation stops due to internal compiler error
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index e325789a279..dbc5341c0f9 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2005/12/05 20:50:40 rillig Exp $
DISTNAME= rpm-2.5.4
PKGREVISION= 3
@@ -26,10 +26,10 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR}
# The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm.
-CONFIGURE_ENV+= varprefix="${RPM_DB_PREFIX}"
+CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q}
RPMDIR= ${RPM_DB_PREFIX}/lib/rpm
-FILES_SUBST+= RPMDIR=${RPMDIR}
+FILES_SUBST+= RPMDIR=${RPMDIR:Q}
post-configure:
cd ${WRKSRC}/po && ${MV} cz.po cs.po
diff --git a/misc/tds/Makefile b/misc/tds/Makefile
index 6315fad4da9..0b936223b91 100644
--- a/misc/tds/Makefile
+++ b/misc/tds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:15 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:40 rillig Exp $
#
DISTNAME= tds-1.4.2
@@ -12,7 +12,7 @@ COMMENT= Web diary system
USE_TOOLS+= perl:run
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PERL5="${PERL5}"
+CONFIGURE_ENV+= PERL5=${PERL5:Q}
NO_BUILD= YES
diff --git a/misc/theme-dirs/dirs.mk b/misc/theme-dirs/dirs.mk
index 246648cd5c6..0868626daef 100644
--- a/misc/theme-dirs/dirs.mk
+++ b/misc/theme-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:40 rillig Exp $
#
# This file is intended to be included by mk/dirs.mk, not directly by packages.
#
@@ -43,7 +43,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \
{ print "@comment in theme-dirs: " $$0; next; }
. endfor
-. undef dir
.endif
.endif # !defined(DIRS_THEME_MK)
diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile
index 3b8809d32d7..3b702b91933 100644
--- a/misc/vfu/Makefile
+++ b/misc/vfu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/07/16 19:10:39 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:41 rillig Exp $
#
DISTNAME= vfu-3.04
@@ -15,7 +15,7 @@ USE_TOOLS+= perl:run
USE_LANGUAGES= c c++
USE_PKGINSTALL= YES
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
INCOMPAT_CURSES+= NetBSD-1.6[A-U]-*
DOCDIR= ${PREFIX}/share/doc/vfu
@@ -23,7 +23,7 @@ EGDIR= ${PREFIX}/share/examples/vfu
CONF_FILES= ${EGDIR}/vfu.conf ${PKG_SYSCONFDIR}/vfu.conf
-MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
+MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
do-build:
cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} build.netbsd
diff --git a/misc/xdg-dirs/dirs.mk b/misc/xdg-dirs/dirs.mk
index 5867fba68c5..b403ac10a10 100644
--- a/misc/xdg-dirs/dirs.mk
+++ b/misc/xdg-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:41 rillig Exp $
#
# This file is intended to be included by mk/dirs.mk, not directly by packages.
#
@@ -24,7 +24,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \
{ print "@comment in xdg-dirs: " $$0; next; }
. endfor
-. undef dir
.endif
.endif # !defined(DIRS_XDG_MK)
diff --git a/misc/xdg-x11-dirs/dirs.mk b/misc/xdg-x11-dirs/dirs.mk
index 6292373346f..f82a1128093 100644
--- a/misc/xdg-x11-dirs/dirs.mk
+++ b/misc/xdg-x11-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:41 rillig Exp $
#
# This file is intended to be included by mk/dirs.mk, not directly by packages.
#
@@ -24,7 +24,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \
{ print "@comment in xdg-x11-dirs: " $$0; next; }
. endfor
-. undef dir
.endif
.endif # !defined(DIRS_XDG_X11_MK)
diff --git a/misc/xorg-dirs/dirs.mk b/misc/xorg-dirs/dirs.mk
index 9b9eedcdc5d..cf387bd3e8f 100644
--- a/misc/xorg-dirs/dirs.mk
+++ b/misc/xorg-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:41 rillig Exp $
#
.if !defined(DIRS_XORG_MK)
@@ -35,7 +35,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \
{ print "@comment in xorg-dirs: "$$0; next; }
. endfor
-. undef dir
.endif
.endif # !defined(DIRS_XORG_MK)
diff --git a/misc/xorg-docs/Makefile b/misc/xorg-docs/Makefile
index 27e9bda837f..76dda663fae 100644
--- a/misc/xorg-docs/Makefile
+++ b/misc/xorg-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/08/26 22:44:30 reed Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:41 rillig Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-docs-${XORG_VER}
@@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org Documentation
-BUILD_DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake
+BUILD_DEPENDS+= xorg-imake>=${XORG_VER}:../../x11/xorg-imake
USE_LANGUAGES= # empty
diff --git a/misc/xrolodex/Makefile b/misc/xrolodex/Makefile
index 9c223a9522f..2805946258a 100644
--- a/misc/xrolodex/Makefile
+++ b/misc/xrolodex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/09/28 19:51:28 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:41 rillig Exp $
DISTNAME= xrolodex.1.5.motif
PKGNAME= xrolodex-1.5
@@ -13,7 +13,7 @@ COMMENT= Motif/X11 rolodex application
WRKSRC= ${WRKDIR}/xrolodex.15
USE_IMAKE= yes
-MAKE_ENV+= XMLIB="${MOTIFLIB}"
+MAKE_ENV+= XMLIB=${MOTIFLIB:Q}
.include "../../mk/motif.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/xtend/Makefile b/misc/xtend/Makefile
index a1189c38f95..575f50ce963 100644
--- a/misc/xtend/Makefile
+++ b/misc/xtend/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 10:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:41 rillig Exp $
#
DISTNAME= xtend-1.2beta4
-PKGNAME= ${DISTNAME}
CATEGORIES= misc
MASTER_SITES= ftp://ftp.jabberwocky.com/pub/xtend/
diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile
index 218a1c34466..a5b8c409c10 100644
--- a/misc/xtide/Makefile
+++ b/misc/xtide/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:41 rillig Exp $
DISTNAME= xtide-2.4
-PKGNAME= ${DISTNAME}
PKGREVISION= 3
CATEGORIES= misc x11
MASTER_SITES= ftp://ftp.flaterco.com/xtide/
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 59b1d58d589..4f19cc828df 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:41 rillig Exp $
#
DISTNAME= avidemux-2.0.40
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://fixounet.free.fr/avidemux/
COMMENT= Graphical video editing program
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/multimedia/divxplayer/Makefile b/multimedia/divxplayer/Makefile
index 653bbdea26d..7699705cbad 100644
--- a/multimedia/divxplayer/Makefile
+++ b/multimedia/divxplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:41 rillig Exp $
DISTNAME= divx-player-installer
PKGNAME= divxplayer-0.2.0
@@ -19,7 +19,7 @@ CHECK_SHLIBS= NO
NO_BUILD= YES
USE_X11BASE= YES
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
BINARY= divxPlayer.bin
DATADIR= ${PREFIX}/share/divxplayer
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 7bdcc598189..45e949368f1 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:41 rillig Exp $
DISTNAME= dvdauthor-0.6.10
PKGREVISION= 2
@@ -10,9 +10,9 @@ HOMEPAGE= http://dvdauthor.sourceforge.net/
COMMENT= Tools to assist DVD authoring
GNU_CONFIGURE= YES
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../converters/fribidi/buildlink3.mk"
-.include "../libdvdread/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index cbc66c5e0ac..980ebc96063 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/10/29 02:27:47 grant Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:41 rillig Exp $
#
DISTNAME= Video-DVDRip-0.50.18
@@ -24,7 +24,7 @@ DEPENDS+= vcdimager>=0.7.12:../../sysutils/vcdimager-devel
#DEPENDS+= rar>=2.02:../../archivers/rar
.endif
-BUILDLINK_DEPENDS.perl= perl>=5.6.0
+BUILDLINK_DEPENDS.perl+= perl>=5.6.0
USE_PKGLOCALEDIR= YES
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 906ef56befc..f9dad02bb21 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:41 rillig Exp $
DISTNAME= ffmpeg-0.4.8
PKGREVISION= 3
@@ -21,8 +21,11 @@ MAKE_ENV+= EXTRA_LIBS=${BUILDLINK_LDADD.getopt:Q} \
FFSERVER_CONF=${PKG_SYSCONFDIR:Q}/ffserver.conf \
LOCALBASE=${LOCALBASE:Q}
-CONFIGURE_ARGS= --cc=${CC} --prefix=${PREFIX}
-CONFIGURE_ARGS+= --enable-pp --disable-vhook --disable-debug
+CONFIGURE_ARGS+= --cc=${CC:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --enable-pp
+CONFIGURE_ARGS+= --disable-vhook
+CONFIGURE_ARGS+= --disable-debug
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
PKG_SUPPORTED_OPTIONS= bktr lame mmx vorbis
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index 2d3e33dcdfd..444a3160753 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/10/12 21:54:04 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:50:41 rillig Exp $
#
DISTNAME= gst-plugins-0.8.11
@@ -129,7 +129,6 @@ CONFIGURE_ENV+= have_func=no
xvideo
CONFIGURE_ARGS+= --disable-${driver}
.endfor
-.undef driver
# A package building a single plugin of gst-plugins has to include this
# file and define the following variables:
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index a7b9e1b55ba..635dfa72fb5 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/10/12 21:53:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:41 rillig Exp $
#
DISTNAME= gstreamer-0.8.11
@@ -21,7 +21,7 @@ USE_TOOLS+= gmake perl pkg-config
CONFIGURE_ARGS+= --disable-plugin-builddir
CONFIGURE_ARGS+= --localstatedir=${PREFIX}/libdata/gstreamer-0.8
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV+= ac_cv_path_PYTHON="${PYTHONBIN}"
+CONFIGURE_ENV+= ac_cv_path_PYTHON=${PYTHONBIN:Q}
CONFIGURE_ARGS+= HAVE_GTK_DOC=no
PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-control.pc.in
diff --git a/multimedia/gstreamer/plugins.mk b/multimedia/gstreamer/plugins.mk
index dbe0bc50873..b172c409730 100644
--- a/multimedia/gstreamer/plugins.mk
+++ b/multimedia/gstreamer/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.5 2005/03/25 12:45:09 jmmv Exp $
+# $NetBSD: plugins.mk,v 1.6 2005/12/05 20:50:41 rillig Exp $
#
# This Makefile fragment is intended to be included by packages that install
# GStreamer modules. It takes care of rebuilding the corresponding databases
@@ -12,9 +12,9 @@ GST_DBDIR= ${BUILDLINK_PREFIX.gstreamer}/libdata/gstreamer-0.8
GST_COMPPREP= ${BUILDLINK_PREFIX.gstreamer}/bin/gst-compprep
GST_REGISTER= ${BUILDLINK_PREFIX.gstreamer}/bin/gst-register
-FILES_SUBST+= GST_DBDIR="${GST_DBDIR}"
-FILES_SUBST+= GST_COMPPREP="${GST_COMPPREP}"
-FILES_SUBST+= GST_REGISTER="${GST_REGISTER}"
+FILES_SUBST+= GST_DBDIR=${GST_DBDIR:Q}
+FILES_SUBST+= GST_COMPPREP=${GST_COMPPREP:Q}
+FILES_SUBST+= GST_REGISTER=${GST_REGISTER:Q}
INSTALL_EXTRA_TMPL+= ../../multimedia/gstreamer/files/plugins.tmpl
DEINSTALL_EXTRA_TMPL+= ../../multimedia/gstreamer/files/plugins.tmpl
USE_PKGINSTALL= YES
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index de93226325e..1c9dacc7d84 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:41 rillig Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
CATEGORIES= multimedia
@@ -19,7 +19,7 @@ CONF_FILES+= ${PREFIX}/share/examples/kdemultimedia3/applications-merged/kde-mu
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-3.*)
-BUILDLINK_DEPENDS.xine-lib= xine-lib>=1rc0anb1
+BUILDLINK_DEPENDS.xine-lib+= xine-lib>=1rc0anb1
.endif
CONFIGURE_ARGS+= --enable-cdparanoia
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 85910650b1b..a65091971aa 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/10/31 17:35:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:41 rillig Exp $
#
DISTNAME= kmplayer-0.9.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://kmplayer.kde.org/
COMMENT= KDE frontend to mplayer
BUILD_USES_MSGFMT= yes
-DEPENDS= mplayer>=1.0rc3:../../multimedia/mplayer
+DEPENDS+= mplayer>=1.0rc3:../../multimedia/mplayer
DEPENDS+= mencoder>=1.0rc3:../../multimedia/mencoder
DEPENDS+= xine-arts>=1rc0a:../../audio/xine-arts
diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile
index 8ba41cffc7d..698cfcf91a7 100644
--- a/multimedia/libflash/Makefile
+++ b/multimedia/libflash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:42 rillig Exp $
#
.include "Makefile.common"
@@ -9,7 +9,7 @@ COMMENT= Open source Flash(tm) library
USE_LIBTOOL= yes
BUILD_DIRS= ${WRKSRC}/Lib
-MAKE_ENV+= LIBOSSAUDIO="${LIBOSSAUDIO}"
+MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q}
MAKE_ENV+= LIBSTDCPP=-lstdc++
.include "../../devel/zlib/buildlink3.mk"
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index d1be0e06ac4..eecd5223f0a 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/04 18:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:43 rillig Exp $
#
DISTNAME= libmatroska-0.7.7
@@ -17,7 +17,7 @@ USE_LANGUAGES= c++
NO_CONFIGURE= yes
MAKEFLAGS+= prefix=${PREFIX:Q}
-MAKE_ENV+= CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q}
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} RANLIB=${RANLIB:Q}
BUILD_DIRS= make/linux
BUILD_TARGET= staticlib
INSTALL_TARGET= install_headers install_staticlib
diff --git a/multimedia/libogg/Makefile b/multimedia/libogg/Makefile
index 4048807f1d3..495b6825f28 100644
--- a/multimedia/libogg/Makefile
+++ b/multimedia/libogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:43 rillig Exp $
#
DISTNAME= libogg-1.1.2
@@ -18,7 +18,7 @@ USE_LIBTOOL= YES
GCC_REQD+= 2.95.3
-PLIST_SUBST+= DISTNAME=${DISTNAME}
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
PKGCONFIG_OVERRIDE+= ogg.pc.in
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
index 72f9d527cbb..35fa6c7fbe7 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/07 11:34:22 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:43 rillig Exp $
#
.include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -17,7 +17,7 @@ USE_LANGUAGES= c++
BUILD_TARGET= src/mmg/mmg
-SUBST_CLASSES= man help
+SUBST_CLASSES+= man help
SUBST_STAGE.man= pre-configure
SUBST_FILES.man= doc/mmg.1
diff --git a/multimedia/moz-bin-flash/Makefile b/multimedia/moz-bin-flash/Makefile
index 5f34b022c80..fe5a5bcfe29 100644
--- a/multimedia/moz-bin-flash/Makefile
+++ b/multimedia/moz-bin-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:43 rillig Exp $
#
DISTNAME= install_flash_player_6_linux
@@ -22,7 +22,7 @@ NO_BUILD= YES
WRKSRC= ${WRKDIR}/install_flash_player_6_linux
DOCDIR= share/doc/moz-bin-flash
-PLIST_SUBST+= DOCDIR="${DOCDIR}"
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
INSTALLATION_DIRS= lib/mozilla-linux/components lib/mozilla-linux/plugins
diff --git a/multimedia/moz-flash/Makefile b/multimedia/moz-flash/Makefile
index e91665ffff5..5d6b148c7e5 100644
--- a/multimedia/moz-flash/Makefile
+++ b/multimedia/moz-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:43 rillig Exp $
#
.include "../../multimedia/libflash/Makefile.common"
@@ -16,8 +16,8 @@ USE_LIBTOOL= YES
BUILD_DIRS= ${WRKSRC}/Plugin
CPPFLAGS+= -DDEV_DSP="\"${DEVOSSSOUND}\""
-MAKE_ENV+= SHLIBTOOL="${SHLIBTOOL}"
-MAKE_ENV+= MOZ_PLUGDIR="${MOZ_PLUGDIR}"
+MAKE_ENV+= SHLIBTOOL=${SHLIBTOOL:Q}
+MAKE_ENV+= MOZ_PLUGDIR=${MOZ_PLUGDIR:Q}
MOZ_PLUGDIR= ${PREFIX}/lib/mozilla/plugins
diff --git a/multimedia/mpeg-lib/Makefile b/multimedia/mpeg-lib/Makefile
index 7c651aade3f..e5288d52bf6 100644
--- a/multimedia/mpeg-lib/Makefile
+++ b/multimedia/mpeg-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:43 rillig Exp $
#
DISTNAME= mpeg_lib-1.3.1
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
BUILD_TARGET= libmpeg_lib.la
-CONFIGURE_ENV+= OPTIMIZE="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" \
- EXTRA_CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+= OPTIMIZE=${CFLAGS:M*:Q} EXTRA_LDFLAGS=${LDFLAGS:M*:Q} \
+ EXTRA_CPPFLAGS=${CPPFLAGS:M*:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index c9ce766aeda..1e0cbbcdd48 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:50:43 rillig Exp $
#
DISTNAME= mplayerplug-in-2.70
@@ -24,7 +24,7 @@ DISTINFO_FILE= ${.CURDIR}/../../multimedia/mplayer-plugin-firefox/distinfo
PLIST_SRC= ${.CURDIR}/../../multimedia/mplayer-plugin-firefox/PLIST
DESCR_SRC= ${.CURDIR}/../../multimedia/mplayer-plugin-firefox/DESCR
-PLIST_SUBST+= BROWSER=${BROWSER}
+PLIST_SUBST+= BROWSER=${BROWSER:Q}
post-extract:
.for f in nspr xpcom plugin
diff --git a/multimedia/mplayer-plugin-mozilla-gtk2/Makefile b/multimedia/mplayer-plugin-mozilla-gtk2/Makefile
index 87cba12b944..c3350bb6cc7 100644
--- a/multimedia/mplayer-plugin-mozilla-gtk2/Makefile
+++ b/multimedia/mplayer-plugin-mozilla-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:43 rillig Exp $
#
BROWSER= mozilla-gtk2
@@ -6,7 +6,7 @@ PKGREVISION= 1
CONFIGURE_ARGS+= --disable-gtk1
-.include "../mplayer-plugin-firefox/Makefile.common"
+.include "../../multimedia/mplayer-plugin-firefox/Makefile.common"
.include "../../www/mozilla-gtk2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-mozilla/Makefile b/multimedia/mplayer-plugin-mozilla/Makefile
index 918c6768f43..878d599398f 100644
--- a/multimedia/mplayer-plugin-mozilla/Makefile
+++ b/multimedia/mplayer-plugin-mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:43 rillig Exp $
#
BROWSER= mozilla
@@ -7,7 +7,7 @@ PKGREVISION= 1
CONFIGURE_ARGS+= --disable-gtk2
CONFIGURE_ARGS+= --enable-gtk1
-.include "../mplayer-plugin-firefox/Makefile.common"
+.include "../../multimedia/mplayer-plugin-firefox/Makefile.common"
.include "../../www/mozilla/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 6c19c1ae46d..3fb3ee69713 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/11/24 03:59:12 ben Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/12/05 20:50:43 rillig Exp $
MPLAYER_DIST_VERSION= 1.0pre7
@@ -29,7 +29,7 @@ HOMEPAGE?= http://www.mplayerhq.hu/
PATCHDIR= ${.CURDIR}/../../multimedia/mplayer-share/patches
DISTINFO_FILE= ${.CURDIR}/../../multimedia/mplayer-share/distinfo
-NO_BIN_ON_CD= "a dependency is restricted"
+NO_BIN_ON_CDROM= "a dependency is restricted"
NO_BIN_ON_FTP= "a dependency is restricted"
NO_SRC_ON_FTP= "prohibited by USAs DMCA"
@@ -50,7 +50,7 @@ ONLY_FOR_COMPILER= gcc
# The configure script attempts to test-execute compiled programs in /tmp,
# but that directory may be mounted as noexec; work this around by setting
# TMPDIR to ${WRKDIR}
-CONFIGURE_ENV+= TMPDIR=${WRKDIR}
+CONFIGURE_ENV+= TMPDIR=${WRKDIR:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index a72f376763d..01de1b75e02 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:43 rillig Exp $
DISTNAME= ogle-0.9.2
PKGREVISION= 2
@@ -23,7 +23,7 @@ USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q}
#CONFIGURE_ARGS+= --enable-obsdaudio
#CONFIGURE_ARGS+= --disable-sunaudio
diff --git a/multimedia/p5-xmltv/Makefile b/multimedia/p5-xmltv/Makefile
index 149203161ed..f950c37cf97 100644
--- a/multimedia/p5-xmltv/Makefile
+++ b/multimedia/p5-xmltv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/06 06:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:43 rillig Exp $
DISTNAME= xmltv-0.5.40
PKGNAME= p5-${DISTNAME}
@@ -46,7 +46,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
PERL5_PACKLIST= auto/XMLTV/.packlist
MAKE_PARAMS+= PREFIX=${PREFIX:Q}
-PLIST_SUBST+= DISTNAME=${DISTNAME}
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/py-ming/Makefile b/multimedia/py-ming/Makefile
index a4c8ed24bb4..efbf6458301 100644
--- a/multimedia/py-ming/Makefile
+++ b/multimedia/py-ming/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 04:29:14 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:43 rillig Exp $
#
DISTNAME= ${MING_DISTNAME}
@@ -17,7 +17,7 @@ PYBINMODULE= yes
BUILD_TARGET= mingcmodule.so
BUILD_DIRS= ${WRKSRC}/py_ext
-MAKE_ENV+= PYSITELIB=${PYSITELIB}
+MAKE_ENV+= PYSITELIB=${PYSITELIB:Q}
PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 900579071b5..3251f5e478d 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:07 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:43 rillig Exp $
#
DISTNAME= xine-ui-0.99.2
@@ -12,7 +12,7 @@ COMMENT= Skinned xlib-based xine GUI
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.curl= curl>7.10.2
+BUILDLINK_DEPENDS.curl+= curl>7.10.2
USE_PKGLOCALEDIR= YES
USE_DIRS+= xdg-1.1
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index f369e7a3c0e..2075fc23799 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/21 07:41:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:43 rillig Exp $
#
DISTNAME= xvidcore-1.0.3
@@ -20,6 +20,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME}/build/generic
GNU_CONFIGURE= YES
-MAKE_ENV+= MKDIR="${MKDIR}"
+MAKE_ENV+= MKDIR=${MKDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/net/adns/Makefile b/net/adns/Makefile
index 7ea2e99977b..43393e265fb 100644
--- a/net/adns/Makefile
+++ b/net/adns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:23 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:44 rillig Exp $
#
DISTNAME= adns-1.1
@@ -14,6 +14,6 @@ USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --disable-dynamic
+CONFIGURE_ARGS+= --disable-dynamic
.include "../../mk/bsd.pkg.mk"
diff --git a/net/airport2basestationconfig/Makefile b/net/airport2basestationconfig/Makefile
index 995ae6ebbb8..aa1ebd48dc7 100644
--- a/net/airport2basestationconfig/Makefile
+++ b/net/airport2basestationconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/04 19:00:19 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:44 rillig Exp $
DISTNAME= configurator_201
PKGNAME= ${BINNAME}-2.0.1
@@ -10,7 +10,7 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/
COMMENT= Configuration program for Apple's Airport Base Station
-PLIST_SUBST+= BINNAME=${BINNAME} JARNAME=${JARNAME}
+PLIST_SUBST+= BINNAME=${BINNAME:Q} JARNAME=${JARNAME:Q}
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-*
diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile
index 08b5e5201b5..54d5669a379 100644
--- a/net/airportbasestationconfig/Makefile
+++ b/net/airportbasestationconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/11/04 19:00:19 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:44 rillig Exp $
DISTNAME= configurator_152-128
PKGNAME= ${BINNAME}-1.5.2
@@ -11,7 +11,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/
COMMENT= Configuration program for Apple's Airport Base Station
-PLIST_SUBST+= BINNAME=${BINNAME} JARNAME=${JARNAME}
+PLIST_SUBST+= BINNAME=${BINNAME:Q} JARNAME=${JARNAME:Q}
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-*
diff --git a/net/airportmodemutility/Makefile b/net/airportmodemutility/Makefile
index 6e198a4a45f..23de09313db 100644
--- a/net/airportmodemutility/Makefile
+++ b/net/airportmodemutility/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/04 19:00:19 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:44 rillig Exp $
DISTNAME= ${BINNAME}_20
PKGNAME= ${BINNAME}-2.0
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/
COMMENT= Modem (dis)connection utility for Apple's Airport Base Station
-PLIST_SUBST+= BINNAME=${BINNAME} JARNAME=${JARNAME}
+PLIST_SUBST+= BINNAME=${BINNAME:Q} JARNAME=${JARNAME:Q}
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-*
diff --git a/net/arla/Makefile b/net/arla/Makefile
index e2e96444027..6ab79be58d1 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:07 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2005/12/05 20:50:44 rillig Exp $
DISTNAME= arla-0.38
PKGREVISION= 2
@@ -28,7 +28,7 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
. if exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
CONFIGURE_ARGS+= --with-sys=${BSDSRCDIR}/sys
. else
-PKG_FAIL_REASON= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or //usr/src/sys)"
+PKG_FAIL_REASON+= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or //usr/src/sys)"
. endif
.endif
@@ -41,8 +41,8 @@ CONFIGURE_ARGS+= --enable-shared=no
#CONFIGURE_ENV+= KERNEL_CPPFLAGS="-DMULTIPROCESSOR -DDEBUG -DDIAGNOSTIC"
MESSAGE_SUBST+= ARLA_CACHE=${ARLA_CACHE}
-PLIST_SUBST+= ARLA_CACHE=${ARLA_CACHE}
-FILES_SUBST+= ARLA_CACHE=${ARLA_CACHE}
+PLIST_SUBST+= ARLA_CACHE=${ARLA_CACHE:Q}
+FILES_SUBST+= ARLA_CACHE=${ARLA_CACHE:Q}
EGDIR= ${PREFIX}/share/examples/arla
RCD_SCRIPTS= arlad
diff --git a/net/arpwatch/distinfo b/net/arpwatch/distinfo
index 56a00e80a15..c1120e73696 100644
--- a/net/arpwatch/distinfo
+++ b/net/arpwatch/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2005/11/30 22:36:43 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2005/12/05 20:50:44 rillig Exp $
SHA1 (arpwatch-2.1a13.tar.gz) = 03d98e239405529f97b742f04d2a9b837b5da43a
RMD160 (arpwatch-2.1a13.tar.gz) = 80b89d36d9c20e9d0ac272ba7b66494d2888a557
Size (arpwatch-2.1a13.tar.gz) = 152779 bytes
SHA1 (patch-aa) = 01d72e1342cdcf2c566a2c761743d4b71af5985c
-SHA1 (patch-ab) = 06a51f7958a4afddac2820886566e89b1b261093
-SHA1 (patch-ac) = 87dfb675a2eaf3c65e1e28dfe647fded229e04e9
+SHA1 (patch-ab) = 73fb4cca476b58c3456f4d418779ae9aecfcf885
+SHA1 (patch-ac) = 0f89214364e5007f9929ad5a4449d4b11bd7dffe
SHA1 (patch-ad) = 0292675b4b48656575ad4429c98e1187962a1bef
-SHA1 (patch-ae) = 019f724d84054a775e6b81f93772831aea5e4db7
+SHA1 (patch-ae) = cb392c6bb2c10b261a759e7c7835dd959d34a047
diff --git a/net/arpwatch/patches/patch-ab b/net/arpwatch/patches/patch-ab
index 15b2b9fe00c..28e5d7b454d 100644
--- a/net/arpwatch/patches/patch-ab
+++ b/net/arpwatch/patches/patch-ab
@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.8 2005/12/05 20:50:44 rillig Exp $
+
--- arpwatch.8.orig 2005-10-25 12:51:51.000000000 +0200
+++ arpwatch.8 2005-10-25 12:52:40.000000000 +0200
@@ -71,6 +71,12 @@
diff --git a/net/arpwatch/patches/patch-ac b/net/arpwatch/patches/patch-ac
index 3bad1578533..6c97420f552 100644
--- a/net/arpwatch/patches/patch-ac
+++ b/net/arpwatch/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.9 2005/12/05 20:50:44 rillig Exp $
+
--- arpwatch.c.orig 2005-10-25 12:53:57.000000000 +0200
+++ arpwatch.c 2005-10-25 12:56:40.000000000 +0200
@@ -107,6 +107,8 @@
diff --git a/net/arpwatch/patches/patch-ae b/net/arpwatch/patches/patch-ae
index e9449e7ea24..069eb464c54 100644
--- a/net/arpwatch/patches/patch-ae
+++ b/net/arpwatch/patches/patch-ae
@@ -1,3 +1,5 @@
+$NetBSD: patch-ae,v 1.5 2005/12/05 20:50:44 rillig Exp $
+
--- report.c.orig 2000-10-01 01:41:10.000000000 +0200
+++ report.c 2005-10-25 13:07:21.000000000 +0200
@@ -70,6 +70,8 @@
diff --git a/net/batchftp/Makefile b/net/batchftp/Makefile
index 509df5fd948..165f3f6a9a1 100644
--- a/net/batchftp/Makefile
+++ b/net/batchftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/11/08 15:51:52 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:44 rillig Exp $
DISTNAME= batchftp102
PKGNAME= batchftp-1.02
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
CPPFLAGS.Interix+= -Dsetpgrp=setpgid
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
INSTALLATION_DIRS= bin
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 3eedd822032..b98d517e5ff 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/11/04 19:36:01 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:44 rillig Exp $
DISTNAME= bind-${BIND_VERSION}
PKGREVISION= 1
@@ -25,7 +25,7 @@ BUILD_DIRS= src doc/man
.if ${OPSYS} == "SunOS"
MAKEFLAGS+= MANROFF=cat
-MAKEFLAGS+= INSTALL=${INSTALL}
+MAKEFLAGS+= INSTALL=${INSTALL:Q}
OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/ndc.d root other 700
.endif
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index fb4e20cbf8d..928638ba5ee 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2005/08/23 11:48:50 rillig Exp $
+# $NetBSD: Makefile,v 1.73 2005/12/05 20:50:44 rillig Exp $
DISTNAME= bind-${BIND_VERSION}
-PKGNAME= bind-${BIND_VERSION}
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
@@ -33,7 +32,7 @@ PKG_GROUPS= ${BIND_GROUP}
PTHREAD_OPTS+= native
-FILES_SUBST+= BIND_GROUP=${BIND_GROUP} BIND_USER=${BIND_USER} PAX=${PAX}
+FILES_SUBST+= BIND_GROUP=${BIND_GROUP:Q} BIND_USER=${BIND_USER:Q} PAX=${PAX:Q}
MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
# include/isc/ipv6.h is installed on non-ipv6 platforms
.if defined(USE_INET6) && (${USE_INET6} == "YES")
diff --git a/net/bing/Makefile b/net/bing/Makefile
index 5ef62f2c1b9..8afbde119f5 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/03/24 21:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:44 rillig Exp $
DISTNAME= bing-1.0.4
CATEGORIES= net
@@ -33,4 +33,3 @@ CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*//g}
CFLAGS:= ${CFLAGS:C/-O[0-9]*//g}
. endif
.endif
-
diff --git a/net/boinc3-seti/Makefile b/net/boinc3-seti/Makefile
index 17b29bd9733..0f180053b4a 100644
--- a/net/boinc3-seti/Makefile
+++ b/net/boinc3-seti/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:23 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:44 rillig Exp $
#
DISTNAME= seti_boinc-client-cvs-2004-07-15
@@ -21,7 +21,7 @@ USE_TOOLS+= gmake
CLIENTBINNAME= setiathome-3.10.${MACHINE_GNU_PLATFORM}
CLIENTVERSION= 310
-PLIST_SUBST+= CLIENTBINNAME=${CLIENTBINNAME}
+PLIST_SUBST+= CLIENTBINNAME=${CLIENTBINNAME:Q}
APPINFO_SED= -e "s|@CLIENTBINNAME@|${CLIENTBINNAME}|g"
APPINFO_SED+= -e "s|@CLIENTVERSION@|${CLIENTVERSION}|g"
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index cc78ae8c350..6af527bb98c 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/17 04:49:47 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:44 rillig Exp $
DISTNAME= chrony-1.20
PKGREVISION= 1
@@ -18,9 +18,9 @@ EGDIR= ${PREFIX}/share/examples/chrony
EGFILES= chrony.conf.example chrony.keys.example
RCD_SCRIPTS= chronyd
-MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}"
+MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
+MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
+MAKE_ENV+= INSTALL_MAN=${INSTALL_MAN:Q}
pre-install:
for file in ${EGFILES}; do \
diff --git a/net/cidr/Makefile b/net/cidr/Makefile
index 53d26e71394..8a6ec6248f1 100644
--- a/net/cidr/Makefile
+++ b/net/cidr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/10/12 07:10:57 seb Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:44 rillig Exp $
#
DISTNAME= cidr-current
@@ -13,6 +13,6 @@ COMMENT= RFC 1878 subnet calculator / helper
WRKSRC= ${WRKDIR}/cidr-2.3
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS="${LIBS}"
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/net/cisco-mibs/Makefile b/net/cisco-mibs/Makefile
index 136ab5ef281..1f4b28a6784 100644
--- a/net/cisco-mibs/Makefile
+++ b/net/cisco-mibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:44 rillig Exp $
DISTNAME= cisco-mibs-20050210
CATEGORIES= net
@@ -13,7 +13,7 @@ DISTFILES= v1.tar.gz \
#
MAINTAINER= kim@tac.nyc.ny.us
-COMMENT= Public SNMPv1 and SNMPv2 MIBs from Cisco.
+COMMENT= Public SNMPv1 and SNMPv2 MIBs from Cisco
WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGBASE}
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 5df344fa8e9..f7fa29acefa 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/09/27 16:09:50 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:44 rillig Exp $
#
# A default so lintpkgsrc is happy, overridden below
@@ -35,7 +35,7 @@ PKGNAME= citrix_ica-7.00.77757
# see http://www.citrix.com/download/unix-downloads.htm
.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
-DEPENDS= suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
.endif
LICENSE= citrix_ica-license
@@ -46,14 +46,14 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
WRKSRC= ${WRKDIR}
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
CDIR= ${PREFIX}/lib/ICAClient
BINDIR= ${PREFIX}/bin
.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
. if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON= "${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
+PKG_FAIL_REASON+= "${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
. endif
.endif
diff --git a/net/dc_gui2/distinfo b/net/dc_gui2/distinfo
index 456bf7e0bde..9ffce71eb11 100644
--- a/net/dc_gui2/distinfo
+++ b/net/dc_gui2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:45 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/05 20:50:44 rillig Exp $
SHA1 (dc_gui2-0.75.tar.gz) = ac99b99e292d1646c8f87e5016762795e6f721b1
RMD160 (dc_gui2-0.75.tar.gz) = 7851bc5d0d8a941f622d9397c3fcfe7840f7f39e
Size (dc_gui2-0.75.tar.gz) = 612248 bytes
SHA1 (patch-aa) = ac14a12d740b030f068b9947f87fc4a29b84313a
SHA1 (patch-ac) = 5a78d9f28de9b8df1d02c821b39ac14ec00e4622
-SHA1 (patch-af) = c680de415395ac112627e9b55ce5aabdf5f7ece4
+SHA1 (patch-af) = f867979e46a62611d2201a93e26deaf3c08b298e
diff --git a/net/dc_gui2/patches/patch-af b/net/dc_gui2/patches/patch-af
index efe83bab11e..dba8f853e5e 100644
--- a/net/dc_gui2/patches/patch-af
+++ b/net/dc_gui2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2003/07/16 10:56:57 wiz Exp $
+$NetBSD: patch-af,v 1.3 2005/12/05 20:50:45 rillig Exp $
--- src/init_fnc.c.orig Wed Jul 9 18:20:53 2003
+++ src/init_fnc.c
-@@ -35,7 +35,13 @@ $Id: init_fnc.c,v 1.13 2003/07/09 16:20:
+@@ -35,7 +35,13 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/net/dctc/distinfo b/net/dctc/distinfo
index 99a9fd38d05..ace2cdcfbb1 100644
--- a/net/dctc/distinfo
+++ b/net/dctc/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2005/02/24 12:13:45 agc Exp $
+$NetBSD: distinfo,v 1.16 2005/12/05 20:50:45 rillig Exp $
SHA1 (dctc-0.85.4.tar.gz) = 8422f041ccd398fcabb032a6ece9f2f50d827bb7
RMD160 (dctc-0.85.4.tar.gz) = ded2d6e8f8de47c50ef689d0c49f6b3bcc2439f6
Size (dctc-0.85.4.tar.gz) = 493733 bytes
SHA1 (patch-aa) = 62cae1e95c3422cb8b184cd8ee13989073b9fc06
SHA1 (patch-ab) = 4a28cc7d9e2a22c52ad319bbda0893d70fd000be
-SHA1 (patch-ac) = 0f9070bc9ce04caaad8612d075d3b5dfcb5523f5
-SHA1 (patch-ad) = 09466a9fec9403bf3dc911a5af5f86050087159b
+SHA1 (patch-ac) = 6f73d5b954bc69c7b83e25411ae3819101c5d4e3
+SHA1 (patch-ad) = ce699efbc6d009146a909e2ffac83435fdb2932e
SHA1 (patch-ae) = d53881200e85a4ebcb62b37d8acbe5ab8bddabae
diff --git a/net/dctc/patches/patch-ac b/net/dctc/patches/patch-ac
index c430b3db582..a6a2cba0c80 100644
--- a/net/dctc/patches/patch-ac
+++ b/net/dctc/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2003/07/15 19:46:15 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2005/12/05 20:50:45 rillig Exp $
--- src/keyboard_master.c.orig Sun Jun 22 10:40:35 2003
+++ src/keyboard_master.c
-@@ -39,7 +40,6 @@ $Id: keyboard_master.c,v 1.1 2003/06/22
+@@ -39,7 +40,6 @@
#include <openssl/md4.h>
#include <glib.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.5 2003/07/15 19:46:15 wiz Exp $
#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
/* union semun is defined by including <sys/sem.h> */
#else
-@@ -51,7 +51,6 @@ $Id: keyboard_master.c,v 1.1 2003/06/22
+@@ -51,7 +51,6 @@
struct seminfo *__buf; /* buffer for IPC_INFO */
};
#endif
diff --git a/net/dctc/patches/patch-ad b/net/dctc/patches/patch-ad
index 697a436daed..3f1d72a8afd 100644
--- a/net/dctc/patches/patch-ad
+++ b/net/dctc/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2003/07/15 19:46:15 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2005/12/05 20:50:45 rillig Exp $
--- src/mydb.h.orig Sat May 17 08:12:37 2003
+++ src/mydb.h
-@@ -24,6 +24,9 @@ $Id: mydb.h,v 1.1.1.1 2003/05/17 06:12:3
+@@ -24,6 +24,9 @@
#ifndef __DB_H__
#define __DB_H__
diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index a1b2476b942..f9c463597b5 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/06/17 03:50:24 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:45 rillig Exp $
DISTNAME= ${PKGNAME_NOREV:S/-//}
PKGNAME= delegate-8.9.6
@@ -29,7 +29,7 @@ BUILD_DEFS+= DELEGATE_MANAGER
DELEGATE_MANAGER?= root@localhost
RCD_SCRIPTS= delegated
-FILES_SUBST+= ADMIN="${DELEGATE_MANAGER}"
+FILES_SUBST+= ADMIN=${DELEGATE_MANAGER:Q}
OWN_DIRS_PERMS+=${VARBASE}/spool/delegate/cache ${ROOT_USER} ${ROOT_GROUP} 1777
OWN_DIRS_PERMS+=${VARBASE}/spool/delegate-nobody nobody nobody 755
diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile
index 1da9928ec36..6784fd2e173 100644
--- a/net/djbdns-run/Makefile
+++ b/net/djbdns-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:45 rillig Exp $
#
DISTNAME= djbdns-run-20050415
@@ -33,7 +33,7 @@ PKG_USERS+= dnscache:djbdns::dnscache
PKG_USERS+= rbldns:djbdns::rbldns
PKG_USERS+= tinydns:djbdns::tinydns
RCD_SCRIPTS= axfrdns djbdns dnscache rbldns tinydns
-FILES_SUBST+= PKGNAME=${PKGNAME}
+FILES_SUBST+= PKGNAME=${PKGNAME:Q}
INSTALLATION_DIRS= bin share/doc/djbdns-run
diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile
index cd5f580f964..2e30cced54c 100644
--- a/net/driftnet/Makefile
+++ b/net/driftnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/17 03:50:24 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:45 rillig Exp $
#
DISTNAME= driftnet-0.1.6
@@ -10,11 +10,11 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.ex-parrot.com/~chris/driftnet/
COMMENT= Real-time image sniffer
-DEPENDS= mpg123-[0-9]*:../../audio/mpg123
+DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
BUILD_TARGET= default
-MAKE_ENV+= CAT="${CAT}" TRUE="${TRUE}"
+MAKE_ENV+= CAT=${CAT:Q} TRUE=${TRUE:Q}
INSTALLATION_DIRS= bin man/man1
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index bda29b4e47f..f09bb7ab6d4 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:21 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:45 rillig Exp $
DISTNAME= ed2k-gtk-gui-0.6.3
PKGREVISION= 1
@@ -13,7 +13,7 @@ USE_TOOLS+= pkg-config
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CONFIGURE_LDFLAGS=${LDFLAGS:Q}
+CONFIGURE_ENV+= CONFIGURE_LDFLAGS=${LDFLAGS:M*:Q}
SUBST_CLASSES+= shell
SUBST_MESSAGE.shell= "Fixing hardcoded shell."
diff --git a/net/entropy/Makefile b/net/entropy/Makefile
index ade59409748..cfcfa35339b 100644
--- a/net/entropy/Makefile
+++ b/net/entropy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/08 15:59:38 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:45 rillig Exp $
#
DISTNAME= entropy_rsa-${ENTROPY_VERSION}
@@ -50,11 +50,11 @@ CONFIGURE_ARGS+= --with-tree
CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
.include "../../mk/mysql.buildlink3.mk"
.elif ${ENTROPY_STORE_TYPE} != "monolithic"
-.error unknown ENTROPY_STORE_TYPE: ${ENTROPY_STORE_TYPE}
+PKG_FAIL_REASON+= "unknown ENTROPY_STORE_TYPE: "${ENTROPY_STORE_TYPE:Q}""
.endif
# maximum allowed peer connections (and child processes); default 64
-.ifdef ENTROPY_MAX_PEERS
+.if defined(ENTROPY_MAX_PEERS)
CONFIGURE_ARGS+= --enable-max-peers=${ENTROPY_MAX_PEERS}
.endif
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 40ca5ccdd01..13a0ff9ef7e 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2005/11/01 20:09:50 frueauf Exp $
+# $NetBSD: Makefile,v 1.119 2005/12/05 20:50:45 rillig Exp $
DISTNAME= ethereal-0.10.13
PKGREVISION= 1
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
CONFIGURE_ENV+= ac_cv_func_pcap_compile_nopcap=no
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
.include "../../mk/bsd.prefs.mk"
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index a5cf0ae9cb0..753f1164a1e 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/11/19 14:28:50 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:45 rillig Exp $
DISTNAME= ettercap-0.6.b
PKGREVISION= 3
@@ -22,7 +22,7 @@ USE_NCURSES= # putwin()
USE_OLD_DES_API= yes
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
BUILD_DIRS= . plugins
INSTALL_DIRS= . plugins
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index 27a496eeb51..913151f236f 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/23 20:06:26 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:45 rillig Exp $
DISTNAME= firewalk-5.0
CATEGORIES= net security
@@ -15,7 +15,7 @@ CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include
BUILDLINK_DEPENDS.libnet+= libnet-1.1.*
-MAKE_ENV+= FIREWALK_LOC=${PREFIX}
+MAKE_ENV+= FIREWALK_LOC=${PREFIX:Q}
.include "../../devel/libnet11/buildlink3.mk"
.include "../../net/libdnet/buildlink3.mk"
diff --git a/net/freenet-tools/Makefile b/net/freenet-tools/Makefile
index e87d3925b32..11f636b27e6 100644
--- a/net/freenet-tools/Makefile
+++ b/net/freenet-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/10/23 21:45:57 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:45 rillig Exp $
#
DISTNAME= ft-0.2.23
@@ -14,7 +14,7 @@ COMMENT= Freenet Tools, freesite manipulation tools for Freenet and Entropy
USE_TOOLS+= gmake
-MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q}
+MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q}
CFLAGS+= -DFT_BIN=\"${PREFIX}/bin\"
INSTALLATION_DIRS= bin
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index db34c094bdc..19a03ab463b 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/11/28 23:44:02 adrianp Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:45 rillig Exp $
DISTNAME= freeradius-1.0.5
PKGREVISION= 2
@@ -18,8 +18,8 @@ GNU_CONFIGURE= YES
USE_PKGINSTALL= YES
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
-FILES_SUBST+= ROOT_USER=${ROOT_USER}
-FILES_SUBST+= ROOT_GROUP=${ROOT_GROUP}
+FILES_SUBST+= ROOT_USER=${ROOT_USER:Q}
+FILES_SUBST+= ROOT_GROUP=${ROOT_GROUP:Q}
USE_OLD_DES_API= YES
BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --without-rlm_sql_iodbc
CONFIGURE_ARGS+= --without-rlm_sql_oracle
CONFIGURE_ARGS+= --without-rlm_sql_unixodbc
-SUBST_CLASSES= make
+SUBST_CLASSES+= make
SUBST_STAGE.make= post-patch
SUBST_FILES.make= src/modules/rlm_ldap/Makefile.in \
src/modules/rlm_mschap/Makefile \
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 2a8c339caa8..f8d7942070d 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:45 rillig Exp $
#
DISTNAME= freeWAIS-sf-2.2.12
@@ -17,11 +17,11 @@ USE_LIBTOOL= yes
USE_TOOLS+= perl:run
HAS_CONFIGURE= yes
-CONFIGURE_ENV+= PREFIX=${PREFIX}
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
CONFIGURE_SCRIPT= ./Configure
CONFIGURE_ARGS+= -sde -Dprefix=${PREFIX} \
-Darchname=${MACHINE_ARCH}-${LOWER_OPSYS}
-CONFIGURE_ENV+= PERL5="${PERL5}"
+CONFIGURE_ENV+= PERL5=${PERL5:Q}
INSTALL_TARGET= install install.man
USE_MAKEINFO= YES
diff --git a/net/freewais-sf/distinfo b/net/freewais-sf/distinfo
index 6fbe25653ba..1cd10d08a1d 100644
--- a/net/freewais-sf/distinfo
+++ b/net/freewais-sf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/06/23 22:12:44 kristerw Exp $
+$NetBSD: distinfo,v 1.6 2005/12/05 20:50:45 rillig Exp $
SHA1 (freeWAIS-sf-2.2.12.tar.gz) = a18ec82b773e0114c3c2b15aa3fbeadc21b2cd47
RMD160 (freeWAIS-sf-2.2.12.tar.gz) = 3b25c10f0cb62d69ce7001affe53c18bfaf9cede
@@ -29,4 +29,4 @@ SHA1 (patch-aw) = 00f267dd288dfcce627dbbb631cd388eae1a81af
SHA1 (patch-ax) = 9934346f7d22c23d0682c316079bb4cdf01d77d7
SHA1 (patch-ay) = b699615b0a152136fc6be02c899a2a0d4ea6ced1
SHA1 (patch-az) = 8b608484a353c73e6e532bb4cb9f32a4270f1385
-SHA1 (patch-ba) = 55414bc530ef72426793014f09578bac1378cbb8
+SHA1 (patch-ba) = fc98fc590a86720f39fc77d650bfc985508b064b
diff --git a/net/freewais-sf/patches/patch-ba b/net/freewais-sf/patches/patch-ba
index 77ed44602c0..03aa8f68fd6 100644
--- a/net/freewais-sf/patches/patch-ba
+++ b/net/freewais-sf/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2004/03/09 11:24:04 seb Exp $
+$NetBSD: patch-ba,v 1.2 2005/12/05 20:50:45 rillig Exp $
--- server/waisserver.c.orig 1999-04-16 09:59:45.000000000 +0000
+++ server/waisserver.c
-@@ -44,6 +44,9 @@ static char *PRCSid = "$Id: waisserver.c
+@@ -44,6 +44,9 @@
#ifdef I_SYS_SELECT
#include <sys/select.h>
#endif
diff --git a/net/ftpproxy/Makefile b/net/ftpproxy/Makefile
index 1168bc4c8b8..d7c51ad4b6b 100644
--- a/net/ftpproxy/Makefile
+++ b/net/ftpproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:25 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:45 rillig Exp $
#
DISTNAME= ftpproxy-${VERSION}
@@ -20,7 +20,7 @@ VERSION= 1.2.3
LIBS+= "-lsocket -lnsl"
OSFLAG= -DSOLARIS
.endif
-MAKE_ENV+= OSFLAG=${OSFLAG} OSLIB=${LIBS} VERSION=${VERSION}
+MAKE_ENV+= OSFLAG=${OSFLAG:Q} OSLIB=${LIBS:M*:Q} VERSION=${VERSION:Q}
INSTALLATION_DIRS= libexec man/man8
diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common
index 365693852b6..990e3328af6 100644
--- a/net/gftp/Makefile.common
+++ b/net/gftp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/04/11 21:46:46 tv Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:46 rillig Exp $
DISTNAME= gftp-${VERSION}
CATEGORIES= net
@@ -15,7 +15,7 @@ USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
CONFIGURE_ARGS+= --with-readline
diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile
index dbeb1050083..0c11be48236 100644
--- a/net/gkrellm-multiping/Makefile
+++ b/net/gkrellm-multiping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:21 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:46 rillig Exp $
#
DISTNAME= gkrellm-multiping-2.0.8
@@ -16,7 +16,7 @@ SPECIAL_PERMS+= ${PREFIX}/lib/gkrellm2/plugins/pinger ${SETUID_ROOT_PERMS}
USE_TOOLS+= pkg-config
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
post-patch:
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index ddef1db46bf..5d03aa056c1 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:22 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:46 rillig Exp $
#
DISTNAME= gnet-2.0.7
@@ -14,7 +14,7 @@ USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= gnet-2.0.pc.in
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --enable-glib2
+CONFIGURE_ARGS+= --enable-glib2
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
TEST_TARGET= check
diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile
index a4aa1eec523..dac5638bc52 100644
--- a/net/gnet1/Makefile
+++ b/net/gnet1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:22 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:46 rillig Exp $
#
DISTNAME= gnet-1.1.8
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= gnet.pc.in
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --enable-glib2
+CONFIGURE_ARGS+= --enable-glib2
TEST_TARGET= check
.include "../../devel/glib2/buildlink3.mk"
diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile
index d978b23ab2f..0aaf5562a3c 100644
--- a/net/gnugk/Makefile
+++ b/net/gnugk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:24 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:46 rillig Exp $
DISTNAME= gnugk-2.2.0
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnugk.org/
COMMENT= H.323 Gatekeeper
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_PTLIB_CONFIG=${PREFIX}/bin/ptlib-config
@@ -18,7 +18,7 @@ CONFIGURE_ENV+= PWLIBDIR=${PREFIX}/share/pwlib
CONFIGURE_ENV+= OPENH323DIR=${PREFIX}/share/openh323
CFLAGS+= -fexceptions
-MAKE_ENV+= LIBTOOL="${LIBTOOL}" SYSLIBDIR="${PREFIX}/lib"
+MAKE_ENV+= LIBTOOL=${LIBTOOL:Q} SYSLIBDIR="${PREFIX}/lib"
PKG_SYSCONFSUBDIR= ${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
diff --git a/net/gofish/Makefile b/net/gofish/Makefile
index d926b20715b..8ea7c595f50 100644
--- a/net/gofish/Makefile
+++ b/net/gofish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/11/11 21:14:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:46 rillig Exp $
DISTNAME= gofish-1.1
PKGREVISION= 1
@@ -33,8 +33,8 @@ 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}
-FILES_SUBST+= PKG_USERS=${PKG_USERS}
+FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q}
+FILES_SUBST+= PKG_USERS=${PKG_USERS:Q}
post-configure:
${MV} ${WRKSRC}/gofish.conf ${WRKSRC}/gofish.conf.orig
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 54602aef180..3ebe4ccc7c2 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/09/27 12:57:06 adam Exp $
+# $NetBSD: Makefile,v 1.46 2005/12/05 20:50:46 rillig Exp $
DISTNAME= gtk-gnutella-0.95.4
CATEGORIES= net
@@ -16,11 +16,11 @@ USE_TOOLS+= gmake
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
CONFIGURE_ARGS+= -d -e -r -s \
- -D prefix="${PREFIX}" \
+ -D prefix=${PREFIX:Q} \
-D privlib="${PREFIX}/share/gtk-gnutella" \
-D sysman="${PREFIX}/man" \
-D locale="${PREFIX}/${PKGLOCALEDIR}/locale" \
- -D cc="${CC}" \
+ -D cc=${CC:Q} \
-D ccflags="${CFLAGS:Unone}" \
-D gtkversion=2 \
-D yacc="yacc" \
diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile
index e99dbd65b20..6f1090903c1 100644
--- a/net/hesiod/Makefile
+++ b/net/hesiod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/04 02:24:04 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:46 rillig Exp $
DISTNAME= hesiod-3.0.2
CATEGORIES= net
@@ -10,7 +10,7 @@ COMMENT= Hesiod network database client and library
.include "../../mk/bsd.prefs.mk"
.if exists(/usr/include/hesiod.h) && !defined(USE_HESIOD)
-PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution"
+PKG_SKIP_REASON+= "${PKGNAME} is part of your ${OPSYS} distribution"
.endif
GNU_CONFIGURE= YES
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index 12bc288c8e1..8acb439c98c 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/09/17 20:33:11 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:46 rillig Exp $
#
DISTNAME= hobbit-4.0-beta6
@@ -46,21 +46,21 @@ CONFIGURE_ENV+= ENABLESSL=y
CONFIGURE_ENV+= ENABLELDAP=y
CONFIGURE_ENV+= ENABLELDAPSSL=y
CONFIGURE_ENV+= BBHOSTNAME=""
-CONFIGURE_ENV+= BBUSER=${BBUSER}
-CONFIGURE_ENV+= BBTOPDIR=${BBTOPDIR}
-CONFIGURE_ENV+= BBHOSTURL=${BBHOSTURL}
-CONFIGURE_ENV+= CGIDIR=${CGIDIR}
-CONFIGURE_ENV+= BBCGIURL=${BBCGIURL}
-CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP}
-CONFIGURE_ENV+= BBLOGDIR=${BBLOGDIR}
-CONFIGURE_ENV+= BBHOSTIP=${BBHOSTIP}
+CONFIGURE_ENV+= BBUSER=${BBUSER:Q}
+CONFIGURE_ENV+= BBTOPDIR=${BBTOPDIR:Q}
+CONFIGURE_ENV+= BBHOSTURL=${BBHOSTURL:Q}
+CONFIGURE_ENV+= CGIDIR=${CGIDIR:Q}
+CONFIGURE_ENV+= BBCGIURL=${BBCGIURL:Q}
+CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP:Q}
+CONFIGURE_ENV+= BBLOGDIR=${BBLOGDIR:Q}
+CONFIGURE_ENV+= BBHOSTIP=${BBHOSTIP:Q}
CONFIGURE_ENV+= MANROOT=${PREFIX}/man
CONFIGURE_ENV+= BARS=all
CONFIGURE_ENV+= USENEWHIST=y
CONFIGURE_ENV+= PIXELCOUNT=560
-MAKE_ENV+= MAKE=${MAKE_PROGRAM}
-MAKE_ENV+= PKGDIR=${PREFIX}
+MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q}
+MAKE_ENV+= PKGDIR=${PREFIX:Q}
do-install:
cd ${WRKSRC} ; \
diff --git a/net/hping/Makefile b/net/hping/Makefile
index 177a7eba38a..39069491be9 100644
--- a/net/hping/Makefile
+++ b/net/hping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/13 14:18:22 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:46 rillig Exp $
#
DISTNAME= hping2.0.0-rc2
@@ -13,8 +13,8 @@ COMMENT= Traceroute and ping using TCP and UDP as well as ICMP
WRKSRC= ${WRKDIR}/hping2-rc2
HAS_CONFIGURE= YES
MANPATH= ${PREFIX}/man
-CONFIGURE_ENV+= MANPATH="${MANPATH}"
-NOT_FOR_PLATFORM= NetBSD-0.* NetBSD-1.[0-4]*
+CONFIGURE_ENV+= MANPATH=${MANPATH:Q}
+NOT_FOR_PLATFORM= NetBSD-0.*-* NetBSD-1.[0-4]*-*
BINMODE= 4755
INSTALLATION_DIRS= man/man8 sbin
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 92193a4edf1..6772bae479d 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/07 20:29:52 markd Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:46 rillig Exp $
DISTNAME= iperf-2.0.2
CATEGORIES= net
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
INSTALLATION_DIRS+= share/doc/html/${PKGBASE}
-PTHREAD_OPTS= native optional
+PTHREAD_OPTS+= native optional
.include "../../mk/pthread.buildlink3.mk"
post-install:
diff --git a/net/ipw/Makefile b/net/ipw/Makefile
index 0f247297138..cd6d808c1f6 100644
--- a/net/ipw/Makefile
+++ b/net/ipw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/31 13:32:27 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:46 rillig Exp $
#
DISTNAME= ipw-3.3a
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}
INSTALLATION_DIRS= bin share/doc
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ipw ${PREFIX}/bin
diff --git a/net/ishell/Makefile b/net/ishell/Makefile
index 2d532a37857..c159d32f0c7 100644
--- a/net/ishell/Makefile
+++ b/net/ishell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/31 13:33:42 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:46 rillig Exp $
#
DISTNAME= ish-v${VERSION}
@@ -19,7 +19,7 @@ USE_TOOLS+= gmake
NO_CONFIGURE= yes
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
INSTALLATION_DIRS= bin sbin
diff --git a/net/isic/Makefile b/net/isic/Makefile
index d21226fbdf4..a1aa8f15d0a 100644
--- a/net/isic/Makefile
+++ b/net/isic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:48 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:46 rillig Exp $
#
DISTNAME= isic-0.06
@@ -28,7 +28,7 @@ post-install:
. if (${MACHINE_ARCH} == "alpha")
CPPFLAGS:= ${CPPFLAGS:C/-O[0-9]*//g}
CFLAGS:= ${CFLAGS:C/-O[0-9]*//g}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q}
+CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
. endif
.endif
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index ee97fae2853..cc2e46c8282 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/08/23 11:48:50 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:46 rillig Exp $
DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION}
PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION}
@@ -34,12 +34,12 @@ SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run
SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
SAMBA_VARDIR?= ${VARBASE}
-FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR}
-FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
-FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
-FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR}
-FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
-FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR}
+FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR:Q}
+FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR:Q}
+FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR:Q}
+FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR:Q}
+FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q}
+FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR:Q}
CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR}
@@ -127,7 +127,7 @@ PKG_GROUPS= ${SAMBA_GROUP}
PKG_USERS= ${SAMBA_USER}:${SAMBA_GROUP}::Samba\ pseudo-user
BUILD_DEFS+= SAMBA_USER SAMBA_GROUP
-MAKE_FLAGS= CFLAGS='-DGUEST_ACCOUNT=\"${SAMBA_USER:Q}\"'
+MAKE_FLAGS+= CFLAGS='-DGUEST_ACCOUNT=\"${SAMBA_USER:Q}\"'
INSTALL_LIBRARY= \
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile
index 108129c1206..8684fa15a38 100644
--- a/net/kftpgrabber/Makefile
+++ b/net/kftpgrabber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/10/08 10:55:05 markd Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:46 rillig Exp $
DISTNAME= kftpgrabber-0.6.0
CATEGORIES= net kde
@@ -7,7 +7,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://kftpgrabber.sourceforge.net/
-COMMENT= graphical FTP client for KDE
+COMMENT= Graphical FTP client for KDE
BUILD_USES_MSGFMT= yes
USE_LANGUAGES= c c++
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index 9f3b177b087..b8f31ece58e 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/11/29 10:15:18 tron Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:46 rillig Exp $
DISTNAME= kphone-4.2
CATEGORIES= net comms
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/kphone
USE_X11BASE= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
-CONFIGURE_ENV+= QTDIR="${QTDIR}"
+CONFIGURE_ENV+= QTDIR=${QTDIR:Q}
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
diff --git a/net/kphone/distinfo b/net/kphone/distinfo
index 8a75dc65d0a..94144403223 100644
--- a/net/kphone/distinfo
+++ b/net/kphone/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.8 2005/11/29 10:15:18 tron Exp $
+$NetBSD: distinfo,v 1.9 2005/12/05 20:50:46 rillig Exp $
SHA1 (kphone-4.2.tar.gz) = 10c7559b79fb13f42714008cd89a3981f66df2cf
RMD160 (kphone-4.2.tar.gz) = 6176a97d19fe05741503f5b81dfd21e6130193e1
Size (kphone-4.2.tar.gz) = 287320 bytes
SHA1 (patch-aa) = ecb31fdeeaf4cb2a5aafe50b5fe58b85375cfd65
SHA1 (patch-ab) = 6edbc28aeb485b8004b6258b04d50c0888c28a31
-SHA1 (patch-ac) = 7b58171b4cb7b56c6ee939a86f861744ee7b6673
-SHA1 (patch-ad) = e69160d4ff68420a473d1f8b64ef32e3b8cedc24
+SHA1 (patch-ac) = 9182af58e48cb20df9c353da2384f69c9ef71a85
+SHA1 (patch-ad) = ad4e7244e35dc0292e5afa7c9119aee02ce85052
SHA1 (patch-ae) = 9d92b2585f673c7275a153f41c72623ad08b0b78
-SHA1 (patch-af) = 6bd63111a707d50096b360e7f0821cdafb3c798d
-SHA1 (patch-ag) = 666218619747ba1107f1967a86eb2fcb680dce7b
+SHA1 (patch-af) = 8b6d80d870d73a75e5060faaed3254d4317d6c33
+SHA1 (patch-ag) = cc2d220da55b7657452a97f2c3b442f0f6939848
SHA1 (patch-ah) = 24157b3b121ee64a87f020c1b140fad1a11428b7
SHA1 (patch-ai) = bba9c0f8ab9c34e65b43e283e4d29e78aecd642c
SHA1 (patch-aj) = 600f96693fcf6f00f0b23a76923cdf0046116936
diff --git a/net/kphone/patches/patch-ac b/net/kphone/patches/patch-ac
index 018bc72e966..5816e2f996c 100644
--- a/net/kphone/patches/patch-ac
+++ b/net/kphone/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.3 2005/12/05 20:50:46 rillig Exp $
+
--- dissipate2/siputil.cpp.orig 2005-06-21 12:14:49.000000000 +0100
+++ dissipate2/siputil.cpp 2005-11-24 16:47:03.000000000 +0000
@@ -5,6 +5,9 @@
diff --git a/net/kphone/patches/patch-ad b/net/kphone/patches/patch-ad
index 1a319ab88da..b27192b0178 100644
--- a/net/kphone/patches/patch-ad
+++ b/net/kphone/patches/patch-ad
@@ -1,3 +1,5 @@
+$NetBSD: patch-ad,v 1.3 2005/12/05 20:50:46 rillig Exp $
+
--- dissipate2/udpmessagesocket.cpp.orig 2005-04-18 14:04:40.000000000 +0100
+++ dissipate2/udpmessagesocket.cpp 2005-11-24 16:49:55.000000000 +0000
@@ -1,5 +1,7 @@
diff --git a/net/kphone/patches/patch-af b/net/kphone/patches/patch-af
index b8d4d3135b4..979c2939e6e 100644
--- a/net/kphone/patches/patch-af
+++ b/net/kphone/patches/patch-af
@@ -1,3 +1,5 @@
+$NetBSD: patch-af,v 1.8 2005/12/05 20:50:46 rillig Exp $
+
--- configure.orig 2005-06-22 09:37:20.000000000 +0100
+++ configure 2005-11-24 16:55:26.000000000 +0000
@@ -1295,8 +1295,8 @@
diff --git a/net/kphone/patches/patch-ag b/net/kphone/patches/patch-ag
index 019e6bec278..a92119f8cf3 100644
--- a/net/kphone/patches/patch-ag
+++ b/net/kphone/patches/patch-ag
@@ -1,3 +1,5 @@
+$NetBSD: patch-ag,v 1.6 2005/12/05 20:50:46 rillig Exp $
+
--- kphone/Makefile.in.orig 2005-06-22 09:37:20.000000000 +0100
+++ kphone/Makefile.in 2005-11-24 16:59:45.000000000 +0000
@@ -6,7 +6,7 @@
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 9ac0e376565..796b7d79b62 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/17 03:50:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:47 rillig Exp $
DISTNAME= LambdaMOO-1.8.1
PKGNAME= lambdamoo-1.8.1
@@ -26,7 +26,7 @@ PKG_USERS= ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP}
_PKG_USER_HOME= ${LAMBDAMOO_HOME}
_PKG_USER_SHELL= ${SH}
-FILES_SUBST+= LAMBDAMOO_HOME=${LAMBDAMOO_HOME}
+FILES_SUBST+= LAMBDAMOO_HOME=${LAMBDAMOO_HOME:Q}
WRKSRC= ${WRKDIR}/MOO-1.8.1
BUILD_TARGET=
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index bf4c99d38a1..71441465dd0 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/12/04 22:12:07 salo Exp $
+# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:47 rillig Exp $
DISTNAME= lftp-3.3.5
CATEGORIES= net
@@ -29,7 +29,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-modules
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
EGDIR= ${PREFIX}/share/examples/lftp
CONF_FILES= ${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index cea684521ea..6416ae3d3b9 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/08/18 13:17:01 adam Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:47 rillig Exp $
DISTNAME= libIDL-0.8.6
CATEGORIES= net gnome
@@ -26,7 +26,7 @@ CONFIGURE_ENV.SunOS+= CPP=/usr/lib/cpp
.endif
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/net/libares/distinfo b/net/libares/distinfo
index d7c5d570340..f5f2a12bbb3 100644
--- a/net/libares/distinfo
+++ b/net/libares/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/11/20 15:08:35 tonio Exp $
+$NetBSD: distinfo,v 1.5 2005/12/05 20:50:47 rillig Exp $
SHA1 (ares-1.1.1.tar.gz) = eafe6ba9c85122538f06dabd735a048abea8bb1e
RMD160 (ares-1.1.1.tar.gz) = 2b564f1194f538ba12378034428bd3a22f8e5a98
Size (ares-1.1.1.tar.gz) = 65463 bytes
SHA1 (patch-aa) = cb8aaad721963f958d61b6b9f3d466c522736c56
-SHA1 (patch-ab) = 380f6cc08630e8173ca7106a939c77fbf6994010
-SHA1 (patch-ac) = 563e29d30d0542b5baac60eba5d053a64c4980da
+SHA1 (patch-ab) = 093014d0747a2077826fa2ae07a1a7a576cde6e4
+SHA1 (patch-ac) = b3c1688b4e9c6c590eaf269d634c5506869f1c7d
diff --git a/net/libares/patches/patch-ab b/net/libares/patches/patch-ab
index d68d86aa915..6a69225b799 100644
--- a/net/libares/patches/patch-ab
+++ b/net/libares/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/03/12 05:42:48 tv Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/05 20:50:47 rillig Exp $
--- ares_init.c.orig 1999-10-23 15:28:13.000000000 -0400
+++ ares_init.c
-@@ -32,6 +32,10 @@ static const char rcsid[] = "$Id: ares_i
+@@ -32,6 +32,10 @@
#include "ares.h"
#include "ares_private.h"
diff --git a/net/libares/patches/patch-ac b/net/libares/patches/patch-ac
index d73db6d6fe9..e71417acbb2 100644
--- a/net/libares/patches/patch-ac
+++ b/net/libares/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/11/20 15:08:35 tonio Exp $
+$NetBSD: patch-ac,v 1.2 2005/12/05 20:50:47 rillig Exp $
--- adig.c.orig 2001-05-18 22:59:51.000000000 +0200
+++ adig.c
-@@ -35,6 +35,10 @@ static const char rcsid[] = "$Id: adig.c
+@@ -35,6 +35,10 @@
#define INADDR_NONE 0xffffffff
#endif
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 7c0a2f585be..7de76ff7f90 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/03 22:40:58 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:47 rillig Exp $
DISTNAME= mDNSResponder-107.1
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://developer.apple.com/darwin/projects/bonjour/
COMMENT= Apple's mDNS responder
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
BUILD_DIRS= mDNSPosix
BUILDDIR= ${WRKSRC}/mDNSPosix/build/prod
@@ -38,7 +38,7 @@ SO_SUFFIX= dylib
.else
MAKE_ENV+= os=netbsd
.endif
-PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX}
+PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
BINARY= mDNSClientPosix mDNSIdentify mDNSNetMonitor \
mDNSProxyResponderPosix mDNSResponderPosix
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 3cd0d5faec1..ae3c771aedf 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/10/06 11:50:03 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:47 rillig Exp $
#
.include "Makefile.common"
@@ -14,9 +14,9 @@ OWN_DIRS_PERMS= ${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
PKG_GROUPS= ${MLDONKEY_GROUP}
PKG_USERS= ${MLDONKEY_USER}:${MLDONKEY_GROUP}::Dedicated\ mldonkey\ server:${MLDONKEY_HOME}:${SH}
-FILES_SUBST+= MLDONKEY_GROUP="${MLDONKEY_GROUP}"
-FILES_SUBST+= MLDONKEY_HOME="${MLDONKEY_HOME}"
-FILES_SUBST+= MLDONKEY_USER="${MLDONKEY_USER}"
+FILES_SUBST+= MLDONKEY_GROUP=${MLDONKEY_GROUP:Q}
+FILES_SUBST+= MLDONKEY_HOME=${MLDONKEY_HOME:Q}
+FILES_SUBST+= MLDONKEY_USER=${MLDONKEY_USER:Q}
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/mldonkey
diff --git a/net/mrstat/Makefile b/net/mrstat/Makefile
index 3056e48dbf2..2d3905afa3b 100644
--- a/net/mrstat/Makefile
+++ b/net/mrstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/06/06 17:09:05 abs Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:47 rillig Exp $
#
DISTNAME= mrstat-1.19
@@ -9,6 +9,6 @@ MAINTAINER= abs@mono.org
HOMEPAGE= http://www.mono.org/abs/tools/mrstat/
COMMENT= Track load and number of users on specified hosts
-MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/net/nam/Makefile b/net/nam/Makefile
index 49eff040cc0..5cd8718c09a 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:07 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:47 rillig Exp $
DISTNAME= nam-src-1.11
PKGNAME= ${DISTNAME:S/-src//}
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}
CONFIGURE_ARGS+= --with-otcl=${BUILDLINK_PREFIX.tcl-otcl}
CONFIGURE_ARGS+= --with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl}
-CONFIGURE_ENV+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; echo $$TCL_LIBS $$TK_LIBS'`"
+CONFIGURE_ENV+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; ${ECHO} $$TCL_LIBS $$TK_LIBS'`"
MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE}
diff --git a/net/nasd/Makefile b/net/nasd/Makefile
index 2c50023f0f0..fe5f6f040a1 100644
--- a/net/nasd/Makefile
+++ b/net/nasd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/16 01:19:16 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:47 rillig Exp $
DISTNAME= repackaged-${PKGNAME}
PKGNAME= nasd-1.3
@@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-* Linux-*-*
USE_IMAKE= yes
USE_TOOLS+= perl
-WRKSRC= ${WRKDIR}/${PKGNAME}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
pre-patch:
${MKDIR} ${WRKSRC}/include/nasd/netbsd
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index b7a027787e1..bf18dced952 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/10/18 04:32:37 grant Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:47 rillig Exp $
DISTNAME= net-snmp-5.2.1.2
PKGREVISION= 1
@@ -79,7 +79,7 @@ CONFIGURE_ARGS+= --enable-ucd-snmp-compatibility
CONFIGURE_ARGS+= --with-perl-modules=${MAKE_PARAMS:Q}
PERL5_CONFIGURE= NO
PERL5_PACKLIST= auto/Bundle/NetSNMP/.packlist
-CONFIGURE_ENV+= PERLPROG="${PERL5}"
+CONFIGURE_ENV+= PERLPROG=${PERL5:Q}
.include "options.mk"
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index bbb08f1a3aa..c3251d7203c 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/09/11 11:43:23 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:47 rillig Exp $
#
DISTNAME= netdisco-0.94_with_mibs
@@ -43,7 +43,7 @@ REPLACE_PERL+= mibs/rm_cisco_dups
REPLACE_PERL+= mibs/chk_mibs
REPLACE_PERL+= mibs/snmpwalkmib
-SUBST_CLASSES= installdir path var
+SUBST_CLASSES+= installdir path var
SUBST_STAGE.installdir= pre-configure
SUBST_FILES.installdir= sql/pg_run sql/pg_init sql/pg_back
SUBST_FILES.installdir+= bin/netdisco_daemon
@@ -81,7 +81,7 @@ SUBST_MESSAGE.var= "Fixing data directory."
NETDISCOUSER?= netdisco
NETDISCOGROUP?= netdisco
-BUILD_DEFS= NETDISCOUSER NETDISCOGROUP
+BUILD_DEFS+= NETDISCOUSER NETDISCOGROUP
PKG_USERS= ${NETDISCOUSER}:${NETDISCOGROUP}::Netdisco\ administrator:${PREFIX}/netdisco:${SH}
PKG_GROUPS= ${NETDISCOGROUP}
diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile
index 8a26551d4fe..5d21ef2f974 100644
--- a/net/netpipes/Makefile
+++ b/net/netpipes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/11/07 02:48:50 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:47 rillig Exp $
DISTNAME= netpipes-4.2-export
PKGNAME= ${DISTNAME:S/-export//}
@@ -7,12 +7,12 @@ MASTER_SITES= http://web.purplefrog.com/ftp/thoth/netpipes/
MAINTAINER= jlam@NetBSD.org
HOMEPAGE= http://web.purplefrog.com/~thoth/netpipes/netpipes.html
-COMMENT= utilities for communicating via sockets
+COMMENT= Utilities for communicating via sockets
WRKSRC= ${WRKDIR}
USE_TOOLS+= tbl
-LIBS.SunOS= -lsocket -lnsl
+LIBS.SunOS+= -lsocket -lnsl
INSTALLATION_DIRS= bin ${PKGMANDIR}
diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index 6af0634d8a0..9d2f0dfef1c 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/09/27 16:09:50 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:47 rillig Exp $
#
DISTNAME= netsaint-0.0.7
@@ -21,7 +21,6 @@ OWN_DIRS_PERMS=
/var/run/netsaint /var/run/netsaint/rw
OWN_DIRS_PERMS+= ${dir} ${NETSAINT_USER} ${NETSAINT_GROUP} 0755
.endfor
-.undef dir
INSTALL_TARGET= install install-config
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 5519b8deed9..38f1d0ca161 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/09/08 02:50:58 minskim Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:47 rillig Exp $
DISTNAME= ns-src-2.28
PKGNAME= ${DISTNAME:S/-src//}
@@ -18,7 +18,7 @@ PTHREAD_OPTS+= require
# Perl is only needed if you want to run the validation tests.
#USE_TOOLS+= perl
-CONFIGURE_ARGS+= LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; echo $$TCL_LIBS'`"
+CONFIGURE_ARGS+= LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`"
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
CONFIGURE_ARGS+= --with-tcl-ver=8.4
CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index 4d353d838f8..9885d4c88f2 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/11/06 16:36:48 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:47 rillig Exp $
DISTNAME= nsd-2.2.0
CATEGORIES= net
@@ -16,7 +16,7 @@ BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+=--enable-bind8-stats
CONFIGURE_ARGS+=--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
.if !defined(USE_INET6)
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 697f0865c32..d2298756989 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/09/10 10:43:42 adrianp Exp $
+# $NetBSD: Makefile,v 1.44 2005/12/05 20:50:47 rillig Exp $
#
DISTNAME= ntp-4.2.0
@@ -19,7 +19,7 @@ GNU_CONFIGURE= YES
USE_TOOLS+= perl
USE_PKGINSTALL= YES
-CONFIGURE_ENV+= PATH_PERL="${PERL5}" ac_cv_header_sys_soundcard_h=no
+CONFIGURE_ENV+= PATH_PERL=${PERL5:Q} ac_cv_header_sys_soundcard_h=no
CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
@@ -62,7 +62,7 @@ TIMETRIM= "@comment "
NO_TIMETRIM= ""
.endif
-PLIST_SUBST+= TIMETRIM=${TIMETRIM} NO_TIMETRIM=${NO_TIMETRIM}
+PLIST_SUBST+= TIMETRIM=${TIMETRIM:Q} NO_TIMETRIM=${NO_TIMETRIM:Q}
.include "../../security/openssl/buildlink3.mk"
diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile
index 5cc93138286..792c834ff73 100644
--- a/net/oinkmaster/Makefile
+++ b/net/oinkmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/08/06 06:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:47 rillig Exp $
DISTNAME= oinkmaster-1.2
PKGREVISION= 1
@@ -26,7 +26,7 @@ REPLACE_PERL+= ${WRKSRC}/oinkmaster.pl
PKG_SYSCONFSUBDIR= snort
-SUBST_CLASSES= pub
+SUBST_CLASSES+= pub
SUBST_STAGE.pub= post-patch
SUBST_FILES.pub= oinkmaster.pl oinkmaster.conf oinkmaster.1
SUBST_SED.pub= -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g" \
@@ -42,7 +42,6 @@ do-install:
. for f in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
. endfor
-. undef f
${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${EGDIR}
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index c86a9126bd1..152c8f91717 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:47 rillig Exp $
DISTNAME= openh323-v1_15_2-src
PKGNAME= openh323-1.15.2
@@ -15,10 +15,10 @@ USE_TOOLS+= gmake tar
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= PWLIBDIR=${PREFIX}
+CONFIGURE_ARGS+= PWLIBDIR=${PREFIX:Q}
BUILD_TARGET= opt apps
-MAKE_ENV+= PWLIBDIR=${PREFIX}/share/pwlib OPENH323DIR=${WRKSRC}
+MAKE_ENV+= PWLIBDIR=${PREFIX}/share/pwlib OPENH323DIR=${WRKSRC:Q}
MAKE_ENV+= SYSLIBDIR=${PREFIX}/lib
post-extract:
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 3ec0e02b879..fe45eae6b33 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/11/03 14:31:19 salo Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:48 rillig Exp $
#
DISTNAME= openvpn-2.0.5
@@ -11,7 +11,7 @@ HOMEPAGE= http://openvpn.net/
COMMENT= Easy-to-use SSL VPN daemon
GNU_CONFIGURE= yes
-USE_TOOLS= grep:run
+USE_TOOLS+= grep:run
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_OLD_DES_API= yes
diff --git a/net/p5-Net-IPv4Addr/Makefile b/net/p5-Net-IPv4Addr/Makefile
index 64eba423ca7..cb410aac30c 100644
--- a/net/p5-Net-IPv4Addr/Makefile
+++ b/net/p5-Net-IPv4Addr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/13 07:56:40 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:48 rillig Exp $
DISTNAME= Net-IPv4Addr-0.10
PKGNAME= p5-${DISTNAME}
@@ -6,7 +6,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Net/}
MAINTAINER= adrianp@NetBSD.org
-COMMENT= Perl extension for manipulating IPv4 addresses.
+COMMENT= Perl extension for manipulating IPv4 addresses
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/net/p5-POE-Component-Client-Ident/Makefile b/net/p5-POE-Component-Client-Ident/Makefile
index c1457937397..7b3aba4a05d 100644
--- a/net/p5-POE-Component-Client-Ident/Makefile
+++ b/net/p5-POE-Component-Client-Ident/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/08/06 06:19:28 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:48 rillig Exp $
#
DISTNAME= POE-Component-Client-Ident-0.7
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=POE/}
MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://search.cpan.org/~bingos/POE-Component-Client-Ident-0.7/
-COMMENT= Non-blocking ident lookups to your sessions.
+COMMENT= Non-blocking ident lookups to your sessions
DEPENDS+= p5-POE-[0-9]*:../../devel/p5-POE
diff --git a/net/pchar/Makefile b/net/pchar/Makefile
index 6f2f317f7fa..d5f97927bdd 100644
--- a/net/pchar/Makefile
+++ b/net/pchar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/17 03:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:48 rillig Exp $
DISTNAME= pchar-1.4
PKGREVISION= 4
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-ipv6
.endif
.if ${OPSYS} == "NetBSD"
-.include "../net-snmp/buildlink3.mk"
+.include "../../net/net-snmp/buildlink3.mk"
CONFIGURE_ARGS+= --with-snmp=${BUILDLINK_PREFIX.net-snmp}
LIBS+= -lsnmp -lcrypto -ldes
diff --git a/net/php-ftp/Makefile b/net/php-ftp/Makefile
index 41c6e15f575..a928c549b66 100644
--- a/net/php-ftp/Makefile
+++ b/net/php-ftp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:48 rillig Exp $
MODNAME= ftp
-PKGREVISION= # empty
CATEGORIES+= net
COMMENT= PHP extension for FTP access
diff --git a/net/php-snmp/Makefile b/net/php-snmp/Makefile
index acadaa5470b..32bf74d6322 100644
--- a/net/php-snmp/Makefile
+++ b/net/php-snmp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:48 rillig Exp $
MODNAME= snmp
CATEGORIES+= net
-PKGREVISION= # empty
COMMENT= PHP extension for SNMP
diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile
index c4151d8e550..36dd0c85c25 100644
--- a/net/php-sockets/Makefile
+++ b/net/php-sockets/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:48 rillig Exp $
MODNAME= sockets
CATEGORIES+= net
-PKGREVISION= # empty
COMMENT= PHP extension for sockets support
diff --git a/net/php-xmlrpc/Makefile b/net/php-xmlrpc/Makefile
index e945b183b19..b0c4b7bb929 100644
--- a/net/php-xmlrpc/Makefile
+++ b/net/php-xmlrpc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/12/03 18:53:57 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:48 rillig Exp $
MODNAME= xmlrpc
CATEGORIES+= net
-PKGREVISION= # empty
COMMENT= PHP extension for XML-RPC support
HOMEPAGE= http://xmlrpc-epi.sourceforge.net/
diff --git a/net/php-yp/Makefile b/net/php-yp/Makefile
index b80c56ef88b..84ea7f3939e 100644
--- a/net/php-yp/Makefile
+++ b/net/php-yp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/12/03 19:50:31 jdolecek Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:48 rillig Exp $
MODNAME= yp
CATEGORIES+= net
-PKGREVISION= # empty
COMMENT= PHP extension for YP domain support
# yp extension has been unbundled in PHP 5.1.1, it's only available
diff --git a/net/ppp-lzs/Makefile b/net/ppp-lzs/Makefile
index f30e0674379..12df972b200 100644
--- a/net/ppp-lzs/Makefile
+++ b/net/ppp-lzs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:48 rillig Exp $
DISTNAME= ppp-lzs-1.2
CATEGORIES= net
@@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-*
.include "../../mk/bsd.prefs.mk"
-MAKE_ENV+= NETBSDSRCDIR="${NETBSDSRCDIR}"
+MAKE_ENV+= NETBSDSRCDIR=${NETBSDSRCDIR:Q}
MAKE_ENV+= S="${NETBSDSRCDIR}/sys"
MESSAGE_SUBST+= PREFIX="${PREFIX}"
diff --git a/net/pppd/Makefile b/net/pppd/Makefile
index e326e45b873..5c622b8b190 100644
--- a/net/pppd/Makefile
+++ b/net/pppd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:25 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:48 rillig Exp $
DISTNAME= ppp-${PPPD_VERSION}
PKGNAME= ${DISTNAME:S/ppp/&d/}
@@ -17,9 +17,9 @@ USE_PKGINSTALL= yes
ONLY_FOR_PLATFORM+= NetBSD-*-* Linux-*-*
PKG_SYSCONFSUBDIR= ppp
-CONFIGURE_ENV+= PREFIX=${PREFIX} PKGSYSCONFDIR=${PKG_SYSCONFDIR}
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q} PKGSYSCONFDIR=${PKG_SYSCONFDIR:Q}
PPPD_VERSION= 2.4.3
-PLIST_SUBST+= PPPD_VERSION=${PPPD_VERSION}
+PLIST_SUBST+= PPPD_VERSION=${PPPD_VERSION:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/net/proxycheck/Makefile b/net/proxycheck/Makefile
index 8716087c9d0..423f6a448e8 100644
--- a/net/proxycheck/Makefile
+++ b/net/proxycheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:48 rillig Exp $
#
DISTNAME= proxycheck-0.49a
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.corpit.ru/mjt/proxycheck.html
COMMENT= Tester for open (promiscuous) proxy systems
HAS_CONFIGURE= YES
-MAKE_FLAGS+= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_FLAGS+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q}
INSTALLATION_DIRS= bin man/man1
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index 14c6e00bbcd..af2b1d42b79 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:22 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:48 rillig Exp $
#
DISTNAME= pyorbit-2.0.1
@@ -16,10 +16,10 @@ USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= pyorbit-2.pc.in
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_VERSIONS_ACCEPTED= 24 23 22
-BUILDLINK_DEPENDS.python22= python22>=2.2.2nb2
+BUILDLINK_DEPENDS.python22+= python22>=2.2.2nb2
.include "../../net/ORBit2/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/net/py-mimelib/Makefile b/net/py-mimelib/Makefile
index d7bbd0b3136..91e36c93bc0 100644
--- a/net/py-mimelib/Makefile
+++ b/net/py-mimelib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:58 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:48 rillig Exp $
#
DISTNAME= email-2.5
@@ -24,4 +24,4 @@ NOT21= "@comment "
.else
NOT21= #empty
.endif
-PLIST_SUBST+= NOT21=${NOT21}
+PLIST_SUBST+= NOT21=${NOT21:Q}
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index 8da4eadfe64..4dc0d9d8850 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:59 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:48 rillig Exp $
#
DISTNAME= ZSI-1.5.0
@@ -13,7 +13,7 @@ COMMENT= SOAP implementation
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
#DIST_SUBDIR= py-ZSI
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index e9326f861d7..ec0006f723e 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:59 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:48 rillig Exp $
#
DISTNAME= pygopherd_2.0.9
@@ -32,8 +32,8 @@ EGFILES+= ${WRKSRC}/conf/mime.types
EGFILES+= ${WRKSRC}/conf/pygopherd.conf
RCD_SCRIPTS= pygopherd
-FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR}
-FILES_SUBST+= PYTHONBIN=${PYTHONBIN}
+FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q}
+FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q}
PYTHON_PATCH_SCRIPTS= bin/pygopherd
PYTHON_PATCH_SCRIPTS+= pygopherd/GopherExceptionsTest.py
diff --git a/net/qadsl/Makefile b/net/qadsl/Makefile
index e5b269b2f24..f9a6f5154e1 100644
--- a/net/qadsl/Makefile
+++ b/net/qadsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:48 rillig Exp $
#
DISTNAME= qadsl-final-1.2
@@ -10,12 +10,12 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://qba.linuxsweden.nu/
COMMENT= Login software for Swedish Telia ADSL/Comhem cable Internet users
-LIBS.SunOS= -lnsl -lsocket
+LIBS.SunOS+= -lnsl -lsocket
MANCOMPRESSED= yes
-MAKE_ENV+= LIBS="${LIBS}"
-MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
+MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
INSTALLATION_DIRS= man/man8 sbin
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 3ebc5a5ddc2..4ead4467dd6 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:16 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:48 rillig Exp $
# Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
#
@@ -39,7 +39,6 @@ PKG_USERS= quagga:quagga
CONF_FILES_PERMS+= ${PREFIX}/share/examples/quagga/log_syslog.conf \
${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600
.endfor
-.undef _file_
BUILD_DEFS+= USE_ZEBRA_VTYSH USE_ZEBRA_OSPF_OPAQUELSA
USE_ZEBRA_VTYSH?= YES
@@ -68,7 +67,6 @@ RCD_SCRIPTS+= ospf6d ripngd
CONF_FILES_PERMS+= ${PREFIX}/share/examples/quagga/log_syslog.conf \
${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600
.endfor
-.undef _file_
.else
CONFIGURE_ARGS+= --disable-ospf6d
CONFIGURE_ARGS+= --disable-ripngd
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index d5cc5545c2b..1a96129a367 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/19 04:25:43 kristerw Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:48 rillig Exp $
DISTNAME= radiusd-cistron-1.6.7
PKGREVISION= 1
@@ -33,7 +33,6 @@ CONF_FILES=
naslist.sample naspasswd.sample realms.sample users.sample
CONF_FILES+= ${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//}
.endfor
-.undef cfile
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radiusd-cistron
diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index b948b8d5470..147bee8ca8b 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/26 08:42:09 abs Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= freerdist-0.92
@@ -13,7 +13,7 @@ COMMENT= Network file distribution/synchronisation utility
RDIST6_NAME= rdist6
INSTALL_TARGET= install install.man
-MAKE_ENV+= RDIST6_NAME=${RDIST6_NAME}
+MAKE_ENV+= RDIST6_NAME=${RDIST6_NAME:Q}
CONFLICTS= rdist6-[0-9]*
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index 3190fb8a0b8..4682ee858e3 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= rinetd
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.boutell.com/rinetd/
COMMENT= Internet redirection server
-WRKSRC= ${WRKDIR}/${PKGNAME:S|nb*||}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
NO_CONFIGURE= yes
USE_PKGINSTALL= yes
BUILD_TARGET= rinetd
diff --git a/net/ripe-whois-tools/Makefile b/net/ripe-whois-tools/Makefile
index 73eae51c530..feca3ab1a98 100644
--- a/net/ripe-whois-tools/Makefile
+++ b/net/ripe-whois-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/10/12 07:10:57 seb Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= ripe-whois-tools-2.4
@@ -11,9 +11,9 @@ COMMENT= RIPE WHOIS client and tools
WRKSRC= ${WRKDIR}
-LIBS.NetBSD= -lcrypt
-LIBS.SunOS= -lnsl -lsocket
+LIBS.NetBSD+= -lcrypt
+LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS="${LIBS}"
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile
index c3a205541cb..a3d57b7677a 100644
--- a/net/ripe-whois/Makefile
+++ b/net/ripe-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:16 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= ripe-whois-3.1.1v6
@@ -13,7 +13,7 @@ COMMENT= RIPE very simple and generic whois client
WRKSRC= ${WRKDIR}/whois-3.1.1v6
GNU_CONFIGURE= YES
USE_TOOLS+= perl
-MAKE_ENV+= PERL5=${PERL5}
+MAKE_ENV+= PERL5=${PERL5:Q}
BUILD_DEFS+= USE_INET6
ASCII_DOC= ripe-223.txt
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 10df2e12acb..4bd62dcc171 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/11/08 16:57:40 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:49 rillig Exp $
DISTNAME= rp-pppoe-3.5
PKGREVISION= 2
@@ -18,8 +18,8 @@ USE_PKGINSTALL= YES
USE_TOOLS+= id
GNU_CONFIGURE= YES
CONFIGURE_DIRS= src
-CONFIGURE_ENV+= PPPD=${PPPD}
-CONFIGURE_ENV+= ID="${TOOLS_ID}"
+CONFIGURE_ENV+= PPPD=${PPPD:Q}
+CONFIGURE_ENV+= ID=${TOOLS_ID:Q}
BUILD_DIRS= src
RCD_SCRIPTS= pppoe
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 948f1805cbe..eecc237f690 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.150 2005/11/15 13:58:14 jlam Exp $
+# $NetBSD: Makefile,v 1.151 2005/12/05 20:50:49 rillig Exp $
.include "Makefile.mirrors"
@@ -38,14 +38,14 @@ SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samba
SAMBA_VARDIR?= ${VARBASE}
WINBINDD_RCD_SCRIPT= # empty
-FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR}
-FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
-FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
-FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR}
-FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
-FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR}
-FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR}
-FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT}
+FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR:Q}
+FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR:Q}
+FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR:Q}
+FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR:Q}
+FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q}
+FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR:Q}
+FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR:Q}
+FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q}
CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR}
diff --git a/net/scamper/Makefile b/net/scamper/Makefile
index 927b6b5a469..729aee8dea1 100644
--- a/net/scamper/Makefile
+++ b/net/scamper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/11/02 15:32:38 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= scamper-cvs-20050529
@@ -12,7 +12,7 @@ COMMENT= Dual-stack traceroute software
INSTALLATION_DIRS=bin
-MAKE_FLAGS= WITH_DEBUG=yes # recommended by the the software developer
+MAKE_FLAGS+= WITH_DEBUG=yes # recommended by the the software developer
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/scamper ${PREFIX}/bin
diff --git a/net/skype/Makefile b/net/skype/Makefile
index dcfc47e6672..be78c2e56c6 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/02 20:11:47 abs Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= skype_staticQT-1.2.0.18
@@ -29,7 +29,7 @@ ONLY_FOR_PLATFORM= *-*-i386
NO_CONFIGURE= yes
CHECK_SHLIBS= no
USE_DIRS+= xdg-1.1
-WRKSRC= ${WRKDIR}/${PKGNAME}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
RESTRICTED= "Redistribution not allowed yet."
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 09eee2c870f..9dc127f8cf7 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/10/28 21:43:18 adrianp Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:49 rillig Exp $
DISTNAME= smokeping-2.0.4
CATEGORIES= net
@@ -8,7 +8,7 @@ MAINTAINER= bouyer@NetBSD.org
HOMEPAGE= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/index.en.html
COMMENT= Latency/packet loss monitoring/graphing tool
-DEPENDS= rrdtool>=1.0:../../databases/rrdtool
+DEPENDS+= rrdtool>=1.0:../../databases/rrdtool
DEPENDS+= fping>=2.4b2:../../net/fping
DEPENDS+= p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5
DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index 57b5f5edb11..80f4031afae 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/10/18 15:15:04 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= snort-2.4.3
@@ -25,7 +25,7 @@ SNORT_USER?= snort
SNORT_GROUP?= snort
PKG_GROUPS= ${SNORT_GROUP}
PKG_USERS= ${SNORT_USER}:${SNORT_GROUP}::Snort\ user
-FILES_SUBST+= SNORT_USER="${SNORT_USER}" SNORT_GROUP="${SNORT_GROUP}"
+FILES_SUBST+= SNORT_USER=${SNORT_USER:Q} SNORT_GROUP=${SNORT_GROUP:Q}
OWN_DIRS_PERMS= ${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
CONF_FILES= ${EGDIR}/snort.conf.default \
@@ -50,7 +50,7 @@ CONF_FILES+= ${EGDIR}/unicode.map \
EGDIR= ${PREFIX}/share/examples/snort
SNORTDIR= ${PREFIX}/share/snort
-SUBST_CLASSES= paths
+SUBST_CLASSES+= paths
SUBST_STAGE.paths= post-patch
SUBST_FILES.paths= etc/snort.conf src/snort.c
SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g" \
diff --git a/net/socks4/Makefile b/net/socks4/Makefile
index 9ba4f0f921d..fd9a5eb915a 100644
--- a/net/socks4/Makefile
+++ b/net/socks4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/10/06 21:18:24 bad Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= export.socks.cstc.4.2.2
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/socks.cstc.4.2
USE_PKGINSTALL= yes
-MAKE_ENV+= OPTIMIZE="${CFLAGS}"
+MAKE_ENV+= OPTIMIZE=${CFLAGS:M*:Q}
EGDIR= ${PREFIX}/share/examples/socks4
CONF_FILES= ${EGDIR}/socks.conf ${PKG_SYSCONFDIR}/socks.conf
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 7a9a5a10542..d69c510654c 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/10/23 21:49:01 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:49 rillig Exp $
DISTNAME= socks5-v1_0r2
PKGNAME= socks5-1.0.2
@@ -30,7 +30,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/socks5-v1.0r2
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libconffile=${PREFIX}/etc/libsocks5.conf \
+CONFIGURE_ARGS+= --with-libconffile=${PREFIX}/etc/libsocks5.conf \
--with-srvconffile=${PREFIX}/etc/socks5.conf \
--with-srvpidfile=/var/run/socks5.pid \
--with-srvidtfile=/var/run/socks5.ident \
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index 82ea2ecb334..85d08a120f2 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/18 11:29:10 kristerw Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:49 rillig Exp $
DISTNAME= speedtouch-1.3.1
PKGREVISION= 3
@@ -27,7 +27,7 @@ USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
RCD_SCRIPTS= adsl
.include "../../mk/pthread.buildlink3.mk"
diff --git a/net/spread/Makefile b/net/spread/Makefile
index c385f5ac6f8..106dd0d2518 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:16 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= spread-src-3.17.3
@@ -15,15 +15,15 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_TOOLS+= perl
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/spread
-MAKE_FLAGS= LD=${CC:Q}
+CONFIGURE_ARGS+= --includedir=${PREFIX:Q}/include/spread
+MAKE_FLAGS+= LD=${CC:Q}
SPREAD_USER= spread
SPREAD_GROUP= spread
-FILES_SUBST+= SPREAD_USER=${SPREAD_USER}
-FILES_SUBST+= SPREAD_GROUP=${SPREAD_GROUP}
-FILES_SUBST+= RUNTIME_DIR=${RUNTIME_DIR}
+FILES_SUBST+= SPREAD_USER=${SPREAD_USER:Q}
+FILES_SUBST+= SPREAD_GROUP=${SPREAD_GROUP:Q}
+FILES_SUBST+= RUNTIME_DIR=${RUNTIME_DIR:Q}
BUILD_DEFS+= SPREAD_USER SPREAD_GROUP
diff --git a/net/stripes/Makefile b/net/stripes/Makefile
index da81a070e20..6f23a86c699 100644
--- a/net/stripes/Makefile
+++ b/net/stripes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:17 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:49 rillig Exp $
#
DISTNAME= stripes-2.1
@@ -14,7 +14,7 @@ DEPENDS+= p5-Net-Telnet>=3.02:../../net/p5-Net-Telnet
PKG_SYSCONFSUBDIR?= httpd
BUILD_TARGET= all
-MAKE_FLAGS+= DEST=${PREFIX} PERL=${PERL5} \
+MAKE_FLAGS+= DEST=${PREFIX:Q} PERL=${PERL5:Q} \
CONFIGFILE=${PKG_SYSCONFDIR}/lg.conf
USE_TOOLS+= perl:run
diff --git a/net/tcpdstat/Makefile b/net/tcpdstat/Makefile
index 9eca89a2171..1ca9d4098cf 100644
--- a/net/tcpdstat/Makefile
+++ b/net/tcpdstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/01 18:45:32 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:49 rillig Exp $
DISTNAME= tcpd-tools-0.8
PKGNAME= tcpdstat-0.8
@@ -11,6 +11,6 @@ COMMENT= Analyze tcpdump output
NOT_FOR_PLATFORM= Interix-*-*
WRKSRC= ${WRKDIR}/${DISTNAME}/tcpdstat
-MAKE_ENV= BINDIR=${PREFIX}/bin
+MAKE_ENV+= BINDIR=${PREFIX:Q}/bin
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index dc5cd21b330..64036025d32 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:00 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:49 rillig Exp $
DISTNAME= tf-40s1
PKGNAME= tf-4.0s1
@@ -13,7 +13,7 @@ COMMENT= Popular programmable MUD client, with macro support and more
MAKEFILE= ${WRKSRC}/unix/Makefile
-MAKE_ENV= TFVER="${DISTNAME:S/^tf-//}"
+MAKE_ENV+= TFVER=${DISTNAME:S/^tf-//:Q}
PATCH_SITES= http://discworld.imaginary.com/external/taffyd/
PATCHFILES= tf-40s1-mccp-patch.gz
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 41884e771e0..a684bac6a87 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/09/27 19:53:41 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:50 rillig Exp $
#
DISTNAME= tor-0.1.0.15
@@ -37,8 +37,8 @@ RCD_SCRIPT= tor
INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
-FILES_SUBST+= PKG_HOME=${PKG_HOME}
-FILES_SUBST+= TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP}
+FILES_SUBST+= PKG_HOME=${PKG_HOME:Q}
+FILES_SUBST+= TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q}
.if !empty(PKGSRC_COMPILER:Mmipspro)
CFLAGS+= -c99
diff --git a/net/torrentutils/Makefile b/net/torrentutils/Makefile
index 5d48aba3bf1..010c0f8d3fb 100644
--- a/net/torrentutils/Makefile
+++ b/net/torrentutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:17 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:50 rillig Exp $
#
DISTNAME= torrentutils-0.3.0
@@ -14,7 +14,7 @@ DEPENDS+= bash-[0-9]*:../../shells/bash
DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
-USE_TOOLS= gmake perl:run
+USE_TOOLS+= gmake perl:run
REPLACE_PERL= torrenttool.in
post-build:
diff --git a/net/traceroute-as/Makefile b/net/traceroute-as/Makefile
index ff8859537bc..7e31c34132b 100644
--- a/net/traceroute-as/Makefile
+++ b/net/traceroute-as/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:22:22 agc Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:50 rillig Exp $
#
DISTNAME= traceroute_991603.tar
@@ -19,9 +19,9 @@ PKG_SYSDEFS= -DSYSV
PKG_LIBRARIES= -lresolv -lsocket -lnsl
.endif
-MAKE_FLAGS+= CC=${CC:Q} PKG_CFLAGS=${CFLAGS:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q}
+MAKE_FLAGS+= CC=${CC:Q} PKG_CFLAGS=${CFLAGS:M*:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q}
MAKE_FLAGS+= PKG_LIBRARIES=${PKG_LIBRARIES:Q}
INSTALL_PROGRAM_SUID= ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555
-MAKE_ENV+= BSD_INSTALL_PROGRAM_SUID="${INSTALL_PROGRAM_SUID}"
+MAKE_ENV+= BSD_INSTALL_PROGRAM_SUID=${INSTALL_PROGRAM_SUID:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index a9309c784dd..3d18eeb5cf7 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/27 12:56:24 tonio Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:50 rillig Exp $
DISTNAME= unison-2.17.1
PKGREVISION= 1
@@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_TOOLS+= gmake
MAKE_FLAGS+= CFLAGS="" UISTYLE=text
-MAKE_ENV+= HOME=${WRKDIR}
+MAKE_ENV+= HOME=${WRKDIR:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 5bd97080f58..2b8fe7ba511 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/10/27 12:54:06 tonio Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:50 rillig Exp $
DISTNAME= unison-2.13.16
PKGREVISION= 1
@@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_TOOLS+= gmake
MAKE_FLAGS+= CFLAGS="" UISTYLE=text
-MAKE_ENV+= HOME=${WRKDIR}
+MAKE_ENV+= HOME=${WRKDIR:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/net/userppp/Makefile b/net/userppp/Makefile
index ca6eb923663..ee623daf0af 100644
--- a/net/userppp/Makefile
+++ b/net/userppp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:01 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:50 rillig Exp $
DISTNAME= ppp-001107.src
PKGNAME= userppp-001107
@@ -31,7 +31,7 @@ post-patch:
USERPPP_GROUP?= network
BUILD_DEFS+= USERPPP_GROUP
-MAKE_ENV+= USERPPP_GROUP="${USERPPP_GROUP}"
+MAKE_ENV+= USERPPP_GROUP=${USERPPP_GROUP:Q}
USE_PKGINSTALL= yes
PKG_GROUPS= ${USERPPP_GROUP}
diff --git a/net/wap-utils/Makefile b/net/wap-utils/Makefile
index cf423cadb27..71dc8f5b585 100644
--- a/net/wap-utils/Makefile
+++ b/net/wap-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/10/28 22:01:47 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:50 rillig Exp $
#
DISTNAME= ap-utils-1.3.2
@@ -15,8 +15,8 @@ COMMENT= Wireless access points UNIX management tool
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
-INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
+INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
diff --git a/net/whoson/Makefile b/net/whoson/Makefile
index 9c323a16f33..3972387fe0e 100644
--- a/net/whoson/Makefile
+++ b/net/whoson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:02 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:50 rillig Exp $
#
DISTNAME= whoson-2.03
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
WHOSOND_CHROOT?= ${VARBASE}/chroot/whosond
CONFIGURE_ARGS+= --with-config="${PKG_SYSCONFDIR}/whoson.conf"
-FILES_SUBST+= CHROOTDIR=${WHOSOND_CHROOT}
+FILES_SUBST+= CHROOTDIR=${WHOSOND_CHROOT:Q}
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
diff --git a/net/wimon/Makefile b/net/wimon/Makefile
index ebedfb59ec7..0703e7cb9ff 100644
--- a/net/wimon/Makefile
+++ b/net/wimon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:02 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:50 rillig Exp $
#
DISTNAME= wimon-0.3
@@ -14,8 +14,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* OpenBSD-*-*
# 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]*
+NOT_FOR_PLATFORM= NetBSD-0*-* NetBSD-1.[012345]*-* NetBSD-1.6[-_.]*-*
+NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
WRKSRC= ${WRKDIR}/wimon
diff --git a/net/wistumbler2/Makefile.common b/net/wistumbler2/Makefile.common
index f24840cd1a2..538767bb311 100644
--- a/net/wistumbler2/Makefile.common
+++ b/net/wistumbler2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/05/25 14:47:05 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:50:50 rillig Exp $
#
DISTNAME= wistumbler2-2.0pre10
@@ -20,7 +20,7 @@ CONFLICTS+= wistumbler-[0-9]*
HAS_CONFIGURE= YES
USE_PKGINSTALL= YES
-CONFIGURE_ENV+= PREFIX=${PREFIX}
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
CONF_FILES= ${PREFIX}/share/examples/wistumbler2/wistumbler2.conf \
${PKG_SYSCONFDIR}/wistumbler2.conf
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 7e6327faed5..1329acca98c 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:50 rillig Exp $
DISTNAME= wu-ftpd-2.6.2
PKGREVISION= 3
@@ -47,9 +47,9 @@ DIST_SUBDIR= wu-ftpd
CFLAGS+= -DHAVE_SYS_MOUNT
.endif
-MAKE_ENV+= INSTALL="${INSTALL}"
-MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}"
+MAKE_ENV+= INSTALL=${INSTALL:Q}
+MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
+MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
+MAKE_ENV+= INSTALL_MAN=${INSTALL_MAN:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 8d618eff52d..d5b0cd6b96a 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/10/16 12:58:37 tonio Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:50 rillig Exp $
#
DISTNAME= xipdump-1.5.4
@@ -17,7 +17,7 @@ PLIST_SRC= ${WRKDIR}/PLIST
USE_X11BASE= yes
GNU_CONFIGURE= yes
CFLAGS+= -I${PREFIX}/include ${LIBNET_CFLAGS_CMD:sh}
-LIBS= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lnet
+LIBS+= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lnet
LIBNET_CFLAGS_CMD= ${BUILDLINK_PREFIX.libnet}/bin/libnet-config --defines
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 8fb98e3ed63..11e75a276fa 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.70 2005/12/05 20:50:50 rillig Exp $
# Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
DISTNAME= zebra-0.95
@@ -24,7 +24,7 @@ CONF_FILES= ${EGDIR}/bgpd.conf.sample ${PKG_SYSCONFDIR}/bgpd.conf \
${EGDIR}/zebra.conf.sample ${PKG_SYSCONFDIR}/zebra.conf
# with optimization, the timer/scheduler (esp. for MRT dump rotation) appears
# to have problems.
-CFLAGS= -O0
+CFLAGS+= -O0
CONFLICTS+= quagga-[0-9]*
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 9ee5b1b8b92..6987dd79844 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2005/11/22 16:14:49 tron Exp $
+# $NetBSD: Makefile,v 1.74 2005/12/05 20:50:50 rillig Exp $
DISTNAME= inn-2.4.1
PKGREVISION= 8
@@ -16,7 +16,7 @@ CONFLICTS+= libradius-[0-9]* nntpclnt-[0-9]*
.include "Makefile.common"
BUILD_DEFS+= USE_INET6
BUILD_DEFS+= INN_DATA_DIR INN_USER INN_GROUP
-FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR}
+FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR:Q}
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
@@ -33,12 +33,12 @@ CONFIGURE_ARGS+= --enable-setgid-inews \
--with-spool-dir=${INN_SPOOL} \
--with-news-user=${INN_USER} \
--with-news-group=${INN_GROUP}
-CONFIGURE_ENV+= _PATH_PERL=${PERL5}
-CONFIGURE_ENV+= _PATH_AWK="${TOOLS_AWK}"
-CONFIGURE_ENV+= _PATH_EGREP="${TOOLS_EGREP}"
-CONFIGURE_ENV+= _PATH_SED="${TOOLS_SED}"
-CONFIGURE_ENV+= _PATH_SH="${TOOLS_SH}"
-CONFIGURE_ENV+= _PATH_SORT="${TOOLS_SORT}"
+CONFIGURE_ENV+= _PATH_PERL=${PERL5:Q}
+CONFIGURE_ENV+= _PATH_AWK=${TOOLS_AWK:Q}
+CONFIGURE_ENV+= _PATH_EGREP=${TOOLS_EGREP:Q}
+CONFIGURE_ENV+= _PATH_SED=${TOOLS_SED:Q}
+CONFIGURE_ENV+= _PATH_SH=${TOOLS_SH:Q}
+CONFIGURE_ENV+= _PATH_SORT=${TOOLS_SORT:Q}
CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q}
USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 18e6663c85e..8b41853dde6 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/08/23 11:48:50 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:50 rillig Exp $
DISTNAME= leafnode-1.11.3.rel
PKGNAME= ${DISTNAME:S/.rel//}
@@ -30,10 +30,10 @@ LEAFNODE_HOME?= ${INN_DATA_DIR}
BUILD_DEFS+= USE_INET6
-FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL}
-FILES_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR}
-FILES_SUBST+= LEAFNODE_LOCKDIR=${LEAFNODE_LOCKDIR}
-FILES_SUBST+= LEAFNODE_HOME=${LEAFNODE_HOME}
+FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL:Q}
+FILES_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR:Q}
+FILES_SUBST+= LEAFNODE_LOCKDIR=${LEAFNODE_LOCKDIR:Q}
+FILES_SUBST+= LEAFNODE_HOME=${LEAFNODE_HOME:Q}
MESSAGE_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR}
GNU_CONFIGURE= yes
diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile
index 0fbdffdd2b2..46f3a3e0215 100644
--- a/news/nntpclnt/Makefile
+++ b/news/nntpclnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:50 rillig Exp $
DISTNAME= nntpclnt-1.6.1
PKGREVISION= 5
@@ -20,7 +20,7 @@ PKG_GROUPS= news
USE_PKGINSTALL= yes
PKG_SYSCONFSUBDIR= nntp
-PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/parallel/GridSim/Makefile b/parallel/GridSim/Makefile
index 345557d2b51..83bc01da4eb 100644
--- a/parallel/GridSim/Makefile
+++ b/parallel/GridSim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:50 rillig Exp $
#
DISTNAME= gridsimtoolkit-3.0
@@ -12,7 +12,7 @@ MAINTAINER= jschauma@NetBSD.org
HOMEPAGE= http://www.gridbus.org/gridsim/
COMMENT= Toolkit for simulation of parallel systems
-USE_JAVA2= run
+USE_JAVA2= 1.4
PKG_JVMS_ACCEPTED= sun-jdk14 jdk14
NO_BUILD= yes
diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile
index 6380e7763c1..f2dc91e2c4a 100644
--- a/parallel/glunix/Makefile
+++ b/parallel/glunix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/29 11:25:12 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:51 rillig Exp $
DISTNAME= glunix-release-1-0a
PKGNAME= glunix-1.0a
@@ -30,9 +30,9 @@ MESSAGE_SUBST+= NOW_ROOT=${NOW_ROOT}
FLAGS+=-DL_ENDIAN
.endif
-MAKE_ENV+= OPSYS=${OPSYS} ARCH=${MACHINE_ARCH} NOW_ROOT=${NOW_ROOT}
-MAKE_ENV+= PORTSDIR=${PKGDIR} WRKDIR=${WRKDIR} FLAGS="${FLAGS}"
-MAKE_ENV+= SSH=${SSH}
+MAKE_ENV+= OPSYS=${OPSYS:Q} ARCH=${MACHINE_ARCH:Q} NOW_ROOT=${NOW_ROOT:Q}
+MAKE_ENV+= PORTSDIR=${PKGDIR:Q} WRKDIR=${WRKDIR:Q} FLAGS=${FLAGS:Q}
+MAKE_ENV+= SSH=${SSH:Q}
.if exists(/usr/sbin/user)
USER_CMD= /usr/sbin/user
diff --git a/parallel/glunix/distinfo b/parallel/glunix/distinfo
index 9c1a589ae32..d38731af170 100644
--- a/parallel/glunix/distinfo
+++ b/parallel/glunix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/05/29 14:38:32 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/12/05 20:50:51 rillig Exp $
SHA1 (glunix-release-1-0a.tar.gz) = 8c69f5252e00fc4143a088c9b555b5e0c5b350f8
RMD160 (glunix-release-1-0a.tar.gz) = a718ebe775b697ebae14ba3a277994dc6c5a4c8d
@@ -50,7 +50,7 @@ SHA1 (patch-br) = d013a9091c7270b83c76e80afb1178985bf35968
SHA1 (patch-bs) = b625e5fefd631e8277574efc5cfe1e7604751a30
SHA1 (patch-bt) = 328c06576c24a7fe4ce25ff4d816d4f51029023a
SHA1 (patch-bu) = 80ba6229ebbbe981bacaece312b3882541a7a276
-SHA1 (patch-bv) = 32df71b44baba4bb47d0cdf124f7d620c534309a
+SHA1 (patch-bv) = fbe100fa1a6bd8c3a4dd7c1ae401a129122537e1
SHA1 (patch-bw) = 3f42749265da2b783b429ca357ee5c0f6f67f371
SHA1 (patch-bx) = ed841b216f4d41ed2777081dbd0eaa6bb426ff09
SHA1 (patch-by) = 7f15f359d307ba064f7cc3d0ed98d0a8189eff39
diff --git a/parallel/glunix/patches/patch-bv b/parallel/glunix/patches/patch-bv
index 1a52c51a3d4..81a7fe01e5b 100644
--- a/parallel/glunix/patches/patch-bv
+++ b/parallel/glunix/patches/patch-bv
@@ -1,8 +1,8 @@
-$NetBSD: patch-bv,v 1.3 2005/05/29 14:38:33 wiz Exp $
+$NetBSD: patch-bv,v 1.4 2005/12/05 20:50:51 rillig Exp $
--- progs/glush/sh.sem.c.orig 1995-07-20 20:09:24.000000000 +0200
+++ progs/glush/sh.sem.c
-@@ -50,7 +50,7 @@ RCSID("$Id: sh.sem.c,v 1.1 1995/07/20 18
+@@ -50,7 +50,7 @@
#endif /* CLOSE_ON_EXEC */
#if defined(__sparc__) || defined(sparc)
diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 5de75c12284..503d5096e8e 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/07/16 01:19:17 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:51 rillig Exp $
DISTNAME= mpich-1.2.6
PKGREVISION= 1
@@ -25,7 +25,7 @@ MPI_RSH?= ssh
.include "../../mk/bsd.prefs.mk"
-CONFIGURE_ARGS= -prefix=${PREFIX}
+CONFIGURE_ARGS+= -prefix=${PREFIX}
CONFIGURE_ARGS+= -docdir=${PREFIX}/share/doc/mpi-ch
CONFIGURE_ARGS+= -htmldir=${PREFIX}/share/doc/html/mpi-ch
CONFIGURE_ARGS+= -opt=-O
@@ -35,16 +35,16 @@ CONFIGURE_ARGS+= --with-mpe
CONFIGURE_ARGS+= --disable-devdebug
CONFIGURE_ARGS+= --disable-f90
CONFIGURE_ARGS+= --disable-f90modules
-CONFIGURE_ENV+= sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+= PERL=${PERL5}
-CONFIGURE_ENV+= PERLFULLPATH=${PERL5}
+CONFIGURE_ENV+= sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ENV+= PERL=${PERL5:Q}
+CONFIGURE_ENV+= PERLFULLPATH=${PERL5:Q}
# build PATH in the config file is not a problem
CHECK_WRKREF_SKIP+= ${PREFIX}/share/examples/mpi-ch/perftest/config.system
.if ${OPSYS} == "NetBSD"
CONFIGURE_ARGS+= --with-arch=netbsd
-PLIST_SUBST+= MPICH_OPSYS="${LOWER_OPSYS}"
+PLIST_SUBST+= MPICH_OPSYS=${LOWER_OPSYS:Q}
.elif ${OPSYS} == "IRIX"
CONFIGURE_ARGS+= --with-arch=IRIX${ABI:S/32/N32/}
PLIST_SUBST+= MPICH_OPSYS="${OPSYS}${ABI:S/32/N32/}"
@@ -55,7 +55,7 @@ PLIST_SUBST+= MPICH_OPSYS="${OPSYS}${ABI:S/32/N32/}"
CONFIGURE_ARGS+= --disable-weak-symbols
.endif
-MAKE_ENV+= RSHCOMMAND="${MPI_RSH}"
+MAKE_ENV+= RSHCOMMAND=${MPI_RSH:Q}
BUILD_DEFS+= MPI_RSH
diff --git a/parallel/p5-Parallel-Pvm/Makefile b/parallel/p5-Parallel-Pvm/Makefile
index dac3883097d..6cd6e59f634 100644
--- a/parallel/p5-Parallel-Pvm/Makefile
+++ b/parallel/p5-Parallel-Pvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:51 rillig Exp $
#
DISTNAME= Parallel-Pvm-1.3.0
@@ -14,8 +14,8 @@ HOMEPAGE= http://www.epm.ornl.gov/pvm/pvm_home.html
COMMENT= Perl module for PVM (Parallel Virtual Machine)
PVM_ROOT?= ${LOCALBASE}/pvm3
-CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT} PVM_ARCH=${PVM_ARCH}
-MAKE_ENV+= PVM_ROOT=${PVM_ROOT} PVM_ARCH=${PVM_ARCH}
+CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT:Q} PVM_ARCH=${PVM_ARCH:Q}
+MAKE_ENV+= PVM_ROOT=${PVM_ROOT:Q} PVM_ARCH=${PVM_ARCH:Q}
PERL5_PACKLIST= auto/Parallel/Pvm/.packlist
MESSAGE_SUBST+= PVM_ROOT=${PVM_ROOT}
EXAMPLES_DIR= ${PREFIX}/share/examples/p5-Parallel-Pvm
diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile
index 2d38eaf8513..feaf264e663 100644
--- a/parallel/pvm3/Makefile
+++ b/parallel/pvm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/09/28 14:31:08 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:51 rillig Exp $
DISTNAME= pvm3.4.5
PKGNAME= pvm-3.4.5
@@ -22,12 +22,12 @@ USE_LANGUAGES= fortran
USE_LIBTOOL= yes
PVM_ROOT= ${WRKSRC}
-MAKE_ENV+= PVM_ROOT=${WRKSRC}
+MAKE_ENV+= PVM_ROOT=${WRKSRC:Q}
MAKE_ENV+= PVM_ARCH=
-MAKE_ENV+= SSH=${PVM_SSH}
-MAKE_ENV+= MKDIR="${MKDIR}"
+MAKE_ENV+= SSH=${PVM_SSH:Q}
+MAKE_ENV+= MKDIR=${MKDIR:Q}
MAKE_ENV+= PVMLIB_VER=3:4
-MAKE_ENV+= PVM_DIR=${PVM_DIR}
+MAKE_ENV+= PVM_DIR=${PVM_DIR:Q}
BUILD_TARGET= all install
# Set PVM_ARCH to the correct value for this machine platform.
diff --git a/parallel/pvm3/arch.mk b/parallel/pvm3/arch.mk
index 3de9e7e4067..bb1edd0018c 100644
--- a/parallel/pvm3/arch.mk
+++ b/parallel/pvm3/arch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: arch.mk,v 1.7 2005/04/28 23:11:14 jlam Exp $
+# $NetBSD: arch.mk,v 1.8 2005/12/05 20:50:51 rillig Exp $
#
.include "../../mk/bsd.prefs.mk"
@@ -34,5 +34,5 @@ _PVM_ARCH= # empty
.endif
PVM_ARCH= ${_PVM_OPSYS}${_PVM_ARCH}
-PLIST_SUBST+= PVM_ARCH=${PVM_ARCH}
-FILES_SUBST+= PVM_ARCH=${PVM_ARCH}
+PLIST_SUBST+= PVM_ARCH=${PVM_ARCH:Q}
+FILES_SUBST+= PVM_ARCH=${PVM_ARCH:Q}
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index 4fa91751586..d2dcb55e32d 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:50 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:51 rillig Exp $
#
DISTNAME= sge-5.3p6
@@ -17,11 +17,11 @@ USE_TOOLS+= gmake perl:run
CFLAGS+= -D${UPPER_OPSYS}
CONFIGURE_ENV+= REMOTE=sge
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
CONFIGURE_ARGS+= --with-grd=${SGE_BUILDARCH}
-PLIST_SUBST+= SGE_ARCH=${SGE_ARCH}
+PLIST_SUBST+= SGE_ARCH=${SGE_ARCH:Q}
MESSAGE_SUBST+= SGE_ROOT=${SGE_ROOT}
-MAKE_ENV+= PERL5=${PERL5}
+MAKE_ENV+= PERL5=${PERL5:Q}
USE_PKGINSTALL= YES
SGE_USER?= sgeadmin
@@ -67,7 +67,7 @@ SGE_BUILDARCH_cmd= ${ECHO} "${SGE_ARCH}" | ${TR} a-z A-Z
SGE_ARCH= darwin
SGE_BUILDARCH= DARWIN
.else
-PKG_FAIL_REASON= "SGE_ARCH and SGE_BUILDARCH need to be confgured for your OS"
+PKG_FAIL_REASON+= "SGE_ARCH and SGE_BUILDARCH need to be configured for your OS"
.endif
SGE_BUILDARCH?= ${SGE_BUILDARCH_cmd:sh}
diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile
index c44c4a97dfd..58bc8a081ad 100644
--- a/pkgtools/dfdisk/Makefile
+++ b/pkgtools/dfdisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/23 21:54:35 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:51 rillig Exp $
#
DISTNAME= dfdisk-1.0
@@ -17,7 +17,7 @@ USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples/dfdisk
CONF_FILES= ${EGDIR}/dfdisk.conf ${PKG_SYSCONFDIR}/dfdisk.conf
-FILES_SUBST+= PKGVERSION="${PKGVERSION}"
+FILES_SUBST+= PKGVERSION=${PKGVERSION:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index 01a4ae4d5cd..47dd7dd33b5 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/17 17:02:04 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:51 rillig Exp $
#
DISTNAME= pkg_filecheck-0.1
@@ -19,8 +19,8 @@ EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-FILES_SUBST+= X11PREFIX=${X11PREFIX}
-FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR}
+FILES_SUBST+= X11PREFIX=${X11PREFIX:Q}
+FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q}
CONF_FILES= ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \
${PKG_SYSCONFDIR}/pkg_filecheck.conf
diff --git a/pkgtools/pkg_install-info/Makefile b/pkgtools/pkg_install-info/Makefile
index e0b33df4a6e..3538c29ad9c 100644
--- a/pkgtools/pkg_install-info/Makefile
+++ b/pkgtools/pkg_install-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:51 rillig Exp $
#
DISTNAME= pkg_install-info-${VERSION}
@@ -21,7 +21,7 @@ NO_CHECKSUM= yes
# Otherwise use PKGREVISION if you need to change this package version.
VERSION= 4.5
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
INSTALLATION_DIRS= bin
diff --git a/pkgtools/pkg_select/Makefile b/pkgtools/pkg_select/Makefile
index 6266432ba7a..cd7674caf7c 100644
--- a/pkgtools/pkg_select/Makefile
+++ b/pkgtools/pkg_select/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/25 10:34:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:51 rillig Exp $
#
DISTNAME= pkg_select-20050817
@@ -32,7 +32,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/mirrors.ftp ${PREFIX}/share/pkg_select
${INSTALL_MAN} ${WRKSRC}/pkg_select.1 ${PREFIX}/man/man1
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= Makefile pkg_select.1
SUBST_SED.path= -e "s|/usr/pkgsrc|${PKGSRCDIR}|g" \
diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile
index b0f3846e228..7651570d1b7 100644
--- a/pkgtools/pkgclean/Makefile
+++ b/pkgtools/pkgclean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/17 22:30:09 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:51 rillig Exp $
DISTNAME= pkgclean-20051116
CATEGORIES= pkgtools
@@ -23,7 +23,7 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/pkgclean.sh ${PREFIX}/bin/pkgclean
${INSTALL_MAN} ${WRKSRC}/pkgclean.1 ${PREFIX}/man/man1/pkgclean.1
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= pkgclean.sh pkgclean.1
SUBST_SED.path+= -e 's,@SH@,${SH},g'
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index f4825e3251a..304e91ed353 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/08/06 06:19:29 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:50:51 rillig Exp $
#
DISTNAME= pkgdiff-0.118
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}
USE_LANGUAGES= # empty
USE_TOOLS+= perl:run
-MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR:Q}
+MAKE_ENV+= PKGSRCDIR=${_PKGSRCDIR:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile
index 8b1b8159d2c..0a58ef4c387 100644
--- a/pkgtools/pkgfind/Makefile
+++ b/pkgtools/pkgfind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/04 22:21:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:51 rillig Exp $
DISTNAME= pkgfind-20050804
CATEGORIES= pkgtools
@@ -25,7 +25,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pkgfind ${PREFIX}/bin/pkgfind
${INSTALL_MAN} ${WRKSRC}/pkgfind.1 ${PREFIX}/man/man1/pkgfind.1
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= pkgfind.c pkgfind.1
SUBST_SED.path= -e "s,/usr/pkgsrc,${PKGSRCDIR},g"
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index 27f1960d968..9974cb3d8b3 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:51 rillig Exp $
DISTNAME= rpm2pkg-2.1
PKGREVISION= 1
@@ -17,7 +17,7 @@ NO_CHECKSUM= YES
CPPFLAGS+= ${BUILDLINK_CPPFLAGS.bzip2} ${BUILDLINK_CPPFLAGS.rpm} \
${BUILDLINK_CPPFLAGS.zlib}
-LIBS= -lrpm -lintl -lz -lbz2
+LIBS+= -lrpm -lintl -lz -lbz2
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/shlock/Makefile b/pkgtools/shlock/Makefile
index 0de28d2a278..d5e80fbecac 100644
--- a/pkgtools/shlock/Makefile
+++ b/pkgtools/shlock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/08/08 21:40:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:51 rillig Exp $
#
DISTNAME= shlock-20020114
@@ -12,14 +12,14 @@ COMMENT= Shell utility to perform dot-locking
WRKSRC= ${WRKDIR}
EXTRACT_ONLY= #empty
-NO_CHECKSUM= #defined
+NO_CHECKSUM= yes
MANCOMPRESSED_IF_MANZ= yes
PLIST_SRC= ${WRKDIR}/PLIST
BUILD_DEFS+= MANINSTALL
MAKE_ENV+= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP}
-MAKE_ENV+= MANOWN=${BINOWN} MANGRP=${BINGRP}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
+MAKE_ENV+= MANOWN=${BINOWN:Q} MANGRP=${BINGRP:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 11632b0e826..f1deb0ac88d 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2005/07/25 20:50:25 reed Exp $
+# $NetBSD: Makefile,v 1.73 2005/12/05 20:50:51 rillig Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
# the x11-links dependency in buildlink3.mk to the correct version,
@@ -28,7 +28,7 @@ PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files} ${PLIST_SRC.dirs}
.include "../../mk/bsd.prefs.mk"
.if !exists(${X11BASE}/include/X11/X.h)
-PKG_FAIL_REASON= "${PKGNAME} requires X headers to be installed"
+PKG_FAIL_REASON+= "${PKGNAME} requires X headers to be installed"
.endif
.if ${OPSYS} == "IRIX"
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 890a0abae67..c737c40a96e 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:51 rillig Exp $
DISTNAME= xpkgwedge-1.14
CATEGORIES= pkgtools devel x11
@@ -52,12 +52,12 @@ do-build:
.if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg) || \
defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
X11TYPEFLAGS?= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-SUBST_CLASSES= fix
+SUBST_CLASSES+= fix
SUBST_STAGE.fix= post-patch
SUBST_FILES.fix= xpkgwedge.def
SUBST_SED.fix= -e "s|@X11TYPEFLAGS@|${X11TYPEFLAGS}|"
.else # X11_TYPE == XFree86 || X11_TYPE == xorg.
-SUBST_CLASSES= foo
+SUBST_CLASSES+= foo
SUBST_STAGE.foo= post-patch
SUBST_FILES.foo= xpkgwedge.def
SUBST_SED.foo= -e "s|\#define ExtraLoadFlags @X11TYPEFLAGS@||"
diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index ab465dcc529..7f1b573ce45 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/24 19:05:48 kristerw Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:52 rillig Exp $
DISTNAME= LPRng-3.8.28
PKGNAME= LPRng-core-3.8.28
@@ -26,8 +26,8 @@ CONFIGURE_ARGS+= --with-printcap_path="${PRINTCAP_PATH}"
CONFIGURE_ARGS+= --with-filterdir="${FILTER_DIR}"
CONFIGURE_ARGS+= --with-filter_path="${FILTER_PATH}"
CONFIGURE_ARGS+= --with-ld_library_path="${FILTER_LD_PATH}"
-CONFIGURE_ENV+= CHGRP="${TOOLS_CHGRP}"
-CONFIGURE_ENV+= CHOWN="${TOOLS_CHOWN}"
+CONFIGURE_ENV+= CHGRP=${TOOLS_CHGRP:Q}
+CONFIGURE_ENV+= CHOWN=${TOOLS_CHOWN:Q}
.include "options.mk"
@@ -48,7 +48,7 @@ INSTALL_FILE= ${WRKDIR}/INSTALL
USE_PKGINSTALL= YES
RCD_SCRIPTS= LPRng
-FILES_SUBST= CAT=${CAT:Q}
+FILES_SUBST+= CAT=${CAT:Q}
FILES_SUBST+= CHMOD=${CHMOD:Q}
FILES_SUBST+= CMP=${CMP:Q}
FILES_SUBST+= CP=${CP:Q}
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 2518d7ce904..e77b4bda736 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/07/09 17:34:42 kristerw Exp $
+# $NetBSD: Makefile,v 1.44 2005/12/05 20:50:52 rillig Exp $
DISTNAME= acroread # Overridden below
PKGNAME= acroread-4.05
@@ -33,20 +33,20 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-1.4[L-Z]-sparc \
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "i386")
-DEPENDS= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
DISTNAME= linux-ar-405
PLATFORM= intellinux
WRKSRC= ${WRKDIR}/ILINXR.install
. elif (${MACHINE_ARCH} == "alpha")
. if !exists(/emul/osf1/sbin/loader)
-PKG_FAIL_REASON= '${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)'
+PKG_FAIL_REASON+= '${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)'
. endif
DISTNAME= fdec-rs-405
PLATFORM= alphaosf
WRKSRC= ${WRKDIR}/AOSFRS.install
. elif (${MACHINE_ARCH} == "sparc")
. if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
+PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
. endif
DISTNAME= sunsparc-rs-405
WRKSRC= ${WRKDIR}/SSOLRS.install
@@ -64,13 +64,13 @@ WRKSRC= ${WRKDIR}/SSOLRS.install
PLATFORM= sparcsolaris
. endif # i86pc
- # Solaris sparc + x86:
-PREPEND_PATH= /bin # for "ed"
+# Solaris sparc + x86:
+PREPEND_PATH+= /bin # for "ed"
post-patch:
${CHMOD} -R o+rwx ${WRKSRC}
.endif # SunOS
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins
diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile
index 6aae628e454..47881881fd5 100644
--- a/print/acroread3/Makefile
+++ b/print/acroread3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:52 rillig Exp $
PKGNAME= acroread3-3.01
CATEGORIES= print
@@ -22,21 +22,21 @@ NO_BUILD= YES
.if ${OPSYS} == "NetBSD"
.if (${MACHINE_ARCH} == "i386")
-DEPENDS= suse_libc5>=6.3:../../emulators/${SUSE_DIR_PREFIX}_libc5
-DEPENDS= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_libc5>=6.3:../../emulators/${SUSE_DIR_PREFIX}_libc5
+DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
DISTNAME= acroread_linux_301
PLATFORM= intellinux
CHECK_SHLIBS= no
.elif (${MACHINE_ARCH} == "alpha")
.if !exists(/emul/osf1/sbin/loader)
-PKG_FAIL_REASON= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
+PKG_FAIL_REASON+= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
.endif
DISTNAME= acroread_osf_301
PLATFORM= alphaosf
LDD?= ${TRUE}
.elif (${MACHINE_ARCH} == "sparc")
.if !exists(/emul/sunos/usr/lib/ld.so)
-PKG_FAIL_REASON= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
+PKG_FAIL_REASON+= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
.endif
DISTNAME= acroread_sunos_301
PLATFORM= sparcsun
@@ -57,7 +57,7 @@ DISTNAME= ${PKGNAME}
LDD?= ${TRUE}
.endif
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
INSTALLATION_DIRS= bin
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index ed898a4634b..eab726730ab 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/10 16:46:37 recht Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:52 rillig Exp $
DISTNAME= acroread5 # Overridden below
PKGNAME= acroread5-5.10
@@ -36,18 +36,18 @@ PLATFORM= unknown
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "i386")
-DEPENDS= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
+DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
DISTNAME= linux-5010
PLATFORM= intellinux
. elif (${MACHINE_ARCH} == "sparc")
. if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
+PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
. endif
DISTNAME= solaris-5010
PLATFORM= sparcsolaris
. elif (${MACHINE_ARCH} == "sparc64")
. if !exists(/emul/svr4_32/usr/lib/ld.so)
-PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4_32(8)'
+PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4_32(8)'
. endif
DISTNAME= solaris-5010
PLATFORM= sparcsolaris
@@ -60,7 +60,7 @@ DISTNAME= solaris-5010
PLATFORM= sparcsolaris
.endif
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index 3651cd1c6dd..2bf7a6602ad 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/08/19 14:35:28 salo Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:52 rillig Exp $
DISTNAME= acroread7 # Overridden below
PKGNAME= acroread7-7.0.1
@@ -35,7 +35,7 @@ PLATFORM= unknown
.if ${OPSYS} == "NetBSD"
. if (${MACHINE_ARCH} == "i386")
-DEPENDS= suse_gtk2>=9.1:../../emulators/suse91_gtk2
+DEPENDS+= suse_gtk2>=9.1:../../emulators/suse91_gtk2
DEPENDS+= suse_locale>=9.1:../../emulators/suse91_locale
DISTNAME= AdbeRdr701_linux_enu
PLATFORM= intellinux
@@ -45,7 +45,7 @@ DISTNAME= AdbeRdr701_linux_enu
PLATFORM= intellinux
.endif
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 59bb42d3644..464518448b1 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/11/28 06:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:52 rillig Exp $
#
DISTNAME= apsfilter-7.2.5
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.apsfilter.org/
COMMENT= Flexible magic filter for printing under Unix environment
-DEPENDS= recode-[0-9]*:../../converters/recode
+DEPENDS+= recode-[0-9]*:../../converters/recode
#DEPENDS+= html2ps-[0-9]*:../../print/html2ps
DEPENDS+= transfig-[0-9]*:../../print/transfig
DEPENDS+= jpeg>=6b:../../graphics/jpeg
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 9cfcb7ac59f..4e487e45a92 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/10/17 16:17:22 tonio Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:52 rillig Exp $
DISTNAME= auctex-11.81
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -24,12 +24,12 @@ CONFIGURE_ARGS+= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp||}
.endif
CONFIGURE_ARGS+= --disable-preview
-MAKEFLAGS+= EMACS=${EMACS_BIN}
+MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
LISPDIR= ${EMACS_LISPPREFIX}
INFO_FILES= auctex.info
-PLIST_SUBST+= INFODIR=${INFODIR}
+PLIST_SUBST+= INFODIR=${INFODIR:Q}
MESSAGE_SUBST+= LISPDIR=${LISPDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/print/bg5pdf/Makefile b/print/bg5pdf/Makefile
index cf88c9d6464..89e66220112 100644
--- a/print/bg5pdf/Makefile
+++ b/print/bg5pdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:52 rillig Exp $
#
DISTNAME= bg5pdf-1.0.0
@@ -16,7 +16,7 @@ PYBINMODULE= # defined
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS= bg5pdf
-MAKE_ENV+= PYINC=${PYINC} PYSITELIB=${PYSITELIB}
+MAKE_ENV+= PYINC=${PYINC:Q} PYSITELIB=${PYSITELIB:Q}
post-extract:
${RM} -f ${WRKSRC}/bg5pdflib.so
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index f67fae4db6d..91bb28d28cc 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/11/08 20:30:29 tonio Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:52 rillig Exp $
#
DISTNAME= chktex-1.6.3
@@ -18,8 +18,8 @@ CONF_FILES= ${EGDIR}/chktexrc ${PKG_SYSCONFDIR}/chktexrc
USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= YES
CFLAGS+= -D__unix__
-CONFIGURE_ENV+= PERL5="${PERL5}"
-MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" EGDIR="${EGDIR}"
+CONFIGURE_ENV+= PERL5=${PERL5:Q}
+MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} EGDIR=${EGDIR:Q}
pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/print/cnprint/Makefile b/print/cnprint/Makefile
index f6cfebeda9b..52300e3334e 100644
--- a/print/cnprint/Makefile
+++ b/print/cnprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:52 rillig Exp $
DISTNAME= #
PKGNAME= cnprint-3.30b
@@ -25,7 +25,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.neurophys.wisc.edu/~cai/software/index.html
COMMENT= Print & convert CJK style text to PostScript
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
USE_TOOLS+= gtar gunzip
INSTALLATION_DIRS= bin
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 64b0fc31ea6..610843731ec 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2005/08/24 08:20:46 rillig Exp $
+# $NetBSD: Makefile,v 1.99 2005/12/05 20:50:52 rillig Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --with-manext=bsd
CONFIGURE_ARGS+= --enable-libtool
CONFIGURE_ARGS+= --enable-slp
CONFIGURE_ARGS+= --enable-ssl
-CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
@@ -74,8 +74,8 @@ PLIST_SUBST+= PAM="@comment "
#
CUPS_USER?= lp
CUPS_GROUP?= sys
-FILES_SUBST+= CUPS_USER=${CUPS_USER}
-FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
+FILES_SUBST+= CUPS_USER=${CUPS_USER:Q}
+FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP:Q}
BUILD_DEFS+= CUPS_USER CUPS_GROUP
diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index 1f3287ae65b..aab4462ca77 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/28 06:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:52 rillig Exp $
DISTNAME= dvipdfm-0.13.2c
PKGREVISION= 5
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share
# needed to get the stdarg.h version of kpathsea/c-varargs.h instead of the
# varargs.h version which gcc3 does not like
CPPFLAGS+= -DHAVE_PROTOTYPES
-CONFIGURE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX}
+CONFIGURE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index eecfbbbdbbf..cdd8e0ffb5f 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/28 06:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:52 rillig Exp $
DISTNAME= dvipdfmx-20050627
PKGNAME= ${DISTNAME:S/-/-0.0.0./}
@@ -16,7 +16,7 @@ CONFLICTS+= ja-dvipdfm-[0-9]*
USE_TOOLS+= gs:run
GNU_CONFIGURE= YES
-MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX}
+MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q}
.include "../../graphics/png/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk
index 6e81f0ad8ad..356cd8d35fe 100644
--- a/print/dvipdfmx/map.mk
+++ b/print/dvipdfmx/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.2 2005/11/20 19:14:50 minskim Exp $
+# $NetBSD: map.mk,v 1.3 2005/12/05 20:50:52 rillig Exp $
# This Makefile fragment is intended to be included by packages that
# install font maps used by dvipdfmx. It takes care of adding and
# removing font map entires in dvipdfmx.cfg.
@@ -19,7 +19,7 @@ DEPENDS+= dvipdfmx>=0.0.0.20050627:../../print/dvipdfmx
.endif
USE_PKGINSTALL= yes
-FILES_SUBST+= DVIPDFMX_FONTMAPS="${DVIPDFMX_FONTMAPS}"
+FILES_SUBST+= DVIPDFMX_FONTMAPS=${DVIPDFMX_FONTMAPS:Q}
FILES_SUBST+= DVIPDFMX_CONFIG_DIR="${PKG_LOCALTEXMFPREFIX}/dvipdfm/config"
INSTALL_EXTRA_TMPL+= ../../print/dvipdfmx/files/map.tmpl
DEINSTALL_EXTRA_TMPL+= ../../print/dvipdfmx/files/map.tmpl
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 13380f59c7b..a42c1fb1e50 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2005/11/21 06:17:58 jlam Exp $
+# $NetBSD: Makefile.common,v 1.27 2005/12/05 20:50:52 rillig Exp $
DISTNAME= espgs-${GS_VERS}-source
BASEGS_VERS= 8.15
@@ -71,7 +71,7 @@ CUPS_EGDIR= ${PREFIX}/share/examples/cups
CUPS_MODEL_DIR= ${PREFIX}/share/cups/model
DOCDIR= ${PREFIX}/share/doc/ghostscript
-PLIST_SUBST+= GS_VERS=${BASEGS_VERS}
+PLIST_SUBST+= GS_VERS=${BASEGS_VERS:Q}
CONF_FILES= ${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs
diff --git a/print/ghostscript-gnu-nox11/Makefile b/print/ghostscript-gnu-nox11/Makefile
index 3949a68209c..e6a10315ed7 100644
--- a/print/ghostscript-gnu-nox11/Makefile
+++ b/print/ghostscript-gnu-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/27 17:06:59 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:52 rillig Exp $
PKGNAME= ghostscript-gnu-nox11-${GS_VERS}
PKGREVISION= 1
@@ -6,4 +6,4 @@ COMMENT= GNU Postscript interpreter without X11 drivers
CONFIGURE_ARGS+= --without-x
-.include "../ghostscript-gnu/Makefile.common"
+.include "../../print/ghostscript-gnu/Makefile.common"
diff --git a/print/ghostscript-gnu-x11/Makefile b/print/ghostscript-gnu-x11/Makefile
index 691e0f435e2..5bf768e914a 100644
--- a/print/ghostscript-gnu-x11/Makefile
+++ b/print/ghostscript-gnu-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:09 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:53 rillig Exp $
PKGNAME= ghostscript-gnu-x11-${GS_VERS}
COMMENT= GNU Postscript interpreter with X11 and image drivers only
@@ -19,4 +19,4 @@ MAKE_FLAGS+= DEVICE_DEVS${N}=
MAKE_FLAGS+= DEVICE_DEVS5="\$$(DD)ijs.dev"
.include "../../mk/x11.buildlink3.mk"
-.include "../ghostscript-gnu/Makefile.common"
+.include "../../print/ghostscript-gnu/Makefile.common"
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common
index 2b0840bab96..a2d2d7c7593 100644
--- a/print/ghostscript-gnu/Makefile.common
+++ b/print/ghostscript-gnu/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2005/10/11 07:23:52 abs Exp $
+# $NetBSD: Makefile.common,v 1.26 2005/12/05 20:50:52 rillig Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 8.15
@@ -55,8 +55,8 @@ CFLAGS+= -DA4
.endif
CFLAGS+= -DHAVE_MKSTEMP=1
-MAKE_FLAGS+= XCFLAGS="${CFLAGS}"
-MAKE_FLAGS+= XLDFLAGS="${LDFLAGS}"
+MAKE_FLAGS+= XCFLAGS=${CFLAGS:M*:Q}
+MAKE_FLAGS+= XLDFLAGS=${LDFLAGS:M*:Q}
REPLACE_PERL= lib/fixmswrd.pl
@@ -66,7 +66,7 @@ DOCDIR= ${PREFIX}/share/doc/ghostscript
HTMLDIR= ${PREFIX}/share/doc/html/ghostscript
LIBDIR= ${GSDATADIR}/lib
-PLIST_SUBST+= GS_VERS=${GS_VERS}
+PLIST_SUBST+= GS_VERS=${GS_VERS:Q}
.include "../../mk/compiler.mk"
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 40ce4a83994..bcb170b4c3d 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.60 2005/10/11 07:23:53 abs Exp $
+# $NetBSD: Makefile.common,v 1.61 2005/12/05 20:50:53 rillig Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 6.01
@@ -153,10 +153,10 @@ CFLAGS+= -DHAVE_MKSTEMP=1
XLIBS?= # empty
GS_DISPLAY_DEVICE?= # empty
-MAKE_FLAGS+= CFLAGS="${CFLAGS}"
-MAKE_FLAGS+= LDFLAGS="${LDFLAGS}"
-MAKE_FLAGS+= GS_DISPLAY_DEVICE="${GS_DISPLAY_DEVICE}"
-MAKE_FLAGS+= XINCLUDE= XLIBDIRS= XLIBS="${XLIBS}"
+MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
+MAKE_FLAGS+= LDFLAGS=${LDFLAGS:M*:Q}
+MAKE_FLAGS+= GS_DISPLAY_DEVICE=${GS_DISPLAY_DEVICE:Q}
+MAKE_FLAGS+= XINCLUDE= XLIBDIRS= XLIBS=${XLIBS:Q}
.if ${OPSYS} == "SunOS"
LDFLAGS+= -L${LOCALBASE}/bsd/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/bsd/lib
@@ -172,7 +172,7 @@ LDFLAGS+= -L${LOCALBASE}/bsd/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/bsd/lib
# fixed point.
#
FPU_TYPE?= 1
-MAKE_FLAGS+= FPU_TYPE=${FPU_TYPE}
+MAKE_FLAGS+= FPU_TYPE=${FPU_TYPE:Q}
PLIST_SUBST+= GS_VERS=${GS_VERS}vflib
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 31d3ac07e9f..6678957d179 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/11/28 06:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.70 2005/12/05 20:50:53 rillig Exp $
DISTNAME= gnome-print-0.37
CATEGORIES= print gnome
@@ -17,7 +17,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --without-admin # currently unstable
# override HOME to avoid trying to install ${HOME}/.gnome
-MAKE_ENV+= HOME=${WRKSRC}
+MAKE_ENV+= HOME=${WRKSRC:Q}
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 69bb51d791b..55cf9e18e03 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:53 rillig Exp $
DISTNAME= hpijs-1.7.1
-PKGREVISION= # empty
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index 78816669c1a..13a9ada1d4b 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:26 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:53 rillig Exp $
DISTNAME= ijs-0.34
PKGREVISION= 1
@@ -14,7 +14,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
BUILD_TARGET= libijs.la
-MAKE_ENV+= XCFLAGS="${CFLAGS}"
+MAKE_ENV+= XCFLAGS=${CFLAGS:M*:Q}
MAKE_ENV+= IJS_VERSION_INFO="0:0"
post-install:
diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index ac51314b81a..bf2bc2d2d6c 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:53 rillig Exp $
DISTNAME= ptex-src-${PTEX_VERS}
PKGNAME= ja-ptex-bin-${PTEX_VERS}
@@ -46,11 +46,11 @@ EXTRACT_ONLY= # none
TEXMF= ${PKG_TEXMFPREFIX}
TEXMFLOCAL= ${PREFIX}/share/texmf.local
-FILES_SUBST+= TEXMFLOCAL=${TEXMFLOCAL}
-FILES_SUBST+= TEXMFSITE=${TEXMFSITE}
-FILES_SUBST+= WRKDIR_=${WRKDIR_}
+FILES_SUBST+= TEXMFLOCAL=${TEXMFLOCAL:Q}
+FILES_SUBST+= TEXMFSITE=${TEXMFSITE:Q}
+FILES_SUBST+= WRKDIR_=${WRKDIR_:Q}
#FILES_SUBST+= FILESDIR=${FILESDIR}
-FILES_SUBST+= PATCH=${PATCH}
+FILES_SUBST+= PATCH=${PATCH:Q}
pre-extract:
if [ ! -r ${WRKSRC} ]; then \
diff --git a/print/ja-vflib-lib/Makefile.common b/print/ja-vflib-lib/Makefile.common
index 6b805cf5fb6..95f1a7ebc50 100644
--- a/print/ja-vflib-lib/Makefile.common
+++ b/print/ja-vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/12/05 20:50:53 rillig Exp $
DISTNAME= VFlib2-${VFLIB_VERSION}
CATEGORIES+= japanese print
@@ -11,21 +11,21 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://TypeHack.aial.hiroshima-u.ac.jp/VFlib/
VFLIB_VERSION= 2.24.2
-PLIST_SUBST+= VFLIB_VERSION=${VFLIB_VERSION}
+PLIST_SUBST+= VFLIB_VERSION=${VFLIB_VERSION:Q}
PLIST_SUBST+= VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
-USE_LIBTOOL= # defined
+USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
FT_LIB= ttf -lintl
FT_INCLUDEDIR= ${BUILDLINK_PREFIX.freetype}/include/freetype
FT_LIBDIR= ${BUILDLINK_PREFIX.freetype}/lib
-GNU_CONFIGURE= # defined
-CONFIGURE_ARGS+= --with-freetype="${FT_LIB}"
-CONFIGURE_ARGS+= --with-freetype-includedir=${FT_INCLUDEDIR}
-CONFIGURE_ARGS+= --with-freetype-libdir=${FT_LIBDIR}
-MAKE_ENV+= LOCAL_LDFLAGS="${LDFLAGS}"
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-freetype=${FT_LIB:Q}
+CONFIGURE_ARGS+= --with-freetype-includedir=${FT_INCLUDEDIR:Q}
+CONFIGURE_ARGS+= --with-freetype-libdir=${FT_LIBDIR:Q}
+MAKE_ENV+= LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
DISTINFO_FILE= ${.CURDIR}/../../print/ja-vflib-lib/distinfo
PATCHDIR= ${.CURDIR}/../../print/ja-vflib-lib/patches
diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile
index 484b53a8baf..cc3d3953457 100644
--- a/print/ja-vflib-utils/Makefile
+++ b/print/ja-vflib-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:53 rillig Exp $
.include "../../print/ja-vflib-lib/Makefile.common"
@@ -6,7 +6,7 @@ PKGNAME= ja-vflib-utils-${VFLIB_VERSION}
PKGREVISION= 1
COMMENT= Utilities for manipulating VFlib vector font files
-BUILDLINK_DEPENDS.vflib=ja-vflib-lib>=${VFLIB_VERSION}
+BUILDLINK_DEPENDS.vflib+= ja-vflib-lib>=${VFLIB_VERSION}
CONFIGURE_ARGS+= --enable-tools --with-x
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index d7584080cde..102557f9049 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:53 rillig Exp $
DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS}
PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -62,9 +62,9 @@ CONFIGURE_ARGS+= --with-zlib-libdir=${PREFIX}/lib \
--with-zlib-include=${PREFIX}/include
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
do-build:
cd ${XDVI_DIR} && ${MAKE_PROGRAM}
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index b74904ed18f..7e9ff20a799 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:53 rillig Exp $
DISTNAME= lgrind
PKGNAME= lgrind-3.5
@@ -17,7 +17,7 @@ TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
.include "../../mk/x11.buildlink3.mk"
-MAKE_ENV+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX}
+MAKE_ENV+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:Q}
pre-patch:
${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile-prepatch
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 7424ea07518..56f8b90195b 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/10/10 13:57:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:53 rillig Exp $
#
DISTNAME= libgnomeprintui-2.12.1
@@ -19,7 +19,7 @@ USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libgnomeprintui/libgnomeprintui-2.2.pc.in
-CONFIGURE_ARGS= --enable-gtk-doc=no
+CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.12.1
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index a439f47fc4c..5de2597a835 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/11/28 06:41:22 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:53 rillig Exp $
#
DISTNAME= lilypond-2.4.3
@@ -30,12 +30,12 @@ CONFIGURE_HAS_INFODIR= NO
CONFIGURE_ARGS+= --infodir=${PREFIX}/info
CONFIGURE_ARGS+=--disable-optimising
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_VERSIONS_ACCEPTED= 21 23
# 22 has some regular expression problem
SCRIPTS_DIR= share/lilypond/${PKGVERSION:S/nb${PKGREVISION}//}/scripts
-PLIST_SUBST+= SCRIPTS_DIR=${SCRIPTS_DIR}
+PLIST_SUBST+= SCRIPTS_DIR=${SCRIPTS_DIR:Q}
MESSAGE_SUBST+= SCRIPTS_DIR=${SCRIPTS_DIR}
post-install:
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 20491f717be..c239a00f3aa 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/10/16 12:24:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:53 rillig Exp $
#
DISTNAME= poppler-0.4.2
@@ -9,7 +9,7 @@ MAINTAINER= reed@reedmedia.net
HOMEPAGE= http://poppler.freedesktop.org/
COMMENT= PDF rendering library
-USE_TOOLS= gmake pkg-config
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.in
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 25113555ef8..6a43984d789 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/07/16 01:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:53 rillig Exp $
DISTNAME= psutils-p17
PKGNAME= psutils-1.17
@@ -20,7 +20,7 @@ USE_PKGINSTALL= yes
PAPERSIZE?= A4
-MAKE_ENV+= PERL5="${PERL5}"
+MAKE_ENV+= PERL5=${PERL5:Q}
MAKE_FLAGS+= PAPER=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`
MAKEFILE= Makefile.unix
diff --git a/print/rtf2latex/Makefile b/print/rtf2latex/Makefile
index 454f5e46d03..4133a78945f 100644
--- a/print/rtf2latex/Makefile
+++ b/print/rtf2latex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:13:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:54 rillig Exp $
DISTNAME= rtf2LaTeX.1.5
PKGNAME= rtf2latex-1.5
@@ -17,7 +17,7 @@ post-extract:
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
-MAKE_ENV+= XCFLAGS="${CPPFLAGS} -DSYSV" CC="${CC}"
+MAKE_ENV+= XCFLAGS="${CPPFLAGS} -DSYSV" CC=${CC:Q}
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index b6be56490e6..d259fefb9d9 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2004/12/03 15:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:54 rillig Exp $
-.include "../pdflib/Makefile.common"
+.include "../../print/pdflib/Makefile.common"
PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS}
PKGREVISION= 3
COMMENT= Tcl interface to PDFlib for generating PDF files
-BUILDLINK_DEPENDS.pdflib= pdflib>=${PDFLIB_BASE_VERS}
+BUILDLINK_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS}
CONFIGURE_ARGS+= --with-tcl=${TCLSH}
CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
@@ -30,7 +30,7 @@ do-install:
${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
.endfor
-.include "../pdflib/buildlink3.mk"
+.include "../../print/pdflib/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX-bin/Makefile.common b/print/teTeX-bin/Makefile.common
index bcbede64090..2f34f73eb1b 100644
--- a/print/teTeX-bin/Makefile.common
+++ b/print/teTeX-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:54 rillig Exp $
TETEX_BIN_VERS= 2.0.2
DIST_SUBDIR= teTeX
@@ -44,9 +44,9 @@ CONFIGURE_ARGS+= --disable-a4
CONFIGURE_ARGS+= --enable-auto-core
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
TEXFONTSDIR= ${VARBASE}/spool/texfonts
OWN_DIRS= ${TEXFONTSDIR}
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk
index b34ab348bd3..20633c5f935 100644
--- a/print/teTeX/module.mk
+++ b/print/teTeX/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.5 2005/11/20 18:22:50 minskim Exp $
+# $NetBSD: module.mk,v 1.6 2005/12/05 20:50:54 rillig Exp $
#
# This Makefile fragment is intended to be included by packages that
# install TeX packages. It takes care of rebuilding the ls-R database
@@ -24,9 +24,9 @@ BUILDLINK_DEPENDS.teTeX-bin+= teTeX-bin>=3.0nb4
USE_PKGINSTALL= yes
FILES_SUBST+= MKTEXLSR="${LOCALBASE}/bin/mktexlsr"
-FILES_SUBST+= TEXMFDIRS="${TEXMFDIRS}"
+FILES_SUBST+= TEXMFDIRS=${TEXMFDIRS:Q}
FILES_SUBST+= UPDMAP_SYS="${LOCALBASE}/bin/updmap-sys"
-FILES_SUBST+= TEX_FONTMAPS="${TEX_FONTMAPS}"
+FILES_SUBST+= TEX_FONTMAPS=${TEX_FONTMAPS:Q}
INSTALL_EXTRA_TMPL+= ../../print/teTeX/files/texmf.tmpl
DEINSTALL_EXTRA_TMPL+= ../../print/teTeX/files/texmf.tmpl
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index dbbd976c989..966f1d4fe5a 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/10/10 14:51:02 tonio Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:54 rillig Exp $
DISTNAME= teTeX-src-1.0.7
PKGNAME= teTeX-bin-1.0.7
@@ -70,9 +70,9 @@ CONFIGURE_ARGS+= --enable-auto-core
CXX= g++2
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
TEXFONTSDIR= /var/spool/texfonts
OWN_DIRS= ${TEXFONTSDIR}
diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common
index b9b5b6ddf30..400bf8a7a40 100644
--- a/print/teTeX3-bin/Makefile.common
+++ b/print/teTeX3-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:54 rillig Exp $
TETEX_BIN_VERS= 3.0
DIST_SUBDIR= teTeX
@@ -44,9 +44,9 @@ CONFIGURE_ARGS+= --disable-a4
CONFIGURE_ARGS+= --enable-auto-core
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
TEXFONTSDIR= ${VARBASE}/spool/texfonts
OWN_DIRS= ${TEXFONTSDIR}
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index a9749eb58e2..edeac6997ca 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/03 20:11:40 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:54 rillig Exp $
DISTNAME= TeXfamily-1.2.1
PKGREVISION= 5
@@ -39,7 +39,7 @@ EXTRACT_ONLY= # none
BUILD_TARGET= all
INSTALL_TARGET= install strip
USE_TOOLS+= gmake gtar
-PLIST_SUBST+= MV="${MV}"
+PLIST_SUBST+= MV=${MV:Q}
CFLAGS+= -Dunix
MAKEFLAGS+= PREFIX=${PREFIX:Q}
GNU_CONFIGURE= yes
@@ -72,9 +72,9 @@ CONFIGURE_ARGS+= --with-zlib-libdir=${LOCALBASE}/lib \
--with-zlib-include=${LOCALBASE}/include
.endif
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
# Local versions
TEXFAMILY_PTEXVERSION= 3.0.1
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 31857f3be21..c4389873f27 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/09/07 15:19:08 adam Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:54 rillig Exp $
DISTNAME= xpdf-3.01
CATEGORIES= print
@@ -20,8 +20,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-freetype2-includes=${BUILDLINK_PREFIX.freetype2}/include/freetype2
CONFIGURE_ARGS+= --with-t1-includes=${BUILDLINK_PREFIX.t1lib}/include
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
-MAKE_ENV+= SED="${SED}" ECHO="${ECHO}"
+CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
+MAKE_ENV+= SED=${SED:Q} ECHO=${ECHO:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/security/AiSSLtelnet/distinfo b/security/AiSSLtelnet/distinfo
index 717a441aace..d42ddb13014 100644
--- a/security/AiSSLtelnet/distinfo
+++ b/security/AiSSLtelnet/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/07/17 23:40:31 kristerw Exp $
+$NetBSD: distinfo,v 1.11 2005/12/05 20:50:54 rillig Exp $
SHA1 (AiSSLtelnet-0.15.tar.gz) = 533662049ac44dbf45bb5b53f37eabf269017a79
RMD160 (AiSSLtelnet-0.15.tar.gz) = 6010734e7a38cf1b26e43b84e12678f99409f170
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = ab2261a810c63a5b5b2d0d1021de94253bb3bc54
SHA1 (patch-ac) = 8fcaf2a51d0f9209033072ded426a8fff28588ac
SHA1 (patch-ad) = 954b02c4d494477062dcb05016e2f7d29c299e48
SHA1 (patch-ae) = 3b162a664c920ac5897154167871925739745083
-SHA1 (patch-af) = 792a27501e29304265b02ba5a7cfaa68ced916a1
+SHA1 (patch-af) = 686ce88931e977e14041be096b589942b35c7a98
SHA1 (patch-ag) = ebeb3ce32341d4b4e69c71ab969408ff84a5d309
diff --git a/security/AiSSLtelnet/patches/patch-af b/security/AiSSLtelnet/patches/patch-af
index 9e4fba9d624..0d1598e19d3 100644
--- a/security/AiSSLtelnet/patches/patch-af
+++ b/security/AiSSLtelnet/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2004/03/25 15:23:40 taca Exp $
+$NetBSD: patch-af,v 1.2 2005/12/05 20:50:54 rillig Exp $
--- telnet/commands.c.orig 2001-08-02 22:42:45.000000000 +0900
+++ telnet/commands.c
-@@ -68,7 +68,7 @@ static char vcid[] = "$Id: commands.c,v
+@@ -68,7 +68,7 @@
#include <netdb.h>
#include <ctype.h>
#include <pwd.h>
diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 68d5222cfdf..64953b9cfb1 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/10/04 18:27:00 reed Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:54 rillig Exp $
#
DISTNAME= Linux-PAM-0.77
@@ -35,7 +35,7 @@ CONFIGURE_ENV+= ac_cv_prog_HAVE_SGML2PS=no
CONFIGURE_ENV+= ac_cv_prog_HAVE_PS2PDF=no
PAM_MODULEDIR= ${VIEWBASE}/lib/security
-MAKE_ENV+= PAM_MODULEDIR="${PAM_MODULEDIR}"
+MAKE_ENV+= PAM_MODULEDIR=${PAM_MODULEDIR:Q}
MESSAGE_SUBST+= PAM_MODULEDIR=${PAM_MODULEDIR}
.include "../../mk/bsd.prefs.mk"
diff --git a/security/amap/Makefile b/security/amap/Makefile
index dff34c98069..ddd87a00ad8 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:54 rillig Exp $
#
DISTNAME= amap-5.0
@@ -22,7 +22,7 @@ CONF_FILES= ${EGDIR}/appdefs.resp ${PKG_SYSCONFDIR}/appdefs.resp
CONF_FILES+= ${EGDIR}/appdefs.rpc ${PKG_SYSCONFDIR}/appdefs.rpc
CONF_FILES+= ${EGDIR}/appdefs.trig ${PKG_SYSCONFDIR}/appdefs.trig
-SUBST_CLASSES= conf
+SUBST_CLASSES+= conf
SUBST_FILES.conf= configure
SUBST_STAGE.conf= pre-configure
SUBST_SED.conf= -e 's|@PREFIX@|${PREFIX}|g' \
diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile
index abae30c3de7..bc07f8ed651 100644
--- a/security/amavis-perl/Makefile
+++ b/security/amavis-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/01 12:18:41 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:54 rillig Exp $
DISTNAME= amavisd-${VERSION}
PKGNAME= amavis-perl-${VERSION}
@@ -48,7 +48,7 @@ GNU_CONFIGURE= YES
PLIST_SRC= ${PKGDIR}/PLIST
USE_TOOLS+= file
-CONFIGURE_ENV+= file=${TOOLS_FILE_CMD}
+CONFIGURE_ENV+= file=${TOOLS_FILE_CMD:Q}
CONFIGURE_ENV+= procmail="/usr/libexec/mail.local"
diff --git a/security/amavis/Makefile b/security/amavis/Makefile
index 80e631f2322..4449ae66a64 100644
--- a/security/amavis/Makefile
+++ b/security/amavis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/26 19:28:55 kristerw Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:54 rillig Exp $
#
DISTNAME= amavis-0.2.1
@@ -30,7 +30,7 @@ VIRUSMAILTO?= security # whom to notify about viruses
GNU_CONFIGURE= YES
CONFIGURE_ENV+= procmail="/usr/libexec/mail.local"
-CONFIGURE_ENV+= BASH=${TOOLS_SH}
+CONFIGURE_ENV+= BASH=${TOOLS_SH:Q}
CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR}
CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO}
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index ce60f62c155..86c013da22f 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/09/05 10:14:16 cube Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:54 rillig Exp $
DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL}
PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -51,10 +51,10 @@ EGDIR= ${PREFIX}/share/examples/amavisd-new
MESSAGE_SRC= ${PKGDIR}/MESSAGE
BUILD_DEFS+= AMAVIS_USER AMAVIS_GROUP AMAVIS_DIR AMAVIS_QUARANTINE
-FILES_SUBST+= AMAVIS_USER=${AMAVIS_USER}
-FILES_SUBST+= AMAVIS_GROUP=${AMAVIS_GROUP}
-FILES_SUBST+= AMAVIS_DIR=${AMAVIS_DIR}
-FILES_SUBST+= AMAVIS_QUARANTINE=${AMAVIS_QUARANTINE}
+FILES_SUBST+= AMAVIS_USER=${AMAVIS_USER:Q}
+FILES_SUBST+= AMAVIS_GROUP=${AMAVIS_GROUP:Q}
+FILES_SUBST+= AMAVIS_DIR=${AMAVIS_DIR:Q}
+FILES_SUBST+= AMAVIS_QUARANTINE=${AMAVIS_QUARANTINE:Q}
PKG_GROUPS= ${AMAVIS_GROUP}
PKG_USERS= ${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\ Scanning\ Account:${AMAVIS_DIR}:${SH}
diff --git a/security/antonym/distinfo b/security/antonym/distinfo
index d9d5beb0451..f6aadb55af7 100644
--- a/security/antonym/distinfo
+++ b/security/antonym/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:10:05 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/12/05 20:50:54 rillig Exp $
SHA1 (antonym-1.9.tar.gz) = 0c1fd06f175a3c13900479460824c07a4bbeb480
RMD160 (antonym-1.9.tar.gz) = b49db8adcd87e57f22fe1095c8307fecd1e08f6a
Size (antonym-1.9.tar.gz) = 14902 bytes
SHA1 (patch-aa) = 36c055595784ff8cd6fc600e3ac3ed5ce4f03275
-SHA1 (patch-ab) = 3421c1849a71e6ae5a2d4ee11e94111c39299664
+SHA1 (patch-ab) = ccb7b3bca2faf22aa8948aea5d8df2fada83388f
diff --git a/security/antonym/patches/patch-ab b/security/antonym/patches/patch-ab
index ede55a79c6c..bc20f2b8e6a 100644
--- a/security/antonym/patches/patch-ab
+++ b/security/antonym/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/05/05 16:34:34 tv Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/05 20:50:54 rillig Exp $
--- README.orig Tue Aug 6 12:44:44 2002
+++ README
-@@ -2,18 +2,17 @@ $Id: README,v 1.1 2002/07/25 16:42:06 ki
+@@ -2,18 +2,17 @@
INSTALLATION
diff --git a/security/apg/Makefile b/security/apg/Makefile
index 65a9a8ff143..587e0b34287 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:54 rillig Exp $
#
DISTNAME= apg-2.2.3
@@ -9,7 +9,7 @@ MAINTAINER= zuntum@NetBSD.org
HOMEPAGE= http://www.adel.nursat.kz/apg/
COMMENT= Tool set for random password generation
-MAKE_ENV+= FLAGS="${CFLAGS}" INSTALL_PREFIX="${PREFIX}"
+MAKE_ENV+= FLAGS=${CFLAGS:M*:Q} INSTALL_PREFIX=${PREFIX:Q}
USE_TOOLS+= perl:run
REPLACE_PERL= perl/apgcli.pl
@@ -17,7 +17,7 @@ REPLACE_PERL= perl/apgcli.pl
OPSYSVARS+= CS_LIBS
CS_LIBS.Linux+= -lnsl
CS_LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= CS_LIBS="${CS_LIBS}"
+MAKE_ENV+= CS_LIBS=${CS_LIBS:Q}
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/perl/apgcli.pl ${PREFIX}/bin/apgcli
diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index 84bf234fdbc..9614dbe60d7 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:55 rillig Exp $
DISTNAME= cfs-1.4.1
PKGREVISION= 5
@@ -30,7 +30,7 @@ CFS_SUBST+= cpasswd->cfs_passwd CPASSWD->CFS_PASSWD
.include "../../mk/compiler.mk"
.include "../../mk/bsd.prefs.mk"
-MAKE_ENV+= OPSYS="${OPSYS}"
+MAKE_ENV+= OPSYS=${OPSYS:Q}
# Required settings necessary to build CFS on various platforms. This is
# copied from ${WRKSRC}/Makefile and from browsing the various README files.
@@ -38,7 +38,7 @@ MAKE_ENV+= OPSYS="${OPSYS}"
.if ${OPSYS} == "NetBSD"
CFLAGS+= -DPROTOTYPES=1
CFLAGS+= -DBSD44 -DANYPORT -DCFS_PORT=2049 -DSHORTLINKS
-MAKE_ENV+= MAKE=${MAKE_PROGRAM}
+MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q}
MAKE_ENV+= COMPAT="-lcompat"
MAKE_ENV+= RPCOPTS="-b"
#
@@ -54,7 +54,7 @@ CFLAGS+= -traditional
. endif
CFLAGS+= -DPROTOTYPES=1
CFLAGS+= -DSOLARIS2X -DPORTMAP -DPTMX
-MAKE_ENV+= MAKE=${MAKE_PROGRAM}
+MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q}
MAKE_ENV+= LIBS="-lsocket -lnsl"
MAKE_ENV+= COMPAT=
MAKE_ENV+= RPCOPTS=
@@ -65,7 +65,7 @@ CFLAGS+= -traditional
. endif
CFLAGS+= -DPROTOTYPES=1
CFLAGS+= -U__OPTIMIZE__ -U__STDC__ -Dd_fileno=d_ino
-MAKE_ENV+= MAKE=${MAKE_PROGRAM}
+MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q}
MAKE_ENV+= LIBS=
MAKE_ENV+= COMPAT=
MAKE_ENV+= RPCOPTS="-k -b"
diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index 7a85558d9fa..a0600f4496f 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:55 rillig Exp $
#
DISTNAME= chkrootkit-0.44
@@ -17,7 +17,7 @@ NO_CONFIGURE= yes
PROGRAMS= chkdirs chklastlog chkproc chkwtmp ifpromisc strings-static
DOCDIR= ${PREFIX}/share/doc/chkrootkit
-SUBST_CLASSES= helper
+SUBST_CLASSES+= helper
SUBST_STAGE.helper= post-patch
SUBST_FILES.helper= chkrootkit
SUBST_SED.helper= -e "s|./chklastlog|${PREFIX}/bin/chklastlog|g" \
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index c6d6a3d0879..82d6345e164 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/07 16:43:49 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:55 rillig Exp $
.include "Makefile.common"
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --without-stdheaderdir
AUTHDAEMONVAR?= ${VARBASE}/authdaemon
CONFIGURE_ARGS+= --with-authdaemonvar=${AUTHDAEMONVAR}
OWN_DIRS_PERMS= ${AUTHDAEMONVAR} ${COURIER_USER} ${COURIER_GROUP} 0750
-FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR}
+FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR:Q}
# Expect is used to change the password from within the courier webmail
# application (sqwebmail).
@@ -42,8 +42,8 @@ AUTHLIBDIR= lib/courier-authlib
AUTHLIBEXECDIR= libexec/courier-authlib
AUTHEXAMPLEDIR= share/examples/courier-authlib
AUTHDOCDIR= share/doc/courier-authlib
-FILES_SUBST+= AUTHLIBEXECDIR=${AUTHLIBEXECDIR}
-FILES_SUBST+= AUTHEXAMPLEDIR=${AUTHEXAMPLEDIR}
+FILES_SUBST+= AUTHLIBEXECDIR=${AUTHLIBEXECDIR:Q}
+FILES_SUBST+= AUTHEXAMPLEDIR=${AUTHEXAMPLEDIR:Q}
PKG_SYSCONFSUBDIR?= courier
diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common
index 2bcab23a910..51659d837a6 100644
--- a/security/courier-authlib/Makefile.common
+++ b/security/courier-authlib/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2005/08/23 11:48:51 rillig Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:55 rillig Exp $
COURIER_USER?= courier
COURIER_GROUP?= mail
-FILES_SUBST+= COURIER_USER=${COURIER_USER}
-FILES_SUBST+= COURIER_GROUP=${COURIER_GROUP}
+FILES_SUBST+= COURIER_USER=${COURIER_USER:Q}
+FILES_SUBST+= COURIER_GROUP=${COURIER_GROUP:Q}
USE_PKGINSTALL= yes
PKG_GROUPS= ${COURIER_GROUP}
diff --git a/security/cy2-anonymous/Makefile b/security/cy2-anonymous/Makefile
index db8240c2c2b..4e287b94d42 100644
--- a/security/cy2-anonymous/Makefile
+++ b/security/cy2-anonymous/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:55 rillig Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-anonymous/}
COMMENT= Cyrus SASL ANONYMOUS authentication plugin
@@ -6,7 +6,7 @@ SASL_PLUGIN= yes
CONFLICTS= cyrus-sasl<=2.1.19nb1
-.include "../cyrus-sasl2/Makefile.common"
+.include "../../security/cyrus-sasl2/Makefile.common"
CONFIGURE_ARGS+= --enable-anonymous
diff --git a/security/cy2-crammd5/Makefile b/security/cy2-crammd5/Makefile
index db9879dc987..8e66ec7aaec 100644
--- a/security/cy2-crammd5/Makefile
+++ b/security/cy2-crammd5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:55 rillig Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-crammd5/}
COMMENT= Cyrus SASL CRAM-MD5 authentication plugin
@@ -6,7 +6,7 @@ SASL_PLUGIN= yes
CONFLICTS= cyrus-sasl<=2.1.19nb1
-.include "../cyrus-sasl2/Makefile.common"
+.include "../../security/cyrus-sasl2/Makefile.common"
CONFIGURE_ARGS+= --enable-cram
diff --git a/security/cy2-digestmd5/Makefile b/security/cy2-digestmd5/Makefile
index ce7537a2b54..c03d0f28253 100644
--- a/security/cy2-digestmd5/Makefile
+++ b/security/cy2-digestmd5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:55 rillig Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
COMMENT= Cyrus SASL DIGEST-MD5 authentication plugin
@@ -6,7 +6,7 @@ SASL_PLUGIN= yes
CONFLICTS= cyrus-sasl<=2.1.19nb1
-.include "../cyrus-sasl2/Makefile.common"
+.include "../../security/cyrus-sasl2/Makefile.common"
CONFIGURE_ARGS+= --enable-digest
CONFIGURE_ARGS+= --with-rc4
diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile
index ed993e66497..3f862f41b9a 100644
--- a/security/cy2-gssapi/Makefile
+++ b/security/cy2-gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:55 rillig Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
COMMENT= Cyrus SASL GSSAPI authentication plugin
@@ -6,7 +6,7 @@ SASL_PLUGIN= yes
CONFLICTS= cyrus-sasl<=2.1.19nb1
-.include "../cyrus-sasl2/Makefile.common"
+.include "../../security/cyrus-sasl2/Makefile.common"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE}
diff --git a/security/cy2-login/Makefile b/security/cy2-login/Makefile
index 5c4383f6587..8789fff16e1 100644
--- a/security/cy2-login/Makefile
+++ b/security/cy2-login/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:55 rillig Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-login/}
COMMENT= Cyrus SASL LOGIN authentication plugin
SASL_PLUGIN= yes
-.include "../cyrus-sasl2/Makefile.common"
+.include "../../security/cyrus-sasl2/Makefile.common"
# We need to configure the PLAIN plugin as well since some of the important
# build variables for the LOGIN plugin are only set if PLAIN is configured.
diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile
index c861326d154..d67401f0442 100644
--- a/security/cy2-ntlm/Makefile
+++ b/security/cy2-ntlm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:55 rillig Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
COMMENT= Cyrus SASL NTLM authentication plugin
SASL_PLUGIN= yes
-.include "../cyrus-sasl2/Makefile.common"
+.include "../../security/cyrus-sasl2/Makefile.common"
CONFIGURE_ARGS+= --enable-ntlm
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
diff --git a/security/cy2-otp/Makefile b/security/cy2-otp/Makefile
index 34bb6f022d4..1b4f87ec17a 100644
--- a/security/cy2-otp/Makefile
+++ b/security/cy2-otp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:55 rillig Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-otp/}
COMMENT= Cyrus SASL OTP authentication plugin
@@ -6,7 +6,7 @@ SASL_PLUGIN= yes
CONFLICTS= cyrus-sasl<=2.1.19nb1
-.include "../cyrus-sasl2/Makefile.common"
+.include "../../security/cyrus-sasl2/Makefile.common"
CONFIGURE_ARGS+= --enable-otp
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
diff --git a/security/cy2-plain/Makefile b/security/cy2-plain/Makefile
index ed7e0fa1bff..6217819833c 100644
--- a/security/cy2-plain/Makefile
+++ b/security/cy2-plain/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:55 rillig Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-plain/}
COMMENT= Cyrus SASL PLAIN authentication plugin
@@ -6,7 +6,7 @@ SASL_PLUGIN= yes
CONFLICTS= cyrus-sasl<=2.1.19nb1
-.include "../cyrus-sasl2/Makefile.common"
+.include "../../security/cyrus-sasl2/Makefile.common"
CONFIGURE_ARGS+= --enable-plain
diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile
index c6a9a6d0c37..9d87c817e91 100644
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2005/05/31 10:01:39 dillo Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:55 rillig Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/}
COMMENT= Cyrus SASL SQL authentication plugin
SASL_PLUGIN= yes
-.include "../cyrus-sasl2/Makefile.common"
+.include "../../security/cyrus-sasl2/Makefile.common"
PKG_OPTIONS_VAR= PKG_OPTIONS.cy2-sql
PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 251a63f2bc2..d3660b77df2 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/08/20 01:56:11 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:55 rillig Exp $
.include "Makefile.common"
@@ -56,8 +56,8 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
#
CYRUS_USER?= cyrus
CYRUS_GROUP?= mail
-FILES_SUBST+= CYRUS_USER=${CYRUS_USER}
-FILES_SUBST+= ROOT_USER=${ROOT_USER}
+FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
+FILES_SUBST+= ROOT_USER=${ROOT_USER:Q}
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
PKG_GROUPS= ${CYRUS_GROUP}
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index bbc14d48d78..eff31978872 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:55 rillig Exp $
DISTNAME= cyrus-sasl-2.1.20
PKGNAME= ${DISTNAME:S/sasl/saslauthd/}
@@ -27,7 +27,7 @@ BUILD_TARGET= all saslcache testsaslauthd
SASLSOCKETDIR?= ${VARBASE}/run/saslauthd
BUILD_DEFS+= SASLSOCKETDIR
-FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR}
+FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR:Q}
CONFIGURE_ARGS+= --with-saslauthd="${SASLSOCKETDIR}"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
RCD_SCRIPTS= saslauthd
-FILES_SUBST+= ROOT_USER=${ROOT_USER}
+FILES_SUBST+= ROOT_USER=${ROOT_USER:Q}
INSTALLATION_DIRS= bin
diff --git a/security/destroy/Makefile b/security/destroy/Makefile
index bb8a5002ff2..eb2875177d1 100644
--- a/security/destroy/Makefile
+++ b/security/destroy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:55 rillig Exp $
#
DISTNAME= destroy-20040415
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.freebsdhackers.net/destroy/ \
MAINTAINER= shane@freebsdhackers.net
HOMEPAGE= http://www.freebsdhackers.net/destroy/
-COMMENT= A program to securely destroy files on the hard disk
+COMMENT= Program to securely destroy files on the hard disk
INSTALLATION_DIRS= bin man/man1
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index b7148c15378..0435f6a77c5 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/09 17:31:06 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:55 rillig Exp $
DISTNAME= dropbear-0.46
CATEGORIES= security
@@ -20,7 +20,7 @@ PKG_SUPPORTED_OPTIONS= pam
CONFIGURE_ARGS+= --enable-pam
.endif
-MAKEFLAGS+= ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
+MAKEFLAGS+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dropbear
diff --git a/security/dsniff-nox11/Makefile b/security/dsniff-nox11/Makefile
index 2d749686e61..0845990cc01 100644
--- a/security/dsniff-nox11/Makefile
+++ b/security/dsniff-nox11/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/22 01:05:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:55 rillig Exp $
-.include "../dsniff/Makefile.common"
+.include "../../security/dsniff/Makefile.common"
PKGNAME= dsniff-nox11-${VERS}
COMMENT= Password sniffer
diff --git a/security/fsh/Makefile b/security/fsh/Makefile
index fd74ce8ee3a..5aa9422b508 100644
--- a/security/fsh/Makefile
+++ b/security/fsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/20 12:51:54 fredb Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:55 rillig Exp $
#
DISTNAME= fsh-1.2
@@ -14,7 +14,7 @@ COMMENT= Fast remote command execution
GNU_CONFIGURE= YES
INFO_FILES= fsh.info
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 914b8c17fd4..29979cf5347 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/27 22:09:23 bad Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:55 rillig Exp $
DISTNAME= fwbuilder-2.0.9
CATEGORIES= security net
@@ -15,8 +15,8 @@ USE_LANGUAGES= c++
UNLIMIT_RESOURCES+= datasize
QMAKE= ${QTDIR}/bin/qmake
-CONFIGURE_ENV+= QMAKE="${QMAKE}"
-MAKE_ENV+= QMAKE="${QMAKE}"
+CONFIGURE_ENV+= QMAKE=${QMAKE:Q}
+MAKE_ENV+= QMAKE=${QMAKE:Q}
.include "../../security/libfwbuilder/buildlink3.mk"
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index df16da307a1..40e3eb633e5 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/12 21:46:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:55 rillig Exp $
#
DISTNAME= gnome-keyring-0.4.5
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= YES
PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-keyring-1.pc.in
-BUILDLINK_DEPENDS.glib2= glib2>=2.6.0
+BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.0
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/security/gnu-crypto/Makefile b/security/gnu-crypto/Makefile
index 506f83cc38f..978189743a2 100644
--- a/security/gnu-crypto/Makefile
+++ b/security/gnu-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= gnu-crypto-2.0.1-bin
@@ -11,7 +11,7 @@ MAINTAINER= tv@duh.org
HOMEPAGE= http://www.gnu.org/software/gnu-crypto/
COMMENT= GPL implementation of the Java Crypto Extensions
-USE_JAVA2= run
+USE_JAVA2= yes
INSTALLATION_DIRS= info
do-build: # do nothing
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index e962f7de410..486f5cf4cf3 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2005/10/10 20:45:19 reed Exp $
+# $NetBSD: Makefile,v 1.79 2005/12/05 20:50:56 rillig Exp $
DISTNAME= gnupg-1.4.2
CATEGORIES= security
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --disable-gnupg-iconv
# XXX: still needed?
.if ${OPSYS} == "FreeBSD"
-SUBST_CLASSES= fixme
+SUBST_CLASSES+= fixme
SUBST_STAGE.fixme= post-configure
SUBST_FILES.fixme= mpi/i386/mpih-add1.S mpi/i386/mpih-lshift.S \
mpi/i386/mpih-mul1.S mpi/i386/mpih-mul2.S \
diff --git a/security/gnupg/hacks.mk b/security/gnupg/hacks.mk
index c9e9da96975..ed619453afb 100644
--- a/security/gnupg/hacks.mk
+++ b/security/gnupg/hacks.mk
@@ -1,7 +1,7 @@
-# $NetBSD: hacks.mk,v 1.2 2005/10/04 22:50:41 wiz Exp $
+# $NetBSD: hacks.mk,v 1.3 2005/12/05 20:50:56 rillig Exp $
-.ifndef GNUPG_HACKS_MK
-GNUPG_HACKS_MK= #defined
+.if !defined(GNUPG_HACKS_MK)
+GNUPG_HACKS_MK= # defined
### workaround for a GCC optimizer bug on sparc:
### drop any -mcpu flag
diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk
index 367487fc14c..320052a9948 100644
--- a/security/gnupg/options.mk
+++ b/security/gnupg/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: options.mk,v 1.5 2005/12/05 20:50:56 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg
PKG_SUPPORTED_OPTIONS= i586-optimized curl idea ldap m68060-optimized
@@ -41,6 +41,6 @@ PLIST_SUBST+= OPENLDAP="@comment "
.if !empty(PKG_OPTIONS:Mm68060-optimized)
# be more efficient on M68060 machines
-CONFIGURE_ENV+= M68060=${M68060}
+CONFIGURE_ENV+= M68060=${M68060:Q}
CFLAGS+= -m68060
.endif
diff --git a/security/gnustep-ssl/Makefile b/security/gnustep-ssl/Makefile
index 7d7773bbc2a..40981e30bbd 100644
--- a/security/gnustep-ssl/Makefile
+++ b/security/gnustep-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/04 11:22:24 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= gnustep-base-1.10.1
@@ -10,7 +10,7 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= GNUstep SSL bundle
-BUILDLINK_DEPENDS.gnustep-base= gnustep-base>1.10.1
+BUILDLINK_DEPENDS.gnustep-base+= gnustep-base>1.10.1
PTHREAD_LIBS= -lpthread
@@ -20,7 +20,7 @@ USE_TOOLS+= gmake
GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${PREFIX}/share/GNUstep
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
SUBST_CLASSES+= gsssl
SUBST_STAGE.gsssl= pre-configure
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index bddb586a78f..0b31b090d12 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/11/14 18:17:49 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:56 rillig Exp $
DISTNAME= gnutls-1.2.9
CATEGORIES= security devel
@@ -16,7 +16,7 @@ COMMENT= GNU Transport Layer Security library
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= yes
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
TEST_TARGET= check
@@ -25,9 +25,9 @@ INFO_FILES= gnutls.info
PKGCONFIG_OVERRIDE= lib/gnutls.pc.in
PKGCONFIG_OVERRIDE+= libextra/gnutls-extra.pc.in
-BUILDLINK_DEPENDS.opencdk= opencdk>=0.5.5
-BUILDLINK_DEPENDS.libtasn1= libtasn1>=0.2.11
-BUILDLINK_DEPENDS.libgcrypt= libgcrypt>=1.2.2
+BUILDLINK_DEPENDS.opencdk+= opencdk>=0.5.5
+BUILDLINK_DEPENDS.libtasn1+= libtasn1>=0.2.11
+BUILDLINK_DEPENDS.libgcrypt+= libgcrypt>=1.2.2
MAKE_ENV+= RM=${RM:Q}
MAKE_ENV+= TZ=UTC
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index efc90b7e9b0..1f59472308f 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/08/12 19:36:53 drochner Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= gpgme-1.0.3
@@ -23,7 +23,7 @@ PKG_SUPPORTED_OPTIONS= gpgsm
LIBS.SunOS+= -lnsl -lsocket
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
# getenv_r is not detected correctly. It will be found
# in either base system or librfuncs
diff --git a/security/gtk-systrace/Makefile b/security/gtk-systrace/Makefile
index d58da19526c..24f0a0c7d91 100644
--- a/security/gtk-systrace/Makefile
+++ b/security/gtk-systrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= gtk-systrace-2002-12-01
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.citi.umich.edu/u/provos/systrace/index.html
COMMENT= GTK interface to systrace(1)
-ONLY_FOR_PLATFORM= NetBSD-1.6[H-Z]*-* NetBSD-[2-9]*
+ONLY_FOR_PLATFORM= NetBSD-1.6[H-Z]*-* NetBSD-[2-9]*-*
WRKSRC= ${WRKDIR}/notification-0.1
GNU_CONFIGURE= YES
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index a994fff8087..b86596d6258 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/10/26 16:44:24 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/05 20:50:56 rillig Exp $
DISTNAME= heimdal-0.7.1
PKGREVISION= 1
@@ -83,7 +83,7 @@ HEIMDAL_TRANSFORM= s/^ftp/${KRB5_PREFIX}&/; \
KRB5_PREFIX= # empty
HEIMDAL_TRANSFORM= s/^ftp/k&/
.endif
-PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX}
+PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX:Q}
CONFIGURE_ARGS+= --program-transform-name="${HEIMDAL_TRANSFORM}"
USE_PKGINSTALL= yes
diff --git a/security/honeyd-arpd/Makefile b/security/honeyd-arpd/Makefile
index 981bd55fc35..6271e2ce94e 100644
--- a/security/honeyd-arpd/Makefile
+++ b/security/honeyd-arpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/09/16 14:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= arpd-0.2
@@ -28,4 +28,3 @@ do-install:
.include "../../net/libdnet/buildlink3.mk"
.include "../../net/libpcap/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
-
diff --git a/security/honeyd/Makefile b/security/honeyd/Makefile
index 12abf722d73..80764429f0f 100644
--- a/security/honeyd/Makefile
+++ b/security/honeyd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/16 14:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= honeyd-1.0
@@ -31,7 +31,6 @@ DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
.for f in ${DIST_CONF_FILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
diff --git a/security/honeyd/options.mk b/security/honeyd/options.mk
index 39b1e4fe920..9b9cc83397b 100644
--- a/security/honeyd/options.mk
+++ b/security/honeyd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/04/20 14:34:31 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2005/12/05 20:50:56 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.honeyd
PKG_SUPPORTED_OPTIONS= python rrdtool
@@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS= python rrdtool
###
.if !empty(PKG_OPTIONS:Mpython)
. include "../../lang/python/extension.mk"
-CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q}
.else
CONFIGURE_ARGS+= --without-python
.endif
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 301083d93ca..4cf054c238c 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:23 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= ${PKGNAME}-src
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
LICENSE+= hydra-license
-SUBST_CLASSES= build
+SUBST_CLASSES+= build
SUBST_STAGE.build= post-patch
SUBST_FILES.build= Makefile.am configure hydra-gtk/src/main.c
SUBST_SED.build= -e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" \
diff --git a/security/ike-scan/Makefile b/security/ike-scan/Makefile
index 73c8cd86668..39cd46778ea 100644
--- a/security/ike-scan/Makefile
+++ b/security/ike-scan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:12 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:56 rillig Exp $
DISTNAME= ike-scan-1.7.1
CATEGORIES= security
@@ -11,7 +11,7 @@ COMMENT= Fingerprinting IKE implementation
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-openssl
-SUBST_CLASSES= man
+SUBST_CLASSES+= man
SUBST_STAGE.man= post-patch
SUBST_FILES.man= ike-scan.1
SUBST_SED.man= -e "s|/usr/local|${PREFIX}|g"
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 986734de369..24c785d5a26 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/11/22 16:22:47 tron Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:56 rillig Exp $
DISTNAME= ipsec-tools-0.6.3
CATEGORIES= security
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --enable-adminport --enable-dpd
CONFIGURE_ARGS+= --enable-natt=kernel
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-PLIST_SUBST+= VARBASE=${VARBASE}
+PLIST_SUBST+= VARBASE=${VARBASE:Q}
PKG_SYSCONFSUBDIR= racoon
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/security/jessie/Makefile b/security/jessie/Makefile
index cb93fa08979..daf5a7765f0 100644
--- a/security/jessie/Makefile
+++ b/security/jessie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:30 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= jessie-0.9.7
@@ -11,7 +11,7 @@ COMMENT= GPL implementation of the Java Secure Sockets Extension
DEPENDS+= gnu-crypto>=2.0:../../security/gnu-crypto
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
USE_JAVA2= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/security/libbf/Makefile b/security/libbf/Makefile
index 8341ad8e3c9..dad86efa0f4 100644
--- a/security/libbf/Makefile
+++ b/security/libbf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:32 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= libbf-0.8.2b
@@ -23,7 +23,7 @@ BF_ENC=asm/bx86-elf.o
BF_ENC=bf_enc.o
.endif
-MAKEFLAGS+= BF_ENC=${BF_ENC}
+MAKEFLAGS+= BF_ENC=${BF_ENC:Q}
INSTALLATION_DIRS= bin include lib
diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile
index e87d238019a..fd964ef3e97 100644
--- a/security/libnasl/Makefile
+++ b/security/libnasl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:56 rillig Exp $
-.include "../nessus/Makefile.common"
+.include "../../security/nessus/Makefile.common"
DISTNAME= libnasl-${VERS}
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index c47301bf2be..d9b23769950 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/10/05 13:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:56 rillig Exp $
DISTNAME= krb5-1.4.2
PKGNAME= mit-${DISTNAME:S/-signed$//}
@@ -27,7 +27,7 @@ USE_LIBTOOL= yes
# The actual KDC databases are stored in ${MIT_KRB5_STATEDIR}/krb5kdc.
MIT_KRB5_STATEDIR?= ${VARBASE}
-FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR}
+FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR:Q}
CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --enable-kdc-replay-cache
CONFIGURE_ARGS+= --disable-thread-support
CONFIGURE_ARGS+= --without-krb4
CONFIGURE_ARGS+= --without-tcl
-MAKE_ENV+= ROOT_USER=${ROOT_USER}
+MAKE_ENV+= ROOT_USER=${ROOT_USER:Q}
PKG_OPTIONS_VAR= PKG_OPTIONS.mit-krb5
PKG_SUPPORTED_OPTIONS= kerberos-prefix-cmds
@@ -59,7 +59,7 @@ MIT_KRB5_TRANSFORM= s/^ftp/${KRB5_PREFIX}&/; \
KRB5_PREFIX= # empty
MIT_KRB5_TRANSFORM= s/^ftp/k&/
.endif
-PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX}
+PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX:Q}
CONFIGURE_ARGS+= --program-transform-name="${MIT_KRB5_TRANSFORM}"
# Fix some places in the MIT krb5 sources that don't point to the correct
diff --git a/security/msu/Makefile b/security/msu/Makefile
index e8d34186b1f..6f9219f34ef 100644
--- a/security/msu/Makefile
+++ b/security/msu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:52:59 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:56 rillig Exp $
#
DISTNAME= msu-1.06
@@ -9,6 +9,6 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.mono.org/abs/tools/msu/
COMMENT= Mini passwordless su
-MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/security/msudir/Makefile b/security/msudir/Makefile
index 402849fa0c0..85daf740870 100644
--- a/security/msudir/Makefile
+++ b/security/msudir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:53:00 grant Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:57 rillig Exp $
#
DISTNAME= msudir-0.13
@@ -9,6 +9,6 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.mono.org/abs/tools/msudir/
COMMENT= Easy setuid script management
-MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index 46b35346ca4..371f130bb71 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2005/07/29 16:42:05 tron Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:57 rillig Exp $
-.include "../nessus/Makefile.common"
+.include "../../security/nessus/Makefile.common"
DISTNAME= nessus-core-${VERS}
@@ -14,7 +14,7 @@ CONFIGURE_ENV+= ac_cv_path_GTKCONFIG="pkg-config gtk+-2.0" \
ac_cv_path_GLIBCONFIG="pkg-config glib-2.0"
RCD_SCRIPTS= nessusd
-PLIST_SUBST+= VARBASE="${VARBASE}"
+PLIST_SUBST+= VARBASE=${VARBASE:Q}
.include "../../security/libnasl/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index efa62f9dca2..24b73d2c77f 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:14 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:57 rillig Exp $
-.include "../nessus/Makefile.common"
+.include "../../security/nessus/Makefile.common"
DISTNAME= nessus-libraries-${VERS}
COMMENT= Libs required by the Nessus Network security scanner
@@ -13,7 +13,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-zlib=${BUILDLINK_PREFIX.zlib}/lib \
--with-ssl=${BUILDLINK_PREFIX.openssl} \
--localstatedir=${VARBASE}
-CONFIGURE_ENV+= CPP="${CPP}"
+CONFIGURE_ENV+= CPP=${CPP:Q}
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 43c6f165de3..d757c0c38e4 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2005/08/30 20:46:23 tron Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:57 rillig Exp $
-.include "../nessus/Makefile.common"
+.include "../../security/nessus/Makefile.common"
DISTNAME= nessus-plugins-GPL-${VERS}
PKGREVISION= 2
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= cat gzip
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-CONFIGURE_ENV+= CAT="${TOOLS_CAT}" GZIP=${TOOLS_GZIP_CMD:Q}
+CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q} GZIP=${TOOLS_GZIP_CMD:Q}
PLIST_SRC= ${WRKDIR}/PLIST PLIST
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 441471092b8..fe9a51ec15a 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2005/08/09 21:33:23 tron Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:57 rillig Exp $
-.include "../nessus/Makefile.common"
+.include "../../security/nessus/Makefile.common"
DISTNAME= nessus-${VERS}
MASTER_SITES= # empty
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 892ce7012ee..83267d3b56b 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/09/06 21:11:57 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:57 rillig Exp $
DISTNAME= nikto-1.35
PKGREVISION= 2
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}nb2
CATEGORIES= security www
MASTER_SITES= http://www.cirt.net/nikto/
@@ -21,7 +21,7 @@ USE_PKGINSTALL= YES
# NOTE: this package will not work with pkgviews due to a hardcoded
# location for nmap.
#
-SUBST_CLASSES= conf
+SUBST_CLASSES+= conf
SUBST_STAGE.conf= post-patch
SUBST_FILES.conf= config.txt
SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g"
diff --git a/security/openpam/Makefile b/security/openpam/Makefile
index 449df07838b..528cb09d441 100644
--- a/security/openpam/Makefile
+++ b/security/openpam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:14 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:57 rillig Exp $
DISTNAME= openpam-20050201
CATEGORIES= security
@@ -6,7 +6,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openpam/}
MAINTAINER= jlam@NetBSD.org
HOMEPAGE= http://www.openpam.org/
-COMMENT= open-source PAM library
+COMMENT= Open-source PAM library
CONFLICTS+= PAM-[0-9]*
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 7b088b71540..398abca3a94 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/10/07 17:43:29 reed Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:57 rillig Exp $
# NOTE: This package is modeled on ../openssh, but does not share
# files with it as that package may update faster than the gssapi
@@ -107,8 +107,8 @@ ASKPASS_PROGRAM= ${X11BASE}/bin/ssh-askpass
.else
ASKPASS_PROGRAM= ${X11PREFIX}/bin/ssh-askpass
.endif
-CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM}
-MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM}
+CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q}
+MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q}
CONFS= ssh_config sshd_config moduli
@@ -129,7 +129,7 @@ OWN_DIRS= ${OPENSSH_CHROOT}
RCD_SCRIPTS= sshd
PLIST_SRC+= ${.CURDIR}/PLIST
-FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR}
+FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q}
MESSAGE_SUBST+= EGDIR=${EGDIR}
MESSAGE_SUBST+= OPENSSH_USER=${OPENSSH_USER}
MESSAGE_SUBST+= OPENSSH_GROUP=${OPENSSH_GROUP}
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index c29eb1916fc..80e6274d617 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.160 2005/11/14 22:36:17 grant Exp $
+# $NetBSD: Makefile,v 1.161 2005/12/05 20:50:57 rillig Exp $
DISTNAME= openssh-4.2p1
PKGNAME= openssh-4.2.1
-PKGREVISION=
SVR4_PKGNAME= ossh
CATEGORIES= security
MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
@@ -109,8 +108,8 @@ ASKPASS_PROGRAM= ${X11BASE}/bin/ssh-askpass
.else
ASKPASS_PROGRAM= ${X11PREFIX}/bin/ssh-askpass
.endif
-CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM}
-MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM}
+CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q}
+MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q}
# do the same for xauth
.if exists(${X11BASE}/bin/xauth)
@@ -140,7 +139,7 @@ OWN_DIRS= ${OPENSSH_CHROOT}
RCD_SCRIPTS= sshd
PLIST_SRC+= ${.CURDIR}/PLIST
-FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR}
+FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q}
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 2852dd253d0..93fd55e518f 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2005/10/15 06:29:58 jlam Exp $
+# $NetBSD: Makefile,v 1.109 2005/12/05 20:50:57 rillig Exp $
OPENSSL_SNAPSHOT?= # empty
OPENSSL_STABLE?= # empty
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+= irix64-mips4-cc
.include "../../security/openssl/options.mk"
CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS}
-CONFIGURE_ENV+= PERL="${PERL5}"
+CONFIGURE_ENV+= PERL=${PERL5:Q}
PLIST_OPSYS= ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}
.if exists(${PLIST_OPSYS})
diff --git a/security/p0f/Makefile b/security/p0f/Makefile
index ca9e6e48dcc..b9ded4847c5 100644
--- a/security/p0f/Makefile
+++ b/security/p0f/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:32 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:57 rillig Exp $
#
DISTNAME= p0f-2.0.5
@@ -19,7 +19,7 @@ CONF_FILES= ${PREFIX}/share/examples/p0f/p0f.fp ${PKG_SYSCONFDIR}/p0f.fp
CONF_FILES+= ${PREFIX}/share/examples/p0f/p0fa.fp ${PKG_SYSCONFDIR}/p0fa.fp
CONF_FILES+= ${PREFIX}/share/examples/p0f/p0fr.fp ${PKG_SYSCONFDIR}/p0fr.fp
-SUBST_CLASSES= paths
+SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-build
SUBST_FILES.paths= config.h p0f.1
SUBST_SED.paths= -e "s|/etc/p0f|${PKG_SYSCONFDIR}|g"
diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile
index f8d8cc74a72..124cefb4fa4 100644
--- a/security/p5-Digest/Makefile
+++ b/security/p5-Digest/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/11/23 22:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:57 rillig Exp $
#
DISTNAME= Digest-1.13
PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5dig
-PKGREVISION= # empty
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Digest/}
diff --git a/security/p5-Net-DNS-SEC/Makefile b/security/p5-Net-DNS-SEC/Makefile
index 37912557396..90b549b8368 100644
--- a/security/p5-Net-DNS-SEC/Makefile
+++ b/security/p5-Net-DNS-SEC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/22 20:05:01 heinz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:57 rillig Exp $
#
DISTNAME= Net-DNS-SEC-0.12
@@ -20,7 +20,7 @@ DEPENDS+= p5-Digest-SHA1>=2.04:../../security/p5-Digest-SHA1
DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
DEPENDS+= p5-Digest-BubbleBabble>=0.01:../../security/p5-Digest-BubbleBabble
-BUILDLINK_DEPENDS.perl= perl>=5.6.1
+BUILDLINK_DEPENDS.perl+= perl>=5.6.1
USE_PKGINSTALL= YES
PERL5_PACKLIST= auto/Net/DNS/SEC/.packlist
diff --git a/security/pflkm/Makefile b/security/pflkm/Makefile
index f5edb880d41..da95c4d6629 100644
--- a/security/pflkm/Makefile
+++ b/security/pflkm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/23 11:48:51 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:57 rillig Exp $
DISTNAME= pflkm-20050511
CATEGORIES= security
@@ -92,7 +92,7 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/usr.sbin/tcpdump/pftcpdump.cat8 ${PREFIX}/man/cat8/pftcpdump.0
${INSTALL_MAN} ${WRKSRC}/usr.sbin/tcpdump/pftcpdump.8 ${PREFIX}/man/man8/pftcpdump.8
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= man/pfsync.4 man/pf.conf.5
SUBST_FILES.path+= sbin/pfctl/pfctl.8 sbin/pfctl/pfctl_parser.h
diff --git a/security/php-mcrypt/Makefile b/security/php-mcrypt/Makefile
index 5d25ccb585d..cfb60375440 100644
--- a/security/php-mcrypt/Makefile
+++ b/security/php-mcrypt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:17 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:58 rillig Exp $
MODNAME= mcrypt
CATEGORIES+= security
-PKGREVISION= # empty
COMMENT= PHP extension for the mcrypt crypto algorithms library
diff --git a/security/php-mhash/Makefile b/security/php-mhash/Makefile
index d41f5ff5cef..7eaa4f3443b 100644
--- a/security/php-mhash/Makefile
+++ b/security/php-mhash/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:17 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:58 rillig Exp $
MODNAME= mhash
CATEGORIES+= security
-PKGREVISION= # empty
COMMENT= PHP extension for the mhash hash algorithms library
diff --git a/security/pinepgp/Makefile b/security/pinepgp/Makefile
index ab838ab50a7..555d4de9e8d 100644
--- a/security/pinepgp/Makefile
+++ b/security/pinepgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/24 18:29:14 kristerw Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:58 rillig Exp $
#
DISTNAME= pinepgp-0.18.0
@@ -17,7 +17,7 @@ DEPENDS+= bash>=2:../../shells/bash2
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= cat
-CONFIGURE_ENV+= CAT="${TOOLS_CAT}"
+CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q}
PINEPGP_USEGPG?= yes
PINEPGP_USEPGP5?= yes
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 42b3de79698..e6cf4e7a186 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/10/23 19:59:54 adrianp Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:58 rillig Exp $
DISTNAME= pks-0.9.4
PKGREVISION= 3
@@ -35,8 +35,8 @@ EGDIR= ${PREFIX}/share/examples
CONF_FILES= ${EGDIR}/pksd.conf ${PKG_SYSCONFDIR}/pksd.conf
RCD_SCRIPTS= pksd
-FILES_SUBST+= PKS_USER=${PKS_USER}
-FILES_SUBST+= PKS_GROUP=${PKS_GROUP}
+FILES_SUBST+= PKS_USER=${PKS_USER:Q}
+FILES_SUBST+= PKS_GROUP=${PKS_GROUP:Q}
OWN_DIRS_PERMS+= ${PKS_HOME} ${PKS_USER} ${PKS_GROUP} 0770
OWN_DIRS_PERMS+= ${PKS_HOME}/db ${PKS_USER} ${PKS_GROUP} 0770
@@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --localstatedir=${PKS_HOME}
#
CONFIGURE_ARGS+= --sysconfdir=${EGDIR}
-SUBST_CLASSES= paths
+SUBST_CLASSES+= paths
SUBST_MESSAGE.paths= "Fixing hardcoded paths."
SUBST_STAGE.paths= post-patch
SUBST_FILES.paths= pks-commands.html
diff --git a/security/prngd/Makefile b/security/prngd/Makefile
index b242967b085..7faf786bd46 100644
--- a/security/prngd/Makefile
+++ b/security/prngd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/07 10:03:13 uebayasi Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:58 rillig Exp $
DISTNAME= prngd-0.9.29
CATEGORIES= security
@@ -21,7 +21,7 @@ CONF_FILES= ${EGDIR}/prngd.conf.netbsd ${PKG_SYSCONFDIR}/prngd.conf
INSTALLATION_DIRS= bin man/man1
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= pre-install
SUBST_FILES.path= prngd.man
SUBST_SED.path= -e 's,/usr/local,${PREFIX},g'
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index a130bbe3cec..59b253fda81 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:58 rillig Exp $
#
DISTNAME= m2crypto-0.12
@@ -15,7 +15,7 @@ COMMENT= Crypto and SSL toolkit for Python
PYDISTUTILSPKG= yes
PYTHON_VERSIONS_ACCEPTED= 23 22 21
-BUILDLINK_DEPENDS.openssl= openssl>=0.9.7b
+BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7b
.include "../../lang/python/extension.mk"
.include "../../devel/swig-build/buildlink3.mk"
diff --git a/security/qca/Makefile b/security/qca/Makefile
index 9e37ad5bfac..3257927b7eb 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:32 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:58 rillig Exp $
DISTNAME= qca-1.0
-PKGREVISION= # empty
CATEGORIES= security
MASTER_SITES= http://delta.affinix.com/qca/
EXTRACT_SUFX= .tar.bz2
diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile
index 66a5156d90e..a4ad42f6fd5 100644
--- a/security/smtpd/Makefile
+++ b/security/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/29 19:49:40 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:58 rillig Exp $
#
DISTNAME= smtpd-2.0
@@ -19,21 +19,21 @@ RCD_SCRIPTS= smtpfwdd
FILES_SUBST+= SPOOL=${SPOOL:Q}
# taken directly from the Makefile.
-CFLAGS.NetBSD= -DUSE_FLOCK -DUSE_MKSTEMP
-CFLAGS.DragonFly= -DUSE_FLOCK -DUSE_MKSTEMP
-CFLAGS.SunOS= -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_STRINGS_H -DBROKEN_SUN_INCLUDES
-CFLAGS.IRIX= -DGETOPT_EOF -DUSE_FLOCK -DNEEDS_FCNTL_H -DNEEDS_BSTRING_H -DIRIX_BROKEN_INCLUDES
-CFLAGS.AIX= -DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_STRINGS_H -DNEEDS_SELECT_H
-OPSYSVARS= LD_LIBS
-LD_LIBS.SunOS= -lnsl -lsocket -lresolv
-MAKE_ENV+= LD_LIBS="${LD_LIBS}"
+CFLAGS.NetBSD+= -DUSE_FLOCK -DUSE_MKSTEMP
+CFLAGS.DragonFly+= -DUSE_FLOCK -DUSE_MKSTEMP
+CFLAGS.SunOS+= -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_STRINGS_H -DBROKEN_SUN_INCLUDES
+CFLAGS.IRIX+= -DGETOPT_EOF -DUSE_FLOCK -DNEEDS_FCNTL_H -DNEEDS_BSTRING_H -DIRIX_BROKEN_INCLUDES
+CFLAGS.AIX+= -DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_STRINGS_H -DNEEDS_SELECT_H
+OPSYSVARS+= LD_LIBS
+LD_LIBS.SunOS+= -lnsl -lsocket -lresolv
+MAKE_ENV+= LD_LIBS=${LD_LIBS:Q}
.include "../../mk/bsd.prefs.mk"
INSTALLATION_DIRS= sbin
do-install:
- -${INSTALL_DATA_DIR} ${SPOOL}/etc
+ ${INSTALL_DATA_DIR} ${SPOOL}/etc
${INSTALL} -m 500 ${WRKSRC}/smtpd ${PREFIX}/sbin/smtpd
${INSTALL} -m 500 ${WRKSRC}/smtpfwdd ${PREFIX}/sbin/smtpfwdd
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smtpd
diff --git a/security/sniff/Makefile b/security/sniff/Makefile
index 555a7de2a8f..68588b506b4 100644
--- a/security/sniff/Makefile
+++ b/security/sniff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:19 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:58 rillig Exp $
#
DISTNAME= sniff-2.0
@@ -13,7 +13,7 @@ COMMENT= Program to sniff logins and passwords
.if ${OPSYS} == "SunOS"
LIBS+= -lsocket -lnsl
-MAKE_ENV+= LIBS="${LIBS}"
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
.endif
.include "../../net/libpcap/buildlink3.mk"
diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common
index 39ca6c84d61..ce4f4bc6328 100644
--- a/security/ssh2/Makefile.common
+++ b/security/ssh2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2005/10/23 23:11:09 rillig Exp $
+# $NetBSD: Makefile.common,v 1.15 2005/12/05 20:50:58 rillig Exp $
#
DISTNAME= ssh-3.2.9.1
@@ -6,7 +6,7 @@ CATEGORIES= security
MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/
MAINTAINER= seb@NetBSD.org
-HOMEPAGE= http://www.ssh.com
+HOMEPAGE= http://www.ssh.com/
CONFLICTS+= openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]*
CONFLICTS+= openssh+gssapi-[0-9]*
@@ -63,8 +63,8 @@ CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR}
CONFIGURE_ARGS+= --with-foreign-etcdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
-MAKE_ENV+= PKGBASE=${PKGBASE}
-MAKE_ENV+= RM="${RM}"
+MAKE_ENV+= PKGBASE=${PKGBASE:Q}
+MAKE_ENV+= RM=${RM:Q}
RCD_SCRIPTS= ssh2_secure_shell
@@ -77,7 +77,7 @@ CONF_FILES= # empty
.for FILE in ${CONFS}
CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
.endfor
-FILES_SUBST= SSH_PID_DIR=${SSH_PID_DIR}
+FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q}
OWN_DIRS= ${PKG_SYSCONFDIR}/knownhosts
OWN_DIRS+= ${PKG_SYSCONFDIR}/hostkeys
diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile
index b66d3271615..0ca056fd78a 100644
--- a/security/sslwrap/Makefile
+++ b/security/sslwrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/10/10 09:16:48 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:58 rillig Exp $
#
DISTNAME= ${PKGNAME_NOREV:S/-//}
@@ -15,8 +15,8 @@ COMMENT= Simple SSL wrapper
OPSYSVARS+= LDADD
LDADD.SunOS= -lnsl -lsocket
MAKE_ENV+= LDADD=${LDADD:Q}
-MAKE_ENV+= BINOWN=${BINOWN}
-MAKE_ENV+= BINGRP=${BINGRP}
+MAKE_ENV+= BINOWN=${BINOWN:Q}
+MAKE_ENV+= BINGRP=${BINGRP:Q}
.include "../../security/openssl/buildlink3.mk"
diff --git a/security/tct/Makefile b/security/tct/Makefile
index f57062fef78..6207e69e3d8 100644
--- a/security/tct/Makefile
+++ b/security/tct/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/08/06 06:19:31 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:58 rillig Exp $
#
DISTNAME= tct-1.09
@@ -17,7 +17,7 @@ REPLACE_PERL= bin/grave-robber bin/mactime bin/strip_tct_home
REPLACE_PERL+= extras/bdf extras/ils2mac extras/realpath
REPLACE_PERL+= lazarus/lazarus
-MAKE_ENV+= PERL5="${PERL5}"
+MAKE_ENV+= PERL5=${PERL5:Q}
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/tct/bin
diff --git a/security/tripwire/distinfo b/security/tripwire/distinfo
index 883986044d0..aca552ab71f 100644
--- a/security/tripwire/distinfo
+++ b/security/tripwire/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 13:10:14 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/12/05 20:50:58 rillig Exp $
SHA1 (tripwire-1.2.tar.gz) = 6fc91e25b3e1af3881fd5b6acf240ab6c1133e38
RMD160 (tripwire-1.2.tar.gz) = f745db5973f14b1abbc0c2e7030f90e6fdac3257
@@ -7,10 +7,10 @@ SHA1 (patch-aa) = 2a03c5970becef18d0b655cc5e91a1db070111f8
SHA1 (patch-ab) = 186edaa504e6e1a7edadb2168982b9b8a2482bac
SHA1 (patch-ac) = 35b3fe52f497e6cbbf7edfeaee398f0d24aff219
SHA1 (patch-ad) = 4b8ad8d0cd7c17a8f3a655c5a574856670533ea5
-SHA1 (patch-ae) = 18fe18ded565476a80b9280054cdf7f90403588e
-SHA1 (patch-af) = b8238aa69ddab6c74ac9057bdc58acbce0f50c0e
+SHA1 (patch-ae) = 6eb1767af3d881ed4181ab83bd02c960edd0a84e
+SHA1 (patch-af) = 1e4eb327ddda18ef08d4b62ca846262dfdf059a6
SHA1 (patch-ag) = 3bfc6965782d727b6b5cf20da4dd44e45327925f
SHA1 (patch-ah) = 97eccc44190e165dbf174f04c3acab5f1b442bc7
-SHA1 (patch-ai) = 51075e32a7523a8d1691aa41336fe46b671fa865
+SHA1 (patch-ai) = c01404b4036d8607c0eea294d2c87d7f454e9abe
SHA1 (patch-aj) = 87a7df6f487339cf06ec662492db4fc238674488
SHA1 (patch-ak) = f97dbba31eec398322384ec72c75ba6698d55718
diff --git a/security/tripwire/patches/patch-ae b/security/tripwire/patches/patch-ae
index 6f91bcdfd90..c11b40d78fb 100644
--- a/security/tripwire/patches/patch-ae
+++ b/security/tripwire/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2003/12/05 05:40:32 ben Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/05 20:50:58 rillig Exp $
--- src/config.parse.c.orig 1994-07-20 18:03:26.000000000 -0700
+++ src/config.parse.c
-@@ -55,7 +55,6 @@ static char rcsid[] = "$Id: config.parse
+@@ -55,7 +55,6 @@
#endif
/* prototypes */
diff --git a/security/tripwire/patches/patch-af b/security/tripwire/patches/patch-af
index c6fbc789b9c..27a22366ac4 100644
--- a/security/tripwire/patches/patch-af
+++ b/security/tripwire/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2003/12/09 19:17:37 ben Exp $
+$NetBSD: patch-af,v 1.3 2005/12/05 20:50:58 rillig Exp $
--- src/dbase.build.c.orig 1994-07-25 08:24:09.000000000 -0700
+++ src/dbase.build.c
-@@ -66,7 +66,6 @@ static char rcsid[] = "$Id: dbase.build.
+@@ -66,7 +66,6 @@
int files_scanned_num = 0;
/* prototypes */
diff --git a/security/tripwire/patches/patch-ai b/security/tripwire/patches/patch-ai
index 164f42bb3b3..2bc7bbbe49d 100644
--- a/security/tripwire/patches/patch-ai
+++ b/security/tripwire/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2003/12/05 05:40:32 ben Exp $
+$NetBSD: patch-ai,v 1.2 2005/12/05 20:50:58 rillig Exp $
--- src/siggen.c.orig 1994-07-25 08:24:12.000000000 -0700
+++ src/siggen.c
-@@ -52,7 +52,6 @@ static char rcsid[] = "$Id: siggen.c,v 1
+@@ -52,7 +52,6 @@
extern int optind;
int debuglevel = 0;
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index d3e670939e4..6b988ea88d1 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/09/18 13:51:09 taca Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:58 rillig Exp $
DISTNAME= zebedee-2.5.3
CATEGORIES= security
@@ -12,8 +12,8 @@ DEPENDS+= tcl-[0-9]*:../../lang/tcl
USE_TOOLS+= gmake perl
-MAKE_ENV+= PERL5=${PERL5}
-MAKE_FLAGS= OS=${LOWER_OPSYS}
+MAKE_ENV+= PERL5=${PERL5:Q}
+MAKE_FLAGS+= OS=${LOWER_OPSYS:Q}
.include "../../mk/pthread.buildlink3.mk"
diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common
index 1a560de7b55..95644b78b33 100644
--- a/shells/ast-ksh/Makefile.common
+++ b/shells/ast-ksh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2005/07/29 18:32:17 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/12/05 20:50:58 rillig Exp $
DISTNAME= ast-ksh-${ASTKSH_VERSION}
PKGNAME= ast-ksh-${ASTKSH_VERSION:S/-//g}
@@ -26,7 +26,7 @@ ASTKSH_VERSION= 2003-07-24
WRKSRC= ${WRKDIR}
USE_PKGINSTALL= YES
-MAKE_FLAGS= CC="${CC}" CCFLAGS="${CFLAGS}"
+MAKE_FLAGS+= CC=${CC:Q} CCFLAGS=${CFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 1ed276eac47..f17b2ab149c 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:58 rillig Exp $
DISTNAME= bash-3.0
PKGNAME= bash-3.0pl16
@@ -25,7 +25,7 @@ USE_MAKEINFO= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-MAKE_ENV+= INSTALL_SCRIPT='${INSTALL_SCRIPT}'
+MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
TEST_TARGET= test
INFO_FILES= bash.info
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index f0166cb981a..7b624a7419d 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2005/12/05 20:50:58 rillig Exp $
#
DISTNAME= bash-2.05b
@@ -24,7 +24,7 @@ USE_GNU_READLINE= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-installed-readline
-MAKE_ENV+= INSTALL_SCRIPT='${INSTALL_SCRIPT}'
+MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
TEST_TARGET= test
PKG_SHELL= bin/bash
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index f1a3f8f4fc2..53e1bc0ffc7 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 03:04:28 snj Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:59 rillig Exp $
DISTNAME= scponly-4.1
CATEGORIES= shells security
@@ -12,21 +12,21 @@ COMMENT= Tiny shell that only permits scp and sftp
GNU_CONFIGURE= yes
USE_TOOLS+= chgrp chmod chown echo id ln ls mkdir mv pwd rm rmdir
-CONFIGURE_ENV+= scponly_PROG_CHGRP="${TOOLS_CHGRP}"
-CONFIGURE_ENV+= PROG_CHMOD="${TOOLS_CHMOD}"
-CONFIGURE_ENV+= scponly_PROG_CHMOD="${TOOLS_CHMOD}"
-CONFIGURE_ENV+= PROG_CHOWN="${TOOLS_CHOWN}"
-CONFIGURE_ENV+= scponly_PROG_CHOWN="${TOOLS_CHOWN}"
-CONFIGURE_ENV+= ac_cv_path_scponly_PROG_ECHO="${TOOLS_ECHO}"
-CONFIGURE_ENV+= scponly_PROG_ID="${TOOLS_ID}"
-CONFIGURE_ENV+= scponly_PROG_LN="${TOOLS_LN}"
-CONFIGURE_ENV+= scponly_PROG_LS="${TOOLS_LS}"
-CONFIGURE_ENV+= scponly_PROG_MKDIR="${TOOLS_MKDIR}"
-CONFIGURE_ENV+= scponly_PROG_MV="${TOOLS_MV}"
-CONFIGURE_ENV+= scponly_PROG_PWD="${TOOLS_PWD_CMD}"
-CONFIGURE_ENV+= PROG_RM="${TOOLS_RM}"
-CONFIGURE_ENV+= scponly_PROG_RM="${TOOLS_RM}"
-CONFIGURE_ENV+= scponly_PROG_RMDIR="${TOOLS_RMDIR}"
+CONFIGURE_ENV+= scponly_PROG_CHGRP=${TOOLS_CHGRP:Q}
+CONFIGURE_ENV+= PROG_CHMOD=${TOOLS_CHMOD:Q}
+CONFIGURE_ENV+= scponly_PROG_CHMOD=${TOOLS_CHMOD:Q}
+CONFIGURE_ENV+= PROG_CHOWN=${TOOLS_CHOWN:Q}
+CONFIGURE_ENV+= scponly_PROG_CHOWN=${TOOLS_CHOWN:Q}
+CONFIGURE_ENV+= ac_cv_path_scponly_PROG_ECHO=${TOOLS_ECHO:Q}
+CONFIGURE_ENV+= scponly_PROG_ID=${TOOLS_ID:Q}
+CONFIGURE_ENV+= scponly_PROG_LN=${TOOLS_LN:Q}
+CONFIGURE_ENV+= scponly_PROG_LS=${TOOLS_LS:Q}
+CONFIGURE_ENV+= scponly_PROG_MKDIR=${TOOLS_MKDIR:Q}
+CONFIGURE_ENV+= scponly_PROG_MV=${TOOLS_MV:Q}
+CONFIGURE_ENV+= scponly_PROG_PWD=${TOOLS_PWD_CMD:Q}
+CONFIGURE_ENV+= PROG_RM=${TOOLS_RM:Q}
+CONFIGURE_ENV+= scponly_PROG_RM=${TOOLS_RM:Q}
+CONFIGURE_ENV+= scponly_PROG_RMDIR=${TOOLS_RMDIR:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
USE_PKGINSTALL= yes
PKG_SHELL= bin/scponly
diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile
index 80f2e668a8f..67539404bf4 100644
--- a/shells/standalone-tcsh/Makefile
+++ b/shells/standalone-tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:59 rillig Exp $
#
NO_MTREE= YES
@@ -17,7 +17,8 @@ PKG_INFO:= ${PKG_INFO}
PKG_CREATE:= ${PKG_CREATE}
PREFIX= /
NLSDIR= usr/share/nls
-CONFIGURE_ARGS= --prefix=${PREFIX} --bindir=/bin
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --bindir=/bin
CONFIGURE_ARGS+= --mandir=/usr/share/man
DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo
diff --git a/shells/zsh3/hacks.mk b/shells/zsh3/hacks.mk
index e5598f53366..0f8feb5c950 100644
--- a/shells/zsh3/hacks.mk
+++ b/shells/zsh3/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.2 2005/01/25 18:22:24 tv Exp $
+# $NetBSD: hacks.mk,v 1.3 2005/12/05 20:50:59 rillig Exp $
-.ifndef ZSH3_HACKS_MK
+.if !defined(ZSH3_HACKS_MK)
ZSH3_HACKS_MK= # defined
### [Mon Jan 24 22:27:33 UTC 2005 : tv]
diff --git a/sysutils/855resolution/Makefile b/sysutils/855resolution/Makefile
index 03be96b380e..7f6cc3eea79 100644
--- a/sysutils/855resolution/Makefile
+++ b/sysutils/855resolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/10/20 10:06:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:59 rillig Exp $
#
DISTNAME= 855resolution-0.4
@@ -13,6 +13,6 @@ COMMENT= BIOS VESA resolution utility for 855/865/915 Intel chips
ONLY_FOR_PLATFORM= NetBSD-*-i386
WRKSRC= ${WRKDIR}/855resolution
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index b67aa632eaf..b833cd4cbed 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/08/02 09:26:06 seb Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:59 rillig Exp $
#
# common make file fragment shared by all amanda-* pkgs.
#
@@ -29,8 +29,8 @@ USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
USE_TOOLS+= gzip:run gtar:run
-CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD}
-CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR}
+CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
+CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q}
TOOLS_DEPENDS.gtar= {gtar,gtar-base}>=1.12:../../archivers/gtar-base
GNU_CONFIGURE= yes
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 80bc17f5878..193e1a117ab 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/08/19 18:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:59 rillig Exp $
DISTNAME= apcupsd-3.8.6
PKGREVISION= 4
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
# this breaks .in files that uses @sbindir@
CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
-CONFIGURE_ENV+= SCRIPTSHELL="${TOOLS_SH}"
+CONFIGURE_ENV+= SCRIPTSHELL=${TOOLS_SH:Q}
EGDIR= ${PREFIX}/share/examples/apcupsd
diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
index 0d9734136ea..7eb32d1475b 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/12/03 15:15:09 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:59 rillig Exp $
DISTNAME= apNetBSD
PKGNAME= aperture-2.0
@@ -26,12 +26,12 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
WRKSRC= ${WRKDIR}
BUILD_TARGET= cleandir depend all
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}nb5
INSTALL_TARGET= dirs includes install
MANCOMPRESSED_IF_MANZ= YES
NO_CONFIGURE= YES
OSVERSION_SPECIFIC= YES
-MAKE_ENV+= BSDSRCDIR="${BSDSRCDIR}"
+MAKE_ENV+= BSDSRCDIR=${BSDSRCDIR:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 478be3c9eeb..7e1c451dbca 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:59 rillig Exp $
#
DISTNAME= asapm-2.11
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.tigr.net/afterstep/detail.pl?applet=asapm
COMMENT= Laptop battery status display for X11
.if !exists(/usr/include/machine/apmvar.h)
-PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}"
+PKG_SKIP_REASON+= "APM is not available for ${MACHINE_PLATFORM}"
.endif
GNU_CONFIGURE= YES
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 35c4d5d4488..84aa436c156 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2005/11/22 19:33:06 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:59 rillig Exp $
CONFLICTS+= bacula-client-[0-9]*
.include "options.mk"
-PLIST_SUBST+= BACULA_DB=${BACULA_DB}
+PLIST_SUBST+= BACULA_DB=${BACULA_DB:Q}
MESSAGE_SUBST+= PREFIX=${PREFIX}
MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV}
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 724d8046b50..d6b97b18cfc 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/11/22 18:35:25 wiz Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:59 rillig Exp $
DISTNAME= bacula-1.38.1
CATEGORIES= sysutils
@@ -24,11 +24,11 @@ BACULA_WORKINGDIR?= ${VARBASE}/spool/bacula
OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770
-FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR}
-FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR}
-FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP}
-FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER}
-FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER}
+FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR:Q}
+FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR:Q}
+FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP:Q}
+FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER:Q}
+FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula
diff --git a/sysutils/bacula/hacks.mk b/sysutils/bacula/hacks.mk
index 93f891dd808..04c94415455 100644
--- a/sysutils/bacula/hacks.mk
+++ b/sysutils/bacula/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.1 2005/11/22 18:35:25 wiz Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:59 rillig Exp $
-.ifndef BACULA_HACKS_MK
+.if !defined(BACULA_HACKS_MK)
BACULA_HACKS_MK= #defined
### gcc 4.0* has been reported to produce bad code on amd64
diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
index 9b9faa39314..26eac4da69a 100644
--- a/sysutils/bchunk/Makefile
+++ b/sysutils/bchunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:59 rillig Exp $
DISTNAME= bchunk-1.1.1
CATEGORIES= sysutils
@@ -8,7 +8,7 @@ MAINTAINER= pooka@NetBSD.org
HOMEPAGE= http://hes.iki.fi/bchunk/
COMMENT= ".bin/.cue" CD image converter
-MAKE_FLAGS+= CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}"
+MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:M*:Q}
INSTALLATION_DIRS= bin man/man1
diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile
index b733ca29796..34db5c2fe04 100644
--- a/sysutils/bkpupsd/Makefile
+++ b/sysutils/bkpupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:59 rillig Exp $
#
DISTNAME= bkpupsd-2.1.2
@@ -20,8 +20,8 @@ USE_PKGINSTALL= YES
.include "../../mk/bsd.prefs.mk"
DOCDIR= ${PREFIX}/share/doc/bkpupsd
-MAKE_ENV+= DEFAULT_DEVICE=${DEFAULT_SERIAL_DEVICE} DOCDIR=${DOCDIR} \
- RCD_SCRIPTS_EXAMPLEDIR=${RCD_SCRIPTS_EXAMPLEDIR}
+MAKE_ENV+= DEFAULT_DEVICE=${DEFAULT_SERIAL_DEVICE:Q} DOCDIR=${DOCDIR:Q} \
+ RCD_SCRIPTS_EXAMPLEDIR=${RCD_SCRIPTS_EXAMPLEDIR:Q}
MESSAGE_SUBST+= DOCDIR=${DOCDIR}
diff --git a/sysutils/ccze/Makefile b/sysutils/ccze/Makefile
index 113b59f20ac..3610153151a 100644
--- a/sysutils/ccze/Makefile
+++ b/sysutils/ccze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:31 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:59 rillig Exp $
DISTNAME= ccze-0.2.1
CATEGORIES= sysutils
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://bonehunter.rulez.org/software/ccze/
COMMENT= Log coloriser, fast and light on resources
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6*-*
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index 69bf3bf3250..4a596434383 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:20 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:59 rillig Exp $
DISTNAME= cdbkup-1.0
PKGREVISION= 3
@@ -17,9 +17,9 @@ DEPENDS+= cdrecord>=1.10:../../sysutils/cdrecord
GNU_CONFIGURE= YES
USE_TOOLS+= cat date gtar perl:run
-CONFIGURE_ENV+= CAT="${TOOLS_CAT}"
-CONFIGURE_ENV+= DATE="${TOOLS_DATE}"
-CONFIGURE_ENV+= GNUTAR="${TOOLS_TAR}"
+CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q}
+CONFIGURE_ENV+= DATE=${TOOLS_DATE:Q}
+CONFIGURE_ENV+= GNUTAR=${TOOLS_TAR:Q}
.if (${OPSYS} == SunOS)
CDBKUP_SNARDIR?= /var/${PKGBASE}
@@ -31,8 +31,8 @@ CDBKUP_DUMPGRP?= operator
CONFIGURE_ARGS+= --with-snardir=${CDBKUP_SNARDIR} \
--with-dumpgrp=${CDBKUP_DUMPGRP}
-PLIST_SUBST+= CDBKUP_SNARDIR=${CDBKUP_SNARDIR} \
- CDBKUP_DUMPGRP=${CDBKUP_DUMPGRP} \
- INSTALL=${INSTALL} RMDIR=${RMDIR} TRUE=${TRUE}
+PLIST_SUBST+= CDBKUP_SNARDIR=${CDBKUP_SNARDIR:Q} \
+ CDBKUP_DUMPGRP=${CDBKUP_DUMPGRP:Q} \
+ INSTALL=${INSTALL:Q} RMDIR=${RMDIR:Q} TRUE=${TRUE:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrecord-xcdroast/Makefile b/sysutils/cdrecord-xcdroast/Makefile
index 7eccc45e19f..a63e0838b04 100644
--- a/sysutils/cdrecord-xcdroast/Makefile
+++ b/sysutils/cdrecord-xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:31 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:59 rillig Exp $
DISTNAME= cdrtools-2.01a21
PKGNAME= cdrecord-xcdroast-0.98a15.2.01a21
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//}
USE_TOOLS+= gmake
.if ${LOCALBASE} != "/opt/schily"
-BUILDLINK_TRANSFORM= rmdir:/opt/schily
+BUILDLINK_TRANSFORM+= rmdir:/opt/schily
.endif
# avoid picking up a bad ${ARCH} during the build
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 9e5f87b65f7..b0c40435cc4 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/05/22 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2005/12/05 20:50:59 rillig Exp $
DISTNAME= cdrtools-2.00.3
PKGNAME= cdrecord-2.00.3
@@ -21,8 +21,8 @@ USE_TOOLS+= gmake tbl
# avoid picking up a bad ${ARCH} during the build
MAKE_ENV+= ARCH=""
MAKE_ENV+= MAKEPROG="gmake"
-MAKE_ENV+= COPTX="${CFLAGS}"
-MAKE_ENV+= LDOPTX="${LDFLAGS}"
+MAKE_ENV+= COPTX=${CFLAGS:M*:Q}
+MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q}
# if we're using a gcc which is named gcc, we need to set CCOM=gcc
# in MAKE_ENV so the make infrastructure picks the right options.
@@ -80,7 +80,7 @@ do-install:
${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin; \
${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1
-SUBST_CLASSES= fix
+SUBST_CLASSES+= fix
SUBST_STAGE.fix= post-patch
SUBST_FILES.fix= cdrecord/defaults.c cdrecord/cdrecord.1 \
readcd/readcd.1
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index f3a03554272..7b27a629893 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/24 21:47:57 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:59 rillig Exp $
DISTNAME= cdrtools-2.01.01a01
PKGNAME= cdrtools-ossdvd-2.01.1.34
@@ -29,8 +29,8 @@ BUILDLINK_TRANSFORM+= rmdir:/opt/schily
# avoid picking up a bad ${ARCH} during the build
MAKE_ENV+= ARCH=""
MAKE_ENV+= MAKEPROG="gmake"
-MAKE_ENV+= COPTX="${CFLAGS}"
-MAKE_ENV+= LDOPTX="${LDFLAGS}"
+MAKE_ENV+= COPTX=${CFLAGS:M*:Q}
+MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q}
# if we're using a gcc which is named gcc, we need to set CCOM=gcc
# in MAKE_ENV so the make infrastructure picks the right options.
diff --git a/sysutils/coreutils/MESSAGE.gsu b/sysutils/coreutils/MESSAGE.gsu
index 540e676f2a6..5540153ccec 100644
--- a/sysutils/coreutils/MESSAGE.gsu
+++ b/sysutils/coreutils/MESSAGE.gsu
@@ -1,7 +1,7 @@
===========================================================================
-$NetBSD: MESSAGE.gsu,v 1.1 2004/01/17 00:14:14 recht Exp $
+$NetBSD: MESSAGE.gsu,v 1.2 2005/12/05 20:50:59 rillig Exp $
-The GNU ${PKGNAME} version of su doesn't support the wheel group.
+The GNU ${PKGNAME} version of su doesn't support the wheel group.
Because of that it is installed without the setuid bit on ${OPSYS}.
===========================================================================
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index c4d6cbe280a..0bb9587b8df 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/08/28 09:07:21 tron Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:59 rillig Exp $
DISTNAME= coreutils-5.2.1
PKGREVISION= 1
@@ -39,7 +39,7 @@ PLIST_SUBST+= COREUTILS_HAVE_HOSTID="@comment "
PLIST_SUBST+= COREUTILS_HAVE_HOSTID=""
.endif
-CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX}
+CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
# if GNU_PROGRAM_PREFIX == 'g'
# devel/id-utils installs a 'gid' program, so conflict with it
# databases/geneweb a 'gwc' program, so conflict with it
@@ -55,7 +55,7 @@ CONFLICTS+= graphviz-[0-9]*
CONFLICTS+= teTeX-bin<3
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 2a100718678..4eaa7a7f0cb 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/17 08:41:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:00 rillig Exp $
DISTNAME= daemontools-0.76
CATEGORIES= sysutils
@@ -26,7 +26,7 @@ SAMPLERC= svscan.sh.sample
SERVICEDIR?= ${VARBASE}/spool/service
CMDDIR= ${WRKSRC}/command
-PLIST_SUBST+= SERVICEDIR=${SERVICEDIR}
+PLIST_SUBST+= SERVICEDIR=${SERVICEDIR:Q}
DEINSTALL_FILE= ${WRKDIR}/.DEINSTALL
INSTALLATION_DIRS= bin man man/man8 share/examples/daemontools
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index 9cdcfd5cfdd..ffc4acd8b69 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:23 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:51:00 rillig Exp $
#
# XXX Do not update to 0.30 or above yet. The API in the 0.2x series is
@@ -72,7 +72,6 @@ BUILD_DIRS+= ${WRKSRC}/${f}
INSTALL_DIRS+= ${WRKSRC}/${f}
SUBST_FILES.paths+= ${f}/Makefile.in
. endfor
-. undef f
BUILDLINK_DEPENDS.dbus+= dbus>=${DBUS_VERSION}
. include "../../sysutils/dbus/buildlink3.mk"
diff --git a/sysutils/depot/Makefile b/sysutils/depot/Makefile
index c536188ba09..e403ded3938 100644
--- a/sysutils/depot/Makefile
+++ b/sysutils/depot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/19 23:08:29 dent Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:00 rillig Exp $
#
DISTNAME= depot-5.14
@@ -10,8 +10,8 @@ HOMEPAGE= http://asg.web.cmu.edu/depot/
COMMENT= Maps several separate packages into a tree without merging them
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= INSTALL="" CC="${CC}"
-MAKE_ENV+= CC="${CC}"
+CONFIGURE_ENV+= INSTALL="" CC=${CC:Q}
+MAKE_ENV+= CC=${CC:Q}
do-install:
@cd ${WRKSRC}/src/cmd && ${MAKE} DESTDIR=${PREFIX} install
diff --git a/sysutils/dmidecode/distinfo b/sysutils/dmidecode/distinfo
index 4d93e5530b3..e6eeb9a1d64 100644
--- a/sysutils/dmidecode/distinfo
+++ b/sysutils/dmidecode/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/10/29 15:32:04 reed Exp $
+$NetBSD: distinfo,v 1.5 2005/12/05 20:51:00 rillig Exp $
SHA1 (dmidecode-2.7.tar.gz) = 394cd6e4535a4676d2d464a44cf8c86f25df1d83
RMD160 (dmidecode-2.7.tar.gz) = 53296b5dcc5301bb31860851d4ce58a0ce024096
Size (dmidecode-2.7.tar.gz) = 52536 bytes
-SHA1 (patch-aa) = 77aba3987226a2db2d2391d76b536f50d87e0a23
+SHA1 (patch-aa) = df099cd7fa47251280fa3be56e3e8ad2de3d8d4a
diff --git a/sysutils/dmidecode/patches/patch-aa b/sysutils/dmidecode/patches/patch-aa
index e0893dda6c3..a79fb5c3480 100644
--- a/sysutils/dmidecode/patches/patch-aa
+++ b/sysutils/dmidecode/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.3 2005/12/05 20:51:00 rillig Exp $
+
--- Makefile.orig 2005-10-28 20:13:08.000000000 -0700
+++ Makefile 2005-10-28 20:14:28.000000000 -0700
@@ -22,9 +22,9 @@
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 1168dba97fc..63754235450 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:00 rillig Exp $
#
DISTNAME= duplicity-0.4.1
@@ -10,9 +10,9 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.nongnu.org/duplicity/
COMMENT= Remote encrypting incremental backup utility
-DEPENDS= gnupg>=1.2.3:../../security/gnupg
+DEPENDS+= gnupg>=1.2.3:../../security/gnupg
-BUILDLINK_DEPENDS.librsync= librsync>=0.9.6
+BUILDLINK_DEPENDS.librsync+= librsync>=0.9.6
PYDISTUTILSPKG= yes
PYTHON_VERSIONS_ACCEPTED= 22 23
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index 1df49f9b236..adb6fd72a26 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/04 21:55:09 dbj Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:00 rillig Exp $
#
DISTNAME= dvd+rw-tools-5.21.4.10.8
@@ -11,7 +11,7 @@ COMMENT= Tools for writing DVD+R[W] disks
DEPENDS+= {cdrecord-[1-9]*,cdrtools-ossdvd-[0-9]*}:../../sysutils/cdrecord
-WRKSRC= ${WRKDIR}/${PKGNAME}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
INSTALLATION_DIRS= bin man/man1
diff --git a/sysutils/easydiskpasswd/Makefile b/sysutils/easydiskpasswd/Makefile
index bc78b52ab1c..bc3beff885c 100644
--- a/sysutils/easydiskpasswd/Makefile
+++ b/sysutils/easydiskpasswd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:00 rillig Exp $
DISTNAME= easydiskpasswd-1.0
CATEGORIES= sysutils
@@ -11,7 +11,7 @@ WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
# we depend on SCIOCCOMMAND and the "make" infrastructure
-ONLY_FOR_PLATFORM= NetBSD-*
+ONLY_FOR_PLATFORM= NetBSD-*-*
do-extract:
${CP} ${FILESDIR}/easydiskpasswd.c ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/sysutils/fdgw/Makefile b/sysutils/fdgw/Makefile
index 679f683c41b..62cb6444ad1 100644
--- a/sysutils/fdgw/Makefile
+++ b/sysutils/fdgw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/08 19:15:25 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:00 rillig Exp $
#
DISTNAME= fdgw-20020130
@@ -15,7 +15,7 @@ _IMG_DST_DIR = ${PREFIX}/fdgw/${MACHINE_ARCH}
ONLY_FOR_PLATFORM= NetBSD-1.5.*-i386
BUILD_TARGET= dist-build
-MAKE_ENV+= BSDSRCDIR="${BSDSRCDIR}"
+MAKE_ENV+= BSDSRCDIR=${BSDSRCDIR:Q}
pre-fetch:
@ ${ECHO} "";
@@ -50,7 +50,7 @@ post-install:
.include "../../mk/bsd.prefs.mk"
.if !exists(${X11BASE}/bin/lndir) && ${OPSYS} == "NetBSD"
-PKG_FAIL_REASON= "${PKGNAME} requires the 'lndir' command, and hence X11"
+PKG_FAIL_REASON+= "${PKGNAME} requires the 'lndir' command, and hence X11"
.endif
# we need the NetBSD source tree.
diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile
index e35477b7029..f9aa8eb4948 100644
--- a/sysutils/findutils/Makefile
+++ b/sysutils/findutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/10/11 01:59:49 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:51:00 rillig Exp $
DISTNAME= findutils-4.1
PKGREVISION= 4
@@ -12,7 +12,7 @@ COMMENT= The GNU find, xargs and locate utilities
GNU_CONFIGURE= YES
CONFIGURE_HAS_INFODIR= NO
CONFIGURE_HAS_MANDIR= NO
-MAKE_ENV+= INFO_DIR=${INFO_DIR}
+MAKE_ENV+= INFO_DIR=${INFO_DIR:Q}
LDFLAGS.IRIX+= -lgen
INFO_FILES= find.info
@@ -28,7 +28,7 @@ PLIST_SUBST+= USE_CATMAN=""
.if defined(GNU_PROGRAM_PREFIX)
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/sysutils/fixelfprot/Makefile b/sysutils/fixelfprot/Makefile
index 254b5bb4c7d..da9040ca747 100644
--- a/sysutils/fixelfprot/Makefile
+++ b/sysutils/fixelfprot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/09/28 20:52:26 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:00 rillig Exp $
DISTNAME= fixelfprot-20040714
CATEGORIES= sysutils
@@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-powerpc
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
-NO_CHECKSUM= # defined - sources are part of pkgsrc entry
+NO_CHECKSUM= yes # sources are part of pkgsrc entry
NO_CONFIGURE= yes
INSTALLATION_DIRS= bin
diff --git a/sysutils/fsv/Makefile b/sysutils/fsv/Makefile
index 8deb43f55a2..83d4e4bebf6 100644
--- a/sysutils/fsv/Makefile
+++ b/sysutils/fsv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/24 21:15:21 kristerw Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:00 rillig Exp $
#
DISTNAME= fsv-0.9
@@ -12,7 +12,7 @@ COMMENT= 3D filesystem visualizer
GNU_CONFIGURE= yes
USE_TOOLS+= file gmake
-CONFIGURE_ENV+= FILE_CMD="${TOOLS_FILE_CMD}"
+CONFIGURE_ENV+= FILE_CMD=${TOOLS_FILE_CMD:Q}
.include "../../x11/gtkglarea/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
diff --git a/sysutils/gamin/Makefile b/sysutils/gamin/Makefile
index 99f57216dc2..a66aefc4623 100644
--- a/sysutils/gamin/Makefile
+++ b/sysutils/gamin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/30 23:24:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:00 rillig Exp $
DISTNAME= gamin-0.1.5
PKGREVISION= 1
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/
CONFLICTS= fam-[0-9]*
MAINTAINER= jlam@NetBSD.org
-COMMENT= file alteration monitor
+COMMENT= File alteration monitor
HOMEPAGE= http://www.gnome.org/~veillard/gamin/
USE_LIBTOOL= yes
diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile
index d615d126bc5..5c204706521 100644
--- a/sysutils/gkrellm-server/Makefile
+++ b/sysutils/gkrellm-server/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:23 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:00 rillig Exp $
.include "../../sysutils/gkrellm/Makefile.common"
-PKGREVISION= # empty1
-
GKRELLM_PKGBASE= gkrellm-server
COMMENT= Monitoring daemon remotely accessible by a GKrellM client
DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
USE_TOOLS+= pkg-config
USE_PKGINSTALL= YES
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
RCD_SCRIPTS= gkrellmd
CONF_FILES= ${PREFIX}/share/examples/gkrellm-server/gkrellmd.conf ${PREFIX}/etc/gkrellmd.conf
@@ -19,7 +17,7 @@ CONF_FILES= ${PREFIX}/share/examples/gkrellm-server/gkrellmd.conf ${PREFIX}/etc
SPECIAL_PERMS+= ${PREFIX}/bin/gkrellmd ${ROOT_USER} kmem 2711
.endif
-NOT_FOR_PLATFORM= IRIX-*
+NOT_FOR_PLATFORM= IRIX-*-*
MAKE_ENV+= MODULES=server
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 757c6ea2de4..a106f51c8d3 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2005/09/08 13:19:56 cube Exp $
+# $NetBSD: Makefile,v 1.46 2005/12/05 20:51:00 rillig Exp $
.include "Makefile.common"
-PKGREVISION= # empty1
-
GKRELLM_PKGBASE= gkrellm
WRKSRC= ${GKRELLM_SRCDIR}
@@ -21,13 +19,13 @@ USE_TOOLS+= pkg-config
SPECIAL_PERMS+= ${PREFIX}/bin/gkrellm ${ROOT_USER} kmem 2711
.endif
-NOT_FOR_PLATFORM= IRIX-*
+NOT_FOR_PLATFORM= IRIX-*-*
.include "options.mk"
-MAKE_ENV+= MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS}
-MAKE_ENV+= BINOWNER=${BINOWN} BINGROUP=${BINGRP}
-MAKE_ENV+= SSL_TYPE=${GKRELLM_SSL_TYPE}
+MAKE_ENV+= MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
+MAKE_ENV+= BINOWNER=${BINOWN:Q} BINGROUP=${BINGRP:Q}
+MAKE_ENV+= SSL_TYPE=${GKRELLM_SSL_TYPE:Q}
MAKE_ENV+= PKG_INCLUDE=-I${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/include
MAKE_ENV+= PKG_LIBS="-L${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib -Wl,-R${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib"
diff --git a/sysutils/gkrellm/Makefile.common b/sysutils/gkrellm/Makefile.common
index cb777274e76..3e985b8c964 100644
--- a/sysutils/gkrellm/Makefile.common
+++ b/sysutils/gkrellm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/09/08 13:19:56 cube Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/12/05 20:51:00 rillig Exp $
DISTNAME= ${GKRELLM_DISTBASE}
PKGNAME= ${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
-MAKE_ENV+= GREP=${GREP}
+MAKE_ENV+= GREP=${GREP:Q}
.if defined(GKRELLM_DEBUG)
MAKE_ENV+= DEBUG=yes
diff --git a/sysutils/gkrellm1/Makefile b/sysutils/gkrellm1/Makefile
index 9741efe5dd2..e9a36887ab4 100644
--- a/sysutils/gkrellm1/Makefile
+++ b/sysutils/gkrellm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:22 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:00 rillig Exp $
#
DISTNAME= gkrellm-1.2.13
@@ -23,7 +23,7 @@ BUILD_TARGET= netbsd
INSTALL_TARGET= install_netbsd
MAKE_ENV+= PTHREAD_INC="-I${LOCALBASE}/include"
-MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index db36c981791..26d1c0379d3 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/08/10 20:56:23 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/05 20:51:00 rillig Exp $
DISTNAME= gnome-vfs-1.0.5
PKGREVISION= 8
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME Virtual File System
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.gnome-mime-data= gnome-mime-data>=2.0.1
+BUILDLINK_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.0.1
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index 60f078ec782..bd24a8c6479 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/10/09 00:33:20 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:51:00 rillig Exp $
#
DISTNAME= gnome-vfs-2.12.1.1
@@ -44,7 +44,6 @@ EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0
.for f in ${EGFILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
#
# The following stuff is to allow easy building of modules distributed within
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 09541614c2c..7e8f53eb21f 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/30 10:25:33 markd Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:51:00 rillig Exp $
DISTNAME= kdirstat-2.4.3
CATEGORIES= sysutils kde
@@ -7,7 +7,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://kdirstat.sourceforge.net/
-COMMENT= A graphical disk usage utility
+COMMENT= Graphical disk usage utility
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 0f9d768cd18..4cba89b54a5 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:20 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= lavaps-1.20
@@ -12,9 +12,10 @@ COMMENT= Lava lamp of currently running processes
USE_TOOLS+= perl
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --with-additional-includes='-I${LOCALBASE}/include' \
- --with-additional-libs='-L${LOCALBASE}/lib' \
- --with-tcl-ver=8.3.2 --with-tk-ver=8.3.2 \
+CONFIGURE_ARGS+= --with-additional-includes=-I${LOCALBASE:Q}/include \
+ --with-additional-libs=-L${LOCALBASE:Q}/lib \
+ --with-tcl-ver=8.3.2 \
+ --with-tk-ver=8.3.2 \
--with-tcltk-lib-suffix-type=nodot
.include "../../x11/tk83/buildlink3.mk"
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index 78c9a3d47c2..7b7a4330535 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/10/12 21:49:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:01 rillig Exp $
DISTNAME= libgtop-2.12.0
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -50,7 +50,7 @@ PRINT_PLIST_AWK+= /^include\/libgtop-2.0\/glibtop_suid.h$$/ \
(${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \
(${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) && \
(${MACHINE_ARCH} != x86_64)
-PKG_FAIL_REASON= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}."
+PKG_FAIL_REASON+= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}."
PKG_FAIL_REASON+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h"
PKG_FAIL_REASON+= "and update ${WRKSRC}/sysdeps/freebsd/prockernel.c appropriately."
PKG_FAIL_REASON+= "(More information can be found in libgtop.info.)"
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index fd9ef4fce31..7f2658dd9d5 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2005/09/13 20:18:27 christos Exp $
+# $NetBSD: Makefile,v 1.87 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= lsof_4.76
@@ -18,7 +18,7 @@ COMMENT= Lists information about open files
WRKSRC= ${WRKDIR}/${DISTNAME}/${SRCBALL_NAME}
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
-CONFIGURE_ARGS= -n ${LOWER_OPSYS}
+CONFIGURE_ARGS+= -n ${LOWER_OPSYS}
CONFIGURE_ENV+= LSOF_CC="${CC} ${CFLAGS}"
MAKE_FLAGS+= LSOF_BLDCMT="NetBSD pkgsrc rocks!"
CPPFLAGS+= -DLSOF_MORE_SECURE=${LSOF_MORE_SECURE} \
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index b221dc81e7f..8f2ad6840c8 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/08 20:09:00 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= radmind-1.5.0
@@ -14,7 +14,7 @@ COMMENT= Remote file administration and integrity tool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
CONFIGURE_ARGS+= --with-radminddir=${VARBASE}/radmind
-CONFIGURE_ENV+= diffpath="${TOOLS_DIFF}"
+CONFIGURE_ENV+= diffpath=${TOOLS_DIFF:Q}
USE_TOOLS+= diff
BUILD_TARGET= all man rash
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 8a5c897bc0e..cfa016bf473 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/09/18 13:03:15 adrianp Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= rdiff-backup-1.0.1
@@ -12,13 +12,13 @@ COMMENT= Remote incremental backup utility
PYDISTUTILSPKG= yes
PYTHON_VERSIONS_ACCEPTED= 24 23 22
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= setup.py
SUBST_SED.path= -e "s|%%LOCALBASE%%|${LOCALBASE}|g"
SUBST_MESSAGE.path= "Fixing paths."
-BUILDLINK_DEPENDS.librsync= librsync>=0.9.6
+BUILDLINK_DEPENDS.librsync+= librsync>=0.9.6
.include "../../devel/librsync/buildlink3.mk"
.include "../../lang/python/application.mk"
diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile
index 360af29ab2d..2dcf1d6aad3 100644
--- a/sysutils/rfstool/Makefile
+++ b/sysutils/rfstool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/06 18:11:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= rfstool-0.14-source
@@ -13,7 +13,7 @@ COMMENT= Tools to access ReiserFS partitions
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/${PKGNAME}/rfstool
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/rfstool
MAKEFILE= makefile.gcc3x
USE_LANGUAGES+= c++
diff --git a/sysutils/scsiinfo/Makefile b/sysutils/scsiinfo/Makefile
index 68a5555d819..dfa164a7210 100644
--- a/sysutils/scsiinfo/Makefile
+++ b/sysutils/scsiinfo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:01 rillig Exp $
DISTNAME= scsiinfo-4.7
-PKGNAME= ${DISTNAME}
CATEGORIES= sysutils
MASTER_SITES= http://www.cs.toronto.edu/pub/jdd/scsiinfo/
EXTRACT_SUFX= .shar
@@ -28,4 +27,3 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/scsiinfo.1 ${PREFIX}/man/man1
.include "../../mk/bsd.pkg.mk"
-
diff --git a/sysutils/sformat/DESCR b/sysutils/sformat/DESCR
index a04294f2e72..c7a6e97c3ed 100644
--- a/sysutils/sformat/DESCR
+++ b/sysutils/sformat/DESCR
@@ -1,10 +1,11 @@
Sformat is the best SCSI disk tool, I came across in the last 20 years.
It is able to repair and format nearly any disk, as long as its heads
-are still in working condition and a few percent of its blocks are writable.
-Once you have learned to use it, you will never think of using something else.
-Formating a disk with sformat does not only send a scsi-format command to the disk,
-but also make a detailed surface analysis after formating. The defect lists are
-updated, and you come out with a reliable disk, again. Thanks Joerg.
+are still in working condition and a few percent of its blocks are
+writable. Once you have learned to use it, you will never think of using
+something else. Formating a disk with sformat does not only send a
+scsi-format command to the disk, but also make a detailed surface
+analysis after formating. The defect lists are updated, and you come out
+with a reliable disk, again. Thanks Joerg.
-On the other side, like with any other powerful tool, you have to invest some time in learning.
-Well invested time.
+On the other side, like with any other powerful tool, you have to invest
+some time in learning. Well invested time.
diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index eb8278ab6e5..af01b74ebc4 100644
--- a/sysutils/sformat/Makefile
+++ b/sysutils/sformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:33 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= sformat-3.5
@@ -7,7 +7,7 @@ MASTER_SITES= ftp://ftp.berlios.de/pub/sformat/
MAINTAINER= Andreas.Hallmann@tiscali.de,tech-pkg@NetBSD.org
HOMEPAGE= http://freshmeat.net/projects/sformat
-COMMENT= SCSI-disk maintainance, formating, and ultimative repair tool with support for netbsd labels
+COMMENT= SCSI disk maintainance, formating, and ultimative repair tool with support for NetBSD labels
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -19,9 +19,9 @@ TBL?= tbl
# avoid picking up a bad ${ARCH} during the build
MAKE_ENV+= ARCH=""
MAKE_ENV+= MAKEPROG="gmake"
-MAKE_ENV+= COPTX="${CFLAGS}"
-MAKE_ENV+= LDOPTX="${LDFLAGS}"
-MAKE_FLAGS+= INS_BASE="${LOCALBASE}" # won't work in MAKE_ENV!
+MAKE_ENV+= COPTX=${CFLAGS:M*:Q}
+MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q}
+MAKE_FLAGS+= INS_BASE=${LOCALBASE:Q} # won't work in MAKE_ENV!
# if we're using a gcc which is named gcc, we need to set CCOM=gcc
# in MAKE_ENV so the make infrastructure picks the right options.
diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
index 484dc83c867..13b5b7e970b 100644
--- a/sysutils/socket/Makefile
+++ b/sysutils/socket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:13:01 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:01 rillig Exp $
DISTNAME= socket-1.1
CATEGORIES= sysutils net
@@ -7,7 +7,7 @@ MASTER_SITES= http://www.freebsd.org/~wosch/src/
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Create tcp socket and connect to stdin/out
-MAKE_ENV+= INSTALLBASE=${PREFIX}
+MAKE_ENV+= INSTALLBASE=${PREFIX:Q}
BUILD_DEFS+= USE_INET6
diff --git a/sysutils/sredird/Makefile b/sysutils/sredird/Makefile
index c979ceb7c9c..56022eb85d4 100644
--- a/sysutils/sredird/Makefile
+++ b/sysutils/sredird/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= sredird-2.0.0
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.pcmicro.com/sredird/
COMMENT= RFC2217 compliant serial port redirector
-MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}"
+MAKE_FLAGS+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q}
BUILD_TARGET= sredird
INSTALLATION_DIRS= libexec share/doc
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index a16f61fd56e..d2b47653b49 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/17 04:32:16 ben Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= su2-1.3
@@ -27,7 +27,7 @@ LDLIBS= -lcrypt
LDLIBS+= -lcompat
.endif
-MAKE_ENV+= LDLIBS="${LDLIBS}"
+MAKE_ENV+= LDLIBS=${LDLIBS:Q}
post-extract:
${CHMOD} -R og+w ${WRKSRC}
diff --git a/sysutils/sysinfo/Makefile b/sysutils/sysinfo/Makefile
index 106a36ad655..c178bb67bba 100644
--- a/sysutils/sysinfo/Makefile
+++ b/sysutils/sysinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/19 14:05:27 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= sysinfo-3.5.1
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= SunOS-*-* # only for Solaris, at the moment
BUILD_TARGET= default
INSTALL_TARGET= install install.man
TEST_TARGET= test
-MAKE_ENV+= CPPFLAGS="" CC="${CC}"
+MAKE_ENV+= CPPFLAGS="" CC=${CC:Q}
post-build:
${CHMOD} -R o+rx ${WRKDIR}
diff --git a/sysutils/tits/Makefile b/sysutils/tits/Makefile
index c293fd9ec60..fa29a846bd4 100644
--- a/sysutils/tits/Makefile
+++ b/sysutils/tits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/26 08:16:17 agc Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= tits-1.1.1
@@ -10,7 +10,7 @@ COMMENT= Server which provides telnet(1) access to one or more tty ports
BINDIR= ${PREFIX}/sbin
MANDIR= ${PREFIX}/man
-MAKE_ENV+= BINDIR=${BINDIR} MANDIR=${MANDIR}
+MAKE_ENV+= BINDIR=${BINDIR:Q} MANDIR=${MANDIR:Q}
MANCOMPRESSED_IF_MANZ= yes
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 0bf986b6399..10ed8402c2f 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/08/23 11:48:51 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= nut-2.0.1
@@ -33,8 +33,8 @@ NUT_STATEDIR= /var/db/nut
NUT_USER?= nut
NUT_GROUP?= nut
-FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR}
-FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR}
+FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR:Q}
+FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR:Q}
MESSAGE_SUBST+= NUT_CONFDIR=${NUT_CONFDIR}
MESSAGE_SUBST+= NUT_EGDIR=${NUT_EGDIR}
diff --git a/sysutils/user/DESCR b/sysutils/user/DESCR
index 5fefbd8b9d7..3cc38bae07b 100644
--- a/sysutils/user/DESCR
+++ b/sysutils/user/DESCR
@@ -1,8 +1,8 @@
The usermgmt suite of programs provides SVR4/Solaris-compatible
{user,group}{add,del,mod} commands, and two utilities, user(8) and
-group(8) whcih perform the same functions. In addition, some
-extensions are provided, which allow a user to be created with the
-same uid and gid, for example.
+group(8) which perform the same functions. In addition, some extensions
+are provided, which allow a user to be created with the same uid and
+gid, for example.
The usermgmt suite was based on the old addnerd package, which, in turn,
was based on Matt Green's addbozo script.
diff --git a/sysutils/user/Makefile b/sysutils/user/Makefile
index 8abe3ebd656..7f009ab63c9 100644
--- a/sysutils/user/Makefile
+++ b/sysutils/user/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/20 12:26:16 agc Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:51:01 rillig Exp $
#
# Note to package maintainers:
@@ -16,7 +16,7 @@ COMMENT= Solaris-compatible {user,group}{add,del,mod} commands
ONLY_FOR_PLATFORM= NetBSD-*-* # already in Solaris base system
.if exists(/usr/sbin/user)
-PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution"
+PKG_SKIP_REASON+= "${PKGNAME} is part of your ${OPSYS} distribution"
.endif
WRKSRC= ${WRKDIR}/user
diff --git a/sysutils/user_darwin/DESCR b/sysutils/user_darwin/DESCR
index 6c9c655c3ba..5060afa99cb 100644
--- a/sysutils/user_darwin/DESCR
+++ b/sysutils/user_darwin/DESCR
@@ -1,2 +1,2 @@
This implements a subset of useradd(8)/groupadd(8) functionality on
-Darwin that is sufficient for pkgsrc use. \ No newline at end of file
+Darwin that is sufficient for pkgsrc use.
diff --git a/sysutils/user_darwin/Makefile b/sysutils/user_darwin/Makefile
index d17149942a4..98286a2de92 100644
--- a/sysutils/user_darwin/Makefile
+++ b/sysutils/user_darwin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:36 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= user-20040801
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-NO_TOOLS= yes
NO_BUILD= yes
INSTALLATION_DIRS= sbin
diff --git a/sysutils/user_interix/Makefile b/sysutils/user_interix/Makefile
index 7ddef1bf52e..c5c73226182 100644
--- a/sysutils/user_interix/Makefile
+++ b/sysutils/user_interix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/10/23 21:56:41 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= user-20040426
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-NO_TOOLS= yes
NO_BUILD= yes
INSTALLATION_DIRS= sbin
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index 7abf75fa19c..0ea4ff84ce2 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:33 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= vifm-0.1
@@ -13,8 +13,8 @@ COMMENT= Ncurses based file manager with vi like keybindings
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
-INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
+INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
pre-configure:
@${SED} -e "s/cfg.use_screen = 0/cfg.use_screen = 1/" \
diff --git a/sysutils/wtail/Makefile b/sysutils/wtail/Makefile
index 7e11446faab..c6fee46df1c 100644
--- a/sysutils/wtail/Makefile
+++ b/sysutils/wtail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:30 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:01 rillig Exp $
#
DISTNAME= wtail-0.2.2
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.teaser.fr/~amajorel/wtail/
COMMENT= Watch multiple files at once
-MAKE_ENV+= SED="${SED}"
+MAKE_ENV+= SED=${SED:Q}
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 004f667cb8d..7ba99bcb415 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/17 04:49:49 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= xbatt-1.3pr1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www2.clave.gr.jp/~eto/xbatt/ # Not really
COMMENT= Displays battery status of your notebook via APM
.if !exists(/usr/include/machine/apmvar.h)
-PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}"
+PKG_SKIP_REASON+= "APM is not available for ${MACHINE_PLATFORM}"
.endif
WRKSRC= ${WRKDIR}/xbatt-1.3
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index a296148ed89..656b7b3be7d 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/09/28 20:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:02 rillig Exp $
DISTNAME= xbattbar_1.4.2
PKGNAME= ${DISTNAME:S/_/-/}
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
USE_IMAKE= yes
.if !exists(/usr/include/machine/apmvar.h)
-PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}"
+PKG_SKIP_REASON+= "APM is not available for ${MACHINE_PLATFORM}"
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 1f3812029f2..af3051b5a9c 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/08/19 18:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:51:02 rillig Exp $
DISTNAME= xcdroast-0.98alpha15
PKGNAME= xcdroast-0.98a15
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
.if ${_OPSYS_HAS_OSSAUDIO} == "yes"
CFLAGS+= -DHAVE_OSS
-CONFIGURE_ENV+= AUDIO_LIBS=${LIBOSSAUDIO}
+CONFIGURE_ENV+= AUDIO_LIBS=${LIBOSSAUDIO:Q}
.endif
DOCDIR= ${PREFIX}/share/doc/xcdroast
diff --git a/sysutils/xentools12/Makefile b/sysutils/xentools12/Makefile
index c191e0c5c32..0508b7ab251 100644
--- a/sysutils/xentools12/Makefile
+++ b/sysutils/xentools12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:33 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= xeno-1.2-src-040418
@@ -25,8 +25,8 @@ CONF_FILES+= ${EGDIR}/democd ${PKG_SYSCONFDIR}/democd
CONF_FILES+= ${EGDIR}/netbsd ${PKG_SYSCONFDIR}/netbsd
USE_TOOLS+= gmake
-MAKE_ENV+= EGDIR="${EGDIR}"
-MAKE_ENV+= MV="${MV}" PYTHON="${PYTHONBIN}" SED="${SED}"
+MAKE_ENV+= EGDIR=${EGDIR:Q}
+MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
PYTHON_VERSIONS_ACCEPTED= 22 23
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS= examples/xc_dom_control.py examples/xc_dom_create.py
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index d86162e7654..167924a1b42 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/08 00:47:35 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= xen-2.0.7-src
@@ -27,8 +27,8 @@ EGDIR= ${PREFIX}/share/examples/xen
MESSAGE_SUBST= EGDIR=${EGDIR}
USE_TOOLS+= gmake
-MAKE_ENV+= EGDIR="${EGDIR}"
-MAKE_ENV+= MV="${MV}" PYTHON="${PYTHONBIN}" SED="${SED}"
+MAKE_ENV+= EGDIR=${EGDIR:Q}
+MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
PYTHON_VERSIONS_ACCEPTED= 24 23 22
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS= python/xen/util/console_client.py
@@ -44,7 +44,7 @@ PYTHON_PATCH_SCRIPTS+= misc/netfix
PYTHON_PATCH_SCRIPTS+= misc/xend
PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format
-SUBST_CLASSES= paths py conf
+SUBST_CLASSES+= paths py conf
SUBST_STAGE.paths= pre-configure
SUBST_FILES.paths= python/xen/xend/server/SrvDaemon.py
SUBST_FILES.paths+= python/xen/xend/XendDomainInfo.py
@@ -75,9 +75,9 @@ PROCPATH= /proc
.endif
RCD_SCRIPTS= xend xendomains
-FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN}
-FILES_SUBST+= PROCPATH=${PROCPATH}
-FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q}
+FILES_SUBST+= PROCPATH=${PROCPATH:Q}
+FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
XEND_SCRIPTS= network block-enbd vif-bridge block-file
diff --git a/sysutils/xenvstat/Makefile b/sysutils/xenvstat/Makefile
index 2d6d998fb31..2fed957afdd 100644
--- a/sysutils/xenvstat/Makefile
+++ b/sysutils/xenvstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:36 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:02 rillig Exp $
DISTNAME= xenvstat-20041127
CATEGORIES= sysutils
@@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-*
NO_CONFIGURE= yes
NO_CHECKSUM= yes
-LIBS= -lXmu -lXext -lXt -lX11 -lm
+LIBS+= -lXmu -lXext -lXt -lX11 -lm
INSTALLATION_DIRS= bin lib/X11/app-defaults
diff --git a/sysutils/xhfs/Makefile b/sysutils/xhfs/Makefile
index b8b11226d08..4aaa18e29e6 100644
--- a/sysutils/xhfs/Makefile
+++ b/sysutils/xhfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:23 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= hfsutils-3.2.6
@@ -13,8 +13,9 @@ COMMENT= Tk GUI + Tcl Shell for accessing HFS volumes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
- --with-tk=${BUILDLINK_PREFIX.tk}/lib --disable-cli
+CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
+CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib
+CONFIGURE_ARGS+= --disable-cli
CPPFLAGS+= -I${BUILDLINK_PREFIX.libhfs}/include/libhfs
.include "../../devel/libhfs/buildlink3.mk"
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 0fa62b74f9c..ea4a14414ca 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/11/17 15:53:00 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2005/12/05 20:51:02 rillig Exp $
DISTNAME= xosview-1.8.2
PKGREVISION= 1
@@ -27,7 +27,7 @@ INSTALLATION_DIRS= bin lib/X11/app-defaults man/man1
. if !defined(UVM) && exists(/usr/include/uvm/uvm.h)
CFLAGS+= -DUVM
UVM= # defined
-BUILD_DEFS= UVM
+BUILD_DEFS+= UVM
. endif
.elif ${OPSYS} == "SunOS"
USE_TOOLS+= gmake
diff --git a/sysutils/zidrav/Makefile b/sysutils/zidrav/Makefile
index b9c459497c8..1cedd3b2e93 100644
--- a/sysutils/zidrav/Makefile
+++ b/sysutils/zidrav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/21 04:00:56 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= zidrav4unix-1.2.0
@@ -16,9 +16,8 @@ BUILD_TARGET= zidrav
PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../mk/endian.mk"
-
.if ${MACHINE_ENDIAN} == "big"
- CXXFLAGS+=-DCPU_BIGENDIAN
+CXXFLAGS+= -DCPU_BIGENDIAN
.endif
INSTALLATION_DIRS= bin man/man1
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 329a2508327..a64a7d8e410 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= aiksaurus-1.2.1
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --without-gtk
+CONFIGURE_ARGS+= --without-gtk
PKGCONFIG_OVERRIDE= base/aiksaurus-1.0.pc.in
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/biblook/Makefile b/textproc/biblook/Makefile
index 3d7e842959a..677f454a583 100644
--- a/textproc/biblook/Makefile
+++ b/textproc/biblook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/10/12 07:10:57 seb Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= biblook
@@ -12,7 +12,7 @@ COMMENT= Indexing and searching tools for BibTeX bibliography databases
WRKSRC= ${WRKDIR}
MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
-MAKE_FLAGS= CC="${CC}"
+MAKE_FLAGS+= CC=${CC:Q}
# override definitions in the package's Makefile via command line
MAKE_FLAGS+= OPT="${CFLAGS} -Dunix"
diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile
index 8c33fd19515..24eec9366f8 100644
--- a/textproc/chasen-base/Makefile
+++ b/textproc/chasen-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/18 15:37:17 taca Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= chasen-${CHASEN_VERSION}
@@ -23,7 +23,7 @@ OWN_DIRS= ${CHASEN_DICDIR}
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-.include "../chasen/Makefile.common"
+.include "../../textproc/chasen/Makefile.common"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/darts/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/dict-dictionaries/Makefile b/textproc/dict-dictionaries/Makefile
index 3544900bab6..83b16bb4d75 100644
--- a/textproc/dict-dictionaries/Makefile
+++ b/textproc/dict-dictionaries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:34 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:02 rillig Exp $
DISTNAME= #
PKGNAME= dict-data-1.8.0
@@ -15,7 +15,7 @@ MAINTAINER= mike@ethmoid.org
HOMEPAGE= http://www.dict.org/
COMMENT= Dictionary data for DICTD
-DEPENDS= dict-server>=1.8.0nb1:../../textproc/dict-server
+DEPENDS+= dict-server>=1.8.0nb1:../../textproc/dict-server
USE_TOOLS+= gmake
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index e8bb9c7763e..e7c99823784 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/10/02 15:07:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= docbook-xml-4.4
@@ -13,7 +13,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://www.oasis-open.org/docbook/
COMMENT= XML DTD designed for computer documentation
-BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip
+BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index f490e3753b2..5351c0d197f 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/09/29 19:40:41 kristerw Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= docbook-xsl-1.69.1
@@ -11,7 +11,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://docbook.sourceforge.net/
COMMENT= Docbook XSL modular stylesheet
-DEPENDS= docbook-xml>=4.2:../../textproc/docbook-xml
+DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml
USE_LANGUAGES= # empty
NO_BUILD= YES
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index c811d4047fd..0f88e6c9b00 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:47:33 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/12/05 20:51:02 rillig Exp $
DISTNAME= docbook-4.4
CATEGORIES= textproc
@@ -19,7 +19,7 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.oasis-open.org/docbook
COMMENT= SGML DTD designed for computer documentation
-BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip
+BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
DEPENDS+= iso8879>=1986:../../textproc/iso8879
WRKSRC= ${WRKDIR}
@@ -34,7 +34,6 @@ SGML_CATALOGS=
.for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2 4.3 4.4
SGML_CATALOGS+= ${INSTDIR}/${ver}/catalog
.endfor
-.undef ver
do-build:
.for ver in 241 30 31 40 41 42 43 44
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 520fe4aff80..2ffd0f0b64d 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/16 01:19:23 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/12/05 20:51:02 rillig Exp $
DISTNAME= eb-4.1.3
CATEGORIES= textproc japanese
@@ -67,7 +67,7 @@ EGDIR= ${PREFIX}/share/examples/eb
# XXX Better than having unflexible/static patches. IMO.
# - ZLIBLIBS="-L$z_libdir -lz"
# + ZLIBLIBS="-Wl,-R$z_libdir -L$z_libdir -lz"
-SUBST_CLASSES= runpath
+SUBST_CLASSES+= runpath
SUBST_STAGE.runpath= post-patch
SUBST_FILES.runpath= configure configure.ac
SUBST_SED.runpath= -e 's|^\(.*LIBS=['\''"]\)-L\(\$$[^[:blank:]][^[:blank:]]*\)\(.*\)$$|\1-Wl,-R\2 -L\2\3|'
diff --git a/textproc/flyspell/Makefile b/textproc/flyspell/Makefile
index fa8ebb340f8..be42717b7cf 100644
--- a/textproc/flyspell/Makefile
+++ b/textproc/flyspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/05 17:04:53 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:02 rillig Exp $
#
DISTNAME= flyspell-1.7j.el
@@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www-sop.inria.fr/mimosa/personnel/Manuel.Serrano/flyspell/flyspell.html
COMMENT= Emacs/Xemacs on-the-fly spell checker
-DEPENDS= ${EMACS_PKGNAME_PREFIX}ispell-emacs-[0-9]*:../../textproc/ispell-emacs
+DEPENDS+= ${EMACS_PKGNAME_PREFIX}ispell-emacs-[0-9]*:../../textproc/ispell-emacs
EXTRACT_ONLY= # None
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 5d26e113ec5..3e681462292 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:34 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:02 rillig Exp $
#
# Note: we currently use the pre-built (-bin) distribution of FOP,
# because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -22,8 +22,8 @@ COMMENT= The Apache Project's XSL Formatting Objects implementation
WRKSRC= ${WRKDIR}
USE_JAVA= run
-NO_CONFIGURE=
-NO_BUILD=
+NO_CONFIGURE= yes
+NO_BUILD= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/textproc/freepwing/Makefile b/textproc/freepwing/Makefile
index 913ed541b39..18af8c5eb97 100644
--- a/textproc/freepwing/Makefile
+++ b/textproc/freepwing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/09 01:52:32 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:03 rillig Exp $
DISTNAME= freepwing-1.4.4
PKGREVISION= 3
@@ -15,6 +15,6 @@ USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-perllibdir=${PERL5_INSTALLVENDORLIB}
CONFIGURE_ARGS+= --with-pkgdocdir=${PREFIX}/share/doc/freepwing
-CONFIGURE_ENV+= GNUMAKE="${GMAKE}"
+CONFIGURE_ENV+= GNUMAKE=${GMAKE:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 2121f31e428..8e78f3e6443 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/11/14 15:12:59 adam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:03 rillig Exp $
DISTNAME= gdome2-0.8.1
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://gdome2.cs.unibo.it/
COMMENT= Gnome DOM (Document Object Model) engine
USE_LIBTOOL= yes
-USE_TOOLS= pkg-config
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
PKGCONFIG_OVERRIDE= ${WRKSRC}/gdome2.pc.in
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 8e4d3b3a4e0..daa7e715849 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/10/07 15:56:46 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= gnome-doc-utils-0.4.2
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
USE_LANGUAGES= # empty
USE_PKGLOCALEDIR= YES
-CONFIGURE_ARGS+= PYTHON=${PYTHONBIN}
+CONFIGURE_ARGS+= PYTHON=${PYTHONBIN:Q}
PKGCONFIG_OVERRIDE= gnome-doc-utils.pc.in
PKGCONFIG_OVERRIDE+= xml2po/xml2po.pc.in
diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index b9fc1a33cdb..ce801c06c35 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:34 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= grep-2.5.1
@@ -26,7 +26,7 @@ INFO_FILES= grep.info
.if defined(GNU_PROGRAM_PREFIX)
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 3070ded6c7f..143de948036 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/11/28 06:41:22 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= groff-1.19.1
@@ -15,15 +15,15 @@ DEPENDS+= psutils>=1.17:../../print/psutils
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PERLPATH="${PERL5}"
+CONFIGURE_ENV+= PERLPATH=${PERL5:Q}
USE_TOOLS+= gs:run perl:run
INFO_FILES= groff
.include "../../mk/bsd.prefs.mk"
-.ifdef PAPERSIZE
-CONFIGURE_ENV+= PAGE=${PAPERSIZE}
+.if defined(PAPERSIZE)
+CONFIGURE_ENV+= PAGE=${PAPERSIZE:Q}
.endif
# Usually the mdoc.local "volume-operating-system" definition is for
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 4c670771e73..0050ad3ea47 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:34 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= sed-4.1.1
@@ -28,7 +28,7 @@ TEST_TARGET= check
.if defined(GNU_PROGRAM_PREFIX)
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile
index fe22be2f2e5..8b26859dc09 100644
--- a/textproc/helpdeco/Makefile
+++ b/textproc/helpdeco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/04 15:50:13 ben Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= helpdeco-2.1.3
@@ -15,7 +15,7 @@ COMMENT= Windows .hlp to .rtf converter
CFLAGS+= -DHAVE_STRLCPY
.endif
-MAKE_ENV+= CFLAGS="${CFLAGS}"
+MAKE_ENV+= CFLAGS=${CFLAGS:M*:Q}
BUILD_TARGET= build
USE_TOOLS+= gmake
diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile
index 7983579ff84..a574a153ca4 100644
--- a/textproc/html2text/Makefile
+++ b/textproc/html2text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:03 rillig Exp $
DISTNAME= html2text-1.3.2a
CATEGORIES= textproc
@@ -9,9 +9,9 @@ HOMEPAGE= http://userpage.fu-berlin.de/~mbayer/tools/html2text.html
COMMENT= Advanced HTML-to-text converter
USE_LANGUAGES= c c++
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
HAS_CONFIGURE= yes
-CONFIGURE_ENV+= ECHO="${ECHO}"
+CONFIGURE_ENV+= ECHO=${ECHO:Q}
USE_TOOLS+= gunzip
INSTALLATION_DIRS= bin man/man1 man/man5
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 12a114e6674..56fe6384c02 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/08/19 18:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= icu-3.2
@@ -19,7 +19,7 @@ TEST_TARGET= check
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-static
-CONFIGURE_ENV+= U_MAKE="${TOOLS_GMAKE}"
+CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE:Q}
# ICU's configure script will automatically append "/icu" to the sysconfdir.
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
index fb4e612b0a8..21d280f6bc9 100644
--- a/textproc/intltool/buildlink3.mk
+++ b/textproc/intltool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/10/08 17:18:47 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/12/05 20:51:03 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
INTLTOOL_BUILDLINK3_MK:= ${INTLTOOL_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_DEPMETHOD.intltool?= build
USE_TOOLS+= perl
.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-CONFIGURE_ENV+= INTLTOOL_PERL="${PERL5}"
+CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q}
INTLTOOLIZE= ${BUILDLINK_PREFIX.intltool}/bin/intltoolize
INTLTOOL_OVERRIDE?= intltool-* */intltool-*
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index 8a70d9e306d..d14d867f448 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:35 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:03 rillig Exp $
DISTNAME= iso12083-1993
PKGREVISION= 4
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://info.ex.ac.uk/pub/SGML/ISO-12083/ \
ftp://ftp.oit.unc.edu/pub/packages/SGML/oslo-mirror/ISO12083/
DISTFILES= article.dtd book.dtd maths.dtd serial.dtd
-MAINTAINER= rh@NetBSD.ORG
+MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.oasis-open.org/cover/sgml-xml.html
COMMENT= SGML DTDs from the The Electronic Publishing Special Interest Group
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 16f068ff272..a17801f73c6 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:03 rillig Exp $
DISTNAME= ISOEnts
PKGNAME= iso8879-1986
@@ -7,7 +7,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.oasis-open.org/cover/
EXTRACT_SUFX= .zip
-MAINTAINER= rh@NetBSD.ORG
+MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.iso.ch/cate/d16387.html
COMMENT= Character entity sets from ISO 8879:1986 (SGML)
diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
index 62848b3aaa6..8f315bef9ef 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= ispell-3.3.02
@@ -14,7 +14,7 @@ CONFLICTS+= ispell-[0-9]*
USE_TOOLS+= mktemp:run
-MAKE_FLAGS+= TMPDIR="${WRKDIR}"
+MAKE_FLAGS+= TMPDIR=${WRKDIR:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/textproc/ispell-british/Makefile b/textproc/ispell-british/Makefile
index 59c9fbf1996..9b6ce483e78 100644
--- a/textproc/ispell-british/Makefile
+++ b/textproc/ispell-british/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/07 12:44:44 markd Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= ispell-3.3.02
@@ -16,7 +16,7 @@ BUILD_TARGET= config.sh all-languages
DICT_LANG= british
-MAKE_FLAGS+= TMPDIR="${WRKDIR}"
+MAKE_FLAGS+= TMPDIR=${WRKDIR:Q}
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
@@ -33,7 +33,7 @@ do-configure:
${ECHO} "#define LANGUAGES \"{${DICT_LANG},MASTERDICTS=${DICT_LANG}.xlg,HASHFILES=${DICT_LANG}xlg.hash,EXTRADICT=}\"" >>local.h; \
${ECHO} '#define MASTERHASH "${DICT_LANG}xlg.hash"' >> local.h ; \
${ECHO} "#undef WORDS" >> local.h ; \
- ${ECHO} '#define WORDS "${WORDS}"' >> local.h ; \
+ ${ECHO} '#define WORDS "${WORDS}"' >> local.h
do-install:
${CP} ${WRKSRC}/languages/${DICT_LANG}/${DICT_LANG}xlg.hash ${PREFIX}/lib
diff --git a/textproc/ispell-emacs/Makefile b/textproc/ispell-emacs/Makefile
index f5c9feb800c..72f2bcf6089 100644
--- a/textproc/ispell-emacs/Makefile
+++ b/textproc/ispell-emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/28 04:25:31 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= ispell.el
@@ -11,13 +11,13 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://kdstevens.com/~stevens/ispell-page.html
COMMENT= Emacs interface for ispell spell checker
-DEPENDS= ispell-base-[0-9]*:../../textproc/ispell-base
+DEPENDS+= ispell-base-[0-9]*:../../textproc/ispell-base
DIST_SUBDIR= ${PKGNAME_NOREV:C|^xemacs-||}
WRKSRC= ${WRKDIR}
-NO_CONFIGURE= #
-NO_BUILD= #
+NO_CONFIGURE= yes
+NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/ispell
diff --git a/textproc/ispell-russian/Makefile.common b/textproc/ispell-russian/Makefile.common
index 33190b119c5..0d859116cc8 100644
--- a/textproc/ispell-russian/Makefile.common
+++ b/textproc/ispell-russian/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2004/01/23 15:02:07 agc Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/12/05 20:51:03 rillig Exp $
DISTNAME= rus-ispell-0.99f5
CATEGORIES= textproc
@@ -14,6 +14,6 @@ PATCHDIR= ${.CURDIR}/../../textproc/ispell-russian/patches
DISTINFO_FILE= ${.CURDIR}/../../textproc/ispell-russian/distinfo
WRKSRC= ${WRKDIR}
-MAKE_ENV+= CAT=${CAT} RM=${RM} SED=${SED} TR=${TR} UNIQ="uniq"
+MAKE_ENV+= CAT=${CAT:Q} RM=${RM:Q} SED=${SED:Q} TR=${TR:Q} UNIQ="uniq"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-slovak/Makefile b/textproc/ispell-slovak/Makefile
index ebc1149133e..18f2dd43cd2 100644
--- a/textproc/ispell-slovak/Makefile
+++ b/textproc/ispell-slovak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/09/12 20:57:41 salo Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= ispell-sk-0.2.2
@@ -12,6 +12,6 @@ COMMENT= Slovak dictionary for ispell
DEPENDS+= ispell-base>=3.1.20:../../textproc/ispell-base
-MAKE_ENV+= CAT=${CAT} SORT=${SORT}
+MAKE_ENV+= CAT=${CAT:Q} SORT=${SORT:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-spanish/Makefile b/textproc/ispell-spanish/Makefile
index 5b6bdc1abb9..d90c63da3a7 100644
--- a/textproc/ispell-spanish/Makefile
+++ b/textproc/ispell-spanish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/09/12 21:37:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:03 rillig Exp $
#
DISTNAME= espa~nol-1.7
@@ -12,6 +12,6 @@ COMMENT= Spanish dictionary for interactive spelling checker
DEPENDS+= ispell-base>=3.1.20:../../textproc/ispell-base
-MAKE_FLAGS+= TMPDIR="${WRKDIR}"
+MAKE_FLAGS+= TMPDIR=${WRKDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index b0c7fd1dc55..4751c4e5e00 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/30 14:43:03 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:51:03 rillig Exp $
DISTNAME= jade-1.2.1
PKGREVISION= 9
@@ -25,7 +25,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
SGML_CATALOGS= ${PREFIX}/share/sgml/jade/catalog
-CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/jade/catalog
+CONFIGURE_ARGS+= --enable-default-catalog=${PREFIX:Q}/share/sgml/jade/catalog
CONFIGURE_ARGS+= --enable-mif
CXXFLAGS+= ${CFLAGS}
diff --git a/textproc/jade/hacks.mk b/textproc/jade/hacks.mk
index 5d904d51402..0275c79cd05 100644
--- a/textproc/jade/hacks.mk
+++ b/textproc/jade/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/25 20:26:06 tv Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:51:03 rillig Exp $
-.ifndef JADE_HACKS_MK
+.if !defined(JADE_HACKS_MK)
JADE_HACKS_MK= # defined
### [Tue Jan 25 20:25:41 UTC 2005 : tv]
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index f0089ac8b20..0c534926d8e 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/20 04:50:46 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:05 rillig Exp $
DISTNAME= libpathan-1.2-2-src
PKGNAME= ${DISTNAME:S/-2-src/.2/}
@@ -18,7 +18,7 @@ USE_TOOLS+= bison gmake perl
USE_LIBTOOL= YES
USE_LANGUAGES= c++
-CONFIGURE_ARGS+= XERCESCROOT=${LOCALBASE}
+CONFIGURE_ARGS+= XERCESCROOT=${LOCALBASE:Q}
.include "../../textproc/xerces-c/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 510d1876b94..9f59b28b273 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2005/09/30 19:58:00 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2005/12/05 20:51:06 rillig Exp $
DISTNAME= libxml2-2.6.22
CATEGORIES= textproc
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --without-threads
# NetBSD-sparc64-1.6*'s f77 makes configure failing and as f77 is not
# needed for this package the following does no harm on other platforms.
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
MAKE_ENV+= PAX=${PAX:Q}
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 02f83057b0b..33066e8a378 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2005/09/05 07:38:25 recht Exp $
+# $NetBSD: Makefile,v 1.61 2005/12/05 20:51:07 rillig Exp $
DISTNAME= libxslt-1.1.15
-PKGNAME= ${DISTNAME}
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxslt/1.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index 8c17009cf6b..7e253922e7d 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/08/18 15:46:24 taca Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:07 rillig Exp $
DISTNAME= namazu-2.0.14
PKGREVISION= 3
@@ -18,7 +18,7 @@ CONFLICTS+= namazu-[0-9]*
USE_PKGLOCALEDIR= yes
USE_PKGINSTALL= yes
-USE_TOOLS= perl:run
+USE_TOOLS+= perl:run
GNU_CONFIGURE= yes
USE_LANGUAGE= c
USE_LIBTOOL= yes
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index d1d442ba99e..e41ba40c5d7 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:07 rillig Exp $
#
DISTNAME= ndtpd-3.1.5
@@ -30,7 +30,7 @@ CONF_FILES= ${EGDIR}/ndtpd.conf.default ${PKG_SYSCONFDIR}/ndtpd.conf
RCD_SCRIPTS= ndtpd
# Will be also used for ndtpd.sh.
-FILES_SUBST+= NDTPD_RUNDIR=${NDTPD_RUNDIR}
+FILES_SUBST+= NDTPD_RUNDIR=${NDTPD_RUNDIR:Q}
EGDIR= ${PREFIX}/share/examples/ndtpd
NDTPD_LOGDIR= ${DESTDIR}/var/log
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 118dbfe03b9..73a8701efda 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:07 rillig Exp $
#
DISTNAME= openjade-1.3.2
@@ -15,7 +15,7 @@ USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CXXFLAGS=${CFLAGS:M*:Q}
CONFIGURE_ARGS+= --enable-default-catalog=${OPENJADE_DATA_DIR}/catalog \
--datadir=${OPENJADE_DATA_DIR}
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index 4275ba4cb84..6c5232f18bf 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/03 13:45:46 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:07 rillig Exp $
#
DISTNAME= XML-Xerces-2.3.0-4
@@ -23,7 +23,7 @@ MAKE_ENV+= XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}" LANG=""
# Xerces-C is built unthreaded in pkgsrc (for now).
BUILDLINK_TRANSFORM+= rm:-lpthread
-BUILDLINK_DEPENDS.xerces-c= xerces-c>=2.3.0
+BUILDLINK_DEPENDS.xerces-c+= xerces-c>=2.3.0
.include "../../textproc/xerces-c/buildlink3.mk"
.include "../../lang/perl5/module.mk"
diff --git a/textproc/php-pspell/Makefile b/textproc/php-pspell/Makefile
index c6cb66c6294..a1cb1136a35 100644
--- a/textproc/php-pspell/Makefile
+++ b/textproc/php-pspell/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/27 12:01:59 salo Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:07 rillig Exp $
MODNAME= pspell
CATEGORIES+= textproc
-PKGREVISION= # empty
COMMENT= PHP extension for pspell support
diff --git a/textproc/php-wddx/Makefile b/textproc/php-wddx/Makefile
index abbf09279f5..bfe4d90ce2e 100644
--- a/textproc/php-wddx/Makefile
+++ b/textproc/php-wddx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:07 rillig Exp $
MODNAME= wddx
CATEGORIES+= textproc
-PKGREVISION= # empty
COMMENT= PHP extension for WDDX support
diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile
index 847d478da8d..83b7a127677 100644
--- a/textproc/php4-domxml/Makefile
+++ b/textproc/php4-domxml/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:07 rillig Exp $
MODNAME= domxml
CATEGORIES+= textproc
-PKGREVISION= # empty
COMMENT= PHP4 extension for DOM support
diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile
index f0938346fb8..8d57925bf3d 100644
--- a/textproc/php4-xslt/Makefile
+++ b/textproc/php4-xslt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/09/04 12:46:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:07 rillig Exp $
MODNAME= xslt
CATEGORIES+= textproc
-PKGREVISION= # empty
COMMENT= PHP4 extension for XSLT functions (Sablotron backend)
diff --git a/textproc/php5-dom/Makefile b/textproc/php5-dom/Makefile
index dab377f69af..114c7eef179 100644
--- a/textproc/php5-dom/Makefile
+++ b/textproc/php5-dom/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:07 rillig Exp $
MODNAME= dom
CATEGORIES+= textproc
-PKGREVISION= # empty
COMMENT= PHP5 extension for DOM support
diff --git a/textproc/php5-xsl/Makefile b/textproc/php5-xsl/Makefile
index cf48a4075f3..567a3fa1712 100644
--- a/textproc/php5-xsl/Makefile
+++ b/textproc/php5-xsl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:07 rillig Exp $
MODNAME= xsl
CATEGORIES+= textproc
-PKGREVISION= # empty
COMMENT= PHP5 extension for XSLT functions
diff --git a/textproc/postgresql-autodoc/Makefile b/textproc/postgresql-autodoc/Makefile
index 8c5fff560ff..4929c3a638b 100644
--- a/textproc/postgresql-autodoc/Makefile
+++ b/textproc/postgresql-autodoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:07 rillig Exp $
#
DISTNAME= postgresql_autodoc-1.24
@@ -10,13 +10,13 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.rbt.ca/autodoc/
COMMENT= Generate HTML, DOT, and XML description of database structure
-DEPENDS= p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
+DEPENDS+= p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
WRKSRC= ${WRKDIR}/postgresql_autodoc
USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --datadir=${PREFIX}/share/${PKGBASE}
-CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5}
+CONFIGURE_ARGS+= --datadir=${PREFIX:Q}/share/${PKGBASE:Q}
+CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile
index bfe7d3462b6..d61436c0a21 100644
--- a/textproc/py-HappyDoc/Makefile
+++ b/textproc/py-HappyDoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:07 rillig Exp $
DISTNAME= HappyDoc_r2_1
PKGNAME= ${PYPKGPREFIX}-HappyDoc-2.1
@@ -11,7 +11,7 @@ COMMENT= Python tool to generate Python API documents
WRKSRC= ${WRKDIR}/HappyDoc-r2_1
PYDISTUTILSPKG= # defined
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
post-extract:
${MV} ${WRKSRC}/happydoc ${WRKSRC}/happydoc${PYVERSSUFFIX}
diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile
index 32f5875e4c6..227afd83057 100644
--- a/textproc/py-expat/Makefile
+++ b/textproc/py-expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:07 rillig Exp $
#
PKGNAME= ${PYPKGPREFIX}-expat-0
@@ -17,7 +17,7 @@ PY_PATCHPLIST= yes
PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR}
PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index cc31251dda6..c5b7edb6f64 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/10/07 15:42:30 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:07 rillig Exp $
DISTNAME= libxslt-1.1.15
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ PYDISTUTILSPKG= YES
PYBINMODULE= YES
NO_CONFIGURE= YES
-MAKE_ENV+= PYLIBXSLTVERSION=${PKGVERSION}
+MAKE_ENV+= PYLIBXSLTVERSION=${PKGVERSION:Q}
SUBST_CLASSES+= setup
SUBST_MESSAGE.setup= "Fixing hardcoded paths."
@@ -25,9 +25,9 @@ SUBST_STAGE.setup= pre-build
SUBST_FILES.setup= setup.py
SUBST_SED.setup= -e "s,@LIBICONVDIR@,${BUILDLINK_PREFIX.iconv},g" \
-e "s,@LIBXML2DIR@,${BUILDLINK_PREFIX.libxml2},g" \
- -e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g" \
+ -e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g"
-BUILDLINK_DEPENDS.libxslt= libxslt>=${PKGVERSION}
+BUILDLINK_DEPENDS.libxslt+= libxslt>=${PKGVERSION}
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index ad86792bbfb..7e2bd36a934 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/24 14:33:19 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:07 rillig Exp $
#
DISTNAME= PyXML-0.8.4
@@ -14,7 +14,7 @@ CONFLICTS+= PyXML-[0-9]*
PYDISTUTILSPKG= yes
PYBINMODULE= yes
-BUILDLINK_DEPENDS.expat= expat>=1.95.6
+BUILDLINK_DEPENDS.expat+= expat>=1.95.6
PYSETUPBUILDARGS+= --with-libexpat=${BUILDLINK_DIR}
PYSETUPBUILDARGS+= --ldflags="${EXPAT_LDFLAGS}"
EXPAT_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib
@@ -29,7 +29,7 @@ post-extract:
.endfor
PYTHON_PATCH_SCRIPTS= ${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
.include "../../textproc/expat/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/textproc/py-xmltools/Makefile b/textproc/py-xmltools/Makefile
index 460c3755f8d..3afcb947289 100644
--- a/textproc/py-xmltools/Makefile
+++ b/textproc/py-xmltools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:07 rillig Exp $
#
DISTNAME= xmltools-1.3.7
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.logilab.org/xmltools/
COMMENT= High level tools to help using XML in python
-DEPENDS= ${PYPKGPREFIX}-FourSuite>=0.12:../../textproc/py-FourSuite
+DEPENDS+= ${PYPKGPREFIX}-FourSuite>=0.12:../../textproc/py-FourSuite
PYDISTUTILSPKG= yes
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index ede65b225d5..a4a3f69c481 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/03/24 21:13:02 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:08 rillig Exp $
DISTNAME= rman
PKGNAME= rman-3.0.9
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
.include "../../mk/bsd.prefs.mk"
.if exists(${X11BASE}/bin/rman)
-PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
+PKG_SKIP_REASON+= "${PKGNAME} is part of your X11 distribution"
.endif
post-install:
diff --git a/textproc/robodoc/Makefile b/textproc/robodoc/Makefile
index be311e2c8ad..49e0870135c 100644
--- a/textproc/robodoc/Makefile
+++ b/textproc/robodoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/11/08 19:45:54 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= robodoc-3.2.3
@@ -6,7 +6,7 @@ CATEGORIES= textproc devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=robodoc/}
MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= https://sourceforge.net/projects/robodoc/
+HOMEPAGE= http://sourceforge.net/projects/robodoc/
COMMENT= Tool to support project documentation within source code
GNU_CONFIGURE= YES
diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile
index 0133240bae0..80172e256ea 100644
--- a/textproc/ruby-eruby/Makefile
+++ b/textproc/ruby-eruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/02 09:48:34 taca Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:51:08 rillig Exp $
DISTNAME= eruby-${ERUBY_VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -20,9 +20,9 @@ CONFIGURE_SCRIPT= ${RUBY} configure.rb
CONFIGURE_ARGS+= --enable-shared \
--with-charset="${ERUBY_DEFAULT_CHARSET}"
INSTALL_TARGET= site-install
-PLIST_SUBST+= ERUBY_MAJOR=${ERUBY_MAJOR} \
- ERUBY_MINOR=${ERUBY_MINOR} \
- ERUBY_TEENY=${ERUBY_TEENY}
+PLIST_SUBST+= ERUBY_MAJOR=${ERUBY_MAJOR:Q} \
+ ERUBY_MINOR=${ERUBY_MINOR:Q} \
+ ERUBY_TEENY=${ERUBY_TEENY:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/textproc/ruby-rdtool/rdversion.mk b/textproc/ruby-rdtool/rdversion.mk
index 70fb0e3c895..e5682519726 100644
--- a/textproc/ruby-rdtool/rdversion.mk
+++ b/textproc/ruby-rdtool/rdversion.mk
@@ -1,7 +1,7 @@
-# $NetBSD: rdversion.mk,v 1.4 2004/12/04 16:07:01 taca Exp $
+# $NetBSD: rdversion.mk,v 1.5 2005/12/05 20:51:08 rillig Exp $
#
-.ifndef _RD_VERSION_MK
+.if !defined(_RD_VERSION_MK)
_RD_VERSION_MK= # defined
.include "../../lang/ruby/rubyversion.mk"
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index aecd04d6447..47f0756eab0 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= saxon
@@ -12,10 +12,10 @@ HOMEPAGE= http://users.iclway.co.uk/mhkay/saxon/
COMMENT= Michael H. Kay's Java XSLT processor
WRKSRC= ${WRKDIR}
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
USE_JAVA= run
-NO_CONFIGURE=
-NO_BUILD=
+NO_CONFIGURE= yes
+NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/java
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index bf11bd7b7e7..7297f5a12d4 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= scrollkeeper-0.3.14
@@ -14,7 +14,7 @@ COMMENT= Open Document Cataloging Project
PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
-DEPENDS= docbook-xml>=4.2nb7:../../textproc/docbook-xml
+DEPENDS+= docbook-xml>=4.2nb7:../../textproc/docbook-xml
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
@@ -22,7 +22,7 @@ USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS= --localstatedir=${SCROLLKEEPER_DATADIR}
+CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR}
CONFIGURE_ARGS+= --sharedstatedir=${SCROLLKEEPER_DATADIR}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-partial-db-dir=db
@@ -41,8 +41,8 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
SCROLLKEEPER_DATADIR= ${PREFIX}/libdata/scrollkeeper
SCROLLKEEPER_REBUILDDB= ${PREFIX}/bin/scrollkeeper-rebuilddb
-FILES_SUBST+= SCROLLKEEPER_DATADIR="${SCROLLKEEPER_DATADIR}"
-FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}"
+FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q}
+FILES_SUBST+= SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q}
EGDIR= ${PREFIX}/share/examples/scrollkeeper
CONF_FILES= ${EGDIR}/scrollkeeper.conf ${PKG_SYSCONFDIR}/scrollkeeper.conf
diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk
index a3f48d39ad0..120f4910c38 100644
--- a/textproc/scrollkeeper/omf.mk
+++ b/textproc/scrollkeeper/omf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: omf.mk,v 1.8 2005/03/24 22:42:58 jlam Exp $
+# $NetBSD: omf.mk,v 1.9 2005/12/05 20:51:08 rillig Exp $
#
# This Makefile fragment is intended to be included by packages that install
# OMF files. It takes care of registering them in scrollkeeper's global
@@ -26,9 +26,9 @@ USE_PKGINSTALL= YES
INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
-FILES_SUBST+= SCROLLKEEPER_DATADIR="${SCROLLKEEPER_DATADIR}"
-FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}"
-FILES_SUBST+= SCROLLKEEPER_UPDATEDB="${SCROLLKEEPER_UPDATEDB}"
+FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q}
+FILES_SUBST+= SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q}
+FILES_SUBST+= SCROLLKEEPER_UPDATEDB=${SCROLLKEEPER_UPDATEDB:Q}
PRINT_PLIST_AWK+= /^libdata\/scrollkeeper/ { next; }
PRINT_PLIST_AWK+= /^@dirrm libdata\/scrollkeeper/ { next; }
diff --git a/textproc/tcl-dom/Makefile b/textproc/tcl-dom/Makefile
index 5e6f0b0b7c4..c5d62fc7cbd 100644
--- a/textproc/tcl-dom/Makefile
+++ b/textproc/tcl-dom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:54:52 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= TclDOM-1.6
@@ -15,8 +15,8 @@ DEPENDS+= tcl-xml-[0-9]*:../../textproc/tcl-xml
# old name for this package...
CONFLICTS+= TclDom-[0-9]*
-NO_CONFIGURE=
-NO_BUILD=
+NO_CONFIGURE= yes
+NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl/TclDOM
diff --git a/textproc/tcl-xml/Makefile b/textproc/tcl-xml/Makefile
index ef3b290246d..9f0fc58fd89 100644
--- a/textproc/tcl-xml/Makefile
+++ b/textproc/tcl-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/09 01:22:58 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= TclXML-1.2
@@ -15,8 +15,8 @@ DEPENDS+= tcl>=8.3.2:../../lang/tcl
# old name for this package...
CONFLICTS+= TclXML-[0-9]*
-NO_CONFIGURE=
-NO_BUILD=
+NO_CONFIGURE= yes
+NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl/TclXML
diff --git a/textproc/tei/Makefile b/textproc/tei/Makefile
index 71e2da4cb5f..7064b4399ea 100644
--- a/textproc/tei/Makefile
+++ b/textproc/tei/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:08 rillig Exp $
DISTNAME= dtd
PKGNAME= tei-4
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.tei-c.org/
COMMENT= DTD of the Text Encoding Initiative
WRKSRC= ${WRKDIR}/dtd
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}nb3
NO_CONFIGURE= YES
NO_BUILD= YES
diff --git a/textproc/vis/Makefile b/textproc/vis/Makefile
index b828c1ddb0a..bc596ae7d35 100644
--- a/textproc/vis/Makefile
+++ b/textproc/vis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/05 19:53:40 christos Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= vis-0.1
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.astron.com/pub/people/christos/
MAINTAINER= christos@NetBSD.org
COMMENT= Convert strings from/to a visual format
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} \
- MANOWN=${MANOWN} MANGRP=${MANGRP}
+MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \
+ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index ac5d7045f5d..e25ba3996bd 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:08 rillig Exp $
#
# Note: we currently use the pre-built (-bin) distribution of Xalan-J,
# because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -17,8 +17,8 @@ DEPENDS+= xerces-j>=1.2.0:../../textproc/xerces-j
WRKSRC= ${WRKDIR}
USE_JAVA= run
-NO_CONFIGURE=
-NO_BUILD=
+NO_CONFIGURE= yes
+NO_BUILD= yes
do-install:
${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index abd34b4d5cd..30975c9a470 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= xmlcatmgr-2.2
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_PKGINSTALL= YES
-CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
OWN_DIRS= ${PKG_SYSCONFDIR}/sgml ${PKG_SYSCONFDIR}/xml
EGDIR= ${PREFIX}/share/examples/xmlcatmgr
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk
index 58f64883d99..8e74e33b0ed 100644
--- a/textproc/xmlcatmgr/catalogs.mk
+++ b/textproc/xmlcatmgr/catalogs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: catalogs.mk,v 1.12 2005/05/22 21:54:59 rillig Exp $
+# $NetBSD: catalogs.mk,v 1.13 2005/12/05 20:51:08 rillig Exp $
#
# This Makefile fragment is intended to be included by packages that install
# catalog files or DTDs. It takes care of registering them into the right
@@ -47,7 +47,7 @@ XML_ENTRIES+= nextCatalog ${PREFIX:=${c}} --
# use pkginstall framework.
#
.if !empty(SGML_ENTRIES) || !empty(XML_ENTRIES)
-FILES_SUBST+= XMLCATMGR="${XMLCATMGR}"
+FILES_SUBST+= XMLCATMGR=${XMLCATMGR:Q}
FILES_SUBST+= SGML_CATALOG="${XMLCATMGR_PREFIX}/share/sgml/catalog"
FILES_SUBST+= XML_CATALOG="${XMLCATMGR_PREFIX}/share/xml/catalog"
FILES_SUBST+= SGML_ENTRIES=${SGML_ENTRIES:Q}
diff --git a/textproc/xmlindent/Makefile b/textproc/xmlindent/Makefile
index 297a7f465ba..83c446d40fd 100644
--- a/textproc/xmlindent/Makefile
+++ b/textproc/xmlindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:42 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= xmlindent-0.2.16
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_TOOLS+= lex
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
INSTALLATION_DIRS= bin man/man1
diff --git a/time/anacron/Makefile b/time/anacron/Makefile
index fffe573d02f..a29bec3346a 100644
--- a/time/anacron/Makefile
+++ b/time/anacron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= anacron-2.3
@@ -33,13 +33,13 @@ SUBST_SED.man= -e 's|/etc/anacrontab|${PKG_SYSCONFDIR}/anacrontab|g'
MAKE_FLAGS+= ANACRONTAB='${PKG_SYSCONFDIR}/anacrontab'
MAKE_FLAGS+= BINDIR='${PREFIX}/sbin'
-MAKE_FLAGS+= CFLAGS='${CFLAGS}'
-MAKE_FLAGS+= INSTALL_DATA='${INSTALL_DATA}'
-MAKE_FLAGS+= INSTALL_DIR='${TRUE}'
-MAKE_FLAGS+= INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
+MAKE_FLAGS+= INSTALL_DATA=${INSTALL_DATA:Q}
+MAKE_FLAGS+= INSTALL_DIR=${TRUE:Q}
+MAKE_FLAGS+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
MAKE_FLAGS+= MANDIR='${PREFIX}/man'
-MAKE_FLAGS+= PREFIX='${PREFIX}'
-MAKE_FLAGS+= SHELL='${SH}'
+MAKE_FLAGS+= PREFIX=${PREFIX:Q}
+MAKE_FLAGS+= SHELL=${SH:Q}
MAKE_FLAGS+= SPOOLDIR='/var/spool/anacron'
EGDIR= ${PREFIX}/share/examples/anacron
diff --git a/time/gnutime/Makefile b/time/gnutime/Makefile
index 720a4596438..7a95697a0f8 100644
--- a/time/gnutime/Makefile
+++ b/time/gnutime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:44 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= time-1.7
@@ -14,7 +14,7 @@ GNU_CONFIGURE= yes
INFO_FILES= time.info
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
-PLIST_SUBST+= GNU_PROGRAM_PREFIX="${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/time/ical/Makefile b/time/ical/Makefile
index 8db147c2b0e..df9ed0ac30b 100644
--- a/time/ical/Makefile
+++ b/time/ical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:23 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:08 rillig Exp $
DISTNAME= ical-2.3.1
PKGREVISION= 1
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX} \
+CONFIGURE_ARGS+= --prefix=${PREFIX} \
--with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \
--with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \
--with-tkconfig=${BUILDLINK_PREFIX.tk}/lib
diff --git a/time/pcal/Makefile b/time/pcal/Makefile
index e0d44a4614f..50498e137e9 100644
--- a/time/pcal/Makefile
+++ b/time/pcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/08 18:22:49 kristerw Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= pcal-4.7
@@ -17,8 +17,8 @@ CGIBINDIR= ${PREFIX}/libexec/cgi-bin
WWWSERVER= ${HOSTNAME_CMD:sh}
.include "../../mk/bsd.prefs.mk" # for PAPERSIZE
-MAKE_ENV+= PAPERSIZE="${PAPERSIZE}"
-MAKE_ENV+= CC="${CC}" HOST_CC="${CC}"
+MAKE_ENV+= PAPERSIZE=${PAPERSIZE:Q}
+MAKE_ENV+= CC=${CC:Q} HOST_CC=${CC:Q}
BUILD_TARGET= pcal
diff --git a/time/pclock/Makefile b/time/pclock/Makefile
index aa0c7de1b48..6d4fe3a644c 100644
--- a/time/pclock/Makefile
+++ b/time/pclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:23 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= pclock_0.13.1.orig
@@ -12,7 +12,7 @@ COMMENT= Simple analog clock designed for Window Maker
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}.orig
-MAKE_ENV+= LN=${LN}
+MAKE_ENV+= LN=${LN:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pclock
diff --git a/time/ptimetracker/Makefile b/time/ptimetracker/Makefile
index 0f3a1fcd17e..f452cfa9ad8 100644
--- a/time/ptimetracker/Makefile
+++ b/time/ptimetracker/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:38 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:09 rillig Exp $
DISTNAME= ptimetracker-1.7.3
-PKGREVISION= # empty
CATEGORIES= time kde
MASTER_SITES= http://www.eggtart.plus.com/ptt/prog/
diff --git a/time/sunclock/Makefile b/time/sunclock/Makefile
index b99a8160ea8..779507560a5 100644
--- a/time/sunclock/Makefile
+++ b/time/sunclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= sunclock-1.5
@@ -10,6 +10,6 @@ COMMENT= Show which portion of the Earth's surface is illuminated by the Sun
USE_IMAKE= yes
-CPPFLAGS.SunOS= -DUSE_PUTENV
+CPPFLAGS.SunOS+= -DUSE_PUTENV
.include "../../mk/bsd.pkg.mk"
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index eeab2ea69e6..8c2354ed9c9 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:43 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= wmMoonClock-1.27
@@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/Src
USE_TOOLS+= gmake
USE_X11BASE= YES
-MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}
+MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index f1d05fe58bf..254f20d6c52 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/23 21:27:47 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= amiwm0.20pl48
@@ -20,7 +20,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
GNU_CONFIGURE= yes
CFLAGS+= -DHAVE_X11_EXTENSIONS_SHAPE_H=1
CFLAGS+= -O
-CONFIGURE_ENV+= CFLAGS=${CFLAGS:Q}
+CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
CONFIGURE_ENV+= X_PRE_LIBS=${X_PRE_LIBS:Q}
CONFIGURE_ENV+= X_EXTRA_LIBS=-lXt
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index 191aa651e75..bb14516eddf 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/11/11 19:07:40 tonio Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= blackbox-0.65.0
@@ -10,7 +10,7 @@ MAINTAINER= jschauma@NetBSD.org
HOMEPAGE= http://blackboxwm.sourceforge.net/
COMMENT= Small and fast X11R6 window manager
-DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot
+DEPENDS+= bsetroot>=0.1nb1:../../wm/bsetroot
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index a0d27901813..47ec8e664ba 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/10/24 17:23:33 tonio Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= fluxbox-0.9.14
@@ -13,7 +13,7 @@ COMMENT= Window Manager for X based on Blackbox
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index 6b4e3887376..ecee3a176f9 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/09/28 20:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= flwm-1.00
@@ -14,7 +14,7 @@ COMMENT= The Fast, Light Window Manager
GNU_CONFIGURE= yes
CONFIGURE_ENV+= X_LIBS="-lGL"
-MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
CXXFLAGS+= -DFLTK_1_0_COMPAT
.include "../../x11/fltk/buildlink3.mk"
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index c118f76d1de..2bba3e76750 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:13:03 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:09 rillig Exp $
DISTNAME= fvwm-1.24r
PKGNAME= ${DISTNAME:S/fvwm/fvwm1/}
@@ -9,7 +9,7 @@ MAINTAINER= cjs@NetBSD.org
HOMEPAGE= http://www.fvwm.org/
COMMENT= Virtual window manager for X
-DEPENDS= xpmroot-2.*:../../x11/xpmroot
+DEPENDS+= xpmroot-2.*:../../x11/xpmroot
CONFLICTS= fvwm2-* fvwm>=1
diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index deb09088a08..e733af402af 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/05/30 23:24:10 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:51:09 rillig Exp $
DISTNAME= fvwm-${FVWM_VER}
PKGNAME= fvwm2-${FVWM_VER}
@@ -23,7 +23,7 @@ USE_X11BASE= YES
GNU_CONFIGURE= YES
USE_GNU_READLINE= YES
-PLIST_SUBST+= FVWM_VER=${FVWM_VER}
+PLIST_SUBST+= FVWM_VER=${FVWM_VER:Q}
EVAL_PREFIX+= XPMDIR=xpm
CONFIGURE_ARGS+= --without-gnome
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR}/include
CONFIGURE_ARGS+= --with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
# We don't want to have CPP from the buildlink directory
-CONFIGURE_ENV+= ac_cv_path_FVWM_CPP="${CPP}"
+CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q}
post-extract:
${MKDIR} ${WRKDIR}/icons
diff --git a/wm/icecc/Makefile b/wm/icecc/Makefile
index a4c976d1116..cc1be211260 100644
--- a/wm/icecc/Makefile
+++ b/wm/icecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/06/25 01:55:08 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:09 rillig Exp $
# Package version reflects icecc version, with PKGREVISION incremented
# for any tool updates, according to the authors scheme.
@@ -38,7 +38,7 @@ PYTHON_PATCH_SCRIPTS= icecursorscfg-0.6/icecurcfg.py iceiconcvt-1.0/iceiconcvt.p
PYTHON_PATCH_SCRIPTS+= icemergeprefs-0.5/icemergeprefs.py icerrun-0.5/icerrrun.py
PYTHON_PATCH_SCRIPTS+= icerrun-0.5/icerrun.py
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= icebgset-1.3/icebgset.pro icecc-2.9/icecc.pro iceked-1.5/iceked.pro
SUBST_FILES.path+= icemc-2.1/icemc.pro icesndcfg-1.3/icesndcfg.pro icets-1.4/icets.pro
@@ -49,7 +49,7 @@ SUBST_SED.path= "s|/usr/local|${PREFIX}|g"
SUBST_MESSAGE.path= "Fixing hardcoded paths."
# VIM_SUBDIR comes from "editors/vim-share/version.mk"
-PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR}
+PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR:Q}
do-configure:
. for dir in ${QSRC}
diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile
index 38a71fab10b..317a152a917 100644
--- a/wm/icewm-imlib/Makefile
+++ b/wm/icewm-imlib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2005/01/20 04:27:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:09 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-imlib-/}
COMMENT= Small, fast and light-weight window manager (imlib version)
CONFLICTS+= icewm-[0-9]* icewm-gnome-[0-9]*
-.include "../icewm/Makefile.common"
+.include "../../wm/icewm/Makefile.common"
PLIST_SRC= ${.CURDIR}/../icewm/PLIST
diff --git a/wm/mlvwm/Makefile b/wm/mlvwm/Makefile
index 5e9906db4ad..808645d80f1 100644
--- a/wm/mlvwm/Makefile
+++ b/wm/mlvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/04 06:57:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= mlvwm091
@@ -24,7 +24,7 @@ post-install:
.endfor
${INSTALL_DATA} ${WRKSRC}/pixmap/*.xpm ${PREFIX}/share/mlvwm
-SUBST_CLASSES= xpm
+SUBST_CLASSES+= xpm
SUBST_STAGE.xpm= post-configure
SUBST_FILES.xpm= sample_rc/Mlvwmrc
SUBST_SED.xpm= -e "s,@PREFIX@,${PREFIX},"
diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile
index e576d85a9bf..7542a700e0a 100644
--- a/wm/openbox2/Makefile
+++ b/wm/openbox2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:25 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= openbox-2.2.3
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://icculus.org/openbox/
COMMENT= Window manager based on Blackbox (2.x branch)
-DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot
+DEPENDS+= bsetroot>=0.1nb1:../../wm/bsetroot
USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index 09bf8bbd4c1..413d7a18fc2 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= pekwm-0.1.3
@@ -35,7 +35,6 @@ CONF_FILES=
.for f in autoproperties config keys menu mouse start
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
.include "../../graphics/xpm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index f59e0891438..d580918b07a 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/13 19:18:14 martin Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= qvwm-1.1.12
@@ -12,7 +12,7 @@ COMMENT= Windows 95/98/NT like window manager for X11
GNU_CONFIGURE= yes
USE_TOOLS+= gmake rm
-CONFIGURE_ENV+= PATH_RM="${TOOLS_RM}"
+CONFIGURE_ENV+= PATH_RM=${TOOLS_RM:Q}
USE_LANGUAGES= c++
post-install:
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 79e8bd576c2..f44fe8aca8e 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/09/28 20:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:09 rillig Exp $
#
PKGNAME= sawfish-${SF_VERS}
@@ -11,14 +11,14 @@ DEPENDS+= sawfish-replibs-${SF_VERS}nb5:../../wm/sawfish-replibs
USE_DIRS+= xdg-1.1
USE_X11BASE= yes
-CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
-MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
+CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
BUILD_USES_MSGFMT= YES
USE_MAKEINFO= YES
INFO_FILES= sawfish.info
-PLIST_SUBST+= SF_VERS=${SF_VERS}
+PLIST_SUBST+= SF_VERS=${SF_VERS:Q}
.include "../../mk/x11.buildlink3.mk"
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index cca8f8f1188..29492206df8 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/09/28 21:55:32 rillig Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/12/05 20:51:09 rillig Exp $
DISTNAME= sawfish-${SF_VERS}-gtk1
SF_VERS= 1.2
@@ -13,7 +13,7 @@ DEPENDS+= rep-gtk>=0.15nb2:../../x11/rep-gtk
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
DISTINFO_FILE= ${.CURDIR}/../../wm/sawfish/distinfo
PATCHDIR= ${.CURDIR}/../../wm/sawfish/patches
diff --git a/wm/wampager/Makefile b/wm/wampager/Makefile
index 6ee5f01d2fd..18c1ce29bf2 100644
--- a/wm/wampager/Makefile
+++ b/wm/wampager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:39 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:09 rillig Exp $
#
DISTNAME= wampager-0.9.1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.waimea.org/wampager_info.html
COMMENT= Virtual pager dockapp for the Waimea Window Manager
-DEPENDS= waimea>=0.4.0:../../wm/waimea
+DEPENDS+= waimea>=0.4.0:../../wm/waimea
INSTALLATION_DIRS= bin
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 408b1484ce9..c110266913b 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/10/27 08:10:08 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:51:10 rillig Exp $
DISTNAME= WindowMaker-0.92.0
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep
CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
CONFIGURE_ENV+= LINGUAS=yes
-CONFIGURE_ENV+= CPP_PATH="${CPP}"
+CONFIGURE_ENV+= CPP_PATH=${CPP:Q}
.if ${MACHINE_ARCH} != "i386"
CONFIGURE_ENV+= ac_cv_c_inline_asm=no
.endif
@@ -42,7 +42,6 @@ CONF_FILES=
.for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
# WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
# to support. Currently supported options:
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index ec98a2503f0..c0dfb235091 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:39 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:10 rillig Exp $
DISTNAME= wm2-4
PKGNAME= wm2-4.0
@@ -13,7 +13,7 @@ BUILD_TARGET= depend wm2
USE_LANGUAGES= c c++
USE_X11BASE= YES
-MAKE_ENV+= CCC="${CXX}"
+MAKE_ENV+= CCC=${CXX:Q}
INSTALLATION_DIRS= bin man/cat1
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index 673fe3f408d..0f3b6304cf2 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/11/03 02:47:58 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:10 rillig Exp $
#
DISTNAME= wmii-20051031
@@ -29,7 +29,6 @@ EGFILES= _clabel extern progmenu rcmenu status \
.for f in ${EGFILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile
index 9824c2a23b1..a4e412c657b 100644
--- a/wm/wmthemes/Makefile
+++ b/wm/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:26 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:10 rillig Exp $
#
# There is no distinfo file because users can specify alternate themes
@@ -36,7 +36,6 @@ THEME_FILES=
THEME_FILES+= ${theme}.tar.gz
SITES_${theme}.tar.gz= http://download.freshmeat.net/themes/${theme:C/-[^-]*$//}/
.endfor
-.undef theme
.include "../../mk/x11.buildlink3.mk"
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
index 6929f38f0f5..979024e525f 100644
--- a/wm/wmx/Makefile.common
+++ b/wm/wmx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2005/09/28 21:55:32 rillig Exp $
+# $NetBSD: Makefile.common,v 1.15 2005/12/05 20:51:10 rillig Exp $
DISTNAME= wmx-6
WMX_VERS= 6.0
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c c++
USE_X11BASE= yes
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
BUILD_TARGET= depend all
DISTINFO_FILE= ${.CURDIR}/../../wm/wmx/distinfo
diff --git a/www/album_themes/Makefile b/www/album_themes/Makefile
index 3fc7f8149fd..73d38268315 100644
--- a/www/album_themes/Makefile
+++ b/www/album_themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/24 14:31:15 augustss Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:10 rillig Exp $
#
DISTNAME= album_themes
@@ -14,7 +14,7 @@ DEPENDS+= album-[0-9]*:../../www/album
NO_CONFIGURE= YES
NO_BUILD= YES
-EXTRACT_ONLY= # defined
+EXTRACT_ONLY= # none
USE_TOOLS+= tar
diff --git a/www/analog/Makefile b/www/analog/Makefile
index ac41b2c1658..e6abf5a0648 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/08/25 10:09:48 grant Exp $
+# $NetBSD: Makefile,v 1.51 2005/12/05 20:51:10 rillig Exp $
DISTNAME= analog-6.0
CATEGORIES= www
@@ -13,7 +13,7 @@ COMMENT= Extremely fast program for analysing WWW logfiles
WRKSRC= ${WRKDISTDIR}/src
BUILD_TARGET= analog
-MAKE_ENV+= PREFIX=${PREFIX} SYSCONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+= PREFIX=${PREFIX:Q} SYSCONFDIR=${PKG_SYSCONFDIR:Q}
WRKDISTDIR= ${WRKDIR}/${DISTNAME}
USE_PKGINSTALL= yes
@@ -28,7 +28,7 @@ INSTALLATION_DIRS= bin man/man1
LIBS+= -lm
LIBS.SunOS+= -lnsl -lsocket
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:M*:Q}
do-install:
${INSTALL_PROGRAM} ${WRKDISTDIR}/analog ${PREFIX}/bin
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index e462b3b0dd0..7f0e74f9c23 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/15 21:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 20:51:10 rillig Exp $
#
# There are a few more mod_auth_cookie's out there doing slightly
# different things. This one pkg would be a good place to dump them all in
@@ -20,7 +20,7 @@ EXTRACT_CMD= ${DO_NADA}
APACHE_MODULE_NAME= mod_auth_cookie.so
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
post-extract:
@(${ECHO} '#include "ap_compat.h"'; ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}) \
diff --git a/www/ap-bandwidth/Makefile b/www/ap-bandwidth/Makefile
index 616a15307a9..044477a44b7 100644
--- a/www/ap-bandwidth/Makefile
+++ b/www/ap-bandwidth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:10 rillig Exp $
#
DISTNAME= mod_bandwidth.c
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}
APACHE_MODULE_NAME= mod_bandwidth.so
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
do-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}
diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
index 53c7e30d38e..e28bb9c98e0 100644
--- a/www/ap-dav/Makefile
+++ b/www/ap-dav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/17 03:50:39 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:10 rillig Exp $
DISTNAME= mod_dav-1.0.3-1.3.6
PKGNAME= ap-dav-1.0.3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.webdav.org/mod_dav/
COMMENT= Apache WebDAV module
# Ugly mess that says apache>=1.3.9 and apache<2.0.
-BUILDLINK_DEPENDS.apache= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
+BUILDLINK_DEPENDS.apache+= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
APACHE_MODULE= YES
GNU_CONFIGURE= YES
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index f49acc82cc1..5dbe5f8a492 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/06/17 03:50:39 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:10 rillig Exp $
DISTNAME= mod_dtcl-0.11.6
PKGNAME= ap-dtcl-0.11.2
@@ -15,8 +15,8 @@ WRKSRC= ${WRKDIR}/mod_dtcl
TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
CPPFLAGS+= -I${BUILDLINK_PREFIX.apache}/include/httpd -DEAPI
-MAKE_ENV+= TCLSH="${TCLSH}"
-MAKE_ENV+= INCLUDES="${CPPFLAGS}"
+MAKE_ENV+= TCLSH=${TCLSH:Q}
+MAKE_ENV+= INCLUDES=${CPPFLAGS:M*:Q}
APACHE_MODULE= yes
APACHEMODDIR= ${PREFIX}/lib/httpd
diff --git a/www/ap-fastcgi/Makefile.common b/www/ap-fastcgi/Makefile.common
index fcccc86cb05..2fc222de200 100644
--- a/www/ap-fastcgi/Makefile.common
+++ b/www/ap-fastcgi/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:51:10 rillig Exp $
#
DISTNAME= mod_fastcgi-2.4.2
CATEGORIES= www
@@ -13,7 +13,7 @@ PATCHDIR= ${.CURDIR}/../../www/ap-fastcgi/patches
PLIST_SRC= ${.CURDIR}/../../www/ap-fastcgi/PLIST
MESSAGE_SRC= ${.CURDIR}/../../www/ap-fastcgi/MESSAGE
-PLIST_SUBST+= APACHE_MANUAL=${APACHE_MANUAL}
+PLIST_SUBST+= APACHE_MANUAL=${APACHE_MANUAL:Q}
post-install:
${INSTALL_DATA} ${WRKSRC}/docs/mod_fastcgi.html \
diff --git a/www/ap-iasp/Makefile b/www/ap-iasp/Makefile
index 5cbdb387070..326622aa41f 100644
--- a/www/ap-iasp/Makefile
+++ b/www/ap-iasp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:54 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:10 rillig Exp $
-.include "../iasp/Makefile.common"
+.include "../../www/iasp/Makefile.common"
PKGNAME= ap-iasp-${IASP_VERSION}
COMMENT= Apache connector for accessing a iASP proxy server
diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile
index f4cf1fa9e46..ae1235c2a57 100644
--- a/www/ap-python/Makefile
+++ b/www/ap-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:10 rillig Exp $
#
DISTNAME= mod_python-2.7.10
@@ -14,8 +14,8 @@ COMMENT= Python interpreter embedded into Apache
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= PYTHON_BIN=${PYTHONBIN}
-MAKE_ENV+= PYTHONBIN=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON_BIN=${PYTHONBIN:Q}
+MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q}
PYTHON_VERSIONS_ACCEPTED= 23 22 21 20
post-install:
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index a82db256d34..336b2e3edf7 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:51 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:10 rillig Exp $
#
DISTNAME= mod_ruby-${VERSION}
@@ -20,7 +20,7 @@ VERSION= 1.2.4
HAS_CONFIGURE= yes
INSTALL_TARGET= site-install
CONFIGURE_SCRIPT= ${RUBY} configure.rb
-CONFIGURE_ARGS= --with-apxs="${APXS}"
+CONFIGURE_ARGS+= --with-apxs=${APXS:Q}
MESSAGE_SUBST+= RUBY_DOCDIR=${RUBY_DOCDIR}
DOCS= ChangeLog NOTICE README.en README.ja
REPLACE_RUBY+= install-rb
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index e0b91d43eb1..39d83f71b85 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2005/10/19 20:33:44 bouyer Exp $
+# $NetBSD: Makefile,v 1.93 2005/12/05 20:51:10 rillig Exp $
DISTNAME= mod_ssl-2.8.25-1.3.34
PKGNAME= ap-ssl-2.8.25
@@ -13,7 +13,7 @@ COMMENT= SSL/TLS protocols module for Apache
CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
-BUILDLINK_DEPENDS.apache= apache>=1.3.33
+BUILDLINK_DEPENDS.apache+= apache>=1.3.33
USE_PKGINSTALL= yes
APACHE_MODULE= yes
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE}
SSL_RPATH_LDFLAGS= ${LINKER_RPATH_FLAG} ${SSLBASE}/lib
FIX_RPATH+= SSL_RPATH_LDFLAGS
-MAKE_ENV+= SSL_RPATH_LDFLAGS="${SSL_RPATH_LDFLAGS}"
+MAKE_ENV+= SSL_RPATH_LDFLAGS=${SSL_RPATH_LDFLAGS:Q}
PKG_SYSCONFVAR= apache
PKG_SYSCONFSUBDIR?= httpd
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index 634f5450047..5004353dbab 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/14 10:47:43 adrianp Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:10 rillig Exp $
DISTNAME= mod_auth_ldap3.05
PKGNAME= ap2-auth-ldap-3.05
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap}
CONFIGURE_ARGS+= --with-apache-dir=${PREFIX}
CONFIGURE_ARGS+= --with-apache-ver=2
-SUBST_CLASSES= paths
+SUBST_CLASSES+= paths
SUBST_STAGE.paths= post-patch
SUBST_FILES.paths= configure
SUBST_SED.paths= -e "s|@@HASHLIB@@|${PREFIX}/include|g" \
diff --git a/www/apache/Makefile b/www/apache/Makefile
index c1dfc28efae..4629bad59b4 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.173 2005/10/19 20:30:20 bouyer Exp $
+# $NetBSD: Makefile,v 1.174 2005/12/05 20:51:10 rillig Exp $
#
# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
# code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -43,9 +43,9 @@ CONFIGURE_ARGS+= --enable-rule=EAPI \
CONFIGURE_ARGS+= --without-confadjust
CONFIGURE_ARGS+= --with-perl=${PERL5}
CONFIGURE_ARGS+= --with-port=80
-CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}"
+CONFIGURE_ENV+= OPTIM=${APACHE_CUSTOM_CFLAGS:Q}
CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_PREFIX.libmm}"
-CONFIGURE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP}
+CONFIGURE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
.include "../../mk/bsd.prefs.mk"
@@ -118,7 +118,7 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64
.if ${OPSYS} == "NetBSD"
. if ${OBJECT_FMT} == "ELF"
LINK_LIBGCC_LDFLAGS= ${LINK_ALL_LIBGCC_HACK}
-MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
+MAKE_ENV+= LINK_LIBGCC_LDFLAGS=${LINK_LIBGCC_LDFLAGS:Q}
#
# If we are using gcc3, we need to link against libgcc_s, too. This
# ensures modules can resolve symbols they require from gcc.
@@ -148,8 +148,8 @@ OWN_DIRS_PERMS+= ${VARBASE}/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
PKG_GROUPS= ${APACHE_GROUP}
PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\ user
-MAKE_ENV+= CHMOD="${CHMOD}" CHOWN="${CHOWN}" XARGS="${XARGS}"
-MAKE_ENV+= FIND="${FIND}" CHGRP="${CHGRP}"
+MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} XARGS=${XARGS:Q}
+MAKE_ENV+= FIND=${FIND:Q} CHGRP=${CHGRP:Q}
.include "../../devel/libmm/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 91277921bf7..4936d820a2a 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2005/10/23 20:14:43 jlam Exp $
+# $NetBSD: Makefile,v 1.87 2005/12/05 20:51:11 rillig Exp $
.include "Makefile.common"
@@ -28,7 +28,7 @@ CONFIGURE_ENV+= perlbin=${PERL5:Q}
CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr}
-BUILDLINK_DEPENDS.apr= apr>=0.9.7.2.0.55
+BUILDLINK_DEPENDS.apr+= apr>=0.9.7.2.0.55
.include "../../mk/bsd.prefs.mk"
.include "../../devel/apr/buildlink3.mk"
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index afa994f6ee0..edde6432605 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/07/16 01:19:25 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2005/12/05 20:51:11 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -21,8 +21,8 @@ BUILDLINK_DEPMETHOD.apache+= full
.endif # APACHE_BUILDLINK3_MK
USE_TOOLS+= perl # for "apxs"
-CONFIGURE_ENV+= APR_LIBTOOL=${LIBTOOL} # make apxs use the libtool we specify
-MAKE_ENV+= APR_LIBTOOL=${LIBTOOL}
+CONFIGURE_ENV+= APR_LIBTOOL=${LIBTOOL:Q} # make apxs use the libtool we specify
+MAKE_ENV+= APR_LIBTOOL=${LIBTOOL:Q}
APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs
.if !empty(APACHE_BUILDLINK3_MK:M+)
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile
index 6edeae77e47..b83f65c657f 100644
--- a/www/apc-gui/Makefile
+++ b/www/apc-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/22 14:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:11 rillig Exp $
DISTNAME= apc_gui-1.0.3
PKGNAME= ${DISTNAME:S/_/-/}
@@ -21,7 +21,7 @@ USE_PKGINSTALL= YES
PKG_SYSCONFSUBDIR?= httpd
APC_GUI_DIR= ${PREFIX}/share/${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-PLIST_SUBST+= PKGBASE=${PKGBASE}
+PLIST_SUBST+= PKGBASE=${PKGBASE:Q}
MESSAGE_SUBST+= APC_GUI_DIR=${APC_GUI_DIR}
CONF_FILES= ${EGDIR}/apc_gui.conf ${PKG_SYSCONFDIR}/apc_gui.conf
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 120ef0d342d..0f5e3cb1168 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/09/28 12:11:29 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:11 rillig Exp $
#
DISTNAME= awstats-6.4
@@ -11,7 +11,7 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://awstats.sourceforge.net/
COMMENT= Free real-time logfile analyzer to get advanced web statistics
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}nb2
NO_BUILD= YES
USE_TOOLS+= perl:run
@@ -26,7 +26,7 @@ USE_PKGINSTALL= YES
OWN_DIRS_PERMS+= ${VARBASE}/awstats ${APACHE_USER} ${APACHE_GROUP} 0700
PKG_SYSCONFSUBDIR= awstats
-SUBST_CLASSES= conf
+SUBST_CLASSES+= conf
SUBST_STAGE.conf= post-patch
SUBST_FILES.conf= tools/awstats_configure.pl \
wwwroot/cgi-bin/awstats.model.conf \
diff --git a/www/bkedit/Makefile b/www/bkedit/Makefile
index 24ca289ad77..d68c69deec3 100644
--- a/www/bkedit/Makefile
+++ b/www/bkedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/11/08 02:25:37 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:11 rillig Exp $
#
DISTNAME= bk_edit-0.6.23
@@ -16,8 +16,8 @@ USE_TOOLS+= bison
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
-MAKE_ENV+= PKG_CFLAGS=${CFLAGS:Q}
-MAKE_ENV+= PKG_LDFLAGS=${LDFLAGS:Q}
+MAKE_ENV+= PKG_CFLAGS=${CFLAGS:M*:Q}
+MAKE_ENV+= PKG_LDFLAGS=${LDFLAGS:M*:Q}
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
diff --git a/www/blur6ex/Makefile b/www/blur6ex/Makefile
index 8d3127c1ace..2d92df5b9c8 100644
--- a/www/blur6ex/Makefile
+++ b/www/blur6ex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:11 rillig Exp $
#
DISTNAME= blur6ex-0.1.198
@@ -18,7 +18,7 @@ NO_BUILD= yes
USE_PKGINSTALL= yes
HTTPD_ROOT?= share/httpd/htdocs
-PLIST_SUBST+= HTTPD_ROOT=${HTTPD_ROOT}
+PLIST_SUBST+= HTTPD_ROOT=${HTTPD_ROOT:Q}
BUILD_DEFS+= HTTPD_ROOT
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index bbccfb7b076..c20593472a2 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/09/28 12:15:16 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:11 rillig Exp $
DISTNAME= Cocoon-1.8.2
PKGNAME= cocoon-1.8.2
@@ -64,4 +64,4 @@ do-install:
.include "../../mk/bsd.pkg.mk"
CLASSPATH:=${CLASSPATH}:${LOCALBASE}/lib/java/fop.jar:${LOCALBASE}/lib/java/xalan.jar:${LOCALBASE}/lib/java/bsf.jar:${LOCALBASE}/lib/java/xerces.jar:${LOCALBASE}/lib/java/servlet.jar:${PKG_JAVA_HOME}/lib/classes.zip:${PKG_JAVA_HOME}/lib/tools.jar
-MAKE_ENV+= CLASSPATH=${CLASSPATH}
+MAKE_ENV+= CLASSPATH=${CLASSPATH:Q}
diff --git a/www/communicator/Makefile b/www/communicator/Makefile
index 1138054cdc1..9e692f02813 100644
--- a/www/communicator/Makefile
+++ b/www/communicator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/08/08 09:38:41 grant Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 20:51:11 rillig Exp $
#
COMMENT= Netscape Communicator browser, version 4 (binary pkg)
@@ -6,5 +6,5 @@ COMMENT= Netscape Communicator browser, version 4 (binary pkg)
BINNAME= communicator
DIST_SDIR_NAME= complete_install
-.include "../navigator/Makefile.common"
+.include "../../www/navigator/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/crawl/Makefile b/www/crawl/Makefile
index 36db298aa92..200bc6627f8 100644
--- a/www/crawl/Makefile
+++ b/www/crawl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/09/16 14:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:11 rillig Exp $
DISTNAME= crawl-0.4
PKGREVISION= 1
@@ -19,7 +19,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/crawl.conf ${PREFIX}/share/examples/${PKGBASE}/crawl.conf
-SUBST_CLASSES= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= cfg.h
SUBST_SED.path= -e 's,crawl.conf,${PKG_SYSCONFDIR}/crawl.conf,g'
diff --git a/www/curl/Makefile b/www/curl/Makefile
index f88f0c7f4c1..a3b961ea49c 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/10/20 16:25:15 minskim Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:51:11 rillig Exp $
DISTNAME= curl-7.15.0
PKGREVISION= 1
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
# Work around an ICE on sparc64 with gcc2
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
TEST_TARGET= check
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index 976753080b5..982cbee1409 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/09/28 12:18:22 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:11 rillig Exp $
#
DISTNAME= cvsweb-3.0.5
@@ -64,7 +64,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
.endfor
-SUBST_CLASSES= prefix
+SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= post-patch
SUBST_FILES.prefix= cvsweb.conf cvsweb.cgi INSTALL
SUBST_SED.prefix= -e "s,/usr/local/etc/apache,${PKG_SYSCONFBASE}/httpd,g"
diff --git a/www/drraw/Makefile b/www/drraw/Makefile
index c9d4f8e4e62..0453359e664 100644
--- a/www/drraw/Makefile
+++ b/www/drraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/13 11:14:41 kleink Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:12 rillig Exp $
#
DISTNAME= drraw-2.1.3
@@ -45,7 +45,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
.endfor
-SUBST_CLASSES= prefix
+SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= post-patch
SUBST_FILES.prefix= drraw.cgi
SUBST_SED.prefix= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g"
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index d92330d2fc4..76d90b61a66 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/09/04 05:00:36 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:12 rillig Exp $
DISTNAME= elinks-0.10.5
PKGREVISION= 1
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake
CONFIGURE_ARGS+= --without-x
CONFIGURE_ARGS+= --enable-256-colors
-CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
+CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index b7e22489de5..31849d39fc0 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:12 rillig Exp $
DISTNAME= emacs-w3m-1.3.3
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -44,8 +44,8 @@ ETCDIR= share/emacs/${EMACS_VERSION:C/[^0-9]*$//}/etc
ICONDIR= ${ETCDIR}/w3m/icons
.endif
DOCDIR= ${ETCDIR}/w3m/doc
-PLIST_SUBST+= DOCDIR=${DOCDIR}
-PLIST_SUBST+= ICONDIR=${ICONDIR}
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
+PLIST_SUBST+= ICONDIR=${ICONDIR:Q}
post-install:
@${MKDIR} ${PREFIX}/${DOCDIR}
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index f06cffa1b70..48d807a665c 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/16 14:14:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:12 rillig Exp $
#
DISTNAME= epiphany-extensions-1.8.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/projects/epiphany/extensions.html
COMMENT= Extensions for the Epiphany web browser
GNU_CONFIGURE= YES
-USE_TOOLS= gmake pkg-config
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_MSGFMT_PLURALS= YES
USE_PKGLOCALEDIR= YES
diff --git a/www/firefox-bin-acroread/Makefile.common b/www/firefox-bin-acroread/Makefile.common
index 8a87ce26f62..0892de6181b 100644
--- a/www/firefox-bin-acroread/Makefile.common
+++ b/www/firefox-bin-acroread/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/08/26 22:18:05 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:51:12 rillig Exp $
PKGNAME= ${DISTNAME:C|MozillaFirebird|firefox|}
CATEGORIES= www print
@@ -16,8 +16,8 @@ NO_CONFIGURE= YES
NO_BUILD= YES
PLIST_SRC= ../../www/firefox-bin-acroread/PLIST
-PLIST_SUBST+= ACROREAD=${ACROREAD}
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= ACROREAD=${ACROREAD:Q}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
NS_PLUGINS_DIR= ${PREFIX}/lib/firefox-linux/plugins
BROWSER?= Browsers
diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common
index ffbcec2bc7d..6399f4e771a 100644
--- a/www/firefox-bin-flash/Makefile.common
+++ b/www/firefox-bin-flash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:51:12 rillig Exp $
DISTNAME= install_flash_player_7_${DISTUNAME}
PKGNAME= ${MOZ_BIN}-flash-${FLASH_VERS:S/r/./}
@@ -37,7 +37,7 @@ MOZ_BIN?= ${MOZ_NAME:S/linux/bin/}
WRKSRC= ${WRKDIR}/${WRKNAME}
NS_PLUGINS_DIR= ${PREFIX}/lib/${MOZ_NAME}/plugins
-PLIST_SUBST+= MOZ_NAME="${MOZ_NAME}"
+PLIST_SUBST+= MOZ_NAME=${MOZ_NAME:Q}
do-install:
${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
diff --git a/www/firefox-bin/Makefile.NetBSD.i386 b/www/firefox-bin/Makefile.NetBSD.i386
index 857a46d8b2e..3c946235107 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.7 2005/04/18 14:24:15 wiz Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.8 2005/12/05 20:51:12 rillig Exp $
BUILD_DEFS+= MOZILLA_USE_LINUX
@@ -6,7 +6,7 @@ BUILD_DEFS+= MOZILLA_USE_LINUX
ONLY_FOR_PLATFORM+= NetBSD-*-i386
. include "Makefile.Linux.i386"
.else
-PKG_SKIP_REASON= "No native pre-built NetBSD binary available."
+PKG_SKIP_REASON+= "No native pre-built NetBSD binary available."
PKG_SKIP_REASON+= "Set MOZILLA_USE_LINUX if you want to use the Linux binary."
DISTNAME= ${MOZILLA}-${MOZ_DISTVER}-i386-unknown-netbsdelf1.6
EXTRACT_SUFX= .tar.bz2
diff --git a/www/firefox/hacks.mk b/www/firefox/hacks.mk
index c8dd1a20d82..35d705a1e48 100644
--- a/www/firefox/hacks.mk
+++ b/www/firefox/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2005/08/03 16:55:19 tron Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:51:12 rillig Exp $
# Firefox suffers from display glitches (e.g. text appearing at the wrong
# location) if it was compiled with optimization.
@@ -13,7 +13,7 @@ _GCC_IS_TOO_OLD!= \
else \
${ECHO} "no"; \
fi
-MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD}
+MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD:Q}
. endif
. if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS])
PKG_HACKS+= powerpc-codegen
diff --git a/www/horde3/Makefile b/www/horde3/Makefile
index 189f5e01557..178e9c3eb08 100644
--- a/www/horde3/Makefile
+++ b/www/horde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/25 20:59:15 adrianp Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:12 rillig Exp $
DISTNAME= horde-3.0.7
CATEGORIES= www
@@ -59,7 +59,7 @@ CONF_FILES_PERMS+= ${HORDEDIR}/config/hooks.php.dist \
${HORDEDIR}/config/hooks.php \
${APACHE_USER} ${ROOT_GROUP} 0440
-SUBST_CLASSES= files
+SUBST_CLASSES+= files
SUBST_STAGE.files= post-build
SUBST_FILES.files= horde.conf.dist config/conf.xml config/conf.xml.dist \
scripts/set_perms.sh
diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index 446bfc98de6..780fd18dc97 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/17 22:00:13 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:51:12 rillig Exp $
DISTNAME= htdig-3.1.6
PKGREVISION= 3
@@ -21,7 +21,7 @@ USE_PKGINSTALL= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \
+CONFIGURE_ARGS+= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \
--with-common-dir=${PREFIX}/share/htdig/common \
--with-config-dir=${PKG_SYSCONFDIR} \
--with-database-dir=${DBDIR} \
diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile
index a40fea61aa0..b38002ac0af 100644
--- a/www/htmldoc-x11/Makefile
+++ b/www/htmldoc-x11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:26 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:12 rillig Exp $
#
-.include "../htmldoc/Makefile.common"
+.include "../../www/htmldoc/Makefile.common"
PKGNAME= htmldoc-x11-${HTMLDOC_VERSION}
PKGREVISION= 3
diff --git a/www/http_load/Makefile b/www/http_load/Makefile
index cee825d846d..f4ff2bbd25c 100644
--- a/www/http_load/Makefile
+++ b/www/http_load/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/23 20:06:26 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:12 rillig Exp $
DISTNAME= http_load-04jan2002
PKGNAME= http_load-20020104
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.acme.com/software/http_load/
COMMENT= Multiprocessing http test client
-MAKE_ENV+= SSLBASE="${SSLBASE}"
+MAKE_ENV+= SSLBASE=${SSLBASE:Q}
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/iasp/Makefile b/www/iasp/Makefile
index e4d6ed138aa..70954515f80 100644
--- a/www/iasp/Makefile
+++ b/www/iasp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2005/08/19 18:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:12 rillig Exp $
-.include "../iasp/Makefile.common"
+.include "../../www/iasp/Makefile.common"
PKGNAME= iasp-${IASP_VERSION}
PKGREVISION= 2
@@ -14,14 +14,14 @@ SCRIPTS_ENV+= ECHO=${ECHO:Q}
SCRIPTS_ENV+= SED=${SED:Q}
SCRIPTS_ENV+= SH=${SH:Q}
SCRIPTS_ENV+= IASP=${IASP_DESTDIR}
-FILES_SUBST= IASP=${IASP_DESTDIR}
-PLIST_SUBST= IASP=${IASP_DESTDIR:S/^${PREFIX}\///}
+FILES_SUBST+= IASP=${IASP_DESTDIR:Q}
+PLIST_SUBST+= IASP=${IASP_DESTDIR:S/^${PREFIX}\///:Q}
IASP_USER?= ${APACHE_USER}
IASP_GROUP?= ${APACHE_GROUP}
BUILD_DEFS+= IASP_USER IASP_GROUP
-FILES_SUBST+= IASP_USER=${IASP_USER}
-FILES_SUBST+= IASP_GROUP=${IASP_GROUP}
+FILES_SUBST+= IASP_USER=${IASP_USER:Q}
+FILES_SUBST+= IASP_GROUP=${IASP_GROUP:Q}
PKG_USERS= ${IASP_USER}:${IASP_GROUP}
PKG_GROUPS= ${IASP_GROUP}
diff --git a/www/ijb/Makefile b/www/ijb/Makefile
index 16ad7408d55..00a66cd2afe 100644
--- a/www/ijb/Makefile
+++ b/www/ijb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:40 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:12 rillig Exp $
#
DISTNAME= ijb20
@@ -12,7 +12,7 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.junkbuster.com/
COMMENT= The Internet Junkbuster Proxy blocks unwanted banner ads and cookies
-MAKE_ENV+= MORE_CFLAGS="${CFLAGS}"
+MAKE_ENV+= MORE_CFLAGS=${CFLAGS:M*:Q}
INSTALLATION_DIRS= bin man/man1
diff --git a/www/ijb/distinfo b/www/ijb/distinfo
index c9700b1a893..f6cf21ff708 100644
--- a/www/ijb/distinfo
+++ b/www/ijb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:08:32 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/12/05 20:51:12 rillig Exp $
SHA1 (ijb20.tar.Z) = 2233cc5f26208058c5046168ff9ddf70312bfb75
RMD160 (ijb20.tar.Z) = 9ca21442e53c839102b3abfedd07e290953c28a7
Size (ijb20.tar.Z) = 286005 bytes
SHA1 (patch-aa) = 4c4f75f5cc3af63afce4aa8beab7f5e2e0b422dd
-SHA1 (patch-ab) = 1295fffa7e2cac2de991ac5b0a7a9f5bfa9cd1d1
+SHA1 (patch-ab) = 18da8c5788d8704f3502f70f5aafdbd9ce897fd2
diff --git a/www/ijb/patches/patch-ab b/www/ijb/patches/patch-ab
index a1bb7d813e0..6afaf774227 100644
--- a/www/ijb/patches/patch-ab
+++ b/www/ijb/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2004/05/23 23:28:30 danw Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/05 20:51:12 rillig Exp $
--- loaders.c.orig Fri Oct 30 22:58:47 1998
+++ loaders.c
-@@ -8,7 +8,6 @@ char *loaders_rcs = "$Id: loaders.c,v 1.
+@@ -8,7 +8,6 @@
#include <stdlib.h>
#include <sys/types.h>
#include <string.h>
diff --git a/www/instiki/Makefile b/www/instiki/Makefile
index 98bc975176e..892cddc5c6a 100644
--- a/www/instiki/Makefile
+++ b/www/instiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/11/09 04:27:34 taca Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:12 rillig Exp $
DISTNAME= instiki-0.9.2
PKGREVISION= 4
@@ -14,7 +14,7 @@ NO_BUILD= yes
USE_PKGINSTALL= yes
RCD_SCRIPTS= instiki
-FILES_SUBST+= RUBY=${RUBY}
+FILES_SUBST+= RUBY=${RUBY:Q}
REPLACE_RUBY= instiki
diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile
index 857a4696bdc..a16413bf55e 100644
--- a/www/jakarta-servletapi/Makefile
+++ b/www/jakarta-servletapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/10/05 14:48:56 jwise Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:12 rillig Exp $
DISTNAME= jakarta-servletapi-${TOMCAT_VERSION}-src
PKGNAME= ${DISTNAME:S/-src$//}
@@ -42,4 +42,4 @@ do-install:
.include "../../mk/bsd.pkg.mk"
MAKE_PROGRAM= ${LOCALBASE}/bin/ant
-MAKE_FLAGS=
+MAKE_FLAGS= # empty
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index 20feae80563..357d36f8101 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/24 14:25:32 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:12 rillig Exp $
PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION}
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
@@ -34,7 +34,7 @@ CONF_FILES+= ${SAMPLECONFDIR}/${FILE}.default ${PKG_SYSCONFDIR}/${FILE}
.endfor
RCD_SCRIPTS= tomcat4
-FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} TOMCAT_LIB=${TOMCAT_LIB}
+FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
.include "../../mk/java-vm.mk"
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index a5d8ef05a00..cb058f26aae 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:12 rillig Exp $
PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION}
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
@@ -42,13 +42,11 @@ CONF_FILES= # empty
.for f in ${CFILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
.for f in ${CF2FILES}
CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f}
.endfor
-.undef f
-FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME} TOMCAT_LIB=${TOMCAT_LIB}
+FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
do-build:
@${MV} ${WRKSRC}/conf ${WRKDIR}
@@ -57,11 +55,9 @@ do-install:
.for f in ${CFILES}
${INSTALL_DATA} ${WRKDIR}/conf/${f} ${EGDIR}
.endfor
-.undef f
.for f in ${CF2FILES}
${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2}
.endfor
-.undef f
${INSTALL_DATA_DIR} ${TOMCAT_LIB}
@(cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB}; \
${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index 1ee0e2e8758..65cd5d0df8c 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:12 rillig Exp $
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
PKGREVISION= 1
@@ -41,13 +41,11 @@ CONF_FILES= # empty
.for f in ${CFILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
.for f in ${CF2FILES}
CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f}
.endfor
-.undef f
-FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME} TOMCAT_LIB=${TOMCAT_LIB}
+FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
do-build:
@${MV} ${WRKSRC}/conf ${WRKDIR}
@@ -56,11 +54,9 @@ do-install:
.for f in ${CFILES}
${INSTALL_DATA} ${WRKDIR}/conf/${f} ${EGDIR}
.endfor
-.undef f
.for f in ${CF2FILES}
${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2}
.endfor
-.undef f
${INSTALL_DATA_DIR} ${TOMCAT_LIB}
@(cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB}; \
${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 055dcd235cd..add116e1a37 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/10/29 01:56:42 kristerw Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:13 rillig Exp $
DISTNAME= ApacheJSSI-1.1.2
PKGNAME= jssi-1.1.2
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java
USE_TOOLS+= gmake
NO_CONFIGURE= yes
-MAKE_ENV+= CLASSPATH=${CLASSPATH}
+MAKE_ENV+= CLASSPATH=${CLASSPATH:Q}
post-build:
(cd ${WRKSRC}/../../docs && ${SETENV} ${SCRIPTS_ENV} ${SH} generate_javadoc)
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 3b3d83d46a0..a50d3c0a443 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/09/17 22:40:36 reed Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:13 rillig Exp $
#
DISTNAME= kazehakase-0.3.0
@@ -36,7 +36,6 @@ EGFILES= bookmarkbar.xml bookmarks.xml kz-ui-beginner.xml \
.for f in ${EGFILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
MAKE_DIRS+= ${PKG_SYSCONFDIR}/mozilla
CONF_FILES+= ${EGDIR}/mozilla/encodings.xml ${PKG_SYSCONFDIR}/mozilla/encodings.xml
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index ffbdba62794..c3226cbe9b2 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/07 02:15:12 reed Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:13 rillig Exp $
DISTNAME= mini_httpd-1.19
PKGREVISION= 2
@@ -11,7 +11,7 @@ COMMENT= Small, forking webserver with IPv6 and SSL support
DIST_SUBDIR= ${PKGNAME_NOREV}
-MAKE_ENV+= PKG_CFLAGS="${CFLAGS}"
+MAKE_ENV+= PKG_CFLAGS=${CFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/www/mozilla-bin-nightly/Makefile.NetBSD.i386 b/www/mozilla-bin-nightly/Makefile.NetBSD.i386
index a54d7cc50e2..067493895ce 100644
--- a/www/mozilla-bin-nightly/Makefile.NetBSD.i386
+++ b/www/mozilla-bin-nightly/Makefile.NetBSD.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.6 2004/11/06 10:41:30 kristerw Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.7 2005/12/05 20:51:13 rillig Exp $
BUILD_DEFS+= MOZILLA_USE_LINUX
@@ -7,7 +7,7 @@ DISTNAME= mozilla-i686-pc-linux-gnu
MOZ_PLATFORM= linux
ONLY_FOR_PLATFORM+= NetBSD-*-i386
.else
-PKG_SKIP_REASON= "No native pre-built NetBSD binary available."
+PKG_SKIP_REASON+= "No native pre-built NetBSD binary available."
PKG_SKIP_REASON+= "Set MOZILLA_USE_LINUX if you want to use the Linux binary."
DISTNAME= mozilla-i386-unknown-netbsdelf1.6
EXTRACT_SUFX= .tar.bz2
diff --git a/www/mozilla-bin-nightly/Makefile.common b/www/mozilla-bin-nightly/Makefile.common
index d529b0e8d8f..8f3e7f3dab3 100644
--- a/www/mozilla-bin-nightly/Makefile.common
+++ b/www/mozilla-bin-nightly/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2005/09/28 12:22:51 rillig Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/12/05 20:51:13 rillig Exp $
MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ \
ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
NO_CHECKSUM= yes
NO_SRC_ON_FTP= # defined
diff --git a/www/mozilla-bin/Makefile.common b/www/mozilla-bin/Makefile.common
index 693b97a39d3..a45d996fb7e 100644
--- a/www/mozilla-bin/Makefile.common
+++ b/www/mozilla-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2005/09/28 12:22:10 rillig Exp $
+# $NetBSD: Makefile.common,v 1.31 2005/12/05 20:51:13 rillig Exp $
DISTNAME= # see Makefile.${OPSYS}.${ARCH}
PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
@@ -49,9 +49,9 @@ MASTER_SITES+= ${_site_}contrib/
MOZILLA_LIB= ${PREFIX}/lib/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM}
-FILES_SUBST+= MOZILLA=${MOZILLA}
-FILES_SUBST+= MOZ_EXTRA=${MOZ_EXTRA}
-FILES_SUBST+= MOZ_PLATFORM=${MOZ_PLATFORM}
+FILES_SUBST+= MOZILLA=${MOZILLA:Q}
+FILES_SUBST+= MOZ_EXTRA=${MOZ_EXTRA:Q}
+FILES_SUBST+= MOZ_PLATFORM=${MOZ_PLATFORM:Q}
MESSAGE_SUBST+= PKGBASE=${PKGBASE}
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 7e3bfb25167..7f1719d70be 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.64 2005/11/26 22:09:25 martin Exp $
+# $NetBSD: Makefile.common,v 1.65 2005/12/05 20:51:13 rillig Exp $
MOZ_DIST_VER?= ${MOZ_VER}
DISTNAME?= mozilla-${MOZ_DIST_VER}-source
@@ -55,7 +55,7 @@ UNLIMIT_RESOURCES= datasize memorysize stacksize
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.ifdef _MOZILLA_USE_GTK2
+.if defined(_MOZILLA_USE_GTK2)
.include "../../net/libIDL/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs
@@ -69,25 +69,25 @@ CONFIGURE_ARGS+= --enable-default-toolkit=gtk
# NetBSD-*-m68k builds, but "regchrome" dumps core.
NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k
-MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA}
+MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA:Q}
MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA}
-MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR}
-CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR}
+MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q}
+CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q}
LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR}
-.ifdef BUILD_SVG
+.if defined(BUILD_SVG)
MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1
CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1
CONFIGURE_ARGS+= --enable-svg
CONFIGURE_ARGS+= --enable-svg-renderer-libart
.endif
-.ifdef BUILD_CALENDAR
+.if defined(BUILD_CALENDAR)
CONFIGURE_ARGS+= --enable-calendar
.endif
-.ifdef BUILD_MATHML
+.if defined(BUILD_MATHML)
CONFIGURE_ARGS+= --enable-mathml
.endif
@@ -100,10 +100,10 @@ CONFIGURE_ARGS+= --enable-xinerama
# directory
SCRIPTS_ENV+= HOME="${WRKDIR}"
-PLIST_SUBST+= MOZILLA=${MOZILLA}
-PLIST_SUBST+= MOZILLA_BIN=${MOZILLA_BIN}
-FILES_SUBST+= MOZILLA=${MOZILLA}
-FILES_SUBST+= MOZILLA_BIN=${MOZILLA_BIN}
+PLIST_SUBST+= MOZILLA=${MOZILLA:Q}
+PLIST_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q}
+FILES_SUBST+= MOZILLA=${MOZILLA:Q}
+FILES_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q}
.if ${OBJECT_FMT} == "ELF"
SO_SUFFIX= so
SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_PROGRAM}"
@@ -114,14 +114,14 @@ SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_LIB}"
SO_SUFFIX= so.1.0
SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_PROGRAM}"
.endif
-PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX}
+PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
.if (${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc")
SUNOSLIB=
.else
SUNOSLIB= "@comment "
.endif
-PLIST_SUBST+= SUNOSLIB=${SUNOSLIB}
+PLIST_SUBST+= SUNOSLIB=${SUNOSLIB:Q}
SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT:Q}
SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC:Q}
@@ -193,7 +193,7 @@ CONFIGURE_ARGS+= --enable-xft
.endif
# Fix for firefox* packages.
-SUBST_CLASSES= pc
+SUBST_CLASSES+= pc
SUBST_STAGE.pc= post-extract
SUBST_FILES.pc= build/unix/*.pc.in
SUBST_SED.pc= -e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \
diff --git a/www/navigator/Makefile b/www/navigator/Makefile
index 6a4a8fc8e80..c9626a55242 100644
--- a/www/navigator/Makefile
+++ b/www/navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/08/08 09:38:40 grant Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:13 rillig Exp $
#
COMMENT= Netscape Navigator browser, version 4 (binary pkg)
@@ -6,5 +6,5 @@ COMMENT= Netscape Navigator browser, version 4 (binary pkg)
BINNAME= navigator
DIST_SDIR_NAME= navigator_standalone
-.include "../navigator/Makefile.common"
+.include "../../www/navigator/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 92e6c762f2c..d6b273fb0bd 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.78 2005/09/28 12:17:23 rillig Exp $
+# $NetBSD: Makefile.common,v 1.79 2005/12/05 20:51:13 rillig Exp $
#
# Common include file for communicator and navigator packages
@@ -45,7 +45,7 @@ DEPENDS+= ns-flash>4.0:../../multimedia/ns-flash
.elif ${MACHINE_ARCH} == "alpha"
. if !exists(/emul/osf1/sbin/loader)
-PKG_FAIL_REASON= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
+PKG_FAIL_REASON+= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
. endif
NS_VERS= 4.78
PKGNAME= ${BINNAME}-${NS_VERS}
@@ -65,7 +65,7 @@ DIST_DIR_NAME= unsupported/bsdi21
WRKNAME= x86-bsdi-bsd2
VENDOR_NAME= BSD/OS 2.1
-BUILD_DEPENDS= binpatch>=1.0:../../pkgtools/binpatch
+BUILD_DEPENDS+= binpatch>=1.0:../../pkgtools/binpatch
post-install:
${SH} ../../www/navigator/files/binpatch-x86-bsdi-bsd2-4.75.sh \
@@ -90,7 +90,7 @@ post-install:
.endif
.elif ((${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && defined(NS_USE_SUNOS))
. if !exists(/emul/sunos/usr/lib/ld.so)
-PKG_FAIL_REASON= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
+PKG_FAIL_REASON+= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
. endif
NS_VERS= 4.61
PKGNAME= ${BINNAME}-${NS_VERS}
@@ -106,7 +106,7 @@ MASTER_SITES= ftp://archive.netscape.com/archive/communicator/${SUB}/
.elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
PLIST_ARCH= solaris-sparc
. if !exists(/emul/svr4/usr/lib/ld.so.1)
-PKG_FAIL_REASON= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)"
+PKG_FAIL_REASON+= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)"
. endif
NS_VERS= 4.79
PKGNAME= ${BINNAME}-${NS_VERS}
@@ -118,9 +118,9 @@ VENDOR_NAME= Solaris 2.5.1
# powerpc is "unusual"
.elif ${MACHINE_ARCH} == "powerpc"
. if ${BINNAME} == "navigator"
-PKG_FAIL_REASON= "There is no navigator-only package for PowerPC"
-PKG_FAIL_REASON+= "platform. Please cd to ../communicator and"
-PKG_FAIL_REASON+= "install communicator package instead."
+PKG_FAIL_REASON+= "There is no navigator-only package for PowerPC"
+PKG_FAIL_REASON+= "platform. Please cd to ../communicator and"
+PKG_FAIL_REASON+= "install communicator package instead."
. endif
NS_VERS= 4.73
PKGNAME= ${BINNAME}-${NS_VERS}
@@ -130,7 +130,7 @@ WRKSRC= ${WRKDIR}
MASTER_SITES= http://www.gmd.de/ftp/mirrors3/ftp.linuxppc.org/linuxppc-halloween/software/
EXTRACT_SUFX= .rpm
HOMEPAGE= http://linuxppc.org/software/index/linuxppc_stable/software/netscape-4.7-3.ppc.html
-BUILD_DEPENDS= rpm2pkg>=1.2:../../pkgtools/rpm2pkg
+BUILD_DEPENDS+= rpm2pkg>=1.2:../../pkgtools/rpm2pkg
DESCR_SRC= ${WRKDIR}/DESCR.linux-powerpc
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPM2PKG= rpm2pkg
@@ -199,7 +199,7 @@ NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins
PLIST_SRC= ${PKGDIR}/PLIST.pre \
${PKGDIR}/PLIST.${PLIST_ARCH} \
${PKGDIR}/PLIST.post
-PLIST_SUBST+= NS_VERS=${NS_VERS} LDAP_VERS=${LDAP_VERS} BINNAME=${BINNAME}
+PLIST_SUBST+= NS_VERS=${NS_VERS:Q} LDAP_VERS=${LDAP_VERS:Q} BINNAME=${BINNAME:Q}
do-install:
${INSTALL_DATA_DIR} ${MOZILLA_HOME}/java/classes
diff --git a/www/netscape7-acroread/Makefile.common b/www/netscape7-acroread/Makefile.common
index a06c9acb139..d01e9ee7bc8 100644
--- a/www/netscape7-acroread/Makefile.common
+++ b/www/netscape7-acroread/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/04/18 16:20:25 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:51:13 rillig Exp $
PKGNAME= ${DISTNAME:C|MozillaFirebird|firefox|}
CATEGORIES= www print
@@ -16,9 +16,9 @@ NO_CONFIGURE= YES
NO_BUILD= YES
PLIST_SRC= ../../www/netscape7-acroread/PLIST
-PLIST_SUBST+= ACROREAD=${ACROREAD}
-PLIST_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR}
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= ACROREAD=${ACROREAD:Q}
+PLIST_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR:Q}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/netscape7/plugins
do-install:
diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile
index c7064182016..56752e5dd9d 100644
--- a/www/ns-remote/Makefile
+++ b/www/ns-remote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/06 19:13:24 abs Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:13 rillig Exp $
DISTNAME= ns-remote
PKGNAME= ns-remote-1.11
@@ -12,7 +12,7 @@ COMMENT= Remote-control of Netscape and Mozilla-based browsers
DIST_SUBDIR= netscape
-LDFLAGS.SunOS= -lsocket -lnsl
+LDFLAGS.SunOS+= -lsocket -lnsl
INSTALLATION_DIRS= bin
diff --git a/www/opera-acroread/Makefile.common b/www/opera-acroread/Makefile.common
index 4f7e8a0520f..6507b6154ca 100644
--- a/www/opera-acroread/Makefile.common
+++ b/www/opera-acroread/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/05/02 08:59:08 tron Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:51:13 rillig Exp $
PKGNAME= ${DISTNAME:C|MozillaFirebird|firefox|}
CATEGORIES= www print
@@ -17,9 +17,9 @@ NO_CONFIGURE= YES
NO_BUILD= YES
PLIST_SRC= ../../www/opera-acroread/PLIST
-PLIST_SUBST+= ACROREAD=${ACROREAD}
-PLIST_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR}
-PLIST_SUBST+= PLATFORM=${PLATFORM}
+PLIST_SUBST+= ACROREAD=${ACROREAD:Q}
+PLIST_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR:Q}
+PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
NS_PLUGINS_DIR= ${PREFIX}/emul/linux/usr/lib/opera/plugins
do-install:
diff --git a/www/opera/Makefile b/www/opera/Makefile
index f7e2e6dd69c..8ce79b5ff39 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/11/22 22:14:51 jdolecek Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/05 20:51:13 rillig Exp $
DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/}
CATEGORIES= www
@@ -21,7 +21,6 @@ LICENSE= opera-850-license
#PKG_INSTALLATION_TYPES= overwrite pkgviews
NO_CONFIGURE= YES
-NO_TOOLS= YES
USE_LANGUAGES= # empty
.include "../../mk/bsd.prefs.mk"
@@ -78,7 +77,7 @@ CONF_FILES+= ${PREFIX}/share/opera/config/opera6rc.fixed \
/etc/opera6rc.fixed
. endif
-PLIST_SUBST+= OPERA_VER_DATE=${OPERA_VER_DATE}
+PLIST_SUBST+= OPERA_VER_DATE=${OPERA_VER_DATE:Q}
PLIST_SUBST+= OPERA_PKG_VERSION=${OPERA_PKG_VERSION:C/u.*//}
.endif
@@ -111,7 +110,7 @@ USE_TOOLS+= gzip
.endif
post-install-manpage:
- # The SuSE common makefile defines "MANCOMPRESSED=yes".
+# The SuSE common makefile defines "MANCOMPRESSED=yes".
. if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS])
${GZIP_CMD} ${EMULDIR}/usr/share/man/man1/opera.1
${LN} -fs ../../${EMULSUBDIR}/usr/share/man/man1/opera.1.gz \
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 8282361c97a..eff77548fb4 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/08/06 06:19:36 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:13 rillig Exp $
#
DISTNAME= Apache-Gallery-0.9.1
@@ -39,15 +39,15 @@ AG_DOCDIR= ${PREFIX}/share/doc/${AG}
AG_EGDIR= ${PREFIX}/share/examples/${AG}
AG_SHAREDIR= ${PREFIX}/share/${AG}
-FILES_SUBST+= AG=${AG}
-FILES_SUBST+= AG_SHAREDIR=${AG_SHAREDIR}
-FILES_SUBST+= LDFLAGS=${LDFLAGS:Q}
+FILES_SUBST+= AG=${AG:Q}
+FILES_SUBST+= AG_SHAREDIR=${AG_SHAREDIR:Q}
+FILES_SUBST+= LDFLAGS=${LDFLAGS:M*:Q}
MESSAGE_SUBST+= AG=${AG}
MESSAGE_SUBST+= AG_DOCDIR=${AG_DOCDIR}
MESSAGE_SUBST+= AG_SHAREDIR=${AG_SHAREDIR}
-PLIST_SUBST+= AG=${AG}
+PLIST_SUBST+= AG=${AG:Q}
PLIST_SUBST+= AG_DOCDIR=${AG_DOCDIR:S,${PREFIX}/,,}
PLIST_SUBST+= AG_EGDIR=${AG_EGDIR:S,${PREFIX}/,,}
PLIST_SUBST+= AG_SHAREDIR=${AG_SHAREDIR:S,${PREFIX}/,,}
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index dbae4d3f330..52d04cee887 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/06 06:19:38 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:13 rillig Exp $
#
DISTNAME= CGI-Kwiki-0.18
@@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CGI/}
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.kwiki.org/
-COMMENT= A Quickie Wiki that's not too Tricky
+COMMENT= Quickie Wiki that's not too Tricky
DEPENDS+= p5-Test-Simple>=0.47:../../devel/p5-Test-Simple
DEPENDS+= p5-Locale-Maketext>=1.08:../../misc/p5-Locale-Maketext
diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile
index 6b6a18ffcb6..7a84410cbde 100644
--- a/www/p5-URI/Makefile
+++ b/www/p5-URI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/08/06 06:19:40 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:13 rillig Exp $
#
DISTNAME= URI-1.35
@@ -12,7 +12,7 @@ MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/URI/
COMMENT= Perl5 Uniform Resource Identifiers class (URI, RFC 2396)
-BUILD_DEPENDS= p5-MIME-Base64>=2.12:../../converters/p5-MIME-Base64
+BUILD_DEPENDS+= p5-MIME-Base64>=2.12:../../converters/p5-MIME-Base64
CONFLICTS+= p5-libwww-5.36 # URI used to be part of that package
diff --git a/www/php-FastTemplate/Makefile b/www/php-FastTemplate/Makefile
index 355cdc39f4d..12c632eaaf4 100644
--- a/www/php-FastTemplate/Makefile
+++ b/www/php-FastTemplate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/23 15:38:40 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:13 rillig Exp $
DISTNAME= FastTemplate-1_1_0
PKGNAME= php-FastTemplate-1.1.0
@@ -24,8 +24,8 @@ PHP_LIB_DIR= ${PREFIX}/${PHP_LIB_SUBDIR}
DOCDIR= ${PREFIX}/share/doc/html/${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-PLIST_SUBST+= PHP_LIB_SUBDIR=${PHP_LIB_SUBDIR}
-PLIST_SUBST+= PKGBASE=${PKGBASE}
+PLIST_SUBST+= PHP_LIB_SUBDIR=${PHP_LIB_SUBDIR:Q}
+PLIST_SUBST+= PKGBASE=${PKGBASE:Q}
do-install:
${INSTALL_DATA_DIR} ${PHP_LIB_DIR}
diff --git a/www/php4-apc/Makefile b/www/php4-apc/Makefile
index 8628c082582..afab433dbbb 100644
--- a/www/php4-apc/Makefile
+++ b/www/php4-apc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/10/04 16:50:50 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:14 rillig Exp $
MODNAME= apc
PECL_VERSION= 2.0.4
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --enable-${MODNAME}
WRKSRC= ${WRKDIR}/APC-${PECL_VERSION}
PLIST_SRC+= ${.CURDIR}/PLIST.extras
-PLIST_SUBST+= PKGBASE="${PKGBASE}"
+PLIST_SUBST+= PKGBASE=${PKGBASE:Q}
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
post-install:
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 9eb54a0a6b6..5f34a9dbc45 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/11/21 09:13:28 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:51:13 rillig Exp $
PKGNAME= php-${PHP_BASE_VERS}
PKGREVISION= 2
@@ -39,12 +39,12 @@ EGDIR= ${PREFIX}/share/examples/php
# libtool without change.
#
.if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF"
-MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_ALL_LIBGCC_HACK}"
+MAKE_ENV+= LINK_LIBGCC_LDFLAGS=${LINK_ALL_LIBGCC_HACK:Q}
.endif
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
-MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
CONF_FILES= ${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR}
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index 235f9a14ec3..c022c2c15ad 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.50 2005/11/01 23:12:15 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.51 2005/12/05 20:51:13 rillig Exp $
DISTNAME?= php-${PHP_DIST_VERS}
CATEGORIES+= www php4
@@ -30,7 +30,7 @@ PHP_DISTFILE= ${DISTNAME}${EXTRACT_SUFX}
# of the Zend API.
#
PHP_EXTENSION_DIR= lib/php/20020429
-PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
+PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
PKG_SYSCONFVAR?= php
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 29638d76078..2deedb90c01 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.33 2005/11/11 07:04:57 rillig Exp $
+# $NetBSD: Makefile.php,v 1.34 2005/12/05 20:51:13 rillig Exp $
.include "../../www/php4/Makefile.common"
@@ -6,7 +6,7 @@
DISTINFO_FILE= ${.CURDIR}/../../www/php4/distinfo
PATCHDIR= ${.CURDIR}/../../www/php4/patches
-BUILD_DEFS= USE_INET6
+BUILD_DEFS+= USE_INET6
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 354b3b0272b..824e86db46c 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/23 11:48:51 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:51:14 rillig Exp $
#
DISTNAME= ${PKGNAME_NOREV}-stable-src
@@ -56,8 +56,8 @@ OWN_DIRS_PERMS+= /var/log/privoxy ${USER_GROUP} 0775
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
-FILES_SUBST+= EGDIR=${EGDIR}
-FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER}
+FILES_SUBST+= EGDIR=${EGDIR:Q}
+FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER:Q}
pre-configure:
@cd ${WRKSRC} && \
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 71a450177f8..ca2b3d23af0 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/22 09:16:00 recht Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:14 rillig Exp $
#
DISTNAME= HTMLgen
@@ -13,7 +13,7 @@ HOMEPAGE= http://starship.python.net/crew/friedrich/HTMLgen/html/main.html
COMMENT= Class library for the generation of HTML documents
NO_BUILD= yes
-MAKE_ENV+= PYTHONBIN=${PYTHONBIN}
+MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q}
PY_PATCHPLIST= yes
.include "../../lang/python/extension.mk"
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 689d5de367a..43c863135e0 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/17 13:30:09 adam Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:14 rillig Exp $
DISTNAME= pycurl-7.13.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,7 +12,7 @@ COMMENT= Python module interface to the cURL library
PYDISTUTILSPKG= # defined
PYBINMODULE= # defined
PYTHON_VERSIONS_ACCEPTED= 23 22
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
BUILDLINK_DEPENDS.curl+= curl>=7.12.1
diff --git a/www/ruby-fcgi/Makefile b/www/ruby-fcgi/Makefile
index e2e5943fb1d..54752358018 100644
--- a/www/ruby-fcgi/Makefile
+++ b/www/ruby-fcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:01 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:14 rillig Exp $
DISTNAME= ruby-fcgi-${VER}
PKGNAME= ${RUBY_PKGPREFIX}-fcgi-${VER}
@@ -13,7 +13,7 @@ USE_RUBY_SETUP= yes
RUBY_SETUP= install.rb
RUBY_EXTCONF_SUBDIRS= ext/fcgi
VER= 0.8.6
-CONFIGURE_ARGS= -- --with-fcgi-dir=${PREFIX}
+CONFIGURE_ARGS+= -- --with-fcgi-dir=${PREFIX}
DOCS= README README.signals
post-install:
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 7dd74d000dc..6130fef64ec 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/10/07 17:57:59 reed Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:14 rillig Exp $
DISTNAME= sarg-1.4.1
CATEGORIES= www
@@ -30,8 +30,8 @@ SARG_REPORTSDIR?= /var/sarg
OWN_DIRS+= ${SARG_REPORTSDIR} ${CFLNG}
-FILES_SUBST+= SQUID_ACCESSLOG=${SQUID_ACCESSLOG} \
- SARG_REPORTSDIR=${SARG_REPORTSDIR}
+FILES_SUBST+= SQUID_ACCESSLOG=${SQUID_ACCESSLOG:Q} \
+ SARG_REPORTSDIR=${SARG_REPORTSDIR:Q}
SUBST_CLASSES+= sargconf
SUBST_MESSAGE.sargconf= "[Adjust values in SARG configuration files]"
SUBST_STAGE.sargconf= post-configure
@@ -41,7 +41,7 @@ SUBST_SED.sargconf= ${FILES_SUBST_SED}
BUILD_DEFS+= SQUID_ACCESSLOG SARG_REPORTSDIR
MAKE_ENV+= PKG_FLAGS="-DSQUID_ACCESSLOG='\"${SQUID_ACCESSLOG}\"' \
-DSARG_REPORTSDIR='\"${SARG_REPORTSDIR}\"'" \
- EGDIR="${EGDIR}"
+ EGDIR=${EGDIR:Q}
CONF_FILES= ${EGDIR}/sarg.conf ${PKG_SYSCONFDIR}/sarg.conf \
${EGDIR}/exclude_codes ${PKG_SYSCONFDIR}/exclude_codes \
diff --git a/www/screws/Makefile b/www/screws/Makefile
index 98ee23bd266..b5a4941433a 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/04 05:00:37 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:14 rillig Exp $
#
DISTNAME= screws-0.56
@@ -18,8 +18,8 @@ BUILD_DEFS+= SCREWS_USER SCREWS_GROUP
PKG_USERS= ${SCREWS_USER}:${SCREWS_GROUP}
PKG_GROUPS= ${SCREWS_GROUP}
-MAKE_ENV+= ETCPREFIX=${PKG_SYSCONFDIR}
-MAKE_ENV+= PERL="${PERL5}"
+MAKE_ENV+= ETCPREFIX=${PKG_SYSCONFDIR:Q}
+MAKE_ENV+= PERL=${PERL5:Q}
EGDIR= ${PREFIX}/share/examples
CONF_FILES= ${EGDIR}/default.conf ${PKG_SYSCONFDIR}/screws.conf
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index f4c0b6e0ac2..c2c28815336 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/10/26 12:44:21 tonio Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:14 rillig Exp $
DISTNAME= snownews-1.5.7
PKGREVISION= 2
@@ -22,7 +22,7 @@ REPLACE_PERL+= configure opml2snow snowsync
CONFIGURE_ARGS+= --prefix=${PREFIX}
MAKE_ENV+= PKG_LOCALEDIR=${PKGLOCALEDIR:Q}
-MAKE_ENV+= EXTRA_CFLAGS=${CFLAGS:Q}
+MAKE_ENV+= EXTRA_CFLAGS=${CFLAGS:M*:Q}
# XXX -lintl hack suggested by Jeremy C. Reed: blocking on PR #23369
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index 168b0f9a306..5ee0087c507 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:42 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:51:14 rillig Exp $
DISTNAME= spfc-0.2.0
CATEGORIES= www java
@@ -15,7 +15,7 @@ DEPENDS+= jsdk-2.0:../../www/jsdk20
WRKSRC= ${WRKDIR}/spfc-0.2.0/src/
USE_TOOLS+= gmake
-NO_CONFIGURE=
+NO_CONFIGURE= yes
MAKE_ENV+= CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar
do-install:
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 0c704da458a..4fede6a61b2 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/08/19 18:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:14 rillig Exp $
#
DISTNAME= surfraw-1.0.7
@@ -18,8 +18,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
# Override sysconfdir so that the installation puts the example config file
# in ${EGDIR}.
#
-MAKE_FLAGS+= sysconfdir=${EGDIR}
-MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}"
+MAKE_FLAGS+= sysconfdir=${EGDIR:Q}
+MAKE_ENV+= AM_MAKEFLAGS=${MAKE_FLAGS:Q}
DOCDIR= ${PREFIX}/share/doc/surfraw
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
diff --git a/www/tcl-cgi/Makefile b/www/tcl-cgi/Makefile
index 999d4bea705..7092bb39e36 100644
--- a/www/tcl-cgi/Makefile
+++ b/www/tcl-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/13 02:57:02 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:14 rillig Exp $
#
DISTNAME= cgi.tcl
@@ -13,7 +13,7 @@ COMMENT= Library of Tcl procedures to assist in writing CGI scripts
DEPENDS+= tcl>=8.3.2:../../lang/tcl
WRKSRC= ${WRKDIR}/cgi.tcl-1.3
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
GNU_CONFIGURE= yes
diff --git a/www/thy/Makefile b/www/thy/Makefile
index 979a7effa3d..4e3bc8e3d71 100644
--- a/www/thy/Makefile
+++ b/www/thy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/09/06 15:19:31 adam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:14 rillig Exp $
DISTNAME= thy-0.9.4
CATEGORIES= www
@@ -37,7 +37,7 @@ RCD_SCRIPTS= thy
INFO_FILES= thy.info
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-MAKE_FLAGS+= pkgconfdir=${EGDIR}
+MAKE_FLAGS+= pkgconfdir=${EGDIR:Q}
EGDIR= ${PREFIX}/share/examples/thy
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index e3154f3ce20..3d64baa6a03 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/10/04 18:00:49 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:14 rillig Exp $
#
DISTNAME= tidy_src_050921
@@ -14,7 +14,7 @@ MAINTAINER= asmodai@in-nomine.org
HOMEPAGE= http://tidy.sourceforge.net/
COMMENT= Fixes and tidies up HTML files
-BUILD_DEPENDS= libxslt>=1.1.0:../../textproc/libxslt
+BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt
WRKSRC= ${WRKDIR}/tidy
NO_CONFIGURE= yes
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index fdcc4ab7cde..00786d548b8 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2005/07/30 11:31:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.41 2005/12/05 20:51:14 rillig Exp $
#
DISTNAME= w3m-${W3M_VERS}
@@ -10,7 +10,7 @@ HOMEPAGE= http://w3m.sourceforge.net/
PKG_INSTALLATION_TYPES= overwrite pkgviews
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
USE_TOOLS+= gmake # Needed for some combinations of options...
W3M_VERS= 0.5.1
diff --git a/www/websvn/Makefile b/www/websvn/Makefile
index 472008ab518..766f36b3223 100644
--- a/www/websvn/Makefile
+++ b/www/websvn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/09/28 14:31:09 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:15 rillig Exp $
#
DISTNAME= WebSVN_161
@@ -22,7 +22,7 @@ PKG_SYSCONFDIR.websvn= ${PREFIX}/${HTTPD_ROOT}/websvn/include
MESSAGE_SUBST+= PKGBASE=${PKGBASE}
MESSAGE_SUBST+= HTTPD_ROOT=${HTTPD_ROOT}
-PLIST_SUBST+= HTTPD_ROOT=${HTTPD_ROOT}
+PLIST_SUBST+= HTTPD_ROOT=${HTTPD_ROOT:Q}
HTTPD_ROOT?= share/httpd/htdocs
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 331de90f3aa..54a0b86e08a 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/06 06:19:41 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:15 rillig Exp $
#
DISTNAME= wml-2.0.9
@@ -19,14 +19,14 @@ DEPENDS+= p5-Term-ReadKey>=2.11:../../devel/p5-Term-ReadKey
USE_TOOLS+= automake
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-perl=${PERL5} \
+CONFIGURE_ARGS+= --with-perl=${PERL5} \
--with-openworld \
--with-tidy=${LOCALBASE}/bin/tidy
TEST_TARGET= test
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
-INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
+INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
PERL_ARCHNAME_cmd= eval `${PERL5} -V:archname 2>/dev/null`; \
${ECHO} $${archname}
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index a0364782d0c..cbec59172e0 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/11/01 12:22:24 abs Exp $
+# $NetBSD: Makefile,v 1.58 2005/12/05 20:51:15 rillig Exp $
DISTNAME= wwwoffle-2.8e
PKGREVISION= 1
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle
PKG_SYSCONFSUBDIR= wwwoffle
-PLIST_SUBST+= GZIP_CMD="${GZIP_CMD}"
+PLIST_SUBST+= GZIP_CMD=${GZIP_CMD:Q}
INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL
RCD_SCRIPTS= wwwoffled
diff --git a/www/zope25-CMFPlone/Makefile b/www/zope25-CMFPlone/Makefile
index 4ff902e69cb..b5107befa10 100644
--- a/www/zope25-CMFPlone/Makefile
+++ b/www/zope25-CMFPlone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 12:37:53 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:15 rillig Exp $
DISTNAME= CMFPlone1.0.3
PKGNAME= zope25-CMFPlone-1.0.3
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.plone.org/
COMMENT= Content Management System
-BUILDLINK_DEPENDS.zope= zope-2.6.*
+BUILDLINK_DEPENDS.zope+= zope-2.6.*
DEPENDS+= zope25-CMF-[0-9]*:../../www/zope25-CMF
DEPENDS+= zope25-Formulator-[0-9]*:../../www/zope25-Formulator
diff --git a/www/zope25-EasyImage/Makefile b/www/zope25-EasyImage/Makefile
index e9b0a249d68..858d35a7f68 100644
--- a/www/zope25-EasyImage/Makefile
+++ b/www/zope25-EasyImage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:03 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:15 rillig Exp $
DISTNAME= EasyImage15
PKGREVISION= 2
@@ -7,7 +7,7 @@ CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/regebro/easyimage/
EXTRACT_SUFX= .zip
-BUILDLINK_DEPENDS.pyimaging= ${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.zope.org/Members/regebro/easyimage
diff --git a/www/zope25-JPicture/Makefile b/www/zope25-JPicture/Makefile
index 84f6f924626..0474c1fed62 100644
--- a/www/zope25-JPicture/Makefile
+++ b/www/zope25-JPicture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:03 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:15 rillig Exp $
DISTNAME= JPicture-2_0
PKGREVISION= 2
@@ -7,7 +7,7 @@ CATEGORIES= www
MASTER_SITES= http://www.dataflake.org/software/jpicture/
EXTRACT_SUFX= .tgz
-BUILDLINK_DEPENDS.pyimaging= ${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.dataflake.org/software/jpicture/
diff --git a/www/zope25-PropertyFolder/Makefile b/www/zope25-PropertyFolder/Makefile
index c4f93d0b37b..f1e25e1db12 100644
--- a/www/zope25-PropertyFolder/Makefile
+++ b/www/zope25-PropertyFolder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/22 04:14:44 martti Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:15 rillig Exp $
DISTNAME= PropertyFolder-1.3.3
PKGNAME= zope25-PropertyFolder-1.3.3
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.zope.org/Members/mjablonski/PropertyFolder
COMMENT= The folderish friend of the PropertyObject
-BUILDLINK_DEPENDS.zope= zope>=2.6.1
+BUILDLINK_DEPENDS.zope+= zope>=2.6.1
.include "../../www/zope25/product.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25-ZPhotoSlides/Makefile b/www/zope25-ZPhotoSlides/Makefile
index c81ae03da17..041492a08b2 100644
--- a/www/zope25-ZPhotoSlides/Makefile
+++ b/www/zope25-ZPhotoSlides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:03 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:15 rillig Exp $
DISTNAME= ZPhotoSlides-1.1b
PKGNAME= zope25-ZPhotoSlides-1.1b
@@ -7,7 +7,7 @@ CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/p3b/ZPhotoSlides/
DEPENDS+= zope25-LocalFS-[0-9]*:../../www/zope25-LocalFS
-BUILDLINK_DEPENDS.pyimaging= ${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.zope.org/Members/p3b/ZPhotoSlides
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index c63cb6fbbbf..ef91cdbe771 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/10/31 20:37:47 tron Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:51:15 rillig Exp $
DISTNAME= XF86Setup-3.3.6
PKGREVISION= 2
@@ -20,9 +20,9 @@ USE_IMAKE= yes
.if !defined(X11_RELEASE) && !defined(CHECK_X11)
X11_RELEASE!= ${MAKE} CHECK_X11=YES print-x11-release
-MAKEFLAGS+= X11_RELEASE=${X11_RELEASE}
+MAKEFLAGS+= X11_RELEASE=${X11_RELEASE:Q}
. if ${X11_RELEASE} == "6.4"
-PKG_SKIP_REASON= "This package doesn't work with your X11 distribution."
+PKG_SKIP_REASON+= "This package doesn't work with your X11 distribution."
. endif
.endif
diff --git a/x11/XFree86-imake/Makefile b/x11/XFree86-imake/Makefile
index 6f0c70e6fb4..06982f0abe0 100644
--- a/x11/XFree86-imake/Makefile
+++ b/x11/XFree86-imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/10 17:18:55 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:15 rillig Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-imake-${XF_VER}
@@ -35,7 +35,6 @@ post-extract:
.for F in ${SYSTEMS}
@${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in
.endfor
-.undef F
pre-configure:
.for F in ${SYSTEMS}
@@ -45,7 +44,6 @@ pre-configure:
-e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \
${WRKSRC}/config/cf/${F}.cf.in > ${WRKSRC}/config/cf/${F}.cf
.endfor
-.undef F
do-build:
@${TOUCH} ${WRKSRC}/config/cf/version.def
diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile
index dd340870e65..50775759ca0 100644
--- a/x11/XFree86-libs/Makefile
+++ b/x11/XFree86-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/10/10 17:22:05 reed Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:15 rillig Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-libs-${XF_VER}
@@ -16,7 +16,7 @@ CONFLICTS+= xextensions-[0-9]*
CONFLICTS+= libX11-[0-9]*
CONFLICTS+= libXau-[0-9]*
-BUILD_DEPENDS= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
+BUILD_DEPENDS+= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
.include "../../mk/bsd.prefs.mk"
@@ -35,7 +35,7 @@ XINSTALL_DIRS= include lib nls programs/Xserver/include \
programs/Xserver/hw/xfree86/parser
XINSTALL_MAN_DIRS= ${XINSTALL_DIRS}
-SUBST_CLASSES= mkstrs
+SUBST_CLASSES+= mkstrs
SUBST_STAGE.mkstrs= post-patch
SUBST_FILES.mkstrs= config/cf/Library.tmpl
SUBST_SED.mkstrs= -e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g'
diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index 59fe0ea766f..6bf0cf505bf 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:15 rillig Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-server-${XF_VER}
@@ -25,7 +25,7 @@ XINSTALL_MAN_DIRS= programs/Xserver
REPLACE_PERL= exports/lib/modules/getconfig*
-SUBST_CLASSES= parser
+SUBST_CLASSES+= parser
SUBST_STAGE.parser= pre-install
SUBST_FILES.parser= programs/Xserver/hw/xfree86/parser/Makefile
SUBST_SED.parser= -e '/$$(INSTALL).*lib$$(LIBNAME).a/ d'
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index 46ba0df05ee..f84ca40606e 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:15 rillig Exp $
#
DISTNAME= XaoS-3.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://xaos.theory.org/
COMMENT= Zoomable fractal rendering doodad
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS= gmake
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-curses-driver=no
diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index 45843879fb1..3a7775436e7 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/10/07 17:39:26 perry Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:15 rillig Exp $
#
DISTNAME= BLT2.4z
@@ -18,8 +18,8 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib
-CONFIGURE_ENV+= X11BASE=${X11BASE}
-MAKE_ENV+= CP=${CP}
+CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
+MAKE_ENV+= CP=${CP:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index ed1f312df3d..cc79f574140 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/08/27 07:33:30 grant Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:15 rillig Exp $
#
DISTNAME= ebuilder-0.56d
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_TOOLS+= flex gmake
MAKEFILE= GNUmakefile
-MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
INSTALLATION_DIRS= bin
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index 65467a123ac..aef70ed23b0 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/10/03 19:52:03 joerg Exp $
+$NetBSD: distinfo,v 1.13 2005/12/05 20:51:15 rillig Exp $
SHA1 (Eterm-0.9.3.tar.gz) = df12cb09676ca265d65b8b5ac61f1ec88d58c692
RMD160 (Eterm-0.9.3.tar.gz) = 4e9f57807f1658cf8bea90219e296f4184f31452
@@ -15,6 +15,6 @@ Size (Eterm-bg-tile.tar.gz) = 1568166 bytes
SHA1 (patch-aa) = e47c20515232098f660a166af4d4c52a2f044d73
SHA1 (patch-ab) = ad802e27730e4d6451d4d64de09750811afcf7b7
SHA1 (patch-ad) = f70a92e4eb84466e379653cbd3a9188db6d408c8
-SHA1 (patch-ah) = 87c9e0e9ebd7409be7c04e0d6fe5e91510983635
+SHA1 (patch-ah) = 694d1348c05a392c193a6efa688c116c434c6e9e
SHA1 (patch-ai) = a8499316ec96198ca2deceaf1838d68f36ba100d
SHA1 (patch-aj) = b6782d1de8d8cd85a0e8a2fdd2a4f459bffdd8f7
diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah
index 0759515cd0d..fb0b7f2efdb 100644
--- a/x11/eterm/patches/patch-ah
+++ b/x11/eterm/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.4 2005/10/03 19:52:04 joerg Exp $
+$NetBSD: patch-ah,v 1.5 2005/12/05 20:51:15 rillig Exp $
--- src/utmp.c.orig Thu Jun 27 14:15:53 2002
+++ src/utmp.c Sat Dec 14 21:44:17 2002
-@@ -38,7 +38,7 @@ static const char cvs_ident[] = "$Id: ut
+@@ -38,7 +38,7 @@
# endif
/* don't go off end of ut_id & remember if an entry has been made */
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 22d8763daa0..89c8f1b9464 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2005/11/25 21:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2005/12/05 20:51:15 rillig Exp $
#
DISTNAME= gdm-2.8.0.5
@@ -34,9 +34,9 @@ PKG_SUPPORTED_OPTIONS= inet6 pam
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+= PREFIX=${PREFIX}
-CONFIGURE_ENV+= X11BASE=${X11BASE}
-MAKE_ENV+= CHMOD=${CHMOD} CHOWN=${CHOWN}
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
+CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
+MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
OWN_DIRS= ${PKG_SYSCONFDIR}/dm/Sessions
OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/Init
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 8210f1c0077..1b7aee48384 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2005/06/01 18:03:28 jlam Exp $
+# $NetBSD: Makefile,v 1.111 2005/12/05 20:51:16 rillig Exp $
DISTNAME= gnome-libs-1.4.2
PKGREVISION= 4
@@ -22,13 +22,13 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--enable-gtk-doc=no \
--with-html-dir=${PREFIX}/share/doc/html \
--with-kde-datadir=${X11PREFIX}/share/kde
-CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
+CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
CONFIGURE_ENV+= ${CONFIGURE_ENV.db-${BDB_TYPE}}
USE_PKGLOCALEDIR= YES
LOCALSTATEDIR= ${VARBASE}/gnome
-PLIST_SUBST+= LOCALSTATEDIR=${LOCALSTATEDIR}
+PLIST_SUBST+= LOCALSTATEDIR=${LOCALSTATEDIR:Q}
SUBST_CLASSES+= varbase
SUBST_MESSAGE.varbase= "Fixing path to score files."
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index cee3f0a5a0c..5ace36dbe29 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/11/25 21:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2005/12/05 20:51:17 rillig Exp $
#
DISTNAME= gnome-session-2.12.0
@@ -22,7 +22,7 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake perl pkg-config
USE_LIBTOOL= yes
-MAKE_ENV+= REAL_GCONFTOOL="${GCONFTOOL2}"
+MAKE_ENV+= REAL_GCONFTOOL=${GCONFTOOL2:Q}
CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index d74273e3222..eaf4d2807bb 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2005/07/16 01:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.111 2005/12/05 20:51:17 rillig Exp $
DISTNAME= gtk+-1.2.10
PKGREVISION= 8
@@ -29,12 +29,12 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-xinput=xfree \
--with-native-locale=yes \
--sysconfdir=${PREFIX}/share
-CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}"
+CONFIGURE_ENV+= X_LDFLAGS=${X_LDFLAGS:Q}
INFO_FILES= gdk.info gtk.info
-MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
-PLIST_SUBST+= LOCALBASE=${LOCALBASE}
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q}
# The following ensures that `gtk-config --libs' includes the correct linker
# flags for linking the X11 libs.
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 6d003c15717..0d875d47b6a 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2005/11/29 17:44:50 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2005/12/05 20:51:17 rillig Exp $
#
DISTNAME= gtk+-2.8.8
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV+= ac_cv_header_X11_extensions_Xinerama_h=no
CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no
-MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
TEST_TARGET= check
PKGCONFIG_OVERRIDE= gdk-2.0-uninstalled.pc.in
@@ -58,7 +58,7 @@ PRINT_PLIST_AWK+= /^@dirrm share\/themes\/Default$$/ \
{ print "@unexec $${RMDIR} %D/" $$2 \
" 2>/dev/null || $${TRUE}"; next; }
-SUBST_CLASSES= pthread
+SUBST_CLASSES+= pthread
SUBST_STAGE.pthread= pre-configure
SUBST_MESSAGE.pthread= "Fixing pthread flags."
SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk
index b073c745f0e..825ab5e8c2b 100644
--- a/x11/gtk2/modules.mk
+++ b/x11/gtk2/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.9 2004/06/20 20:12:20 jmmv Exp $
+# $NetBSD: modules.mk,v 1.10 2005/12/05 20:51:17 rillig Exp $
#
# This Makefile fragment is intended to be included by packages that install
# GTK2 modules. It takes care of rebuilding the corresponding databases at
@@ -22,8 +22,8 @@ GTK2_LOADERS= YES
.endif
.if defined(GTK2_IMMODULES) && !empty(GTK2_IMMODULES:M[Yy][Ee][Ss])
-FILES_SUBST+= GTK_IMMODULES_DB="${GTK_IMMODULES_DB}"
-FILES_SUBST+= GTK_QUERY_IMMODULES="${GTK_QUERY_IMMODULES}"
+FILES_SUBST+= GTK_IMMODULES_DB=${GTK_IMMODULES_DB:Q}
+FILES_SUBST+= GTK_QUERY_IMMODULES=${GTK_QUERY_IMMODULES:Q}
GTK_IMMODULES_DB= ${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gtk.immodules
INSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/immodules.tmpl
DEINSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/immodules.tmpl
@@ -31,8 +31,8 @@ USE_PKGINSTALL= YES
.endif
.if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss])
-FILES_SUBST+= GDK_PIXBUF_LOADERS_DB="${GDK_PIXBUF_LOADERS_DB}"
-FILES_SUBST+= GDK_PIXBUF_QUERY_LOADERS="${GDK_PIXBUF_QUERY_LOADERS}"
+FILES_SUBST+= GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q}
+FILES_SUBST+= GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q}
GDK_PIXBUF_LOADERS_DB= ${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gdk-pixbuf.loaders
INSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/loaders.tmpl
DEINSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/loaders.tmpl
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index 9928e9c91b4..78809336a09 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/10/14 21:45:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:17 rillig Exp $
#
DISTNAME= gtksourceview-1.4.2
@@ -19,7 +19,7 @@ USE_TOOLS+= gmake perl pkg-config
PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in
-CONFIGURE_ARGS= --disable-build-tests
+CONFIGURE_ARGS+= --disable-build-tests
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 0b064217103..d9f882b060f 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2005/11/17 04:33:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.95 2005/12/05 20:51:17 rillig Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
CATEGORIES= x11
@@ -133,8 +133,8 @@ GCC_REQD+= 2.95
. if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc")
CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g}
CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
+CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
. endif
#
# Configure finds these but apparently they are not ready for primetime
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 7e00983b117..26f4839c7e9 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/30 15:45:11 tron Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:18 rillig Exp $
DISTNAME= lablgtk-1.2.7
PKGREVISION= 1
@@ -22,7 +22,7 @@ BUILDLINK_DEPENDS.ocaml+= ocaml>=3.0.5
USE_DOTOPT= YES
.else
CAMLOPT= ocamlc
-MAKE_ENV+= CAMLOPT=${CAMLOPT}
+MAKE_ENV+= CAMLOPT=${CAMLOPT:Q}
PLIST_SRC= ${PKGDIR}/PLIST.noopt
.endif
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index f72074fb374..15be4d82601 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2005/06/30 15:42:49 adam Exp $
+# $NetBSD: Makefile,v 1.83 2005/12/05 20:51:18 rillig Exp $
DISTNAME= lesstif-0.94.4
CATEGORIES= x11
@@ -24,12 +24,12 @@ CONFIGURE_ENV+= LYNX_CMD=${WRKDIR}/nonexecutable
CONFIGURE_ENV+= LINKS_CMD=${WRKDIR}/nonexecutable
# Work around an ICE on sparc64-1.6
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
INSTALL_FILE= ${WRKDIR}/INSTALL
-FILES_SUBST= LOCALBASE=${LOCALBASE}
-FILES_SUBST+= X11BASE=${X11BASE}
+FILES_SUBST+= LOCALBASE=${LOCALBASE:Q}
+FILES_SUBST+= X11BASE=${X11BASE:Q}
FILES_SUBST+= CP=${CP:Q}
FILES_SUBST+= CMP=${CMP:Q}
FILES_SUBST+= ECHO=${ECHO:Q}
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 649d48980da..d8efa625a34 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/06/27 14:08:15 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:51:18 rillig Exp $
PKGVER= 2.1.30
DISTNAME= openmotif${PKGVER}
@@ -32,7 +32,7 @@ USE_TOOLS+= tbl
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= X11BASE=${X11BASE}
+FILES_SUBST+= X11BASE=${X11BASE:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index eb7629c9d8e..5fc9a2028c7 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/08/06 06:19:41 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/05 20:51:18 rillig Exp $
DISTNAME= Tk-804.027
PKGNAME= p5-Tk-804.027
@@ -11,7 +11,7 @@ MAINTAINER= shell@NetBSD.org
HOMEPAGE= http://cpan.uwinnipeg.ca/htdocs/Tk/Tk.html
COMMENT= Perl5 interface to Tk
-BUILD_DEPENDS= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser
+BUILD_DEPENDS+= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index acb775c3d8f..f6008ddbcca 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/25 21:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:18 rillig Exp $
#
DISTNAME= gnome-python-extras-2.12.0
@@ -16,7 +16,7 @@ PY_PATCHPLIST= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= gnome-python-extras-2.0.pc.in
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
USE_TOOLS+= pkg-config
PYTHON_VERSIONS_ACCEPTED= 24 23
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 78eb9fe6456..8de2088c263 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/10/18 18:09:13 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:18 rillig Exp $
#
DISTNAME= gnome-python-2.12.1
@@ -15,7 +15,7 @@ PY_PATCHPLIST= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= gnome-python-2.0.pc.in
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
USE_TOOLS+= pkg-config
PYTHON_VERSIONS_ACCEPTED= 24 23
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 34f212000f5..005e75be796 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/10/18 18:04:24 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:51:18 rillig Exp $
#
DISTNAME= pygtk-2.8.2
@@ -17,7 +17,7 @@ PY_PATCHPLIST= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in pygobject-2.0.pc.in
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
USE_TOOLS+= gmake pkg-config
PYTHON_VERSIONS_ACCEPTED= 24 23
diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile
index 6cc91892ab1..8a82af34e1a 100644
--- a/x11/py-qt2-sip/Makefile
+++ b/x11/py-qt2-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:28 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:18 rillig Exp $
#
DISTNAME= sip-3.1
@@ -14,12 +14,12 @@ COMMENT= Tool to create Python bindings for C++ libraries
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-python=${PYTHONBIN} \
+CONFIGURE_ARGS+= --with-python=${PYTHONBIN} \
--with-qt-dir=${QTDIR}
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
.include "../../lang/python/extension.mk"
.include "../../x11/qt2-libs/buildlink3.mk"
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 1eff3f44bdb..04677b05163 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/09/28 20:52:28 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:18 rillig Exp $
#
DISTNAME= PyQt-3.1-Qt-2.3.1
@@ -15,12 +15,12 @@ WRKSRC= ${WRKDIR}/PyQt-3.1
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-python=${PYTHONBIN} \
+CONFIGURE_ARGS+= --with-python=${PYTHONBIN} \
--with-qt-dir=${QTDIR}
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
.include "../../lang/python/extension.mk"
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index f81346a8264..fff2a4594f4 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/01 01:35:10 reed Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:18 rillig Exp $
#
.include "../../x11/py-qt3-base/Makefile.common"
@@ -7,7 +7,7 @@ PKGNAME= ${PYPKGPREFIX}-qt3-base-${PYQT_VERSION}
COMMENT= Python binding for Qt3
-BUILDLINK_DEPENDS.qt3-tools= qt3-tools>=3.1.2nb2
+BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb2
PLIST_SRC= ${PKGDIR}/PLIST.common
.if ${OPSYS} == "Darwin"
diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common
index cbc2da273b0..837a2b7794f 100644
--- a/x11/py-qt3-base/Makefile.common
+++ b/x11/py-qt3-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/11/22 18:52:45 drochner Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:51:18 rillig Exp $
#
# XXX: when updating version, be sure to update distinfo for both
@@ -24,13 +24,13 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
-CONFIGURE_ARGS= -b ${PREFIX}/bin
+CONFIGURE_ARGS+= -b ${PREFIX}/bin
CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB}
CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX}
PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
do-configure:
(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 3166e422f7b..7b63ecfea5e 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/22 18:50:30 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:18 rillig Exp $
#
DISTNAME= sip-4.3.2
@@ -19,14 +19,14 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
-CONFIGURE_ARGS= -b ${PREFIX}/bin
+CONFIGURE_ARGS+= -b ${PREFIX}/bin
CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB}
CONFIGURE_ARGS+= -e ${PREFIX}/${PYINC}
CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX}
PYTHON_VERSIONS_ACCEPTED= 24 23
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index ca5794e3f7d..f760bc71fb5 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/04 02:31:27 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:18 rillig Exp $
#
DISTNAME= wxPython-src-2.6.1.0
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxpython/}
MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://wxpython.org/
-COMMENT= wxPython: Python bindings for wxWidgets
+COMMENT= Python bindings for wxWidgets
WRKSRC= ${WRKDIR}/wxPython-src-2.6.1.0/wxPython
USE_TOOLS+= gmake pkg-config
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 628332700ae..797bbd2a721 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:49 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:18 rillig Exp $
#
DISTNAME= pygtk-0.6.11
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.pygtk.org/
COMMENT= Python Bindings for the GTK Widget Set
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
USE_TOOLS+= gmake
USE_LIBTOOL= yes
PY_PATCHPLIST= yes
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile
index ffd23541139..6f6bfc47e09 100644
--- a/x11/qt1/Makefile
+++ b/x11/qt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 19:21:57 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:18 rillig Exp $
#
DISTNAME= qt-1.44
@@ -19,8 +19,8 @@ USE_LIBTOOL= yes
QTPREFIX=${PREFIX}/qt1
-MAKE_ENV= QTDIR=${WRKSRC} QTPREFIX=${QTPREFIX}
-MAKE_ENV+= CXXOPTS="${CFLAGS}"
+MAKE_ENV+= QTDIR=${WRKSRC:Q} QTPREFIX=${QTPREFIX:Q}
+MAKE_ENV+= CXXOPTS=${CFLAGS:M*:Q}
BUILD_TARGET= src
PKG_OPTIONS_VAR= PKG_OPTIONS.qt1
diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index 28313649ec6..7e2e37b56fa 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/17 03:50:44 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:18 rillig Exp $
PKGNAME= qt2-designer-${QTVERSION}
PKGREVISION= 3
@@ -7,7 +7,7 @@ COMMENT= Visual (WYSIWYG) QT GUI builder
CONFLICTS+= qt2-designer-kde-[0-9]*
-.include "../qt2-libs/Makefile.common"
+.include "../../x11/qt2-libs/Makefile.common"
BUILD_TARGET= sub-tools
diff --git a/x11/qt2-docs/Makefile b/x11/qt2-docs/Makefile
index 387202ee45d..69380d3907e 100644
--- a/x11/qt2-docs/Makefile
+++ b/x11/qt2-docs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:18 rillig Exp $
#
PKGNAME= qt2-docs-${QTVERSION}
PKGREVISION= 3
COMMENT= Documentation for the QT C++ X GUI toolkit
-.include "../qt2-libs/Makefile.common"
+.include "../../x11/qt2-libs/Makefile.common"
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/x11/qt2-examples/Makefile b/x11/qt2-examples/Makefile
index 4bf58c879b9..cbcd929abf0 100644
--- a/x11/qt2-examples/Makefile
+++ b/x11/qt2-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:19 rillig Exp $
#
PKGNAME= qt2-examples-${QTVERSION}
@@ -6,9 +6,9 @@ PKGREVISION= 3
COMMENT= QT2 Tutorial, example code and HTML documentation
-.include "../qt2-libs/Makefile.common"
+.include "../../x11/qt2-libs/Makefile.common"
-CONFIGURE_ENV+= QTDIR=${QTPREFIX}
+CONFIGURE_ENV+= QTDIR=${QTPREFIX:Q}
do-build:
@MFS="`${FIND} ${WRKSRC}/examples ${WRKSRC}/tutorial -name Makefile -print`"; \
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 22affd8874b..10161768208 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:19 rillig Exp $
PKGNAME= qt2-libs-${QTVERSION}
PKGREVISION= 6
COMMENT= C++ X GUI toolkit
-.include "../qt2-libs/Makefile.common"
+.include "../../x11/qt2-libs/Makefile.common"
-CONFIGURE_ENV+= QTDIR="${WRKSRC}"
-MAKE_ENV+= QTDIR="${WRKSRC}"
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+CONFIGURE_ENV+= QTDIR=${WRKSRC:Q}
+MAKE_ENV+= QTDIR=${WRKSRC:Q}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
BUILD_TARGET= sub-src
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index f63dab83efc..b4a2bf61323 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/10/04 19:34:36 joerg Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/12/05 20:51:19 rillig Exp $
#
DISTNAME= qt-x11-${QTVERSION}
@@ -6,7 +6,7 @@ CATEGORIES= x11
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/
-.include "../qt2/Makefile.common"
+.include "../../x11/qt2/Makefile.common"
WRKSRC= ${WRKDIR}/qt-${QTVERSION}
HAS_CONFIGURE= yes
@@ -22,12 +22,12 @@ CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
QTPREFIX= ${PREFIX}/qt2
-MAKE_ENV+= QTPREFIX=${QTPREFIX}
+MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
-MAKE_ENV+= SYSCONF_CXXFLAGS="${CXXFLAGS}"
-MAKE_ENV+= SYSCONF_CFLAGS="${CFLAGS}"
-MAKE_ENV+= SYSCONF_CXXFLAGS_LIB="${CXXFLAGS}"
-MAKE_ENV+= SYSCONF_CFLAGS_LIB="${CFLAGS}"
+MAKE_ENV+= SYSCONF_CXXFLAGS=${CXXFLAGS:M*:Q}
+MAKE_ENV+= SYSCONF_CFLAGS=${CFLAGS:M*:Q}
+MAKE_ENV+= SYSCONF_CXXFLAGS_LIB=${CXXFLAGS:M*:Q}
+MAKE_ENV+= SYSCONF_CFLAGS_LIB=${CFLAGS:M*:Q}
DISTINFO_FILE= ${.CURDIR}/../../x11/qt2-libs/distinfo
FILESDIR= ${.CURDIR}/../../x11/qt2-libs/files
@@ -41,11 +41,11 @@ CONFIGURE_ARGS+= -platform solaris-g++
CONFIGURE_ARGS+= -xft -platform freebsd-g++
.endif
-FILES_SUBST= BUILDLINK_DIR=${BUILDLINK_DIR}
-FILES_SUBST+= BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR}
-FILES_SUBST+= LOCALBASE=${LOCALBASE}
-FILES_SUBST+= QTDIR=${QTPREFIX}
-FILES_SUBST+= X11BASE=${X11BASE}
+FILES_SUBST= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+FILES_SUBST+= BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR:Q}
+FILES_SUBST+= LOCALBASE=${LOCALBASE:Q}
+FILES_SUBST+= QTDIR=${QTPREFIX:Q}
+FILES_SUBST+= X11BASE=${X11BASE:Q}
FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
.include "../../mk/x11.buildlink3.mk"
diff --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk
index 395301dc001..4d7b9d888a1 100644
--- a/x11/qt2-libs/buildlink3.mk
+++ b/x11/qt2-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:38 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/12/05 20:51:19 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT2_LIBS_BUILDLINK3_MK:= ${QT2_LIBS_BUILDLINK3_MK}+
@@ -27,9 +27,9 @@ BUILDLINK_LIBDIRS.qt2-libs= qt2/lib
.include "../../graphics/png/buildlink3.mk"
QTDIR= ${BUILDLINK_PREFIX.qt2-libs}/qt2
-CONFIGURE_ENV+= QTDIR="${QTDIR}"
+CONFIGURE_ENV+= QTDIR=${QTDIR:Q}
CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc"
-MAKE_ENV+= QTDIR="${QTDIR}"
+MAKE_ENV+= QTDIR=${QTDIR:Q}
MAKE_ENV+= MOC="${QTDIR}/bin/moc"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index 3f2941d6c9e..dcf19fdfd11 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2005/09/27 08:01:28 adam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:19 rillig Exp $
-.include "../qt3-libs/Makefile.common"
+.include "../../x11/qt3-libs/Makefile.common"
PKGNAME= qt3-docs-${QTVERSION}
COMMENT= Documentation for the QT C++ X GUI toolkit
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 39de70f7c78..e65f815aa70 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2005/11/17 04:33:20 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.58 2005/12/05 20:51:19 rillig Exp $
#
DISTNAME= qt-x11-free-${QTVERSION}
CATEGORIES= x11
@@ -32,8 +32,8 @@ CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
LIBQT?= -lqt-mt
-MAKE_ENV+= QTPREFIX=${QTPREFIX}
-MAKE_ENV+= QTDIR="${WRKSRC}"
+MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
+MAKE_ENV+= QTDIR=${WRKSRC:Q}
# avoid creating a .qt directory in the users home
# directory
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index 9edf209ce3e..e54f52439ac 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/07 16:36:47 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/12/05 20:51:19 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+
@@ -42,8 +42,8 @@ MAKE_ENV+= MOC="${QTDIR}/bin/moc"
#LDFLAGS+= ${COMPILER_RPATH_FLAG}${QTDIR}/lib
.if !defined(BUILD_QT3)
-CONFIGURE_ENV+= QTDIR="${QTDIR}"
-MAKE_ENV+= QTDIR="${QTDIR}"
+CONFIGURE_ENV+= QTDIR=${QTDIR:Q}
+MAKE_ENV+= QTDIR=${QTDIR:Q}
.endif
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index 4c46784a7a9..0fac60ab451 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2005/09/27 09:15:31 adam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:19 rillig Exp $
-.include "../qt3-libs/Makefile.common"
+.include "../../x11/qt3-libs/Makefile.common"
PKGNAME= qt3-mysql-${QTVERSION}
COMMENT= QT mysql driver
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index 4bdca6dd923..2a86936bf52 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2005/11/01 15:20:51 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:19 rillig Exp $
-.include "../qt3-libs/Makefile.common"
+.include "../../x11/qt3-libs/Makefile.common"
PKGNAME= qt3-psql-${QTVERSION}
PKGREVISION= 1
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index be810f90c02..ad047ee57d6 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/06 17:49:13 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:19 rillig Exp $
#
DISTNAME= qscintilla-1.65-gpl-1.6
@@ -18,7 +18,7 @@ BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools
USE_TOOLS+= gmake
USE_LIBTOOL= yes
-MAKE_ENV+= QTPREFIX=${QTDIR}
+MAKE_ENV+= QTPREFIX=${QTDIR:Q}
do-configure:
(cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro)
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index ce21b73cb73..55cedc82f55 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/09/27 07:47:27 adam Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:51:19 rillig Exp $
.include "../../mk/bsd.prefs.mk"
# XXX: hack - work round an ICE with GCC 3.3 on sparc
@@ -6,7 +6,7 @@
GCC_REQD+= 3.4
.endif
-.include "../qt3-libs/Makefile.common"
+.include "../../x11/qt3-libs/Makefile.common"
PKGNAME= qt3-tools-${QTVERSION}
COMMENT= QT GUI (WYSIWYG) builder and other tools
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index d39d87252ae..84518302996 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/17 03:50:44 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:19 rillig Exp $
DISTNAME= qwt-0.3.0
PKGREVISION= 2
@@ -13,7 +13,7 @@ USE_X11BASE= yes
USE_TOOLS+= gmake
USE_LIBTOOL= yes
-MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
CONFLICTS= qwtlib-[0-9]*
diff --git a/x11/ruby-tcltklib/tcltkversion.mk b/x11/ruby-tcltklib/tcltkversion.mk
index 1d470bb897a..d5583188d85 100644
--- a/x11/ruby-tcltklib/tcltkversion.mk
+++ b/x11/ruby-tcltklib/tcltkversion.mk
@@ -1,6 +1,6 @@
-# $NetBSD: tcltkversion.mk,v 1.1 2004/11/27 14:50:12 taca Exp $
-.ifndef _RUBY_TCLTKVERSION_MK
+# $NetBSD: tcltkversion.mk,v 1.2 2005/12/05 20:51:19 rillig Exp $
+.if !defined(_RUBY_TCLTKVERSION_MK)
_RUBY_TCLTKVERSION_MK= # defined
TCL_VERSION?= 8.4
diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile
index 40fee1c12f3..b6048239c5b 100644
--- a/x11/tk83/Makefile
+++ b/x11/tk83/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/05 03:27:55 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:19 rillig Exp $
DISTNAME= tk8.3.4
PKGNAME= tk-8.3.4
@@ -23,7 +23,7 @@ SUBST_FILES.tk834= unix/tkConfig.sh
SUBST_SED.tk834+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|"
SUBST_SED.tk834+= -e "s|${WRKSRC}|${PREFIX}/include/tk|"
-MAKE_ENV+= TOUCH="${TOUCH}"
+MAKE_ENV+= TOUCH=${TOUCH:Q}
USE_LIBTOOL= yes
TEST_TARGET= test
diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile
index 87e9acb8e1a..4a353b8f323 100644
--- a/x11/tkinfo/Makefile
+++ b/x11/tkinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/17 03:50:44 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:19 rillig Exp $
DISTNAME= tkinfo-2.8
CATEGORIES= x11
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://math-www.uni-paderborn.de/~axel/tkinfo/
COMMENT= Tk script to read and display GNU "info" files
-DEPENDS= tk>=8.3.2:../../x11/tk
+DEPENDS+= tk>=8.3.2:../../x11/tk
NO_BUILD= yes
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 5e23e9fafe4..9190fe161d3 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/10/23 22:01:26 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:19 rillig Exp $
DISTNAME= wdm-1.25
PKGREVISION= 6
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-gfx-incs=${BUILDLINK_DIR}/include/WINGs
CONFIGURE_ARGS+= --with-gfx-libs=${BUILDLINK_DIR}/lib
CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log
CONFIGURE_ARGS+= --with-runlockdir=${VARBASE}/run
-CONFIGURE_ENV+= SYSTEM_SHELL="${SH}"
+CONFIGURE_ENV+= SYSTEM_SHELL=${SH:Q}
RCD_SCRIPTS= wdm
diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common
index af3d4f8f0eb..239e7d23fa9 100644
--- a/x11/wxGTK/Makefile.common
+++ b/x11/wxGTK/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/10/04 01:47:32 minskim Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/12/05 20:51:19 rillig Exp $
#
DISTNAME= wxGTK-2.6.2
@@ -23,8 +23,8 @@ CONFIGURE_ARGS+= --with-libpng=sys
CONFIGURE_ARGS+= --with-libtiff=sys
CONFIGURE_ARGS+= --with-opengl
CONFIGURE_ARGS+= --with-zlib=sys
-CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
-MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
+CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this
diff --git a/x11/wxGTK24/Makefile.common b/x11/wxGTK24/Makefile.common
index 497e18f82ad..8499617ffba 100644
--- a/x11/wxGTK24/Makefile.common
+++ b/x11/wxGTK24/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/08/10 20:56:30 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:51:19 rillig Exp $
#
DISTNAME= wxGTK-2.4.2
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-libjpeg=sys
CONFIGURE_ARGS+= --with-zlib=sys
CONFIGURE_ARGS+= --with-libpng=sys
CONFIGURE_ARGS+= --with-libtiff=sys
-CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
+CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 92562d214eb..43e0f79ac4f 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/10/11 01:03:57 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:19 rillig Exp $
DISTNAME= wxhaskell-src-0.9.4
PKGNAME= ${DISTNAME:S/-src//}
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
MAKEFILE= makefile
-MAKE_FLAGS= X11BASE=${X11BASE}
+MAKE_FLAGS+= X11BASE=${X11BASE:Q}
pre-configure:
cd ${WRKSRC}; ./configure --prefix=${PREFIX} --with-opengl
diff --git a/x11/xdesktopwaves/Makefile b/x11/xdesktopwaves/Makefile
index 9e9e67f8681..07464400885 100644
--- a/x11/xdesktopwaves/Makefile
+++ b/x11/xdesktopwaves/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:32 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:19 rillig Exp $
#
DISTNAME= xdesktopwaves-1.1
@@ -11,8 +11,8 @@ COMMENT= Simulates water waves on the X Windows desktop
USE_DIRS+= xdg-1.1
-MAKE_FLAGS+= CFLAGS="${CFLAGS}"
-MAKE_FLAGS+= LFLAGS="${LDFLAGS}"
+MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
+MAKE_FLAGS+= LFLAGS=${LDFLAGS:M*:Q}
INSTALLATION_DIRS= bin man/man1 share/doc/xdesktopwaves
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 75441276443..076db2620d3 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.54 2005/12/05 20:51:20 rillig Exp $
#
DISTNAME= xforms-1.0-release
@@ -15,7 +15,7 @@ COMMENT= Graphical user interface toolkit for X Window System
USE_IMAKE= YES
-MAKE_ENV= DEPEND_DEFINES="${CPPFLAGS}"
+MAKE_ENV= DEPEND_DEFINES=${CPPFLAGS:M*:Q}
SCRIPTS_ENV= DEPEND_DEFINES="${CPPFLAGS}"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo
index b2418cc4a80..e8b76c836ec 100644
--- a/x11/xforms/distinfo
+++ b/x11/xforms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2005/11/07 14:41:20 joerg Exp $
+$NetBSD: distinfo,v 1.17 2005/12/05 20:51:20 rillig Exp $
SHA1 (xforms-1.0-release.tgz) = e25a31351c52472de88352388cf879512b20fc62
RMD160 (xforms-1.0-release.tgz) = 18ccbff4df5e0e3786341a5ab4f8af6e2fd4fd92
@@ -9,5 +9,5 @@ SHA1 (patch-ac) = 55c32e091b1da5441e4c652d3e4a002202a6d076
SHA1 (patch-ad) = 324100fb05e723fbaa92126e279074860c842f1b
SHA1 (patch-ae) = ba8b68d7e886311cb2fbfe4e0a45e975e7790821
SHA1 (patch-af) = f3fdbbb2a103505e6f18608f0c3882cc1d264b00
-SHA1 (patch-ag) = 3dde38a74cbbb1943eefd78f3df56a8de3c0f74f
+SHA1 (patch-ag) = 447c24ad912a65af5f93b393579516a900a10c4e
SHA1 (patch-ah) = 45129394ca29063443548d961c7954ea12cc435f
diff --git a/x11/xforms/patches/patch-ag b/x11/xforms/patches/patch-ag
index 4aac4f8a6fb..6fa2d1f5d81 100644
--- a/x11/xforms/patches/patch-ag
+++ b/x11/xforms/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2005/10/10 12:11:47 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2005/12/05 20:51:20 rillig Exp $
--- lib/errmsg.c.orig 2005-07-22 18:01:01.000000000 +0000
+++ lib/errmsg.c
-@@ -51,7 +51,10 @@ char *id_errm = "$Id: errmsg.c,v 0.80 19
+@@ -51,7 +51,10 @@
#include "forms.h"
#include "ulib.h"
diff --git a/x11/xjman/Makefile b/x11/xjman/Makefile
index d2dfe623cf7..d0c7ef7286a 100644
--- a/x11/xjman/Makefile
+++ b/x11/xjman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/23 22:03:21 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:20 rillig Exp $
DISTNAME= xjman-0.5
CATEGORIES= japanese x11
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/man/ja_JP.eucJP
USE_X11BASE= yes
PLIST_SRC= ${WRKDIR}/PLIST
XJMANDIR= man/ja_JP.EUC
-MAKE_ENV+= XJMANDIR=${XJMANDIR}
+MAKE_ENV+= XJMANDIR=${XJMANDIR:Q}
NO_CONFIGURE= yes
diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile
index 503b7f0880c..761d97f8154 100644
--- a/x11/xlockmore-lite/Makefile
+++ b/x11/xlockmore-lite/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/11/27 00:15:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:20 rillig Exp $
-.include "../xlockmore/Makefile.common"
+.include "../../x11/xlockmore/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-lite-/}
COMMENT= "lite" version of xlockmore
diff --git a/x11/xmms-osd/Makefile b/x11/xmms-osd/Makefile
index c567051ec13..1265694f1c6 100644
--- a/x11/xmms-osd/Makefile
+++ b/x11/xmms-osd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:40 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:20 rillig Exp $
#
-.include "../xosd/Makefile.common"
+.include "../../x11/xosd/Makefile.common"
PKGNAME= ${DISTNAME:S/xosd/xmms-osd/}
PKGREVISION= 1
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index ef56d249dd4..0347c3fa7d1 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/09/13 22:51:42 reed Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:20 rillig Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
@@ -38,7 +38,6 @@ post-extract:
.for F in ${SYSTEMS}
@${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in
.endfor
-.undef F
@${SED} -e "s|CONFIGDIRSPEC|-I${X11ROOT}/lib/X11/config|" \
${WRKSRC}/config/util/xmkmf.cpp > \
${WRKSRC}/config/util/xmkmf.cpp.orig
@@ -54,7 +53,6 @@ pre-configure:
-e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g" \
${WRKSRC}/config/cf/${F}.cf.in > ${WRKSRC}/config/cf/${F}.cf
.endfor
-.undef F
@( \
${ECHO} "#define XORG_VERSION_MAJOR 6"; \
${ECHO} "#define XORG_VERSION_MINOR 8"; \
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index b0523c2cd0c..06aa7d9a3a9 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/11/09 01:05:06 reed Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:20 rillig Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-libs-${XORG_VER}
@@ -12,7 +12,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org Libraries
-BUILD_DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake
+BUILD_DEPENDS+= xorg-imake>=${XORG_VER}:../../x11/xorg-imake
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common
index 002249a89d1..6fef7195e10 100644
--- a/x11/xosd/Makefile.common
+++ b/x11/xosd/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/06/01 18:03:33 jlam Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/12/05 20:51:20 rillig Exp $
DISTNAME= xosd-2.2.12
CATEGORIES= x11
@@ -19,7 +19,7 @@ SHLIBTOOL_OVERRIDE= libtool-disable-static
CONFIGURE_ARGS+= --disable-xinerama
# Avoid an ICE on sparc64 with gcc2
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
SUBST_CLASSES+= fixme
SUBST_STAGE.fixme= post-patch
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 042908e7fd3..2a1bf41aa08 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:33 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:20 rillig Exp $
#
DISTNAME= xpad-1.12
@@ -18,7 +18,7 @@ USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
-LIBS.SunOS= -lX11
+LIBS.SunOS+= -lX11
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
diff --git a/x11/xpaste/distinfo b/x11/xpaste/distinfo
index cf7ba2793f9..77cb7f47397 100644
--- a/x11/xpaste/distinfo
+++ b/x11/xpaste/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:36:25 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/12/05 20:51:20 rillig Exp $
SHA1 (xpaste-1.1.shar.gz) = 15c022ddb3e43bc25721e9185aebe5d5ef8160a2
RMD160 (xpaste-1.1.shar.gz) = 3e09e70047c244583ef689627be58618ed73abcf
Size (xpaste-1.1.shar.gz) = 6144 bytes
SHA1 (patch-aa) = 467ecb06be395db5222614beeaba6694eb44c1fc
-SHA1 (patch-ab) = ef12cd1b9a1244fa3193298b1a00783fb984ed43
+SHA1 (patch-ab) = 5d1fec1a6f1dfb500f5bdb49b4f2e126d1e5e3ed
diff --git a/x11/xpaste/patches/patch-ab b/x11/xpaste/patches/patch-ab
index cd3c288b8a6..5b3904b0d7f 100644
--- a/x11/xpaste/patches/patch-ab
+++ b/x11/xpaste/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2003/12/04 09:27:01 seb Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/05 20:51:20 rillig Exp $
--- xpaste.c.orig 2003-11-18 07:23:53.000000000 +0000
+++ xpaste.c
-@@ -18,7 +18,7 @@ static char rcsid[] = "$Id: xpaste.c,v 1
+@@ -18,7 +18,7 @@
#include <X11/Xaw/AsciiText.h>
#include <X11/Xaw/Form.h>
#include <X11/Xaw/Command.h>
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index 4b04d7d904d..6e6a1b9ae54 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/04 00:49:33 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:20 rillig Exp $
#
DISTNAME= xphoon.tar
@@ -16,7 +16,7 @@ COMMENT= Set the root window to the moon in its current phase
WRKSRC= ${WRKDIR}/xphoon
USE_IMAKE= yes
-MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}
+MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index aae82eaeee9..adc986a6a42 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/06/17 03:50:45 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/05 20:51:20 rillig Exp $
#
DISTNAME= fvwm-${PKG_VERSION}
@@ -15,7 +15,7 @@ PKG_VERSION= 2.4.19
USE_X11BASE= YES
GNU_CONFIGURE= YES
-MAKE_ENV+= VERSION=${PKG_VERSION}
+MAKE_ENV+= VERSION=${PKG_VERSION:Q}
CONFIGURE_ARGS+= --without-extras --disable-dmalloc --without-gnome
INSTALLATION_DIRS= bin man/man1
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index de756b00f3d..dd1eece6c3f 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.84 2005/10/07 18:43:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.85 2005/12/05 20:51:20 rillig Exp $
#
DISTNAME= xscreensaver-4.22
@@ -30,11 +30,11 @@ CONFIGURE_ARGS+= --without-pam
CONFIGURE_ENV+= X_PRE_LIBS=-lXt
CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
CONFIGURE_ENV+= ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
-CONFIGURE_ENV+= INTLTOOL_PERL="${PERL5}"
+CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q}
.if defined(PKGREVISION)
CONFIGURE_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
.endif
-CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL="${PERL5}"
+CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL=${PERL5:Q}
DISTINFO_FILE= ${.CURDIR}/../../x11/xscreensaver/distinfo
FILESDIR= ${.CURDIR}/../../x11/xscreensaver/files
diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile
index cfe0b6ed984..ea663903c2f 100644
--- a/x11/xscribble/Makefile
+++ b/x11/xscribble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/05/23 18:31:27 danw Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:20 rillig Exp $
DISTNAME= xscribble
PKGNAME= xscribble-20000616
@@ -17,7 +17,7 @@ NO_INSTALL_MANPAGES= YES
.if ${OPSYS} == "Darwin"
SYS_LIBRARIES= -lmx
-MAKE_ENV+= SYS_LIBRARIES="${SYS_LIBRARIES}"
+MAKE_ENV+= SYS_LIBRARIES=${SYS_LIBRARIES:Q}
.endif
post-install:
diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile
index 3ee8567da88..53c40095ce9 100644
--- a/x11/xservers/Makefile
+++ b/x11/xservers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/10/31 20:34:48 tron Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:20 rillig Exp $
DISTNAME= xservers-3.3.6.4
CATEGORIES= x11
@@ -19,9 +19,9 @@ USE_X11BASE= YES
.if !defined(X11_RELEASE) && !defined(CHECK_X11)
X11_RELEASE!= ${MAKE} CHECK_X11=YES print-x11-release
-MAKEFLAGS+= X11_RELEASE=${X11_RELEASE}
+MAKEFLAGS+= X11_RELEASE=${X11_RELEASE:Q}
. if ${X11_RELEASE} == "6.3"
-PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
+PKG_SKIP_REASON+= "${PKGNAME} is part of your X11 distribution"
. endif
.endif
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index 4c099eae5bd..8d2556fc846 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/09/28 20:52:28 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:20 rillig Exp $
DISTNAME= xview3.2p1-X11R6
PKGNAME= xview-lib-3.2.1
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= OpenLook Toolkit libs, includes, and man pages
-DEPENDS= xview-config>=3.2.1nb2:../../x11/xview-config
+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
diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile
index 560acfaa138..742f6798fb9 100644
--- a/x11/xworld/Makefile
+++ b/x11/xworld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/20 10:58:16 wennmach Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:20 rillig Exp $
#
DISTNAME= xworld-2.0
@@ -12,9 +12,9 @@ COMMENT= Earth as seen from the direction of the sun
HAS_CONFIGURE= yes
-CONFIGURE_ENV+= PREFIX="${PREFIX}"
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
CONFIGURE_ENV+= LDLIBS="-lm ${LDFLAGS} -lX11"
-CONFIGURE_ENV+= CAT="${CAT}" STRIP=strip INCLUDES="" MORELIBS=""
+CONFIGURE_ENV+= CAT=${CAT:Q} STRIP=strip INCLUDES="" MORELIBS=""
SUBST_CLASSES+= x11
SUBST_MESSAGE.x11= "Fixing x11 options."