From owner-svn-ports-branches@FreeBSD.ORG  Thu Dec 26 13:16:25 2013
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@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 1658E876;
 Thu, 26 Dec 2013 13:16:24 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BAA041F80;
 Thu, 26 Dec 2013 13:16:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDGOV0091017;
 Thu, 26 Dec 2013 13:16:24 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDGO2c091016;
 Thu, 26 Dec 2013 13:16:24 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201312261316.rBQDGO2c091016@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 26 Dec 2013 13:16:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r337504 - branches/2014Q1/www/cntlm
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Dec 2013 13:16:25 -0000

Author: mat
Date: Thu Dec 26 13:16:24 2013
New Revision: 337504
URL: http://svnweb.freebsd.org/changeset/ports/337504

Log:
  MFH: r337439
  
  Fix build on -current
  
  PR:		ports/184902
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/www/cntlm/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/www/cntlm/Makefile
==============================================================================
--- branches/2014Q1/www/cntlm/Makefile	Thu Dec 26 13:16:15 2013	(r337503)
+++ branches/2014Q1/www/cntlm/Makefile	Thu Dec 26 13:16:24 2013	(r337504)
@@ -17,14 +17,29 @@ HAS_CONFIGURE=	yes
 ALL_TARGET=	cntlm
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|DESTDIR=|DESTDIR=${PREFIX}|' \
-		-e 's|CC=|CC?=|' \
-		-e 's|-Wno-unused-but-set-variable -pedantic -O3||' \
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|$$(DESTDIR)/etc|$$(PREFIX)/etc| ; \
+		 s|^CC=|CC?=| ; \
+		 s| -Wno-unused-but-set-variable | | ; \
+		 s| -pedantic | | ; \
+		 s| -O3 | | ; \
+		 s|@$$(CC)|$$(CC)| ; \
+		 s|@if|if| ; \
+		 s|-lpthread|-pthread|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|^CCS=|#CCS=| ; \
+		 s|mv |: | ; \
+		 s|ln |: |' ${WRKSRC}/configure
+
+post-build:
+	@${LN} -sf cntlm.conf ${WRKSRC}/doc/cntlm.conf.sample
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cntlm ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/doc/cntlm.conf ${STAGEDIR}${PREFIX}/etc/cntlm.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/doc/cntlm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} cntlm \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} cntlm.conf.sample \
+		${STAGEDIR}${PREFIX}/etc)
+	(cd ${WRKSRC}/doc && ${INSTALL_MAN} cntlm.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
 
 .include <bsd.port.mk>