[pkgsrc/trunk]: pkgsrc/x11/xorg-imake Remove patch-ai, which is the same file...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a2cad7d4d42c
branches:  trunk
changeset: 483115:a2cad7d4d42c
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Nov 08 08:19:48 2004 +0000

description:
Remove patch-ai, which is the same file than DragonFly.cf in ${FILESDIR},
noted by hira@ in private email.

diffstat:

 x11/xorg-imake/distinfo         |    3 +-
 x11/xorg-imake/patches/patch-ai |  283 ----------------------------------------
 2 files changed, 1 insertions(+), 285 deletions(-)

diffs (truncated from 301 to 300 lines):

diff -r ebc997cf2800 -r a2cad7d4d42c x11/xorg-imake/distinfo
--- a/x11/xorg-imake/distinfo   Mon Nov 08 04:32:20 2004 +0000
+++ b/x11/xorg-imake/distinfo   Mon Nov 08 08:19:48 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/11/01 23:41:58 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/11/08 08:19:48 xtraeme Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -12,4 +12,3 @@
 SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
 SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
 SHA1 (patch-ah) = 2d509b235d9b52317c435453db7d970e0ad54fd3
-SHA1 (patch-ai) = 545518e16c23333f3d02e477495e6f8480c5650c
diff -r ebc997cf2800 -r a2cad7d4d42c x11/xorg-imake/patches/patch-ai
--- a/x11/xorg-imake/patches/patch-ai   Mon Nov 08 04:32:20 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,283 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/11/01 23:41:59 xtraeme Exp $
-
---- /dev/null  2004-10-25 03:03:50.000000000 +0000
-+++ config/cf/DragonFly.cf.in  2004-10-25 15:32:02.000000000 +0000
-@@ -0,0 +1,278 @@
-+/* xc/config/cf/DragonFly.cf */
-+
-+#define UseElfFormat          YES
-+#define OSBinaryFormat                [ELF]
-+
-+#ifndef OSName
-+# define OSName                       DefaultOSName OSBinaryFormat
-+#endif
-+#ifndef OSVendor
-+# define OSVendor             /**/
-+#endif
-+#ifndef OSMajorVersion
-+# define OSMajorVersion               DefaultOSMajorVersion
-+#endif
-+#ifndef OSMinorVersion
-+# define OSMinorVersion               DefaultOSMinorVersion
-+#endif
-+#ifndef OSTeenyVersion
-+# define OSTeenyVersion               DefaultOSTeenyVersion
-+#endif
-+
-+/* #ifndef OSRelVersion */
-+/* Include this to get finer-grained information about the OS version */
-+#include "/usr/include/osreldate.h"
-+#define OSRelVersion __DragonFly_version
-+/* #endif */
-+
-+XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OSRelVersion)
-+
-+
-+#define HasCplusplus          YES
-+#define GccUsesGas            YES
-+#define UseGas                        YES
-+#define GnuCpp                        YES
-+#define HasNdbm                       YES
-+#define HasPutenv             YES
-+#define HasSnprintf           YES
-+#define HasBSD44Sockets       YES
-+#define HasDlopen             YES
-+#define HasSetProcTitle               YES
-+#define HasLibCrypt           YES
-+#define HasShm                        YES
-+#define HasWChar32            YES
-+#define HasUsableFileMmap     YES
-+#define HasNCurses            YES
-+#define HasVarRun             YES
-+#define HasVarDb              YES
-+#define HasIssetugid          YES
-+#define HasPoll                       YES
-+#define HasGetIfAddrs         YES
-+
-+#define IPv6SocketsAlsoIPv4   NO
-+#define InstallXloadSetGID    NO
-+#define HasWeakSymbols                UseElfFormat
-+
-+/*
-+ * Multi-thread safe libs 
-+ */   
-+#ifndef HasLibPthread
-+# define HasLibPthread                NO
-+#endif
-+#define HasPosixThreads               YES
-+#define ThreadedX             YES
-+#define SystemMTDefines               -D_REENTRANT -D_THREAD_SAFE
-+#define HasThreadSafeAPI      YES
-+#define MTSafeAPIDefines      -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-+
-+#if HasLibPthread
-+# define ThreadsLibraries     -lpthread
-+#else
-+# define BuildThreadStubLibrary       YES
-+# define NeedUIThrStubs               YES
-+# define ThreadsLibraries     -pthread
-+# define SharedX11Reqs                $(LDPRELIB)
-+# define SharedXtReqs         $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-+#endif
-+
-+#define AvoidNullMakeCommand  YES
-+#define StripInstalledPrograms        YES
-+#define CompressAllFonts      YES
-+#define Malloc0ReturnsNull    YES
-+#define NeedConstPrototypes   YES
-+#define NeedFunctionPrototypes        YES
-+#define NeedNestedPrototypes  YES
-+#define NeedVarargsPrototypes YES
-+#define NeedWidePrototypes    NO
-+
-+#define HasPlugin             YES
-+#define VendorHasX11R6_3libXext       YES     /* XC or XFree86 >= 3.3.1 */
-+
-+#define CppCmd                        cpp
-+#define PreProcessCmd         CppCmd
-+
-+#define StandardCppOptions    -traditional
-+#define StandardCppDefines    /**/
-+#ifndef DefaultCCOptions
-+# if defined(UseInstalled)
-+#  define DefaultCCOptions    /**/
-+# else
-+#  if defined(HasGcc3) && HasGcc3
-+#   define NoSystemWarn               -Wno-system-headers
-+#  else
-+#   define NoSystemWarn
-+#  endif
-+#  define DefaultCCOptions    -ansi -Dasm=__asm NoSystemWarn
-+# endif
-+#endif
-+
-+#define HasSetUserContext     YES
-+#define HasGetpeereid         YES
-+#define HasMTRRSupport                YES
-+
-+#ifndef BuildXF86DRI
-+# define BuildXF86DRI         YES
-+#endif
-+
-+#if defined(i386Architecture)
-+# define HasAgpGart           YES
-+#endif
-+
-+/*
-+ * SSE and 3DNow will be autodetected, so binutils is the only 
-+ * requirement for enabling this.  By 4.2 they were all supported.
-+ */
-+#if defined(i386Architecture)
-+# define HasX86Support          YES
-+# define HasMMXSupport                YES
-+# define Has3DNowSupport      YES
-+# define HasSSESupport                YES
-+#else
-+# define HasX86Support                NO
-+# define HasMMXSupport                NO
-+# define Has3DNowSupport      NO
-+# define HasSSESupport                NO
-+#endif
-+
-+#ifndef UseRpath
-+# define UseRpath             YES
-+#endif
-+
-+#ifndef RpathLoadFlags
-+# if UseRpath
-+#  define RpathLoadFlags      -Wl,-rpath,$(USRLIBDIRPATH)
-+# else
-+#  define RpathLoadFlags      /**/
-+# endif
-+#endif
-+
-+#ifndef ExtraLoadFlags
-+# if !defined(UseInstalled)
-+#  define ExtraLoadFlags      RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
-+# else
-+#  define ExtraLoadFlags      RpathLoadFlags
-+# endif
-+#endif
-+
-+#ifndef StaticLibrary
-+# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
-+#endif
-+
-+#define DlLibrary             -Wl,--export-dynamic
-+
-+#ifndef HasPam
-+# define HasPam               YES
-+#endif
-+#ifndef PamLibraries
-+# define PamLibraries         -lpam DlLibrary
-+#endif
-+
-+#ifndef UseGnuMalloc
-+# define UseGnuMalloc         NO
-+#endif
-+#ifndef GnuMallocLibrary
-+# define GnuMallocLibrary     -lgnumalloc
-+#endif
-+
-+#ifndef HasZlib
-+# define HasZlib              YES
-+#endif
-+
-+#ifdef AlphaArchitecture
-+# define IoLibrary            -lio
-+#else
-+# define IoLibrary            /**/
-+#endif
-+#define ServerExtraSysLibs    IoLibrary
-+
-+#ifndef HasExpat
-+# define HasExpat             YES
-+#endif
-+
-+#ifndef HasFreetype2
-+# define HasFreetype2         YES
-+#endif
-+
-+#undef  InstallCmd
-+#define InstallCmd            /usr/bin/install
-+
-+#define AsmElfDefines         -D__ELF__
-+
-+#if GccUsesGas
-+# define GccGasOption         -DGCCUSESGAS
-+# define AsmDefines           -DUSE_GAS AsmElfDefines
-+#else
-+# define GccGasOption /**/
-+# define AsmDefines           AsmElfDefines
-+#endif
-+
-+#ifdef i386Architecture
-+# define ServerExtraDefines GccGasOption XFree86ServerDefines
-+#endif
-+#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \
-+      defined(ia64Architecture) || defined(AMD64Architecture)
-+# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
-+#endif
-+
-+#ifdef Sparc64Architecture
-+# define AsVISOption          -Av9a
-+# define AsOutputArchSize     64
-+#endif
-+
-+#define StandardDefines       -DCSRG_BASED
-+
-+#define ServerOSDefines               XFree86ServerOSDefines -DDDXTIME
-+#define XawI18nDefines                -DUSE_XWCHAR_STRING
-+#define HasMakefileSafeInclude        YES
-+#define IncludeMakefile(file) @@# dependencies are in .depend
-+#define DependFileName                .depend
-+#ifndef DoLoadableServer
-+# define DoLoadableServer     YES
-+#endif
-+#ifndef ForceNormalLib
-+# define ForceNormalLib               YES
-+#endif
-+#define HasMkstemp            YES
-+
-+#ifndef PreIncDir
-+# define PreIncDir    /usr/include
-+#endif
-+
-+#define HasGroff      YES
-+#define NroffCmd      env GROFF_NO_SGR=y groff -Tascii
-+#define SetTtyGroup   YES
-+
-+#ifndef ExtraFilesToClean
-+# define ExtraFilesToClean *.core
-+#endif
-+
-+#define DefaultUserPath               /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin
-+#define DefaultSystemPath     /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
-+
-+#ifndef SystemManDirectory
-+# define SystemManDirectory   /usr/share/man
-+#endif
-+
-+#define InstKmemFlags -g kmem -m 2755
-+
-+#ifndef CompressManPages
-+# define CompressManPages     YES
-+#endif
-+
-+#define HasBsdMake    YES
-+
-+#ifndef SharedLibXdmGreet
-+# define SharedLibXdmGreet            NO
-+#endif
-+
-+#ifndef HasCookieMaker
-+/* Which versions have /dev/urandom? */
-+#define HasCookieMaker                YES
-+#define MkCookieCmd \
-+      'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
-+#endif
-+
-+
-+#include <bsdLib.rules>
-+