diff options
| -rw-r--r-- | meta-pkgs/XFree86/Makefile.common | 21 | ||||
| -rw-r--r-- | x11/XFree86-libs/distinfo | 5 | ||||
| -rw-r--r-- | x11/XFree86-libs/files/host.def | 4 | ||||
| -rw-r--r-- | x11/XFree86-libs/patches/patch-ai | 26 | ||||
| -rw-r--r-- | x11/XFree86-libs/patches/patch-as | 22 | ||||
| -rw-r--r-- | x11/imake/distinfo | 4 | ||||
| -rw-r--r-- | x11/imake/patches/patch-ag | 22 |
7 files changed, 88 insertions, 16 deletions
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common index bdadd2db59f..49fba6069c1 100644 --- a/meta-pkgs/XFree86/Makefile.common +++ b/meta-pkgs/XFree86/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2004/08/27 06:29:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.19 2004/11/07 12:57:37 markd Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -48,6 +48,23 @@ KERNMAN_SUFFIX= 4 FILEMAN_SUFFIX= 5 MISCMAN_SUFFIX= 7 +.elif ${OPSYS} == "SunOS" + +XF86RUSH= '@comment ' +IMAKE_MANTOOLS= +LIBDRI= '@comment ' +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= 1x +LIBMAN_SUFFIX= 3x +KERNMAN_SUFFIX= 4 +FILEMAN_SUFFIX= 5x +MISCMAN_SUFFIX= 7 + .elif ${OPSYS} == "Linux" XF86RUSH= @@ -142,7 +159,7 @@ _XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS} # # Operating Systems to pass our compiler options (CC, CXX, CPP, CFLAGS). # -SYSTEMS= FreeBSD NetBSD OpenBSD linux +SYSTEMS= FreeBSD NetBSD OpenBSD linux sun .if !defined(NO_XFREE86_TARGETS) diff --git a/x11/XFree86-libs/distinfo b/x11/XFree86-libs/distinfo index f46f5016fea..94869619d9b 100644 --- a/x11/XFree86-libs/distinfo +++ b/x11/XFree86-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2004/09/16 19:28:56 minskim Exp $ +$NetBSD: distinfo,v 1.8 2004/11/07 12:57:37 markd Exp $ SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79 Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes @@ -16,7 +16,7 @@ SHA1 (patch-ae) = 90584e5732fb882f431afd69f6fd1c26c9d22bee SHA1 (patch-af) = b34f46d715e90159df3897cf20023b58b9deff67 SHA1 (patch-ag) = a06752ee9f55e64a407fac6fbde3547fd096c71d SHA1 (patch-ah) = 30618658577dd37b31191197cd2c156ff72e0d90 -SHA1 (patch-ai) = 178d556fa11818420cd685308cf179ee5f6f7dac +SHA1 (patch-ai) = dd2f382f7dc3aea9ca591b386e988cd1655adff0 SHA1 (patch-aj) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad SHA1 (patch-ak) = 8df00ceb043f9a1d99b5bd270bd19198f0a23a51 SHA1 (patch-al) = 4eb342844fe90e1269b6a0296c5ba52ab7be50b3 @@ -26,3 +26,4 @@ SHA1 (patch-ao) = 12af967565c0c3ddb29464f7f726786c5d04c60b SHA1 (patch-ap) = e2d533dd24e176e20fb1af7c8791e2670aad5c20 SHA1 (patch-aq) = 398fbbeca94beb6e4a878941d1b825d0b734e11b SHA1 (patch-ar) = c9ad52d94aedd94d7c0e0dc254d02cde5e33b637 +SHA1 (patch-as) = c0b27ef82c688c535fdd46cb5de3315e24677fc6 diff --git a/x11/XFree86-libs/files/host.def b/x11/XFree86-libs/files/host.def index 90b4ee4e082..1e3255c0b79 100644 --- a/x11/XFree86-libs/files/host.def +++ b/x11/XFree86-libs/files/host.def @@ -1,4 +1,4 @@ -/* $NetBSD: host.def,v 1.3 2004/04/27 21:49:57 reed Exp $ */ +/* $NetBSD: host.def,v 1.4 2004/11/07 12:57:37 markd Exp $ */ #define ProjectRoot @PREFIX@ @@ -45,7 +45,7 @@ #define HasXdmAuth YES #define UseInstalledPrograms YES -#ifndef FreeBSDArchitecture +#if !defined(FreeBSDArchitecture) && !defined(SunArchitecture) # ifndef BuildThreadStubLibrary # define BuildThreadStubLibrary YES # endif diff --git a/x11/XFree86-libs/patches/patch-ai b/x11/XFree86-libs/patches/patch-ai index 5dbf49772e7..4e1a8ef0fe4 100644 --- a/x11/XFree86-libs/patches/patch-ai +++ b/x11/XFree86-libs/patches/patch-ai @@ -1,14 +1,32 @@ -$NetBSD: patch-ai,v 1.3 2004/07/03 06:26:08 grant Exp $ +$NetBSD: patch-ai,v 1.4 2004/11/07 12:57:37 markd Exp $ ---- config/cf/sun.cf.orig 2004-02-02 14:55:26.000000000 +1100 -+++ config/cf/sun.cf -@@ -19,6 +19,9 @@ XCOMM platform: $XFree86: xc/config/cf/ +--- config/cf/sun.cf.in.orig 2004-02-02 16:55:26.000000000 +1300 ++++ config/cf/sun.cf.in +@@ -19,6 +19,12 @@ XCOMM platform: $XFree86: xc/config/cf/ #endif XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) +/* This is the XFree86 package - we want to build XFree86 on Solaris */ +#define BuildXFree86OnSparcSunOS YES ++#define HasZlib YES ++#define HasSunC NO ++#define HasGcc2 YES + /* * Compiler setup. This sun.cf file knows what options to use with * certain compilers, including Sun C, CenterLine C, and gcc. It +@@ -224,6 +230,14 @@ XCOMM SunPro C++ CplusplusCompilerMajorV + #endif + #endif + ++#define CcCmd @@PKGSRC_CC@@ ++#define LdCmd @@PKGSRC_CC@@ ++#define CplusplusCmd @@PKGSRC_CXX@@ ++#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ ++#define ExtraLoadFlags -Wl,-R$(USRLIBDIRPATH) ++#define SharedLibraryLoadFlags -shared ExtraLoadFlags ++#define HasLdRunPath NO ++ + # if HasSunC && (CCompilerMajorVersion < 3) + # define BootstrapCFlags -DSVR4 + # else diff --git a/x11/XFree86-libs/patches/patch-as b/x11/XFree86-libs/patches/patch-as new file mode 100644 index 00000000000..890914656c8 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-as @@ -0,0 +1,22 @@ +$NetBSD: patch-as,v 1.3 2004/11/07 12:57:37 markd Exp $ + +--- config/cf/sunLib.tmpl.orig 2003-07-12 10:17:41.000000000 +1200 ++++ config/cf/sunLib.tmpl +@@ -57,6 +57,17 @@ XCOMM $XFree86: xc/config/cf/sunLib.tmpl + # define SharedXrenderReqs $(LDPRELIB) $(XLIB) + # define FixupLibReferences() /**/ + ++#define SharedX11Reqs $(LDPRELIB) -lsocket -lnsl ++#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) ++#define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB) ++#define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB) ++#define SharedXaw6Reqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) ++#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) ++#define SharedXextReqs $(LDPRELIBS) $(XONLYLIB) ++#define SharedXiReqs $(LDPRELIBS) $(XLIB) ++#define SharedXtstReqs $(LDPRELIBS) $(XLIB) ++#define SharedSMReqs $(LDPRELIBS) $(ICELIB) ++ + # define SharedPamReqs -ldl + # define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs + # define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs diff --git a/x11/imake/distinfo b/x11/imake/distinfo index 86cd6ce24ea..1973a512a93 100644 --- a/x11/imake/distinfo +++ b/x11/imake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2004/07/21 22:32:33 xtraeme Exp $ +$NetBSD: distinfo,v 1.8 2004/11/07 12:57:37 markd Exp $ SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79 Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes @@ -10,5 +10,5 @@ SHA1 (patch-ac) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa SHA1 (patch-ad) = 90584e5732fb882f431afd69f6fd1c26c9d22bee SHA1 (patch-ae) = b34f46d715e90159df3897cf20023b58b9deff67 SHA1 (patch-af) = a06752ee9f55e64a407fac6fbde3547fd096c71d -SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac +SHA1 (patch-ag) = 2431b04483928ddd281d37e09b2e5c6fc37895f5 SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad diff --git a/x11/imake/patches/patch-ag b/x11/imake/patches/patch-ag index f1ff5273d9a..b24019cf237 100644 --- a/x11/imake/patches/patch-ag +++ b/x11/imake/patches/patch-ag @@ -1,14 +1,28 @@ -$NetBSD: patch-ag,v 1.3 2004/07/03 06:26:08 grant Exp $ +$NetBSD: patch-ag,v 1.4 2004/11/07 12:57:37 markd Exp $ ---- config/cf/sun.cf.orig 2004-02-02 14:55:26.000000000 +1100 -+++ config/cf/sun.cf -@@ -19,6 +19,9 @@ XCOMM platform: $XFree86: xc/config/cf/ +--- config/cf/sun.cf.in.orig Mon Feb 2 16:55:26 2004 ++++ config/cf/sun.cf.in Thu Nov 4 16:43:40 2004 +@@ -19,6 +19,12 @@ #endif XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) +/* This is the XFree86 package - we want to build XFree86 on Solaris */ +#define BuildXFree86OnSparcSunOS YES ++#define BuildThreadStubLibrary NO ++#define HasSunC NO ++#define HasGcc2 YES + /* * Compiler setup. This sun.cf file knows what options to use with * certain compilers, including Sun C, CenterLine C, and gcc. It +@@ -224,6 +230,10 @@ + #endif + #endif + ++#define CcCmd @@PKGSRC_CC@@ ++#define CplusplusCmd @@PKGSRC_CXX@@ ++#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ ++ + # if HasSunC && (CCompilerMajorVersion < 3) + # define BootstrapCFlags -DSVR4 + # else |