openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-10 03:08:56 +00:00
Code Issues Projects Releases Wiki Activity

Update to xfsinfo 1.0.2

Browse Source
This commit is contained in:
matthieu
2008-06-14 16:49:28 +00:00
parent a1c7582f93
commit c2c271a871
10 changed files with 457 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/xfsinfo/COPYING
View File

@@ -1,12 +1,66 @@
This is a stub file. This package has not yet had its complete licensing
information compiled. Please see the individual source files for details on
your rights to use and modify this software.
Portions Copyright 1987, 1993, 1998 The Open Group
Please submit updated COPYING files to the Xorg bugzilla:
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
All licensing questions regarding this software should be directed at the
Xorg mailing list:
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
http://lists.freedesktop.org/mailman/listinfo/xorg
Except as contained in this notice, the name of The Open Group shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
Copyright 1990, 1991 Network Computing Devices;
Portions Copyright 1987 by Digital Equipment Corporation
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation, and that the names of Network Computing Devices
or Digital not be used in advertising or
publicity pertaining to distribution of the software without specific,
written prior permission. Network Computing Devices and Digital
make no representations about the
suitability of this software for any purpose. It is provided "as is"
without express or implied warranty.
NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES OR DIGITAL BE
LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Copyright 2005 Red Hat, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation, and that the name of Red Hat not be used in
advertising or publicity pertaining to distribution of the software without
specific, written prior permission. Red Hat makes no
representations about the suitability of this software for any purpose. It
is provided "as is" without express or implied warranty.
RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.

208
app/xfsinfo/ChangeLog
View File

@@ -1,25 +1,203 @@
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 2212c7ad4386dcddfa2910b0cbf7497d2ac60654
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 23 16:13:43 2008 -0700
* configure.ac:
Update package version for X11R7 release.
xfsinfo 1.0.2
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 3816d144f9f310544d6ddff991911a949d2ae070
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 23 16:13:31 2008 -0700
* configure.ac:
Update package version number for final X11R7 release candidate.
Fill in COPYING with copyright/license notices from sources
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 72a78dc043b06192a72e08d37bbac1ee0fb27429
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 23 16:01:10 2008 -0700
* Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
Replace (1) with __appmansuffix__ in man page
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 58d4b018eaf3840341c0815bb177521e6311a665
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 23 15:44:26 2008 -0700
* configure.ac:
Update package version number for X11R7 RC3 release.
Plug memory leaks (Coverity ids 570 & 571)
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 8e614188ba9ee7cd0c87804555a352d1248efa11
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu May 22 20:02:34 2008 -0700
* configure.ac:
Update package version number for RC1 release.
Change xfsinfo_CFLAGS to AM_CFLAGS to make automake-1.10 happier
commit 94c2ffa1fd6a6c8aacb5bce3002a1ec4ccae29dd
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu May 22 19:37:56 2008 -0700
Clarify syntax of -server & FONTSERVER in man page
commit 0034621a7661c18f2e2b55239fc7f5c79117b694
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun Mar 16 23:04:25 2008 -0700
Added missing AM_PROG_CC_C_O
commit cc632b81c4840fed41972b672a6e78e903b64d0c
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:37:15 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
commit 3f09e04800c597beaac11bb6de7d4c2b15e009bb
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:51:23 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit bc30afe115ffaab9aac6a580013e27e76477ac3f
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:24:49 2007 -0400
Rename .cvsignore to .gitignore
commit 16af7a8d70d4abfbcefaf5397ca6a702136c462d
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:50 2005 +0000
Update package version for X11R7 release.
commit 9493acfad1b73681caea030fa4429af7a35c9703
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:22:44 2005 +0000
Stub COPYING files
commit a970f4d11b32b5dcf32389609950ad6b5bb0f2c4
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:07 2005 +0000
Update package version number for final X11R7 release candidate.
commit c6c1e15b824fc8e871994f087e58252bd76df9ba
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:22 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit 7623174063bd35bbdf87ffc338a40134750d4fea
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:23 2005 +0000
Update package version number for X11R7 RC3 release.
commit 76c904a43455515b4cd2b357d5cd5249586b90fa
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:01:42 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit ba8bd073ed2d5131e20ccf53c0f3b26a07415f5f
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:35:01 2005 +0000
Another pass at .cvsignores for apps.
commit ae4e88480f26e057a4c356b2a5d5057ddc8870ef
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 20 22:08:52 2005 +0000
Add/improve .cvsignore files for apps.
commit bb0af487c21e63754891ea05e16f74a68c13a2ac
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:47:54 2005 +0000
Update package version number for RC1 release.
commit 0f35ff2cea82b2d3c8a3faad2de3397b2ceab22d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 23:56:22 2005 +0000
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
work better with BSD make
commit 6b84bdf6ab2d1cdf813475ac003e850cc2ab75b8
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 00:25:45 2005 +0000
Use sed to fill in variables in man page
commit ab6ef92d549e286d367889e1fdc3eca0baab6678
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 1 20:25:30 2005 +0000
Install man pages to section 1 instead of section m (Patch from Donnie
Berkholz)
commit a9822002d7a724ac6036401da2e6b24c4e5ddb83
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:34 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 632c814305c180f61beb068b946a7a12e07bf728
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 20 19:31:56 2005 +0000
Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
configure cache, you cache it, and the cached value is probably wrong.
commit dddb0fc49f851443d9aea595c7c98c109256f407
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 6 14:54:15 2005 +0000
Build system for xfsinfo
commit 1358a14ac6d3ae2b4d3f184d240e9da91e2203d6
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:54:48 2004 +0000
Merging XORG-CURRENT into trunk
commit deba072592938eb8f684756831fef1c03247f187
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:35:23 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 19186656b5274e8d63b66154798f17584be2416b
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:13:08 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 9668d8f33eb05c12ecd0831831e57643b2a877c8
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:24 2004 +0000
readding XFree86's cvs IDs
commit bc80c9eeba40ec86e29abb9932d6abc43e657298
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:24:07 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit a40bcbfdb43fd4f4facca21d3749595322491a97
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:49:22 2003 +0000
XFree86 4.3.0.1
commit 83f8ee18a050cbad1a2d3770bc8c2ad0f89c3837
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:49:22 2003 +0000
Initial revision

