[36813] trunk/dports/devel/poco

nox at macports.org nox at macports.org
Thu May 15 05:02:20 PDT 2008


Revision: 36813
          http://trac.macosforge.org/projects/macports/changeset/36813
Author:   nox at macports.org
Date:     2008-05-15 05:02:17 -0700 (Thu, 15 May 2008)

Log Message:
-----------
poco:
 * Updated to 1.3.2.
 * Disabled dependency tracking in universal variant.
 * Enabled parallel build.

Modified Paths:
--------------
    trunk/dports/devel/poco/Portfile

Added Paths:
-----------
    trunk/dports/devel/poco/files/
    trunk/dports/devel/poco/files/patch-rules-deps-universal.diff

Modified: trunk/dports/devel/poco/Portfile
===================================================================
--- trunk/dports/devel/poco/Portfile	2008-05-15 09:29:32 UTC (rev 36812)
+++ trunk/dports/devel/poco/Portfile	2008-05-15 12:02:17 UTC (rev 36813)
@@ -3,7 +3,7 @@
 PortSystem      1.0
 
 name            poco
-version         1.3.1
+version         1.3.2
 categories      devel
 maintainers     nox
 platforms       darwin
@@ -19,34 +19,36 @@
 use_bzip2       yes
 set my_distname ${distname}
 
-checksums       [suffix ${distname}] \
-                    md5 e6ef09835af19498552f530964e06267 \
-                    sha1 e1be1c364af8bd8edf7855ffa11fc2ad15796263 \
-                    rmd160 c79227a33b62528a69d4869c48855bb496e24bfe \
-                [suffix ${distname}-ssl] \
-                    md5 8d0010ad6dd06e414107d46b3d06de72 \
-                    sha1 ba6a03a119e791a653dd6c9e2d07dd9b77caf997 \
-                    rmd160 b52ca94dae5813d7254bece1e71e86430e9a86d9 \
-                [suffix ${distname}-data] \
-                    md5 22eb8f7cc8ab5276ba37a9937515f016 \
-                    sha1 f8367f2f10946d8cbc096e7d3736f34c1ac09454 \
-                    rmd160 a39c9f197255959bc2e44bfbbec1aba72a46dd6c \
-                ${my_distname}-doc.tar.gz \
-                    md5 d952ebe3fc3e012857b2636b582133e3 \
-                    sha1 912de8e62ae264408b130c760e08b6867d674f00 \
-                    rmd160 2de13a5c8f93364730da685c201ef1a894b2da4c
+checksums       poco-1.3.2.tar.bz2 \
+                    md5     ba0a8e58522a01e77981ea2b42d369a6 \
+                    sha1    ec1eb28ceda24bca524c485a73da92e2ac78df0e \
+                    rmd160  ba6cb689c05f9c718f6381918183a7f72da85d4c \
+                poco-1.3.2-data.tar.bz2 \
+                    md5     110f8daf889b915f50e78ca0f8edd800 \
+                    sha1    b8d884beab455b63c9edc0c60bf4c11b504ccf7a \
+                    rmd160  73112ddd532b093bd55bb611759ce96c39395e52 \
+                poco-1.3.2-doc.tar.gz \
+                    md5     a92ccd7038573064515a9f2f3b0f8562 \
+                    sha1    cbf72f9cfbb624f28978f3d752cba7d4dc471ce6 \
+                    rmd160  813f8b0ce8cb18269c5fcbf1c577375bca7db0c4
 
+if {[variant_isset universal]} {
+    patchfiles-append   patch-rules-deps-universal.diff
+}
+
 set config      Darwin
 
