Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2013 02:51:37 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/184902: www/cntlm: Fix build on -current
Message-ID:  <20131217025137.905a9b69344cd49be7097510@yahoo.com>
Resent-Message-ID: <201312161810.rBGIATQM016663@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         184902
>Category:       ports
>Synopsis:       www/cntlm: Fix build on -current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:29 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/www/cntlm/Makefile www/cntlm/Makefile
--- /usr/ports/www/cntlm/Makefile	2013-11-06 21:57:54.000000000 +0900
+++ www/cntlm/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -12,19 +12,34 @@
 LICENSE=	GPLv2
 
 USE_RC_SUBR=	cntlm
+
 USES=		gmake
 HAS_CONFIGURE=	yes
+MAKEFILE=	Makefile.gcc
 ALL_TARGET=	cntlm
 
+post-extract:
+	@${LN} -sf cntlm.conf ${WRKSRC}/doc/cntlm.conf.sample
+
 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 \
+		'/exit 1/s|^|#|' ${WRKSRC}/configure
 
 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_MAN} cntlm.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} cntlm.conf.sample \
+		${STAGEDIR}${PREFIX}/etc)
 
 .include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:



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