diff options
| author | Roman Bogorodskiy <novel@FreeBSD.org> | 2006-02-11 16:53:33 +0000 |
|---|---|---|
| committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2006-02-11 16:53:33 +0000 |
| commit | b21cb2fa5f1c17727cd2ad6cbbf89c13308ca8cd (patch) | |
| tree | a297a630796595912cb45ff60e3c765a8f4c7c6b /multimedia | |
| parent | Update to 1.60 (diff) | |
- Fix building when an older version of bmpx is installed [1]
- Remove curl dependency since it is not needed anymore [2]
Reported by: Anish Mistry <amistry@am-productions.biz> [1],
David Le Brun <david@dyn-ns.net> [2]
Notes
Notes:
svn path=/head/; revision=155764
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/bmpx/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/bmpx/files/patch-plugins-flow-Makefile.in | 20 | ||||
| -rw-r--r-- | multimedia/bmpx/files/patch-plugins-transport-Makefile.in | 21 |
3 files changed, 41 insertions, 1 deletions
diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile index 00566ecc509a..da44019fb55d 100644 --- a/multimedia/bmpx/Makefile +++ b/multimedia/bmpx/Makefile @@ -16,7 +16,6 @@ COMMENT= Audio player LIB_DEPENDS= tag.5:${PORTSDIR}/audio/taglib \ xine.15:${PORTSDIR}/multimedia/libxine \ - curl.3:${PORTSDIR}/ftp/curl \ neon.25:${PORTSDIR}/www/neon USE_AUTOTOOLS= libtool:15 diff --git a/multimedia/bmpx/files/patch-plugins-flow-Makefile.in b/multimedia/bmpx/files/patch-plugins-flow-Makefile.in new file mode 100644 index 000000000000..d2ba62251ab7 --- /dev/null +++ b/multimedia/bmpx/files/patch-plugins-flow-Makefile.in @@ -0,0 +1,20 @@ +--- plugins/flow/Makefile.in.orig Fri Feb 10 05:45:38 2006 ++++ plugins/flow/Makefile.in Sat Feb 11 19:40:00 2006 +@@ -310,13 +310,13 @@ + xchat_plugin_dir = @xchat_plugin_dir@ + AUTOMAKE_OPTIONS = foreign + INCLUDES = \ ++ -I$(top_srcdir) \ ++ -I$(top_srcdir)/include \ ++ -I$(top_builddir)/include \ + $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(HREL_CFLAGS) \ +- $(BMPX_DEFINES) \ +- -I$(top_srcdir) \ +- -I$(top_srcdir)/include \ +- -I$(top_builddir)/include ++ $(BMPX_DEFINES) + + libflow_shuffle_LTLIBRARIES = libflow_shuffle.la + libflow_shuffledir = $(PLUGIN_DIR)/flow diff --git a/multimedia/bmpx/files/patch-plugins-transport-Makefile.in b/multimedia/bmpx/files/patch-plugins-transport-Makefile.in new file mode 100644 index 000000000000..c09db16b94cb --- /dev/null +++ b/multimedia/bmpx/files/patch-plugins-transport-Makefile.in @@ -0,0 +1,21 @@ +--- plugins/transport/Makefile.in.orig Sat Feb 11 19:39:08 2006 ++++ plugins/transport/Makefile.in Sat Feb 11 19:39:40 2006 +@@ -331,14 +331,14 @@ + xchat_plugin_dir = @xchat_plugin_dir@ + AUTOMAKE_OPTIONS = foreign + INCLUDES = \ ++ -I$(top_srcdir) \ ++ -I$(top_srcdir)/include \ ++ -I$(top_builddir)/include \ + $(NEON_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(BMPX_DEFINES) \ +- $(HREL_CFLAGS) \ +- -I$(top_srcdir) \ +- -I$(top_srcdir)/include \ +- -I$(top_builddir)/include ++ $(HREL_CFLAGS) + + libtransport_http_LTLIBRARIES = libtransport_http.la + libtransport_httpdir = $(PLUGIN_DIR)/transport |