-post-patch {
-    reinplace -E "/^CFLAGS\[\[:>:\]\]/s|\$|[join ${configure.cppflags} " "] [join ${configure.cflags} " "]|" \
+pre-configure {
+    reinplace -E "/^C(XX)?FLAGS +=/s|\$| ${configure.cppflags} ${configure.cflags}|" \
         ${worksrcpath}/build/config/${config}
-    reinplace -E "/^LINKFLAGS\[\[:>:\]\]/s|\$|[join ${configure.ldflags} " "]|" \
+    reinplace -E "/^((SH|DY)LIB|LINKFLAGS) +=/s|\$| ${configure.ldflags}|" \
         ${worksrcpath}/build/config/${config}
 }
 
 configure.args  --no-samples
 
+use_parallel_build  yes
+
 build.target    poco
 
 test.run        yes
@@ -83,10 +85,29 @@
     xinstall -m 0644 -W ${worksrcpath} CHANGELOG CONTRIBUTORS LICENSE NEWS README VERSION \
         ${destroot}${docdir}
 
-    if {! [variant_isset doc]} {
+    if {![variant_isset doc]} {
         xinstall -d ${destroot}${docdir}/html
         xinstall -m 0644 -W ${worksrcpath}/doc Acknowledgements.html ${destroot}${docdir}/html
     }
+
+    set libdir ${prefix}/lib
+
+    foreach {dylib} [glob -types f -tails -directory ${destroot}${libdir} *.dylib] {
+        system "install_name_tool -id ${libdir}/${dylib} ${destroot}${libdir}/${dylib}"
+
+        set otool [lrange [split [exec otool -L ${destroot}${libdir}/${dylib}] \n] 2 end]
+
+        foreach {otoolentry} ${otool} {
+            set lib [lindex ${otoolentry} 0]
+
+            if {! [string match ${worksrcpath}/* ${lib}]} {
+                continue
+            }
+
+            system "install_name_tool -change ${lib} ${libdir}/[file tail ${lib}] \
+                ${destroot}${libdir}/${dylib}"
+        }
+    }
 }
 
 variant ssl description {Build NetSSL library} {
@@ -129,33 +150,9 @@
     }
 }
 
-platform darwin {
-    post-destroot {
-        set libdir ${prefix}/lib
-
-        foreach {dylib} [glob -type f -directory ${destroot}${libdir} -tail *.dylib] {
-            system "install_name_tool -id ${libdir}/${dylib} ${destroot}${libdir}/${dylib}"
-
-            set otool [lrange [split [exec otool -L ${dylib}] \n] 2 end]
-
-            foreach {otoolentry} ${otool} {
-                set lib [lindex ${otoolentry} 0]
-
-                if {! [string match ${worksrcpath}/* ${lib}]} {
-                    continue
-                }
-
-                system "install_name_tool -change ${lib} ${libdir}/[file tail ${lib}] \
-                    ${destroot}${libdir}/${dylib}"
-            }
-        }
-    }
-}
-
 platform darwin 7 {
     set config              Darwin7
     configure.args-append   --config=${config}
 }
 
 livecheck.regex "<title>sources ${name}-(.*) released.*</title>"
-

Added: trunk/dports/devel/poco/files/patch-rules-deps-universal.diff
===================================================================
--- trunk/dports/devel/poco/files/patch-rules-deps-universal.diff	                        (rev 0)
+++ trunk/dports/devel/poco/files/patch-rules-deps-universal.diff	2008-05-15 12:02:17 UTC (rev 36813)
@@ -0,0 +1,128 @@
+diff -ur build.orig/rules/compile build/rules/compile
+--- build.orig/rules/compile	2008-05-15 12:56:50.000000000 +0200
++++ build/rules/compile	2008-05-15 12:58:19.000000000 +0200
+@@ -32,49 +32,34 @@
+ #
+ # Rules for compiling
+ #	
+-$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
++$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp
+ 	@echo "** Compiling" $< "(debug)"
+ 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+ 
+-$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
++$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp
+ 	@echo "** Compiling" $< "(release)"
+ 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+ 
+-$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
++$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c
+ 	@echo "** Compiling" $< "(debug)"
+ 	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
+ 
+-$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
++$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c
+ 	@echo "** Compiling" $< "(release)"
+ 	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
+ 
+-$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
++$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp
+ 	@echo "** Compiling" $< "(debug, shared)"
+ 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+ 
+-$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
++$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp
+ 	@echo "** Compiling" $< "(release, shared)"
+ 	$(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+ 
+-$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
++$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c
+ 	@echo "** Compiling" $< "(debug, shared)"
+ 	$(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+ 
+-$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
++$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c
+ 	@echo "** Compiling" $< "(release, shared)"
+ 	$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+-
+-#
+-# Rules for creating dependency information
+-#
+-$(DEPPATH)/%.d: $(SRCDIR)/%.cpp
+-	@echo "** Creating dependency info for" $^
+-	$(MKDIR) $(DEPPATH)
+-	$(DEP) $(SRCDIR)/$(patsubst %.d,%.cpp,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CXXFLAGS) 
+-
+-$(DEPPATH)/%.d: $(SRCDIR)/%.c
+-	@echo "** Creating dependency info for" $^
+-	$(MKDIR) $(DEPPATH)
+-	$(DEP) $(SRCDIR)/$(patsubst %.d,%.c,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CFLAGS)
+-
+-depend: $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
+diff -ur build.orig/rules/dylib build/rules/dylib
+--- build.orig/rules/dylib	2008-05-15 12:56:50.000000000 +0200
++++ build/rules/dylib	2008-05-15 12:58:40.000000000 +0200
+@@ -70,8 +70,3 @@
+ 	@echo "** Building dynamic library (release)" $@
+ 	$(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
+ 	$(postbuild)
+-
+-#
+-# Include the automatically generated dependency files
+-#
+-sinclude $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
+diff -ur build.orig/rules/exec build/rules/exec
+--- build.orig/rules/exec	2008-05-15 12:56:50.000000000 +0200
++++ build/rules/exec	2008-05-15 12:58:52.000000000 +0200
+@@ -57,8 +57,3 @@
+ 	$(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
+ 	$(STRIPCMD)
+ 	$(postbuild)
+-
+-#
+-# Include the automatically generated dependency files
+-#
+-sinclude $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
+diff -ur build.orig/rules/global build/rules/global
+--- build.orig/rules/global	2008-05-15 12:56:50.000000000 +0200
++++ build/rules/global	2008-05-15 12:59:10.000000000 +0200
+@@ -104,11 +104,9 @@
+ LIBDIR   = lib/$(OSNAME)/$(OSARCH)
+ BINDIR   = bin/$(OSNAME)/$(OSARCH)
+ OBJDIR   = obj/$(OSNAME)/$(OSARCH)
+-DEPDIR   = .dep/$(OSNAME)/$(OSARCH)
+ LIBPATH  = $(POCO_BUILD)/$(LIBDIR)
+ BINPATH  = $(POCO_BUILD)/$(COMPONENT)/$(BINDIR)
+ OBJPATH  = $(POCO_BUILD)/$(COMPONENT)/$(OBJDIR)
+-DEPPATH  = $(POCO_BUILD)/$(COMPONENT)/$(DEPDIR)
+ 
+ ifeq ($(POCO_BASE),$(PROJECT_BASE))
+ POCO_LIBRARY =
+diff -ur build.orig/rules/lib build/rules/lib
+--- build.orig/rules/lib	2008-05-15 12:56:50.000000000 +0200
++++ build/rules/lib	2008-05-15 12:59:18.000000000 +0200
+@@ -70,8 +70,3 @@
+ 	$(SHLIBLN) $(LIB_RELEASE_SHARED) $(LIB_RELEASE_SHARED_LINK)
+ 	$(STRIPCMD)
+ 	$(postbuild)
+-
+-#
+-# Include the automatically generated dependency files
+-#
+-sinclude $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects)))
+diff -ur build.orig/rules/sample build/rules/sample
+--- build.orig/rules/sample	2008-05-15 12:56:50.000000000 +0200
++++ build/rules/sample	2008-05-15 12:59:34.000000000 +0200
+@@ -43,12 +43,10 @@
+ LIBDIR   = lib
+ BINDIR   = bin
+ OBJDIR   = obj
+-DEPDIR   = .dep
+ INCPATH  = $(POCO_BASE)/$(INCDIR)
+ LIBPATH  = $(POCO_BASE)/$(LIBDIR)
+ BINPATH  = $(BINDIR)
+ OBJPATH  = $(OBJDIR)
+-DEPPATH  = $(DEPDIR)
+ 
+ #
+ # Determine link mode

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080515/50c7d1da/attachment.htm 


More information about the macports-changes mailing list