svn commit: r314040 - in head: multimedia/gstreamer-plugins net-im/empathy/files

[Koop Mast]

Author: kwm
Date: Wed Mar 13 08:57:19 2013
New Revision: 314040
URL: http://svnweb.freebsd.org/changeset/ports/314040

Log:
  Fix the build of empathy my removing offending Makefile rules. Bump
  gstreamer-plugins portrevision to fix the messed up header.
  
  Thanks to The BSD Dreamer <beastie at tardisi.com> for finding out where it
  went wrong.
  
  PR:		ports/176768
  Submitted by:	Ruslan Makhmatkhanov <rm at FreeBSD.org>

Added:
  head/net-im/empathy/files/patch-src_Makefile.in   (contents, props changed)
Modified:
  head/multimedia/gstreamer-plugins/Makefile

Modified: head/multimedia/gstreamer-plugins/Makefile
==============================================================================
--- head/multimedia/gstreamer-plugins/Makefile	Wed Mar 13 08:26:11 2013	(r314039)
+++ head/multimedia/gstreamer-plugins/Makefile	Wed Mar 13 08:57:19 2013	(r314040)
@@ -6,7 +6,7 @@ PORTNAME=	gstreamer
 PORTVERSION?=	${BASE_PORTVERSION}
 # When chasing a shared library for a plug-in bump the PORTREVISION in the 
 # plug-in port instead, like ${category}/gstreamer-plugin-${PLUGIN}.
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH=	3
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \

Added: head/net-im/empathy/files/patch-src_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/empathy/files/patch-src_Makefile.in	Wed Mar 13 08:57:19 2013	(r314040)
@@ -0,0 +1,27 @@
+--- src/Makefile.in.orig	2013-03-12 21:11:24.000000000 +0000
++++ src/Makefile.in	2013-03-12 21:12:10.000000000 +0000
+@@ -1688,24 +1688,6 @@
+ 	$(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 at _get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_ at ENUMSHORT@ (@enum_name at _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 at enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G at Type@Value values[] = {"     \
+-	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \
+-	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ at 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: