Thu Jan 12 16:01:46 2012 UTC ()
Fix build on SunOS.


(hans)
diff -r1.70 -r1.71 pkgsrc/x11/openmotif/Makefile
diff -r1.29 -r1.30 pkgsrc/x11/openmotif/distinfo
diff -r0 -r1.1 pkgsrc/x11/openmotif/patches/patch-lib_Xm_Xmfuncs.h
cvs diff -r1.70 -r1.71 pkgsrc/x11/openmotif/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/openmotif/Attic/Makefile 2011/12/07 17:01:58 1.70
+++ pkgsrc/x11/openmotif/Attic/Makefile 2012/01/12 16:01:46 1.71
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.70 2011/12/07 17:01:58 drochner Exp $ 1# $NetBSD: Makefile,v 1.71 2012/01/12 16:01:46 hans Exp $
2 2
3PKGVER= 2.3.3 3PKGVER= 2.3.3
4DISTNAME= openmotif-${PKGVER} 4DISTNAME= openmotif-${PKGVER}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= http://ftp.ics.com/openmotif/2.3/2.3.3/ 7MASTER_SITES= http://ftp.ics.com/openmotif/2.3/2.3.3/
8MASTER_SITES+= ftp://ftp.ics.com/openmotif/2.3/2.3.3/ 8MASTER_SITES+= ftp://ftp.ics.com/openmotif/2.3/2.3.3/
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://www.opengroup.org/openmotif/ 11HOMEPAGE= http://www.opengroup.org/openmotif/
12COMMENT= The Open Group Motif toolkit for the X Window System 12COMMENT= The Open Group Motif toolkit for the X Window System
13LICENSE= openmotif-license 13LICENSE= openmotif-license
14 14
@@ -33,26 +33,28 @@ NO_BIN_ON_FTP= ${RESTRICTED} @@ -33,26 +33,28 @@ NO_BIN_ON_FTP= ${RESTRICTED}
33# NO_*_ON_CDROM: License seems to require indemnification for 33# NO_*_ON_CDROM: License seems to require indemnification for
34# "commercial product offering", but doesn't define commercial product 34# "commercial product offering", but doesn't define commercial product
35# offering. Err on the side of caution and mark restricted. 35# offering. Err on the side of caution and mark restricted.
36NO_SRC_ON_CDROM= ${RESTRICTED} 36NO_SRC_ON_CDROM= ${RESTRICTED}
37NO_BIN_ON_CDROM= ${RESTRICTED} 37NO_BIN_ON_CDROM= ${RESTRICTED}
38 38
39CONFLICTS+= lesstif-[0-9]* 39CONFLICTS+= lesstif-[0-9]*
40 40
41USE_LIBTOOL= yes 41USE_LIBTOOL= yes
42USE_TOOLS+= flex gmake tbl pkg-config 42USE_TOOLS+= flex gmake tbl pkg-config
43GNU_CONFIGURE= yes 43GNU_CONFIGURE= yes
44MAKE_JOBS_SAFE= no # PR 37233 44MAKE_JOBS_SAFE= no # PR 37233
45 45
 46CFLAGS.SunOS+= -Dsun
 47
