diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-02-01 00:43:51 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-02-01 00:43:51 +0800 |
| commit | 3a8ca122c70d063883aaec56c6af87e2f7a4dd20 (patch) | |
| tree | ec5286ade32f92191acd3533422fb4e09813c2c6 | |
| parent | 380dbaf9e768ed991ef3e281d5d0c0a58e26e183 (diff) | |
| download | marcuscom-ports-3a8ca122c70d063883aaec56c6af87e2f7a4dd20.tar.gz marcuscom-ports-3a8ca122c70d063883aaec56c6af87e2f7a4dd20.tar.zst marcuscom-ports-3a8ca122c70d063883aaec56c6af87e2f7a4dd20.zip | |
Update to 2.29.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13554 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/liboobs/Makefile | 16 | ||||
| -rw-r--r-- | devel/liboobs/distinfo | 6 | ||||
| -rw-r--r-- | devel/liboobs/files/patch-src_oobs-user.c | 42 |
3 files changed, 28 insertions, 36 deletions
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile index db6ae4e39..66313439f 100644 --- a/devel/liboobs/Makefile +++ b/devel/liboobs/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/liboobs/Makefile,v 1.38 2009/11/28 05:59:00 mezz Exp $ +# $MCom: ports/devel/liboobs/Makefile,v 1.41 2010/01/18 07:09:10 marcus Exp $ # PORTNAME= liboobs -PORTVERSION= 2.29.2.1 +PORTVERSION= 2.29.3 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -28,4 +28,14 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +# disable utmpx detection on early 9.x and below. +# We still have only utmp there +post-patch: +.if ${OSVERSION} < 900007 + @${REINPLACE_CMD} -e 's|utmpx|utmp|g' \ + ${WRKSRC}/configure +.endif + +.include <bsd.port.post.mk> diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo index 2cd6cd7b0..72f2813a0 100644 --- a/devel/liboobs/distinfo +++ b/devel/liboobs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/liboobs-2.29.2.1.tar.bz2) = 85be98dacddc44c51ebcf947577df44d -SHA256 (gnome2/liboobs-2.29.2.1.tar.bz2) = 0c2d37d7f07508660d06d75fb245a920860dc5e7efe760e913634e1b2ab130f4 -SIZE (gnome2/liboobs-2.29.2.1.tar.bz2) = 367534 +MD5 (gnome2/liboobs-2.29.3.tar.bz2) = ee097d4c6bad8e0eeb3db3aadf7fcb14 +SHA256 (gnome2/liboobs-2.29.3.tar.bz2) = 46f7ed6ff2c665e894050ad36facf3417e97a4fc4eddbf84797298ea26cde570 +SIZE (gnome2/liboobs-2.29.3.tar.bz2) = 317702 diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c index ec1ce8ce6..a7215c4ef 100644 --- a/devel/liboobs/files/patch-src_oobs-user.c +++ b/devel/liboobs/files/patch-src_oobs-user.c @@ -1,13 +1,9 @@ ---- oobs/oobs-user.c.orig 2007-10-30 09:16:53.406333206 -0400 -+++ oobs/oobs-user.c 2007-10-30 09:40:02.560797530 -0400 -@@ -18,13 +18,28 @@ - * Authors: Carlos Garnacho Parro <carlosg@gnome.org> +--- oobs/oobs-user.c.orig 2010-01-31 17:36:52.000000000 +0000 ++++ oobs/oobs-user.c 2010-01-31 17:40:21.000000000 +0000 +@@ -19,13 +19,24 @@ + * Milan Bouchet-Valat <nalimilan@club.fr>. */ -+#if defined(HAVE_CONFIG_H) -+#include <config.h> -+#endif -+ +#ifdef __FreeBSD__ +# include <sys/param.h> +# if __FreeBSD_version >= 900007 @@ -22,42 +18,28 @@ #include <string.h> +#ifdef HAVE_CRYPT_H #include <crypt.h> --#include <utmp.h> +#endif +#ifdef HAVE_UTMPX_H -+#include <utmpx.h> + #include <utmpx.h> +#endif + #include "oobs-object-private.h" #include "oobs-usersconfig.h" - #include "oobs-user.h" -@@ -811,7 +826,8 @@ +@@ -1252,6 +1263,7 @@ oobs_user_set_locale (OobsUser *user, co gboolean oobs_user_get_active (OobsUser *user) { -- struct utmp *entry; +#ifdef HAVE_UTMPX_H -+ struct utmpx *entry; + struct utmpx *entry; const gchar *login; gboolean match = FALSE; - -@@ -819,14 +835,18 @@ - - login = oobs_user_get_login_name (user); - -- while (!match && (entry = getutent ()) != NULL) -+ setutxent (); -+ while (!match && (entry = getutxent ()) != NULL) - { - match = (entry->ut_type == USER_PROCESS && - strcmp (entry->ut_user, login) == 0); - } - - /* close utmp */ -- endutent (); -+ endutxent (); +@@ -1272,6 +1284,9 @@ oobs_user_get_active (OobsUser *user) + endutxent (); return match; +#else + return FALSE; +#endif } + + /** |