pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/xorg-cf-files Import xorg-cf-files-1.0.2 with the ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eb3d70c53b01
branches:  trunk
changeset: 522740:eb3d70c53b01
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Dec 19 22:54:51 2006 +0000

description:
Import xorg-cf-files-1.0.2 with the local changes from xorg-imake.
This are the default rules used by imake. Platforms other than
DragonFly, FreeBSD, Linux and NetBSD will most likely want some work
here.

OK for import during freeze: agc@ and wiz@

diffstat:

 x11/xorg-cf-files/DESCR              |    1 +
 x11/xorg-cf-files/Makefile           |   38 ++++++++++
 x11/xorg-cf-files/PLIST              |  123 +++++++++++++++++++++++++++++++++++
 x11/xorg-cf-files/distinfo           |   14 +++
 x11/xorg-cf-files/files/host.def     |    5 +
 x11/xorg-cf-files/files/xorgsite.def |   27 +++++++
 x11/xorg-cf-files/patches/patch-aa   |   87 ++++++++++++++++++++++++
 x11/xorg-cf-files/patches/patch-ab   |   38 ++++++++++
 x11/xorg-cf-files/patches/patch-ac   |   55 +++++++++++++++
 x11/xorg-cf-files/patches/patch-ad   |   51 ++++++++++++++
 x11/xorg-cf-files/patches/patch-ae   |   40 +++++++++++
 x11/xorg-cf-files/patches/patch-af   |   22 ++++++
 x11/xorg-cf-files/patches/patch-ag   |   26 +++++++
 x11/xorg-cf-files/patches/patch-ah   |   16 ++++
 x11/xorg-cf-files/patches/patch-ai   |   16 ++++
 15 files changed, 559 insertions(+), 0 deletions(-)

diffs (truncated from 619 to 300 lines):

