- Fix glib-mkenums warnings (which may lead to errors)

- Remove MAKE_JOBS_UNSAFE
- Sort plist

PR:		196663
Submitted by:	rm@FreeBSD.org
Approved by:	kwm

3 files changed, 27 insertions, 4 deletions

diff --git a/devel/libgit2-glib/Makefile b/devel/libgit2-glib/Makefile
index 495c648d66d9..ab09e9972f33 100644
--- a/devel/libgit2-glib/Makefile
+++ b/devel/libgit2-glib/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	libgit2-glib
 PORTVERSION=	0.0.24
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -27,6 +28,5 @@ CONFIGURE_ARGS=	--disable-python
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
-MAKE_JOBS_UNSAFE=yes
 
 .include <bsd.port.mk>
diff --git a/devel/libgit2-glib/files/patch-libgit2-glib__ggit-types.h b/devel/libgit2-glib/files/patch-libgit2-glib__ggit-types.h
new file mode 100644
index 000000000000..6198b7428684
--- /dev/null
+++ b/devel/libgit2-glib/files/patch-libgit2-glib__ggit-types.h
@@ -0,0 +1,23 @@
+--- libgit2-glib/ggit-types.h.orig	2014-10-19 13:55:09.000000000 +0400
++++ libgit2-glib/ggit-types.h	2015-01-15 14:12:33.000000000 +0300
+@@ -963,9 +963,7 @@
+ 	GGIT_STATUS_OPTION_RENAMES_INDEX_TO_WORKDIR = (1 << 8),
+ 	GGIT_STATUS_OPTION_SORT_CASE_SENSITIVELY    = (1 << 9),
+ 	GGIT_STATUS_OPTION_SORT_CASE_INSENSITIVELY  = (1 << 10),
+-	GGIT_STATUS_OPTION_DEFAULT                  = GGIT_STATUS_OPTION_INCLUDE_IGNORED |
+-	                                              GGIT_STATUS_OPTION_INCLUDE_UNTRACKED |
+-	                                              GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS
++	GGIT_STATUS_OPTION_DEFAULT                  = GGIT_STATUS_OPTION_INCLUDE_IGNORED | GGIT_STATUS_OPTION_INCLUDE_UNTRACKED | GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS
+ } GgitStatusOption;
+ 
+ /**
+@@ -1059,8 +1057,7 @@
+ 	GGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED     = (1u << 3),
+ 	GGIT_DIFF_FIND_REWRITES                   = (1u << 4),
+ 	GGIT_DIFF_BREAK_REWRITES                  = (1u << 5),
+-	GGIT_DIFF_FIND_AND_BREAK_REWRITES         = (GGIT_DIFF_FIND_REWRITES |
+-	                                             GGIT_DIFF_BREAK_REWRITES),
++	GGIT_DIFF_FIND_AND_BREAK_REWRITES         = (GGIT_DIFF_FIND_REWRITES | GGIT_DIFF_BREAK_REWRITES),
+ 	GGIT_DIFF_FIND_FOR_UNTRACKED              = (1u << 6),
+ 	GGIT_DIFF_FIND_ALL                        = (0x0ff),
+ 	GGIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE  = 0,
diff --git a/devel/libgit2-glib/pkg-plist b/devel/libgit2-glib/pkg-plist
index 479c5cdd5769..cddde6241a49 100644
--- a/devel/libgit2-glib/pkg-plist
+++ b/devel/libgit2-glib/pkg-plist
@@ -29,8 +29,8 @@ include/libgit2-glib-1.0/libgit2-glib/ggit-index-entry-resolve-undo.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-index-entry.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-index.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-main.h
-include/libgit2-glib-1.0/libgit2-glib/ggit-message.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-merge-options.h
+include/libgit2-glib-1.0/libgit2-glib/ggit-message.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-native.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-note.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-object-factory-base.h
@@ -59,12 +59,11 @@ include/libgit2-glib-1.0/libgit2-glib/ggit-tree-entry.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-tree.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-types.h
 include/libgit2-glib-1.0/libgit2-glib/ggit.h
+lib/girepository-1.0/Ggit-1.0.typelib
 lib/libgit2-glib-1.0.so
 lib/libgit2-glib-1.0.so.0
 lib/libgit2-glib-1.0.so.0.0.0
-lib/girepository-1.0/Ggit-1.0.typelib
 libdata/pkgconfig/libgit2-glib-1.0.pc
-share/gir-1.0/Ggit-1.0.gir
 %%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlob.html
 %%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlobOutputStream.html
 %%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBranch.html
@@ -124,5 +123,6 @@ share/gir-1.0/Ggit-1.0.gir
 %%PORTDOCS%%%%DOCSDIR%%-1.0/style.css
 %%PORTDOCS%%%%DOCSDIR%%-1.0/up-insensitive.png
 %%PORTDOCS%%%%DOCSDIR%%-1.0/up.png
+share/gir-1.0/Ggit-1.0.gir
 share/vala/vapi/ggit-1.0.deps
 share/vala/vapi/ggit-1.0.vapi