46SUBST_CLASSES+= man_rename 48SUBST_CLASSES+= man_rename
47SUBST_STAGE.man_rename= pre-configure 49SUBST_STAGE.man_rename= pre-configure
48SUBST_MESSAGE.man_rename= Fixing hardcoded paths. 50SUBST_MESSAGE.man_rename= Fixing hardcoded paths.
49SUBST_FILES.man_rename= doc/man/man3/Makefile.in 51SUBST_FILES.man_rename= doc/man/man3/Makefile.in
50SUBST_SED.man_rename= -e 's: Core.3: XCore.3:g' 52SUBST_SED.man_rename= -e 's: Core.3: XCore.3:g'
51SUBST_SED.man_rename+= -e 's: Object.3: XObject.3:g' 53SUBST_SED.man_rename+= -e 's: Object.3: XObject.3:g'
52SUBST_SED.man_rename+= -e 's: Shell.3: XShell.3:g' 54SUBST_SED.man_rename+= -e 's: Shell.3: XShell.3:g'
53 55
54CONFIGURE_ARGS+= \ 56CONFIGURE_ARGS+= \
55 --enable-jpeg --enable-png \ 57 --enable-jpeg --enable-png \
56 --with-libjpeg-includes=${JPEGBASE}/include \ 58 --with-libjpeg-includes=${JPEGBASE}/include \
57 --with-libjpeg-lib=${JPEGBASE}/lib \ 59 --with-libjpeg-lib=${JPEGBASE}/lib \
58 --with-libpng-includes=${BUILDLINK_PREFIX.png}/include \ 60 --with-libpng-includes=${BUILDLINK_PREFIX.png}/include \
cvs diff -r1.29 -r1.30 pkgsrc/x11/openmotif/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/openmotif/Attic/distinfo 2011/11/27 14:17:40 1.29
+++ pkgsrc/x11/openmotif/Attic/distinfo 2012/01/12 16:01:46 1.30
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.29 2011/11/27 14:17:40 drochner Exp $ 1$NetBSD: distinfo,v 1.30 2012/01/12 16:01:46 hans Exp $
2 2
3SHA1 (openmotif-2.3.3.tar.gz) = 2a51e2f28078c4db7ff0c8517eb257001716b699 3SHA1 (openmotif-2.3.3.tar.gz) = 2a51e2f28078c4db7ff0c8517eb257001716b699
4RMD160 (openmotif-2.3.3.tar.gz) = 015323e212e91ea3beaf039593de5ba75b01e4a6 4RMD160 (openmotif-2.3.3.tar.gz) = 015323e212e91ea3beaf039593de5ba75b01e4a6
5Size (openmotif-2.3.3.tar.gz) = 6051202 bytes 5Size (openmotif-2.3.3.tar.gz) = 6051202 bytes
6SHA1 (patch-aa) = bbd5e51128e565d36d4b88260ba634bf6a7df61c 6SHA1 (patch-aa) = bbd5e51128e565d36d4b88260ba634bf6a7df61c
7SHA1 (patch-ab) = b9662c99b008e6490dc61cabe36cf952c87b51b1 7SHA1 (patch-ab) = b9662c99b008e6490dc61cabe36cf952c87b51b1
8SHA1 (patch-ac) = 1c14d22f888859b15365bcba7edba78a1114c6ac 8SHA1 (patch-ac) = 1c14d22f888859b15365bcba7edba78a1114c6ac
9SHA1 (patch-ae) = 00ffe019ea7a6950ed673f5a7907196b22a45f4e 9SHA1 (patch-ae) = 00ffe019ea7a6950ed673f5a7907196b22a45f4e
10SHA1 (patch-ah) = 901ba95f037bb987f2411b3661359e3f414906c5 10SHA1 (patch-ah) = 901ba95f037bb987f2411b3661359e3f414906c5
11SHA1 (patch-aj) = 28dd5d30ebbb7a4ea6da03a4befd026a7dd01cef 11SHA1 (patch-aj) = 28dd5d30ebbb7a4ea6da03a4befd026a7dd01cef
12SHA1 (patch-ak) = 56e41891f92aabc31cb2fad0a68d3e6040a7c866 12SHA1 (patch-ak) = 56e41891f92aabc31cb2fad0a68d3e6040a7c866
13SHA1 (patch-az) = 2b389987baa5a278f93efe35528d94c8defcd48f 13SHA1 (patch-az) = 2b389987baa5a278f93efe35528d94c8defcd48f
14SHA1 (patch-bc) = 3e02a245bb4d442b30200d6da2725ef84986d52e 14SHA1 (patch-bc) = 3e02a245bb4d442b30200d6da2725ef84986d52e
15SHA1 (patch-bj) = 87abfdc6593d3b4ba3c7a76c84c54522ad7a044b 15SHA1 (patch-bj) = 87abfdc6593d3b4ba3c7a76c84c54522ad7a044b
16SHA1 (patch-bl) = 905bec86af6d8d139faa2ca185adf3e8b58c1dea 16SHA1 (patch-bl) = 905bec86af6d8d139faa2ca185adf3e8b58c1dea
17SHA1 (patch-bm) = 1b78f6ba2f369e5dcc4dfda65e1ffa7660ac6a32 17SHA1 (patch-bm) = 1b78f6ba2f369e5dcc4dfda65e1ffa7660ac6a32
18SHA1 (patch-bn) = c794756e1d113dd8d77054837764052b2696214c 18SHA1 (patch-bn) = c794756e1d113dd8d77054837764052b2696214c
19SHA1 (patch-bo) = a1b2ab6cdaac779116f262519a42901c8effb9db 19SHA1 (patch-bo) = a1b2ab6cdaac779116f262519a42901c8effb9db
20SHA1 (patch-bp) = 4efeb0da29a691dea4c3c7738fba52a25843c0de 20SHA1 (patch-bp) = 4efeb0da29a691dea4c3c7738fba52a25843c0de
 21SHA1 (patch-lib_Xm_Xmfuncs.h) = 8ca6059000cde2e31d185264f21b04b2c5433f6f
File Added: pkgsrc/x11/openmotif/patches/Attic/patch-lib_Xm_Xmfuncs.h
$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_ */