Index: converters/ical2html/Makefile =================================================================== --- converters/ical2html/Makefile (wersja 438695) +++ converters/ical2html/Makefile (kopia robocza) @@ -17,4 +17,10 @@ CPPFLAGS+= -I${LOCALBASE}/include/libical -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +post-patch: + @${REINPLACE_CMD} '/icalerror_errors_are_fatal/d' \ + ${WRKSRC}/ical2html.c \ + ${WRKSRC}/icalfilter.c \ + ${WRKSRC}/icalmerge.c + .include <bsd.port.mk> Index: deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake =================================================================== --- deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake (wersja 438695) +++ deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- cmake/modules/FindLibical.cmake.orig 2013-08-10 13:38:51.103327753 +0000 -+++ cmake/modules/FindLibical.cmake 2013-08-10 13:40:47.134325441 +0000 -@@ -49,7 +49,7 @@ - - if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES) - set(FIND_LIBICAL_VERSION_SOURCE -- "#include <libical/ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n") -+ "#include <ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n") - set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx) - file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}") - Zmiany atrybutów dla: deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake ___________________________________________________________________ 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: devel/libical/Makefile =================================================================== --- devel/libical/Makefile (wersja 438695) +++ devel/libical/Makefile (kopia robocza) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libical -PORTVERSION= 1.0.1 +PORTVERSION= 2.0.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -12,6 +12,8 @@ LICENSE_COMB= dual LICENSE= MPL LGPL21 +LIB_DEPENDS= libicuuc.so:devel/icu + USE_GITHUB= yes USES= cmake pathfix perl5 Index: devel/libical/distinfo =================================================================== --- devel/libical/distinfo (wersja 438695) +++ devel/libical/distinfo (kopia robocza) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464772258 -SHA256 (libical-libical-v1.0.1_GH0.tar.gz) = 7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c -SIZE (libical-libical-v1.0.1_GH0.tar.gz) = 720618 +TIMESTAMP = 1490973722 +SHA256 (libical-libical-v2.0.0_GH0.tar.gz) = 20f4a98475052e1200d2691ba50b27969e4bedc6e50bffd5e2fa81f4ac90de9a +SIZE (libical-libical-v2.0.0_GH0.tar.gz) = 699099 Index: devel/libical/pkg-plist =================================================================== --- devel/libical/pkg-plist (wersja 438695) +++ devel/libical/pkg-plist (kopia robocza) @@ -1,4 +1,3 @@ -include/ical.h include/libical/ical.h include/libical/icalarray.h include/libical/icalattach.h @@ -23,13 +22,16 @@ include/libical/icalmessage.h include/libical/icalmime.h include/libical/icalparameter.h +include/libical/icalparameter_cxx.h include/libical/icalparser.h include/libical/icalperiod.h include/libical/icalproperty.h +include/libical/icalproperty_cxx.h include/libical/icalrecur.h include/libical/icalrestriction.h include/libical/icalset.h include/libical/icalspanlist.h +include/libical/icalspanlist_cxx.h include/libical/icalss.h include/libical/icalssyacc.h include/libical/icaltime.h @@ -37,12 +39,17 @@ include/libical/icaltypes.h include/libical/icaltz-util.h include/libical/icalvalue.h +include/libical/icalvalue_cxx.h include/libical/icalvcal.h -include/libical/port.h +include/libical/icptrholder_cxx.h +include/libical/libical_ical_export.h +include/libical/libical_icalss_export.h +include/libical/libical_vcal_export.h include/libical/pvl.h include/libical/sspm.h include/libical/vcaltmp.h include/libical/vcc.h +include/libical/vcomponent_cxx.h include/libical/vobject.h lib/cmake/LibIcal/LibIcalConfig.cmake lib/cmake/LibIcal/LibIcalConfigVersion.cmake @@ -50,14 +57,22 @@ lib/cmake/LibIcal/LibIcalTargets.cmake lib/libical.a lib/libical.so -lib/libical.so.1 -lib/libical.so.1.0.1 +lib/libical.so.2 +lib/libical.so.2.0.0 +lib/libical_cxx.a +lib/libical_cxx.so +lib/libical_cxx.so.2 +lib/libical_cxx.so.2.0.0 lib/libicalss.a lib/libicalss.so -lib/libicalss.so.1 -lib/libicalss.so.1.0.1 +lib/libicalss.so.2 +lib/libicalss.so.2.0.0 +lib/libicalss_cxx.a +lib/libicalss_cxx.so +lib/libicalss_cxx.so.2 +lib/libicalss_cxx.so.2.0.0 lib/libicalvcal.a lib/libicalvcal.so -lib/libicalvcal.so.1 -lib/libicalvcal.so.1.0.1 +lib/libicalvcal.so.2 +lib/libicalvcal.so.2.0.0 libdata/pkgconfig/libical.pc Index: devel/libical-glib/Makefile =================================================================== --- devel/libical-glib/Makefile (wersja 438695) +++ devel/libical-glib/Makefile (kopia robocza) @@ -12,6 +12,8 @@ LIB_DEPENDS= libical.so:devel/libical +IGNORE= Does not build with libical >= 2.0 + USES= compiler:c11 gettext gmake libtool pathfix pkgconfig tar:xz USE_GNOME= glib20 introspection:build libxml2 GNU_CONFIGURE= yes