diff options
author | dmcmahill <dmcmahill@pkgsrc.org> | 2005-08-18 23:51:24 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill@pkgsrc.org> | 2005-08-18 23:51:24 +0000 |
commit | 59f5327ead64ba0bad17f4e32d560e728caa402a (patch) | |
tree | 5faf0ac0f7fd04fb4a45ef5e01e9a62708d858b2 /cad | |
parent | 76545d12934bc29905b5de0103e8ac051476f0a4 (diff) | |
download | pkgsrc-59f5327ead64ba0bad17f4e32d560e728caa402a.tar.gz |
Set the correct DEF_${OPSYS} to get this to build on solaris.
Should also help with irix builds.
Diffstat (limited to 'cad')
-rw-r--r-- | cad/qcad/Makefile | 17 | ||||
-rw-r--r-- | cad/qcad/distinfo | 4 | ||||
-rw-r--r-- | cad/qcad/patches/patch-ac | 72 |
3 files changed, 86 insertions, 7 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index a7ba5aa39c4..f159761f2e2 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/06/16 06:57:41 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/08/18 23:51:24 dmcmahill Exp $ DISTNAME= qcad-1.5.4-src PKGNAME= qcad-1.5.4 @@ -15,10 +15,25 @@ MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} MAKE_ENV+= QTDIR=${BUILDLINK_PREFIX.qt3} INSTALLATION_DIRS= bin +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Linux" +QCAD_OPSYS = LINUX +.elif ${OPSYS} == "SunOS" +QCAD_OPSYS = SOLARIS +.elif !empty(OPSYS:MBSD) +QCAD_OPSYS = BSD +.elif !empty(OPSYS:MIRIX) +QCAD_OPSYS = IRIX +.else +PKG_FAIL_REASON= "Unknown operating system for ${PKGNAME} +.endif + do-configure: for f in rappwin.cpp relement.cpp rfonts.cpp rprgdef.h; do \ ${SED} -e 's:@PREFIX@:'${PREFIX}':g' \ -e 's:@X11BASE@:${X11BASE}:g' \ + -e 's:@OPSYS@:${QCAD_OPSYS}:g' \ ${WRKSRC}/$$f > ${WRKSRC}/$$f.tmp \ && ${MV} ${WRKSRC}/$$f.tmp ${WRKSRC}/$$f; \ done diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index 6cede103aad..d4ad09599f6 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2005/02/23 14:59:25 agc Exp $ +$NetBSD: distinfo,v 1.11 2005/08/18 23:51:24 dmcmahill Exp $ SHA1 (qcad-1.5.4-src.tar.gz) = d28f31bb392cdcd5d7ea9396647e07851757c790 RMD160 (qcad-1.5.4-src.tar.gz) = 3afa9e1e8ff7e3dc3c064310c1ad586cd0a9cfc1 Size (qcad-1.5.4-src.tar.gz) = 2884049 bytes SHA1 (patch-aa) = f2752f57849a237a66029dfd80d5afcbf533cddc SHA1 (patch-ab) = cea24c43b1d9187f8b55c2c831e26ac8d7a6efe7 -SHA1 (patch-ac) = 3210453403685c1294547871eda4ec2f0df3c61a +SHA1 (patch-ac) = d3879d61fca6b47ba179b7991c7d718392c05d71 SHA1 (patch-ad) = 873961829011b8717c154d4c4caf7e8c428a848e SHA1 (patch-af) = 61b18b29e50246dce977bc7cee24aaa2b78d4a95 diff --git a/cad/qcad/patches/patch-ac b/cad/qcad/patches/patch-ac index 8898a4d5e4a..15314829568 100644 --- a/cad/qcad/patches/patch-ac +++ b/cad/qcad/patches/patch-ac @@ -1,13 +1,77 @@ -$NetBSD: patch-ac,v 1.2 2003/04/29 21:51:54 jtb Exp $ +$NetBSD: patch-ac,v 1.3 2005/08/18 23:51:24 dmcmahill Exp $ ---- rprgdef.h.orig +--- rprgdef.h.orig 2002-09-20 13:26:57.000000000 -0400 +++ rprgdef.h -@@ -28,7 +28,7 @@ +@@ -22,16 +22,27 @@ + //#define DEF_LESS_DIALOGS // Don't show the startup dialog + + ++// Define one of ++// DEF_LINUX ++// DEF_SOLARIS ++// DEF_WINDOWS ++// DEF_BSD ++// DEF_IRIX ++ ++#define DEF_@OPSYS@ ++ + // Uncomment for Linux +-#define DEF_LINUX // Are we running Linux? ++#ifdef DEF_LINUX // Are we running Linux? + #define RUNNING_LINUX true #define RUNNING_WINDOWS false #define RUNNING_SOLARIS false #define RUNNING_IRIX false -#define DATADIR "/usr/share" ++#endif + +#define DATADIR "@PREFIX@/share" +-#ifdef __FreeBSD__ ++ ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + #define DEF_FREEBSD + #undef DEF_LINUX + #define RUNNING_LINUX true // close enough +@@ -42,35 +53,30 @@ + + + // Uncomment for Solaris +-/* +-#define DEF_SOLARIS // Are we running Solaris? ++#ifdef DEF_SOLARIS // Are we running Solaris? + #define RUNNING_SOLARIS true + #define RUNNING_WINDOWS false + #define RUNNING_LINUX false + #define RUNNING_IRIX false +-*/ ++#endif + + + // Uncomment for Windoze +-/* +-#define DEF_WINDOWS // Iiiik - we're running windoze!!! ++#ifdef DEF_WINDOWS // Iiiik - we're running windoze!!! + #define RUNNING_WINDOWS true + #define RUNNING_LINUX false + #define RUNNING_SOLARIS false + #define RUNNING_IRIX false +-*/ +- ++#endif + + + // Uncomment for IRIX +-/* +-#define DEF_SGI // Are we running IRIX? ++#ifdef DEF_SGI // Are we running IRIX? + #define RUNNING_SOLARIS false + #define RUNNING_WINDOWS false + #define RUNNING_LINUX false + #define RUNNING_IRIX true +-*/ +- ++#endif - #ifdef __FreeBSD__ + #ifdef DEF_SOLARIS + #define true 1 |