diff -r 03c195918820 -r eb3d70c53b01 x11/xorg-cf-files/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-cf-files/DESCR   Tue Dec 19 22:54:51 2006 +0000
@@ -0,0 +1,1 @@
+This package contains the default Xorg imake rules.
diff -r 03c195918820 -r eb3d70c53b01 x11/xorg-cf-files/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-cf-files/Makefile        Tue Dec 19 22:54:51 2006 +0000
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+#
+
+DISTNAME=              xorg-cf-files-1.0.2
+CATEGORIES=            x11 devel
+MASTER_SITES=          http://xorg.freedesktop.org/releases/individual/util/
+EXTRACT_SUFX=          .tar.bz2
+
+MAINTAINER=            joerg%NetBSD.org@localhost
+HOMEPAGE=              http://xorg.freedesktop.org/releases/individual/util/
+COMMENT=               Xorg imake rules
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            pkg-config
+
+post-extract:
+       ${CP} ${FILESDIR}/host.def ${WRKSRC}
+       ${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}
+
+pre-configure:
+.for sys in NetBSD FreeBSD DragonFly linux darwin
+       mv ${WRKSRC}/${sys}.cf ${WRKSRC}/${sys}.cf.before &&
+       ${SED} -e "s|@@PKGSRC_CC@@|${CC}|g"             \
+               -e "s|@@PKGSRC_CPP@@|${CPP}|g"          \
+               -e "s|@@PKGSRC_CXX@@|${CXX}|g"          \
+               -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g"    \
+               -e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g"     \
+               ${WRKSRC}/${sys}.cf.before > ${WRKSRC}/${sys}.cf
+.endfor
+       ${SED} -e "s|@PREFIX@|${PREFIX}|g"              \
+               -e "s|@MAKE@|${MAKE_PROGRAM}|"  ${FILESDIR}/host.def > \
+               ${WRKSRC}/host.def
+
+.include "../../x11/xproto/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff -r 03c195918820 -r eb3d70c53b01 x11/xorg-cf-files/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-cf-files/PLIST   Tue Dec 19 22:54:51 2006 +0000
@@ -0,0 +1,123 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+lib/X11/config/Amoeba.cf
+lib/X11/config/DGUX.cf
+lib/X11/config/DragonFly.cf
+lib/X11/config/FreeBSD.cf
+lib/X11/config/Imake.cf
+lib/X11/config/Imake.rules
+lib/X11/config/Imake.tmpl
+lib/X11/config/Library.tmpl
+lib/X11/config/Mips.cf
+lib/X11/config/Motif.rules
+lib/X11/config/Motif.tmpl
+lib/X11/config/NetBSD.cf
+lib/X11/config/Oki.cf
+lib/X11/config/OpenBSD.cf
+lib/X11/config/OpenBSDLib.rules
+lib/X11/config/OpenBSDLib.tmpl
+lib/X11/config/QNX4.cf
+lib/X11/config/QNX4.rules
+lib/X11/config/Server.tmpl
+lib/X11/config/ServerLib.tmpl
+lib/X11/config/Threads.tmpl
+lib/X11/config/Win32.cf
+lib/X11/config/Win32.rules
+lib/X11/config/WinLib.tmpl
+lib/X11/config/X11.rules
+lib/X11/config/X11.tmpl
+lib/X11/config/apollo.cf
+lib/X11/config/bsd.cf
+lib/X11/config/bsdLib.rules
+lib/X11/config/bsdLib.tmpl
+lib/X11/config/bsdi.cf
+lib/X11/config/bsdiLib.rules
+lib/X11/config/bsdiLib.tmpl
+lib/X11/config/cde.rules
+lib/X11/config/cde.tmpl
+lib/X11/config/convex.cf
+lib/X11/config/cray.cf
+lib/X11/config/cross.def
+lib/X11/config/cross.rules
+lib/X11/config/cygwin.cf
+lib/X11/config/cygwin.rules
+lib/X11/config/cygwin.tmpl
+lib/X11/config/darwin.cf
+lib/X11/config/darwinLib.rules
+lib/X11/config/darwinLib.tmpl
+lib/X11/config/date.def
+lib/X11/config/dmx.cf
+lib/X11/config/fujitsu.cf
+lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
+lib/X11/config/host.def
+lib/X11/config/hp.cf
+lib/X11/config/hpLib.rules
+lib/X11/config/hpLib.tmpl
+lib/X11/config/ibm.cf
+lib/X11/config/ibmLib.rules
+lib/X11/config/ibmLib.tmpl
+lib/X11/config/isc.cf
+lib/X11/config/linux.cf
+lib/X11/config/lnxLib.rules
+lib/X11/config/lnxLib.tmpl
+lib/X11/config/lnxdoc.rules
+lib/X11/config/lnxdoc.tmpl
+lib/X11/config/luna.cf
+lib/X11/config/lynx.cf
+lib/X11/config/macII.cf
+lib/X11/config/mach.cf
+lib/X11/config/mingw.cf
+lib/X11/config/mingw.rules
+lib/X11/config/mingw.tmpl
+lib/X11/config/minix.cf
+lib/X11/config/moto.cf
+lib/X11/config/ncr.cf
+lib/X11/config/nec.cf
+lib/X11/config/necLib.rules
+lib/X11/config/necLib.tmpl
+lib/X11/config/noop.rules
+lib/X11/config/nto.cf
+lib/X11/config/nto.rules
+lib/X11/config/oldlib.rules
+lib/X11/config/os2.cf
+lib/X11/config/os2.rules
+lib/X11/config/os2Lib.rules
+lib/X11/config/os2Lib.tmpl
+lib/X11/config/osf1.cf
+lib/X11/config/osfLib.rules
+lib/X11/config/osfLib.tmpl
+lib/X11/config/pegasus.cf
+lib/X11/config/sco.cf
+lib/X11/config/sco5.cf
+lib/X11/config/scoLib.rules
+lib/X11/config/sequent.cf
+lib/X11/config/sequentLib.rules
+lib/X11/config/sgi.cf
+lib/X11/config/sgiLib.rules
+lib/X11/config/sgiLib.tmpl
+lib/X11/config/site.def
+lib/X11/config/sony.cf
+lib/X11/config/sun.cf
+lib/X11/config/sunLib.rules
+lib/X11/config/sunLib.tmpl
+lib/X11/config/sv3Lib.rules
+lib/X11/config/sv3Lib.tmpl
+lib/X11/config/sv4Lib.rules
+lib/X11/config/sv4Lib.tmpl
+lib/X11/config/svr3.cf
+lib/X11/config/svr4.cf
+lib/X11/config/ultrix.cf
+lib/X11/config/usl.cf
+lib/X11/config/version.def
+lib/X11/config/x386.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
+lib/X11/config/xfree86.cf
+lib/X11/config/xorg.cf
+lib/X11/config/xorg.tmpl
+lib/X11/config/xorgsite.def
+lib/X11/config/xorgversion.def
+@dirrm lib/X11/config
diff -r 03c195918820 -r eb3d70c53b01 x11/xorg-cf-files/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-cf-files/distinfo        Tue Dec 19 22:54:51 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+SHA1 (xorg-cf-files-1.0.2.tar.bz2) = a1182e1fd05a648e6282598a355b7c4be9339755
+RMD160 (xorg-cf-files-1.0.2.tar.bz2) = dc42aa06d7fb5bc073d51958763bf1bfcfd22926
+Size (xorg-cf-files-1.0.2.tar.bz2) = 264638 bytes
+SHA1 (patch-aa) = afe809bcc5d93be3b8a74e720faf2dc1daa4634d
+SHA1 (patch-ab) = 42fb5238ca07a25d54069aca72882fd36fb118cc
+SHA1 (patch-ac) = 7ed4cd5b33759736d86cdb6226ef53a42bbf7d7e
+SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
+SHA1 (patch-ae) = bc41dbcfdb45fce8be152cd2ea275954d4aad935
+SHA1 (patch-af) = 6fdcbcb8858bd82d260d00563980e80e314b899c
+SHA1 (patch-ag) = f2e665cc6e67cf2f687652b9adeab0a0de816729
+SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
+SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
diff -r 03c195918820 -r eb3d70c53b01 x11/xorg-cf-files/files/host.def
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-cf-files/files/host.def  Tue Dec 19 22:54:51 2006 +0000
@@ -0,0 +1,5 @@
+/* $NetBSD: host.def,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $ */
+
+#define ProjectRoot @PREFIX@
+#define BuildHtmlManPages NO
+#define MakeCmd @MAKE@
diff -r 03c195918820 -r eb3d70c53b01 x11/xorg-cf-files/files/xorgsite.def
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-cf-files/files/xorgsite.def      Tue Dec 19 22:54:51 2006 +0000
@@ -0,0 +1,27 @@
+/*
+ * $NetBSD: xorgsite.def,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+ *
+ * X.org packages for pkgsrc system 
+ *  
+ */ 
+
+#ifndef HasSecureRPC
+#define HasSecureRPC YES
+#endif
+#ifndef BuildAoutLibraries
+#define BuildAoutLibraries NO
+#endif
+#ifndef InstallXdmConfig
+#define InstallXdmConfig YES
+#endif
+#ifndef InstallXinitConfig
+#define InstallXinitConfig YES
+#endif
+#ifndef InstallAppDefFiles
+#define InstallAppDefFiles YES
+#endif
+#define HasXdmAuth YES
+#define BuildXF86Setup NO
+#define NothingOutsideProjectRoot YES
+
+#define        BuildDPSLibrary YES
diff -r 03c195918820 -r eb3d70c53b01 x11/xorg-cf-files/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-cf-files/patches/patch-aa        Tue Dec 19 22:54:51 2006 +0000
@@ -0,0 +1,87 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+--- NetBSD.cf.orig     2005-11-30 06:20:06.000000000 +0100
++++ NetBSD.cf
+@@ -126,7 +126,7 @@ XCOMM operating system:  OSName (OSMajor
+ # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
+       (OSMajorVersion == 2 && OSMinorVersion < 99) || \
+       (OSMajorVersion < 2))
+-#  define LibraryMTDefines    -DUSE_NBSD_THREADLIB
++#  define LibraryMTDefines    @@NETBSD_THREADLIB@@
+ # endif
+ # define SystemMTDefines      -D_REENTRANT
+ # define MTSafeAPIDefines     -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
+@@ -150,7 +150,7 @@ XCOMM operating system:  OSName (OSMajor
+ #define MkdirHierCmd          mkdir -p
+ 
+ #undef CcCmd
+-#define CcCmd                         gcc
++#define CcCmd                         @@PKGSRC_CC@@
+ #ifndef DefaultCCOptions
+ #if defined(UseInstalled)
+ #define DefaultCCOptions      /**/
+@@ -166,7 +166,7 @@ XCOMM operating system:  OSName (OSMajor
+ #endif
+ #endif
+ 
+-#define CppCmd                        cpp
++#define CppCmd                        @@PKGSRC_CPP@@
+ #define StandardCppOptions    -traditional
+ #define StandardCppDefines    /**/
+ #define PreProcessCmd         CcCmd -E
+@@ -195,7 +195,7 @@ XCOMM operating system:  OSName (OSMajor
+  * Disabled for NetBSD/vax until I figure out the scheme. --CS 
+  */
+ #if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
+-    defined(PpcArchitecture)
++    defined(PpcArchitecture) || defined(AMD64Architecture)
+ #  ifndef DoLoadableServer
+ #  define DoLoadableServer    YES
+ #  endif
+@@ -231,7 +231,7 @@ XCOMM operating system:  OSName (OSMajor
+ #  define ServerExtraSysLibs  -li386
+ # endif
+ #else
+-# define OptimizedCDebugFlags         -O2
++# define OptimizedCDebugFlags         -O2 GccAliasingArgs
+ # if defined(SparcArchitecture)
+ #  define ServerOSDefines     -DDDXOSINIT
+ # elif defined(AlphaArchitecture)
+@@ -284,6 +284,8 @@ XCOMM operating system:  OSName (OSMajor
+ #  ifndef XFree86ConsoleDefines
+ #    define XFree86ConsoleDefines     -DWSCONS_SUPPORT
+ #  endif
++#elif defined(ia64Architecture) || defined(AMD64Architecture)
++#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #else
+ #  define ServerExtraDefines GccGasOption
+ #endif
+@@ -404,6 +406,10 @@ XCOMM operating system:  OSName (OSMajor
+ # endif /* MTRRBuiltin */
+ #endif /* i386Architecture */
+ 
++#if defined(AMD64Architecture)
++# define HasMTRRBuiltin                YES



Home | Main Index | Thread Index | Old Index