Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Jun 2013 02:51:25 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/179222: net-p2p/cdonkey: Fix build with clang
Message-ID:  <20130603025125.30cd7ab9ae49a155a7221734@yahoo.com>
Resent-Message-ID: <201306021810.r52IA6Gv099548@freefall.freebsd.org>

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

>Number:         179222
>Category:       ports
>Synopsis:       net-p2p/cdonkey: Fix build with clang
>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:   Sun Jun 02 18:10:06 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add MAKE_JOBS_SAFE

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/net-p2p/cdonkey/Makefile net-p2p/cdonkey/Makefile
--- /usr/ports/net-p2p/cdonkey/Makefile	2012-11-08 07:10:02.000000000 +0900
+++ net-p2p/cdonkey/Makefile	2013-06-03 00:00:00.000000000 +0900
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	cDonkey
-# Date created:			Feb 9, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD: head/net-p2p/cdonkey/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
 
 PORTNAME=	cdonkey
 PORTVERSION=	0.9.0
@@ -14,21 +9,27 @@
 DISTNAME=	cDonkey-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An open and free core client for the eDonkey protocol
+COMMENT=	Open and free core client for the eDonkey protocol
+
+WRKSRC=		${WRKDIR}/cDonkey-${PORTVERSION}
 
-PLIST_FILES=	bin/cDonkey
-USE_BDB=	41
 USE_BZIP2=	yes
+USE_BDB=	41
+USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-berkeley-db="${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}"
-USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/cDonkey-${PORTVERSION}
+MAKE_JOBS_SAFE=	yes
 
-.include <bsd.port.pre.mk>
+PLIST_FILES=	bin/cDonkey
 
 post-patch:
-	${REINPLACE_CMD} -e "s|-ldb|-l${BDB_LIB_NAME}|g" ${WRKSRC}/configure
-	${REINPLACE_CMD} -e "s|/etc/|${LOCALBASE}/etc/|" \
-		${WRKSRC}/donkey.cpp ${WRKSRC}/donkey.h
+	@${REINPLACE_CMD} -e \
+		's|-ldb|-l${BDB_LIB_NAME}|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-fno-for-scope||' ${WRKSRC}/Makefile.in
+.for i in donkey.cpp donkey.h
+	@${REINPLACE_CMD} -e \
+		's|/etc/|${LOCALBASE}/etc/|' ${WRKSRC}/${i}
+.endfor
 
-.include <bsd.port.post.mk>
+.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?20130603025125.30cd7ab9ae49a155a7221734>