From owner-svn-ports-head@FreeBSD.ORG Wed May 7 17:08:57 2014 Return-Path: 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 E161087C; Wed, 7 May 2014 17:08: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B4B75205; Wed, 7 May 2014 17:08:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47H8vQU079960; Wed, 7 May 2014 17:08:57 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47H8uQU079958; Wed, 7 May 2014 17:08:56 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201405071708.s47H8uQU079958@svn.freebsd.org> From: Alex Kozlov Date: Wed, 7 May 2014 17:08:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353178 - in head/www/www6to4: . 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.18 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: Wed, 07 May 2014 17:08:58 -0000 Author: ak Date: Wed May 7 17:08:56 2014 New Revision: 353178 URL: http://svnweb.freebsd.org/changeset/ports/353178 QAT: https://qat.redports.org/buildarchive/r353178/ Log: - Support STAGEDIR [1] - Add license [1] - Use @sample to handle config files PR: ports/188936 (based on) [1] Submitted by: Takefu [1] Approved by: Janos Mohacsi (maintainer) Deleted: head/www/www6to4/files/patch-Makefile Modified: head/www/www6to4/Makefile head/www/www6to4/pkg-plist Modified: head/www/www6to4/Makefile ============================================================================== --- head/www/www6to4/Makefile Wed May 7 17:02:36 2014 (r353177) +++ head/www/www6to4/Makefile Wed May 7 17:08:56 2014 (r353178) @@ -10,27 +10,28 @@ MASTER_SITES= ftp://ftp.pasta.cs.uit.no/ MAINTAINER= jmohacsi@bsd.hu COMMENT= Lightweight http proxy to help IPv4 only browsers +LICENSE= GPLv2 + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./-/} USE_RC_SUBR= www6to4 -NO_STAGE= yes +PORTDOCS= README + +ALL_TARGET= www6to4 + post-patch: - @${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,' \ - ${WRKSRC}/www6to4.c + @${REINPLACE_CMD} -e 's,/etc,${ETCDIR},' \ + ${WRKSRC}/www6to4.c ${WRKSRC}/www6to4.conf + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/www6to4 ${PREFIX}/sbin - @if [ ! -d ${PREFIX}/etc/www6to4 ]; then \ - ${MKDIR} ${PREFIX}/etc/www6to4; fi + ${INSTALL_PROGRAM} ${WRKSRC}/www6to4 ${STAGEDIR}${PREFIX}/sbin + @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/www6to4.conf \ - ${PREFIX}/etc/www6to4/www6to4.conf.sample + ${STAGEDIR}${ETCDIR}/www6to4.conf.sample ${INSTALL_DATA} ${WRKSRC}/www6to4_forward.conf \ - ${PREFIX}/etc/www6to4/www6to4_forward.conf.sample -.if !defined(NOPORTDOCS) - if [ ! -d ${DOCSDIR} ]; then \ - ${MKDIR} ${DOCSDIR}; fi - ${INSTALL_DATA} ${WRKSRC}/README \ - ${DOCSDIR} -.endif + ${STAGEDIR}${ETCDIR}/www6to4_forward.conf.sample + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/www/www6to4/pkg-plist ============================================================================== --- head/www/www6to4/pkg-plist Wed May 7 17:02:36 2014 (r353177) +++ head/www/www6to4/pkg-plist Wed May 7 17:08:56 2014 (r353178) @@ -1,6 +1,4 @@ sbin/www6to4 -etc/www6to4/www6to4.conf.sample -etc/www6to4/www6to4_forward.conf.sample -%%PORTDOCS%%%%DOCSDIR%%/README -@dirrm etc/www6to4 -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@sample %%ETCDIR%%/www6to4.conf.sample +@sample %%ETCDIR%%/www6to4_forward.conf.sample +@dirrmtry %%ETCDIR%%