From nobody@FreeBSD.org  Wed Nov 27 00:44:06 2013
Return-Path: <nobody@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 3369023B
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Nov 2013 00:44:06 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 2331A2AA4
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Nov 2013 00:44:06 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rAR0i52S013530
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Nov 2013 00:44:05 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rAR0i5e6013527;
	Wed, 27 Nov 2013 00:44:05 GMT
	(envelope-from nobody)
Message-Id: <201311270044.rAR0i5e6013527@oldred.freebsd.org>
Date: Wed, 27 Nov 2013 00:44:05 GMT
From: Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] ports-mgmt/pkg_replace support pkg-1.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         184319
>Category:       ports
>Synopsis:       [maintainer update] ports-mgmt/pkg_replace support pkg-1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danilo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 27 00:50:00 UTC 2013
>Closed-Date:    Wed Nov 27 13:39:17 UTC 2013
>Last-Modified:  Wed Nov 27 13:40:00 UTC 2013
>Originator:     Ken DEGUCHI
>Release:        9.2-STABLE
>Organization:
TOKOHA University
>Environment:
FreeBSD lagrange.tokoha-u.ac.jp 9.2-STABLE FreeBSD 9.2-STABLE #111 r258582M: Tue Nov 26 04:38:18 JST 2013     root@lagrange.tokoha-u.ac.jp:/usr/obj/usr/src/sys/LAGRANGE  amd64
>Description:
pkg_replace can not find installed package with pkg-1.2, because 'pkg info' is querying a file or is a single direct match query then default on '-f'.

'pkg_glob' function in pkg_replace is modified to use 'pkg query' instead of 'pkg info'.
>How-To-Repeat:
pkg_replace can not find installed package with pkg-1.2.
>Fix:
'pkg_glob' function in pkg_replace is modified to use 'pkg query' instead of 'pkg info'.

Patch attached with submission follows:

diff -ur pkg_replace/Makefile.orig pkg_replace/Makefile
--- pkg_replace/Makefile.orig	2013-10-08 07:21:29.731507953 +0900
+++ pkg_replace/Makefile	2013-11-27 09:19:20.927959294 +0900
@@ -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
diff -ur pkg_replace/distinfo.orig pkg_replace/distinfo
--- pkg_replace/distinfo.orig	2013-10-08 07:21:29.752506778 +0900
+++ pkg_replace/distinfo	2013-11-27 09:18:42.974959139 +0900
@@ -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


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->danilo 
Responsible-Changed-By: danilo 
Responsible-Changed-When: Wed Nov 27 01:54:57 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184319 

From: "Danilo E. Gondolfo" <danilo@freebsd.org>
To: bug-followup@FreeBSD.org, kdeguchi@sz.tokoha-u.ac.jp
Cc:  
Subject: Re: ports/184319: [maintainer update] ports-mgmt/pkg_replace support
 pkg-1.2
Date: Wed, 27 Nov 2013 00:37:08 -0200

 This is a multi-part message in MIME format.
 --------------070601010401090600050303
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 This port is installing files unconditionally.
 
 [barba pkg_replace$] make check-orphans
 ====> Items missing from pkg-plist (check-orphans)
 man/man1/pkgdb_fix.1.gz
 sbin/pkgdb_fix
 share/zsh/site-functions/_pkg_replace
 @dirrmtry share/zsh/site-functions
 @dirrmtry share/zsh
 
  I create an do-install target to handle these situations. What do you
 think?
 
 --------------070601010401090600050303
 Content-Type: text/x-diff;
  name="pkg_replace.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="pkg_replace.diff"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 334989)
 +++ Makefile	(working copy)
 @@ -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 @@
  
  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>
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 334989)
 +++ distinfo	(working copy)
 @@ -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
 
 --------------070601010401090600050303--

From: Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp>
To: "Danilo E. Gondolfo" <danilo@freebsd.org>
Cc: <bug-followup@FreeBSD.org>
Subject: Re: ports/184319: [maintainer update] ports-mgmt/pkg_replace
 support pkg-1.2
Date: Wed, 27 Nov 2013 12:38:37 +0900

 > This port is installing files unconditionally.
 > 
 > [barba pkg_replace$] make check-orphans
 > ====> Items missing from pkg-plist (check-orphans)
 > man/man1/pkgdb_fix.1.gz
 > sbin/pkgdb_fix
 > share/zsh/site-functions/_pkg_replace
 > @dirrmtry share/zsh/site-functions
 > @dirrmtry share/zsh
 > 
 >  I create an do-install target to handle these situations. What do you
 > think?
 
 It is good. I agree.
State-Changed-From-To: open->closed 
State-Changed-By: danilo 
State-Changed-When: Wed Nov 27 13:39:16 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184319 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184319: commit references a PR
Date: Wed, 27 Nov 2013 13:39:03 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
