This updates mico to 2.3.1 ...

PR: ports/16055
Submitted by: Maxim Sobolev <sobomax@altavista.net>

4 files changed, 47 insertions, 8 deletions

diff --git a/devel/mico/files/patch-ak b/devel/mico/files/patch-ak
index bfa66cd10705..cd6c14085f97 100644
--- a/devel/mico/files/patch-ak
+++ b/devel/mico/files/patch-ak
@@ -1,16 +1,15 @@
-diff -ruN work/mico/configure.in mico/configure.in
---- work/mico/configure.in	Sun Aug  8 06:00:49 1999
-+++ configure.in	Sun Sep 26 04:44:44 1999
+--- configure.in.orig	Tue Dec  7 00:36:14 1999
++++ configure.in	Mon Jan 10 18:07:54 2000
 @@ -170,7 +170,7 @@
  # extra dirs
  #
  
 -wi_EXTRA_DIRS(no, /usr/local /local /user/local /usr/share /opt /opt/local $QTDIR $GTKDIR $TCLDIR $SSLDIR)
-+wi_EXTRA_DIRS(no, /usr/local /local /user/local /usr/share /opt /opt/local /usr/X11R6 $QTDIR $GTKDIR $TCLDIR $SSLDIR, tcl8.0 X11/qt )
++wi_EXTRA_DIRS(no, /usr/local /local /user/local /usr/share /opt /opt/local /usr/X11R6 $QTDIR $GTKDIR $TCLDIR $SSLDIR, tcl8.2 )
  
  #
  # misc
-@@ -314,7 +314,12 @@
+@@ -320,7 +320,12 @@
      CONF_OBJ_SIZE_LIMIT=yes
      ;;
    *bsd*)
@@ -24,3 +23,12 @@ diff -ruN work/mico/configure.in mico/configure.in
      ;;
    *cygwin32*)
      have_cdk=yes;
+@@ -600,7 +605,7 @@
+ 
+ if test X"$QTDIR" != X; then
+   HAVE_QT=yes
+-  AC_PATH_PROG(MOC, moc, no)
++  AC_PATH_PROG(MOC, moc"$QTVER", no)
+   if test X"$MOC" = Xno; then
+     AC_MSG_WARN(cannot find moc. QT parts disabled.)
+     HAVE_QT=no
diff --git a/devel/mico/files/patch-am b/devel/mico/files/patch-am
index a24ccd4e0f03..bc62ab9bab44 100644
--- a/devel/mico/files/patch-am
+++ b/devel/mico/files/patch-am
@@ -153,3 +153,16 @@
 +	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/services
 +	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/services
  	for i in $(DIRS) stream-sound; do $(MAKE) -C $$i install || exit 1; done
+--- demo/siegel/Makefile.orig	Mon Jan 10 23:43:52 2000
++++ demo/siegel/Makefile	Mon Jan 10 23:44:19 2000
+@@ -33,7 +33,7 @@
+ 	for i in $(DIRS); do $(MAKE) -C $$i clean || exit 1; done
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/siegel
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/siegel
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/siegel
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/siegel
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/siegel
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/siegel
+ 	for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done
diff --git a/devel/mico/files/patch-an b/devel/mico/files/patch-an
index 2875edc3d009..3c724616d189 100644
--- a/devel/mico/files/patch-an
+++ b/devel/mico/files/patch-an
@@ -1,6 +1,5 @@
-diff -ruN work/mico/auxdir/Makefile mico/auxdir/Makefile
---- work/mico/auxdir/Makefile	Mon Jul 26 20:44:45 1999
-+++ auxdir/Makefile	Sun Sep 26 04:48:35 1999
+--- auxdir/Makefile.orig	Tue Jul 20 15:57:27 1999
++++ auxdir/Makefile	Mon Jan 10 17:51:58 2000
 @@ -24,7 +24,7 @@
  
  LDLIBS    = -lmico$(VERSION) $(CONFLIBS)
@@ -10,3 +9,12 @@ diff -ruN work/mico/auxdir/Makefile mico/auxdir/Makefile
  
  AUX_SRCS=dynany_impl.cc
  STATIC_AUX_OBJS = $(AUX_SRCS:.cc=.o)
+@@ -119,7 +119,7 @@
+ endif
+ 	rm -f $@
+ 	$(LDSO) -o libmicoqt$(VERSION) $(SHARED_QT_OBJS) \
+-		$(PURE_LDFLAGS) -lqt -lX11 -L../libs -lmico$(VERSION)
++		$(PURE_LDFLAGS) -lqt$(QTVER) -lX11 -L../libs -lmico$(VERSION)
+ 	$(IDIRCMD) ../libs
+ 	cd ../libs; rm -f $@; ln -f -s ../auxdir/$@ .
+ 
diff --git a/devel/mico/files/patch-ar b/devel/mico/files/patch-ar
new file mode 100644
index 000000000000..1fe4b3d14964
--- /dev/null
+++ b/devel/mico/files/patch-ar
@@ -0,0 +1,10 @@
+--- aclocal.m4.orig	Sun Nov 28 00:34:22 1999
++++ aclocal.m4	Sun Nov 28 00:34:47 1999
+@@ -684,6 +684,7 @@
+       AC_TRY_RUN([
+ #include <gtk/gtk.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ int 
+ main ()