From owner-svn-ports-head@FreeBSD.ORG Sat May 24 16:03:59 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9C3F5EE6; Sat, 24 May 2014 16:03:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 893492732; Sat, 24 May 2014 16:03:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OG3xx6069474; Sat, 24 May 2014 16:03:59 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OG3wWX069471; Sat, 24 May 2014 16:03:58 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201405241603.s4OG3wWX069471@svn.freebsd.org> From: Jimmy Olgeni Date: Sat, 24 May 2014 16:03:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355047 - in head/sysutils/webmin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 16:03:59 -0000 Author: olgeni Date: Sat May 24 16:03:58 2014 New Revision: 355047 URL: http://svnweb.freebsd.org/changeset/ports/355047 QAT: https://qat.redports.org/buildarchive/r355047/ Log: A couple of fixes: - Remove some generic Linux configuration files containing the '*' character: they are interpreted as shell globs in the plist and cause poudriere's staging tests to fail. - Do not let the setup script change file owners and permissions. Modified: head/sysutils/webmin/Makefile head/sysutils/webmin/files/patch-aa head/sysutils/webmin/pkg-plist Modified: head/sysutils/webmin/Makefile ============================================================================== --- head/sysutils/webmin/Makefile Sat May 24 15:51:45 2014 (r355046) +++ head/sysutils/webmin/Makefile Sat May 24 16:03:58 2014 (r355047) @@ -3,6 +3,7 @@ PORTNAME= webmin PORTVERSION= 1.690 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \ @@ -56,6 +57,10 @@ post-patch: @${FIND} ${WRKSRC} -name "*.bak" -delete @${FIND} ${WRKSRC} -name "*.pyc" -delete +.for module in ldap-server ldap-client ldap-useradmin logrotate status time webalizer + @${RM} ${WRKSRC}/${module}/config-\*-linux +.endfor + @${PRINTF} "g/^FreeBSD/m0\nwq\n" | ex ${WRKSRC}/os_list.txt do-build: Modified: head/sysutils/webmin/files/patch-aa ============================================================================== --- head/sysutils/webmin/files/patch-aa Sat May 24 15:51:45 2014 (r355046) +++ head/sysutils/webmin/files/patch-aa Sat May 24 16:03:58 2014 (r355047) @@ -3,7 +3,7 @@ $FreeBSD$ --- setup.sh.orig +++ setup.sh -@@ -15,16 +15,8 @@ +@@ -17,16 +17,8 @@ srcdir=$wadir ver=`cat "$wadir/version"` @@ -22,7 +22,7 @@ $FreeBSD$ echo "***********************************************************************" echo "* Welcome to the Webmin setup script, version $ver *" -@@ -95,19 +87,7 @@ +@@ -97,19 +89,7 @@ echo "Unless you want to run multiple versions of Webmin at the same time" echo "you can just accept the defaults." echo "" @@ -43,7 +43,7 @@ $FreeBSD$ if [ ! -d $config_dir ]; then mkdir $config_dir; if [ $? != 0 ]; then -@@ -207,12 +187,12 @@ +@@ -209,12 +189,12 @@ fi # Ask for log directory @@ -58,7 +58,7 @@ $FreeBSD$ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -240,7 +220,9 @@ +@@ -242,7 +222,9 @@ echo "Webmin is written entirely in Perl. Please enter the full path to the" echo "Perl 5 interpreter on your system." echo "" @@ -69,7 +69,7 @@ $FreeBSD$ perldef=/usr/bin/perl elif [ -x /usr/local/bin/perl ]; then perldef=/usr/local/bin/perl -@@ -439,22 +421,6 @@ +@@ -441,22 +423,6 @@ fi fi @@ -92,7 +92,7 @@ $FreeBSD$ # Copy files to target directory echo "***********************************************************************" if [ "$wadir" != "$srcdir" ]; then -@@ -576,6 +542,7 @@ +@@ -578,6 +544,7 @@ fi fi @@ -100,7 +100,7 @@ $FreeBSD$ if [ "$noperlpath" = "" ]; then echo "Inserting path to perl into scripts.." (find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl - -@@ -586,7 +553,6 @@ +@@ -588,7 +555,6 @@ echo "Creating start and stop scripts.." rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload echo "#!/bin/sh" >>$config_dir/start @@ -108,7 +108,7 @@ $FreeBSD$ echo "trap '' 1" >>$config_dir/start echo "LANG=" >>$config_dir/start echo "export LANG" >>$config_dir/start -@@ -734,6 +700,7 @@ +@@ -724,6 +690,7 @@ echo passdelay=1 >> $config_dir/miniserv.conf fi @@ -116,7 +116,15 @@ $FreeBSD$ if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <