From owner-svn-ports-all@FreeBSD.ORG Tue Jul 8 17:26:37 2014 Return-Path: Delivered-To: svn-ports-all@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 D5765C78; Tue, 8 Jul 2014 17:26:37 +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 A95822BAF; Tue, 8 Jul 2014 17:26:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68HQbc3089826; Tue, 8 Jul 2014 17:26:37 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68HQb8W089820; Tue, 8 Jul 2014 17:26:37 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407081726.s68HQb8W089820@svn.freebsd.org> From: John Marino Date: Tue, 8 Jul 2014 17:26:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361273 - head/games/atomix 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: Tue, 08 Jul 2014 17:26:37 -0000 Author: marino Date: Tue Jul 8 17:26:36 2014 New Revision: 361273 URL: http://svnweb.freebsd.org/changeset/ports/361273 QAT: https://qat.redports.org/buildarchive/r361273/ Log: games/atomix: Fix deinstallation issue involving scores file The scheme used to leave a non-zero length scores file alone during deinstallation no longer works under stage. The scheme used a post-install script to add the scores directory and initial file, but then tried to remove it using the pkg-plist. Apparently these need to be matched, which means either the post-install script is matched with a post-deinstall script, or the creation of the scores file be done in the pkg-list with @exec. As the logic is slightly complex, it was easier to solve with a pkg-deinstall script. There were two unnecessary @dirrmtry lines as well which have been removed. Bump portrevision for multiple reasons. Reported by: swills (jenkins) Added: head/games/atomix/pkg-deinstall (contents, props changed) Modified: head/games/atomix/Makefile head/games/atomix/pkg-plist Modified: head/games/atomix/Makefile ============================================================================== --- head/games/atomix/Makefile Tue Jul 8 17:11:02 2014 (r361272) +++ head/games/atomix/Makefile Tue Jul 8 17:26:36 2014 (r361273) @@ -4,7 +4,7 @@ PORTNAME= atomix PORTVERSION= 2.14.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Added: head/games/atomix/pkg-deinstall ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/atomix/pkg-deinstall Tue Jul 8 17:26:36 2014 (r361273) @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ "$2" = "POST-DEINSTALL" ]; then + GAMES=${PKG_PREFIX}/share/games + SCORES=${GAMES}/atomix.scores + if [ -f ${SCORES} ]; then + if [ ! -s ${SCORES} ]; then + rm -f ${SCORES} + rmdir ${GAMES} > /dev/null 2>&1 || : + fi + fi +fi Modified: head/games/atomix/pkg-plist ============================================================================== --- head/games/atomix/pkg-plist Tue Jul 8 17:11:02 2014 (r361272) +++ head/games/atomix/pkg-plist Tue Jul 8 17:26:36 2014 (r361273) @@ -66,7 +66,6 @@ share/atomix/themes/default/wall-vertica share/atomix/themes/default/wall-vertical-rightx.png share/atomix/themes/default/wall-vertical-top-end.png share/atomix/themes/default/wall-vertical.png -@unexec [ -s %D/share/games/atomix.scores ] || rm -f %D/share/games/atomix.scores share/gnome-2.0/ui/atomix-ui.xml share/pixmaps/atomix-icon.png share/locale/am/LC_MESSAGES/atomix.mo @@ -128,5 +127,3 @@ share/locale/zh_TW/LC_MESSAGES/atomix.mo @dirrm share/atomix/themes @dirrm share/atomix/level @dirrm share/atomix -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK