From owner-svn-ports-head@FreeBSD.ORG Tue Jul 22 21:05:32 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 733B1277; Tue, 22 Jul 2014 21:05:32 +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 45D15262E; Tue, 22 Jul 2014 21:05:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6ML5VJk002855; Tue, 22 Jul 2014 21:05:31 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6ML5VnQ002854; Tue, 22 Jul 2014 21:05:31 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201407222105.s6ML5VnQ002854@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Tue, 22 Jul 2014 21:05:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362580 - head/net/delegate 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: Tue, 22 Jul 2014 21:05:32 -0000 Author: danilo Date: Tue Jul 22 21:05:31 2014 New Revision: 362580 URL: http://svnweb.freebsd.org/changeset/ports/362580 QAT: https://qat.redports.org/buildarchive/r362580/ Log: - Fix the binary checksumming (use this approach until find a better solution) - Fix staging PR: ports/192039 Modified: head/net/delegate/Makefile Modified: head/net/delegate/Makefile ============================================================================== --- head/net/delegate/Makefile Tue Jul 22 20:55:01 2014 (r362579) +++ head/net/delegate/Makefile Tue Jul 22 21:05:31 2014 (r362580) @@ -3,7 +3,7 @@ PORTNAME= delegate PORTVERSION= 9.9.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net www MASTER_SITES= ftp://ftp.delegate.org/pub/DeleGate/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -20,15 +20,17 @@ PLIST_FILES= sbin/delegated etc/rc.d/del PORTDOCS= CHANGES COPYRIGHT DG9note.html HowToDG.html IPv6NOTE.txt \ Manual.htm jpconv.htm tutor-en.htm tutor-jp.htm -# Strip breaks binary checksumming -STRIP= - post-extract: @${LN} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/DG9note.html \ ${WRKSRC}/IPv6NOTE.txt ${WRKSRC}/doc post-patch: - @${REINPLACE_CMD} -E "/ADMIN/s,undef,${ADMIN}," ${WRKSRC}/src/Makefile +# Prevent "filesystem was touched prior to 'make install' phase" warning; +# allow unattended (non-interactive) builds + @${REINPLACE_CMD} -e 's,"$$(XDG)",& DGROOT=${WRKDIR},' \ + ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E '/ADMIN/s,undef,${ADMIN}, ; \ + s,-F(esign|ver),& DGROOT=${WRKDIR},' ${WRKSRC}/src/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/delegated ${STAGEDIR}${PREFIX}/sbin @@ -37,4 +39,12 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} +post-install: +# Re-sign the executable + @${MKDIR} ${WRKDIR}/tmp + @${CP} ${STAGEDIR}${PREFIX}/sbin/delegated ${WRKDIR}/tmp/dg + @${CHMOD} +w ${STAGEDIR}${PREFIX}/sbin/delegated + @${WRKDIR}/tmp/dg -Fesign -w ${STAGEDIR}${PREFIX}/sbin/delegated + @${CHMOD} -w ${STAGEDIR}${PREFIX}/sbin/delegated + .include