From owner-svn-ports-all@FreeBSD.ORG Mon Sep 23 11:24:02 2013 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 ESMTP id CA283BC1; Mon, 23 Sep 2013 11:24:01 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6FA682410; Mon, 23 Sep 2013 11:24:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NBO1NU044601; Mon, 23 Sep 2013 11:24:01 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8NBO1AH044599; Mon, 23 Sep 2013 11:24:01 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201309231124.r8NBO1AH044599@svn.freebsd.org> From: Bryan Drewery Date: Mon, 23 Sep 2013 11:24:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327977 - 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.14 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: Mon, 23 Sep 2013 11:24:02 -0000 Author: bdrewery Date: Mon Sep 23 11:24:00 2013 New Revision: 327977 URL: http://svnweb.freebsd.org/changeset/ports/327977 Log: - Support STAGEDIR Modified: head/ports-mgmt/portupgrade/Makefile head/ports-mgmt/portupgrade/pkg-plist Modified: head/ports-mgmt/portupgrade/Makefile ============================================================================== --- head/ports-mgmt/portupgrade/Makefile Mon Sep 23 11:23:55 2013 (r327976) +++ head/ports-mgmt/portupgrade/Makefile Mon Sep 23 11:24:00 2013 (r327977) @@ -19,32 +19,14 @@ OPTIONS_DEFINE= DOCS CONFLICTS_INSTALL= portupgrade-devel-* -NO_STAGE= yes DIST_SUBDIR= ${PORTNAME} USE_BZIP2= yes USE_RUBY= yes USE_LDCONFIG= ${PREFIX}/lib/compat/pkg -MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}" - -MAN1= pkg_deinstall.1 \ - pkg_fetch.1 \ - pkg_glob.1 \ - pkg_sort.1 \ - pkgdb.1 \ - pkgdu.1 \ - portcvsweb.1 \ - portsclean.1 \ - portsdb.1 \ - portupgrade.1 \ - portversion.1 -MAN5= pkgtools.conf.5 -MLINKS= pkgdb.1 pkg_which.1 \ - portupgrade.1 portinstall.1 \ - portcvsweb.1 portsvnweb.1 \ - portsdb.1 ports_glob.1 -MANCOMPRESSED= maybe +MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" \ + RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}" EXAMPLESDIR= ${PREFIX}/share/examples/pkgtools DOCSDIR= ${PREFIX}/share/doc/pkgtools @@ -71,10 +53,6 @@ PLIST_SUB+= SCRIPT="@comment " .endif post-install: - if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ - ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ - fi - ${MKDIR} ${PREFIX}/lib/compat/pkg - ${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg .include Modified: head/ports-mgmt/portupgrade/pkg-plist ============================================================================== --- head/ports-mgmt/portupgrade/pkg-plist Mon Sep 23 11:23:55 2013 (r327976) +++ head/ports-mgmt/portupgrade/pkg-plist Mon Sep 23 11:24:00 2013 (r327977) @@ -1,6 +1,22 @@ @exec /bin/mkdir -p %D/lib/compat/pkg @dirrmtry lib/compat/pkg @dirrmtry lib/compat +man/man1/pkg_deinstall.1.gz +man/man1/pkg_fetch.1.gz +man/man1/pkg_glob.1.gz +man/man1/pkg_sort.1.gz +man/man1/pkg_which.1.gz +man/man1/pkgdb.1.gz +man/man1/pkgdu.1.gz +man/man1/portcvsweb.1.gz +man/man1/portinstall.1.gz +man/man1/ports_glob.1.gz +man/man1/portsclean.1.gz +man/man1/portsdb.1.gz +man/man1/portsvnweb.1.gz +man/man1/portupgrade.1.gz +man/man1/portversion.1.gz +man/man5/pkgtools.conf.5.gz sbin/pkg_deinstall sbin/pkg_fetch sbin/pkg_glob