12
app/xfsinfo/Makefile.am
View File

@@ -21,7 +21,7 @@
bin_PROGRAMS = xfsinfo
xfsinfo_CFLAGS = $(XFSINFO_CFLAGS)
AM_CFLAGS = $(XFSINFO_CFLAGS)
xfsinfo_LDADD = $(XFSINFO_LIBS)
xfsinfo_SOURCES = \
@@ -61,3 +61,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog

38
app/xfsinfo/Makefile.in
View File

@@ -77,7 +77,7 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_xfsinfo_OBJECTS = xfsinfo-xfsinfo.$(OBJEXT)
am_xfsinfo_OBJECTS = xfsinfo.$(OBJEXT)
xfsinfo_OBJECTS = $(am_xfsinfo_OBJECTS)
am__DEPENDENCIES_1 =
xfsinfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -207,7 +207,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
xfsinfo_CFLAGS = $(XFSINFO_CFLAGS)
AM_CFLAGS = $(XFSINFO_CFLAGS)
xfsinfo_LDADD = $(XFSINFO_LIBS)
xfsinfo_SOURCES = \
xfsinfo.c
@@ -217,7 +217,7 @@ appman_PRE = \
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
SED = sed
@@ -238,6 +238,7 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -326,7 +327,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfsinfo-xfsinfo.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfsinfo.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -341,20 +342,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
xfsinfo-xfsinfo.o: xfsinfo.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfsinfo_CFLAGS) $(CFLAGS) -MT xfsinfo-xfsinfo.o -MD -MP -MF "$(DEPDIR)/xfsinfo-xfsinfo.Tpo" -c -o xfsinfo-xfsinfo.o `test -f 'xfsinfo.c' || echo '$(srcdir)/'`xfsinfo.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfsinfo-xfsinfo.Tpo" "$(DEPDIR)/xfsinfo-xfsinfo.Po"; else rm -f "$(DEPDIR)/xfsinfo-xfsinfo.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfsinfo.c' object='xfsinfo-xfsinfo.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfsinfo_CFLAGS) $(CFLAGS) -c -o xfsinfo-xfsinfo.o `test -f 'xfsinfo.c' || echo '$(srcdir)/'`xfsinfo.c
xfsinfo-xfsinfo.obj: xfsinfo.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfsinfo_CFLAGS) $(CFLAGS) -MT xfsinfo-xfsinfo.obj -MD -MP -MF "$(DEPDIR)/xfsinfo-xfsinfo.Tpo" -c -o xfsinfo-xfsinfo.obj `if test -f 'xfsinfo.c'; then $(CYGPATH_W) 'xfsinfo.c'; else $(CYGPATH_W) '$(srcdir)/xfsinfo.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfsinfo-xfsinfo.Tpo" "$(DEPDIR)/xfsinfo-xfsinfo.Po"; else rm -f "$(DEPDIR)/xfsinfo-xfsinfo.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfsinfo.c' object='xfsinfo-xfsinfo.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfsinfo_CFLAGS) $(CFLAGS) -c -o xfsinfo-xfsinfo.obj `if test -f 'xfsinfo.c'; then $(CYGPATH_W) 'xfsinfo.c'; else $(CYGPATH_W) '$(srcdir)/xfsinfo.c'; fi`
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
@@ -451,6 +438,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -580,6 +570,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -635,8 +626,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-appmanDATA install-binPROGRAMS install-data \
@@ -651,6 +642,13 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

40
app/xfsinfo/aclocal.m4 vendored
View File

@@ -740,6 +740,34 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 3
# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
AC_DEFUN([AM_PROG_CC_C_O],
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
@@ -1042,7 +1070,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
[XORG_MACROS_version=1.1.5
[XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -1191,7 +1219,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
if test x"$cross_compiling" = x"yes" ; then
HAVE_DEFS_ENT=no
else
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -1463,14 +1495,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi

3
app/xfsinfo/config.h.in
View File

@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
/* Name of package */
#undef PACKAGE

127
app/xfsinfo/configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for xfsinfo 1.0.1.
# Generated by GNU Autoconf 2.59 for xfsinfo 1.0.2.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xfsinfo'
PACKAGE_TARNAME='xfsinfo'
PACKAGE_VERSION='1.0.1'
PACKAGE_STRING='xfsinfo 1.0.1'
PACKAGE_VERSION='1.0.2'
PACKAGE_STRING='xfsinfo 1.0.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE PKG_CONFIG ac_pt_PKG_CONFIG XFSINFO_CFLAGS XFSINFO_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
@@ -750,7 +750,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures xfsinfo 1.0.1 to adapt to many kinds of systems.
\`configure' configures xfsinfo 1.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -816,7 +816,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xfsinfo 1.0.1:";;
short | recursive ) echo "Configuration of xfsinfo 1.0.2:";;
esac
cat <<\_ACEOF
@@ -946,7 +946,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
xfsinfo configure 1.0.1
xfsinfo configure 1.0.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -960,7 +960,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by xfsinfo $as_me 1.0.1, which was
It was created by xfsinfo $as_me 1.0.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1558,7 +1558,7 @@ fi
# Define the identity of the package.
PACKAGE='xfsinfo'
VERSION='1.0.1'
VERSION='1.0.2'
cat >>confdefs.h <<_ACEOF
@@ -2820,6 +2820,109 @@ else
fi
if test "x$CC" != xcc; then
echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6
else
echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6
fi
set dummy $CC; ac_cc=`echo $2 |
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
main ()
{
;
return 0;
}
_ACEOF
# Make sure it works both with $CC and with simple cc.
# We do the test twice because some compilers refuse to overwrite an
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest.$ac_objext >&5'
if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
if test "x$CC" != xcc; then
# Test first that cc exists at all.
if { ac_try='cc -c conftest.$ac_ext >&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_try='cc -c conftest.$ac_ext -o conftest.$ac_objext >&5'
if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); };
then
# cc works too.
:
else
# cc exists but doesn't like -o.
eval ac_cv_prog_cc_${ac_cc}_c_o=no
fi
fi
fi
else
eval ac_cv_prog_cc_${ac_cc}_c_o=no
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define NO_MINUS_C_MINUS_O 1
_ACEOF
fi
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -3265,7 +3368,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -3274,7 +3377,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -3669,7 +3772,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by xfsinfo $as_me 1.0.1, which was
This file was extended by xfsinfo $as_me 1.0.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3732,7 +3835,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
xfsinfo config.status 1.0.1
xfsinfo config.status 1.0.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

