Attachment 199011 Details for Bug 233023 – Patch converting port to OPTIONS framework, disabling MAKE_JOBS_UNSAFE

Patch converting port to OPTIONS framework, disabling MAKE_JOBS_UNSAFE

patch-libical (text/plain), 5.77 KB, created by Peter Laursen on 2018-11-06 12:34:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Laursen

Created: 2018-11-06 12:34:22 UTC

Size: 5.77 KB

patch

obsolete

>diff -ru /usr/ports/devel/libical/Makefile devel/libical/Makefile
>--- /usr/ports/devel/libical/Makefile	2018-10-23 13:35:03.000000000 +0200
>+++ devel/libical/Makefile	2018-11-06 13:16:49.789264000 +0100
>@@ -1,9 +1,9 @@
> # Created by: Joe Kelsey
>-# $FreeBSD: head/devel/libical/Makefile 482830 2018-10-23 11:35:03Z jbeich $
>+# $FreeBSD$
> 
> PORTNAME=	libical
> PORTVERSION=	3.0.3
>-PORTREVISION=	1
>+PORTREVISION= 2
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/libical/libical/releases/download/v${PORTVERSION}/
> 
>@@ -21,13 +21,20 @@
> USE_PERL5=	build
> USE_LDCONFIG=	yes
> 
>-MAKE_JOBS_UNSAFE= yes
>+#MAKE_JOBS_UNSAFE= yes
>+OPTIONS_SUB=yes
>+OPTIONS_DEFINE= GLIB GOBJECT VALA
>+OPTIONS_DEFAULT=GLIB GOBJECT VALA
>+VALA_DESC= Build VALA bindings
>+VALA_BUILD_DEPENDS= valac:lang/vala
>+GOBJECT_DESC= Build GObject Introspection
>+GOBJECT_USE+= gnome=introspection:build
>+GLIB_DESC= Build GLib bindings
>+GLIB_USE=GNOME=	glib20,libxml2
> 
>-BUILD_DEPENDS=	valac:lang/vala \
>-		gtkdoc-scan:textproc/gtk-doc
>-USE_GNOME=	introspection:build glib20 libxml2
>-CMAKE_ARGS+=	-DGOBJECT_INTROSPECTION=true \
>-		-DICAL_GLIB_VAPI=true \
>-		-DICAL_BUILD_DOCS=false
>+VALA_CMAKE_BOOL= ICAL_GLIB_VAPI
>+GOBJECT_CMAKE_BOOL= GOBJECT_INTROSPECTION
>+GLIB_CMAKE_BOOL=ICAL_GLIB
>+CMAKE_ARGS+= 		-DICAL_BUILD_DOCS=false
> 
> .include <bsd.port.mk>
>diff -ru /usr/ports/devel/libical/pkg-plist devel/libical/pkg-plist
>--- /usr/ports/devel/libical/pkg-plist	2018-09-30 13:58:29.000000000 +0200
>+++ devel/libical/pkg-plist	2018-11-06 13:08:54.854773000 +0100
>@@ -1,39 +1,39 @@
>-include/libical-glib/i-cal-array.h
>-include/libical-glib/i-cal-attach.h
>-include/libical-glib/i-cal-comp-iter.h
>-include/libical-glib/i-cal-component.h
>-include/libical-glib/i-cal-datetimeperiod-type.h
>-include/libical-glib/i-cal-derived-parameter.h
>-include/libical-glib/i-cal-derived-property.h
>-include/libical-glib/i-cal-derived-value.h
>-include/libical-glib/i-cal-duration-type.h
>-include/libical-glib/i-cal-enums.h
>-include/libical-glib/i-cal-error.h
>-include/libical-glib/i-cal-forward-declarations.h
>-include/libical-glib/i-cal-geo-type.h
>-include/libical-glib/i-cal-langbind.h
>-include/libical-glib/i-cal-memory.h
>-include/libical-glib/i-cal-mime.h
>-include/libical-glib/i-cal-object.h
>-include/libical-glib/i-cal-parameter.h
>-include/libical-glib/i-cal-parser.h
>-include/libical-glib/i-cal-period-type.h
>-include/libical-glib/i-cal-property.h
>-include/libical-glib/i-cal-recur-iterator.h
>-include/libical-glib/i-cal-recur.h
>-include/libical-glib/i-cal-recurrence-type.h
>-include/libical-glib/i-cal-reqstat-type.h
>-include/libical-glib/i-cal-restriction.h
>-include/libical-glib/i-cal-time-span.h
>-include/libical-glib/i-cal-time.h
>-include/libical-glib/i-cal-timetype.h
>-include/libical-glib/i-cal-timezone-phase.h
>-include/libical-glib/i-cal-timezone.h
>-include/libical-glib/i-cal-timezonetype.h
>-include/libical-glib/i-cal-trigger-type.h
>-include/libical-glib/i-cal-unknowntokenhandling.h
>-include/libical-glib/i-cal-value.h
>-include/libical-glib/libical-glib.h
>+%%GLIB%%include/libical-glib/i-cal-array.h
>+%%GLIB%%include/libical-glib/i-cal-attach.h
>+%%GLIB%%include/libical-glib/i-cal-comp-iter.h
>+%%GLIB%%include/libical-glib/i-cal-component.h
>+%%GLIB%%include/libical-glib/i-cal-datetimeperiod-type.h
>+%%GLIB%%include/libical-glib/i-cal-derived-parameter.h
>+%%GLIB%%include/libical-glib/i-cal-derived-property.h
>+%%GLIB%%include/libical-glib/i-cal-derived-value.h
>+%%GLIB%%include/libical-glib/i-cal-duration-type.h
>+%%GLIB%%include/libical-glib/i-cal-enums.h
>+%%GLIB%%include/libical-glib/i-cal-error.h
>+%%GLIB%%include/libical-glib/i-cal-forward-declarations.h
>+%%GLIB%%include/libical-glib/i-cal-geo-type.h
>+%%GLIB%%include/libical-glib/i-cal-langbind.h
>+%%GLIB%%include/libical-glib/i-cal-memory.h
>+%%GLIB%%include/libical-glib/i-cal-mime.h
>+%%GLIB%%include/libical-glib/i-cal-object.h
>+%%GLIB%%include/libical-glib/i-cal-parameter.h
>+%%GLIB%%include/libical-glib/i-cal-parser.h
>+%%GLIB%%include/libical-glib/i-cal-period-type.h
>+%%GLIB%%include/libical-glib/i-cal-property.h
>+%%GLIB%%include/libical-glib/i-cal-recur-iterator.h
>+%%GLIB%%include/libical-glib/i-cal-recur.h
>+%%GLIB%%include/libical-glib/i-cal-recurrence-type.h
>+%%GLIB%%include/libical-glib/i-cal-reqstat-type.h
>+%%GLIB%%include/libical-glib/i-cal-restriction.h
>+%%GLIB%%include/libical-glib/i-cal-time-span.h
>+%%GLIB%%include/libical-glib/i-cal-time.h
>+%%GLIB%%include/libical-glib/i-cal-timetype.h
>+%%GLIB%%include/libical-glib/i-cal-timezone-phase.h
>+%%GLIB%%include/libical-glib/i-cal-timezone.h
>+%%GLIB%%include/libical-glib/i-cal-timezonetype.h
>+%%GLIB%%include/libical-glib/i-cal-trigger-type.h
>+%%GLIB%%include/libical-glib/i-cal-unknowntokenhandling.h
>+%%GLIB%%include/libical-glib/i-cal-value.h
>+%%GLIB%%include/libical-glib/libical-glib.h
> include/libical/ical.h
> include/libical/icalarray.h
> include/libical/icalattach.h
>@@ -91,12 +91,12 @@
> lib/cmake/LibIcal/LibIcalConfigVersion.cmake
> lib/cmake/LibIcal/LibIcalTargets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/LibIcal/LibIcalTargets.cmake
>-lib/girepository-1.0/ICalGLib-3.0.typelib
>-lib/girepository-1.0/libical-3.0.3.typelib
>-lib/libical-glib.a
>-lib/libical-glib.so
>-lib/libical-glib.so.3
>-lib/libical-glib.so.3.0.3
>+%%GOBJECT%%lib/girepository-1.0/ICalGLib-3.0.typelib
>+%%GOBJECT%%lib/girepository-1.0/libical-3.0.3.typelib
>+%%GLIB%%lib/libical-glib.a
>+%%GLIB%%lib/libical-glib.so
>+%%GLIB%%lib/libical-glib.so.3
>+%%GLIB%%lib/libical-glib.so.3.0.3
> lib/libical.a
> lib/libical.so
> lib/libical.so.3
>@@ -117,8 +117,8 @@
> lib/libicalvcal.so
> lib/libicalvcal.so.3
> lib/libicalvcal.so.3.0.3
>-libdata/pkgconfig/libical-glib.pc
>+%%GLIB%%libdata/pkgconfig/libical-glib.pc
> libdata/pkgconfig/libical.pc
>-share/gir-1.0/ICalGLib-3.0.gir
>-share/gir-1.0/libical-3.0.3.gir
>-share/vala/vapi/libical-glib.vapi
>+%%GOBJECT%%share/gir-1.0/ICalGLib-3.0.gir
>+%%GOBJECT%%share/gir-1.0/libical-3.0.3.gir
>+%%VALA%%share/vala/vapi/libical-glib.vapi

Actions: View

Attachments on bug 233023: 199011 | 199041 | 199073 | 201409 | 202677 | 202784 | 212191