Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Dec 2013 13:16:24 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r337504 - branches/2014Q1/www/cntlm
Message-ID:  <201312261316.rBQDGO2c091016@svn.freebsd.org>

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



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