update to 2.3.3

changes: bugfixes

8 files changed, 60 insertions, 68 deletions

diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 2cac16c05b3..a6038c769bc 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.68 2011/11/01 06:03:04 sbd Exp $
+# $NetBSD: Makefile,v 1.69 2011/11/27 14:17:40 drochner Exp $
 
-PKGVER=		2.3.1
+PKGVER=		2.3.3
 DISTNAME=	openmotif-${PKGVER}
-PKGREVISION=	6
 CATEGORIES=	x11
-MASTER_SITES=	http://ftp.ics.com/openmotif/2.3/2.3.1/
-MASTER_SITES+=	ftp://ftp.ics.com/openmotif/2.3/2.3.1/
+MASTER_SITES=	http://ftp.ics.com/openmotif/2.3/2.3.3/
+MASTER_SITES+=	ftp://ftp.ics.com/openmotif/2.3/2.3.3/
 
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://www.opengroup.org/openmotif/
diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo
index 68a8b0e126b..c15636895e9 100644
--- a/x11/openmotif/distinfo
+++ b/x11/openmotif/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.28 2009/11/09 02:46:12 christos Exp $
+$NetBSD: distinfo,v 1.29 2011/11/27 14:17:40 drochner Exp $
 
-SHA1 (openmotif-2.3.1.tar.gz) = 7132493712111e6846deda241137f28a957b5878
-RMD160 (openmotif-2.3.1.tar.gz) = 8fe6f41a8b75636d9211d34cae96d47a7ed10ade
-Size (openmotif-2.3.1.tar.gz) = 5932681 bytes
+SHA1 (openmotif-2.3.3.tar.gz) = 2a51e2f28078c4db7ff0c8517eb257001716b699
+RMD160 (openmotif-2.3.3.tar.gz) = 015323e212e91ea3beaf039593de5ba75b01e4a6
+Size (openmotif-2.3.3.tar.gz) = 6051202 bytes
 SHA1 (patch-aa) = bbd5e51128e565d36d4b88260ba634bf6a7df61c
 SHA1 (patch-ab) = b9662c99b008e6490dc61cabe36cf952c87b51b1
 SHA1 (patch-ac) = 1c14d22f888859b15365bcba7edba78a1114c6ac
-SHA1 (patch-ad) = 9ce8f34493a39dfe51260543726c1b5df7e6c4e4
 SHA1 (patch-ae) = 00ffe019ea7a6950ed673f5a7907196b22a45f4e
-SHA1 (patch-af) = d52e01e8b27b77e62274c5daef56399dee77c0f3
-SHA1 (patch-ah) = 8b895129f5b055d0f91d9e15e014759b358d3363
+SHA1 (patch-ah) = 901ba95f037bb987f2411b3661359e3f414906c5
 SHA1 (patch-aj) = 28dd5d30ebbb7a4ea6da03a4befd026a7dd01cef
 SHA1 (patch-ak) = 56e41891f92aabc31cb2fad0a68d3e6040a7c866
 SHA1 (patch-az) = 2b389987baa5a278f93efe35528d94c8defcd48f
 SHA1 (patch-bc) = 3e02a245bb4d442b30200d6da2725ef84986d52e
 SHA1 (patch-bj) = 87abfdc6593d3b4ba3c7a76c84c54522ad7a044b
 SHA1 (patch-bl) = 905bec86af6d8d139faa2ca185adf3e8b58c1dea
-SHA1 (patch-bm) = 0e1aaf8b9a474a43e1382caa09b2ac9050f3505c
+SHA1 (patch-bm) = 1b78f6ba2f369e5dcc4dfda65e1ffa7660ac6a32
 SHA1 (patch-bn) = c794756e1d113dd8d77054837764052b2696214c
+SHA1 (patch-bo) = a1b2ab6cdaac779116f262519a42901c8effb9db
+SHA1 (patch-bp) = 4efeb0da29a691dea4c3c7738fba52a25843c0de
diff --git a/x11/openmotif/patches/patch-ad b/x11/openmotif/patches/patch-ad
deleted file mode 100644
index 44cdb5ae452..00000000000
--- a/x11/openmotif/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2008/07/14 23:01:32 christos Exp $
-
---- lib/Xm/Makefile.in.orig	2008-05-04 00:30:45.000000000 -0400
-+++ lib/Xm/Makefile.in	2008-06-28 16:42:34.000000000 -0400
-@@ -237,7 +237,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
-+LDFLAGS = @LDFLAGS@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -383,6 +383,7 @@
- @OM_LIBPNG_TRUE@PNG_SRCS = Png.c
- @OM_LIBPNG_FALSE@PNG_HDRS = 
- @OM_LIBPNG_TRUE@PNG_HDRS = PngI.h
-+libXm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
- libXm_la_LIBADD = ${X_LIBS} ${X_XMU} -lXt -lXext -lXp -lX11 ${X_EXTRA_LIBS}
- noinst_HEADERS = BaseClassI.h \
- BitmapsI.h \
diff --git a/x11/openmotif/patches/patch-af b/x11/openmotif/patches/patch-af
deleted file mode 100644
index b09373ed19a..00000000000
--- a/x11/openmotif/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.4 2008/07/14 23:01:32 christos Exp $
-
---- lib/Mrm/Makefile.in.orig	2008-05-04 00:30:45.000000000 -0400
-+++ lib/Mrm/Makefile.in	2008-06-28 16:38:02.000000000 -0400
-@@ -131,7 +131,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
-+LDFLAGS = @LDFLAGS@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -234,6 +234,7 @@
- EXTRA_DIST = Mrm.msg Imakefile
- INCLUDES = -I$(srcdir)/.. -I.. -I../Xm ${X_CFLAGS}
- mrmdir = $(includedir)/Mrm
-+libMrm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
- libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS}
- lib_LTLIBRARIES = libMrm.la
- noinst_HEADERS = IDB.h \
diff --git a/x11/openmotif/patches/patch-ah b/x11/openmotif/patches/patch-ah
index 2a147db0fa4..3bb517a1100 100644
--- a/x11/openmotif/patches/patch-ah
+++ b/x11/openmotif/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2008/07/14 23:01:32 christos Exp $
+$NetBSD: patch-ah,v 1.5 2011/11/27 14:17:41 drochner Exp $
 
