pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/gdm Simplify patches a lot (specially those touchi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d94b346ba83a
branches: trunk
changeset: 466678:d94b346ba83a
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Thu Jan 22 10:11:16 2004 +0000
description:
Simplify patches a lot (specially those touching configure) and also cleanup
the Makefile a bit. No functional changes.
diffstat:
x11/gdm/Makefile | 25 +-
x11/gdm/distinfo | 7 +-
x11/gdm/patches/patch-aa | 7390 +---------------------------------------------
x11/gdm/patches/patch-ae | 28 +-
x11/gdm/patches/patch-af | 58 -
5 files changed, 46 insertions(+), 7462 deletions(-)
diffs (truncated from 7610 to 300 lines):
diff -r 29022e117728 -r d94b346ba83a x11/gdm/Makefile
--- a/x11/gdm/Makefile Thu Jan 22 10:09:10 2004 +0000
+++ b/x11/gdm/Makefile Thu Jan 22 10:11:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/01/22 09:16:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.44 2004/01/22 10:11:16 jmmv Exp $
#
DISTNAME= gdm-2.4.4.7
@@ -12,6 +12,8 @@
HOMEPAGE= http://www.gnome.org/
COMMENT= Gnome Display Manager - a re-implementation of the xdm program
+BUILD_USES_MSGFMT= YES
+
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
@@ -22,9 +24,7 @@
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-
-CONFIGURE_ENV+= X11BASE=${X11BASE} GDMOWN=${GDMOWN} GDMGRP=${GDMGRP}
-MAKE_ENV+= ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
+CONFIGURE_ENV+= X11BASE=${X11BASE}
MAKE_ENV+= CHMOD=${CHMOD} CHOWN=${CHOWN}
OWN_DIRS= ${PKG_SYSCONFDIR}/dm/Sessions
@@ -54,10 +54,14 @@
RCD_SCRIPTS= gdm
SUBST_CLASSES+= desktop
-SUBST_MESSAGE.desktop= "Enabling sessions."
-SUBST_STAGE.desktop= post-patch
-SUBST_FILES.desktop= config/default.desktop.in config/gnome.desktop.in
+SUBST_MESSAGE.desktop= "Configuring GDM settings."
+SUBST_STAGE.desktop= pre-configure
+SUBST_FILES.desktop= config/default.desktop.in
+SUBST_FILES.desktop+= config/gnome.desktop.in
+SUBST_FILES.desktop+= config/gdm.conf.in
SUBST_SED.desktop= -e 's/^_//g'
+SUBST_SED.desktop+= -e 's|@GDMOWN@|${GDMOWN}|g'
+SUBST_SED.desktop+= -e 's|@GDMGRP@|${GDMGRP}|g'
.include "../../mk/bsd.prefs.mk"
@@ -74,14 +78,11 @@
.if defined(USE_PAM)
.include "../../security/PAM/buildlink2.mk"
+CONFIGURE_ENV+= USE_PAM=yes
PLIST_SUBST+= PAM_MISC=""
.else
+CONFIGURE_ENV+= USE_PAM=no
PLIST_SUBST+= PAM_MISC="@comment "
-SUBST_CLASSES+= pam
-SUBST_MESSAGE.pam= "Disabling PAM."
-SUBST_STAGE.pam= post-patch
-SUBST_FILES.pam= configure
-SUBST_SED.pam= -e 's:security/pam_appl.h:nopam:g'
.endif
post-install:
diff -r 29022e117728 -r d94b346ba83a x11/gdm/distinfo
--- a/x11/gdm/distinfo Thu Jan 22 10:09:10 2004 +0000
+++ b/x11/gdm/distinfo Thu Jan 22 10:11:16 2004 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.7 2004/01/20 13:41:06 xtraeme Exp $
+$NetBSD: distinfo,v 1.8 2004/01/22 10:11:16 jmmv Exp $
SHA1 (gdm-2.4.4.7.tar.bz2) = 8db05c6f0af247fc3d6bc0c32e69df7991eff0ae
Size (gdm-2.4.4.7.tar.bz2) = 2430455 bytes
-SHA1 (patch-aa) = c657cd53520bde72af2eb26fc87875396d7b0d34
+SHA1 (patch-aa) = c61a99841c206ff790fc3eb73d53e69d914dcbd9
SHA1 (patch-ab) = 049d4fe8b6e71239392e7a8bae00006103dff309
SHA1 (patch-ac) = d810e16076aa69070f238900198a0050eaf12516
SHA1 (patch-ad) = a27c73a296013919a3a2db155de8ae1b22a38f28
-SHA1 (patch-ae) = ebe1efbe4cf5cbde9bad75e5f700c8449fa2ee0b
-SHA1 (patch-af) = b60e8ec5ee7fd4afa4c8ca16303a7250fd60cc6e
+SHA1 (patch-ae) = 600c4e35539a78d7da2235500c8b4767d233bf61
diff -r 29022e117728 -r d94b346ba83a x11/gdm/patches/patch-aa
--- a/x11/gdm/patches/patch-aa Thu Jan 22 10:09:10 2004 +0000
+++ b/x11/gdm/patches/patch-aa Thu Jan 22 10:11:16 2004 +0000
@@ -1,6836 +1,27 @@
-$NetBSD: patch-aa,v 1.4 2004/01/20 13:41:06 xtraeme Exp $
+$NetBSD: patch-aa,v 1.5 2004/01/22 10:11:16 jmmv Exp $
---- configure.orig 2003-12-31 12:10:05.000000000 -0600
+--- configure.orig 2003-12-31 19:10:05.000000000 +0100
+++ configure
-@@ -1,9 +1,8 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.57.
-+# Generated by GNU Autoconf 2.59.
- #
--# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -20,9 +19,10 @@ if test -n "${ZSH_VERSION+set}" && (emul
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
- else
- as_unset=false
-@@ -41,7 +41,7 @@ for as_var in \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
- do
-- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- $as_unset $as_var
-@@ -218,16 +218,17 @@ rm -f conf$$ conf$$.exe conf$$.file
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
- else
-+ test -d ./-p && rmdir ./-p
- as_mkdir_p=false
- fi
-
- as_executable_p="test -f"
-
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
- # IFS
-@@ -462,7 +463,7 @@ ac_includes_default="\
- # 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_XAM_RULE INTLTOOL_KBD_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 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 AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL X_CFLAGS
X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG DAEMON_CFLAGS DAEMON_LIBS GUI_CFLAGS GUI_LIBS GUIGLADE_CFLAGS GUIGLADE_LIBS GUING_CFLAGS GUING_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 EXTRA_GDMASKPASS_LIBS VRFY XDMCP_LIBS XDMCP_SUPPORT_TRUE XDMCP_SUPPORT_FALSE GDMCHOOSER GDMXNESTCHOOSER XINERAMA_LIBS EXTRA_DAEMON_LIBS
EXTRA_CHOOSER_LIBS EXPANDED_DATADIR EXPANDED_PIXMAPDIR EXPANDED_BINDIR EXPANDED_SBINDIR EXPANDED_LIBEXECDIR EXPANDED_GDMCONFIGDIR EXPANDED_LOCALEDIR EXPANDED_AUTHDIR EXPANDED_LOGDIR X_PATH X_SERVER
X_SERVER_PATH X_CONF_PATH 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_XAM_RULE INTLTOOL_KBD_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 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 AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL X_CFLAGS
X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG DAEMON_CFLAGS DAEMON_LIBS GUI_CFLAGS GUI_LIBS GUIGLADE_CFLAGS GUIGLADE_LIBS GUING_CFLAGS GUING_LIBS GREETER_CFLAGS GREETER_LIBS UTILS_CFLAGS
UTILS_LIBS CONSOLE_HELPER_TRUE CONSOLE_HELPER_FALSE GDMOWN GDMGRP 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 EXTRA_GDMASKPASS_LIBS VRFY XDMCP_LIBS XDMCP_SUPPORT_TRUE XDMCP_SUPPORT_FALSE GDMCHOOSER GDMXNESTCHOOSER XINERAMA_LIBS
EXTRA_DAEMON_LIBS EXTRA_CHOOSER_LIBS EXPANDED_DATADIR EXPANDED_PIXMAPDIR EXPANDED_BINDIR EXPANDED_SBINDIR EXPANDED_LIBEXECDIR EXPANDED_GDMCONFIGDIR EXPANDED_LOCALEDIR EXPANDED_AUTHDIR EXPANDED_LOGDIR
X_PATH X_SERVER X_SERVER_PATH X_CONF_PATH EXPANDED_SYSCONFDIR EXPANDED_SESSDIR LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -821,7 +822,7 @@ done
-
- # Be sure to have absolute paths.
- for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
-+ localstatedir libdir includedir oldincludedir infodir mandir
- do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
-@@ -861,10 +862,10 @@ if test -z "$srcdir"; then
- # Try the directory containing this script, then its parent.
- ac_confdir=`(dirname "$0") 2>/dev/null ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$0" : 'X\(//\)[^/]' \| \
-- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -976,9 +977,9 @@ _ACEOF
- cat <<_ACEOF
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
-- [$ac_default_prefix]
-+ [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-- [PREFIX]
-+ [PREFIX]
-
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -1106,12 +1107,45 @@ case $srcdir in
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
-@@ -1122,7 +1156,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $a
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
-- test -f $ac_srcdir/configure.in; then
-+ test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
- else
-@@ -1136,8 +1170,7 @@ test -n "$ac_init_help" && exit 0
- if $ac_init_version; then
- cat <<\_ACEOF
-
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--Free Software Foundation, Inc.
-+Copyright (C) 2003 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1149,7 +1182,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.57. Invocation command line was
-+generated by GNU Autoconf 2.59. Invocation command line was
-
- $ $0 $@
-
-@@ -1226,19 +1259,19 @@ do
- 2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
- if test $ac_must_keep_next = true; then
-- ac_must_keep_next=false # Got value, back to normal.
-+ ac_must_keep_next=false # Got value, back to normal.
- else
-- case $ac_arg in
-- *=* | --config-cache | -C | -disable-* | --disable-* \
-- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-- | -with-* | --with-* | -without-* | --without-* | --x)
-- case "$ac_configure_args0 " in
-- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-- esac
-- ;;
-- -* ) ac_must_keep_next=true ;;
-- esac
-+ case $ac_arg in
-+ *=* | --config-cache | -C | -disable-* | --disable-* \
-+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+ | -with-* | --with-* | -without-* | --without-* | --x)
-+ case "$ac_configure_args0 " in
-+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+ esac
-+ ;;
-+ -* ) ac_must_keep_next=true ;;
-+ esac
- fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
Home |
Main Index |
Thread Index |
Old Index