diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/amaya/Makefile | 9 | ||||
-rw-r--r-- | www/amaya/PLIST | 6 | ||||
-rw-r--r-- | www/apache2/Makefile | 9 | ||||
-rw-r--r-- | www/apache2/PLIST | 8 | ||||
-rw-r--r-- | www/apache2/options.mk | 7 | ||||
-rw-r--r-- | www/apache22/PLIST | 4 | ||||
-rw-r--r-- | www/apache22/options.mk | 7 | ||||
-rw-r--r-- | www/emacs-w3m/Makefile | 7 | ||||
-rw-r--r-- | www/emacs-w3m/PLIST | 48 | ||||
-rw-r--r-- | www/emacs-w3m/options.mk | 7 | ||||
-rw-r--r-- | www/ikiwiki/Makefile | 6 | ||||
-rw-r--r-- | www/ikiwiki/PLIST | 12 | ||||
-rw-r--r-- | www/libwww/Makefile | 10 | ||||
-rw-r--r-- | www/libwww/PLIST | 4 | ||||
-rw-r--r-- | www/py-django/PLIST | 130 | ||||
-rw-r--r-- | www/py-django/options.mk | 20 | ||||
-rw-r--r-- | www/w3m/PLIST | 4 | ||||
-rw-r--r-- | www/w3m/options.mk | 6 |
18 files changed, 146 insertions, 158 deletions
diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 19561847017..c5e0d45eb45 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2006/10/07 19:16:57 schwarz Exp $ +# $NetBSD: Makefile,v 1.50 2008/04/12 22:43:13 jlam Exp $ DISTNAME= amaya-fullsrc-9.2.1 PKGNAME= ${DISTNAME:S/-fullsrc//} @@ -30,10 +30,11 @@ FONTS_DIRS.ttf+= ${PREFIX}/share/Amaya/fonts REQD_DIRS+= ${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts .include "../../mk/bsd.prefs.mk" + +# GNOME/KDE integration (only for Linux) +PLIST_VARS+= desktop .if ${OPSYS} == "Linux" -PLIST_SUBST+= LINUX= -.else -PLIST_SUBST+= LINUX="@comment " +PLIST.desktop= yes .endif post-extract: diff --git a/www/amaya/PLIST b/www/amaya/PLIST index 3881d8831d4..b4afedafb0e 100644 --- a/www/amaya/PLIST +++ b/www/amaya/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2006/10/07 19:16:57 schwarz Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:13 jlam Exp $ bin/amaya bin/amaya-gtk share/Amaya/amaya/Amaya.svg @@ -1419,8 +1419,8 @@ share/Amaya/resources/xrc/TextDlgWX.xrc share/Amaya/resources/xrc/TitleDlgWX.xrc share/Amaya/resources/xrc/Toolbar.xrc share/Amaya/resources/xrc/WinPrintDlgWX.xrc -${LINUX}share/applications/amaya-8.8.1.desktop -${LINUX}share/pixmaps/amaya-8.8.1.png +${PLIST.desktop}share/applications/amaya-8.8.1.desktop +${PLIST.desktop}share/pixmaps/amaya-8.8.1.png @dirrm share/Amaya/resources/xrc @dirrm share/Amaya/resources/icons/misc @dirrm share/Amaya/resources/icons/22x22 diff --git a/www/apache2/Makefile b/www/apache2/Makefile index eb469418273..ae477a0a82b 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.121 2008/01/21 14:37:22 taca Exp $ +# $NetBSD: Makefile,v 1.122 2008/04/12 22:43:13 jlam Exp $ .include "Makefile.common" @@ -46,11 +46,8 @@ APACHE_MODULES?= ${DFLT_APACHE_MODULES} APACHE_MPM?= prefork CONFIGURE_ARGS+= --with-mpm=${APACHE_MPM:Q} BUILD_DEFS+= APACHE_MPM -.for mpm in prefork worker -PLIST_SUBST.${mpm}?= MPM_COMMENT.${mpm}="@comment " -PLIST_SUBST+= ${PLIST_SUBST.${mpm}} -.endfor -PLIST_SUBST.${APACHE_MPM}= MPM_COMMENT.${APACHE_MPM}= +PLIST_VARS+= mpm-prefork mpm-worker +PLIST.${APACHE_MPM}= yes CONFIGURE_ARGS+= --disable-access CONFIGURE_ARGS+= --disable-auth diff --git a/www/apache2/PLIST b/www/apache2/PLIST index 749cf6a4ef3..e4eaa59e828 100644 --- a/www/apache2/PLIST +++ b/www/apache2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.35 2007/09/07 23:11:40 tron Exp $ +@comment $NetBSD: PLIST,v 1.36 2008/04/12 22:43:13 jlam Exp $ include/httpd/ap_compat.h include/httpd/ap_config.h include/httpd/ap_config_auto.h @@ -9,7 +9,7 @@ include/httpd/ap_mpm.h include/httpd/ap_provider.h include/httpd/ap_regkey.h include/httpd/ap_release.h -${MPM_COMMENT.worker}include/httpd/fdqueue.h +${PLIST.mpm-worker}include/httpd/fdqueue.h include/httpd/http_config.h include/httpd/http_connection.h include/httpd/http_core.h @@ -33,7 +33,7 @@ include/httpd/mpm_default.h include/httpd/os.h include/httpd/pcre.h include/httpd/pcreposix.h -${MPM_COMMENT.worker}include/httpd/pod.h +${PLIST.mpm-worker}include/httpd/pod.h include/httpd/rfc1413.h include/httpd/scoreboard.h include/httpd/ssl_expr.h @@ -79,7 +79,7 @@ sbin/httxt2dbm sbin/logresolve sbin/mkcert sbin/rotatelogs -${SUEXEC_COMMENT}sbin/suexec +${PLIST.suexec}sbin/suexec share/examples/httpd/highperformance-std.conf share/examples/httpd/httpd-std.conf share/examples/httpd/magic diff --git a/www/apache2/options.mk b/www/apache2/options.mk index 072af02318b..0726f306c94 100644 --- a/www/apache2/options.mk +++ b/www/apache2/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.7 2007/07/04 20:55:03 jlam Exp $ +# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= suexec .include "../../mk/bsd.options.mk" +PLIST_VARS+= suexec .if !empty(PKG_OPTIONS:Msuexec) PKG_USERS_VARS+= APACHE_USER BUILD_DEFS+= VARBASE APACHE_SUEXEC_PATH @@ -23,7 +24,5 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \ APACHE_MODULES+= suexec CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS -PLIST_SUBST+= SUEXEC_COMMENT= -.else -PLIST_SUBST+= SUEXEC_COMMENT="@comment " +PLIST.suexec= yes .endif diff --git a/www/apache22/PLIST b/www/apache22/PLIST index 33f063e7302..d5420596657 100644 --- a/www/apache22/PLIST +++ b/www/apache22/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2008/01/21 15:07:10 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:13 jlam Exp $ include/httpd/ap_compat.h include/httpd/ap_config.h include/httpd/ap_config_auto.h @@ -75,7 +75,7 @@ sbin/httxt2dbm sbin/logresolve sbin/mkcert sbin/rotatelogs -${SUEXEC_COMMENT}sbin/suexec +${PLIST.suexec}sbin/suexec share/examples/httpd/extra/httpd-autoindex.conf share/examples/httpd/extra/httpd-dav.conf share/examples/httpd/extra/httpd-default.conf diff --git a/www/apache22/options.mk b/www/apache22/options.mk index 57c12e5f48a..6933435a6ae 100644 --- a/www/apache22/options.mk +++ b/www/apache22/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2007/07/04 20:55:04 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= suexec .include "../../mk/bsd.options.mk" +PLIST_VARS+= suexec .if !empty(PKG_OPTIONS:Msuexec) PKG_USERS_VARS+= APACHE_USER BUILD_DEFS+= VARBASE APACHE_SUEXEC_PATH @@ -23,7 +24,5 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \ APACHE_MODULES+= suexec CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS -PLIST_SUBST+= SUEXEC_COMMENT= -.else -PLIST_SUBST+= SUEXEC_COMMENT="@comment " +PLIST.suexec= yes .endif diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 3dafc71a672..f7908b3e006 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/10/29 13:11:11 uebayasi Exp $ +# $NetBSD: Makefile,v 1.22 2008/04/12 22:43:13 jlam Exp $ DISTNAME= emacs-w3m-1.4.4 PKGREVISION= 1 @@ -30,11 +30,10 @@ SUBST_SED.fix-icondir= -e 's|etc/images/w3m|etc/w3m|g' \ .include "../../mk/emacs.mk" # GNU Emacs 21 or later and XEmacs have GUI support +PLIST_VARS+= gui .if (${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} > 20) || \ ${EMACS_FLAVOR} == "xemacs" -PLIST_SUBST+= FOR_gui="" -.else -PLIST_SUBST+= FOR_gui="@comment " +PLIST.gui= yes .endif DOCUMENTS= COPYING ChangeLog ChangeLog.1 README README.ja diff --git a/www/emacs-w3m/PLIST b/www/emacs-w3m/PLIST index 4b4e7a0d7c9..97777abbaab 100644 --- a/www/emacs-w3m/PLIST +++ b/www/emacs-w3m/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.10 2007/10/29 13:11:11 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:13 jlam Exp $ ${EMACS_LISPPREFIX}/w3m/ChangeLog ${EMACS_LISPPREFIX}/w3m/ChangeLog.1 ${EMACS_LISPPREFIX}/w3m/mew-w3m.el -${FOR_mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc +${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc ${EMACS_LISPPREFIX}/w3m/mime-w3m.el ${EMACS_LISPPREFIX}/w3m/mime-w3m.elc ${EMACS_LISPPREFIX}/w3m/octet.el @@ -68,7 +68,7 @@ ${FOR_xemacs215}${EMACS_LISPPREFIX}/w3m/w3m-xmas.elc ${EMACS_LISPPREFIX}/w3m/w3m.el ${EMACS_LISPPREFIX}/w3m/w3m.elc ${EMACS_LISPPREFIX}/w3m/mew-shimbun.el -${FOR_mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc +${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc ${EMACS_LISPPREFIX}/w3m/w3m-ccl.el ${EMACS_LISPPREFIX}/w3m/w3m-favicon.el ${EMACS_LISPPREFIX}/w3m/w3m-filter.el @@ -317,27 +317,27 @@ ${ETCDIR}/ChangeLog ${ETCDIR}/ChangeLog.1 ${ETCDIR}/README ${ETCDIR}/README.ja -${FOR_gui}${ETCDIR}/antenna-up.xpm -${FOR_gui}${ETCDIR}/back-disabled.xpm -${FOR_gui}${ETCDIR}/back-up.xpm -${FOR_gui}${ETCDIR}/copy-up.xpm -${FOR_gui}${ETCDIR}/db-history-up.xpm -${FOR_gui}${ETCDIR}/forward-disabled.xpm -${FOR_gui}${ETCDIR}/forward-up.xpm -${FOR_gui}${ETCDIR}/history-up.xpm -${FOR_gui}${ETCDIR}/home-up.xpm -${FOR_gui}${ETCDIR}/image-up.xpm -${FOR_gui}${ETCDIR}/open-up.xpm -${FOR_gui}${ETCDIR}/parent-disabled.xpm -${FOR_gui}${ETCDIR}/parent-up.xpm -${FOR_gui}${ETCDIR}/reload-up.xpm -${FOR_gui}${ETCDIR}/search-up.xpm -${FOR_gui}${ETCDIR}/spinner.gif -${FOR_gui}${ETCDIR}/state-00.xpm -${FOR_gui}${ETCDIR}/state-01.xpm -${FOR_gui}${ETCDIR}/state-10.xpm -${FOR_gui}${ETCDIR}/state-11.xpm -${FOR_gui}${ETCDIR}/weather-up.xpm +${PLIST.gui}${ETCDIR}/antenna-up.xpm +${PLIST.gui}${ETCDIR}/back-disabled.xpm +${PLIST.gui}${ETCDIR}/back-up.xpm +${PLIST.gui}${ETCDIR}/copy-up.xpm +${PLIST.gui}${ETCDIR}/db-history-up.xpm +${PLIST.gui}${ETCDIR}/forward-disabled.xpm +${PLIST.gui}${ETCDIR}/forward-up.xpm +${PLIST.gui}${ETCDIR}/history-up.xpm +${PLIST.gui}${ETCDIR}/home-up.xpm +${PLIST.gui}${ETCDIR}/image-up.xpm +${PLIST.gui}${ETCDIR}/open-up.xpm +${PLIST.gui}${ETCDIR}/parent-disabled.xpm +${PLIST.gui}${ETCDIR}/parent-up.xpm +${PLIST.gui}${ETCDIR}/reload-up.xpm +${PLIST.gui}${ETCDIR}/search-up.xpm +${PLIST.gui}${ETCDIR}/spinner.gif +${PLIST.gui}${ETCDIR}/state-00.xpm +${PLIST.gui}${ETCDIR}/state-01.xpm +${PLIST.gui}${ETCDIR}/state-10.xpm +${PLIST.gui}${ETCDIR}/state-11.xpm +${PLIST.gui}${ETCDIR}/weather-up.xpm info/emacs-w3m-ja.info info/emacs-w3m.info @dirrm ${EMACS_LISPPREFIX}/w3m diff --git a/www/emacs-w3m/options.mk b/www/emacs-w3m/options.mk index 9a611060270..b798cbe175d 100644 --- a/www/emacs-w3m/options.mk +++ b/www/emacs-w3m/options.mk @@ -1,13 +1,12 @@ -# $NetBSD: options.mk,v 1.1 2007/10/29 13:11:11 uebayasi Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.emacs-w3m PKG_SUPPORTED_OPTIONS= emacs-w3m-mew .include "../../mk/bsd.options.mk" +PLIST_VARS+= mew .if !empty(PKG_OPTIONS:Memacs-w3m-mew) .include "../../mail/mew/buildlink3.mk" -PLIST_SUBST+= FOR_mew= -.else -PLIST_SUBST+= FOR_mew="@comment " +PLIST.mew= yes .endif diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 480ea6a0d80..7024be4f878 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/01/02 15:39:57 reed Exp $ +# $NetBSD: Makefile,v 1.11 2008/04/12 22:43:13 jlam Exp $ # DISTNAME= ikiwiki_2.15 @@ -47,13 +47,13 @@ DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base .endif +PLIST_VARS+= w3m .if !empty(PKG_OPTIONS:Mw3m) DEPENDS+= w3m-[0-9]*:../../www/w3m -PLIST_SUBST+= W3M="" +PLIST.w3m= yes SUBST_SED.makefile+= -e 's,/lib/w3m/cgi-bin,/libexec/w3m/cgi-bin,' INSTALLATION_DIRS+= share/doc/ikiwiki/w3mmode .else -PLIST_SUBST+= W3M="@comment " SUBST_SED.makefile+= -e 's,^\(.*install .*/lib/w3m/cgi-bin\),\#\1,' .endif diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index b978073784e..465495a2bc9 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,18 +1,18 @@ -@comment $NetBSD: PLIST,v 1.3 2007/12/05 04:09:53 reed Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:13 jlam Exp $ bin/ikiwiki bin/ikiwiki-makerepo bin/ikiwiki-update-wikilist lib/ikiwiki/plugins/externaldemo lib/ikiwiki/plugins/rst -${W3M}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi +${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi man/man1/ikiwiki-makerepo.1 man/man1/ikiwiki-update-wikilist.1 man/man1/ikiwiki.1 man/man8/ikiwiki-mass-rebuild.8 sbin/ikiwiki-mass-rebuild share/doc/ikiwiki/ikiwiki.setup -${W3M}share/doc/ikiwiki/w3mmode.html -${W3M}share/doc/ikiwiki/w3mmode/ikiwiki.setup +${PLIST.w3m}share/doc/ikiwiki/w3mmode.html +${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup share/ikiwiki/basewiki/blog.mdwn share/ikiwiki/basewiki/favicon.ico share/ikiwiki/basewiki/helponformatting.mdwn @@ -96,8 +96,8 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo @dirrm share/ikiwiki/basewiki/subpage @dirrm share/ikiwiki/basewiki @dirrm share/ikiwiki -${W3M}@dirrm share/doc/ikiwiki/w3mmode +${PLIST.w3m}@dirrm share/doc/ikiwiki/w3mmode @dirrm share/doc/ikiwiki -${W3M}@dirrm libexec/w3m/cgi-bin +${PLIST.w3m}@dirrm libexec/w3m/cgi-bin @dirrm lib/ikiwiki/plugins @dirrm lib/ikiwiki diff --git a/www/libwww/Makefile b/www/libwww/Makefile index d374951a1bf..46e3a27284b 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2008/03/11 18:47:41 tnn Exp $ +# $NetBSD: Makefile,v 1.78 2008/04/12 22:43:13 jlam Exp $ DISTNAME= w3c-libwww-5.4.0 PKGNAME= libwww-5.4.0 @@ -47,16 +47,16 @@ pre-configure: CONFIGURE_ARGS+= --with-regex .endif +PLIST_VARS+= md5 .if ${OPSYS} == "SunOS" -# Solaris has a /usr/lib/libmd5 which seems to be enouth, and +# Solaris has a /usr/lib/libmd5 which seems to be enough, and # /usr/local/lib/libmd5 breaks /usr/lib/librt -CONFIGURE_ARGS+= --without-md5 -PLIST_SUBST+= MD5LIB="@comment " +CONFIGURE_ARGS+= --without-md5 .else +PLIST.md5= yes . if !exists(/usr/include/md5.h) CONFIGURE_ARGS+= --with-md5=${SSLBASE:Q} . endif -PLIST_SUBST+= MD5LIB="" .endif .include "../../devel/zlib/buildlink3.mk" diff --git a/www/libwww/PLIST b/www/libwww/PLIST index 429f4e4ddcd..b843948d8e6 100644 --- a/www/libwww/PLIST +++ b/www/libwww/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2005/05/31 20:52:00 salo Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:13 jlam Exp $ bin/libwww-config bin/w3c bin/webbot @@ -163,7 +163,7 @@ include/w3c-libwww/WWWZip.h include/w3c-libwww/wwwsys.h include/w3c-libwww/xmlparse.h include/wwwconf.h -${MD5LIB}lib/libmd5.la +${PLIST.md5}lib/libmd5.la lib/libpics.la lib/libwwwapp.la lib/libwwwcache.la diff --git a/www/py-django/PLIST b/www/py-django/PLIST index 94c2ea5626e..6d10018b7dc 100644 --- a/www/py-django/PLIST +++ b/www/py-django/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2007/08/11 17:20:16 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:13 jlam Exp $ bin/django-admin.py ${PYSITELIB}/django/__init__.py ${PYSITELIB}/django/__init__.pyc @@ -691,21 +691,21 @@ ${PYSITELIB}/django/db/backends/dummy/creation.pyo ${PYSITELIB}/django/db/backends/dummy/introspection.py ${PYSITELIB}/django/db/backends/dummy/introspection.pyc ${PYSITELIB}/django/db/backends/dummy/introspection.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/__init__.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/__init__.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/__init__.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/base.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/base.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/base.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/client.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/client.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/client.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/creation.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/creation.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/creation.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/introspection.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/introspection.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/introspection.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/__init__.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/__init__.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/__init__.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/base.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/base.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/base.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/client.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/client.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/client.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/creation.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/creation.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/creation.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.pyo ${PYSITELIB}/django/db/backends/mysql_old/__init__.py ${PYSITELIB}/django/db/backends/mysql_old/__init__.pyc ${PYSITELIB}/django/db/backends/mysql_old/__init__.pyo @@ -721,51 +721,51 @@ ${PYSITELIB}/django/db/backends/mysql_old/creation.pyo ${PYSITELIB}/django/db/backends/mysql_old/introspection.py ${PYSITELIB}/django/db/backends/mysql_old/introspection.pyc ${PYSITELIB}/django/db/backends/mysql_old/introspection.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/__init__.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/base.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/base.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/base.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/client.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/client.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/client.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/creation.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/creation.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/creation.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/introspection.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/__init__.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/base.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/base.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/base.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/client.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/client.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/client.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/creation.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/creation.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/creation.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/introspection.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/__init__.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/base.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/base.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/base.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/client.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/client.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/client.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/creation.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/creation.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/creation.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/introspection.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/creation.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/creation.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/creation.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/introspection.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyo ${PYSITELIB}/django/db/backends/util.py ${PYSITELIB}/django/db/backends/util.pyc ${PYSITELIB}/django/db/backends/util.pyo @@ -1095,11 +1095,11 @@ ${PYSITELIB}/django/views/static.pyo @dirrm ${PYSITELIB}/django/dispatch @dirrm ${PYSITELIB}/django/db/models/fields @dirrm ${PYSITELIB}/django/db/models -${COND_SQLITE}@dirrm ${PYSITELIB}/django/db/backends/sqlite3 -${COND_PSYCOPG2}@dirrm ${PYSITELIB}/django/db/backends/postgresql_psycopg2 -${COND_PSYCOPG1}@dirrm ${PYSITELIB}/django/db/backends/postgresql +${PLIST.sqlite}@dirrm ${PYSITELIB}/django/db/backends/sqlite3 +${PLIST.psycopg2}@dirrm ${PYSITELIB}/django/db/backends/postgresql_psycopg2 +${PLIST.psycopg1}@dirrm ${PYSITELIB}/django/db/backends/postgresql @dirrm ${PYSITELIB}/django/db/backends/mysql_old -${COND_MYSQL}@dirrm ${PYSITELIB}/django/db/backends/mysql +${PLIST.mysql}@dirrm ${PYSITELIB}/django/db/backends/mysql @dirrm ${PYSITELIB}/django/db/backends/dummy @dirrm ${PYSITELIB}/django/db/backends @dirrm ${PYSITELIB}/django/db diff --git a/www/py-django/options.mk b/www/py-django/options.mk index 6e3b50462b2..c400dcd333e 100644 --- a/www/py-django/options.mk +++ b/www/py-django/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2007/02/22 19:27:24 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR = PKG_OPTIONS.django PKG_SUPPORTED_OPTIONS= mysql psycopg1 psycopg2 sqlite @@ -6,11 +6,11 @@ PKG_SUGGESTED_OPTIONS= psycopg1 .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Mmysql) DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb -PLIST_SUBST+= COND_MYSQL= -.else -PLIST_SUBST+= COND_MYSQL="@comment " +PLIST.mysql= yes .endif .if !empty(PKG_OPTIONS:Mpsycopg1) @@ -19,20 +19,14 @@ DEPENDS+= ${PYPKGPREFIX}-psycopg-[0-9]*:../../databases/py-psycopg .if !empty(PKG_OPTIONS:Mpsycopg2) DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2 -PLIST_SUBST+= COND_PSYCOPG2= -.else -PLIST_SUBST+= COND_PSYCOPG2="@comment " +PLIST.psycopg2= yes .endif .if !empty(PKG_OPTIONS:Mpsycopg1) || !empty(PKG_OPTIONS:Mpsycopg2) -PLIST_SUBST+= COND_PSYCOPG1= -.else -PLIST_SUBST+= COND_PSYCOPG1="@comment " +PLIST.psycopg1= yes .endif .if !empty(PKG_OPTIONS:Msqlite) DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2 -PLIST_SUBST+= COND_SQLITE= -.else -PLIST_SUBST+= COND_SQLITE="@comment " +PLIST.sqlite= yes .endif diff --git a/www/w3m/PLIST b/www/w3m/PLIST index 1b718975769..320c08c80e3 100644 --- a/www/w3m/PLIST +++ b/www/w3m/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2007/01/29 23:05:09 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:14 jlam Exp $ bin/w3m bin/w3mman man/man1/w3m.1 @@ -56,7 +56,7 @@ share/w3m/w3mhelp-w3m_en.html share/w3m/w3mhelp-w3m_ja.html share/w3m/w3mhelp.html libexec/w3m/inflate -${USE_IMAGE}libexec/w3m/w3mimgdisplay +${PLIST.image}libexec/w3m/w3mimgdisplay libexec/w3m/cgi-bin/dirlist.cgi libexec/w3m/cgi-bin/multipart.cgi libexec/w3m/cgi-bin/w3mbookmark diff --git a/www/w3m/options.mk b/www/w3m/options.mk index 11a40139788..0559573c5fe 100644 --- a/www/w3m/options.mk +++ b/www/w3m/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2007/10/15 15:44:52 obache Exp $ +# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.w3m PKG_SUPPORTED_OPTIONS= inet6 w3m-lynx-key w3m-m17n w3m-unicode @@ -53,6 +53,7 @@ CONFIGURE_ARGS+= --enable-keymap=lynx CONFIGURE_ARGS+= --enable-keymap=w3m .endif +PLIST_VARS+= image .if ${_W3M_USE_IMAGE} == "YES" . for _imagelib in ${PKG_OPTIONS_GROUP.imagelib} . if !empty(PKG_OPTIONS:M${_imagelib}) @@ -61,9 +62,8 @@ _W3M_IMAGELIB= ${_imagelib:C|^w3m-image-||} . endfor USE_X11= YES CONFIGURE_ARGS+= --enable-image=x11 --with-imagelib=${_W3M_IMAGELIB:Q} -PLIST_SUBST+= USE_IMAGE='' +PLIST.image= yes . include "../../graphics/${_W3M_IMAGELIB}/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-image -PLIST_SUBST+= USE_IMAGE='@comment ' .endif |