Index: head/x11/gdm/Makefile =================================================================== --- head/x11/gdm/Makefile (revision 245305) +++ head/x11/gdm/Makefile (revision 245306) @@ -1,105 +1,105 @@ # New ports collection makefile for: gdm2 # Date created: 20 May 2002 # Whom: Joe Marcus Clarke # # $FreeBSD$ # $MCom: ports/x11/gdm/Makefile,v 1.164 2009/11/28 05:59:03 mezz Exp $ # PORTNAME= gdm PORTVERSION= 2.28.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 version of xdm display manager BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \ execinfo:${PORTSDIR}/devel/libexecinfo \ hal.1:${PORTSDIR}/sysutils/hal \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ gnome-session:${PORTSDIR}/x11/gnome-session USERS= gdm GROUPS= gdm USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_XORG= dmx dmxproto INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomehier gconf2 libglade2 librsvg2 \ gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAS_SA_LEN" \ LDFLAGS="-L${LOCALBASE}/lib" \ LIBS="-lm" \ GTKDOC="false" SUB_FILES+= gdm.pam GDMDIR?= ${PREFIX}/etc/gdm PKGMESSAGE= ${WRKDIR}/pkg-message GNOME_LOCALSTATEDIR= /var OPTIONS= IPV6 "Enable IPv6 support" off \ KEYRING "Enable GnomeKeyring/PAM integration" on .include .if defined(WITHOUT_KEYRING) SUB_LIST+= PAM_KEYRING=\# .else RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring SUB_LIST+= PAM_KEYRING= .endif .if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif post-patch: @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \ ${WRKSRC}/data/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/daemon/gdm-session-worker.c \ ${WRKSRC}/data/gconf.path @${REINPLACE_CMD} -e 's|/bin/true|/usr/bin/true|g' \ ${WRKSRC}/data/session-setup.entries @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po @${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|g' \ ${WRKSRC}/data/greeter-autostart/*.desktop.in* post-install: ${INSTALL_DATA} ${WRKSRC}/data/gconf.path \ ${PREFIX}/share/gdm/gconf.path ${INSTALL_DATA} ${WRKSRC}/data/session-setup.entries \ ${PREFIX}/share/gdm/session-setup.entries .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif ${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \ ${PREFIX}/etc/gdm/custom.conf.default ${MKDIR} ${PREFIX}/share/xsessions ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \ | /usr/bin/fmt 75 79 > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11/gdm/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.125 \ No newline at end of property +1.126 \ No newline at end of property Index: head/x11/gdm/files/patch-gui_simple-greeter_Makefile.in =================================================================== --- head/x11/gdm/files/patch-gui_simple-greeter_Makefile.in (revision 245305) +++ head/x11/gdm/files/patch-gui_simple-greeter_Makefile.in (revision 245306) @@ -1,11 +1,11 @@ --- gui/simple-greeter/Makefile.in.orig 2008-02-13 01:57:37.000000000 -0500 +++ gui/simple-greeter/Makefile.in 2008-02-13 01:57:44.000000000 -0500 @@ -445,7 +445,7 @@ INCLUDES = \ -DGDMCONFDIR=\"$(gdmconfdir)\" \ -DDATADIR=\""$(datadir)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ -+ -DLIBLOCALEDIR=\""$(prefix)/share/locale"\" \ ++ -DLIBLOCALEDIR=\""/usr/share/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGLADEDIR=\""$(pkgdatadir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ Property changes on: head/x11/gdm/files/patch-gui_simple-greeter_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c =================================================================== --- head/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c (revision 245305) +++ head/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c (revision 245306) @@ -1,45 +1,27 @@ --- gui/simple-greeter/gdm-languages.c.orig 2009-07-20 03:09:09.000000000 +0200 +++ gui/simple-greeter/gdm-languages.c 2009-07-20 10:02:41.000000000 +0200 @@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam *codesetp = NULL; } - if (*codesetp != NULL) { +/* if (*codesetp != NULL) { char *codeset; codeset = normalize_codeset (*codesetp); g_free (*codesetp); *codesetp = codeset; - } + }*/ } if (modifierp != NULL) { -@@ -314,7 +314,7 @@ language_name_has_translations (const ch - const char *name; - gboolean has_translations; - -- path = g_build_filename (GNOMELOCALEDIR, language_name, "LC_MESSAGES", NULL); -+ path = g_build_filename ("/usr/share/locale", language_name, "LC_MESSAGES", NULL); - - has_translations = FALSE; - dir = g_dir_open (path, 0, NULL); @@ -352,7 +352,7 @@ add_locale (const char *language_name) if (language_name_is_utf8 (language_name)) { name = g_strdup (language_name); } else { - name = g_strdup_printf ("%s.utf8", language_name); + name = g_strdup_printf ("%s.UTF-8", language_name); if (!language_name_is_utf8 (name)) { g_free (name); -@@ -501,7 +501,7 @@ collect_locales_from_directory (void) - int ndirents; - int cnt; - -- ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort); -+ ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort); - - for (cnt = 0; cnt < ndirents; ++cnt) { - add_locale (dirents[cnt]->d_name); Property changes on: head/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property