Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Mar 2006 09:23:08 GMT
From:      Matthew May <rrghphar@bigpond.net.au>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/94998: Update devel/openthreads port to latest OSG-compatible version
Message-ID:  <200603270923.k2R9N8in055977@www.freebsd.org>
Resent-Message-ID: <200603270930.k2R9UJsE053948@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         94998
>Category:       ports
>Synopsis:       Update devel/openthreads port to latest OSG-compatible version
>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:   Mon Mar 27 09:30:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Matthew May
>Release:        5.4-RELEASE
>Organization:
<private-individual>
>Environment:
FreeBSD yuu.sa.bigpond.net.au 5.4-RELEASE FreeBSD 5.4-RELEASE #4: Sun Dec  4 14:29:54 CST 2005     root@yuu.sa.bigpond.net.au:/usr/src/sys/i386/compile/YUU  i386
>Description:
devel/openthreads is a building block used by OpenSceneGraph (graphics/osg), which has recently gone to 1.0 release.  The OpenThreads source is released as part of the OpenSceneGraph archive, and the current version here is no longer compatible with osg-1.0.

Attempting to build osg-1.0 using the FreeBSD openthreads package fails due to changes in headers, and general OpenThreads development.
>How-To-Repeat:
Install the openthreads package, then attempt to build osg-1.0 using a pre-installed openthreads (rather than the version that comes with osg-1.0).
>Fix:
The following context diff will upgrade the devel/openthreads files to build using the more recent release:

----8<----
diff -ur --expand-tabs openthreads-ORIG/Makefile openthreads/Makefile
--- openthreads-ORIG/Makefile   Tue Jan 25 07:04:54 2005
+++ openthreads/Makefile        Sun Jan 15 10:56:31 2006
@@ -6,32 +6,30 @@
 #
 
 PORTNAME=       openthreads
-PORTVERSION=    1.2d3
+PORTVERSION=    1.4.2
 PORTREVISION=   1
 CATEGORIES=     devel
-MASTER_SITES=   http://www.csie.nctu.edu.tw/~yinjieh/
-DISTNAME=       OpenThreads-v1.2dev3-osg0.9.6
+MASTER_SITES=   http://www.openscenegraph.org/downloads/snapshots/
+#
+# the following master distribution contains the version of OpenThreads
+# as described above by PORTVERSION and PORTREVISION.
+DISTNAME=       OSG_OP_OT-1.0
 
 MAINTAINER=     yinjieh@csie.nctu.edu.tw
 COMMENT=        A library which provides OO thread interface for C++ programmers
 
+USE_ZIP=        yes
 USE_GMAKE=      yes
-USE_REINPLACE=  yes
-MAKE_ENV=       PTHREAD_LIBS=${PTHREAD_LIBS}
 INSTALLS_SHLIB= yes
 
-WRKSRC=         ${WRKDIR}/${DISTNAME}
 MAKEFILE=       GNUmakefile
+WRKSRC=         ${WRKDIR}/${DISTNAME}/OpenThreads
 
-# opt = optimized ($OPTF added); debug = debug ($DBGF added); opt is default
+# Optimisation/Debug flags:
+#   opt = optimized ($OPTF added);
+#   debug = debug ($DBGF added);
+# opt is default
+#
 ALL_TARGET=     opt
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-        @${REINPLACE_CMD} -e 's,%%CXXFLAGS%%,${CXXFLAGS},g' \
-        ${WRKSRC}/Make/makedefs
-        @${FIND} ${WRKSRC} -name '*.o' -delete
-        @${FIND} ${WRKSRC} -name '*.so' -delete
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ur --expand-tabs openthreads-ORIG/distinfo openthreads/distinfo
--- openthreads-ORIG/distinfo   Wed Mar 31 12:37:04 2004
+++ openthreads/distinfo        Sun Jan 15 06:23:27 2006
@@ -1,2 +1,2 @@
-MD5 (OpenThreads-v1.2dev3-osg0.9.6.tar.gz) = 15c8b9658d509e18a043c1ba0ef212ef
-SIZE (OpenThreads-v1.2dev3-osg0.9.6.tar.gz) = 68342
+MD5 (OSG_OP_OT-1.0.zip) = dfb3eca46b32625602dabe9aa46c6b6f
+SIZE (OSG_OP_OT-1.0.zip) = 5036053
Only in openthreads-ORIG/: files
diff -ur --expand-tabs openthreads-ORIG/pkg-plist openthreads/pkg-plist
--- openthreads-ORIG/pkg-plist  Thu Nov  6 23:45:00 2003
+++ openthreads/pkg-plist       Tue Nov  1 17:55:06 2005
@@ -1,8 +1,8 @@
 include/OpenThreads/Barrier
+include/OpenThreads/Condition
+include/OpenThreads/Exports
 include/OpenThreads/Mutex
-include/OpenThreads/Thread
 include/OpenThreads/ScopedLock
-include/OpenThreads/Exports
-include/OpenThreads/Condition
+include/OpenThreads/Thread
 lib/libOpenThreads.so
 @dirrm include/OpenThreads
Only in openthreads: work
---->8----

Note: I have read the request above concerning embedding plain code, however I cannot use the send-pr command because my raw mail isn't properly setup.  I do have an ISP-based email account, as listed above;
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603270923.k2R9N8in055977>