From owner-freebsd-ports Fri Feb 2 14:28:57 2001 Delivered-To: freebsd-ports@freebsd.org Received: from mail.ctonet.it (mail.ctonet.it [212.110.160.100]) by hub.freebsd.org (Postfix) with ESMTP id 523EA37B401 for ; Fri, 2 Feb 2001 14:28:37 -0800 (PST) Received: from olgeni.localdomain.net (ppp-251.dial2.ctonet.it [212.110.177.251]) by mail.ctonet.it (Postfix) with ESMTP id 5E91CCF3B0 for ; Fri, 2 Feb 2001 23:28:26 +0100 (CET) Received: from olgeni.localdomain.net (olgeni.localdomain.net [192.168.1.1]) by olgeni.localdomain.net (8.11.2/8.11.1) with ESMTP id f12MSkG49724 for ; Fri, 2 Feb 2001 23:28:47 +0100 (CET) (envelope-from olgeni@FreeBSD.org) Date: Fri, 2 Feb 2001 23:28:46 +0100 (CET) From: Jimmy Olgeni X-X-Sender: To: Subject: RFC: module update support in webmin port Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org I was wondering if anybody was interested in having support for updated webmin modules in the port makefile. Updated webmin modules are simple gzipped tarballs that can be extracted over the stock webmin source before calling "make install". They can be tracked in the makefile with a simple patch. As a bonus, "make deinstall/install" will automatically upgrade all modules after cvsup. As a side effect, the port build will break when the checksum of a previously installed module changes... at least you know that something has changed (the webmin site has only a list of updated ports, not change dates). Also, PORTREVISION can be used to track module updates. I plan to track only official updates, not 3rd part modules. If nobody comes up with any reason not to do it I could commit the patch. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/webmin/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- Makefile 2001/02/02 22:21:53 1.28 +++ Makefile 2001/02/02 22:23:33 @@ -7,8 +7,12 @@ PORTNAME= webmin PORTVERSION= 0.84 +PORTREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= http://www.webmin.com/webmin/download/ +MASTER_SITES= http://www.webmin.com/webmin/updates/ \ + http://www.webmin.com/webmin/download/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${WEBMIN_MODULES} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= olgeni@FreeBSD.org @@ -17,6 +21,14 @@ NO_BUILD= yes IS_INTERACTIVE= yes USE_PERL5= yes + +WEBMIN_MODULES= apache.wbm.gz mysql.wbm.gz status.wbm.gz + +post-extract: + @for webmin_module in ${WEBMIN_MODULES}; do \ + ${TAR} xfz ${DISTDIR}/$${webmin_module} -C ${WRKSRC}; \ + done + @find ${WRKSRC} -name "*.bak" | xargs ${RM} post-patch: ${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/sysutils/webmin/distinfo,v retrieving revision 1.14 diff -u -r1.14 distinfo --- distinfo 2001/01/31 23:07:37 1.14 +++ distinfo 2001/02/02 22:23:33 @@ -1 +1,4 @@ MD5 (webmin-0.84.tar.gz) = 93ed89a7d98e7586cacf44e4e053e6cd +MD5 (apache.wbm.gz) = a63f2b27b6531131acc8056aaefd00eb +MD5 (mysql.wbm.gz) = 94322dc8a89d32346b51d2524b7525dc +MD5 (status.wbm.gz) = 8f58432e5fc0e992505a411888f837a2 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/sysutils/webmin/pkg-plist,v retrieving revision 1.13 diff -u -r1.13 pkg-plist --- pkg-plist 2001/01/31 23:19:42 1.13 +++ pkg-plist 2001/02/02 22:23:41 @@ -102,6 +102,7 @@ lib/webmin/apache/create_files.cgi lib/webmin/apache/create_htaccess.cgi lib/webmin/apache/create_virt.cgi +lib/webmin/apache/darkstar.site lib/webmin/apache/defaultacl lib/webmin/apache/delete_htaccess.cgi lib/webmin/apache/dir_index.cgi @@ -117,6 +118,7 @@ lib/webmin/apache/edit_vserv.cgi lib/webmin/apache/files_index.cgi lib/webmin/apache/find_htaccess.cgi +lib/webmin/apache/florissa.site lib/webmin/apache/htaccess.cgi lib/webmin/apache/htaccess_index.cgi lib/webmin/apache/images/def.gif @@ -219,6 +221,11 @@ lib/webmin/apache/show_virt.cgi lib/webmin/apache/start.cgi lib/webmin/apache/stop.cgi +lib/webmin/apache/test/conf/access.conf +lib/webmin/apache/test/conf/httpd.conf +lib/webmin/apache/test/conf/httpd.conf.old +lib/webmin/apache/test/conf/mime.types +lib/webmin/apache/test/conf/srm.conf lib/webmin/apache/useradmin_update.pl lib/webmin/apache/virt_index.cgi lib/webmin/bind8/acl_security.pl @@ -5069,8 +5076,10 @@ @dirrm lib/webmin/inittab/help @dirrm lib/webmin/inittab/lang @dirrm lib/webmin/inittab/images +@dirrm lib/webmin/apache/test/conf @dirrm lib/webmin/apache/images @dirrm lib/webmin/apache/lang +@dirrm lib/webmin/apache/test @dirrm lib/webmin/bind8/images @dirrm lib/webmin/bind8/lang @dirrm lib/webmin/bsdexports/images To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message