cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- unbreak with clang (mostly from freebsd)

Browse Source 
- use SUBST_CMD while here
This commit is contained in:
jasper 2017-05-07 07:31:14 +00:00
parent 0faf00548d
commit 95014a1c2e
4 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/larbin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2017/04/10 11:46:35 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2017/05/07 07:31:14 jasper Exp $
COMMENT= little and fast Web crawler
@ -26,7 +26,14 @@ NO_TEST= Yes
USE_X11 = Yes
pre-configure:
perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},' ${WRKSRC}/src/global.cc
${SUBST_CMD} ${WRKSRC}/src/global.cc
# Now fixup some C++ constructs not supported by clang
find ${WRKSRC}/src -name '*.cc' -or -name '*.h' | xargs \
sed -i -e 's|<iostream.h>|<iostream>| ; \
s|<string.h>|<cstring>| ; \
s|\([[:blank:]]\)cerr|\1std::cerr|g ; \
s|\([[:blank:]]\)cout|\1std::cout|g ; \
s|\([[:blank:]]\)endl|\1std::endl|g'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/larbin ${PREFIX}/bin

9
www/larbin/patches/patch-src_global_cc
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-src_global_cc,v 1.1.1.1 2007/05/07 11:17:07 jasper Exp $
--- src/global.cc.orig Mon May 7 12:43:37 2007
+++ src/global.cc Mon May 7 12:43:38 2007
$OpenBSD: patch-src_global_cc,v 1.2 2017/05/07 07:31:14 jasper Exp $
Index: src/global.cc
--- src/global.cc.orig
+++ src/global.cc
@@ -84,7 +84,7 @@ int global::IPUrl = 0;
* Everything is read from the config file (larbin.conf by default)
*/
global::global (int argc, char *argv[]) {
- char *configFile = "larbin.conf";
+ char *configFile = "!!SYSCONFDIR!!/larbin/larbin.conf";
+ char *configFile = "${SYSCONFDIR}/larbin/larbin.conf";
#ifdef RELOAD
bool reload = true;
#else

8
www/larbin/patches/patch-src_larbin_make
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_larbin_make,v 1.2 2007/05/12 06:47:56 steven Exp $
--- src/larbin.make.orig Tue Jul 8 22:25:24 2003
+++ src/larbin.make Fri May 4 20:35:06 2007
$OpenBSD: patch-src_larbin_make,v 1.3 2017/05/07 07:31:14 jasper Exp $
--- src/larbin.make.orig
+++ src/larbin.make
@@ -1,4 +1,4 @@
-ADNSDIR=$(BASEDIR)/../adns
+ADNSDIR=${LOCALBASE}/include
@ -14,7 +14,7 @@ $OpenBSD: patch-src_larbin_make,v 1.2 2007/05/12 06:47:56 steven Exp $
-CFLAGS:=-O3 -Wall -D_REENTRANT
-CXXFLAGS:= -Wno-deprecated -Wall -O3 -D_REENTRANT -I- -I$(BASEDIR) -I$(ADNSDIR)
+CFLAGS+= -Wall -D_REENTRANT
+CXXFLAGS+= -Wno-deprecated -Wall -D_REENTRANT -I- -I$(BASEDIR) -I$(ADNSDIR)
+CXXFLAGS+= -Wno-deprecated -Wall -D_REENTRANT -iquote -I- -I$(BASEDIR) -I$(ADNSDIR)
RM:=rm -f
first: all

14
www/larbin/patches/patch-src_utils_histogram_cc Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_utils_histogram_cc,v 1.1 2017/05/07 07:31:14 jasper Exp $
Index: src/utils/histogram.cc
--- src/utils/histogram.cc.orig
+++ src/utils/histogram.cc
@@ -106,8 +106,6 @@ Histogram::Histogram (time_t period) {
/* Destructor */
Histogram::~Histogram () {
- delete [] tab1;
- delete [] tab2;
}
/* A page is retrieved, add to stats */