ports/163731: Update port: www/dtse Fix build with clang
Douglas William Thrift
douglas at douglasthrift.net
Sat Dec 31 05:40:13 UTC 2011
>Number: 163731
>Category: ports
>Synopsis: Update port: www/dtse Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 31 05:40:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Douglas William Thrift
>Release: FreeBSD 8.0-RELEASE-p6 amd64
>Organization:
>Environment:
System: FreeBSD slowhand.douglasthrift.net 8.0-RELEASE-p6 FreeBSD 8.0-RELEASE-p6 #2: Wed Sep 28 21:40:42 PDT 2011 user at jail8.johncompanies.com:/usr/obj/usr/src/sys/jail8 amd64
>Description:
Patched www/dtse to fix building with clang.
>How-To-Repeat:
>Fix:
--- dtse.patch begins here ---
diff -Nrux .svn -x work /usr/ports/www/dtse/Makefile dtse/Makefile
--- /usr/ports/www/dtse/Makefile 2011-01-15 07:33:45.000000000 -0800
+++ dtse/Makefile 2011-12-30 21:07:44.000000000 -0800
@@ -17,6 +17,8 @@
LICENSE= ASL
+BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_check_gnu_make.m4:${PORTSDIR}/devel/autoconf-archive
+
.if defined(WITH_OPENSSL)
USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
@@ -25,6 +27,7 @@
USE_PERL5= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_AUTOTOOLS= aclocal:env automake:env autoconf:env
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}/${PORTNAME}
@@ -33,4 +36,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+pre-configure:
+ cd ${WRKSRC}; ${SH} autogen.sh
+
.include <bsd.port.mk>
diff -Nrux .svn -x work /usr/ports/www/dtse/files/patch-HttpHandler.cpp dtse/files/patch-HttpHandler.cpp
--- /usr/ports/www/dtse/files/patch-HttpHandler.cpp 1969-12-31 16:00:00.000000000 -0800
+++ dtse/files/patch-HttpHandler.cpp 2011-12-30 20:46:27.000000000 -0800
@@ -0,0 +1,11 @@
+--- ./HttpHandler.cpp.orig 2008-08-23 04:00:12.000000000 -0700
++++ ./HttpHandler.cpp 2011-12-30 17:37:16.000000000 -0800
+@@ -427,7 +427,7 @@
+
+ void HttpHandler::putline(const string& line)
+ {
+- sprintf(buffer, "%s\r\n", line.c_str());
++ snprintf(buffer, BUFSIZ + 1, "%s\r\n", line.c_str());
+
+ #ifndef _OpenSSL_
+ if (send(http, buffer, strlen(buffer), 0) == SOCKET_ERROR)
diff -Nrux .svn -x work /usr/ports/www/dtse/files/patch-Indexer.cpp dtse/files/patch-Indexer.cpp
--- /usr/ports/www/dtse/files/patch-Indexer.cpp 1969-12-31 16:00:00.000000000 -0800
+++ dtse/files/patch-Indexer.cpp 2011-12-30 20:46:27.000000000 -0800
@@ -0,0 +1,20 @@
+--- ./Indexer.cpp.orig 2008-08-23 04:00:12.000000000 -0700
++++ ./Indexer.cpp 2011-12-30 17:37:16.000000000 -0800
+@@ -286,6 +286,8 @@
+ case all:
+ restrictionsAll.insert(restriction.getURL());
+ break;
++ default:
++ break;
+ }
+ }
+ }
+@@ -332,6 +334,8 @@
+ restrictions.insert(*itor);
+ }
+ break;
++ default:
++ break;
+ }
+
+ cout << "done.\n";
diff -Nrux .svn -x work /usr/ports/www/dtse/files/patch-Outputter.cpp dtse/files/patch-Outputter.cpp
--- /usr/ports/www/dtse/files/patch-Outputter.cpp 1969-12-31 16:00:00.000000000 -0800
+++ dtse/files/patch-Outputter.cpp 2011-12-30 20:46:27.000000000 -0800
@@ -0,0 +1,13 @@
+--- ./Outputter.cpp.orig 2008-08-23 04:00:12.000000000 -0700
++++ ./Outputter.cpp 2011-12-30 17:37:16.000000000 -0800
+@@ -459,8 +459,8 @@
+
+ if (condition)
+ {
+- line.erase(start, strlen(tag));
+- line.erase(finish - strlen(tag), 9);
++ line.erase(start, std::strlen(tag));
++ line.erase(finish - std::strlen(tag), 9);
+
+ begin = finish - strlen(tag) - 9;
+ }
diff -Nrux .svn -x work /usr/ports/www/dtse/files/patch-Search.hpp dtse/files/patch-Search.hpp
--- /usr/ports/www/dtse/files/patch-Search.hpp 1969-12-31 16:00:00.000000000 -0800
+++ dtse/files/patch-Search.hpp 2011-12-30 20:46:27.000000000 -0800
@@ -0,0 +1,10 @@
+--- ./Search.hpp.orig 2008-08-23 04:00:12.000000000 -0700
++++ ./Search.hpp 2011-12-30 17:37:16.000000000 -0800
+@@ -65,6 +65,7 @@
+ #include <queue>
+ #include <cstdlib>
+ #include <cstdio>
++#include <cstring>
+ #include <climits>
+ #include <ctime>
+ #include <cctype>
diff -Nrux .svn -x work /usr/ports/www/dtse/files/patch-autogen.sh dtse/files/patch-autogen.sh
--- /usr/ports/www/dtse/files/patch-autogen.sh 1969-12-31 16:00:00.000000000 -0800
+++ dtse/files/patch-autogen.sh 2011-12-30 20:46:27.000000000 -0800
@@ -0,0 +1,17 @@
+--- ./autogen.sh.orig 2011-12-30 17:37:16.000000000 -0800
++++ ./autogen.sh 2011-12-30 17:37:16.000000000 -0800
+@@ -0,0 +1,14 @@
++#!/bin/sh
++#
++# Douglas Thrift's Search Engine
++#
++# Douglas Thrift
++#
++# $Id$
++
++set -e
++cd `dirname $0`
++
++aclocal
++automake -acf || true
++autoconf
diff -Nrux .svn -x work /usr/ports/www/dtse/files/patch-configure.ac dtse/files/patch-configure.ac
--- /usr/ports/www/dtse/files/patch-configure.ac 1969-12-31 16:00:00.000000000 -0800
+++ dtse/files/patch-configure.ac 2011-12-30 20:46:27.000000000 -0800
@@ -0,0 +1,57 @@
+--- ./configure.ac.orig 2008-08-23 03:29:42.000000000 -0700
++++ ./configure.ac 2011-12-30 17:37:16.000000000 -0800
+@@ -9,36 +9,22 @@
+ AC_PREFIX_DEFAULT(/usr/local/dtse)
+ AC_PROG_INSTALL
+
+-CHECK_GNU_MAKE
+-if test x$_cv_gnu_make_command = x; then
+- AC_MSG_ERROR(You need GNU Make.)
+-fi
++AX_CHECK_GNU_MAKE
++AC_SUBST([GNUMAKE], [$_cv_gnu_make_command])
++AS_IF([test "x$GNUMAKE" = x], [AC_MSG_ERROR([You need GNU make])])
++AX_WITH_PERL
++AX_PROG_PERL_MODULES([File::Temp], [], [AC_MSG_ERROR([You need File::Temp.])])
++AC_LANG([C++])
+ AC_PROG_CXX
+-if ! test x$GXX = x; then
+- AC_MSG_CHECKING(if g++ is version 3.1 or higher)
+- dt_gxx_3_x=`$CXX --version 2>&1 | grep ^$CXX`
+- if test "x$dt_gxx_3_x" = "x"; then
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR(You need g++ 3.1 or higher.)
+- else
+- AC_MSG_RESULT(yes)
+- fi
+-fi
+-AC_PROG_PERL_VERSION(5.00503, , AC_MSG_ERROR(You need a Perl 5.6 or higher.))
+-AC_MSG_CHECKING(perl path)
+-AC_SUBST(which_perl, `which $PERL`)
+-AC_MSG_RESULT($which_perl)
+-
+-AC_PROG_PERL_MODULES(File::Temp, , AC_MSG_ERROR(You need File::Temp.))
+ mingw=`$CXX --version 2>&1 | grep mingw\ special`
+ if test "x$mingw" = "x"; then
+- ETR_SOCKET_NSL
++ AX_LIB_SOCKET_NSL
+ LIBS="$LIBS $ETR_SOCKET_LIBS"
+ else
+ LIBS="$LIBS -lws2_32"
+ fi
+-AC_MSG_CHECKING(if OpenSSL is wanted)
+-AC_ARG_WITH(openssl, [[ --with-openssl[=DIR] enable OpenSSL [DIR=path]]
++AC_MSG_CHECKING([if OpenSSL is wanted])
++AC_ARG_WITH([openssl], [[ --with-openssl[=DIR] enable OpenSSL [DIR=path]]
+ ], [
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(for OpenSSL)
+@@ -62,7 +48,7 @@
+ AC_SUBST(OpenSSL, -D_OpenSSL_)
+ else
+ AC_MSG_RESULT(not found);
+- AC_MSG_ERROR(couldn't find OpenSSL)
++ AC_MSG_ERROR(could not find OpenSSL)
+ fi
+ ], [ AC_MSG_RESULT(no) ])
+ if ! test x$openssl = x; then
diff -Nrux .svn -x work /usr/ports/www/dtse/files/patch-search.cgi.in dtse/files/patch-search.cgi.in
--- /usr/ports/www/dtse/files/patch-search.cgi.in 1969-12-31 16:00:00.000000000 -0800
+++ dtse/files/patch-search.cgi.in 2011-12-30 20:46:27.000000000 -0800
@@ -0,0 +1,8 @@
+--- ./search.cgi.in.orig 2004-04-05 15:50:25.000000000 -0700
++++ ./search.cgi.in 2011-12-30 17:37:16.000000000 -0800
+@@ -1,4 +1,4 @@
+-#!@which_perl@
++#!@PERL@
+ #
+ # Douglas Thrift's Search Engine CGI Script
+ #
--- dtse.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list