From ec9f1973a7e118d7f41cd85ec9fc008074bd45e9 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 19 Jan 2009 17:42:50 +0000 Subject: [PATCH] - change schemas file location - don't hardcode /usr/X11R6, use X11BASE and SUBST_CMD - add CONFIGURE_SHARED - bump --- sysutils/libgksu/Makefile | 9 ++++++--- sysutils/libgksu/patches/patch-libgksu_test-gksu_c | 10 +++++----- sysutils/libgksu/pkg/PLIST | 11 +++++------ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile index 2a550c98dfd..aac69ff7418 100644 --- a/sysutils/libgksu/Makefile +++ b/sysutils/libgksu/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2008/11/18 11:29:34 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2009/01/19 17:42:50 ajacoutot Exp $ COMMENT= library providing su and sudo functionality DISTNAME= libgksu-2.0.7 +PKGNAME= ${DISTNAME}p0 SHARED_LIBS= gksu2 0.1 # .0.2 CATEGORIES= sysutils @@ -38,12 +39,14 @@ USE_LIBTOOL= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gksu2 \ +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/libgksu \ --enable-gtk-doc="no" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-extract: +pre-configure: @perl -pi -e 's,/bin/su,/usr/bin/su,g' ${WRKSRC}/po/*.po + ${SUBST_CMD} ${WRKSRC}/libgksu/test-gksu.c .include diff --git a/sysutils/libgksu/patches/patch-libgksu_test-gksu_c b/sysutils/libgksu/patches/patch-libgksu_test-gksu_c index 59a53a423c1..116817698e7 100644 --- a/sysutils/libgksu/patches/patch-libgksu_test-gksu_c +++ b/sysutils/libgksu/patches/patch-libgksu_test-gksu_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-libgksu_test-gksu_c,v 1.1 2008/02/02 20:42:04 jasper Exp $ +$OpenBSD: patch-libgksu_test-gksu_c,v 1.2 2009/01/19 17:42:50 ajacoutot Exp $ --- libgksu/test-gksu.c.orig Thu Jan 31 21:00:44 2008 +++ libgksu/test-gksu.c Thu Jan 31 21:01:04 2008 @@ -63,12 +63,12 @@ main (int argc, char **argv) @@ -6,13 +6,13 @@ $OpenBSD: patch-libgksu_test-gksu_c,v 1.1 2008/02/02 20:42:04 jasper Exp $ context->debug = TRUE; - context->command = g_strdup ("/usr/bin/xterm"); -+ context->command = g_strdup ("/usr/X11R6/bin/xterm"); ++ context->command = g_strdup ("${X11BASE}/bin/xterm"); if (try_su) { printf ("Testing gksu_su...\n"); - gksu_su ("/usr/bin/xterm", &error); -+ gksu_su ("/usr/X11R6/bin/xterm", &error); ++ gksu_su ("${X11BASE}/bin/xterm", &error); if (error) fprintf (stderr, "gksu_su failed: %s\n", error->message); @@ -21,7 +21,7 @@ $OpenBSD: patch-libgksu_test-gksu_c,v 1.1 2008/02/02 20:42:04 jasper Exp $ printf ("Testing gksu_sudo...\n"); error = NULL; - gksu_sudo ("/usr/bin/xterm", &error); -+ gksu_sudo ("/usr/X11R6/bin/xterm", &error); ++ gksu_sudo ("${X11BASE}/bin/xterm", &error); if (error) fprintf (stderr, "gksu_sudo failed: %s\n", error->message); @@ -30,7 +30,7 @@ $OpenBSD: patch-libgksu_test-gksu_c,v 1.1 2008/02/02 20:42:04 jasper Exp $ printf ("Testing gksu_run...\n"); error = NULL; - gksu_run ("/usr/bin/xterm", &error); -+ gksu_run ("/usr/X11R6/bin/xterm", &error); ++ gksu_run ("${X11BASE}/bin/xterm", &error); if (error) fprintf (stderr, "gksu_run failed: %s\n", error->message); diff --git a/sysutils/libgksu/pkg/PLIST b/sysutils/libgksu/pkg/PLIST index be445479a3c..55635c435a8 100644 --- a/sysutils/libgksu/pkg/PLIST +++ b/sysutils/libgksu/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2008/11/18 11:29:34 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.4 2009/01/19 17:42:50 ajacoutot Exp $ %%SHARED%% @bin bin/gksu-properties include/libgksu/ @@ -18,7 +18,6 @@ share/locale/cs/LC_MESSAGES/libgksu.mo share/locale/da/LC_MESSAGES/libgksu.mo share/locale/de/LC_MESSAGES/libgksu.mo share/locale/es/LC_MESSAGES/libgksu.mo -share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/libgksu.mo share/locale/fr/LC_MESSAGES/libgksu.mo share/locale/hu/LC_MESSAGES/libgksu.mo @@ -38,10 +37,10 @@ share/locale/sv/LC_MESSAGES/libgksu.mo share/locale/zh_CN/LC_MESSAGES/libgksu.mo share/pixmaps/ share/pixmaps/gksu.png -@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gksu2/*.schemas > /dev/null +@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/libgksu/*.schemas > /dev/null share/schemas/ -share/schemas/gksu2/ -share/schemas/gksu2/gksu.schemas -@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gksu2/*.schemas > /dev/null +share/schemas/libgksu/ +share/schemas/libgksu/gksu.schemas +@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/libgksu/*.schemas > /dev/null @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database