From owner-svn-ports-all@FreeBSD.ORG  Sat Apr 12 03:39:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 ECE67BFE;
 Sat, 12 Apr 2014 03:39:48 +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 D99B811EC;
 Sat, 12 Apr 2014 03:39:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3C3dm6b009917;
 Sat, 12 Apr 2014 03:39:48 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3C3dm2s009915;
 Sat, 12 Apr 2014 03:39:48 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201404120339.s3C3dm2s009915@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 12 Apr 2014 03:39:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351065 - head/ports-mgmt/portupgrade
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Apr 2014 03:39:49 -0000

Author: bdrewery
Date: Sat Apr 12 03:39:48 2014
New Revision: 351065
URL: http://svnweb.freebsd.org/changeset/ports/351065
QAT: https://qat.redports.org/buildarchive/r351065/

Log:
  - Update LICENSE to BSD3CLAUSE
  - Convert to USES=tar
  - Convert to @sample
    Don't bump PORTREVISION as this is a nop.

Modified:
  head/ports-mgmt/portupgrade/Makefile
  head/ports-mgmt/portupgrade/pkg-plist

Modified: head/ports-mgmt/portupgrade/Makefile
==============================================================================
--- head/ports-mgmt/portupgrade/Makefile	Sat Apr 12 03:39:02 2014	(r351064)
+++ head/ports-mgmt/portupgrade/Makefile	Sat Apr 12 03:39:48 2014	(r351065)
@@ -13,14 +13,14 @@ DISTNAME=	pkgtools-${PORTVERSION}
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	FreeBSD ports/packages administration and management tool suite
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=	DOCS
 
 CONFLICTS_INSTALL=	portupgrade-devel-*
 
 DIST_SUBDIR=	${PORTNAME}
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_RUBY=	yes
 
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg

Modified: head/ports-mgmt/portupgrade/pkg-plist
==============================================================================
--- head/ports-mgmt/portupgrade/pkg-plist	Sat Apr 12 03:39:02 2014	(r351064)
+++ head/ports-mgmt/portupgrade/pkg-plist	Sat Apr 12 03:39:48 2014	(r351065)
@@ -53,9 +53,7 @@ sbin/portversion
 %%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null
 %%SCRIPT%%libexec/pkgtools/script
 %%SCRIPT%%@dirrm libexec/pkgtools
-@unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
-etc/pkgtools.conf.sample
-@exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
+@sample etc/pkgtools.conf.sample
 etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkgtools
 @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true