Make sure X_SERVER_PATH gets expanded in all the right places.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@904 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 20 insertions, 2 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 61ab094c6..7164f5c8c 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdm2
 PORTVERSION=	2.4.2.95
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.4
diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure
index e6e122ab8..eab20e478 100644
--- a/x11/gdm2/files/patch-configure
+++ b/x11/gdm2/files/patch-configure
@@ -1,5 +1,14 @@
---- configure.orig	Mon May  5 12:32:19 2003
-+++ configure	Mon May  5 21:45:38 2003
+--- configure.orig	Tue Jun 17 16:35:40 2003
++++ configure	Tue Jun 17 16:39:25 2003
+@@ -467,7 +467,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PAM_PREFIX CONSOLE_HELPER GNOME_ACLOCAL_DIR GNOME_ACLOCAL_FLAGS INSIDE_GNOME_DOCU_TRUE INSIDE_GNOME_DOCU_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DAEMON_CFLAGS DAEMON_LIBS GUI_CFLAGS GUI_LIBS GREETER_CFLAGS GREETER_LIBS UTILS_CFLAGS UTILS_LIBS CONSOLE_HELPER_TRUE CONSOLE_HELPER_FALSE GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GDMOPEN GDMASKPASS VRFY XDMCP_LIBS XDMCP_SUPPORT_TRUE XDMCP_SUPPORT_FALSE GDMCHOOSER GDMXNESTCHOOSER XINERAMA_LIBS EXTRA_DAEMON_LIBS EXPANDED_DATADIR EXPANDED_PIXMAPDIR EXPANDED_BINDIR EXPANDED_SBINDIR EXPANDED_LIBEXECDIR EXPANDED_GDMCONFIGDIR EXPANDED_LOCALEDIR EXPANDED_AUTHDIR X_PATH X_SERVER EXPANDED_SYSCONFDIR EXPANDED_SESSDIR LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PAM_PREFIX CONSOLE_HELPER GNOME_ACLOCAL_DIR GNOME_ACLOCAL_FLAGS INSIDE_GNOME_DOCU_TRUE INSIDE_GNOME_DOCU_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DAEMON_CFLAGS DAEMON_LIBS GUI_CFLAGS GUI_LIBS GREETER_CFLAGS GREETER_LIBS UTILS_CFLAGS UTILS_LIBS CONSOLE_HELPER_TRUE CONSOLE_HELPER_FALSE GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GDMOPEN GDMASKPASS VRFY XDMCP_LIBS XDMCP_SUPPORT_TRUE XDMCP_SUPPORT_FALSE GDMCHOOSER GDMXNESTCHOOSER XINERAMA_LIBS EXTRA_DAEMON_LIBS EXPANDED_DATADIR EXPANDED_PIXMAPDIR EXPANDED_BINDIR EXPANDED_SBINDIR EXPANDED_LIBEXECDIR EXPANDED_GDMCONFIGDIR EXPANDED_LOCALEDIR EXPANDED_AUTHDIR X_PATH X_SERVER X_SERVER_PATH EXPANDED_SYSCONFDIR EXPANDED_SESSDIR LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
 @@ -9772,6 +9772,8 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
@@ -9,3 +18,11 @@
  $ac_includes_default
  int
  main ()
+@@ -14074,6 +14076,7 @@
+ s,@EXPANDED_AUTHDIR@,$EXPANDED_AUTHDIR,;t t
+ s,@X_PATH@,$X_PATH,;t t
+ s,@X_SERVER@,$X_SERVER,;t t
++s,@X_SERVER_PATH@,$X_SERVER_PATH,;t t
+ s,@EXPANDED_SYSCONFDIR@,$EXPANDED_SYSCONFDIR,;t t
+ s,@EXPANDED_SESSDIR@,$EXPANDED_SESSDIR,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t