[95749] trunk/dports/devel/poco
ryandesign at macports.org
ryandesign at macports.org
Sat Jul 21 01:05:34 PDT 2012
Revision: 95749
https://trac.macports.org/changeset/95749
Author: ryandesign at macports.org
Date: 2012-07-21 01:05:34 -0700 (Sat, 21 Jul 2012)
Log Message:
-----------
poco: update to 1.4.3p1, fixing build (#35266); license Boost-1.0; indicate supported_archs; fix fetching doc distfile; use unversioned docdir
Modified Paths:
--------------
trunk/dports/devel/poco/Portfile
trunk/dports/devel/poco/files/patch-rules-deps.diff
Modified: trunk/dports/devel/poco/Portfile
===================================================================
--- trunk/dports/devel/poco/Portfile 2012-07-21 07:12:43 UTC (rev 95748)
+++ trunk/dports/devel/poco/Portfile 2012-07-21 08:05:34 UTC (rev 95749)
@@ -4,11 +4,13 @@
PortSystem 1.0
name poco
-version 1.3.6p2
-revision 1
+version 1.4.3p1
categories devel
maintainers nomaintainer
platforms darwin
+license Boost-1.0
+supported_archs i386 x86_64
+
description POCO C++ Libraries
long_description \
@@ -17,25 +19,25 @@
development -- a powerful, yet easy to use platform to build your applications upon.
homepage http://pocoproject.org/
-master_sites sourceforge:project/poco/sources/poco-[strsed ${version} {s/[^0-9.].*$//}]
+master_sites sourceforge:project/poco/sources/poco-[strsed ${version} {s/[^0-9.].*$//}]:source \
+ sourceforge:project/poco/docs/poco-[strsed ${version} {s/[^0-9.].*$//}]-doc:doc
use_bzip2 yes
distname ${name}-${version}-all
+distfiles [suffix ${distname}]:source
+extract.only [suffix ${distname}]
set docdistname ${name}-[strsed ${version} {s/[a-z].*$//}]-all-doc
checksums [suffix ${distname}] \
- md5 8f1a6c3511764167d39f1950da3fcb37 \
- sha1 46c66620f7685e9ed9f7caffc8ff3a09454c06de \
- rmd160 effaff38aebca34af7dbbd3aae0798af95268790 \
+ rmd160 3ec28ef3a78bb9850965eef29a81150b4ea7d4a3 \
+ sha256 8a3fd41234a8015e5c46470baa90140c7726cd7dc70d8300c655f08d71fdc35a \
${docdistname}.tar.gz \
- md5 a6abb9a02b0a7406194853d422d5fc28 \
- sha1 2167220ad0c354c3ae8a9ea1be4a7d91d73976a3 \
- rmd160 78b82bd8dd19dd4bb599543d860a1aae8585a64f
+ rmd160 15cff661019f96bdd1ba2b7b00725117d9e2605c \
+ sha256 c72c29835a4922356da197c08597e448f79e4e2a0202d8dbe0936114d13a0028
set omit {NetSSL_OpenSSL Data/ODBC Data/MySQL Crypto}
-# Poco build doesn't support the standard --target config option.
-if {$build_arch == "x86_64"} {
- set config Darwin_x86_64
+if {${configure.compiler} == "clang"} {
+ set config Darwin-clang
} else {
set config Darwin
}
@@ -56,7 +58,8 @@
# Make sure poco build uses the right compiler.
build.args-append CC=${configure.cc} \
CXX=${configure.cxx} \
- CPP=${configure.cpp}
+ CPP=${configure.cpp} \
+ POCO_HOST_OSARCH=${configure.build_arch}
pre-configure {
configure.args-append --omit=[join ${omit} ,]
@@ -98,7 +101,7 @@
}
}
-set docdir ${prefix}/share/doc/${name}-${version}
+set docdir ${prefix}/share/doc/${name}
post-destroot {
xinstall -d ${destroot}${docdir}
@@ -154,8 +157,7 @@
}
variant doc description {Install extra documentation} {
- extract.only ${distfiles}
- distfiles-append ${docdistname}.tar.gz
+ distfiles-append ${docdistname}.tar.gz:doc
post-extract {
system "tar xzf ${distpath}/${docdistname}.tar.gz -C ${workpath}"
Modified: trunk/dports/devel/poco/files/patch-rules-deps.diff
===================================================================
--- trunk/dports/devel/poco/files/patch-rules-deps.diff 2012-07-21 07:12:43 UTC (rev 95748)
+++ trunk/dports/devel/poco/files/patch-rules-deps.diff 2012-07-21 08:05:34 UTC (rev 95749)
@@ -1,28 +1,27 @@
-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 @@
+--- build/rules/compile.orig 2012-01-23 08:12:26.000000000 -0600
++++ build/rules/compile 2012-07-21 02:34:58.000000000 -0500
+@@ -33,49 +33,34 @@
#
# Rules for compiling
#
-$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
+$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp
- @echo "** Compiling" $< "(debug)"
+ @echo "** Compiling" $< "(debug, static)"
$(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)"
+ @echo "** Compiling" $< "(release, static)"
$(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)"
+ @echo "** Compiling" $< "(debug, static)"
$(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)"
+ @echo "** Compiling" $< "(release, static)"
$(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
-$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
@@ -59,22 +58,20 @@
- $(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
+--- build/rules/dylib.orig 2012-01-23 08:12:26.000000000 -0600
++++ build/rules/dylib 2012-07-21 02:32:28.000000000 -0500
@@ -70,8 +70,3 @@
- @echo "** Building dynamic library (release)" $@
- $(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
+ @echo "** Building dynamic library (release, static)" $@
+ $(DYLIB) $(DYLIBFLAGS) $^ $(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 @@
+--- build/rules/exec.orig 2012-01-23 08:12:26.000000000 -0600
++++ build/rules/exec 2012-07-21 02:32:28.000000000 -0500
+@@ -60,8 +60,3 @@
$(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
$(STRIPCMD)
$(postbuild)
@@ -83,10 +80,9 @@
-# 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 @@
+--- build/rules/global.orig 2012-01-23 08:12:26.000000000 -0600
++++ build/rules/global 2012-07-21 02:32:28.000000000 -0500
+@@ -157,11 +157,9 @@
LIBDIR = lib/$(OSNAME)/$(OSARCH)
BINDIR = bin/$(OSNAME)/$(OSARCH)
OBJDIR = obj/$(OSNAME)/$(OSARCH)
@@ -96,12 +92,11 @@
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 @@
+ POCO_HOST_BINDIR = bin/$(POCO_HOST_OSNAME)/$(POCO_HOST_OSARCH)
+ POCO_TARGET_BINDIR = $(BINDIR)
+--- build/rules/lib.orig 2012-01-23 08:12:26.000000000 -0600
++++ build/rules/lib 2012-07-21 02:32:28.000000000 -0500
+@@ -75,8 +75,3 @@
$(SHLIBLN) $(LIB_RELEASE_SHARED) $(LIB_RELEASE_SHARED_LINK)
$(STRIPCMD)
$(postbuild)
@@ -110,10 +105,9 @@
-# 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 @@
+--- build/rules/sample.orig 2012-01-23 08:12:26.000000000 -0600
++++ build/rules/sample 2012-07-21 02:32:28.000000000 -0500
+@@ -46,12 +46,10 @@
LIBDIR = lib
BINDIR = bin
OBJDIR = obj
@@ -124,5 +118,5 @@
OBJPATH = $(OBJDIR)
-DEPPATH = $(DEPDIR)
- #
- # Determine link mode
+ LIBPREFIX = lib
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120721/ef503a1b/attachment-0001.html>
More information about the macports-changes
mailing list