aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm2/Makefile11
-rw-r--r--x11/gdm2/distinfo2
-rw-r--r--x11/gdm2/pkg-plist6
3 files changed, 5 insertions, 14 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 56ea7e779ee7..210077fc68ed 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gdm2
-PORTVERSION= 2.4.0.4
+PORTVERSION= 2.4.0.5
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= 2.0.0/sources/${PORTNAME:S/2$//}
@@ -21,12 +21,12 @@ LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomeprefix gnomehack gnomehier
USE_LIBTOOL= yes
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
GDMDIR?= ${PREFIX}/etc/gdm
@@ -40,12 +40,9 @@ pre-fetch:
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
.endif
-pre-patch:
+post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
- 's|[(]datadir[)]/gnome/|(datadir)/|g ; \
- s|[(]datadir[)]/locale|(prefix)/share/locale|g'
post-install:
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 89c1bc6d4549..1d9658892f7e 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.4.0.4.tar.bz2) = a600d6bf2dd027cde25fcafdcecd4d5d
+MD5 (gnome2/gdm-2.4.0.5.tar.bz2) = 7a1d3b39137acf4bbedc327cd158d861
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 86c6aa197656..0efd5c1013b9 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -91,9 +91,3 @@ 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
-@dirrm share/gnome/gdm
-@dirrm etc/gdm/Sessions
-@dirrm etc/gdm/PreSession
-@dirrm etc/gdm/PostSession
-@dirrm etc/gdm/Init
-@dirrm etc/gdm