From owner-svn-ports-head@FreeBSD.ORG Tue Sep 23 18:56:47 2014 Return-Path: Delivered-To: svn-ports-head@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 85BAA6DA; Tue, 23 Sep 2014 18:56:47 +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 66D65985; Tue, 23 Sep 2014 18:56:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8NIulVZ052399; Tue, 23 Sep 2014 18:56:47 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8NIukNh052396; Tue, 23 Sep 2014 18:56:46 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201409231856.s8NIukNh052396@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 23 Sep 2014 18:56:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369112 - head/sysutils/pacman 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-1 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: Tue, 23 Sep 2014 18:56:47 -0000 Author: amdmi3 Date: Tue Sep 23 18:56:46 2014 New Revision: 369112 URL: http://svnweb.freebsd.org/changeset/ports/369112 QAT: https://qat.redports.org/buildarchive/r369112/ Log: - Drop @dirrm* from plist - Use newer plist practices Deleted: head/sysutils/pacman/pkg-install Modified: head/sysutils/pacman/Makefile head/sysutils/pacman/pkg-deinstall head/sysutils/pacman/pkg-plist Modified: head/sysutils/pacman/Makefile ============================================================================== --- head/sysutils/pacman/Makefile Tue Sep 23 18:49:43 2014 (r369111) +++ head/sysutils/pacman/Makefile Tue Sep 23 18:56:46 2014 (r369112) @@ -3,7 +3,7 @@ PORTNAME= pacman PORTVERSION= 4.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.archlinux.org/other/pacman/ \ http://mirror.amdmi3.ru/distfiles/ @@ -79,7 +79,6 @@ post-patch: .endif post-install: - @${RM} -rf ${STAGEDIR}/var # handled by pkg-install .for f in makepkg.conf pacman.conf ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${STAGEDIR}${PREFIX}/etc/${f}.dist .endfor Modified: head/sysutils/pacman/pkg-deinstall ============================================================================== --- head/sysutils/pacman/pkg-deinstall Tue Sep 23 18:49:43 2014 (r369111) +++ head/sysutils/pacman/pkg-deinstall Tue Sep 23 18:56:46 2014 (r369112) @@ -5,16 +5,13 @@ case $2 in POST-DEINSTALL) - rmdir /var/cache/pacman/pkg 2>/dev/null || true - rmdir /var/cache/pacman 2>/dev/null || true - rmdir /var/lib/pacman 2>/dev/null || true - rmdir /var/lib 2>/dev/null || true - if [ -e /var/lib/pacman -o -e /var/cache/pacman ]; then + if find /var/lib/pacman /var/cache/pacman -type f 2>/dev/null | grep -q ''; then echo "" echo "To completely remove the port, please remove the following" - echo "directories and the content manualy:" + echo "directories and the content manualy if its no longer needed:" echo "" - echo " /var/lib/pacman /var/cache/pacman" + echo " /var/cache/pacman" + echo " /var/lib/pacman" echo "" fi ;; Modified: head/sysutils/pacman/pkg-plist ============================================================================== --- head/sysutils/pacman/pkg-plist Tue Sep 23 18:49:43 2014 (r369111) +++ head/sysutils/pacman/pkg-plist Tue Sep 23 18:56:46 2014 (r369112) @@ -118,13 +118,11 @@ man/man8/vercmp.8.gz %%NLS%%share/locale/zh_TW/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/pacman.mo -%%NLS%%@dirrm share/locale/sr@latin/LC_MESSAGES -%%NLS%%@dirrm share/locale/sr@latin -%%NLS%%@dirrm share/locale/kk/LC_MESSAGES -%%NLS%%@dirrm share/locale/kk %%DATADIR%%/ChangeLog.proto %%DATADIR%%/PKGBUILD-split.proto %%DATADIR%%/PKGBUILD.proto %%DATADIR%%/proto.install -@dirrm %%DATADIR%% -@dirrmtry %%PACMAN_ROOT%% +@dir /var/cache/pacman/pkg +@dir /var/cache/pacman +@dir /var/lib/pacman +@dir /var/lib