diff options
43 files changed, 136 insertions, 51 deletions
diff --git a/sysutils/wbm-apache/Makefile b/sysutils/wbm-apache/Makefile index 8c022c2988d..c8d00946d30 100644 --- a/sysutils/wbm-apache/Makefile +++ b/sysutils/wbm-apache/Makefile @@ -1,19 +1,20 @@ -# $NetBSD: Makefile,v 1.8 2009/05/16 17:10:40 kefren Exp $ +# $NetBSD: Makefile,v 1.9 2010/07/11 17:41:01 joerg Exp $ WBM_NAME= apache COMMENT= Webmin module for configuring Apache servers +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" -CONF_FILES_PERMS+= ${WBM_EGDIR}/${WBM_NAME}/site \ - ${PKG_SYSCONFDIR}/${WBM_NAME}/site \ - ${ROOT_USER} ${ROOT_GROUP} 0644 +CONF_FILES+= ${WBM_EGDIR}/${WBM_NAME}/site \ + ${PKG_SYSCONFDIR}/${WBM_NAME}/site post-build: ${TOUCH} ${TOUCH_ARGS} ${WRKDIR}/site post-install: - ${INSTALL_DATA} ${WRKDIR}/site ${WBM_EGDIR}/${WBM_NAME}/site + ${INSTALL_DATA} ${WRKDIR}/site ${DESTDIR}${WBM_EGDIR}/${WBM_NAME}/site .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-at/Makefile b/sysutils/wbm-at/Makefile index 8ab35e2f47b..4f423ab492f 100644 --- a/sysutils/wbm-at/Makefile +++ b/sysutils/wbm-at/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:22:58 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:01 joerg Exp $ WBM_NAME= at COMMENT= Webmin module to schedule execution of commands +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-bandwidth/Makefile b/sysutils/wbm-bandwidth/Makefile index 4f5b706fc2a..1a298ca7a90 100644 --- a/sysutils/wbm-bandwidth/Makefile +++ b/sysutils/wbm-bandwidth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/04/21 05:22:58 obache Exp $ +# $NetBSD: Makefile,v 1.3 2010/07/11 17:41:01 joerg Exp $ WBM_NAME= bandwidth @@ -6,5 +6,7 @@ WBM_DEPEND_MODULES= net COMMENT= Webmin module to view bandwidth usage +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-bind8/Makefile b/sysutils/wbm-bind8/Makefile index f3a27a1eedd..57937e738fe 100644 --- a/sysutils/wbm-bind8/Makefile +++ b/sysutils/wbm-bind8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/09/18 11:04:07 obache Exp $ +# $NetBSD: Makefile,v 1.7 2010/07/11 17:41:01 joerg Exp $ WBM_NAME= bind8 @@ -6,5 +6,7 @@ COMMENT= Webmin module for managing ISC BIND 8.x DNS servers PKGREVISION= 1 +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-change-user/Makefile b/sysutils/wbm-change-user/Makefile index 3770bbd1a6b..7bc336a8c5b 100644 --- a/sysutils/wbm-change-user/Makefile +++ b/sysutils/wbm-change-user/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:22:59 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:02 joerg Exp $ WBM_NAME= change-user COMMENT= Webmin module to personalize Webmin user sessions +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-cluster-copy/Makefile b/sysutils/wbm-cluster-copy/Makefile index b94d349b2a6..552e2057b49 100644 --- a/sysutils/wbm-cluster-copy/Makefile +++ b/sysutils/wbm-cluster-copy/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2007/04/21 05:22:59 obache Exp $ +# $NetBSD: Makefile,v 1.5 2010/07/11 17:41:02 joerg Exp $ WBM_NAME= cluster-copy COMMENT= Webmin module to schedule file transfers within a Webmin cluster +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-cluster-cron/Makefile b/sysutils/wbm-cluster-cron/Makefile index d344439d260..489ba8e268f 100644 --- a/sysutils/wbm-cluster-cron/Makefile +++ b/sysutils/wbm-cluster-cron/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2007/04/21 05:22:59 obache Exp $ +# $NetBSD: Makefile,v 1.5 2010/07/11 17:41:02 joerg Exp $ WBM_NAME= cluster-cron COMMENT= Webmin module to schedule cron jobs within a Webmin cluster +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-cluster-passwd/Makefile b/sysutils/wbm-cluster-passwd/Makefile index 502efe99a0e..f41ec8fe565 100644 --- a/sysutils/wbm-cluster-passwd/Makefile +++ b/sysutils/wbm-cluster-passwd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/04/21 05:22:59 obache Exp $ +# $NetBSD: Makefile,v 1.3 2010/07/11 17:41:02 joerg Exp $ WBM_NAME= cluster-passwd @@ -6,5 +6,7 @@ WBM_DEPEND_MODULES= cluster-useradmin COMMENT= Webmin module to change users' passwords within a Webmin cluster +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-cluster-shell/Makefile b/sysutils/wbm-cluster-shell/Makefile index a1f1f4269c6..d9b44f7c5a4 100644 --- a/sysutils/wbm-cluster-shell/Makefile +++ b/sysutils/wbm-cluster-shell/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:22:59 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:02 joerg Exp $ WBM_NAME= cluster-shell COMMENT= Webmin module to run commands across a Webmin cluster +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-cluster-useradmin/Makefile b/sysutils/wbm-cluster-useradmin/Makefile index c5cd135c691..211b43380c5 100644 --- a/sysutils/wbm-cluster-useradmin/Makefile +++ b/sysutils/wbm-cluster-useradmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/09/01 06:35:01 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:02 joerg Exp $ WBM_NAME= cluster-useradmin @@ -6,5 +6,7 @@ WBM_DEPEND_MODULES= useradmin COMMENT= Webmin module to manage users & groups within a Webmin cluster +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-cluster-webmin/Makefile b/sysutils/wbm-cluster-webmin/Makefile index b2ccb862868..68892f019d0 100644 --- a/sysutils/wbm-cluster-webmin/Makefile +++ b/sysutils/wbm-cluster-webmin/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:03 joerg Exp $ WBM_NAME= cluster-webmin COMMENT= Webmin module to manage Webmin settings across a Webmin cluster +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-custom/Makefile b/sysutils/wbm-custom/Makefile index 94cfbce08db..542d6aa7403 100644 --- a/sysutils/wbm-custom/Makefile +++ b/sysutils/wbm-custom/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:03 joerg Exp $ WBM_NAME= custom COMMENT= Webmin module for creating custom action buttons +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-cyrus-imapd/Makefile b/sysutils/wbm-cyrus-imapd/Makefile index 0836497ac8b..be1254f6d82 100644 --- a/sysutils/wbm-cyrus-imapd/Makefile +++ b/sysutils/wbm-cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2007/06/09 23:02:41 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2010/07/11 17:41:03 joerg Exp $ DISTNAME= cyrus-imapd-mod-1.6 WBM_NAME= cyrus-imapd @@ -13,6 +13,8 @@ DEPENDS+= p5-Tree-Simple-[0-9]*:../../devel/p5-Tree-Simple HOMEPAGE= http://www.tecchio.net/webmin/cyrus/ COMMENT= Webmin module for administering Cyrus IMAP +PKG_DESTDIR_SUPPORT= user-destdir + WBM_STD_MODULE= NO .include "../../sysutils/webmin/wbm.mk" diff --git a/sysutils/wbm-dhcpd/Makefile b/sysutils/wbm-dhcpd/Makefile index 3f42242d6d8..8d65f9909d5 100644 --- a/sysutils/wbm-dhcpd/Makefile +++ b/sysutils/wbm-dhcpd/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:03 joerg Exp $ WBM_NAME= dhcpd COMMENT= Webmin module for managing ISC DHCPd +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-dovecot/Makefile b/sysutils/wbm-dovecot/Makefile index 1e669f99ab2..4cba606af11 100644 --- a/sysutils/wbm-dovecot/Makefile +++ b/sysutils/wbm-dovecot/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:03 joerg Exp $ WBM_NAME= dovecot COMMENT= Webmin module for configuring the Dovecot IMAP/POP3 server +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-fetchmail/Makefile b/sysutils/wbm-fetchmail/Makefile index 97bd668a6fb..24e1e97611a 100644 --- a/sysutils/wbm-fetchmail/Makefile +++ b/sysutils/wbm-fetchmail/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:03 joerg Exp $ WBM_NAME= fetchmail COMMENT= Webmin module for configuring fetchmail +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-file/Makefile b/sysutils/wbm-file/Makefile index 8d9b19cc84e..8bb0b2081da 100644 --- a/sysutils/wbm-file/Makefile +++ b/sysutils/wbm-file/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:01 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:03 joerg Exp $ WBM_NAME= file COMMENT= Webmin module for managing file and directory permissions +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-htaccess-htpasswd/Makefile b/sysutils/wbm-htaccess-htpasswd/Makefile index 895bffd190c..6736f2dc576 100644 --- a/sysutils/wbm-htaccess-htpasswd/Makefile +++ b/sysutils/wbm-htaccess-htpasswd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/04/21 05:23:01 obache Exp $ +# $NetBSD: Makefile,v 1.3 2010/07/11 17:41:04 joerg Exp $ WBM_NAME= htaccess-htpasswd @@ -6,5 +6,7 @@ WBM_DEPEND_MODULES= apache useradmin COMMENT= Webmin module to protect Apache web-accessible directories +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-inetd/Makefile b/sysutils/wbm-inetd/Makefile index 5e260cb77d1..794254872bd 100644 --- a/sysutils/wbm-inetd/Makefile +++ b/sysutils/wbm-inetd/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:01 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:04 joerg Exp $ WBM_NAME= inetd COMMENT= Webmin module to configure inetd +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-ipfilter/Makefile b/sysutils/wbm-ipfilter/Makefile index 471366e33b8..553fd4d6d87 100644 --- a/sysutils/wbm-ipfilter/Makefile +++ b/sysutils/wbm-ipfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/04/21 05:23:01 obache Exp $ +# $NetBSD: Makefile,v 1.3 2010/07/11 17:41:04 joerg Exp $ WBM_NAME= ipfilter @@ -6,6 +6,8 @@ WBM_DEPEND_MODULES+= net COMMENT= Webmin module for IPFilter configuration +PKG_DESTDIR_SUPPORT= user-destdir + post-extract: cp ${FILESDIR}/ipfilter_config-netbsd ${WRKSRC}/${WBM_NAME}/config-netbsd diff --git a/sysutils/wbm-ldap-useradmin/Makefile b/sysutils/wbm-ldap-useradmin/Makefile index 45b6cb217c3..313235a754b 100644 --- a/sysutils/wbm-ldap-useradmin/Makefile +++ b/sysutils/wbm-ldap-useradmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/04/21 05:23:02 obache Exp $ +# $NetBSD: Makefile,v 1.3 2010/07/11 17:41:04 joerg Exp $ WBM_NAME= ldap-useradmin @@ -6,5 +6,7 @@ WBM_DEPEND_MODULES+= useradmin COMMENT= Webmin module to manage users and groups stored in LDAP +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-lpadmin/Makefile b/sysutils/wbm-lpadmin/Makefile index 0c45283a423..128670d766d 100644 --- a/sysutils/wbm-lpadmin/Makefile +++ b/sysutils/wbm-lpadmin/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:02 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:04 joerg Exp $ WBM_NAME= lpadmin COMMENT= Webmin module to manage local and remote printers +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-mailboxes/Makefile b/sysutils/wbm-mailboxes/Makefile index 3198572c913..70d4acdb2fb 100644 --- a/sysutils/wbm-mailboxes/Makefile +++ b/sysutils/wbm-mailboxes/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:02 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:04 joerg Exp $ WBM_NAME= mailboxes COMMENT= Webmin module to read email in users' mailboxes +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-mount/Makefile b/sysutils/wbm-mount/Makefile index 51a504405ce..49479a14a95 100644 --- a/sysutils/wbm-mount/Makefile +++ b/sysutils/wbm-mount/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:03 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:04 joerg Exp $ WBM_NAME= mount COMMENT= Webmin module to mount filesystems +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-mysql/Makefile b/sysutils/wbm-mysql/Makefile index dbc485dc3f3..129ef463841 100644 --- a/sysutils/wbm-mysql/Makefile +++ b/sysutils/wbm-mysql/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:03 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:05 joerg Exp $ WBM_NAME= mysql COMMENT= Webmin module for managing MySQL databases +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-net/Makefile b/sysutils/wbm-net/Makefile index 067e035fa24..2600aca9597 100644 --- a/sysutils/wbm-net/Makefile +++ b/sysutils/wbm-net/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:03 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:05 joerg Exp $ WBM_NAME= net COMMENT= Webmin module for network configuration +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-openslp/Makefile b/sysutils/wbm-openslp/Makefile index e8ef0a64cd6..65558765363 100644 --- a/sysutils/wbm-openslp/Makefile +++ b/sysutils/wbm-openslp/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:03 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:05 joerg Exp $ WBM_NAME= openslp COMMENT= Webmin module to configure an OpenSLP server +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-passwd/Makefile b/sysutils/wbm-passwd/Makefile index 54ac9fd5ad7..c0049aace53 100644 --- a/sysutils/wbm-passwd/Makefile +++ b/sysutils/wbm-passwd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/04/21 05:23:03 obache Exp $ +# $NetBSD: Makefile,v 1.3 2010/07/11 17:41:05 joerg Exp $ WBM_NAME= passwd @@ -6,5 +6,7 @@ WBM_DEPEND_MODULES+= useradmin COMMENT= Webmin module to change users' system passwords +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-postfix/Makefile b/sysutils/wbm-postfix/Makefile index bd383d7654e..57ab9abda1f 100644 --- a/sysutils/wbm-postfix/Makefile +++ b/sysutils/wbm-postfix/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2007/04/21 05:23:04 obache Exp $ +# $NetBSD: Makefile,v 1.5 2010/07/11 17:41:05 joerg Exp $ WBM_NAME= postfix COMMENT= Webmin module for Postfix mail server configuration +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-postgresql/Makefile b/sysutils/wbm-postgresql/Makefile index 3c57d9ee58d..b28c963caf3 100644 --- a/sysutils/wbm-postgresql/Makefile +++ b/sysutils/wbm-postgresql/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:04 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:05 joerg Exp $ WBM_NAME= postgresql COMMENT= Webmin module for managing PostgreSQL databases +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-qmailadmin/Makefile b/sysutils/wbm-qmailadmin/Makefile index 39da4139cbc..9fae373e25f 100644 --- a/sysutils/wbm-qmailadmin/Makefile +++ b/sysutils/wbm-qmailadmin/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:04 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:06 joerg Exp $ WBM_NAME= qmailadmin COMMENT= Webmin module to configure the qmail mail server +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-quota/Makefile b/sysutils/wbm-quota/Makefile index 6e815e84110..132bc2e9dd5 100644 --- a/sysutils/wbm-quota/Makefile +++ b/sysutils/wbm-quota/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:04 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:06 joerg Exp $ WBM_NAME= quota @@ -6,5 +6,7 @@ WBM_DEPEND_MODULES+= mount COMMENT= Webmin module to setup disk quotas +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-sendmail/Makefile b/sysutils/wbm-sendmail/Makefile index c44b9ce3564..9cdeb345186 100644 --- a/sysutils/wbm-sendmail/Makefile +++ b/sysutils/wbm-sendmail/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:06 joerg Exp $ WBM_NAME= sendmail COMMENT= Webmin module to manage Sendmail +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-shell/Makefile b/sysutils/wbm-shell/Makefile index 2332d338425..4521fd5030a 100644 --- a/sysutils/wbm-shell/Makefile +++ b/sysutils/wbm-shell/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:06 joerg Exp $ WBM_NAME= shell COMMENT= Webmin module for executing shell commands +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-sshd/Makefile b/sysutils/wbm-sshd/Makefile index bfe288a6506..d6fcc7de35d 100644 --- a/sysutils/wbm-sshd/Makefile +++ b/sysutils/wbm-sshd/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:06 joerg Exp $ WBM_NAME= sshd COMMENT= Webmin module to setup the Secure Shell server +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-status/Makefile b/sysutils/wbm-status/Makefile index 5423002ee07..bee57328a11 100644 --- a/sysutils/wbm-status/Makefile +++ b/sysutils/wbm-status/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:06 joerg Exp $ WBM_NAME= status @@ -6,5 +6,7 @@ WBM_DEPEND_MODULES+= mailboxes COMMENT= Webmin module to view the status of services +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-syslog/Makefile b/sysutils/wbm-syslog/Makefile index f9f09013f59..87db0cca259 100644 --- a/sysutils/wbm-syslog/Makefile +++ b/sysutils/wbm-syslog/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:06 joerg Exp $ WBM_NAME= syslog COMMENT= Webmin module to configure the syslog server view log files +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-telnet/Makefile b/sysutils/wbm-telnet/Makefile index 8b6039872ef..f9bc9e84efc 100644 --- a/sysutils/wbm-telnet/Makefile +++ b/sysutils/wbm-telnet/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:06 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:07 joerg Exp $ WBM_NAME= telnet COMMENT= Webmin module to login via telnet or SSH +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-time/Makefile b/sysutils/wbm-time/Makefile index 333d3786ff2..5256fcb59af 100644 --- a/sysutils/wbm-time/Makefile +++ b/sysutils/wbm-time/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2007/04/21 05:23:07 obache Exp $ +# $NetBSD: Makefile,v 1.5 2010/07/11 17:41:07 joerg Exp $ WBM_NAME= time COMMENT= Webmin module to set the system time +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-tunnel/Makefile b/sysutils/wbm-tunnel/Makefile index 2a6c1b522c9..38182fe9a44 100644 --- a/sysutils/wbm-tunnel/Makefile +++ b/sysutils/wbm-tunnel/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:08 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:07 joerg Exp $ WBM_NAME= tunnel COMMENT= Webmin module to tunnel to another HTTP server +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-useradmin/Makefile b/sysutils/wbm-useradmin/Makefile index 0ccb27a51e4..406dffa934d 100644 --- a/sysutils/wbm-useradmin/Makefile +++ b/sysutils/wbm-useradmin/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:08 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:07 joerg Exp $ WBM_NAME= useradmin COMMENT= Webmin module to manage users and groups +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wbm-virtual-server/Makefile b/sysutils/wbm-virtual-server/Makefile index d4672a048df..01871d6b08d 100644 --- a/sysutils/wbm-virtual-server/Makefile +++ b/sysutils/wbm-virtual-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/07/10 12:19:23 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/11 17:41:07 joerg Exp $ PKGNAME= wbm-${WBM_NAME}-${WBM_MOD_REV} PKGREVISION= 2 @@ -12,5 +12,7 @@ WBM_DEPEND_MODULES= net quota useradmin sendmail apache mysql COMMENT= Webmin module to allow users to control their own virtual servers +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../sysutils/webmin/wbm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk index eb3e81ec35b..bb5547a5456 100644 --- a/sysutils/webmin/wbm.mk +++ b/sysutils/webmin/wbm.mk @@ -1,4 +1,4 @@ -# $NetBSD: wbm.mk,v 1.8 2007/10/08 08:47:09 obache Exp $ +# $NetBSD: wbm.mk,v 1.9 2010/07/11 17:41:01 joerg Exp $ # # Makefile fragment for Webmin modules # @@ -57,10 +57,10 @@ WBM_EGDIR= ${PREFIX}/share/examples/webmin PKG_SYSCONFSUBDIR= webmin OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${WBM_NAME} \ - ${ROOT_USER} ${ROOT_GROUP} 0700 + ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 CONF_FILES_PERMS+= ${WBM_EGDIR}/${WBM_NAME}/config \ ${PKG_SYSCONFDIR}/${WBM_NAME}/config \ - ${ROOT_USER} ${ROOT_GROUP} 0600 + ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600 FILES_SUBST+= WBM_NAME=${WBM_NAME:Q} FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q} FILES_SUBST+= WEBMIN_VARDIR=${WEBMIN_VARDIR:Q} @@ -85,11 +85,13 @@ wbm-build: ${FIND} ${WBMSRC} -name '*.cgi' -print -o -name '*.pl' -print | \ ${PERL5} ${WEBMIN_DIR}/perlpath.pl ${PERL5} - +INSTALLATION_DIRS+= ${WBM_DIR} ${WBM_EGDIR} + wbm-install: - ${CP} -R ${WBMSRC} ${WBM_DIR}/. + ${CP} -R ${WBMSRC} ${DESTDIR}${WBM_DIR}/. ${PERL5} ${WEBMIN_DIR}/copyconfig.pl \ ${WEBMIN_OSTYPE_cmd:sh:Q} ${WEBMIN_OSVERSION_cmd:sh:Q} \ - ${WBM_DIR} ${WBM_EGDIR} ${WBM_NAME} + ${DESTDIR}${WBM_DIR} ${DESTDIR}${WBM_EGDIR} ${WBM_NAME} do-configure: wbm-configure do-build: wbm-build |