Index: head/databases/evolution-data-server/Makefile =================================================================== --- head/databases/evolution-data-server/Makefile (revision 461289) +++ head/databases/evolution-data-server/Makefile (revision 461290) @@ -1,80 +1,81 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= evolution-data-server PORTVERSION= 3.24.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Data backends for the Evolution integrated mail/PIM suite LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= vapigen:lang/vala LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libgcr-base-3.so:security/gcr \ libgoa-1.0.so:net/gnome-online-accounts \ libgdata.so:devel/libgdata \ libical.so:devel/libical \ libnss3.so:security/nss \ libicudata.so:devel/icu \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libjson-glib-1.0.so:devel/json-glib \ libp11-kit.so:security/p11-kit \ libnspr4.so:devel/nspr \ libsecret-1.so:security/libsecret PORTSCOUT= limitw:1,even USES= bdb:5 cmake compiler:c++11-lib gettext gnome gperf \ iconv localbase pathfix pkgconfig python:3.3+,build\ sqlite tar:xz +USE_CXXSTD= gnu++11 USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2 USE_LDCONFIG= yes CMAKE_ARGS= -DENABLE_VALA_BINDINGS=ON \ -DENABLE_INTROSPECTION=ON \ -DENABLE_UOA=OFF CMAKE_ARGS+= -DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \ -DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb-5" GLIB_SCHEMAS= org.gnome.Evolution.DefaultSources.gschema.xml \ org.gnome.evolution.eds-shell.gschema.xml \ org.gnome.evolution-data-server.addressbook.gschema.xml \ org.gnome.evolution-data-server.calendar.gschema.xml \ org.gnome.evolution-data-server.gschema.xml \ org.gnome.evolution.shell.network-config.gschema.xml PLIST_SUB= VERSION="3.24" EVO_VERSION="1.2" OPTIONS_SUB= yes OPTIONS_DEFINE= WEATHER KERBEROS LDAP OPTIONS_DEFAULT=WEATHER KERBEROS LDAP KERBEROS_CMAKE_ON= -DWITH_KRB5=/usr KERBEROS_CMAKE_OFF= -DWITH_KRB5=OFF KERBEROS_USES= ssl LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE} LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF LDAP_USE= openldap=yes WEATHER_DESC= Weather calendar backend WEATHER_LIB_DEPENDS= libgweather-3.so:net/libgweather WEATHER_CMAKE_BOOL= ENABLE_WEATHER .include post-patch: @${REINPLACE_CMD} -e 's| python| ${PYTHON_VERSION}|g' \ ${WRKSRC}/CMakeLists.txt post-install: @${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd .include Index: head/devel/icu/Makefile =================================================================== --- head/devel/icu/Makefile (revision 461289) +++ head/devel/icu/Makefile (revision 461290) @@ -1,50 +1,50 @@ # Created by: dwm # $FreeBSD$ PORTNAME= icu DISTVERSION= 60_2 -PORTREVISION?= 1 # keep for icu-lx +PORTREVISION?= 2 # keep for icu-lx PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \ SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION} DISTNAME= icu4c-${DISTVERSION}-src MAINTAINER= office@FreeBSD.org COMMENT?= International Components for Unicode (from IBM) LICENSE= ICU LICENSE_NAME= ICU license LICENSE_FILE= ${WRKSRC}/../LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes CONFIGURE_ARGS?=--disable-layoutex CONFIGURE_ARGS+=--with-data-packaging=archive \ --disable-renaming \ --disable-samples \ --enable-static CPPFLAGS+= -DICU_NO_USER_DATA_OVERRIDE MAKE_ARGS= VERBOSE=1 TEST_TARGET= check USES+= compiler:c++11-lib gmake pathfix tar:tgz USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/icu/source ICUMAJOR= ${PORTVERSION:C/\..*//} PLIST_SUB+= ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION} .ifndef PKGNAMESUFFIX post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \ ${STAGEDIR}${PREFIX}/bin/*conv \ ${STAGEDIR}${PREFIX}/bin/icuinfo \ ${STAGEDIR}${PREFIX}/bin/derb \ ${STAGEDIR}${PREFIX}/bin/pkgdata @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* # Filename varies by endianness: icudtb.dat vs. icudtl.dat @(cd ${STAGEDIR}${PREFIX} && ${ECHO_CMD} \ ${DATADIR_REL}/${PORTVERSION}/icudt*.dat >>${TMPPLIST}) .endif # PKGNAMESUFFIX .include Index: head/devel/icu/files/patch-common_unicode_umachine.h =================================================================== --- head/devel/icu/files/patch-common_unicode_umachine.h (revision 461289) +++ head/devel/icu/files/patch-common_unicode_umachine.h (nonexistent) @@ -1,11 +0,0 @@ ---- common/unicode/umachine.h.orig 2017-03-16 19:01:12 UTC -+++ common/unicode/umachine.h -@@ -295,7 +295,7 @@ typedef int8_t UBool; - * If 1, then char16_t is a typedef and not a real type (yet) - * @internal - */ --#if (U_PLATFORM == U_PF_AIX) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11) -+#if defined(__cplusplus) && (U_CPLUSPLUS_VERSION < 11) - // for AIX, uchar.h needs to be included - # include - # define U_CHAR16_IS_TYPEDEF 1 Property changes on: head/devel/icu/files/patch-common_unicode_umachine.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/icu/files/patch-common_unicode_unistr.h =================================================================== --- head/devel/icu/files/patch-common_unicode_unistr.h (revision 461289) +++ head/devel/icu/files/patch-common_unicode_unistr.h (nonexistent) @@ -1,33 +0,0 @@ ---- common/unicode/unistr.h.orig 2017-03-29 04:44:37 UTC -+++ common/unicode/unistr.h -@@ -117,12 +117,20 @@ class UnicodeStringAppendable; // unicode/appendable. - * The string parameter must be a C string literal. - * The length of the string, not including the terminating - * NUL, must be specified as a constant. -+ * The U_STRING_DECL macro should be invoked exactly once for one -+ * such string variable before it is used. - * @stable ICU 2.0 - */ - #if !U_CHAR16_IS_TYPEDEF - # define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, u ## cs, _length) -+#elif defined(U_DECLARE_UTF16) -+# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t *)U_DECLARE_UTF16(cs), _length) -+#elif U_SIZEOF_WCHAR_T==U_SIZEOF_UCHAR && (U_CHARSET_FAMILY==U_ASCII_FAMILY || (U_SIZEOF_UCHAR == 2 && defined(U_WCHAR_IS_UTF16))) -+# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t *)L ## cs, _length) -+#elif U_SIZEOF_UCHAR==1 && U_CHARSET_FAMILY==U_ASCII_FAMILY -+# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t *)cs, _length) - #else --# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t*)u ## cs, _length) -+# define UNICODE_STRING(cs, _length) icu::UnicodeString(cs, _length, US_INV) - #endif - - /** -@@ -3985,7 +3993,7 @@ UnicodeString::isBufferWritable() const - inline const char16_t * - UnicodeString::getBuffer() const { - if(fUnion.fFields.fLengthAndFlags&(kIsBogus|kOpenGetBuffer)) { -- return nullptr; -+ return NULL; - } else if(fUnion.fFields.fLengthAndFlags&kUsingStackBuffer) { - return fUnion.fStackFields.fBuffer; - } else { Property changes on: head/devel/icu/files/patch-common_unicode_unistr.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/icu/files/patch-revert-r40077 =================================================================== --- head/devel/icu/files/patch-revert-r40077 (revision 461289) +++ head/devel/icu/files/patch-revert-r40077 (nonexistent) @@ -1,297 +0,0 @@ -Revert https://ssl.icu-project.org/trac/changeset/40077 -until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222433 - ---- common/cmemory.h.orig 2017-10-06 01:37:59 UTC -+++ common/cmemory.h -@@ -162,6 +162,7 @@ class LocalMemory : public LocalPointerBase { (publ - * @param p simple pointer to an array of T items that is adopted - */ - explicit LocalMemory(T *p=NULL) : LocalPointerBase(p) {} -+#if U_HAVE_RVALUE_REFERENCES - /** - * Move constructor, leaves src with isNull(). - * @param src source smart pointer -@@ -169,12 +170,14 @@ class LocalMemory : public LocalPointerBase { (publ - LocalMemory(LocalMemory &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { - src.ptr=NULL; - } -+#endif - /** - * Destructor deletes the memory it owns. - */ - ~LocalMemory() { - uprv_free(LocalPointerBase::ptr); - } -+#if U_HAVE_RVALUE_REFERENCES - /** - * Move assignment operator, leaves src with isNull(). - * The behavior is undefined if *this and src are the same object. -@@ -184,6 +187,7 @@ class LocalMemory : public LocalPointerBase { (publ - LocalMemory &operator=(LocalMemory &&src) U_NOEXCEPT { - return moveFrom(src); - } -+#endif - /** - * Move assignment, leaves src with isNull(). - * The behavior is undefined if *this and src are the same object. ---- common/unicode/localpointer.h.orig 2017-04-26 20:23:44 UTC -+++ common/unicode/localpointer.h -@@ -213,6 +213,7 @@ class LocalPointer : public LocalPointerBase { (pub - errorCode=U_MEMORY_ALLOCATION_ERROR; - } - } -+#if U_HAVE_RVALUE_REFERENCES - /** - * Move constructor, leaves src with isNull(). - * @param src source smart pointer -@@ -221,6 +222,7 @@ class LocalPointer : public LocalPointerBase { (pub - LocalPointer(LocalPointer &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { - src.ptr=NULL; - } -+#endif - /** - * Destructor deletes the object it owns. - * @stable ICU 4.4 -@@ -228,6 +230,7 @@ class LocalPointer : public LocalPointerBase { (pub - ~LocalPointer() { - delete LocalPointerBase::ptr; - } -+#if U_HAVE_RVALUE_REFERENCES - /** - * Move assignment operator, leaves src with isNull(). - * The behavior is undefined if *this and src are the same object. -@@ -238,6 +241,7 @@ class LocalPointer : public LocalPointerBase { (pub - LocalPointer &operator=(LocalPointer &&src) U_NOEXCEPT { - return moveFrom(src); - } -+#endif - // do not use #ifndef U_HIDE_DRAFT_API for moveFrom, needed by non-draft API - /** - * Move assignment, leaves src with isNull(). -@@ -358,6 +362,7 @@ class LocalArray : public LocalPointerBase { (publi - errorCode=U_MEMORY_ALLOCATION_ERROR; - } - } -+#if U_HAVE_RVALUE_REFERENCES - /** - * Move constructor, leaves src with isNull(). - * @param src source smart pointer -@@ -366,6 +371,7 @@ class LocalArray : public LocalPointerBase { (publi - LocalArray(LocalArray &&src) U_NOEXCEPT : LocalPointerBase(src.ptr) { - src.ptr=NULL; - } -+#endif - /** - * Destructor deletes the array it owns. - * @stable ICU 4.4 -@@ -373,6 +379,7 @@ class LocalArray : public LocalPointerBase { (publi - ~LocalArray() { - delete[] LocalPointerBase::ptr; - } -+#if U_HAVE_RVALUE_REFERENCES - /** - * Move assignment operator, leaves src with isNull(). - * The behavior is undefined if *this and src are the same object. -@@ -383,6 +390,7 @@ class LocalArray : public LocalPointerBase { (publi - LocalArray &operator=(LocalArray &&src) U_NOEXCEPT { - return moveFrom(src); - } -+#endif - // do not use #ifndef U_HIDE_DRAFT_API for moveFrom, needed by non-draft API - /** - * Move assignment, leaves src with isNull(). -@@ -484,6 +492,7 @@ class LocalArray : public LocalPointerBase { (publi - * @see LocalPointer - * @stable ICU 4.4 - */ -+#if U_HAVE_RVALUE_REFERENCES - #define U_DEFINE_LOCAL_OPEN_POINTER(LocalPointerClassName, Type, closeFunction) \ - class LocalPointerClassName : public LocalPointerBase { \ - public: \ -@@ -517,6 +526,34 @@ class LocalArray : public LocalPointerBase { (publi - ptr=p; \ - } \ - } -+#else -+#define U_DEFINE_LOCAL_OPEN_POINTER(LocalPointerClassName, Type, closeFunction) \ -+ class LocalPointerClassName : public LocalPointerBase { \ -+ public: \ -+ using LocalPointerBase::operator*; \ -+ using LocalPointerBase::operator->; \ -+ explicit LocalPointerClassName(Type *p=NULL) : LocalPointerBase(p) {} \ -+ ~LocalPointerClassName() { closeFunction(ptr); } \ -+ LocalPointerClassName &moveFrom(LocalPointerClassName &src) U_NOEXCEPT { \ -+ if (ptr != NULL) { closeFunction(ptr); } \ -+ LocalPointerBase::ptr=src.ptr; \ -+ src.ptr=NULL; \ -+ return *this; \ -+ } \ -+ void swap(LocalPointerClassName &other) U_NOEXCEPT { \ -+ Type *temp=LocalPointerBase::ptr; \ -+ LocalPointerBase::ptr=other.ptr; \ -+ other.ptr=temp; \ -+ } \ -+ friend inline void swap(LocalPointerClassName &p1, LocalPointerClassName &p2) U_NOEXCEPT { \ -+ p1.swap(p2); \ -+ } \ -+ void adoptInstead(Type *p) { \ -+ if (ptr != NULL) { closeFunction(ptr); } \ -+ ptr=p; \ -+ } \ -+ } -+#endif - - U_NAMESPACE_END - ---- common/unicode/platform.h.orig 2017-10-05 00:47:38 UTC -+++ common/unicode/platform.h -@@ -499,6 +499,22 @@ namespace std { - #endif - - /** -+ * \def U_HAVE_RVALUE_REFERENCES -+ * Set to 1 if the compiler supports rvalue references. -+ * C++11 feature, necessary for move constructor & move assignment. -+ * @internal -+ */ -+#ifdef U_HAVE_RVALUE_REFERENCES -+ /* Use the predefined value. */ -+#elif U_CPLUSPLUS_VERSION >= 11 || __has_feature(cxx_rvalue_references) \ -+ || defined(__GXX_EXPERIMENTAL_CXX0X__) \ -+ || (defined(_MSC_VER) && _MSC_VER >= 1600) /* Visual Studio 2010 */ -+# define U_HAVE_RVALUE_REFERENCES 1 -+#else -+# define U_HAVE_RVALUE_REFERENCES 0 -+#endif -+ -+/** - * \def U_NOEXCEPT - * "noexcept" if supported, otherwise empty. - * Some code, especially STL containers, uses move semantics of objects only ---- common/unicode/unistr.h.orig 2017-09-14 19:20:49 UTC -+++ common/unicode/unistr.h -@@ -1891,6 +1891,7 @@ class U_COMMON_API UnicodeString : public Replaceable - */ - UnicodeString &fastCopyFrom(const UnicodeString &src); - -+#if U_HAVE_RVALUE_REFERENCES - /** - * Move assignment operator, might leave src in bogus state. - * This string will have the same contents and state that the source string had. -@@ -1902,7 +1903,7 @@ class U_COMMON_API UnicodeString : public Replaceable - UnicodeString &operator=(UnicodeString &&src) U_NOEXCEPT { - return moveFrom(src); - } -- -+#endif - // do not use #ifndef U_HIDE_DRAFT_API for moveFrom, needed by non-draft API - /** - * Move assignment, might leave src in bogus state. -@@ -3349,6 +3350,7 @@ class U_COMMON_API UnicodeString : public Replaceable - */ - UnicodeString(const UnicodeString& that); - -+#if U_HAVE_RVALUE_REFERENCES - /** - * Move constructor, might leave src in bogus state. - * This string will have the same contents and state that the source string had. -@@ -3356,6 +3358,7 @@ class U_COMMON_API UnicodeString : public Replaceable - * @stable ICU 56 - */ - UnicodeString(UnicodeString &&src) U_NOEXCEPT; -+#endif - - /** - * 'Substring' constructor from tail of source string. ---- common/unistr.cpp.orig 2017-04-26 20:23:44 UTC -+++ common/unistr.cpp -@@ -308,10 +308,12 @@ UnicodeString::UnicodeString(const UnicodeString& that - copyFrom(that); - } - -+#if U_HAVE_RVALUE_REFERENCES - UnicodeString::UnicodeString(UnicodeString &&src) U_NOEXCEPT { - fUnion.fFields.fLengthAndFlags = kShortString; - moveFrom(src); - } -+#endif - - UnicodeString::UnicodeString(const UnicodeString& that, - int32_t srcStart) { ---- test/intltest/itutil.cpp.orig 2017-04-26 20:23:44 UTC -+++ test/intltest/itutil.cpp -@@ -375,6 +375,7 @@ void LocalPointerTest::TestLocalPointerMoveSwap() { - if(s3.getAlias() != p1 || s1.isValid()) { - errln("LocalPointer.moveFrom() did not move"); - } -+#if U_HAVE_RVALUE_REFERENCES - infoln("TestLocalPointerMoveSwap() with rvalue references"); - s1 = static_cast &&>(s3); - if(s1.getAlias() != p1 || s3.isValid()) { -@@ -384,6 +385,9 @@ void LocalPointerTest::TestLocalPointerMoveSwap() { - if(s4.getAlias() != p2 || s2.isValid()) { - errln("LocalPointer move constructor did not move"); - } -+#else -+ infoln("TestLocalPointerMoveSwap() without rvalue references"); -+#endif - - // Move self assignment leaves the object valid but in an undefined state. - // Do it to make sure there is no crash, -@@ -468,6 +472,7 @@ void LocalPointerTest::TestLocalArrayMoveSwap() { - if(a3.getAlias() != p1 || a1.isValid()) { - errln("LocalArray.moveFrom() did not move"); - } -+#if U_HAVE_RVALUE_REFERENCES - infoln("TestLocalArrayMoveSwap() with rvalue references"); - a1 = static_cast &&>(a3); - if(a1.getAlias() != p1 || a3.isValid()) { -@@ -477,6 +482,9 @@ void LocalPointerTest::TestLocalArrayMoveSwap() { - if(a4.getAlias() != p2 || a2.isValid()) { - errln("LocalArray move constructor did not move"); - } -+#else -+ infoln("TestLocalArrayMoveSwap() without rvalue references"); -+#endif - - // Move self assignment leaves the object valid but in an undefined state. - // Do it to make sure there is no crash, -@@ -636,6 +644,7 @@ void LocalPointerTest::TestLocalXyzPointerMoveSwap() { - if(f3.getAlias() != p1 || f1.isValid()) { - errln("LocalUNormalizer2Pointer.moveFrom() did not move"); - } -+#if U_HAVE_RVALUE_REFERENCES - infoln("TestLocalXyzPointerMoveSwap() with rvalue references"); - f1 = static_cast(f3); - if(f1.getAlias() != p1 || f3.isValid()) { -@@ -645,6 +654,9 @@ void LocalPointerTest::TestLocalXyzPointerMoveSwap() { - if(f4.getAlias() != p2 || f2.isValid()) { - errln("LocalUNormalizer2Pointer move constructor did not move"); - } -+#else -+ infoln("TestLocalXyzPointerMoveSwap() without rvalue references"); -+#endif - // Move self assignment leaves the object valid but in an undefined state. - // Do it to make sure there is no crash, - // but do not check for any particular resulting value. ---- test/intltest/ustrtest.cpp.orig 2017-09-21 23:45:08 UTC -+++ test/intltest/ustrtest.cpp -@@ -2160,6 +2160,7 @@ UnicodeStringTest::TestMoveSwap() { - if(s6.getBuffer() != abc || s6.length() != 3) { - errln("UnicodeString.moveFrom(alias) did not move"); - } -+#if U_HAVE_RVALUE_REFERENCES - infoln("TestMoveSwap() with rvalue references"); - s1 = static_cast(s6); - if(s1.getBuffer() != abc || s1.length() != 3) { -@@ -2169,6 +2170,10 @@ UnicodeStringTest::TestMoveSwap() { - if(s7.getBuffer() != p || s7.length() != 100 || !s4.isBogus()) { - errln("UnicodeString move constructor did not move"); - } -+#else -+ infoln("TestMoveSwap() without rvalue references"); -+ UnicodeString s7; -+#endif - - // Move self assignment leaves the object valid but in an undefined state. - // Do it to make sure there is no crash, Property changes on: head/devel/icu/files/patch-revert-r40077 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/icu/files/patch-common_unicode_platform.h =================================================================== --- head/devel/icu/files/patch-common_unicode_platform.h (revision 461289) +++ head/devel/icu/files/patch-common_unicode_platform.h (revision 461290) @@ -1,31 +1,13 @@ --- common/unicode/platform.h.orig 2017-03-22 19:06:26 UTC +++ common/unicode/platform.h @@ -382,8 +382,8 @@ */ #ifdef U_IS_BIG_ENDIAN /* Use the predefined value. */ -#elif defined(BYTE_ORDER) && defined(BIG_ENDIAN) -# define U_IS_BIG_ENDIAN (BYTE_ORDER == BIG_ENDIAN) +#elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) +# define U_IS_BIG_ENDIAN (_BYTE_ORDER == _BIG_ENDIAN) #elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) /* gcc */ # define U_IS_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) -@@ -498,11 +498,15 @@ - # define U_CPLUSPLUS_VERSION 1 - #endif - --#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11) -+#if defined(__cplusplus) && (U_CPLUSPLUS_VERSION < 11) - // add in std::nullptr_t - namespace std { -+#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390) - typedef decltype(nullptr) nullptr_t; --}; -+#elif defined(__GNUC__) && !defined(__clang__) -+ typedef __decltype(__null) nullptr_t; -+#endif -+} - #endif - - /** Index: head/devel/icu-le-hb/Makefile =================================================================== --- head/devel/icu-le-hb/Makefile (revision 461289) +++ head/devel/icu-le-hb/Makefile (revision 461290) @@ -1,28 +1,29 @@ # $FreeBSD$ PORTNAME= icu-le-hb DISTVERSION= 1.0.3-3 DISTVERSIONSUFFIX= -gb8a3163 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel print MAINTAINER= office@FreeBSD.org COMMENT= ICU Layout Engine API on top of HarfBuzz shaping library LICENSE= ICU LICENSE_NAME= ICU license LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libicuuc.so:devel/icu \ libharfbuzz.so:print/harfbuzz USE_GITHUB= yes GH_ACCOUNT= behdad -USES= autoreconf gmake libtool pathfix pkgconfig +USES= autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig +USE_CXXSTD= gnu++11 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip .include Index: head/devel/pecl-intl/Makefile =================================================================== --- head/devel/pecl-intl/Makefile (revision 461289) +++ head/devel/pecl-intl/Makefile (revision 461290) @@ -1,19 +1,20 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= intl PORTVERSION= 3.0.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel pear MAINTAINER= sunpoet@FreeBSD.org COMMENT= PECL extension to support Internationalization(ICU) LICENSE= PHP301 LIB_DEPENDS= libicui18n.so:devel/icu IGNORE_WITH_PHP=70 71 72 -USES= php:pecl +USES= compiler:c++11-lib php:pecl +USE_CXXSTD= gnu++11 .include Index: head/devel/php70-intl/Makefile =================================================================== --- head/devel/php70-intl/Makefile (revision 461289) +++ head/devel/php70-intl/Makefile (revision 461290) @@ -1,10 +1,14 @@ # Created by: Alex Dupre # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -intl + +USES= compiler:c++11-lib +USE_CXXSTD= gnu++11 .include "${MASTERDIR}/Makefile" Index: head/devel/php71-intl/Makefile =================================================================== --- head/devel/php71-intl/Makefile (revision 461289) +++ head/devel/php71-intl/Makefile (revision 461290) @@ -1,9 +1,13 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php71 PKGNAMESUFFIX= -intl + +USES= compiler:c++11-lib +USE_CXXSTD= gnu++11 .include "${MASTERDIR}/Makefile" Index: head/devel/php72-intl/Makefile =================================================================== --- head/devel/php72-intl/Makefile (revision 461289) +++ head/devel/php72-intl/Makefile (revision 461290) @@ -1,9 +1,13 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php72 PKGNAMESUFFIX= -intl + +USES= compiler:c++11-lib +USE_CXXSTD= gnu++11 .include "${MASTERDIR}/Makefile" Index: head/games/openttd/Makefile =================================================================== --- head/games/openttd/Makefile (revision 461289) +++ head/games/openttd/Makefile (revision 461290) @@ -1,128 +1,131 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= openttd DISTVERSION= 1.7.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://de.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://fr.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${DISTVERSION}/ \ http://uk.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://us.binaries.openttd.org/binaries/releases/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= danfe@FreeBSD.org COMMENT= Open source clone of Microprose Transport Tycoon Deluxe LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ liblzo2.so:archivers/lzo2 BROKEN_powerpc64= fails to compile: libicuuc.so: undefined reference to __cxa_throw_bad_array_new_length USES= cpe gmake pkgconfig tar:xz HAS_CONFIGURE= yes CONFIGURE_ENV= STRIP="${STRIP_CMD} ${STRIP}" CONFIGURE_ARGS= --prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" MAKE_ARGS= VERBOSE=1 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} CXXFLAGS= # Set to empty as OpenTTD treats it as an addition to CFLAGS SUB_FILES= pkg-message PORTDOCS= HOWTO_compile_lang_files.txt admin_network.txt \ elrail.svg elrail_tile.png elrail_track.png landscape.html \ landscape_externals.html landscape_grid.html multiplayer.txt \ obg_format.txt obm_format.txt obs_format.txt \ ottd-colourtext-palette.png tileh.png DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \ "Game;Simulation;StrategyGame;" false .if defined(WITH_MIDI_PLAYER) CONFIGURE_ARGS+= --with-midi="${WITH_MIDI_PLAYER}" .endif .if defined(WITH_MIDI_PLAYER_ARGS) CONFIGURE_ARGS+= --with-midi-arg="${WITH_MIDI_PLAYER_ARGS}" .endif .if defined(WITH_DEDICATED_SERVER_ONLY) CONFIGURE_ARGS+= --enable-dedicated # Aid it to find lzo2 headers; client build gets it via sdl-config CFLAGS+= -I${LOCALBASE}/include USE_RC_SUBR= ${PORTNAME} .else +USES+= compiler:c++11-lib +USE_CXXSTD= gnu++11 LIB_DEPENDS+= libfreetype.so:print/freetype2 \ libicui18n.so:devel/icu \ libicu-le-hb.so:devel/icu-le-hb \ libiculx.so:devel/icu-lx \ libfontconfig.so:x11-fonts/fontconfig USE_SDL= sdl INSTALLS_ICONS= yes .endif .if defined(WITH_OPEN_GAME_FILES) RUN_DEPENDS+= ${LOCALBASE}/share/${PORTNAME}/baseset/opengfx/opengfx.obg:games/opengfx \ ${LOCALBASE}/share/${PORTNAME}/baseset/openmsx/openmsx.obm:games/openmsx \ ${LOCALBASE}/share/${PORTNAME}/baseset/opensfx/opensfx.obs:games/opensfx .endif .if defined(WITH_SAVE_PASSWORDS) EXTRA_PATCHES= ${FILESDIR}/extra-patch-save-passwords .endif .include pre-everything:: .if !defined(WITH_MIDI_PLAYER) @${ECHO_MSG} "Define WITH_MIDI_PLAYER=/path/to/player to build with external MIDI player" .endif .if !defined(WITH_MIDI_PLAYER_ARGS) @${ECHO_MSG} "Define WITH_MIDI_PLAYER_ARGS=arguments for external MIDI player" .endif .if !defined(WITH_DEDICATED_SERVER_ONLY) @${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server" .endif .if !defined(WITH_OPEN_GAME_FILES) @${ECHO_MSG} "Define WITH_OPEN_GAME_FILES to install with libre graphics, music, and sounds" .endif .if !defined(WITH_SAVE_PASSWORDS) @${ECHO_MSG} "Define WITH_SAVE_PASSWORDS to save passwords between server restarts" .endif post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/ai ${STAGEDIR}${DATADIR}/baseset \ ${STAGEDIR}${DATADIR}/lang ${STAGEDIR}${DATADIR}/scripts ${INSTALL_DATA} ${WRKSRC}/bin/ai/*.nut ${STAGEDIR}${DATADIR}/ai ${INSTALL_DATA} ${WRKSRC}/bin/baseset/* ${STAGEDIR}${DATADIR}/baseset ${INSTALL_DATA} ${WRKSRC}/bin/lang/* ${STAGEDIR}${DATADIR}/lang ${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${STAGEDIR}${DATADIR}/scripts ${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.6 \ ${STAGEDIR}${MANPREFIX}/man/man6 .if !defined(WITH_DEDICATED_SERVER_ONLY) ${INSTALL_DATA} ${WRKSRC}/media/openttd.32.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps . for n in 16 32 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps ${INSTALL_DATA} ${WRKSRC}/media/openttd.${n}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps/openttd.png . endfor .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR} post-install: .if defined(WITH_DEDICATED_SERVER_ONLY) @${REINPLACE_CMD} -E '/icons|pixmaps/d' ${TMPPLIST} .endif .include Index: head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro =================================================================== --- head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro (nonexistent) +++ head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro (revision 461290) @@ -0,0 +1,17 @@ +Fixes build on FreeBSD 10.* with ICU >= 59 + +In file included from icu.cpp:34: +In file included from /usr/local/include/unicode/utypes.h:38: +/usr/local/include/unicode/umachine.h:347:13: error: unknown type name 'char16_t' + typedef char16_t UChar; + ^ + +--- src/qt/qtbase/config.tests/unix/icu/icu.pro.orig 2015-12-12 12:58:05 UTC ++++ src/qt/qtbase/config.tests/unix/icu/icu.pro +@@ -1,5 +1,5 @@ + SOURCES = icu.cpp +-CONFIG += console ++CONFIG += c++11 console + CONFIG -= qt dylib + + include($$PWD/../../../src/3rdparty/icu_dependency.pri) Property changes on: head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/v8-devel/Makefile =================================================================== --- head/lang/v8-devel/Makefile (revision 461289) +++ head/lang/v8-devel/Makefile (revision 461290) @@ -1,63 +1,64 @@ # Created by: siasia # $FreeBSD$ PORTNAME= v8 PORTVERSION= 3.27.7 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= lang MASTER_SITES= LOCAL/vanilla PKGNAMESUFFIX= -devel MAINTAINER= sunpoet@FreeBSD.org COMMENT= Open source JavaScript engine by Google LICENSE= BSD3CLAUSE LIB_DEPENDS= libicui18n.so:devel/icu CONFLICTS_INSTALL= v8-[0-9]* ONLY_FOR_ARCHS= i386 amd64 ALL_TARGET= native MAKE_ARGS= library=shared use_system_icu=on MAKE_ENV= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} USE_LDCONFIG= yes -USES= compiler cpe gmake localbase python:2 shebangfix tar:xz +USE_CXXSTD= gnu++11 +USES= compiler:c++11-lib cpe gmake localbase python:2 shebangfix tar:xz CPE_VENDOR= google SHEBANG_FILES= build/gyp/gyp bash_CMD= ${SH} .include .if ${COMPILER_TYPE} == clang CXXFLAGS+= -Wno-nested-anon-types -Wno-unused-function -Wno-unused-private-field -Wno-unused-variable MAKE_ARGS+= clang=on MAKE_ENV+= LINK=clang++ AR=/usr/bin/ar .if ${COMPILER_VERSION} >= 34 CXXFLAGS+= -Wno-unused-const-variable .if ${COMPILER_VERSION} >= 35 CXXFLAGS+= -Wno-tautological-undefined-compare .endif .endif .else MAKE_ARGS+= strictaliasing=off USE_GCC= any .endif post-patch: @${REINPLACE_CMD} -e 's|test/cctest/cctest.gyp||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e '/test\/cctest\/cctest.gyp/d' ${WRKSRC}/build/all.gyp @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/build/shim_headers.gypi ${WRKSRC}/build/gyp/gyp ${WRKSRC}/tools/gyp/v8.gyp @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/build/toolchain.gypi ${WRKSRC}/tools/gyp/v8.gyp @${REINPLACE_CMD} -e 's, | MAP_NORESERVE,,' ${WRKSRC}/src/platform-freebsd.cc do-install: ${INSTALL_PROGRAM} ${WRKSRC}/out/native/d8 ${STAGEDIR}${PREFIX}/bin/d8 cd ${WRKSRC}/include/ && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/ ${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${STAGEDIR}${PREFIX}/lib/libv8.so.1 ${LN} -fs ${PREFIX}/lib/libv8.so.1 ${STAGEDIR}${PREFIX}/lib/libv8.so .include Index: head/misc/sword/Makefile =================================================================== --- head/misc/sword/Makefile (revision 461289) +++ head/misc/sword/Makefile (revision 461290) @@ -1,63 +1,65 @@ # Created by: Willem van Engen # $FreeBSD$ PORTNAME= sword PORTVERSION= 1.7.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= misc MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \ http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/ MAINTAINER= tabthorpe@FreeBSD.org COMMENT= Framework for manipulating Bible texts LICENSE= GPLv2 BUILD_DEPENDS= cppunit-config:devel/cppunit # Workaround for for FreeBSD_11+. BUILD_DEPENDS+= clang38:lang/clang38 CC= clang38 CXX= clang++38 BROKEN_powerpc64= does not compile: libicui18n.so: undefined reference to __cxa_throw_bad_array_new_length GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-conf --with-zlib INSTALL_TARGET= install-strip USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes SUB_FILES= pkg-message PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= CURL CLUCENE CLUCENE_DESC= Include indexing capability OPTIONS_DEFAULT=CURL CLUCENE .include .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS= libcurl.so:ftp/curl CONFIGURE_ARGS+= --with-curl .else CONFIGURE_ARGS+= --without-curl .endif .if ${PORT_OPTIONS:MCLUCENE} +USES+= compiler:c++11-lib +USE_CXXSTD= gnu++11 LIB_DEPENDS+= libclucene-core.so:textproc/clucene \ libicudata.so:devel/icu CONFIGURE_ARGS+= --with-clucene=${LOCALBASE} --with-icu .else CONFIGURE_ARGS+= --without-clucene --without-icu .endif post-patch: @${REINPLACE_CMD} 's|-O3||' ${WRKSRC}/configure post-install: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install_config) ${MV} ${STAGEDIR}${PREFIX}/etc/sword.conf \ ${STAGEDIR}${PREFIX}/etc/sword.conf.sample .include Index: head/print/tex-xetex/Makefile =================================================================== --- head/print/tex-xetex/Makefile (revision 461289) +++ head/print/tex-xetex/Makefile (revision 461290) @@ -1,95 +1,96 @@ # $FreeBSD$ PORTNAME= xetex PORTVERSION= 0.99992 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DISTNAME_TEXMF}${EXTRACT_SUFX} DIST_SUBDIR= TeX EXTRACT_ONLY= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source${EXTRACT_SUFX} MAINTAINER= hrs@FreeBSD.org COMMENT= TeX System with Unicode and Modern Font Technologies LIB_DEPENDS= libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ libicuio.so:devel/icu \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libpng.so:graphics/png \ libpoppler.so:graphics/poppler \ libTECkit.so:textproc/teckit -USES= pkgconfig tar:xz +USES= compiler:c++11-lib pkgconfig tar:xz +USE_CXXSTD= gnu++11 USE_TEX= kpathsea web2c texmf formats fmtutil dvipdfmx USE_XORG= pixman USE_GNOME= cairo TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFVARDIR} EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux \ libs/xpdf \ texk/web2c EXTRACT_AFTER_ARGS_TEXMF= \ | ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner \ ${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,} DISTVERSION_TEXLIVE_SOURCE=20150521 DISTVERSION_TEXLIVE_TEXMF=20150523 DISTNAME_TEXMF= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf EXTRACT_FILES_TEXMF= \ texmf-dist/doc/xelatex \ texmf-dist/doc/xetex \ texmf-dist/fonts/misc/xetex \ texmf-dist/scripts/xetex \ texmf-dist/source/xelatex \ texmf-dist/tex/latex/latexconfig/xelatex.ini \ texmf-dist/tex/plain/config/xetex.ini \ texmf-dist/tex/xelatex \ texmf-dist/tex/xetex \ texmf-dist/tex/generic/xetexconfig/unicode-letters.tex WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c GNU_CONFIGURE= yes EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin \ ptex eptex uptex euptex \ otangle mp pmp upmp web2c web-progs tex synctex CONFIGURE_ARGS= ${EXCLUDE_ENGINES:S/^/--disable-/} \ --enable-xetex \ --with-system-freetype2 \ --with-freetype2-includes=${LOCALBASE}/include/freetype2 \ --with-freetype2-libdir=${LOCALBASE}/lib \ --with-system-graphite2 \ --with-graphite2-includes=${LOCALBASE}/include/graphite2 \ --with-graphite2-libdir=${LOCALBASE}/lib \ --with-system-harfbuzz \ --with-system-poppler \ --with-system-teckit \ --with-teckit-includes=${LOCALBASE}/include/teckit \ --with-teckit-libdir=${LOCALBASE}/lib \ --with-system-zziplib \ --with-system-zlib .for L in cairo gmp kpathsea libpng mpfr pixman ptexenc icu CONFIGURE_ARGS+=--with-system-$L \ --with-$L-include=${LOCALBASE}/include \ --with-$L-libdir=${LOCALBASE}/lib .endfor CPPFLAGS+= -I${LOCALBASE}/include/harfbuzz -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes TEX_FORMATS= xetex pre-configure: for D in libs/xpdf; do \ cd ${WRKDIR}/${DISTNAME}/$$D && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \ ${CONFIGURE_ARGS}; \ done pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share ${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS_TEXMF} .include Index: head/print/texlive-base/Makefile =================================================================== --- head/print/texlive-base/Makefile (revision 461289) +++ head/print/texlive-base/Makefile (revision 461290) @@ -1,146 +1,147 @@ # $FreeBSD$ PORTNAME= texlive PORTVERSION= 20150521 -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMESUFFIX= -base DISTNAME= ${PORTNAME}-${DISTVERSION}-source DIST_SUBDIR= TeX MAINTAINER= hrs@FreeBSD.org COMMENT= TeX Live Typesetting System, base binaries RUN_DEPENDS= psbook:print/psutils LIB_DEPENDS= libicuio.so:devel/icu \ libt1.so:devel/t1lib \ libTECkit.so:textproc/teckit \ libgd.so:graphics/gd \ libgraphite2.so:graphics/graphite2 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libpng.so:graphics/png \ libzzip.so:devel/zziplib \ libpoppler.so:graphics/poppler \ libpotrace.so:graphics/libpotrace CONFLICTS_INSTALL= texlive-texmf-201[234]* USE_TEX= web2c kpathsea ptexenc tlmgr texhash-bootstrap USES= compiler:c++11-lib ghostscript pkgconfig perl5 \ python:run shebangfix tar:xz +USE_CXXSTD= gnu++11 USE_PERL5= run # during build phase gnu configure is run a lot MAKE_ENV+= CONFIG_SITE=${CONFIG_SITE} EXCLUDE_FILES= ${DISTNAME}/texk/web2c \ ${DISTNAME}/texk/kpathsea \ ${DISTNAME}/texk/ptexenc \ ${DISTNAME}/texk/xdvik \ ${DISTNAME}/texk/dvipdfm-x \ ${DISTNAME}/texk/dvipsk \ ${DISTNAME}/libs \ ${DISTNAME}/utils/t1utils \ ${DISTNAME}/utils/xpdfopen EXTRACT_AFTER_ARGS= ${EXCLUDE_FILES:S,^,--exclude ,} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-native-texlive-build \ --disable-web-progs \ --disable-psutils \ --enable-shared \ --disable-t1utils \ --disable-dvipdfmx \ --disable-dvipdfm-x \ --disable-xdvipdfmx \ --disable-xpdfopen \ --enable-build-in-source-tree \ --datarootdir=${LOCALBASE}/share \ --with-system-freetype2 \ --with-freetype2-includes=${LOCALBASE}/include/freetype2 \ --with-freetype2-libdir=${LOCALBASE}/lib \ --with-system-gd \ --with-system-cairo \ --with-system-harfbuzz \ --with-system-graphite2 \ --with-system-pixman \ --with-system-poppler \ --with-system-t1lib \ --with-xpdf-includes=${LOCALBASE}/include/poppler \ --with-xpdf-libdir=${LOCALBASE}/lib \ --with-system-xpdf \ --with-system-zziplib \ --with-system-zlib .for L in gmp icu kpathsea libgs libpng libpaper mpfr ptexenc potrace teckit CONFIGURE_ARGS+=--with-system-$L \ --with-$L-include=${LOCALBASE}/include \ --with-$L-libdir=${LOCALBASE}/lib .endfor CFLAGS+= -I${LOCALBASE}/include PLIST_SUB= INSTALL_DATA="${INSTALL_DATA}" INSTALL_TARGET= install-strip SHEBANG_FILES= texk/texlive/linked_scripts/accfonts/mkt1font \ texk/texlive/linked_scripts/accfonts/vpl2ovp \ texk/texlive/linked_scripts/accfonts/vpl2vpl \ texk/texlive/linked_scripts/arara/arara.sh \ texk/texlive/linked_scripts/bibexport/bibexport.sh \ texk/texlive/linked_scripts/convbkmk/convbkmk.rb \ texk/texlive/linked_scripts/ctanupload/ctanupload.pl \ texk/texlive/linked_scripts/ebong/*.py \ texk/texlive/linked_scripts/dtxgen/dtxgen \ texk/texlive/linked_scripts/dviasm/*.py \ texk/texlive/linked_scripts/exceltex/exceltex \ texk/texlive/linked_scripts/findhyph/findhyph \ texk/texlive/linked_scripts/fragmaster/fragmaster.pl \ texk/texlive/linked_scripts/installfont/installfont-tl \ texk/texlive/linked_scripts/kotex-utils/jamo-normalize.pl \ texk/texlive/linked_scripts/latexpand/latexpand \ texk/texlive/linked_scripts/lilyglyphs/*.py \ texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \ texk/texlive/linked_scripts/lua2dox/lua2dox_filter \ texk/texlive/linked_scripts/mathspic/mathspic.pl \ texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \ texk/texlive/linked_scripts/multibibliography/multibibliography.pl \ texk/texlive/linked_scripts/pygmentex/*.py \ texk/texlive/linked_scripts/pythontex/*.py \ texk/texlive/linked_scripts/rubik/rubikrotation.pl \ texk/texlive/linked_scripts/splitindex/splitindex.pl \ texk/texlive/linked_scripts/svn-multi/svn-multi.pl \ texk/texlive/linked_scripts/texdirflatten/texdirflatten \ texk/texlive/linked_scripts/texliveonfly/texliveonfly.py \ texk/texlive/linked_scripts/ulqda/ulqda.pl \ texk/texlive/linked_scripts/urlbst/urlbst \ texk/texlive/linked_scripts/yplan/yplan INFO= dvipng tlbuild OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= TEX=xpdfopen:run post-patch: cd ${WRKSRC}/texk/texlive && \ ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ linked_scripts/texlive/fmtutil-sys.sh \ tl_scripts/texconfig-sys.sh \ linked_scripts/texlive/updmap-sys.sh ${REINPLACE_CMD} -e 's|/usr/bin/python -O|${python_CMD}|' \ ${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro \ post-install-fmtutil: for D in ${TEXHASHDIRS}; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/$$D; \ ${TOUCH} ${STAGEDIR}${PREFIX}/$$D/.keep_me; \ done ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c ${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c/.keep_me ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/fmtutil.cnf \ ${STAGEDIR}${PREFIX}/${FMTUTIL_CNF} post-install: post-install-fmtutil .ORDER: post-install-fmtutil do-texhash .include Index: head/sysutils/gdisk/Makefile =================================================================== --- head/sysutils/gdisk/Makefile (revision 461289) +++ head/sysutils/gdisk/Makefile (revision 461290) @@ -1,47 +1,50 @@ # Created by: Dmitry N Fomin # $FreeBSD$ PORTNAME= gdisk PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/gptfdisk/gptfdisk/${PORTVERSION} DISTNAME= gptfdisk-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= GPT fdisk LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libpopt.so:devel/popt \ libuuid.so:misc/e2fsprogs-libuuid USES= localbase:ldflags ALL_TARGET= fixparts gdisk sgdisk MAKEFILE= Makefile.freebsd OPTIONS_DEFINE= CGDISK UTF16 OPTIONS_SUB= yes CGDISK_DESC= Curses-based interactive program UTF16_DESC= Support for Unicode partition names CGDISK_ALL_TARGET= cgdisk CGDISK_USES= ncurses +UTF16_USES= compiler:c++11-lib UTF16_CPPFLAGS= -DUSE_UTF16 +UTF16_CXXFLAGS= -std=gnu++11 UTF16_LDFLAGS= -licuio -licuuc UTF16_LIB_DEPENDS= libicuuc.so:devel/icu do-install: .for i in fixparts gdisk sgdisk ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/${i}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .endfor do-install-CGDISK-on: ${INSTALL_PROGRAM} ${WRKSRC}/cgdisk ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/cgdisk.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .include Index: head/www/cppcms/Makefile =================================================================== --- head/www/cppcms/Makefile (revision 461289) +++ head/www/cppcms/Makefile (revision 461290) @@ -1,46 +1,49 @@ # $FreeBSD$ PORTNAME= cppcms PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/cppcms/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= C++ web development framework LICENSE= LGPL3 LIB_DEPENDS= libpcre.so:devel/pcre BROKEN_powerpc64= Does not build: error: 'localeconv_l' was not declared in this scope USES= cmake python:2 shebangfix tar:bzip2 ssl USE_LDCONFIG= yes SHEBANG_FILES= bin/cppcms_tmpl_cc OPTIONS_DEFINE= EXAMPLES GCRYPT ICU OPTIONS_DEFAULT= ICU ICU_DESC= ICU unicode support .include .if ${PORT_OPTIONS:MICU} +USES+= compiler:c++11-lib +USE_CXXSTD= gnu++11 LIB_DEPENDS+= libicuuc.so:devel/icu CMAKE_ARGS+= -DDISABLE_ICONV:BOOL=ON .else USES+= iconv CMAKE_ARGS+= -DDISABLE_ICU_LOCALE:BOOL=ON .endif .if ${PORT_OPTIONS:MGCRYPT} LIB_DEPENDS+= libgcrypt.so:security/libgcrypt CMAKE_ARGS+= -DDISABLE_GCRYPT:BOOL=OFF .else CMAKE_ARGS+= -DDISABLE_GCRYPT:BOOL=ON .endif post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include