pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Make this build/work on DragonFlyBSD. Patches were sub...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d1507efd4076
branches: trunk
changeset: 482715:d1507efd4076
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Mon Nov 01 23:41:58 2004 +0000
description:
Make this build/work on DragonFlyBSD. Patches were submitted by
Todd Willey via tech-pkg@.
diffstat:
meta-pkgs/xorg/Makefile.common | 33 +++-
x11/xorg-imake/Makefile | 3 +-
x11/xorg-imake/distinfo | 4 +-
x11/xorg-imake/files/DragonFly.cf | 278 +++++++++++++++++++++++++++++++++++++
x11/xorg-imake/patches/patch-ah | 29 +++
x11/xorg-imake/patches/patch-ai | 283 ++++++++++++++++++++++++++++++++++++++
6 files changed, 623 insertions(+), 7 deletions(-)
diffs (truncated from 703 to 300 lines):
diff -r 2e900d8f85e1 -r d1507efd4076 meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common Mon Nov 01 23:15:15 2004 +0000
+++ b/meta-pkgs/xorg/Makefile.common Mon Nov 01 23:41:58 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/10/20 14:33:30 reed Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/11/01 23:41:59 xtraeme Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -17,7 +17,27 @@
#
# Manual page handling.
#
-.if ${OPSYS} == "FreeBSD"
+.if ${OPSYS} == "DragonFly"
+
+XTHRSTUB_MINOR= '@comment '
+LIBXTHRSTUB=
+XF86RUSH= '@comment '
+IMAKE_MANTOOLS=
+LIBDRI=
+MANSOURCEPATH= man/man
+MAN_DIR= ${MANSOURCEPATH}1
+LIBMAN_DIR= ${MANSOURCEPATH}3
+KERNMAN_DIR= ${MANSOURCEPATH}4
+FILEMAN_DIR= ${MANSOURCEPATH}5
+MISCMAN_DIR= ${MANSOURCEPATH}7
+MAN_SUFFIX= 1
+LIBMAN_SUFFIX= 3
+KERNMAN_SUFFIX= 4
+FILEMAN_SUFFIX= 5
+MISCMAN_SUFFIX= 7
+
+.elif ${OPSYS} == "FreeBSD"
+
. if ${LOWER_OPSYS_VERSUFFIX} == "4"
XTHRSTUB_MINOR= '@comment '
LIBXTHRSTUB=
@@ -116,9 +136,10 @@
#
# Any volunteer to test any platform not listed here? :)
#
-ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* OpenBSD-*-* SunOS-*-*
+ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* \
+ OpenBSD-*-* SunOS-*-* DragonFly-*-*
-MASTER_SITE_XORG+= \
+MASTER_SITE_XORG+= \
http://freedesktop.org/~xorg/X11R${XORG_VER}/src/ \
ftp://ftp.x.org/pub/ \
ftp://ftp.gwdg.de/pub/x11/x.org/pub/ \
@@ -137,7 +158,7 @@
#
# Operating Systems to pass our compiler options (CC, CXX, CPP, CFLAGS).
#
-SYSTEMS= FreeBSD NetBSD OpenBSD linux
+SYSTEMS= FreeBSD NetBSD OpenBSD linux DragonFly
.if !defined(NO_XORG_TARGETS)
@@ -174,6 +195,8 @@
@${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
+
. for F in ${SYSTEMS}
@${MV} ${WRKSRC}/config/cf/${F}.cf \
${WRKSRC}/config/cf/${F}.cf.in
diff -r 2e900d8f85e1 -r d1507efd4076 x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile Mon Nov 01 23:15:15 2004 +0000
+++ b/x11/xorg-imake/Makefile Mon Nov 01 23:41:58 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/09/21 17:38:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/11/01 23:41:58 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
@@ -33,6 +33,7 @@
post-extract:
@${TOUCH} ${WRKSRC}/config/cf/date.def
+ @${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf/
.for F in ${SYSTEMS}
@${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in
.endfor
diff -r 2e900d8f85e1 -r d1507efd4076 x11/xorg-imake/distinfo
--- a/x11/xorg-imake/distinfo Mon Nov 01 23:15:15 2004 +0000
+++ b/x11/xorg-imake/distinfo Mon Nov 01 23:41:58 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/10/08 03:35:25 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2004/11/01 23:41:58 xtraeme Exp $
SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -11,3 +11,5 @@
SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
+SHA1 (patch-ah) = 2d509b235d9b52317c435453db7d970e0ad54fd3
+SHA1 (patch-ai) = 545518e16c23333f3d02e477495e6f8480c5650c
diff -r 2e900d8f85e1 -r d1507efd4076 x11/xorg-imake/files/DragonFly.cf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-imake/files/DragonFly.cf Mon Nov 01 23:41:58 2004 +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
+
Home |
Main Index |
Thread Index |
Old Index