From owner-svn-ports-all@FreeBSD.ORG  Sun Jul  6 09:28:30 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EE09FFB2;
 Sun,  6 Jul 2014 09:28:30 +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 DB5A920C4;
 Sun,  6 Jul 2014 09:28:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s669SUuL085169;
 Sun, 6 Jul 2014 09:28:30 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s669SUDu085168;
 Sun, 6 Jul 2014 09:28:30 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201407060928.s669SUDu085168@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Sun, 6 Jul 2014 09:28:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360866 - in head/security/sks: . 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-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jul 2014 09:28:31 -0000

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