diff options
-rw-r--r-- | MOVED | 1 | ||||
-rw-r--r-- | net/Makefile | 1 | ||||
-rw-r--r-- | net/libcmis/Makefile | 30 | ||||
-rw-r--r-- | net/libcmis/distinfo | 4 | ||||
-rw-r--r-- | net/libcmis/files/patch-configure | 35 | ||||
-rw-r--r-- | net/libcmis/files/patch-src__libcmis__atom-document.hxx | 11 | ||||
-rw-r--r-- | net/libcmis/files/patch-src__libcmis__atom-folder.hxx | 11 | ||||
-rw-r--r-- | net/libcmis/files/patch-src__libcmis__session.hxx | 10 | ||||
-rw-r--r-- | net/libcmis/pkg-plist | 52 | ||||
-rw-r--r-- | net/libcmis03/Makefile | 48 | ||||
-rw-r--r-- | net/libcmis03/distinfo | 2 | ||||
-rw-r--r-- | net/libcmis03/pkg-descr | 5 | ||||
-rw-r--r-- | net/libcmis03/pkg-plist | 41 |
13 files changed, 70 insertions, 181 deletions
@@ -4045,3 +4045,4 @@ lang/perl5.8||2013-02-04|Has expired: no longer under development, use lang/perl lang/perl5.10||2013-02-04|Has expired: no longer under development, use lang/perl5.16 or lang/perl5.14 net-mgmt/argus||2013-02-05|Has expired: Using of this branch of argus is discouraged. Please migrate to net-mgmt/argus3 net-mgmt/argus-clients||2013-02-05|Has expired: Using of this branch of argus-clients is discouraged. Please migrate to net-mgmt/argus3-clients +net/libcmis03|net/libcmis|2013-02-05|libcmis has been updated to 0.3 diff --git a/net/Makefile b/net/Makefile index 5b4f4b8aa0f4..b4a9508912e6 100644 --- a/net/Makefile +++ b/net/Makefile @@ -308,7 +308,6 @@ SUBDIR += libarms SUBDIR += libbgpdump SUBDIR += libcmis - SUBDIR += libcmis03 SUBDIR += libdnet SUBDIR += libexosip2 SUBDIR += libfb diff --git a/net/libcmis/Makefile b/net/libcmis/Makefile index 9523b27b4df8..722180ca7493 100644 --- a/net/libcmis/Makefile +++ b/net/libcmis/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libcmis -PORTVERSION= 0.1.0 -PORTREVISION= 1 +PORTVERSION= 0.3.0 CATEGORIES= net devel MASTER_SITES= SF/${PORTNAME} @@ -20,7 +19,30 @@ GNU_CONFIGURE= yes USE_GNOME= libxml2 gnomehack USE_GMAKE= yes USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes -CONFIGURE_ARGS= --disable-client +CXXFLAGS+= -std=c++98 +CONFIGURE_ARGS+= --without-man \ + --with-boost=${LOCALBASE} \ + --disable-werror -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 +CC= /usr/bin/clang +CPP= /usr/bin/clang-cpp +CXX= /usr/bin/clang++ +CONFIGURE_ENV+= CXXCPP="${CPP}" +.else +BUILD_DEPENDS+= clang-devel>=3.2.r159895:${PORTSDIR}/lang/clang-devel +USE_BINUTILS= yes +CC= ${LOCALBASE}/bin/clang +CPP= ${CC} -E +CXX= ${LOCALBASE}/bin/clang++ +CONFIGURE_ENV+= CXXCPP="${CXX} -E" +.endif + +post-patch: + @${REINPLACE_CMD} -e "s|@WITH_LIBCMIS_MAN_FALSE@|#|g" ${WRKSRC}/Makefile.in + +.include <bsd.port.post.mk> diff --git a/net/libcmis/distinfo b/net/libcmis/distinfo index 9e2ba0185a56..086bc70f6e68 100644 --- a/net/libcmis/distinfo +++ b/net/libcmis/distinfo @@ -1,2 +1,2 @@ -SHA256 (libcmis-0.1.0.tar.gz) = 2452f9a746d85a126a9a61d71330f6ecca5449f1ab08f43924d660a143bd7e95 -SIZE (libcmis-0.1.0.tar.gz) = 373429 +SHA256 (libcmis-0.3.0.tar.gz) = 8c1271cba2494d8c52bba08fa3b14cdca7401b5f90faacb8b206364c84233ffb +SIZE (libcmis-0.3.0.tar.gz) = 515564 diff --git a/net/libcmis/files/patch-configure b/net/libcmis/files/patch-configure deleted file mode 100644 index b9c0c1d79267..000000000000 --- a/net/libcmis/files/patch-configure +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.orig 2012-05-07 21:34:01.900594469 +0200 -+++ configure 2012-05-07 21:57:05.241595943 +0200 -@@ -3178,19 +3178,6 @@ - - fi - --if test x"$enable_werror" != "xno"; then : -- -- CFLAGS="$CFLAGS -Werror" -- CXXFLAGS="$CXXFLAGS -Werror" -- --fi --if test x"$GCC" = xyes; then : -- -- # Be tough with warnings and produce less careless code -- CFLAGS="$CFLAGS -Wall -pedantic" -- CXXFLAGS="$CXXFLAGS -Wall -pedantic" -- --fi - - LIBCMIS_API_VERSION=0.2 - -@@ -15971,6 +15958,12 @@ - - ac_config_files="$ac_config_files Makefile libcmis.pc src/Makefile src/libcmis/Makefile" - -+if test x"$enable_werror" != "xno"; then : -+ -+ CFLAGS="$CFLAGS -Werror" -+ CXXFLAGS="$CXXFLAGS -Werror" -+ -+fi - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure diff --git a/net/libcmis/files/patch-src__libcmis__atom-document.hxx b/net/libcmis/files/patch-src__libcmis__atom-document.hxx deleted file mode 100644 index b20d89c64e52..000000000000 --- a/net/libcmis/files/patch-src__libcmis__atom-document.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libcmis/atom-document.hxx.orig 2011-10-01 14:26:15.000000000 +0200 -+++ src/libcmis/atom-document.hxx 2012-05-07 20:06:51.000000000 +0200 -@@ -44,7 +44,7 @@ class AtomDocument : public libcmis::Doc - public: - AtomDocument( AtomPubSession* session, std::string url ); - AtomDocument( AtomPubSession* session, xmlNodePtr entryNd ); -- ~AtomDocument( ); -+ virtual ~AtomDocument( ); - - // Override content methods - virtual FILE* getContent( const char* path = NULL ); diff --git a/net/libcmis/files/patch-src__libcmis__atom-folder.hxx b/net/libcmis/files/patch-src__libcmis__atom-folder.hxx deleted file mode 100644 index 55ff5295a598..000000000000 --- a/net/libcmis/files/patch-src__libcmis__atom-folder.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libcmis/atom-folder.hxx.orig 2011-09-30 20:52:01.000000000 +0200 -+++ src/libcmis/atom-folder.hxx 2012-05-07 20:06:29.000000000 +0200 -@@ -42,7 +42,7 @@ class AtomFolder : public libcmis::Folde - public: - AtomFolder( AtomPubSession* session, std::string url ); - AtomFolder( AtomPubSession* session, xmlNodePtr entryNd ); -- ~AtomFolder( ); -+ virtual ~AtomFolder( ); - - // virtual pure methods from Folder - virtual std::vector< libcmis::CmisObjectPtr > getChildren( ); diff --git a/net/libcmis/files/patch-src__libcmis__session.hxx b/net/libcmis/files/patch-src__libcmis__session.hxx deleted file mode 100644 index 6a2eedb7e595..000000000000 --- a/net/libcmis/files/patch-src__libcmis__session.hxx +++ /dev/null @@ -1,10 +0,0 @@ ---- src/libcmis/session.hxx.orig 2011-09-30 20:38:39.000000000 +0200 -+++ src/libcmis/session.hxx 2012-05-07 19:23:43.000000000 +0200 -@@ -36,6 +36,7 @@ namespace libcmis - class Session - { - public: -+ virtual ~Session( ) { } - - /** Get the Root folder of the repository - */ diff --git a/net/libcmis/pkg-plist b/net/libcmis/pkg-plist index 5d37a221b1af..99d2e116c085 100644 --- a/net/libcmis/pkg-plist +++ b/net/libcmis/pkg-plist @@ -1,11 +1,41 @@ -include/libcmis/cmis-object.hxx -include/libcmis/document.hxx -include/libcmis/folder.hxx -include/libcmis/session-factory.hxx -include/libcmis/session.hxx -lib/libcmis-0.2.a -lib/libcmis-0.2.la -lib/libcmis-0.2.so -lib/libcmis-0.2.so.0 -libdata/pkgconfig/libcmis-0.2.pc -@dirrm include/libcmis +bin/cmis-client +include/libcmis-0.3/libcmis/allowable-actions.hxx +include/libcmis-0.3/libcmis/document.hxx +include/libcmis-0.3/libcmis/exception.hxx +include/libcmis-0.3/libcmis/folder.hxx +include/libcmis-0.3/libcmis/object-type.hxx +include/libcmis-0.3/libcmis/object.hxx +include/libcmis-0.3/libcmis/property-type.hxx +include/libcmis-0.3/libcmis/property.hxx +include/libcmis-0.3/libcmis/repository.hxx +include/libcmis-0.3/libcmis/session-factory.hxx +include/libcmis-0.3/libcmis/session.hxx +include/libcmis-0.3/libcmis/xml-utils.hxx +include/libcmis-0.3/libcmis/xmlserializable.hxx +include/libcmis-c-0.3/libcmis-c/allowable-actions.h +include/libcmis-c-0.3/libcmis-c/document.h +include/libcmis-c-0.3/libcmis-c/error.h +include/libcmis-c-0.3/libcmis-c/folder.h +include/libcmis-c-0.3/libcmis-c/object-type.h +include/libcmis-c-0.3/libcmis-c/object.h +include/libcmis-c-0.3/libcmis-c/property-type.h +include/libcmis-c-0.3/libcmis-c/property.h +include/libcmis-c-0.3/libcmis-c/repository.h +include/libcmis-c-0.3/libcmis-c/session-factory.h +include/libcmis-c-0.3/libcmis-c/session.h +include/libcmis-c-0.3/libcmis-c/types.h +include/libcmis-c-0.3/libcmis-c/vectors.h +lib/libcmis-0.3.a +lib/libcmis-0.3.la +lib/libcmis-0.3.so +lib/libcmis-0.3.so.3 +lib/libcmis-c-0.3.a +lib/libcmis-c-0.3.la +lib/libcmis-c-0.3.so +lib/libcmis-c-0.3.so.3 +libdata/pkgconfig/libcmis-0.3.pc +libdata/pkgconfig/libcmis-c-0.3.pc +@dirrm include/libcmis-c-0.3/libcmis-c +@dirrm include/libcmis-c-0.3 +@dirrm include/libcmis-0.3/libcmis +@dirrm include/libcmis-0.3 diff --git a/net/libcmis03/Makefile b/net/libcmis03/Makefile deleted file mode 100644 index 722180ca7493..000000000000 --- a/net/libcmis03/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# $FreeBSD$ - -PORTNAME= libcmis -PORTVERSION= 0.3.0 -CATEGORIES= net devel -MASTER_SITES= SF/${PORTNAME} - -MAINTAINER= office@FreeBSD.org -COMMENT= Client library for the CMIS interface - -LICENSE= LGPL20 MPL GPLv2 -LICENSE_COMB= dual - -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl -BUILD_DEPENDS= ${LOCALBASE}/lib/libcppunit.so:${PORTSDIR}/devel/cppunit \ - ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs - -GNU_CONFIGURE= yes -USE_GNOME= libxml2 gnomehack -USE_GMAKE= yes -USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes - -CXXFLAGS+= -std=c++98 -CONFIGURE_ARGS+= --without-man \ - --with-boost=${LOCALBASE} \ - --disable-werror - -.include <bsd.port.pre.mk> - -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014 -CC= /usr/bin/clang -CPP= /usr/bin/clang-cpp -CXX= /usr/bin/clang++ -CONFIGURE_ENV+= CXXCPP="${CPP}" -.else -BUILD_DEPENDS+= clang-devel>=3.2.r159895:${PORTSDIR}/lang/clang-devel -USE_BINUTILS= yes -CC= ${LOCALBASE}/bin/clang -CPP= ${CC} -E -CXX= ${LOCALBASE}/bin/clang++ -CONFIGURE_ENV+= CXXCPP="${CXX} -E" -.endif - -post-patch: - @${REINPLACE_CMD} -e "s|@WITH_LIBCMIS_MAN_FALSE@|#|g" ${WRKSRC}/Makefile.in - -.include <bsd.port.post.mk> diff --git a/net/libcmis03/distinfo b/net/libcmis03/distinfo deleted file mode 100644 index 086bc70f6e68..000000000000 --- a/net/libcmis03/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (libcmis-0.3.0.tar.gz) = 8c1271cba2494d8c52bba08fa3b14cdca7401b5f90faacb8b206364c84233ffb -SIZE (libcmis-0.3.0.tar.gz) = 515564 diff --git a/net/libcmis03/pkg-descr b/net/libcmis03/pkg-descr deleted file mode 100644 index ce87379fd3a9..000000000000 --- a/net/libcmis03/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -LibCMIS is a C++ client library for the CMIS interface. This allows C++ -applications to connect to any ECM behaving as a CMIS server like Alfresco, -Nuxeo for the open source ones. - -WWW: http://sourceforge.net/projects/libcmis/ diff --git a/net/libcmis03/pkg-plist b/net/libcmis03/pkg-plist deleted file mode 100644 index 99d2e116c085..000000000000 --- a/net/libcmis03/pkg-plist +++ /dev/null @@ -1,41 +0,0 @@ -bin/cmis-client -include/libcmis-0.3/libcmis/allowable-actions.hxx -include/libcmis-0.3/libcmis/document.hxx -include/libcmis-0.3/libcmis/exception.hxx -include/libcmis-0.3/libcmis/folder.hxx -include/libcmis-0.3/libcmis/object-type.hxx -include/libcmis-0.3/libcmis/object.hxx -include/libcmis-0.3/libcmis/property-type.hxx -include/libcmis-0.3/libcmis/property.hxx -include/libcmis-0.3/libcmis/repository.hxx -include/libcmis-0.3/libcmis/session-factory.hxx -include/libcmis-0.3/libcmis/session.hxx -include/libcmis-0.3/libcmis/xml-utils.hxx -include/libcmis-0.3/libcmis/xmlserializable.hxx -include/libcmis-c-0.3/libcmis-c/allowable-actions.h -include/libcmis-c-0.3/libcmis-c/document.h -include/libcmis-c-0.3/libcmis-c/error.h -include/libcmis-c-0.3/libcmis-c/folder.h -include/libcmis-c-0.3/libcmis-c/object-type.h -include/libcmis-c-0.3/libcmis-c/object.h -include/libcmis-c-0.3/libcmis-c/property-type.h -include/libcmis-c-0.3/libcmis-c/property.h -include/libcmis-c-0.3/libcmis-c/repository.h -include/libcmis-c-0.3/libcmis-c/session-factory.h -include/libcmis-c-0.3/libcmis-c/session.h -include/libcmis-c-0.3/libcmis-c/types.h -include/libcmis-c-0.3/libcmis-c/vectors.h -lib/libcmis-0.3.a -lib/libcmis-0.3.la -lib/libcmis-0.3.so -lib/libcmis-0.3.so.3 -lib/libcmis-c-0.3.a -lib/libcmis-c-0.3.la -lib/libcmis-c-0.3.so -lib/libcmis-c-0.3.so.3 -libdata/pkgconfig/libcmis-0.3.pc -libdata/pkgconfig/libcmis-c-0.3.pc -@dirrm include/libcmis-c-0.3/libcmis-c -@dirrm include/libcmis-c-0.3 -@dirrm include/libcmis-0.3/libcmis -@dirrm include/libcmis-0.3 |