diff options
author | marcus <marcus@FreeBSD.org> | 2003-02-07 18:42:25 +0000 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2003-02-07 18:42:25 +0000 |
commit | f62e25411b41ca8baddd09338c464cd9b8eb7ef6 (patch) | |
tree | 461379d765de7667472a8d24cf3b741ac706024e /x11/gdm2 | |
parent | e739179a076b7ce87c2686708607b87f29f155f7 (diff) | |
download | FreeBSD-ports-f62e25411b41ca8baddd09338c464cd9b8eb7ef6.zip FreeBSD-ports-f62e25411b41ca8baddd09338c464cd9b8eb7ef6.tar.gz |
Update to GNOME 2.2.
This is Phase I. All existing ports have been updated to their GNOME 2.2
counterparts.
Diffstat (limited to 'x11/gdm2')
-rw-r--r-- | x11/gdm2/Makefile | 9 | ||||
-rw-r--r-- | x11/gdm2/distinfo | 2 | ||||
-rw-r--r-- | x11/gdm2/files/patch-al | 17 | ||||
-rw-r--r-- | x11/gdm2/files/patch-config_Default | 20 | ||||
-rw-r--r-- | x11/gdm2/files/patch-config_locale.alias | 175 | ||||
-rw-r--r-- | x11/gdm2/files/patch-daemon_gdm.c | 11 | ||||
-rw-r--r-- | x11/gdm2/pkg-install | 4 | ||||
-rw-r--r-- | x11/gdm2/pkg-plist | 5 |
8 files changed, 118 insertions, 125 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 54491b9..1471cf2 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gdm2 -PORTVERSION= 2.4.0.12 -PORTREVISION= 1 +PORTVERSION= 2.4.1.3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 @@ -16,8 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ - rsvg-2.2:${PORTSDIR}/graphics/librsvg2 +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ + rsvg-2.4:${PORTSDIR}/graphics/librsvg2 USE_BZIP2= yes USE_X_PREFIX= yes @@ -56,6 +55,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ + ${WRKSRC}/po/Makefile.in.in post-install: .if !defined(PACKAGE_BUILDING) diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index 9e9c353..07f6dda 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gdm-2.4.0.12.tar.bz2) = 8aa6e503d4f74de8df32dee28df9a0de +MD5 (gnome2/gdm-2.4.1.3.tar.bz2) = 448769257c5bda3cda48e63869825173 diff --git a/x11/gdm2/files/patch-al b/x11/gdm2/files/patch-al index ee0fb6a..6458c9e 100644 --- a/x11/gdm2/files/patch-al +++ b/x11/gdm2/files/patch-al @@ -1,12 +1,9 @@ ---- config/gnomerc.in.orig Wed Jul 24 15:25:51 2002 -+++ config/gnomerc.in Mon Dec 23 23:53:21 2002 -@@ -2,7 +2,8 @@ +--- config/gnomerc.in.orig Mon Nov 11 10:54:52 2002 ++++ config/gnomerc.in Fri Jan 3 12:09:49 2003 +@@ -9,5 +9,6 @@ + #fi - # Do we have gnome-volume-control? - # If so we should run it to load the gnome-volume-control settings --if command -v gnome-volume-control > /dev/null 2>&1; then + # path takes precedence +LC_CTYPE= ; export LC_CTYPE -+if /usr/bin/which -s gnome-volume-control > /dev/null 2>&1; then - gnome-volume-control -i - elif [ -x @EXPANDED_BINDIR@/gnome-volume-control ] ; then - @EXPANDED_BINDIR@/gnome-volume-control -i + exec gnome-session + exec @EXPANDED_BINDIR@/gnome-session diff --git a/x11/gdm2/files/patch-config_Default b/x11/gdm2/files/patch-config_Default deleted file mode 100644 index 1c82c6b..0000000 --- a/x11/gdm2/files/patch-config_Default +++ /dev/null @@ -1,20 +0,0 @@ ---- config/Default.orig Mon Dec 23 23:53:42 2002 -+++ config/Default Mon Dec 23 23:54:11 2002 -@@ -7,7 +7,7 @@ - - sysmodmap=/etc/X11/Xmodmap - --if command -v xmodmap > /dev/null 2>&1; then -+if /usr/bin/which -s xmodmap > /dev/null 2>&1; then - if [ -z "$GDM_PARENT_DISPLAY" ]; then - if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -@@ -17,7 +17,7 @@ - fi - fi - --if command -v setxkbmap > /dev/null 2>&1; then -+if /usr/bin/which -s setxkbmap > /dev/null 2>&1; then - # FIXME: is this all right? Is this completely on crack? - # What this does is move the xkb configuration from the GDM_PARENT_DISPLAY - # FIXME: This should be done in code. Or there must be an easier way ... diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias index a162ae1..48d7d1b 100644 --- a/x11/gdm2/files/patch-config_locale.alias +++ b/x11/gdm2/files/patch-config_locale.alias @@ -1,90 +1,91 @@ ---- config/locale.alias.orig Thu Aug 22 18:47:35 2002 -+++ config/locale.alias Wed Sep 18 22:18:10 2002 -@@ -14,54 +14,36 @@ +--- config/locale.alias.orig Wed Jan 8 13:31:44 2003 ++++ config/locale.alias Tue Jan 14 16:51:29 2003 +@@ -14,55 +14,36 @@ # # - George --Azerbaijani az_AZ.utf8,az_AZ --Arabic(Egypt) ar_EG.utf8,ar_EG --Arabic(Lebanon) ar_LB.utf8,ar_LB --Basque eu_ES.utf8,eu_ES --Bulgarian bg_BG.utf8,bg_BG --Catalan ca_ES.utf8,ca_ES --Chinese(simplified) zh_CN.utf8,zh_CN --Chinese(traditional) zh_TW.utf8,zh_TW --Croatian hr_HR.utf8,hr_HR --Czech cs_CZ.utf8,cs_CZ --Danish da_DK.utf8,da_DK --Dutch nl_NL.utf8,nl_NL --Estonian et_EE.utf8,et_EE --English(American) en_US.utf8,en_US --English(Australian) en_AU.utf8,en_AU --English(British) en_GB.utf8,en_GB --English(Ireland) en_IE.utf8,en_IE --Finnish fi_FI.utf8,fi_FI --French fr_FR.utf8,fr_FR --Galician gl_ES.utf8,gl_ES --German de_DE.utf8,de_DE --Greek el_GR.utf8,el_GR --Hebrew he_IL.utf8,he_IL --Hungarian hu_HU.utf8,hu_HU --Icelandic is_IS.utf8,is_IS --Irish ga_IE.utf8,ga_IE --Italian it_IT.utf8,it_IT --Japanese ja_JP.utf8,ja_JP --Korean ko_KR.utf8,ko_KR --Latvian lv_LV.utf8,lv_LV --Lithuanian lt_LT.utf8,lt_LT --Macedonian mk_MK.utf8,mk_MK --Malay ms_MY.utf8,ms_MY --Norwegian(bokmal) no_NO.utf8,no_NO --Norwegian(nynorsk) nn_NO.utf8,nn_NO --Polish pl_PL.utf8,pl_PL --Portuguese pt_PT.utf8,pt_PT --Portuguese(Brazilian) pt_BR.utf8,pt_BR --Romanian ro_RO.utf8,ro_RO --Russian ru_RU.utf8,ru_RU --Slovak sk_SK.utf8,sk_SK --Slovenian sl_SI.utf8,sl_SI --Spanish es_ES.utf8,es_ES --Spanish(Mexico) es_MX.utf8,es_MX --Swedish sv_SE.utf8,sv_SE --Swedish(Finland) sv_FI.utf8,sv_FI --Tamil ta_IN.utf8,ta_IN --Turkish tr_TR.utf8,tr_TR --Ukrainian uk_UA.utf8,uk_UA --Vietnamese vi_VN.utf8,vi_VN --Walloon wa_BE.utf8,wa_BE -+Bulgarian bg_BG.utf8,bg_BG.CP1251 -+Chinese(simplified) zh_CN.utf8,zh_CN.EUC -+Chinese(traditional) zh_TW.utf8,zh_TW.Big5 -+Croatian hr_HR.utf8,hr_HR.ISO_8859-2 -+Czech cs_CZ.utf8,cs_CZ.ISO_8859-2 -+Danish da_DK.utf8,da_DK.ISO_8859-1 -+Dutch nl_NL.utf8,nl_NL.ISO_8859-1 -+Estonian et_EE.utf8,et_EE.ISO_8859-15 -+English(American) en_US.utf8,en_US.ISO_8859-1 -+English(Australian) en_AU.utf8,en_AU.ISO_8859-1 -+English(British) en_GB.utf8,en_GB.ISO_8859-1 -+Finnish fi_FI.utf8,fi_FI.ISO_8859-1 -+French fr_FR.utf8,fr_FR.ISO_8859-1 -+German de_DE.utf8,de_DE.ISO_8859-1 -+Greek el_GR.utf8,el_GR.ISO_8859-7 -+Hungarian hu_HU.utf8,hu_HU.ISO_8859-2 -+Icelandic is_IS.utf8,is_IS.ISO_8859-1 -+Italian it_IT.utf8,it_IT.ISO_8859-1 -+Japanese ja_JP.utf8,ja_JP.EUC -+Korean ko_KR.utf8,ko_KR.EUC -+Lithuanian lt_LT.utf8,lt_LT.ISO_8859-4 -+Norwegian(bokmal) no_NO.utf8,no_NO.ISO_8859-1 -+Polish pl_PL.utf8,pl_PL.ISO_8859-2 -+Portuguese pt_PT.utf8,pt_PT.ISO_8859-1 -+Portuguese(Brazilian) pt_BR.utf8,pt_BR.ISO8859-1 -+Romanian ro_RO.utf8,ro_RO.ISO8859-2 -+Russian ru_RU.utf8,ru_RU.ISO_8859-5 -+Slovak sk_SK.utf8,sk_SK.ISO_8859-2 -+Slovenian sl_SI.utf8,sl_SI.ISO_8859-2 -+Spanish es_ES.utf8,es_ES.ISO_8859-1 -+Swedish sv_SE.utf8,sv_SE.ISO_8859-1 -+Turkish tr_TR.utf8,tr_TR.ISO_8859-9 -+Ukrainian uk_UA.utf8,uk_UA.ISO8859-5 +-Azerbaijani az_AZ.UTF-8,az_AZ +-Arabic(Egypt) ar_EG.UTF-8,ar_EG +-Arabic(Lebanon) ar_LB.UTF-8,ar_LB +-Amharic am_ET.UTF-8,am_ET +-Basque eu_ES.UTF-8,eu_ES +-Bulgarian bg_BG.UTF-8,bg_BG +-Catalan ca_ES.UTF-8,ca_ES +-Chinese(simplified) zh_CN.UTF-8,zh_CN +-Chinese(traditional) zh_TW.UTF-8,zh_TW +-Croatian hr_HR.UTF-8,hr_HR +-Czech cs_CZ.UTF-8,cs_CZ +-Danish da_DK.UTF-8,da_DK +-Dutch nl_NL.UTF-8,nl_NL +-Estonian et_EE.UTF-8,et_EE +-English(American) en_US.UTF-8,en_US +-English(Australian) en_AU.UTF-8,en_AU +-English(British) en_GB.UTF-8,en_GB +-English(Ireland) en_IE.UTF-8,en_IE +-Finnish fi_FI.UTF-8,fi_FI +-French fr_FR.UTF-8,fr_FR +-Galician gl_ES.UTF-8,gl_ES +-German de_DE.UTF-8,de_DE +-Greek el_GR.UTF-8,el_GR +-Hebrew he_IL.UTF-8,he_IL +-Hungarian hu_HU.UTF-8,hu_HU +-Icelandic is_IS.UTF-8,is_IS +-Irish ga_IE.UTF-8,ga_IE +-Italian it_IT.UTF-8,it_IT +-Japanese ja_JP.UTF-8,ja_JP +-Korean ko_KR.UTF-8,ko_KR +-Latvian lv_LV.UTF-8,lv_LV +-Lithuanian lt_LT.UTF-8,lt_LT +-Macedonian mk_MK.UTF-8,mk_MK +-Malay ms_MY.UTF-8,ms_MY +-Norwegian(bokmal) no_NO.UTF-8,no_NO +-Norwegian(nynorsk) nn_NO.UTF-8,nn_NO +-Polish pl_PL.UTF-8,pl_PL +-Portuguese pt_PT.UTF-8,pt_PT +-Portuguese(Brazilian) pt_BR.UTF-8,pt_BR +-Romanian ro_RO.UTF-8,ro_RO +-Russian ru_RU.UTF-8,ru_RU +-Slovak sk_SK.UTF-8,sk_SK +-Slovenian sl_SI.UTF-8,sl_SI +-Spanish es_ES.UTF-8,es_ES +-Spanish(Mexico) es_MX.UTF-8,es_MX +-Swedish sv_SE.UTF-8,sv_SE +-Swedish(Finland) sv_FI.UTF-8,sv_FI +-Tamil ta_IN.UTF-8,ta_IN +-Turkish tr_TR.UTF-8,tr_TR +-Ukrainian uk_UA.UTF-8,uk_UA +-Vietnamese vi_VN.UTF-8,vi_VN +-Walloon wa_BE.UTF-8,wa_BE ++Bulgarian bg_BG.UTF-8,bg_BG.CP1251 ++Chinese(simplified) zh_CN.UTF-8,zh_CN.EUC ++Chinese(traditional) zh_TW.UTF-8,zh_TW.Big5 ++Croatian hr_HR.UTF-8,hr_HR.ISO_8859-2 ++Czech cs_CZ.UTF-8,cs_CZ.ISO_8859-2 ++Danish da_DK.UTF-8,da_DK.ISO_8859-1 ++Dutch nl_NL.UTF-8,nl_NL.ISO_8859-1 ++Estonian et_EE.UTF-8,et_EE.ISO_8859-15 ++English(American) en_US.UTF-8,en_US.ISO_8859-1 ++English(Australian) en_AU.UTF-8,en_AU.ISO_8859-1 ++English(British) en_GB.UTF-8,en_GB.ISO_8859-1 ++Finnish fi_FI.UTF-8,fi_FI.ISO_8859-1 ++French fr_FR.UTF-8,fr_FR.ISO_8859-1 ++German de_DE.UTF-8,de_DE.ISO_8859-1 ++Greek el_GR.UTF-8,el_GR.ISO_8859-7 ++Hungarian hu_HU.UTF-8,hu_HU.ISO_8859-2 ++Icelandic is_IS.UTF-8,is_IS.ISO_8859-1 ++Italian it_IT.UTF-8,it_IT.ISO_8859-1 ++Japanese ja_JP.UTF-8,ja_JP.EUC ++Korean ko_KR.UTF-8,ko_KR.EUC ++Lithuanian lt_LT.UTF-8,lt_LT.ISO_8859-4 ++Norwegian(bokmal) no_NO.UTF-8,no_NO.ISO_8859-1 ++Polish pl_PL.UTF-8,pl_PL.ISO_8859-2 ++Portuguese pt_PT.UTF-8,pt_PT.ISO_8859-1 ++Portuguese(Brazilian) pt_BR.UTF-8,pt_BR.ISO8859-1 ++Romanian ro_RO.UTF-8,ro_RO.ISO8859-2 ++Russian ru_RU.UTF-8,ru_RU.ISO_8859-5 ++Slovak sk_SK.UTF-8,sk_SK.ISO_8859-2 ++Slovenian sl_SI.UTF-8,sl_SI.ISO_8859-2 ++Spanish es_ES.UTF-8,es_ES.ISO_8859-1 ++Swedish sv_SE.UTF-8,sv_SE.ISO_8859-1 ++Turkish tr_TR.UTF-8,tr_TR.ISO_8859-9 ++Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5 diff --git a/x11/gdm2/files/patch-daemon_gdm.c b/x11/gdm2/files/patch-daemon_gdm.c new file mode 100644 index 0000000..76c115f --- /dev/null +++ b/x11/gdm2/files/patch-daemon_gdm.c @@ -0,0 +1,11 @@ +--- daemon/gdm.c.orig Thu May 30 11:02:29 2002 ++++ daemon/gdm.c Thu May 30 10:59:19 2002 +@@ -36,7 +36,7 @@ + #include <locale.h> + + /* This should be moved to auth.c I suppose */ +-#include <X11/Xauth.h> ++/*#include <X11/Xauth.h>*/ + + #include <vicious.h> + diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install index 237a1ce..e373a44 100644 --- a/x11/gdm2/pkg-install +++ b/x11/gdm2/pkg-install @@ -36,8 +36,8 @@ if [ "$2" = "POST-INSTALL" ]; then exit 1 fi fi - ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm - ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm + ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm + ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm exit 0 fi diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index 8f165bb..269c2f7 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -61,6 +61,7 @@ share/gnome/pixmaps/gdm.png share/gnome/pixmaps/login-photo.png share/gnome/pixmaps/nobody.png share/gnome/pixmaps/nohost.png +share/locale/am/LC_MESSAGES/gdm-2.4.mo share/locale/ar/LC_MESSAGES/gdm-2.4.mo share/locale/az/LC_MESSAGES/gdm-2.4.mo share/locale/be/LC_MESSAGES/gdm-2.4.mo @@ -77,12 +78,15 @@ share/locale/fi/LC_MESSAGES/gdm-2.4.mo share/locale/fr/LC_MESSAGES/gdm-2.4.mo share/locale/ga/LC_MESSAGES/gdm-2.4.mo share/locale/gl/LC_MESSAGES/gdm-2.4.mo +share/locale/he/LC_MESSAGES/gdm-2.4.mo share/locale/hu/LC_MESSAGES/gdm-2.4.mo share/locale/it/LC_MESSAGES/gdm-2.4.mo share/locale/ja/LC_MESSAGES/gdm-2.4.mo share/locale/ko/LC_MESSAGES/gdm-2.4.mo share/locale/lt/LC_MESSAGES/gdm-2.4.mo share/locale/lv/LC_MESSAGES/gdm-2.4.mo +share/locale/mk/LC_MESSAGES/gdm-2.4.mo +share/locale/mn/LC_MESSAGES/gdm-2.4.mo share/locale/ms/LC_MESSAGES/gdm-2.4.mo share/locale/nl/LC_MESSAGES/gdm-2.4.mo share/locale/nn/LC_MESSAGES/gdm-2.4.mo @@ -104,5 +108,4 @@ share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo @dirrm share/gnome/gdm/themes/happygnome @dirrm share/gnome/gdm/themes/circles @dirrm share/gnome/gdm/themes -@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true @dirrm etc/pam.d |