Remove -enumtypes rurles.

It may break installed header files from gst-plugins0.10-base as PR 46229.

3 files changed, 65 insertions, 1 deletions

diff --git a/chat/empathy/distinfo b/chat/empathy/distinfo
index af154fbe39d..0c331460f28 100644
--- a/chat/empathy/distinfo
+++ b/chat/empathy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/04/05 18:27:08 drochner Exp $
+$NetBSD: distinfo,v 1.10 2012/03/20 11:17:49 obache Exp $
 
 SHA1 (empathy-2.34.0.tar.gz) = 533be910844e92e24be7232d2d122e9dc8b2267f
 RMD160 (empathy-2.34.0.tar.gz) = dfff9212f8c7f5d1c745a4b6bd3f6dbaf4ef02ab
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = ee11360640dcf6a4dd54339ddf63d1aca9d8a7ae
 SHA1 (patch-ab) = faab0ef087905b61eb676f5ae91df3f6ac4b06df
 SHA1 (patch-ac) = 0f99ad2c0498ad849ec3a3f6dcfe760d7e158a6c
 SHA1 (patch-ad) = 0df9f0f04447930e311913ab0e7fc13d5470cdf3
+SHA1 (patch-src_Makefile.am) = b80be45492abf1a4bf79f4c408f07beb4ee4ed29
+SHA1 (patch-src_Makefile.in) = bf630e12c9517d0bb7b4e0e32ee47d4197ab0d92
diff --git a/chat/empathy/patches/patch-src_Makefile.am b/chat/empathy/patches/patch-src_Makefile.am
new file mode 100644
index 00000000000..03de87a18ca
--- /dev/null
+++ b/chat/empathy/patches/patch-src_Makefile.am
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2012/03/20 11:17:49 obache Exp $
+
+* remove -enumtypes rules
+  http://git.gnome.org/browse/empathy/commit/src/Makefile.am?id=2d1cf80cf8ae0412eaf176c557f78f29ab8d4064
+
+--- src/Makefile.am.orig	2011-03-24 15:15:16.000000000 +0000
++++ src/Makefile.am
+@@ -274,23 +274,5 @@ src-marshal.list: $(empathy_SOURCES) Mak
+ 	$(AM_V_GEN)echo "#include \"src-marshal.h\"" > $@ && \
+ 	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
+ 
+-# rules for making the glib enum objects
+-%-enumtypes.h: %.h Makefile.in
+-	$(AM_V_GEN)glib-mkenums \
+-	--fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+-	--fprod "/* enumerations from \"@filename@\" */\n" \
+-	--vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
+-	--ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \
+-	$< > $@
+-
+-%-enumtypes.c: %.h Makefile.in
+-	$(AM_V_GEN)glib-mkenums \
+-	--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
+-	--fprod "\n/* enumerations from \"@filename@\" */" \
+-	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
+-	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \
+-	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+-	$< > $@
+-
+ CLEANFILES = $(BUILT_SOURCES)
+ 
diff --git a/chat/empathy/patches/patch-src_Makefile.in b/chat/empathy/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..26d165002fc
--- /dev/null
+++ b/chat/empathy/patches/patch-src_Makefile.in
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2012/03/20 11:17:49 obache Exp $
+
+* refrect changes from Makefile.am
+
+--- src/Makefile.in.orig	2011-03-24 15:18:54.000000000 +0000
++++ src/Makefile.in
+@@ -1688,24 +1688,6 @@ src-marshal.list: $(empathy_SOURCES) Mak
+ 	$(AM_V_GEN)echo "#include \"src-marshal.h\"" > $@ && \
+ 	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
+ 
+-# rules for making the glib enum objects
+-%-enumtypes.h: %.h Makefile.in
+-	$(AM_V_GEN)glib-mkenums \
+-	--fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+-	--fprod "/* enumerations from \"@filename@\" */\n" \
+-	--vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
+-	--ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \
+-	$< > $@
+-
+-%-enumtypes.c: %.h Makefile.in
+-	$(AM_V_GEN)glib-mkenums \
+-	--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
+-	--fprod "\n/* enumerations from \"@filename@\" */" \
+-	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
+-	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \
+-	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+-	$< > $@
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: