diff options
| author | hans <hans@pkgsrc.org> | 2012-01-12 16:01:46 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-01-12 16:01:46 +0000 |
| commit | f50345ae05055598a2331e80bd3526e7c898dd3c (patch) | |
| tree | e9c2d557948ff7a44667dd84eb1d92299cdd0cb9 /x11/openmotif | |
| parent | a6421eb80677eaa1dd3764bfac342f9ea4c6b36e (diff) | |
| download | pkgsrc-f50345ae05055598a2331e80bd3526e7c898dd3c.tar.gz | |
Fix build on SunOS.
Diffstat (limited to 'x11/openmotif')
| -rw-r--r-- | x11/openmotif/Makefile | 4 | ||||
| -rw-r--r-- | x11/openmotif/distinfo | 3 | ||||
| -rw-r--r-- | x11/openmotif/patches/patch-lib_Xm_Xmfuncs.h | 23 |
3 files changed, 28 insertions, 2 deletions
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 7c0911a8d8b..e9fdb4fb9e0 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2011/12/07 17:01:58 drochner Exp $ +# $NetBSD: Makefile,v 1.71 2012/01/12 16:01:46 hans Exp $ PKGVER= 2.3.3 DISTNAME= openmotif-${PKGVER} @@ -43,6 +43,8 @@ USE_TOOLS+= flex gmake tbl pkg-config GNU_CONFIGURE= yes MAKE_JOBS_SAFE= no # PR 37233 +CFLAGS.SunOS+= -Dsun + SUBST_CLASSES+= man_rename SUBST_STAGE.man_rename= pre-configure SUBST_MESSAGE.man_rename= Fixing hardcoded paths. diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo index c15636895e9..c61fee35f9c 100644 --- a/x11/openmotif/distinfo +++ b/x11/openmotif/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2011/11/27 14:17:40 drochner Exp $ +$NetBSD: distinfo,v 1.30 2012/01/12 16:01:46 hans Exp $ SHA1 (openmotif-2.3.3.tar.gz) = 2a51e2f28078c4db7ff0c8517eb257001716b699 RMD160 (openmotif-2.3.3.tar.gz) = 015323e212e91ea3beaf039593de5ba75b01e4a6 @@ -18,3 +18,4 @@ SHA1 (patch-bm) = 1b78f6ba2f369e5dcc4dfda65e1ffa7660ac6a32 SHA1 (patch-bn) = c794756e1d113dd8d77054837764052b2696214c SHA1 (patch-bo) = a1b2ab6cdaac779116f262519a42901c8effb9db SHA1 (patch-bp) = 4efeb0da29a691dea4c3c7738fba52a25843c0de +SHA1 (patch-lib_Xm_Xmfuncs.h) = 8ca6059000cde2e31d185264f21b04b2c5433f6f diff --git a/x11/openmotif/patches/patch-lib_Xm_Xmfuncs.h b/x11/openmotif/patches/patch-lib_Xm_Xmfuncs.h new file mode 100644 index 00000000000..36b651756d0 --- /dev/null +++ b/x11/openmotif/patches/patch-lib_Xm_Xmfuncs.h @@ -0,0 +1,23 @@ +$NetBSD: patch-lib_Xm_Xmfuncs.h,v 1.1 2012/01/12 16:01:46 hans Exp $ + +Avoid all the outdated #ifdef mess on SunOS. SunOS had both bcopy/bzero/bcmp +and memmove/memcmp/memset since at least 1996. + +--- lib/Xm/Xmfuncs.h.orig 2002-01-04 22:23:20.000000000 +0100 ++++ lib/Xm/Xmfuncs.h 2012-01-10 19:15:58.346463824 +0100 +@@ -34,6 +34,8 @@ in this Software without prior written a + + /* the old Xfuncs.h, for pre-R6 */ + ++#ifndef __sun ++ + #ifdef X_USEBFUNCS + void bcopy(); + void bzero(); +@@ -88,4 +90,6 @@ int bcmp(); + #endif /* SYSV else */ + #endif /* ! X_NOT_STDC_ENV else */ + ++#endif /* __sun */ ++ + #endif /* _XFUNCS_H_ */ |