diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-03-06 07:28:00 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-03-06 07:28:00 +0000 |
| commit | 59e00ec626ae75ad345e2a1638ec04368a495049 (patch) | |
| tree | 523e64fac0b6011544e038f30069a3952ae496b9 /x11 | |
| parent | 47fb8aaa2277a9bcc30c6aedc0fa924d45355f44 (diff) | |
| download | ports-59e00ec626ae75ad345e2a1638ec04368a495049.tar.gz ports-59e00ec626ae75ad345e2a1638ec04368a495049.zip | |
* Fix detection of *.euc locales [1]
* Use intlhack
* Remove trailing whitespace from pkg-message
PR: 63671
Submitted by: KAWATA Masahiko <kawata@mta.biglobe.ne.jp>
Notes
Notes:
svn path=/head/; revision=103070
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm2/Makefile | 11 | ||||
| -rw-r--r-- | x11/gdm2/pkg-message | 14 |
2 files changed, 13 insertions, 12 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index efb451473da2..99b9aec6880d 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdm2 PORTVERSION= 2.4.4.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 @@ -19,8 +19,9 @@ COMMENT= GNOME 2 version of xdm display manager USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui librsvg2 +USE_GNOME= gnomeprefix intlhack gnomehack gnomehier libgnomeui librsvg2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -42,9 +43,9 @@ post-extract: ${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample post-patch: - ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \ - s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";|' +.if ${OSVERSION} >= 450002 && ${OSVERSION} < 500000 || ${OSVERSION} >= 500020 + @${REINPLACE_CMD} -E -e 's/(..)\.EUC/\1.euc\1/' ${WRKSRC}/config/locale.alias +.endif post-install: .if !defined(PACKAGE_BUILDING) diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message index 6f3b7dcba333..03665d14d573 100644 --- a/x11/gdm2/pkg-message +++ b/x11/gdm2/pkg-message @@ -1,18 +1,18 @@ GDM is installed. -Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm -hanging or restarting constantly. Instead, copy the included gdm.sh.sample +Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm +hanging or restarting constantly. Instead, copy the included gdm.sh.sample script to gdm.sh, and restart. This script is found, by default, in /usr/X11R6/etc/rc.d. GDM uses its own locale.alias file to determine its language and especially -the GNOME-2 fontencoding. This file is located, by default, in -/usr/X11R6/etc/gdm/locale.alias. By default, the character set for every -county using the EURO currency is set to ISO8859-15 in order to enable the -EURO sign. If you don't feel comfortable with this, edit this file according +the GNOME-2 fontencoding. This file is located, by default, in +/usr/X11R6/etc/gdm/locale.alias. By default, the character set for every +county using the EURO currency is set to ISO8859-15 in order to enable the +EURO sign. If you don't feel comfortable with this, edit this file according to your preferences. -If you are running 5.x and you are running 5.1-RELEASE or earlier, GDM will +If you are running 5.x and you are running 5.1-RELEASE or earlier, GDM will fail to work due to a bug in OpenPAM. You can download a patch from http://www.FreeBSD.org/~marcus/pam_get_user.c.diff. You must also have the FreeBSD src tree on your system. Do the following to apply the patch: |