Bug 179058 - www/larbin: Fix build with clang
Summary: www/larbin: Fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-05-28 19:40 UTC by tkato432
Modified: 2013-05-29 06:30 UTC (History)
0 users

See Also:


Attachments
file.diff (4.41 KB, patch)
2013-05-28 19:40 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-05-28 19:40:01 UTC
- Fix build with clang
- Support PORTDOCS/PLIST_FILES
- Add MAKE_JOBS_UNSAFE

Remove file:
pkg-plist
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-05-28 19:40:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-05-29 06:28:29 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-05-29 06:28:35 UTC
Author: miwi
Date: Wed May 29 05:28:26 2013
New Revision: 319345
URL: http://svnweb.freebsd.org/changeset/ports/319345

Log:
  - Fix build with clang
  - Support PORTDOCS/PLIST_FILES
  - Add MAKE_JOBS_UNSAFE
  - Trim header
  
  PR:		179058
  Submitted by:	Ports Fury

Deleted:
  head/www/larbin/pkg-plist
Modified:
  head/www/larbin/Makefile   (contents, props changed)

Modified: head/www/larbin/Makefile
==============================================================================
--- head/www/larbin/Makefile	Wed May 29 05:26:53 2013	(r319344)
+++ head/www/larbin/Makefile	Wed May 29 05:28:26 2013	(r319345)
@@ -1,61 +1,69 @@
-# New ports collection makefile for: 	larbin
-# Date Created:		26 March 2002
-# Whom:			Hiten Pandya <hiten@uk.FreeBSD.org>
-#
+# Created by: Hiten Pandya <hiten@uk.FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	larbin
 PORTVERSION=	2.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A powerful HTTP crawler with an easy interface
+COMMENT=	Powerful HTTP crawler with an easy interface
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		makedepend:${PORTSDIR}/devel/makedepend
 
+OPTIONS_DEFINE=	DOCS
+
+USES=		shebangfix
+SHEBANG_FILES=	configure
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	CXX=${CXX}
+MAKE_JOBS_UNSAFE=	yes
+
+PORTDOCS=	*
+PLIST_FILES=	bin/larbin etc/larbin.conf.sample
+
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
+pre-everything::
+	@${ECHO_MSG} "====================================================================="
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Make sure you have a look at the larbin documentation available at:"
+	@${ECHO_MSG} "  http://larbin.sourceforge.net/custom-eng.html."
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "====================================================================="
 
 post-patch:
-	@${SED} -e 's,CC=,CC?=,' -e 's,CFLAGS=-O3,CFLAGS+=,' < \
-		${WRKSRC}/adns/Makefile > ${WRKSRC}/adns/Makefile.new
-	@${MV} ${WRKSRC}/adns/Makefile.new ${WRKSRC}/adns/Makefile
-	${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}/bin/bash,' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's,CFLAGS:=-O3,CFLAGS+=,g ; s,CXXFLAGS:=-Wall -O3,CXXFLAGS+=,g' \
-		${WRKSRC}/src/larbin.make
+	@${REINPLACE_CMD} -e \
+		'/CC=/s|echo|${TRUE:T}| ; \
+		 /CXX=/s|echo|${TRUE:T}| ; \
+		 /-lpthread/d' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|CFLAGS:=-O3|CFLAGS+=| ; \
+		 s|CXXFLAGS:=|CXXFLAGS+=| ; \
+		 s|-O3|| ; \
+		 s|-I-||' ${WRKSRC}/src/larbin.make
+	@${REINPLACE_CMD} -e \
+		'/delete \[\] tab/s|^|//|' ${WRKSRC}/src/utils/histogram.cc
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/larbin ${PREFIX}/bin/
-	@${INSTALL_DATA} ${WRKSRC}/larbin.conf ${PREFIX}/etc/larbin.conf.sample
-	@${MKDIR} ${PREFIX}/share/larbin
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/larbin/
-
-pre-configure: config-message
-
-config-message:
-	@${ECHO} "====================================================================="
-	@${ECHO} ""
-	@${ECHO} "Make sure you have a look at the larbin documentation available at:"
-	@${ECHO} "  http://larbin.sourceforge.net/custom-eng.html."
-	@${ECHO} ""
-	@${ECHO} "====================================================================="
+	${INSTALL_PROGRAM} ${WRKSRC}/larbin ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/larbin.conf ${PREFIX}/etc/larbin.conf.sample
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
 
 post-install:
-	@${ECHO} "====================================================================="
-	@${ECHO} ""
-	@${ECHO} "You must invoke larbin with the name of the configuration file, e.g:"
-	@${ECHO} "larbin -c config-file"
-	@${ECHO} ""
-	@${ECHO} "Documentation: ${PREFIX}/share/larbin"
-	@${ECHO} "Sample Configuration file: ${PREFIX}/etc/larbin.conf.sample"
-	@${ECHO} ""
-	@${ECHO} "====================================================================="
+	@${ECHO_MSG} "====================================================================="
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You must invoke larbin with the name of the configuration file, e.g:"
+	@${ECHO_MSG} "larbin -c config-file"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Documentation: ${DOCSDIR}"
+	@${ECHO_MSG} "Sample Configuration file: ${PREFIX}/etc/larbin.conf.sample"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "====================================================================="
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"