---- Makefile.in.orig	2008-05-04 00:30:46.000000000 -0400
-+++ Makefile.in	2008-06-28 16:21:12.000000000 -0400
-@@ -245,8 +245,7 @@
+--- Makefile.in.orig	2010-03-12 14:45:02.000000000 +0000
++++ Makefile.in
+@@ -288,8 +288,7 @@ SUBDIRS = bindings bitmaps \
               include \
               tools \
               clients \
@@ -11,4 +11,4 @@ $NetBSD: patch-ah,v 1.4 2008/07/14 23:01:32 christos Exp $
 +             doc
  
  AUTOMAKE_OPTIONS = 1.4
- all: all-recursive
+ ACLOCAL_AMFLAGS = -I .
diff --git a/x11/openmotif/patches/patch-bm b/x11/openmotif/patches/patch-bm
index 8a9d6a609b7..9b4dcc84da3 100644
--- a/x11/openmotif/patches/patch-bm
+++ b/x11/openmotif/patches/patch-bm
@@ -1,17 +1,16 @@
-$NetBSD: patch-bm,v 1.2 2008/07/14 23:01:32 christos Exp $
+$NetBSD: patch-bm,v 1.3 2011/11/27 14:17:41 drochner Exp $
 
---- config/util/Makefile.in.orig	2008-05-04 00:30:39.000000000 -0400
-+++ config/util/Makefile.in	2008-06-28 16:23:22.000000000 -0400
-@@ -258,9 +258,16 @@
- 	  echo " rm -f $$p $$f"; \
- 	  rm -f $$p $$f ; \
- 	done
+--- config/util/Makefile.in.orig	2010-03-12 14:44:24.000000000 +0000
++++ config/util/Makefile.in
+@@ -277,9 +277,15 @@ clean-noinstPROGRAMS:
+ 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ 	echo " rm -f" $$list; \
+ 	rm -f $$list
 +ifndef CROSS_COMPILING
  makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES) 
  	@rm -f makestrs$(EXEEXT)
  	$(LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
 +else
-+makestrs$(EXEEXT): $(makestrs_SOURCES) $(makestrs_DEPENDENCIES)
 +	@rm -f makestrs$(EXEEXT)
 +	$(CC_FOR_BUILD) $(X_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
 +	    $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
diff --git a/x11/openmotif/patches/patch-bo b/x11/openmotif/patches/patch-bo
new file mode 100644
index 00000000000..3c273455c14
--- /dev/null
+++ b/x11/openmotif/patches/patch-bo
@@ -0,0 +1,18 @@
+$NetBSD: patch-bo,v 1.1 2011/11/27 14:17:41 drochner Exp $
+
+--- tools/wml/Uil.h.orig	2009-10-22 11:54:44.000000000 +0000
++++ tools/wml/Uil.h
+@@ -278,6 +278,7 @@
+ 
+ 
+ 
++#if 0
+ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+ typedef int YYSTYPE;
+ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
+@@ -286,4 +287,4 @@ typedef int YYSTYPE;
+ #endif
+ 
+ extern YYSTYPE yylval;
+-
++#endif
diff --git a/x11/openmotif/patches/patch-bp b/x11/openmotif/patches/patch-bp
new file mode 100644
index 00000000000..6896fa46773
--- /dev/null
+++ b/x11/openmotif/patches/patch-bp
@@ -0,0 +1,18 @@
+$NetBSD: patch-bp,v 1.1 2011/11/27 14:17:41 drochner Exp $
+
+--- tools/wml/UilLexPars.h.orig	2009-10-22 11:54:44.000000000 +0000
++++ tools/wml/UilLexPars.h
+@@ -278,6 +278,7 @@
+ 
+ 
+ 
++#if 0
+ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+ typedef int YYSTYPE;
+ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
+@@ -286,4 +287,4 @@ typedef int YYSTYPE;
+ #endif
+ 
+ extern YYSTYPE yylval;
+-
++#endif