summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-01-10 05:00:44 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-01-10 05:00:44 +0800
commit867eaf916dafa9bcd2e24564ea8e8e3b69d601f2 (patch)
tree61c46732a6dbbb47131417be67e4447e87aa2f5d
parent0a460533e28d9f69d713f46aed46d8ff04854e67 (diff)
downloadmarcuscom-ports-867eaf916dafa9bcd2e24564ea8e8e3b69d601f2.tar
marcuscom-ports-867eaf916dafa9bcd2e24564ea8e8e3b69d601f2.tar.gz
marcuscom-ports-867eaf916dafa9bcd2e24564ea8e8e3b69d601f2.tar.bz2
marcuscom-ports-867eaf916dafa9bcd2e24564ea8e8e3b69d601f2.tar.lz
marcuscom-ports-867eaf916dafa9bcd2e24564ea8e8e3b69d601f2.tar.xz
marcuscom-ports-867eaf916dafa9bcd2e24564ea8e8e3b69d601f2.tar.zst
marcuscom-ports-867eaf916dafa9bcd2e24564ea8e8e3b69d601f2.zip
Correct the path to lsof, and add a RUN_DEPENDS on lsof.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13419 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--ports-mgmt/packagekit/Makefile7
-rw-r--r--ports-mgmt/packagekit/files/patch-src_pk-lsof.c11
2 files changed, 16 insertions, 2 deletions
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index 7f024caef..a93829443 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -3,11 +3,11 @@
# Whom: Anders F Bjorklund <afb@users.sourceforge.net>
#
# $FreeBSD$
-# $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.7 2010/01/09 20:49:13 marcus Exp $
+# $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.8 2010/01/09 20:50:09 marcus Exp $
PORTNAME= PackageKit
PORTVERSION= 0.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ports-mgmt sysutils
MASTER_SITES= http://www.packagekit.org/releases/
@@ -20,6 +20,7 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
ck-connector.0:${PORTSDIR}/sysutils/consolekit
+RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof
USE_GMAKE= yes
USE_GETTEXT= yes
@@ -107,5 +108,7 @@ CONFIGURE_ARGS+=--disable-qt
post-patch:
@${REINPLACE_CMD} -E -e 's/.*WARNINGFLAGS_CPP.*-Werror/#$$&/' \
-e 's|-Wmissing-include-dirs||g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/src/pk-lsof.c
.include <bsd.port.post.mk>
diff --git a/ports-mgmt/packagekit/files/patch-src_pk-lsof.c b/ports-mgmt/packagekit/files/patch-src_pk-lsof.c
new file mode 100644
index 000000000..6609acef2
--- /dev/null
+++ b/ports-mgmt/packagekit/files/patch-src_pk-lsof.c
@@ -0,0 +1,11 @@
+--- src/pk-lsof.c.orig 2010-01-09 15:57:54.000000000 -0500
++++ src/pk-lsof.c 2010-01-09 15:58:15.000000000 -0500
+@@ -153,7 +153,7 @@ pk_lsof_refresh (PkLsof *lsof)
+ g_return_val_if_fail (PK_IS_LSOF (lsof), FALSE);
+
+ /* run lsof to get all data */
+- ret = g_spawn_command_line_sync ("/usr/sbin/lsof -Fpfn", &stdout, &stderr, NULL, &error);
++ ret = g_spawn_command_line_sync ("%%LOCALBASE%%/sbin/lsof -Fpfn", &stdout, &stderr, NULL, &error);
+ if (!ret) {
+ egg_warning ("failed to get pids: %s", error->message);
+ g_error_free (error);