From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 15 00:54:40 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3C55F16A500 for ; Fri, 15 Dec 2006 00:54:40 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E13543F15 for ; Fri, 15 Dec 2006 00:49:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBF0o3dp051049 for ; Fri, 15 Dec 2006 00:50:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBF0o3OA051048; Fri, 15 Dec 2006 00:50:03 GMT (envelope-from gnats) Resent-Date: Fri, 15 Dec 2006 00:50:03 GMT Resent-Message-Id: <200612150050.kBF0o3OA051048@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Greg Larkin Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C161F16A4CA for ; Fri, 15 Dec 2006 00:42:19 +0000 (UTC) (envelope-from glarkin@sourcehosting.net) Received: from sourcehosting.net (sourcehosting.net [204.8.45.67]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E5F34421E for ; Fri, 15 Dec 2006 00:30:25 +0000 (GMT) (envelope-from glarkin@sourcehosting.net) Received: (qmail 16375 invoked by uid 0); 15 Dec 2006 00:31:36 -0000 Received: from glarkin@sourcehosting.net by patches by uid 2033 with qmail-scanner-1.20rc1 (0.80 Clear:RC:1:. Processed in 2.431072 secs); 15 Dec 2006 00:31:36 -0000 Received: from 68-112-252-252.dhcp.oxfr.ma.charter.com (HELO Gregory-Larkins-Computer.local) (68.112.252.252) by 192.168.1.4 with SMTP; 15 Dec 2006 00:31:33 -0000 Received: from fuzz-fbsd411.entropy.prv (fuzz-fbsd411.entropy.prv [192.168.1.17]) by Gregory-Larkins-Computer.local (Postfix) with ESMTP id 29F7AA9A1FC for ; Thu, 14 Dec 2006 19:31:33 -0500 (EST) Received: from fuzz-fbsd411.entropy.prv (localhost [127.0.0.1]) by fuzz-fbsd411.entropy.prv (8.13.1/8.13.1) with ESMTP id kBF0VaBd021040 for ; Thu, 14 Dec 2006 19:31:36 -0500 (EST) (envelope-from glarkin@fuzz-fbsd411.entropy.prv) Received: (from root@localhost) by fuzz-fbsd411.entropy.prv (8.13.1/8.13.1/Submit) id kBF0VZsN021039; Thu, 14 Dec 2006 19:31:35 -0500 (EST) (envelope-from glarkin) Message-Id: <200612150031.kBF0VZsN021039@fuzz-fbsd411.entropy.prv> Date: Thu, 14 Dec 2006 19:31:35 -0500 (EST) From: Greg Larkin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/106744: [www/clearsilver] Request to "unbreak" the port on 4.X X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Greg Larkin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Dec 2006 00:54:40 -0000 >Number: 106744 >Category: ports >Synopsis: [www/clearsilver] Request to "unbreak" the port on 4.X >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Dec 15 00:50:03 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Greg Larkin >Release: FreeBSD 4.11-RELEASE-p22 i386 >Organization: SourceHosting.net, LLC >Environment: System: FreeBSD fuzz-fbsd411.entropy.prv 4.11-RELEASE-p22 FreeBSD 4.11-RELEASE-p22 #0: Tue Sep 19 14:25:52 EDT 2006 glarkin@fuzz-fbsd411.entropy.prv:/usr/obj/usr/src/sys/GENERIC i386 >Description: www/clearsilver was marked BROKEN on FreeBSD 4.X because of a missing pthread library. However, pthread.h exists on 4.X, and that causes the configure script to get confused. Clearsilver can be built successfully on 4.X as long as the proper HAVE_PTHREAD value is set. >How-To-Repeat: "cd /usr/ports/www/clearsilver && make install clean" on FreeBSD 4.X results in a "Does not compile" message. >Fix: The configure script has to be patched to remove the definition of the HAVE_PTHREAD ifdef along with some source files that require the pthread library. --- clearsilver.4X.diff begins here --- diff -urN clearsilver.orig/Makefile clearsilver/Makefile --- clearsilver.orig/Makefile Thu Dec 14 18:50:50 2006 +++ clearsilver/Makefile Thu Dec 14 19:23:00 2006 @@ -62,8 +62,11 @@ .include -.if ${OSVERSION} < 500000 -BROKEN= Does not compile +.if ${OSVERSION} >= 500000 +PATCHDIR= dont-patch +PLIST_SUB+= PTHREAD="" +.else +PLIST_SUB+= PTHREAD="@comment " .endif post-patch: diff -urN clearsilver.orig/files/patch-configure clearsilver/files/patch-configure --- clearsilver.orig/files/patch-configure Wed Dec 31 19:00:00 1969 +++ clearsilver/files/patch-configure Thu Dec 14 19:16:41 2006 @@ -0,0 +1,17 @@ +--- configure.orig Thu Dec 14 19:15:07 2006 ++++ configure Thu Dec 14 19:16:25 2006 +@@ -4969,14 +4969,6 @@ + fi + + +- if test $cs_cv_pthread = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PTHREADS 1 +-_ACEOF +- +- EXTRA_UTL_SRC="$EXTRA_UTL_SRC skiplist.c dict.c" +- fi +- + fi + + diff -urN clearsilver.orig/pkg-plist clearsilver/pkg-plist --- clearsilver.orig/pkg-plist Thu Dec 14 18:50:50 2006 +++ clearsilver/pkg-plist Thu Dec 14 19:22:07 2006 @@ -7,7 +7,7 @@ include/ClearSilver/cgi/html.h include/ClearSilver/cs/cs.h include/ClearSilver/cs_config.h -include/ClearSilver/util/dict.h +%%PTHREAD%%include/ClearSilver/util/dict.h include/ClearSilver/util/filter.h include/ClearSilver/util/neo_date.h include/ClearSilver/util/neo_err.h @@ -20,7 +20,7 @@ include/ClearSilver/util/neo_server.h include/ClearSilver/util/neo_str.h include/ClearSilver/util/rcfs.h -include/ClearSilver/util/skiplist.h +%%PTHREAD%%include/ClearSilver/util/skiplist.h include/ClearSilver/util/ulist.h include/ClearSilver/util/ulocks.h include/ClearSilver/util/wildmat.h --- clearsilver.4X.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: