From owner-svn-ports-head@FreeBSD.ORG Thu Sep 26 18:00:19 2013 Return-Path: Delivered-To: svn-ports-head@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 CD13EE8C; Thu, 26 Sep 2013 18:00:19 +0000 (UTC) (envelope-from ak@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 BA52D2E27; Thu, 26 Sep 2013 18:00:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8QI0JL4077319; Thu, 26 Sep 2013 18:00:19 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8QI0JTt077316; Thu, 26 Sep 2013 18:00:19 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201309261800.r8QI0JTt077316@svn.freebsd.org> From: Alex Kozlov Date: Thu, 26 Sep 2013 18:00:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328399 - in head/ports-mgmt/pkg_replace: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 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: Thu, 26 Sep 2013 18:00:20 -0000 Author: ak Date: Thu Sep 26 18:00:18 2013 New Revision: 328399 URL: http://svnweb.freebsd.org/changeset/ports/328399 Log: - Support STAGEDIR [1] - Move pkgng patch outside of ports tree [1] - Fix pattern matching in pkg_glob function [2] - Minor Makefile cleanup PR: ports/182388 [1] PR: ports/182371 (based on) [2] Submitted by: Ken DEGUCHI (maintainer) [1], Iouri Ivliev [2] Deleted: head/ports-mgmt/pkg_replace/files/ Modified: head/ports-mgmt/pkg_replace/Makefile head/ports-mgmt/pkg_replace/distinfo (contents, props changed) head/ports-mgmt/pkg_replace/pkg-plist Modified: head/ports-mgmt/pkg_replace/Makefile ============================================================================== --- head/ports-mgmt/pkg_replace/Makefile Thu Sep 26 17:30:13 2013 (r328398) +++ head/ports-mgmt/pkg_replace/Makefile Thu Sep 26 18:00:18 2013 (r328399) @@ -3,45 +3,36 @@ PORTNAME= pkg_replace PORTVERSION= 0.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ports-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} -MASTER_SITE_SUBDIR=portutil/22116 +MASTER_SITE_SUBDIR= portutil/22116 + +PATCH_SITES= http://member.tokoha-u.ac.jp/~kdeguchi/download/ +PATCHFILES= ${PKGNAME}.patch MAINTAINER= kdeguchi@sz.tokoha-u.ac.jp COMMENT= Utility for upgrading installed packages -USE_BZIP2= YES +USE_BZIP2= yes MAKE_ARGS= PREFIX="${PREFIX}" \ PORTSDIR="${PORTSDIR}" PKG_DBDIR="${PKG_DBDIR}" -MAN1= pkg_replace.1 -MANCOMPRESSED= maybe - -OPTIONS_DEFINE= ZSH +OPTIONS_DEFINE= ZSH .if empty(WITH_PKGNG) OPTIONS_DEFINE+= PKGDB_FIX -PKGDB_FIX_DESC= Fixing tool of installed package dependencies +PKGDB_FIX_DESC= Fixing tool of installed package dependencies .else PLIST_SUB+= PKGDB_FIX="@comment " .endif OPTIONS_SUB= yes -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MPKGDB_FIX} -MAN1+= pkgdb_fix.1 -.endif - post-patch: -.if ${PORT_OPTIONS:MPKGDB_FIX} @${REINPLACE_CMD} -e 's/pkg_replace/pkg_replace pkgdb_fix/;' ${WRKSRC}/sbin/Makefile -.endif -.if !${PORT_OPTIONS:MZSH} - @${REINPLACE_CMD} -e 's/^ sbin \\$$/ sbin/;s/^ share$$//;' ${WRKSRC}/Makefile -.endif + +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions .include Modified: head/ports-mgmt/pkg_replace/distinfo ============================================================================== --- head/ports-mgmt/pkg_replace/distinfo Thu Sep 26 17:30:13 2013 (r328398) +++ head/ports-mgmt/pkg_replace/distinfo Thu Sep 26 18:00:18 2013 (r328399) @@ -1,2 +1,4 @@ SHA256 (pkg_replace-0.8.0.tar.bz2) = 3092f5fc0d18529eb5d38776941c0ee4d0073ecb524ab17671c81ca69c29e214 SIZE (pkg_replace-0.8.0.tar.bz2) = 17296 +SHA256 (pkg_replace-0.8.0_3.patch) = cfa2adb3643a8684281143e4c241b8597510251730657816d68926701615ae98 +SIZE (pkg_replace-0.8.0_3.patch) = 11125 Modified: head/ports-mgmt/pkg_replace/pkg-plist ============================================================================== --- head/ports-mgmt/pkg_replace/pkg-plist Thu Sep 26 17:30:13 2013 (r328398) +++ head/ports-mgmt/pkg_replace/pkg-plist Thu Sep 26 18:00:18 2013 (r328399) @@ -1,6 +1,8 @@ +etc/pkg_replace.conf.sample +man/man1/pkg_replace.1.gz sbin/pkg_replace +%%PKGDB_FIX%%man/man1/pkgdb_fix.1.gz %%PKGDB_FIX%%sbin/pkgdb_fix -etc/pkg_replace.conf.sample %%ZSH%%share/zsh/site-functions/_pkg_replace -%%ZSH%%@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true +%%ZSH%%@dirrmtry share/zsh/site-functions %%ZSH%%@dirrmtry share/zsh