diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-17 19:23:40 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-17 19:23:40 +0800 |
| commit | d61a8206f1657eccafb0ded1bebfa2cc026c8aed (patch) | |
| tree | b6ad7508d147b50ec777497a4c2ee6996479f4fb | |
| parent | 024f0bb23fb82642e74441cc90251d374642a8ff (diff) | |
| download | marcuscom-ports-d61a8206f1657eccafb0ded1bebfa2cc026c8aed.tar marcuscom-ports-d61a8206f1657eccafb0ded1bebfa2cc026c8aed.tar.gz marcuscom-ports-d61a8206f1657eccafb0ded1bebfa2cc026c8aed.tar.bz2 marcuscom-ports-d61a8206f1657eccafb0ded1bebfa2cc026c8aed.tar.lz marcuscom-ports-d61a8206f1657eccafb0ded1bebfa2cc026c8aed.tar.xz marcuscom-ports-d61a8206f1657eccafb0ded1bebfa2cc026c8aed.tar.zst marcuscom-ports-d61a8206f1657eccafb0ded1bebfa2cc026c8aed.zip | |
Syn with ports, fixes build error where it tries to regen a installed
gstreamer header.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18543 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | net-im/empathy/Makefile | 4 | ||||
| -rw-r--r-- | net-im/empathy/files/patch-src_Makefile.in | 27 |
2 files changed, 29 insertions, 2 deletions
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index 4dd3d6cb0..68d80df2f 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -70,11 +70,11 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly .endif -.if ${PORT_OPTIONS:MIRC} +.if ${PORT_OPTIONS:MIRC} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-idle:${PORTSDIR}/net-im/telepathy-idle .endif -.if ${PORT_OPTIONS:MSALUT +.if ${PORT_OPTIONS:MSALUT} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut .endif diff --git a/net-im/empathy/files/patch-src_Makefile.in b/net-im/empathy/files/patch-src_Makefile.in new file mode 100644 index 000000000..ef7ba8546 --- /dev/null +++ b/net-im/empathy/files/patch-src_Makefile.in @@ -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@_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: |