Date: Thu, 14 Dec 2006 19:31:35 -0500 (EST) From: Greg Larkin <glarkin@sourcehosting.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/106744: [www/clearsilver] Request to "unbreak" the port on 4.X Message-ID: <200612150031.kBF0VZsN021039@fuzz-fbsd411.entropy.prv> Resent-Message-ID: <200612150050.kBF0o3OA051048@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk> -.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612150031.kBF0VZsN021039>