diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-06-29 06:31:07 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-06-29 06:31:07 +0800 |
commit | 2b99784ea5d1e69d48b4f8a128c5e316642e00be (patch) | |
tree | 23fb87b48597839d6da5299fe1d8926b7bb0dbd9 /x11 | |
parent | 7c02bb3b48154d073b2a7d117721ffb52170935a (diff) | |
download | marcuscom-ports-2b99784ea5d1e69d48b4f8a128c5e316642e00be.tar marcuscom-ports-2b99784ea5d1e69d48b4f8a128c5e316642e00be.tar.gz marcuscom-ports-2b99784ea5d1e69d48b4f8a128c5e316642e00be.tar.bz2 marcuscom-ports-2b99784ea5d1e69d48b4f8a128c5e316642e00be.tar.lz marcuscom-ports-2b99784ea5d1e69d48b4f8a128c5e316642e00be.tar.xz marcuscom-ports-2b99784ea5d1e69d48b4f8a128c5e316642e00be.tar.zst marcuscom-ports-2b99784ea5d1e69d48b4f8a128c5e316642e00be.zip |
Update to 2.4.2.96.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@931 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gdm2/Makefile | 5 | ||||
-rw-r--r-- | x11/gdm2/distinfo | 2 | ||||
-rw-r--r-- | x11/gdm2/files/patch-ab | 20 | ||||
-rw-r--r-- | x11/gdm2/files/patch-configure | 23 | ||||
-rw-r--r-- | x11/gdm2/files/patch-daemon_gdm.c | 24 | ||||
-rw-r--r-- | x11/gdm2/files/patch-ltmain.sh | 30 |
6 files changed, 33 insertions, 71 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 7164f5c8c..1adc53396 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gdm2 -PORTVERSION= 2.4.2.95 -PORTREVISION= 1 +PORTVERSION= 2.4.2.96 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 @@ -15,7 +14,7 @@ DISTNAME= gdm-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME 2.0 version of xdm display manager +COMMENT= GNOME 2 version of xdm display manager USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index d41b6aac3..94ea9cdf4 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gdm-2.4.2.95.tar.bz2) = 83190cb663db4168a19032a9adf205fc +MD5 (gnome2/gdm-2.4.2.96.tar.bz2) = c94ba18e1776e555cdc33d02fa4a7b2a diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index b672187b9..ecd105c93 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,6 +1,6 @@ ---- config/gdm.conf.in.orig Mon Jun 9 18:29:06 2003 -+++ config/gdm.conf.in Mon Jun 16 16:32:38 2003 -@@ -62,7 +62,7 @@ +--- config/gdm.conf.in.orig Wed Jun 25 16:42:37 2003 ++++ config/gdm.conf.in Sat Jun 28 18:14:11 2003 +@@ -63,7 +63,7 @@ # To try to kill all clients started at greeter time or in the Init script. # doesn't always work, only if those clients have a window of their own KillInitClients=true @@ -9,7 +9,7 @@ # You should probably never change this value unless you have a weird setup PidFile=/var/run/gdm.pid # Note that a post login script is run before a PreSession script. -@@ -81,7 +81,7 @@ +@@ -82,7 +82,7 @@ # Reboot, Halt and suspend commands, you can add different commands # separated by a semicolon and gdm will use the first one it can find RebootCommand=/sbin/shutdown -r now;/usr/sbin/shutdown -r now @@ -18,16 +18,16 @@ SuspendCommand= # Probably should not touch the below this is the standard setup ServAuthDir=@EXPANDED_AUTHDIR@ -@@ -109,7 +109,7 @@ +@@ -110,7 +110,7 @@ # we force X to use specific vts. turn VTAllocation to false if this # is causing problems. FirstVT=7 -VTAllocation=true +VTAllocation=false - - [security] - # If any distributions ship with this one off, they should be shot -@@ -184,7 +184,7 @@ + # Should double login be treated with a warning (and possibility to change + # vts on linux systems for console logins) + DoubleLoginWarning=true +@@ -188,7 +188,7 @@ # The 'theme'. By default we're using the default gtk theme # Of course assuming that gtk got installed in the same prefix, # if not change this. @@ -36,7 +36,7 @@ # Maximum size of an icon, larger icons are scaled down MaxIconWidth=128 MaxIconHeight=128 -@@ -357,7 +357,7 @@ +@@ -361,7 +361,7 @@ # to the command line [server-Chooser] name=Chooser server diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure index eab20e478..cbbc44334 100644 --- a/x11/gdm2/files/patch-configure +++ b/x11/gdm2/files/patch-configure @@ -1,15 +1,6 @@ ---- 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 @@ +--- configure.orig Sat Jun 28 18:15:07 2003 ++++ configure Sat Jun 28 18:15:08 2003 +@@ -20222,6 +20222,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -18,11 +9,3 @@ $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 diff --git a/x11/gdm2/files/patch-daemon_gdm.c b/x11/gdm2/files/patch-daemon_gdm.c index e68005a30..787890f2a 100644 --- a/x11/gdm2/files/patch-daemon_gdm.c +++ b/x11/gdm2/files/patch-daemon_gdm.c @@ -1,5 +1,5 @@ ---- daemon/gdm.c.orig Tue Jun 10 19:25:11 2003 -+++ daemon/gdm.c Mon Jun 16 16:48:29 2003 +--- daemon/gdm.c.orig Wed Jun 25 17:04:49 2003 ++++ daemon/gdm.c Sat Jun 28 18:17:44 2003 @@ -38,7 +38,7 @@ #include <locale.h> @@ -9,23 +9,3 @@ #include <vicious.h> -@@ -1216,7 +1216,9 @@ - gdm_final_cleanup (); - chdir ("/"); - -+#ifdef __linux__ - change_to_first_and_clear (TRUE /* reboot */); -+#endif - - argv = ve_split (GdmRebootReal); - execv (argv[0], argv); -@@ -1234,7 +1236,9 @@ - gdm_final_cleanup (); - chdir ("/"); - -+#ifdef __linux__ - change_to_first_and_clear (FALSE /* reboot */); -+#endif - - argv = ve_split (GdmHaltReal); - execv (argv[0], argv); diff --git a/x11/gdm2/files/patch-ltmain.sh b/x11/gdm2/files/patch-ltmain.sh index 8afc42e39..04395ca76 100644 --- a/x11/gdm2/files/patch-ltmain.sh +++ b/x11/gdm2/files/patch-ltmain.sh @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Fri Apr 25 15:18:44 2003 -+++ ltmain.sh Sun May 11 02:27:13 2003 -@@ -1061,7 +1061,7 @@ +--- ltmain.sh.orig Tue Jun 24 14:39:01 2003 ++++ ltmain.sh Sat Jun 28 18:20:02 2003 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + elif test "X$arg" = "X-lc_r"; then + case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1071,8 +1071,16 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; @@ -26,17 +26,17 @@ continue ;; -@@ -2471,6 +2479,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4280,10 +4291,12 @@ + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ fi # Install the pseudo-library for information purposes. |