[pkgsrc/trunk]: pkgsrc Add support for building XFree86 packages on Solaris.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Add support for building XFree86 packages on Solaris.
From: markd <markd%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:47:59 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2ea42ee6ab61
branches:  trunk
changeset: 483085:2ea42ee6ab61
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Nov 07 12:57:37 2004 +0000

description:
Add support for building XFree86 packages on Solaris.
Claim to be using gcc always and assume that the wrapper framework will
deal with the differences for other compilers (rather than getting imake
to try and do it).

diffstat:

 meta-pkgs/XFree86/Makefile.common |  21 +++++++++++++++++++--
 x11/XFree86-libs/distinfo         |   5 +++--
 x11/XFree86-libs/files/host.def   |   4 ++--
 x11/XFree86-libs/patches/patch-ai |  26 ++++++++++++++++++++++----
 x11/XFree86-libs/patches/patch-as |  22 ++++++++++++++++++++++
 x11/imake/distinfo                |   4 ++--
 x11/imake/patches/patch-ag        |  22 ++++++++++++++++++----
 7 files changed, 88 insertions(+), 16 deletions(-)

diffs (201 lines):

diff -r 147b049580c3 -r 2ea42ee6ab61 meta-pkgs/XFree86/Makefile.common
--- a/meta-pkgs/XFree86/Makefile.common Sun Nov 07 12:32:04 2004 +0000
+++ b/meta-pkgs/XFree86/Makefile.common Sun Nov 07 12:57:37 2004 +0000
@@ -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 @@
 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 @@
 #
 # 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 -r 147b049580c3 -r 2ea42ee6ab61 x11/XFree86-libs/distinfo
--- a/x11/XFree86-libs/distinfo Sun Nov 07 12:32:04 2004 +0000
+++ b/x11/XFree86-libs/distinfo Sun Nov 07 12:57:37 2004 +0000
@@ -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-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-ap) = e2d533dd24e176e20fb1af7c8791e2670aad5c20
 SHA1 (patch-aq) = 398fbbeca94beb6e4a878941d1b825d0b734e11b
 SHA1 (patch-ar) = c9ad52d94aedd94d7c0e0dc254d02cde5e33b637
+SHA1 (patch-as) = c0b27ef82c688c535fdd46cb5de3315e24677fc6
diff -r 147b049580c3 -r 2ea42ee6ab61 x11/XFree86-libs/files/host.def
--- a/x11/XFree86-libs/files/host.def   Sun Nov 07 12:32:04 2004 +0000
+++ b/x11/XFree86-libs/files/host.def   Sun Nov 07 12:57:37 2004 +0000
@@ -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 -r 147b049580c3 -r 2ea42ee6ab61 x11/XFree86-libs/patches/patch-ai
--- a/x11/XFree86-libs/patches/patch-ai Sun Nov 07 12:32:04 2004 +0000
+++ b/x11/XFree86-libs/patches/patch-ai Sun Nov 07 12:57:37 2004 +0000
@@ -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 -r 147b049580c3 -r 2ea42ee6ab61 x11/XFree86-libs/patches/patch-as
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/XFree86-libs/patches/patch-as Sun Nov 07 12:57:37 2004 +0000
@@ -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 -r 147b049580c3 -r 2ea42ee6ab61 x11/imake/distinfo
--- a/x11/imake/distinfo        Sun Nov 07 12:32:04 2004 +0000
+++ b/x11/imake/distinfo        Sun Nov 07 12:57:37 2004 +0000
@@ -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-ad) = 90584e5732fb882f431afd69f6fd1c26c9d22bee
 SHA1 (patch-ae) = b34f46d715e90159df3897cf20023b58b9deff67
 SHA1 (patch-af) = a06752ee9f55e64a407fac6fbde3547fd096c71d
-SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac
+SHA1 (patch-ag) = 2431b04483928ddd281d37e09b2e5c6fc37895f5
 SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
diff -r 147b049580c3 -r 2ea42ee6ab61 x11/imake/patches/patch-ag
--- a/x11/imake/patches/patch-ag        Sun Nov 07 12:32:04 2004 +0000
+++ b/x11/imake/patches/patch-ag        Sun Nov 07 12:57:37 2004 +0000
@@ -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
Prev by Date: [pkgsrc/trunk]: pkgsrc/www/p5-Apache-Session-Wrapper This pkg need devel/p5-M...
Next by Date: [pkgsrc/trunk]: pkgsrc/security/seahorse Update to 0.7.5. While here, apply ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/p5-Apache-Session-Wrapper This pkg need devel/p5-M...
Next by Thread: [pkgsrc/trunk]: pkgsrc/security/seahorse Update to 0.7.5. While here, apply ...
Indexes:
Home | Main Index | Thread Index | Old Index