Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Jul 2014 21:05:31 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r362580 - head/net/delegate
Message-ID:  <201407222105.s6ML5VnQ002854@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407222105.s6ML5VnQ002854>