SOURCES: xorg-util-util-macros-x.patch (NEW) - reverting x suffixe...

qboosh qboosh at pld-linux.org
Sun Sep 3 18:20:24 CEST 2006


Author: qboosh                       Date: Sun Sep  3 16:20:24 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverting x suffixes patch to revert

---- Files affected:
SOURCES:
   xorg-util-util-macros-x.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/xorg-util-util-macros-x.patch
diff -u /dev/null SOURCES/xorg-util-util-macros-x.patch:1.1
--- /dev/null	Sun Sep  3 18:20:24 2006
+++ SOURCES/xorg-util-util-macros-x.patch	Sun Sep  3 18:20:19 2006
@@ -0,0 +1,91 @@
+Revert this change (except version de-bump), according to FHS 2.3
+
+xorg-macros: remove GNU-userland special case; bump to 1.1.1
+Remove special-casing of man page suffices for GNU-userland systems (Linux,
+Hurd, GNU/kFreeBSD).  Bump to version 1.1.1.
+
+--- a/xorg-macros.m4.in
++++ b/xorg-macros.m4.in
+@@ -114,75 +114,47 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ 
+ if test x$APP_MAN_SUFFIX = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
+-	*)	APP_MAN_SUFFIX=1  ;;
+-    esac
++    APP_MAN_SUFFIX=1
+ fi
+ if test x$APP_MAN_DIR = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
+-	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
+-    esac
++    APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
+ fi
+ 
+ if test x$LIB_MAN_SUFFIX = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
+-	*)	LIB_MAN_SUFFIX=3  ;;
+-    esac
++    LIB_MAN_SUFFIX=3
+ fi
+ if test x$LIB_MAN_DIR = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
+-	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
+-    esac
++    LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+ fi
+ 
+ if test x$FILE_MAN_SUFFIX = x    ; then
+     case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
+ 	solaris*)	FILE_MAN_SUFFIX=4  ;;
+ 	*)		FILE_MAN_SUFFIX=5  ;;
+     esac
+ fi
+ if test x$FILE_MAN_DIR = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
+-	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
+-    esac
++    FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
+ fi
+ 
+-# In Imake's linux.cf, the misc man suffix & dir was only changed for 
+-# LinuxDebian, not other Linuxes, so we leave it unchanged here
+ if test x$MISC_MAN_SUFFIX = x    ; then
+     case $host_os in
+-#	linux* | gnu* | k*bsd*-gnu)		MISC_MAN_SUFFIX=7x ;;
+ 	solaris*)	MISC_MAN_SUFFIX=5  ;;
+ 	*)		MISC_MAN_SUFFIX=7  ;;
+     esac
+ fi
+ if test x$MISC_MAN_DIR = x    ; then
+-    case $host_os in
+-#	linux* | gnu* | k*bsd*-gnu)	MISC_MAN_DIR='$(mandir)/man7' ;;
+-	*)	MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
+-    esac
++    MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
+ fi
+ 
+-# In Imake's linux.cf, the driver man suffix & dir was only changed for 
+-# LinuxDebian, not other Linuxes, so we leave it unchanged here
+ if test x$DRIVER_MAN_SUFFIX = x    ; then
+     case $host_os in
+-#	linux* | gnu* | k*bsd*-gnu)		DRIVER_MAN_SUFFIX=4x ;;
+ 	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
+ 	*)		DRIVER_MAN_SUFFIX=4  ;;
+     esac
+ fi
+ if test x$DRIVER_MAN_DIR = x    ; then
+-    case $host_os in
+-#	linux* | gnu* | k*bsd*-gnu)	DRIVER_MAN_DIR='$(mandir)/man4' ;;
+-	*)	DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
+-    esac
++    DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+ fi
+ 
+ if test x$ADMIN_MAN_SUFFIX = x    ; then
================================================================


More information about the pld-cvs-commit mailing list