Index: head/x11/gdm/Makefile =================================================================== --- head/x11/gdm/Makefile (revision 220211) +++ head/x11/gdm/Makefile (revision 220212) @@ -1,101 +1,100 @@ # New ports collection makefile for: gdm2 # Date created: 20 May 2002 # Whom: Joe Marcus Clarke # # $FreeBSD$ # $MCom: ports/x11/gdm/Makefile,v 1.117 2008/03/22 04:21:52 mezz Exp $ # PORTNAME= gdm -PORTVERSION= 2.20.7 -PORTREVISION= 3 +PORTVERSION= 2.20.8 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= popt.0:${PORTSDIR}/devel/popt \ ck-connector.0:${PORTSDIR}/sysutils/consolekit RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ xrdb:${PORTSDIR}/x11/xrdb USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_XORG= dmx dmxproto INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomehier librsvg2 gnomedocutils \ gnomeprefix GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" CONFIGURE_ARGS=--with-console-kit=yes SUB_FILES+= gdm.pam GDMDIR?= ${PREFIX}/etc/gdm PKGMESSAGE= ${WRKDIR}/pkg-message GNOME_LOCALSTATEDIR= /var MAN1= gdm.1 OPTIONS= IPV6 "Enable IPv6 support" off \ KEYRING "Enable GnomeKeyring/PAM integration" on \ LOG_LIMIT "Limit ~/.xsession-errors size" 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(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif .if defined(WITHOUT_LOG_LIMIT) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-daemon_slave.c .endif post-patch: .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) .for po in zh_CN.po @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} .endfor .endif @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \ ${WRKSRC}/config/Makefile.in @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure ${WRKSRC}/po/*.po ${WRKSRC}/gui/*.glade \ ${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.* @${REINPLACE_CMD} -e 's|/etc/gdm/gdm.conf|${PREFIX}/etc/gdm/gdm.conf|' \ ${WRKSRC}/docs/gdm.1 post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif ${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \ ${PREFIX}/etc/gdm/custom.conf.default ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm @${MKDIR} ${PREFIX}/etc/gdm/Sessions @${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.107 \ No newline at end of property +1.108 \ No newline at end of property Index: head/x11/gdm/distinfo =================================================================== --- head/x11/gdm/distinfo (revision 220211) +++ head/x11/gdm/distinfo (revision 220212) @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.20.7.tar.bz2) = 15be72743003cb1e36c9ce2ac2de5381 -SHA256 (gnome2/gdm-2.20.7.tar.bz2) = 84a71eae8a52c89e3044afa69424b8a7e79210024334eb7c23f25bdfa16ca825 -SIZE (gnome2/gdm-2.20.7.tar.bz2) = 3978969 +MD5 (gnome2/gdm-2.20.8.tar.bz2) = c183b017280e6ef25ad38d618aac2271 +SHA256 (gnome2/gdm-2.20.8.tar.bz2) = cef608d263866003f573a9b80d29c635a74ee73343d3f45bb381cf50b5c52894 +SIZE (gnome2/gdm-2.20.8.tar.bz2) = 3932232 Property changes on: head/x11/gdm/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.46 \ No newline at end of property +1.47 \ No newline at end of property Index: head/x11/gdm/files/patch-config_locale.alias =================================================================== --- head/x11/gdm/files/patch-config_locale.alias (revision 220211) +++ head/x11/gdm/files/patch-config_locale.alias (revision 220212) @@ -1,190 +1,191 @@ --- config/locale.alias.orig 2008-03-10 21:53:02.000000000 -0500 +++ config/locale.alias 2008-03-10 21:53:37.000000000 -0500 -@@ -14,133 +14,57 @@ +@@ -14,134 +14,57 @@ # # - George -C(POSIX) C,POSIX -Afrikaans af_ZA.UTF-8,af_ZA -Albanian sq_AL.UTF-8,sq_AL -Amharic am_ET.UTF-8,am_ET -Arabic(Egypt) ar_EG.UTF-8,ar_EG -Arabic(Lebanon) ar_LB.UTF-8,ar_LB -Arabic(SaudiArabia) ar_SA.UTF-8,ar_SA -Armenian hy_AM.UTF-8,hy_AM -Azerbaijani az_AZ.UTF-8,az_AZ -Azerbaijani(Iran) az_IR.UTF-8,az_IR -Basque eu_ES.UTF-8,eu_ES -Belarusian be_BY.UTF-8,be_BY -Belarusian(Latin) be_BY.UTF-8@latin,be_BY@latin -Bengali bn_BD.UTF-8,bn_BD -Bengali(India) bn_IN.UTF-8,bn_IN -Bosnian bs_BA.UTF-8,bs_BA -Breton br_FR.UTF-8,br_FR -Bulgarian bg_BG.UTF-8,bg_BG -Catalan ca_ES.UTF-8,ca_ES -Chinese(ChinaMainland) zh_CN.UTF-8,zh_CN -Chinese(GB18030) zh_CN.GB18030 -Chinese(Hong-Kong) zh_HK.UTF-8,zh_HK -Chinese(Singapore) zh_SG.UTF-8,zh_SG -Chinese(Taiwan) 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 -Dutch(Belgium) nl_BE.UTF-8,nl_BE -English(Australia) en_AU.UTF-8,en_AU -English(Canada) en_CA.UTF-8,en_CA -English(Ireland) en_IE.UTF-8,en_IE -English(Malta) en_MT.UTF-8,en_MT -English(NewZealand) en_NZ.UTF-8,en_NZ -English(SouthAfrica) en_ZA.UTF-8,en_ZA -English(UK) en_GB.UTF-8,en_GB -English(USA) en_US.UTF-8,en_US -Esperanto eo.UTF-8,eo -Estonian et_EE.UTF-8,et_EE -Finnish fi_FI.UTF-8,fi_FI -French fr_FR.UTF-8,fr_FR -French(Belgium) fr_BE.UTF-8,fr_BE -French(Canada) fr_CA.UTF-8,fr_CA -French(Luxembourg) fr_LU.UTF-8,fr_LU -French(Switzerland) fr_CH.UTF-8,fr_CH -Galician gl_ES.UTF-8,gl_ES -German de_DE.UTF-8,de_DE -German(Austria) de_AT.UTF-8,de_AT -German(Switzerland) de_CH.UTF-8,de_CH -German(Luxembourg) de_LU.UTF-8,de_LU -Greek el_GR.UTF-8,el_GR -Greek(Cyprus) el_CY.UTF-8,el_CY -Gujarati gu_IN.UTF-8,gu_IN -Hebrew he_IL.UTF-8,he_IL -Hindi hi_IN.UTF-8,hi_IN -Hungarian hu_HU.UTF-8,hu_HU -Icelandic is_IS.UTF-8,is_IS -Indonesian id_ID.UTF-8,id_ID -Interlingua ia.UTF-8,ia -Irish ga_IE.UTF-8,ga_IE -Italian it_IT.UTF-8,it_IT -Japanese ja_JP.UTF-8,ja_JP -Kannada kn_IN.UTF-8,kn_IN +-Kazakh kk_KZ.UTF-8,kk_KZ -Kinyarwanda rw_RW.UTF-8,rw_RW -Korean ko_KR.UTF-8,ko_KR -Latvian lv_LV.UTF-8,lv_LV -Limburgish li_NL.UTF-8,li_NL -Limburgish(Belgium) li_BE.UTF-8,li_BE -Limburgish(Germany) li_DE.UTF-8,li_DE -Lithuanian lt_LT.UTF-8,lt_LT -Macedonian mk_MK.UTF-8,mk_MK -Malayalam ml_IN.UTF-8,ml_IN -Malay ms_MY.UTF-8,ms_MY -Maltese mt_MT.UTF-8,mt_MT -Maori mi_NZ.UTF-8,mi_NZ -Marathi mr_IN.UTF-8,mr_IN -Mongolian mn_MN.UTF-8,mn_MN -Nepali ne_NP.UTF-8,ne_NP -NorthernSotho nso_ZA.UTF-8,nso_ZA -Norwegian(bokmal) nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO -Norwegian(nynorsk) nn_NO.UTF-8,nn_NO -Oriya or_IN.UTF-8,or_IN -Persian fa_IR.UTF-8,fa_IR -Polish pl_PL.UTF-8,pl_PL -Portuguese(Brazilian) pt_BR.UTF-8,pt_BR -Portuguese pt_PT.UTF-8,pt_PT -Punjabi pa_IN.UTF-8,pa_IN -Romanian ro_RO.UTF-8,ro_RO -Russian ru_RU.UTF-8,ru_RU -Serbian sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU -Serbian(Montenegro) sr_ME.UTF-8 -Serbian(Serbia) sr_RS.UTF-8 -Serbian(Bosnia) sh_BA.UTF-8,sh_BA -Serbian(Latin) sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn -Serbian(Jekavian) sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije -Slovak sk_SK.UTF-8,sk_SK -Slovenian sl_SI.UTF-8,sl_SI -Spanish es_ES.UTF-8,es_ES -Spanish(Argentina) es_AR.UTF-8,es_AR -Spanish(Bolivia) es_BO.UTF-8,es_BO -Spanish(Chile) es_CL.UTF-8,es_CL -Spanish(Colombia) es_CO.UTF-8,es_CO -Spanish(CostaRica) es_CR.UTF-8,es_CR -Spanish(Ecuador) es_EC.UTF-8,es_EC -Spanish(Guatemala) es_GT.UTF-8,es_GT -Spanish(Mexico) es_MX.UTF-8,es_MX -Spanish(Nicaragua) es_NI.UTF-8,es_NI -Spanish(Panama) es_PA.UTF-8,es_PA -Spanish(Peru) es_PE.UTF-8,es_PE -Spanish(Paraguay) es_PY.UTF-8,es_PY -Spanish(ElSalvador) es_SV.UTF-8,es_SV -Spanish(Uruguay) es_UY.UTF-8,es_UY -Spanish(Venezuela) es_VE.UTF-8,es_VE -Swedish(Finland) sv_FI.UTF-8,sv_FI -Swedish sv_SE.UTF-8,sv_SE -Tagalog tl_PH.UTF-8,tl_PH -Tajik tg_TJ.UTF-8,tg_TJ -Tamil ta_IN.UTF-8,ta_IN -Telugu te_IN.UTF-8,te_IN -Thai th_TH.UTF-8,th_TH -Turkish tr_TR.UTF-8,tr_TR -Ukrainian uk_UA.UTF-8,uk_UA -Uzbek uz_UZ.UTF-8,uz_UZ -Uzbek(Latin) uz_UZ.UTF-8@Latn,uz_UZ@Latn -Vietnamese vi_VN.UTF-8,vi_VN -Walloon wa_BE.UTF-8,wa_BE -Welsh cy_GB.UTF-8,cy_GB -Xhosa xh_ZA.UTF-8,xh_ZA -Yiddish yi.UTF-8,yi -Zulu zu_ZA.UTF-8,zu_ZA +C(POSIX) C,POSIX +Afrikaans af_ZA.UTF-8,af_ZA.ISO8859-15,af_ZA.ISO8859-1 +Amharic am_ET.UTF-8 +Armenian hy_AM.UTF-8 +Basque eu_ES.UTF-8,eu_ES.ISO8859-15,eu_ES.ISO8859-1 +Byelorussian be_BY.UTF-8,be_BY.CP1131,be_BY.CP1251,be_BY.ISO8859-5 +Bulgarian bg_BG.UTF-8,bg_BG.CP1251 +Catalan ca_ES.UTF-8,ca_ES.ISO8859-15,ca_ES.ISO8859-1 +Chinese(simplified) zh_CN.UTF-8,zh_CN.EUC,zh_CN.eucCN +Chinese(traditional) zh_TW.UTF-8,zh_TW.Big5 +Chinese(Hong-Kong) zh_HK.UTF-8,zh_HK.Big5HKSCS +Croatian hr_HR.UTF-8,hr_HR.ISO8859-2 +Czech cs_CZ.UTF-8,cs_CZ.ISO8859-2 +Danish da_DK.UTF-8,da_DK.ISO8859-15,da_DK.ISO8859-1 +Dutch nl_NL.UTF-8,nl_NL.ISO8859-15,nl_NL.ISO8859-1 +Dutch(Belgian) nl_BE.UTF-8,nl_BE.ISO8859-15,nl_BE.ISO8859-1 +English(American) en_US.UTF-8,en_US.ISO8859-1,en_US.ISO8859-15 +English(Australian) en_AU.UTF-8,en_AU.ISO8859-1,en_AU.ISO8859-15 +English(British) en_GB.UTF-8,en_GB.ISO8859-1,en_GB.ISO8859-15 +English(Canadian) en_CA.UTF-8,en_CA.ISO8859-1,en_CA.ISO8859-15 +English(Irish) en_IE.UTF-8,en_IE.ISO8859-1,en_IE.ISO8859-15 +English(New-Zealand) en_NZ.UTF-8,en_NZ.ISO8859-1,en_NZ.ISO8859-15 +Estonian et_EE.UTF-8,et_EE.ISO8859-15 +Finnish fi_FI.UTF-8,fi_FI.ISO8859-15,fi_FI.ISO8859-1 +French fr_FR.UTF-8,fr_FR.ISO8859-15,fr_FR.ISO8859-1 +French(Belgium) fr_BE.UTF-8,fr_BE.ISO8859-15,fr_BE.ISO8859-1 +French(Canadian) fr_CA.UTF-8,fr_CA.ISO8859-1,fr_CA.ISO8859-15 +French(Swiss) fr_CH.UTF-8,fr_CH.ISO8859-15,fr_CH.ISO8859-1 +German de_DE.UTF-8,de_DE.ISO8859-15,de_DE.ISO8859-1 +German(Austria) de_AT.UTF-8,de_AT.ISO8859-15,de_AT.ISO8859-1 +German(Switzerland) de_CH.UTF-8,de_CH.ISO8859-15,de_CH.ISO8859-1 +Greek el_GR.UTF-8,el_GR.ISO8859-7 +Hebrew he_IL.UTF-8 +Hindi hi_IN.ISCII-DEV +Hungarian hu_HU.UTF-8,hu_HU.ISO8859-2 +Icelandic is_IS.UTF-8,is_IS.ISO8859-1,is_IS.ISO8859-15 +Italian it_IT.UTF-8,it_IT.ISO8859-15,it_IT.ISO8859-1 +Italian(Swiss) it_CH.UTF-8,it_CH.ISO8859-15,it_CH.ISO8859-1 +Japanese ja_JP.UTF-8,ja_JP.EUC,ja_JP.eucJP +Korean ko_KR.UTF-8,ko_KR.EUC,ko_KR.eucKR +Lithuanian lt_LT.UTF-8,lt_LT.ISO8859-4,lt_LT.ISO8859-13 +Norwegian(bokmal) nb_NO.UTF-8,nb_NO.ISO8859-1,nb_NO.ISO8859-15,no_NO.UTF-8,no_NO.ISO8859-1,no_NO.ISO8859-15 +Polish pl_PL.UTF-8,pl_PL.ISO8859-2 +Portuguese pt_PT.UTF-8,pt_PT.ISO8859-15,pt_PT.ISO8859-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.ISO8859-5 +Serbian sr_YU.UTF-8,sr_YU.ISO8859-2,sr_YU.ISO8859-5 +Slovak sk_SK.UTF-8,sk_SK.ISO8859-2 +Slovenian sl_SI.UTF-8,sl_SI.ISO8859-2 +Spanish es_ES.UTF-8,es_ES.ISO8859-15,es_ES.ISO8859-1 +Swedish sv_SV.UTF-8,sv_SE.ISO8859-1 +Turkish tr_TR.UTF-8,tr_TR.ISO8859-9 +Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5 Property changes on: head/x11/gdm/files/patch-config_locale.alias ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/x11/gdm/files/patch-gui_gdmchooser.c =================================================================== --- head/x11/gdm/files/patch-gui_gdmchooser.c (revision 220211) +++ head/x11/gdm/files/patch-gui_gdmchooser.c (revision 220212) @@ -1,27 +1,18 @@ $FreeBSD$ --- gui/gdmchooser.c.orig +++ gui/gdmchooser.c -@@ -727,7 +727,7 @@ - /* paranoia */ - ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0'; - -- if (ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) -+ if ((ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) && (errno != ENXIO)) - gdm_common_error ("Could not get SIOCGIFFLAGS for %s", ifr[i].ifr_name); - - if ((ifreq.ifr_flags & IFF_UP) == 0 || @@ -1123,6 +1123,12 @@ have_ipv6 = FALSE; else have_ipv6 = TRUE; + /* Net- & FreeBSD default to V6ONLY */ + { + int no = 0; + setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no)); + } + #endif if ( ! have_ipv6) { if ((sockfd = socket (AF_INET, SOCK_DGRAM, 0)) == -1) { Property changes on: head/x11/gdm/files/patch-gui_gdmchooser.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property