mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

- BMPx has gone, remove the option from BMPx [1]

Browse Source 
- while here remove CPPFLAGS from CONFIGURE_ENV
- default package unchange: no portrevision bump

Approved by:	Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer) [1]
This commit is contained in:
Baptiste Daroussin 2011-09-12 08:35:22 +00:00
parent 614a9d8c75
commit a3ccdf5b36
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=281655
2 changed files with 4 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sysutils/conky/Makefile
View File

@ -26,9 +26,10 @@ USE_ICONV= yes
USE_GMAKE= yes
CONFIGURE_ARGS+= --disable-portmon \
--disable-hddtemp \
--disable-alsa
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
--disable-alsa \
--disable-bmpx
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
MAN1= conky.1
PLIST_FILES= bin/conky
@ -38,7 +39,6 @@ PORTDOCS= README AUTHORS ChangeLog TODO NEWS \
OPTIONS+= APCUPSD "Enable APCUPSD support" Off \
AUDACIOUS "Enable Audacious support" Off \
BMPX "Enable BMPX support" Off \
MPD "Enable MPD support" Off \
NCURSES "Enable ncurses support" Off \
RSS "Enable RSS support" Off \
@ -82,15 +82,6 @@ CONFIGURE_ARGS+= --enable-audacious
CONFIGURE_ARGS+= --disable-audacious
.endif
.if defined(WITH_BMPX)
BUILD_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx
RUN_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx
LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+= --enable-bmpx
.else
CONFIGURE_ARGS+= --disable-bmpx
.endif
.if defined(WITH_LUA) || defined(WITH_LUA_CAIRO) || defined(WITH_LUA_IMLIB2)
USE_LUA= 5.1+
CONFIGURE_ARGS+= --enable-lua

60
sysutils/conky/files/patch-src-bmpx.c
View File

@ -1,60 +0,0 @@
--- src/bmpx.c.orig
+++ src/bmpx.c
@@ -42,7 +42,7 @@
static int connected = 0;
static char *unknown = "unknown";
-void fail(GError *error);
+void fail(GError *error, struct information *);
void update_bmpx()
{
@@ -58,15 +58,15 @@
bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
if (bus == NULL) {
NORM_ERR("BMPx error 1: %s\n", error->message);
- fail(error);
+ fail(error, current_info);
return;
}
remote_object = dbus_g_proxy_new_for_name(bus, BMP_DBUS_SERVICE,
- BMP_DBUS_PATH, BMP_DBUS_INTERFACE);
+ BMP_DBUS_PATH__BMP, BMP_DBUS_INTERFACE__BMP);
if (!remote_object) {
NORM_ERR("BMPx error 2: %s\n", error->message);
- fail(error);
+ fail(error, current_info);
return;
}
@@ -78,7 +78,7 @@
G_TYPE_INVALID, G_TYPE_INT, &current_track, G_TYPE_INVALID)) {
} else {
NORM_ERR("BMPx error 3: %s\n", error->message);
- fail(error);
+ fail(error, current_info);
return;
}
@@ -112,17 +112,17 @@
g_value_get_string(g_hash_table_lookup(metadata, "location"));
} else {
NORM_ERR("BMPx error 4: %s\n", error->message);
- fail(error);
+ fail(error, current_info);
return;
}
g_hash_table_destroy(metadata);
} else {
- fail(error);
+ fail(error, current_info);
}
}
-void fail(GError *error)
+void fail(GError *error, struct information *current_info)
{
if (error) {
g_error_free(error);