[pkgsrc/trunk]: pkgsrc/x11/imake Added OpenBSD support.

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd61d672682a
branches:  trunk
changeset: 478310:bd61d672682a
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Jul 21 21:42:51 2004 +0000

description:
Added OpenBSD support.

diffstat:

 x11/imake/Makefile         |   7 ++++++-
 x11/imake/PLIST            |   4 ++--
 x11/imake/distinfo         |   3 ++-
 x11/imake/patches/patch-ah |  41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 4 deletions(-)

diffs (95 lines):

diff -r af195e94e44e -r bd61d672682a x11/imake/Makefile
--- a/x11/imake/Makefile        Wed Jul 21 21:40:17 2004 +0000
+++ b/x11/imake/Makefile        Wed Jul 21 21:42:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/20 16:17:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/21 21:42:51 xtraeme Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       imake-${XF_VER}
@@ -22,6 +22,11 @@
 .if ${OPSYS} == "Linux"
 DEPENDS+=      bison-[0-9]*:../../devel/bison
 DEPENDS+=      flex-[0-9]*:../../devel/flex
+PLIST_SUBST+=  LNDIR=
+.elif ${OPSYS} == "OpenBSD"
+PLIST_SUBST+=  LNDIR="@comment "
+.else
+PLIST_SUBST+=  LNDIR=
 .endif
 
 .include "../../meta-pkgs/XFree86/Makefile.common"
diff -r af195e94e44e -r bd61d672682a x11/imake/PLIST
--- a/x11/imake/PLIST   Wed Jul 21 21:40:17 2004 +0000
+++ b/x11/imake/PLIST   Wed Jul 21 21:42:51 2004 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/28 22:06:16 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/07/21 21:42:51 xtraeme Exp $
 ${X11ROOT_PREFIX}/bin/ccmakedep
 ${X11ROOT_PREFIX}/bin/cleanlinks
 ${X11ROOT_PREFIX}/bin/gccmakedep
 ${X11ROOT_PREFIX}/bin/imake
-${X11ROOT_PREFIX}/bin/lndir
+${LNDIR}${X11ROOT_PREFIX}/bin/lndir
 ${X11ROOT_PREFIX}/bin/makedepend
 ${X11ROOT_PREFIX}/bin/makeg
 ${X11ROOT_PREFIX}/bin/makestrs
diff -r af195e94e44e -r bd61d672682a x11/imake/distinfo
--- a/x11/imake/distinfo        Wed Jul 21 21:40:17 2004 +0000
+++ b/x11/imake/distinfo        Wed Jul 21 21:42:51 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/07/03 06:26:08 grant Exp $
+$NetBSD: distinfo,v 1.6 2004/07/21 21:42:51 xtraeme Exp $
 
 SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79
 Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes
@@ -11,3 +11,4 @@
 SHA1 (patch-ae) = b34f46d715e90159df3897cf20023b58b9deff67
 SHA1 (patch-af) = a06752ee9f55e64a407fac6fbde3547fd096c71d
 SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac
+SHA1 (patch-ah) = 72348b2ed4e38c9eb22ce8482b2f6b921c57c945
diff -r af195e94e44e -r bd61d672682a x11/imake/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/imake/patches/patch-ah        Wed Jul 21 21:42:51 2004 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-ah,v 1.3 2004/07/21 21:42:51 xtraeme Exp $
+
+--- config/cf/OpenBSD.cf.in.orig       Wed Jul 21 23:38:55 2004
++++ config/cf/OpenBSD.cf.in    Wed Jul 21 23:40:53 2004
+@@ -162,7 +162,7 @@
+ #define MkdirHierCmd          mkdir -p
+ 
+ #ifndef CppCmd
+-#define CppCmd                /usr/libexec/cpp
++#define CppCmd                @@PKGSRC_CPP@@
+ #endif
+ #define StandardCppOptions    -traditional
+ #define StandardCppDefines    /**/
+@@ -170,10 +170,10 @@
+ #define PreIncDir             DefaultGccIncludeDir
+ 
+ #ifndef CcCmd
+-#define CcCmd                         cc
++#define CcCmd                         @@PKGSRC_CC@@
+ #endif
+ #ifndef AsCmd
+-#define AsCmd                 cc -c -x assembler
++#define AsCmd                 @@PKGSRC_CC@@ -c -x assembler
+ #endif
+ #ifndef DefaultCCOptions
+ #if defined(UseInstalled)
+@@ -481,13 +481,7 @@
+ # endif 
+  
+ 
+-# ifndef DefaultGcc2i386Opt
+-#   if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
+-      /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
+-#     define DefaultGcc2i386Opt       -O2 GccAliasingArgs
+-#   endif
+-# endif
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
+ # define ServerOSDefines      XFree86ServerOSDefines -DDDXTIME
+ # define ServerExtraSysLibs   -li386
+ # define LdPostLib            /**/