From owner-svn-ports-all@FreeBSD.ORG Fri May 16 15:56:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE9D454E; Fri, 16 May 2014 15:56:25 +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 9F91F2DCE; Fri, 16 May 2014 15:56:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GFuPWA020058; Fri, 16 May 2014 15:56:25 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GFuPnF020054; Fri, 16 May 2014 15:56:25 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201405161556.s4GFuPnF020054@svn.freebsd.org> From: Matthias Andree Date: Fri, 16 May 2014 15:56:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354242 - in head/mail/mailman: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 May 2014 15:56:25 -0000 Author: mandree Date: Fri May 16 15:56:24 2014 New Revision: 354242 URL: http://svnweb.freebsd.org/changeset/ports/354242 QAT: https://qat.redports.org/buildarchive/r354242/ Log: Avoid leftovers on pkg_add-based systems by running a depth-first remove of empty directories under the Mailman directory. Submitted by: jenkins/swills@ Modified: head/mail/mailman/Makefile head/mail/mailman/files/pkg-deinstall.in head/mail/mailman/files/pkg-install.in Modified: head/mail/mailman/Makefile ============================================================================== --- head/mail/mailman/Makefile Fri May 16 15:54:18 2014 (r354241) +++ head/mail/mailman/Makefile Fri May 16 15:56:24 2014 (r354242) @@ -3,6 +3,7 @@ PORTNAME= mailman DISTVERSION= 2.1.18-1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GNU} \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ Modified: head/mail/mailman/files/pkg-deinstall.in ============================================================================== --- head/mail/mailman/files/pkg-deinstall.in Fri May 16 15:54:18 2014 (r354241) +++ head/mail/mailman/files/pkg-deinstall.in Fri May 16 15:56:24 2014 (r354242) @@ -5,14 +5,13 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in - DEINSTALL) - echo "---> Starting deinstall script:" + echo "---> Starting deinstall script" if /usr/bin/crontab -u "%%USER%%" -l | \ - /usr/bin/diff - "%%MAILMANDIR%%/cron/crontab.in" >/dev/null 2>&1 ; then + /usr/bin/diff -B -b - "%%MAILMANDIR%%/cron/crontab.in" >/dev/null 2>&1 ; then echo "---> Zeroing crontab for \"%%USER%%\"" - /usr/bin/crontab -u "%%USER%%" /dev/null + /usr/bin/crontab -u "%%USER%%" -r /var/cron/allow.new$$ mv /var/cron/allow.new$$ /var/cron/allow @@ -38,11 +37,13 @@ DEINSTALL) ;; POST-DEINSTALL) - echo "---> Starting post-deinstall script:" + echo "---> Starting post-deinstall script" - rmdir "%%MAILMANDIR%%" >/dev/null 2>&1 + # try to kill all empty directories - necessary on pkg_add-based systems + find "%%MAILMANDIR%%" -depth -type d -exec rmdir '{}' + >/dev/null 2>&1 || : if [ -d "%%MAILMANDIR%%" ]; then echo '---> %%MAILMANDIR%% is not empty - this installation may have active lists!' + ls -lRB "%%MAILMANDIR%%" | head -n200 || : echo "---> Restoring \"last_mailman_version\" file" /bin/mkdir -p "%%MAILMANDIR%%/data" /bin/mv -f /var/tmp/last_mailman_version "%%MAILMANDIR%%/data/" Modified: head/mail/mailman/files/pkg-install.in ============================================================================== --- head/mail/mailman/files/pkg-install.in Fri May 16 15:54:18 2014 (r354241) +++ head/mail/mailman/files/pkg-install.in Fri May 16 15:56:24 2014 (r354242) @@ -7,14 +7,14 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in POST-INSTALL) - echo "---> Starting post-install script:" + echo "---> Starting post-install script" MYTMP="$(mktemp -d "${TMPDIR-/tmp}/mminstall.XXXXXXXXXX")" || exit 1 trap "rm -rf \"$MYTMP\"" EXIT /bin/chmod g+s "%%MAILMANDIR%%" || exit 1 - echo "---> Running update:" + echo "---> Running update" LC_ALL=C "%%MAILMANDIR%%/bin/update" || exit 1