pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Apply patches from Joerg Sonnenberger for DragonFl...
details: https://anonhg.NetBSD.org/pkgsrc/rev/72e70316bc34
branches: trunk
changeset: 494388:72e70316bc34
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Mon May 23 19:14:14 2005 +0000
description:
Apply patches from Joerg Sonnenberger for DragonFlyBSD and GCC
3.x.x, while I'm here remove redundant DragonFly.cf from xorg-imake/files,
we'll use the same file from xorg-libs.
diffstat:
x11/xorg-imake/Makefile | 5 +-
x11/xorg-imake/distinfo | 4 +-
x11/xorg-imake/files/DragonFly.cf | 278 --------------------------------------
x11/xorg-imake/patches/patch-ak | 39 +++++
x11/xorg-imake/patches/patch-al | 59 ++++++++
x11/xorg-libs/distinfo | 12 +-
x11/xorg-libs/files/DragonFly.cf | 38 ++--
x11/xorg-libs/patches/patch-bb | 22 +++
x11/xorg-libs/patches/patch-bc | 22 +++
x11/xorg-libs/patches/patch-bd | 15 ++
x11/xorg-libs/patches/patch-be | 15 ++
x11/xorg-libs/patches/patch-bf | 31 ++++
x11/xorg-libs/patches/patch-bg | 13 +
x11/xorg-libs/patches/patch-bh | 13 +
x11/xorg-libs/patches/patch-bi | 40 +++++
x11/xorg-libs/patches/patch-bj | 85 +++++++++++
x11/xorg-libs/patches/patch-bk | 13 +
17 files changed, 405 insertions(+), 299 deletions(-)
diffs (truncated from 874 to 300 lines):
diff -r 2b06e9956fcd -r 72e70316bc34 x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile Mon May 23 18:05:16 2005 +0000
+++ b/x11/xorg-imake/Makefile Mon May 23 19:14:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/23 19:14:14 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
@@ -33,7 +33,8 @@
post-extract:
@${TOUCH} ${WRKSRC}/config/cf/date.def
- @${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf/
+ @${CP} ${PKGSRCDIR}/x11/xorg-libs/files/DragonFly.cf \
+ ${WRKSRC}/config/cf/
.for F in ${SYSTEMS}
@${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in
.endfor
diff -r 2b06e9956fcd -r 72e70316bc34 x11/xorg-imake/distinfo
--- a/x11/xorg-imake/distinfo Mon May 23 18:05:16 2005 +0000
+++ b/x11/xorg-imake/distinfo Mon May 23 19:14:14 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/03/22 09:46:10 adam Exp $
+$NetBSD: distinfo,v 1.13 2005/05/23 19:14:14 xtraeme Exp $
SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -16,3 +16,5 @@
SHA1 (patch-ah) = 6960406211ab12eff3044db477c22833c9eaa488
SHA1 (patch-ai) = eb3853e360dd5e05ca5978791734bcba5541b162
SHA1 (patch-aj) = 58594b376a62a584c0bc7f056e512fe8700d558e
+SHA1 (patch-ak) = c7e83c91d5192b5bd9e40c5b3ae3501900487a9f
+SHA1 (patch-al) = 14701767d5719cb2a47d2b828e69cffc1a6063bc
diff -r 2b06e9956fcd -r 72e70316bc34 x11/xorg-imake/files/DragonFly.cf
--- a/x11/xorg-imake/files/DragonFly.cf Mon May 23 18:05:16 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,278 +0,0 @@
-/* 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 NO
-#endif
-
-#define HasBsdMake YES
Home |
Main Index |
Thread Index |
Old Index