pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Apply patches from Todd Willey for DragonFlyBSD, this ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/819301049220
branches:  trunk
changeset: 488206:819301049220
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Jan 25 17:49:57 2005 +0000

description:
Apply patches from Todd Willey for DragonFlyBSD, this closes PR pkg/29042.

Thank you!

diffstat:

 meta-pkgs/xorg/Makefile.common   |    6 +-
 x11/xorg-libs/PLIST.DragonFly    |  123 +++++++++++++++++
 x11/xorg-libs/distinfo           |    4 +-
 x11/xorg-libs/files/DragonFly.cf |  280 +++++++++++++++++++++++++++++++++++++++
 x11/xorg-libs/patches/patch-ak   |   18 +-
 x11/xorg-server/PLIST.DragonFly  |    8 +
 6 files changed, 429 insertions(+), 10 deletions(-)

diffs (truncated from 490 to 300 lines):

diff -r c22e0676c8cc -r 819301049220 meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common    Tue Jan 25 17:38:47 2005 +0000
+++ b/meta-pkgs/xorg/Makefile.common    Tue Jan 25 17:49:57 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2005/01/24 10:57:27 hira Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/01/25 17:49:57 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -211,7 +211,9 @@
        @${LN} -sf ${X11ROOT}/lib/X11/config/version.def ${WRKSRC}/config/cf
        @${LN} -sf ${X11ROOT}/lib/X11/config/date.def ${WRKSRC}/config/cf
 
-       @${TOUCH} ${WRKSRC}/config/cf/DragonFly.cf
+.if ${OPSYS} == "DragonFly"
+       @${CP} ../../x11/xorg-libs/files/DragonFly.cf ${WRKSRC}/config/cf/
+.endif
 
 .  for F in ${SYSTEMS}
        @${MV} ${WRKSRC}/config/cf/${F}.cf \
diff -r c22e0676c8cc -r 819301049220 x11/xorg-libs/PLIST.DragonFly
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/PLIST.DragonFly     Tue Jan 25 17:49:57 2005 +0000
@@ -0,0 +1,123 @@
+@comment $NetBSD: PLIST.DragonFly,v 1.1 2005/01/25 17:49:57 xtraeme Exp $
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so
+${X11ROOT_PREFIX}/lib/libFS.so.6
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so
+${X11ROOT_PREFIX}/lib/libGL.so.1
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so
+${X11ROOT_PREFIX}/lib/libGLU.so.1
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so
+${X11ROOT_PREFIX}/lib/libGLw.so.1
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so
+${X11ROOT_PREFIX}/lib/libICE.so.6
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so
+${X11ROOT_PREFIX}/lib/libSM.so.6
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so
+${X11ROOT_PREFIX}/lib/libX11.so.6
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so
+${X11ROOT_PREFIX}/lib/libXRes.so.1
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so
+${X11ROOT_PREFIX}/lib/libXTrap.so.6
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so
+${X11ROOT_PREFIX}/lib/libXaw.so.6
+${X11ROOT_PREFIX}/lib/libXaw.so.7
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so
+${X11ROOT_PREFIX}/lib/libXext.so.6
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so
+${X11ROOT_PREFIX}/lib/libXfont.so.1
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so
+${X11ROOT_PREFIX}/lib/libXi.so.6
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so
+${X11ROOT_PREFIX}/lib/libXinerama.so.1
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so
+${X11ROOT_PREFIX}/lib/libXmu.so.6
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so
+${X11ROOT_PREFIX}/lib/libXmuu.so.1
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so
+${X11ROOT_PREFIX}/lib/libXp.so.6
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so
+${X11ROOT_PREFIX}/lib/libXpm.so.4
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so
+${X11ROOT_PREFIX}/lib/libXss.so.1
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so
+${X11ROOT_PREFIX}/lib/libXt.so.6
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so
+${X11ROOT_PREFIX}/lib/libXtst.so.6
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so
+${X11ROOT_PREFIX}/lib/libXv.so.1
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so
+${X11ROOT_PREFIX}/lib/libXvMC.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so
+${X11ROOT_PREFIX}/lib/libdps.so.1
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so
+${X11ROOT_PREFIX}/lib/libdpstk.so.1
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so
+${X11ROOT_PREFIX}/lib/libfontenc.so.1
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so
+${X11ROOT_PREFIX}/lib/liboldX.so.6
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so
+${X11ROOT_PREFIX}/lib/libpsres.so.1
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so
+${X11ROOT_PREFIX}/lib/libxkbui.so.1
+${X11ROOT_PREFIX}/lib/libXaw.so.8
+${X11ROOT_PREFIX}/lib/libXcomposite.a
+${X11ROOT_PREFIX}/lib/libXcomposite.so
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1
+${X11ROOT_PREFIX}/lib/libXdamage.a
+${X11ROOT_PREFIX}/lib/libXdamage.so
+${X11ROOT_PREFIX}/lib/libXdamage.so.1
+${X11ROOT_PREFIX}/lib/libXevie.a
+${X11ROOT_PREFIX}/lib/libXevie.so
+${X11ROOT_PREFIX}/lib/libXevie.so.1
+${X11ROOT_PREFIX}/lib/libXfixes.a
+${X11ROOT_PREFIX}/lib/libXfixes.so
+${X11ROOT_PREFIX}/lib/libXfixes.so.3
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
diff -r c22e0676c8cc -r 819301049220 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo    Tue Jan 25 17:38:47 2005 +0000
+++ b/x11/xorg-libs/distinfo    Tue Jan 25 17:49:57 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/01/07 16:57:36 reed Exp $
+$NetBSD: distinfo,v 1.10 2005/01/25 17:49:57 xtraeme Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -16,7 +16,7 @@
 SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
 SHA1 (patch-ai) = 841c2e76c3934b9da967aaed1876b78d3fc0465e
 SHA1 (patch-aj) = 78855dfdafe76695290636e170f69b6685ad23e1
-SHA1 (patch-ak) = d600481936a6b141dc1247e1af2270e224b03b22
+SHA1 (patch-ak) = 623d8e4f9cab4451a38447e8954a78158c83dfaa
 SHA1 (patch-al) = cb82cecd7147da8edd19d9f38a0789f07cddea87
 SHA1 (patch-am) = a907d42a4d2a72871e165b99afdba81945d656c7
 SHA1 (patch-an) = 513f8746bb66c954decdd7f2ca00888175c72834
diff -r c22e0676c8cc -r 819301049220 x11/xorg-libs/files/DragonFly.cf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/files/DragonFly.cf  Tue Jan 25 17:49:57 2005 +0000
@@ -0,0 +1,280 @@
+/* xc/config/cf/DragonFly.cf */
+
+#ifndef LocalBase
+# define LocalBase     @LOCALBASE@
+#endif
+
+#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 
+ */    
+#define HasPosixThreads                YES
+#define ThreadedX              YES
+#define SystemMTDefines                -D_REENTRANT -D_THREAD_SAFE
+#define HasThreadSafeAPI       YES
+#define MTSafeAPIDefines       -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
+
+# define BuildThreadStubLibrary        YES
+# define NeedUIThrStubs                YES
+# define ThreadsLibraries      -pthread
+# define SharedX11Reqs         $(LDPRELIB)
+# define SharedXtReqs          $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
+
+#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 CcCmd                         cc
+#define OptimizedCDebugFlags         /* -O2 causes some files to die out */
+#define CplusplusCmd          c++
+#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



Home | Main Index | Thread Index | Old Index