diff options
| author | jmmv <jmmv@pkgsrc.org> | 2006-04-01 16:13:56 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2006-04-01 16:13:56 +0000 |
| commit | 99a477e8434cdefe6d47dd91b217e7cb2b566040 (patch) | |
| tree | e4672c2a8797819b33113f923871139373000944 | |
| parent | a2d3c1a3c2c70a49cb8a47899ab6daf9599272ed (diff) | |
| download | pkgsrc-99a477e8434cdefe6d47dd91b217e7cb2b566040.tar.gz | |
Fix pkill detection to get rid of the psmisc dependency.
Bump PKGREVISION to 2.
| -rw-r--r-- | mail/evolution/Makefile | 5 | ||||
| -rw-r--r-- | mail/evolution/distinfo | 3 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-aa | 21 |
3 files changed, 25 insertions, 4 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index e30e652bf3a..12105387d59 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.104 2006/03/31 09:00:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.105 2006/04/01 16:13:56 jmmv Exp $ DISTNAME= evolution-2.6.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail time gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.6/} EXTRACT_SUFX= .tar.bz2 @@ -10,7 +10,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/projects/evolution/ COMMENT= GNOME mailer, calendar, contact manager, and communications tool -DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc BUILD_USES_MSGFMT= YES PKG_OPTIONS_VAR= PKG_OPTIONS.evolution diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index e987889bdfa..f3409fbe86f 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.43 2006/03/30 21:37:01 jmmv Exp $ +$NetBSD: distinfo,v 1.44 2006/04/01 16:13:56 jmmv Exp $ SHA1 (evolution-2.6.0.tar.bz2) = f515b3112cb4b6a4f44a02ee398391cd178f2d59 RMD160 (evolution-2.6.0.tar.bz2) = 7f01966a6ff8b02ab5f5bf74a120e452cbc32f4d Size (evolution-2.6.0.tar.bz2) = 12072895 bytes +SHA1 (patch-aa) = c261b438f08bf1eff21faa80fc1a2c935b4dce51 SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa new file mode 100644 index 00000000000..11b82c0c0a5 --- /dev/null +++ b/mail/evolution/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.20 2006/04/01 16:13:56 jmmv Exp $ + +--- configure.orig 2006-04-01 13:05:40.000000000 +0200 ++++ configure +@@ -29653,13 +29653,10 @@ fi + echo "$as_me:$LINENO: checking for command to kill processes" >&5 + echo $ECHO_N "checking for command to kill processes... $ECHO_C" >&6 + +-if test `uname -s` = "SunOS" ; then +- KILL_PROCESS_CMD="pkill"; +-else +- KILL_PROCESS_CMD="killall"; ++KILL_PROCESS_CMD=`which pkill` ++if test -z "$KILL_PROCESS_CMD" ; then ++ KILL_PROCESS_CMD=`which killall` + fi +- +-KILL_PROCESS_CMD=`which $KILL_PROCESS_CMD` + if test -z "$KILL_PROCESS_CMD" ; then + echo "$as_me:$LINENO: result: none" >&5 + echo "${ECHO_T}none" >&6 |