From owner-svn-ports-head@FreeBSD.ORG  Wed Nov 27 13:38:57 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 646FB3B6;
 Wed, 27 Nov 2013 13:38:57 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A4B720CE;
 Wed, 27 Nov 2013 13:38:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rARDcvbg080028;
 Wed, 27 Nov 2013 13:38:57 GMT (envelope-from danilo@svn.freebsd.org)
Received: (from danilo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rARDcuWC080026;
 Wed, 27 Nov 2013 13:38:56 GMT (envelope-from danilo@svn.freebsd.org)
Message-Id: <201311271338.rARDcuWC080026@svn.freebsd.org>
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Wed, 27 Nov 2013 13:38:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335013 - head/ports-mgmt/pkg_replace
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.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Nov 2013 13:38:57 -0000

Author: danilo
Date: Wed Nov 27 13:38:56 2013
New Revision: 335013
URL: http://svnweb.freebsd.org/changeset/ports/335013

Log:
  - Support pkg-1.2 [1]
  - Fix the unconditional installation of files
  
  PR:		ports/184319
  Submitted by:	Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp> (maintainer) [1]

Modified:
  head/ports-mgmt/pkg_replace/Makefile
  head/ports-mgmt/pkg_replace/distinfo

Modified: head/ports-mgmt/pkg_replace/Makefile
==============================================================================
--- head/ports-mgmt/pkg_replace/Makefile	Wed Nov 27 13:21:30 2013	(r335012)
+++ head/ports-mgmt/pkg_replace/Makefile	Wed Nov 27 13:38:56 2013	(r335013)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pkg_replace
 PORTVERSION=	0.8.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	portutil/22116
@@ -29,11 +29,23 @@ PLIST_SUB+=	PKGDB_FIX="@comment "
 
 OPTIONS_SUB=	yes
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/pkg_replace/pkg_replace pkgdb_fix/' ${WRKSRC}/sbin/Makefile
 	@${REINPLACE_CMD} -e 's/mkdir -p $${FILESDIR}/@true/' ${WRKSRC}/share/zsh/Makefile
 
-pre-install:
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/sbin/pkg_replace/pkg_replace ${STAGEDIR}${PREFIX}/sbin
+	${CP} ${WRKSRC}/etc/pkg_replace.conf ${STAGEDIR}${PREFIX}/etc/pkg_replace.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/sbin/pkg_replace/pkg_replace.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+.if ${PORT_OPTIONS:MZSH}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${WRKSRC}/share/zsh/_pkg_replace ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+.endif
+.if ${PORT_OPTIONS:MPKGDB_FIX}
+	${INSTALL_SCRIPT} ${WRKSRC}/sbin/pkgdb_fix/pkgdb_fix ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/sbin/pkgdb_fix/pkgdb_fix.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+.endif
 
 .include <bsd.port.mk>

Modified: head/ports-mgmt/pkg_replace/distinfo
==============================================================================
--- head/ports-mgmt/pkg_replace/distinfo	Wed Nov 27 13:21:30 2013	(r335012)
+++ head/ports-mgmt/pkg_replace/distinfo	Wed Nov 27 13:38:56 2013	(r335013)
@@ -1,4 +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_4.patch) = a802706afe92dae8a0cb9db4cf4b15879d57dc67d4376cd6aa2ada83bd7fd02c
-SIZE (pkg_replace-0.8.0_4.patch) = 11135
+SHA256 (pkg_replace-0.8.0_5.patch) = ce2a9f44c4592839423fe2098a247d4409b9d3e3d8da2a0b343219dca922be93
+SIZE (pkg_replace-0.8.0_5.patch) = 11168