Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Jul 2014 09:28:30 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360866 - in head/security/sks: . files
Message-ID:  <201407060928.s669SUDu085168@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: johans
Date: Sun Jul  6 09:28:30 2014
New Revision: 360866
URL: http://svnweb.freebsd.org/changeset/ports/360866
QAT: https://qat.redports.org/buildarchive/r360866/

Log:
  Fix build on FreeBSD 9 (and earlier)
  While here, merge another patch from files to makefile to avoid
  patching the same file from multiple locations
  
  PR:		 ports/191643
  Submitted by:	 Dan Lukes

Deleted:
  head/security/sks/files/patch-Makefile
Modified:
  head/security/sks/Makefile

Modified: head/security/sks/Makefile
==============================================================================
--- head/security/sks/Makefile	Sun Jul  6 09:09:14 2014	(r360865)
+++ head/security/sks/Makefile	Sun Jul  6 09:28:30 2014	(r360866)
@@ -31,8 +31,10 @@ post-extract:
 	@cd ${WRKSRC} && ${RM} -f .depend
 
 post-patch:
-	@${REINPLACE_CMD} '/^CC=/d; /^CFLAGS=/s/=/+=/' \
-		${WRKSRC}/Makefile ${WRKSRC}/bdb/Makefile
+	@${REINPLACE_CMD} -Ee '/^CC=/d; /^CFLAGS=/s/=/+=/' \
+		-e '/^install/,$$s/\$$\((PREFIX|MANDIR)\)/$$(DESTDIR)&/' \
+		-e '/patch/s/-p 0/-p0/' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/s/=/+=/' ${WRKSRC}/bdb/Makefile
 
 pre-build:
 	@cd ${WRKSRC} && test -f .depend || ${MAKE_CMD} dep



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