Index: head/devel/openthreads/Makefile =================================================================== --- head/devel/openthreads/Makefile (revision 175956) +++ head/devel/openthreads/Makefile (revision 175957) @@ -1,36 +1,36 @@ # New ports collection makefile for: openthreads # Date created: 16 October 2003 # Whom: Ying-Chieh Chen # # $FreeBSD$ # PORTNAME= openthreads -PORTVERSION= 1.2d3 -PORTREVISION= 1 +PORTVERSION= 1.4.2 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 -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${DISTNAME} MAKEFILE= GNUmakefile +WRKSRC= ${WRKDIR}/${DISTNAME}/OpenThreads +MAKE_ENV+= FREEBSD_ARCH="${ARCH}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" -# opt = optimized ($OPTF added); debug = debug ($DBGF added); opt is default +# Optimisation/Debug flags: +# opt = optimised ($OPTF added) +# debug = debug ($DBGF added) +# opt is default +# ALL_TARGET= opt -.include - -post-patch: - @${REINPLACE_CMD} -e 's,%%CXXFLAGS%%,${CXXFLAGS},g' \ - ${WRKSRC}/Make/makedefs - @${FIND} ${WRKSRC} -name '*.o' -delete - @${FIND} ${WRKSRC} -name '*.so' -delete - -.include +.include Property changes on: head/devel/openthreads/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/devel/openthreads/distinfo =================================================================== --- head/devel/openthreads/distinfo (revision 175956) +++ head/devel/openthreads/distinfo (revision 175957) @@ -1,3 +1,3 @@ -MD5 (OpenThreads-v1.2dev3-osg0.9.6.tar.gz) = 15c8b9658d509e18a043c1ba0ef212ef -SHA256 (OpenThreads-v1.2dev3-osg0.9.6.tar.gz) = 02b42f62bbf08bfd2739c7c3fad80f6a755ec762c3e59ca6c26b0cc77041cf16 -SIZE (OpenThreads-v1.2dev3-osg0.9.6.tar.gz) = 68342 +MD5 (OSG_OP_OT-1.0.zip) = dfb3eca46b32625602dabe9aa46c6b6f +SHA256 (OSG_OP_OT-1.0.zip) = c39572c72d9ed7b7a34a36779bcf56180ba2917926f6f658b5af1824eeb3b6a6 +SIZE (OSG_OP_OT-1.0.zip) = 5036053 Property changes on: head/devel/openthreads/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/devel/openthreads/files/patch-pthread_src::PThreadConditionPrivateData.h =================================================================== --- head/devel/openthreads/files/patch-pthread_src::PThreadConditionPrivateData.h (revision 175956) +++ head/devel/openthreads/files/patch-pthread_src::PThreadConditionPrivateData.h (nonexistent) @@ -1,14 +0,0 @@ ---- pthread_src/PThreadConditionPrivateData.h.orig Sun Jan 23 14:06:58 2005 -+++ pthread_src/PThreadConditionPrivateData.h Sun Jan 23 14:07:12 2005 -@@ -24,9 +24,10 @@ - #ifndef _PTHREADCONDITIONPRIVATEDATA_H_ - #define _PTHREADCONDITIONPRIVATEDATA_H_ - -+#include -+ - namespace OpenThreads { - --#include - #include - - class PThreadConditionPrivateData { Property changes on: head/devel/openthreads/files/patch-pthread_src::PThreadConditionPrivateData.h ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/devel/openthreads/files/patch-Make::makedefs =================================================================== --- head/devel/openthreads/files/patch-Make::makedefs (revision 175956) +++ head/devel/openthreads/files/patch-Make::makedefs (revision 175957) @@ -1,30 +1,29 @@ ---- Make/makedefs.orig Thu Oct 2 16:56:31 2003 -+++ Make/makedefs Mon Jan 24 21:28:13 2005 -@@ -252,15 +252,22 @@ +--- Make/makedefs.orig Sat Dec 10 09:49:24 2005 ++++ Make/makedefs Wed Sep 27 19:05:17 2006 +@@ -264,15 +264,22 @@ CXX = g++ endif DEPARG = -MM - INC += -I/usr/local/include -I/usr/X11R6/include - DEF += -W -Wall -- OPTF = -O2 + INC += -I${LOCALBASE}/include -I${X11BASE}/include -+ DEF += -W -Wall -fPIC -+ OPTF = -O -pipe ++ DEF += -W -Wall ${PTHREAD_CFLAGS} + OPTF = -O2 DBGF = -g SHARED = -shared ARCH = 32 ARCHARGS = -- INST_LOCATION = /opt/X11R6 +- INST_LOCATION = /usr/local - INST_SHARE = /usr/share/OpenThreads + INST_SYS_PREFIX = $(PREFIX) + INST_SHARE_PREFIX = $(DATADIR) -+ LINKARGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib ++ LINKARGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib ${PTHREAD_LIBS} + INST_LOCATION = $(INST_SYS_PREFIX) + INST_SHARE = $(INST_SHARE_PREFIX) + INST_DEMOS = $(EXAMPLESDIR)/bin + INST_SRC = $(EXAMPLESDIR)/src + INST_DOC = $(DOCSDIR) + INST_DATA = $(DATADIR) endif #### MacOS X specific definitions Property changes on: head/devel/openthreads/files/patch-Make::makedefs ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/openthreads/files/patch-Make_instrules =================================================================== --- head/devel/openthreads/files/patch-Make_instrules (nonexistent) +++ head/devel/openthreads/files/patch-Make_instrules (revision 175957) @@ -0,0 +1,20 @@ +--- Make/instrules.orig Thu Dec 8 22:28:18 2005 ++++ Make/instrules Mon Sep 25 19:17:55 2006 +@@ -28,13 +28,13 @@ + + __inst_headers: + @[ -d $(INST_INCLUDE)/OpenThreads ] || mkdir -p $(INST_INCLUDE)/OpenThreads +- for f in include/OpenThreads/* ; do\ +- if [ ! -d $$f ];\ +- then\ ++ for f in include/OpenThreads/* ; do \ ++ if [ ! -d $$f ]; \ ++ then \ + [ "`head -1 $$f | cut -c 1-12`" = "/* -*-c++-*-" ] && \ + echo $(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \ + $(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \ +- fi;\ ++ fi; \ + done + + Property changes on: head/devel/openthreads/files/patch-Make_instrules ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/openthreads/pkg-plist =================================================================== --- head/devel/openthreads/pkg-plist (revision 175956) +++ head/devel/openthreads/pkg-plist (revision 175957) @@ -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 Property changes on: head/devel/openthreads/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property