3
app/xfsinfo/configure.ac
View File

@@ -22,13 +22,14 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(xfsinfo,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfsinfo)
AC_INIT(xfsinfo,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfsinfo)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_INSTALL
# Checks for pkg-config packages

2
app/xfsinfo/xfsinfo.c
View File

@@ -139,6 +139,7 @@ print_catalogue_info(FSServer *svr)
for (i = 0; i < n; i++) {
printf(" %s\n", cats[i]);
}
FSFreeCatalogues(cats);
}
}
@@ -155,6 +156,7 @@ print_extension_info(FSServer *svr)
for (i = 0; i < n; i++) {
printf(" %s\n", extlist[i]);
}
FSFreeExtensionList(extlist);
}
}

20
app/xfsinfo/xfsinfo.man
View File

@@ -26,7 +26,7 @@
.\"
.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.4 2001/04/18 16:13:23 dawes Exp $
.\"
.TH XFSINFO 1 __xorgversion__
.TH XFSINFO __appmansuffix__ __xorgversion__
.SH NAME
xfsinfo \- X font server information utility
.SH SYNOPSIS
@@ -43,8 +43,14 @@ and alternate servers that are available.
.SH "OPTIONS"
.PP
.TP
.B \-server \fIhost\fP:\fIport\fP
.B \-server \fIservername\fP
This option specifies the X font server to contact.
.I servername
must be specified in one of the formats defined in the
.I Font Server Names
section of X(__miscmansuffix__). If not specified, the server name in the
.B FONTSERVER
environment variable is used.
.SH HISTORY
.I Xfsinfo
was originally called
@@ -56,9 +62,10 @@ utility from the Berkeley automounter
.SH EXAMPLE
.PP
The following shows a sample produced by
.I xfsinfo.
.IR xfsinfo .
.PP
.nf
example% xfsinfo -server hansen:7100
name of server: hansen:7100
version number: 1
vendor string: Font Server Prototype
@@ -76,8 +83,11 @@ number of extensions: 0
.PP
.TP 8
.B FONTSERVER
To get the default fontserver.
To get the default fontserver. The server name must
be specified in one of the formats defined in the
.I Font Server Names
section of X(__miscmansuffix__).
.SH "SEE ALSO"
xfs(1), fslsfonts(1)
xfs(__appmansuffix__), fslsfonts(__appmansuffix__), X(__miscmansuffix__).
.SH AUTHOR
Dave Lemke, Network Computing Devices, Inc