ports/76591: [PATCH] devel/openthreads: un-BROKEN on 5.x;

[Sam Lawrance]

>Number:         76591
>Category:       ports
>Synopsis:       [PATCH] devel/openthreads: un-BROKEN on 5.x;
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 23 05:20:09 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sam Lawrance
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD dirk.no.domain 5.3-STABLE FreeBSD 5.3-STABLE #0: Sat Jan 22 13:45:56 EST 2005
>Description:

The port was failing to build on 5.x due to a header included inside of
the wrong namespace. Patch (to go in files/) included below as shar.

Also, I think the port will now build on non-i386 platforms. The 
distfile contained i386 object files and libraries which are not meant
to be there. They are now deleted post-patch.
I can't test this on other platforms though.

Port maintainer (yinjieh at csie.nctu.edu.tw) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- openthreads-1.2d3_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/devel/openthreads/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- Makefile	19 Sep 2004 02:57:05 -0000	1.3
+++ Makefile	23 Jan 2005 05:11:25 -0000
@@ -18,7 +18,7 @@
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
-ONLY_FOR_ARCHS=         i386
+INSTALLS_SHLIB=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 MAKEFILE=	GNUmakefile
@@ -28,12 +28,10 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 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>
--- openthreads-1.2d3_1.patch ends here ---


# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	files/patch-pthread_src::PThreadConditionPrivateData.h
#
echo x - files/patch-pthread_src::PThreadConditionPrivateData.h
sed 's/^X//' >files/patch-pthread_src::PThreadConditionPrivateData.h << 'END-of-files/patch-pthread_src::PThreadConditionPrivateData.h'
X--- pthread_src/PThreadConditionPrivateData.h.orig	Sun Jan 23 14:06:58 2005
X+++ pthread_src/PThreadConditionPrivateData.h	Sun Jan 23 14:07:12 2005
X@@ -24,9 +24,10 @@
X #ifndef _PTHREADCONDITIONPRIVATEDATA_H_
X #define _PTHREADCONDITIONPRIVATEDATA_H_
X 
X+#include <pthread.h>
X+
X namespace OpenThreads {
X 
X-#include <pthread.h>
X #include <OpenThreads/Condition>
X 
X class PThreadConditionPrivateData {
END-of-files/patch-pthread_src::PThreadConditionPrivateData.h
exit

>Release-Note:
>Audit-Trail:
>Unformatted: