pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils DESTDIR support for webmin packages.
details: https://anonhg.NetBSD.org/pkgsrc/rev/976766d0a9d4
branches: trunk
changeset: 577436:976766d0a9d4
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Jul 11 17:41:01 2010 +0000
description:
DESTDIR support for webmin packages.
diffstat:
sysutils/wbm-apache/Makefile | 11 ++++++-----
sysutils/wbm-at/Makefile | 4 +++-
sysutils/wbm-bandwidth/Makefile | 4 +++-
sysutils/wbm-bind8/Makefile | 4 +++-
sysutils/wbm-change-user/Makefile | 4 +++-
sysutils/wbm-cluster-copy/Makefile | 4 +++-
sysutils/wbm-cluster-cron/Makefile | 4 +++-
sysutils/wbm-cluster-passwd/Makefile | 4 +++-
sysutils/wbm-cluster-shell/Makefile | 4 +++-
sysutils/wbm-cluster-useradmin/Makefile | 4 +++-
sysutils/wbm-cluster-webmin/Makefile | 4 +++-
sysutils/wbm-custom/Makefile | 4 +++-
sysutils/wbm-cyrus-imapd/Makefile | 4 +++-
sysutils/wbm-dhcpd/Makefile | 4 +++-
sysutils/wbm-dovecot/Makefile | 4 +++-
sysutils/wbm-fetchmail/Makefile | 4 +++-
sysutils/wbm-file/Makefile | 4 +++-
sysutils/wbm-htaccess-htpasswd/Makefile | 4 +++-
sysutils/wbm-inetd/Makefile | 4 +++-
sysutils/wbm-ipfilter/Makefile | 4 +++-
sysutils/wbm-ldap-useradmin/Makefile | 4 +++-
sysutils/wbm-lpadmin/Makefile | 4 +++-
sysutils/wbm-mailboxes/Makefile | 4 +++-
sysutils/wbm-mount/Makefile | 4 +++-
sysutils/wbm-mysql/Makefile | 4 +++-
sysutils/wbm-net/Makefile | 4 +++-
sysutils/wbm-openslp/Makefile | 4 +++-
sysutils/wbm-passwd/Makefile | 4 +++-
sysutils/wbm-postfix/Makefile | 4 +++-
sysutils/wbm-postgresql/Makefile | 4 +++-
sysutils/wbm-qmailadmin/Makefile | 4 +++-
sysutils/wbm-quota/Makefile | 4 +++-
sysutils/wbm-sendmail/Makefile | 4 +++-
sysutils/wbm-shell/Makefile | 4 +++-
sysutils/wbm-sshd/Makefile | 4 +++-
sysutils/wbm-status/Makefile | 4 +++-
sysutils/wbm-syslog/Makefile | 4 +++-
sysutils/wbm-telnet/Makefile | 4 +++-
sysutils/wbm-time/Makefile | 4 +++-
sysutils/wbm-tunnel/Makefile | 4 +++-
sysutils/wbm-useradmin/Makefile | 4 +++-
sysutils/wbm-virtual-server/Makefile | 4 +++-
sysutils/webmin/wbm.mk | 12 +++++++-----
43 files changed, 136 insertions(+), 51 deletions(-)
diffs (truncated from 708 to 300 lines):
diff -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-apache/Makefile
--- a/sysutils/wbm-apache/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-apache/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-at/Makefile
--- a/sysutils/wbm-at/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-at/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-bandwidth/Makefile
--- a/sysutils/wbm-bandwidth/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-bandwidth/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 @@
COMMENT= Webmin module to view bandwidth usage
+PKG_DESTDIR_SUPPORT= user-destdir
+
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-bind8/Makefile
--- a/sysutils/wbm-bind8/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-bind8/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 @@
PKGREVISION= 1
+PKG_DESTDIR_SUPPORT= user-destdir
+
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-change-user/Makefile
--- a/sysutils/wbm-change-user/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-change-user/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-cluster-copy/Makefile
--- a/sysutils/wbm-cluster-copy/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-cluster-copy/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-cluster-cron/Makefile
--- a/sysutils/wbm-cluster-cron/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-cluster-cron/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-cluster-passwd/Makefile
--- a/sysutils/wbm-cluster-passwd/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-cluster-passwd/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 @@
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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-cluster-shell/Makefile
--- a/sysutils/wbm-cluster-shell/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-cluster-shell/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-cluster-useradmin/Makefile
--- a/sysutils/wbm-cluster-useradmin/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-cluster-useradmin/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 @@
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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-cluster-webmin/Makefile
--- a/sysutils/wbm-cluster-webmin/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-cluster-webmin/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-custom/Makefile
--- a/sysutils/wbm-custom/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-custom/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-cyrus-imapd/Makefile
--- a/sysutils/wbm-cyrus-imapd/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-cyrus-imapd/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 @@
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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-dhcpd/Makefile
--- a/sysutils/wbm-dhcpd/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-dhcpd/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-dovecot/Makefile
--- a/sysutils/wbm-dovecot/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-dovecot/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-fetchmail/Makefile
--- a/sysutils/wbm-fetchmail/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-fetchmail/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-file/Makefile
--- a/sysutils/wbm-file/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-file/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-htaccess-htpasswd/Makefile
--- a/sysutils/wbm-htaccess-htpasswd/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-htaccess-htpasswd/Makefile Sun Jul 11 17:41:01 2010 +0000
@@ -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 @@
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 -r 1faad79a0020 -r 976766d0a9d4 sysutils/wbm-inetd/Makefile
--- a/sysutils/wbm-inetd/Makefile Sun Jul 11 14:54:12 2010 +0000
+++ b/sysutils/wbm-inetd/Makefile Sun Jul 11 17:41:01 2010 +0000
Home |
Main Index |
Thread Index |
Old Index