From owner-svn-ports-head@FreeBSD.ORG  Wed Nov 27 13:58:11 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 8CBE29C3;
 Wed, 27 Nov 2013 13:58:11 +0000 (UTC)
Received: from ravenloft.kiev.ua (ravenloft.kiev.ua [94.244.131.95])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4604521B9;
 Wed, 27 Nov 2013 13:58:10 +0000 (UTC)
Date: Wed, 27 Nov 2013 15:58:08 +0200
From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Subject: Re: svn commit: r335013 - head/ports-mgmt/pkg_replace
Message-ID: <20131127135808.GA35467@ravenloft.kiev.ua>
References: <201311271338.rARDcuWC080026@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201311271338.rARDcuWC080026@svn.freebsd.org>
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
 ports-committers@freebsd.org
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:58:11 -0000

On Wed, Nov 27, 2013 at 01:38:56PM +0000, Danilo Egea Gondolfo wrote:
> 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
These conditions are not needed. The port is stagified.
This is similar to https://wiki.freebsd.org/ports/StageDir 'DOCS/EXAMPLES' case.
 

-- 
Alex