diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-15 11:47:10 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-15 11:47:10 +0800 |
| commit | 9fa21e27e141551a190dedf22d5d9a81cfd813f1 (patch) | |
| tree | e3a66be686ee100655ff0a47ccf5190480ded142 /x11/gdm | |
| parent | 5a8ae859ac1f29eb0be9330edf86925cb470d1df (diff) | |
| download | marcuscom-ports-9fa21e27e141551a190dedf22d5d9a81cfd813f1.tar marcuscom-ports-9fa21e27e141551a190dedf22d5d9a81cfd813f1.tar.gz marcuscom-ports-9fa21e27e141551a190dedf22d5d9a81cfd813f1.tar.bz2 marcuscom-ports-9fa21e27e141551a190dedf22d5d9a81cfd813f1.tar.lz marcuscom-ports-9fa21e27e141551a190dedf22d5d9a81cfd813f1.tar.xz marcuscom-ports-9fa21e27e141551a190dedf22d5d9a81cfd813f1.tar.zst marcuscom-ports-9fa21e27e141551a190dedf22d5d9a81cfd813f1.zip | |
Update to 2.13.0.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5139 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 4 | ||||
| -rw-r--r-- | x11/gdm/distinfo | 5 | ||||
| -rw-r--r-- | x11/gdm/files/patch-daemon_getvt.c | 64 | ||||
| -rw-r--r-- | x11/gdm/pkg-plist | 3 |
4 files changed, 72 insertions, 4 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 731732a34..960a9ead9 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/x11/gdm/Makefile,v 1.1 2005/11/06 05:28:01 ahze Exp $ # PORTNAME= gdm -PORTVERSION= 2.13.0.0 +PORTVERSION= 2.13.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.13 diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 7db48c1b3..9e962b7b9 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,2 +1,3 @@ -MD5 (gnome2/gdm-2.13.0.0.tar.bz2) = e5ad1dc5841f469bdcfda128175f402f -SIZE (gnome2/gdm-2.13.0.0.tar.bz2) = 2833282 +MD5 (gnome2/gdm-2.13.0.1.tar.bz2) = d4e665609734cc62db7199a3e35b9300 +SHA256 (gnome2/gdm-2.13.0.1.tar.bz2) = 788689adc986178856faecd451ce1a6206691621892c2acae4254cd870044b02 +SIZE (gnome2/gdm-2.13.0.1.tar.bz2) = 2847181 diff --git a/x11/gdm/files/patch-daemon_getvt.c b/x11/gdm/files/patch-daemon_getvt.c new file mode 100644 index 000000000..44eb9c198 --- /dev/null +++ b/x11/gdm/files/patch-daemon_getvt.c @@ -0,0 +1,64 @@ +--- daemon/getvt.c.orig Mon Nov 14 22:20:51 2005 ++++ daemon/getvt.c Mon Nov 14 22:40:39 2005 +@@ -87,8 +87,10 @@ get_free_vt (int *vtfd) + { + int fd, fdv; + int vtno; ++#if defined(__linux__) + unsigned short vtmask; + struct vt_stat vtstat; ++#endif + + *vtfd = -1; + +@@ -103,23 +105,50 @@ get_free_vt (int *vtfd) + if (fd < 0) + return -1; + ++#if defined(__linux__) + if (ioctl (fd, VT_GETSTATE, &vtstat) < 0) { ++#elif defined (__FreeBSD__) || defined(__DragonFly__) ++ if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) { ++#endif + VE_IGNORE_EINTR (close (fd)); + return -1; + } + ++#if defined(__linux__) + for (vtno = gdm_get_value_int (GDM_KEY_FIRST_VT), vtmask = 1 << (vtno-1); + vtstat.v_state & vtmask; vtno++, vtmask <<= 1); + if (!vtmask) { ++#elif defined (__FreeBSD__) || defined(__DragonFly__) ++ fdv = open_vt(vtno); ++ if (fdv < 0) { ++#endif + VE_IGNORE_EINTR (close (fd)); + return -1; + } + ++#if defined(__linux__) + fdv = open_vt (vtno); + if (fdv < 0) { + VE_IGNORE_EINTR (close (fd)); + return -1; + } ++#elif defined(__FreeBSD__) || defined(__DragonFly__) ++ while (vtno < gdm_get_value_int (GDM_KEY_FIRST_VT)) { ++ if (fdv > -1) ++ VE_IGNORE_EINTR (close (fdv)); ++ ++ if (ioctl(fd, VT_OPENQRY, &vtno) == -1) { ++ VE_IGNORE_EINTR (close (fd)); ++ return -1; ++ } ++ ++ fdv = open_vt (vtno); ++ if (fdv < 0) { ++ VE_IGNORE_EINTR (close (fd)); ++ return -1; ++ } ++ } ++#endif + *vtfd = fdv; + return vtno; + } diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index bff2fc89b..24f09355a 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -180,6 +180,7 @@ share/locale/is/LC_MESSAGES/gdm.mo share/locale/it/LC_MESSAGES/gdm.mo share/locale/ja/LC_MESSAGES/gdm.mo share/locale/ko/LC_MESSAGES/gdm.mo +share/locale/ku/LC_MESSAGES/gdm.mo share/locale/lt/LC_MESSAGES/gdm.mo share/locale/lv/LC_MESSAGES/gdm.mo share/locale/mi/LC_MESSAGES/gdm.mo @@ -229,6 +230,8 @@ share/locale/zu/LC_MESSAGES/gdm.mo @unexec rmdir %D/share/locale/mr 2> /dev/null || true @unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/mi 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm share/gnome/xsessions @dirrm share/gnome/omf/gdm @dirrm share/gnome/help/gdm/zh_TW/figures |