Re-add this port marked BROKEN and commenting out USE_QT_VER and related

relating to Qt1.  When someone has time they can test with Qt2 and fix this.

Requested by:	sobomax

7 files changed, 272 insertions, 0 deletions

diff --git a/devel/mico/files/patch-ak b/devel/mico/files/patch-ak
new file mode 100644
index 000000000000..cd6c14085f97
--- /dev/null
+++ b/devel/mico/files/patch-ak
@@ -0,0 +1,34 @@
+--- 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.2 )
+ 
+ #
+ # misc
+@@ -320,7 +320,12 @@
+     CONF_OBJ_SIZE_LIMIT=yes
+     ;;
+   *bsd*)
+-    CONF_SOEXT=so.1.0
++    if test "X$PORTOBJFORMAT" = "Xelf"; then
++      CONF_SHARED_CC="$CXX -shared -Wl,-x "
++      CONF_SOEXT=so.1
++    else
++      CONF_SOEXT=so.1.0
++    fi
+     ;;
+   *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
new file mode 100644
index 000000000000..bc62ab9bab44
--- /dev/null
+++ b/devel/mico/files/patch-am
@@ -0,0 +1,168 @@
+--- MakeVars.in.orig	Wed May 12 18:19:51 1999
++++ MakeVars.in	Wed May 12 18:20:40 1999
+@@ -25,7 +25,7 @@
+ exec_prefix	= @exec_prefix@
+ SRCDIR		= @ABSSRCDIR@
+ INSTDIR		= $(exec_prefix)
+-SHARED_INSTDIR	= $(prefix)
++SHARED_INSTDIR	= $(prefix)/share
+ 
+ 
+ HAVE_REPO	= @HAVE_REPO@
+--- demo/MakeVars.orig	Wed May 12 18:32:24 1999
++++ demo/MakeVars	Wed May 12 18:32:47 1999
+@@ -78,14 +78,14 @@
+ endif
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/$(INSTALL_DIR)
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/$(INSTALL_DIR)
+ 	test -z "$(INSTALL_SRCS)" || \
+ 	  eval 'for i in $(INSTALL_SRCS); do \
+-	    $(ISRCCMD) $$i $(INSTDIR)/doc/mico/examples/$(INSTALL_DIR); \
++	    $(ISRCCMD) $$i $(SHARED_INSTDIR)/doc/mico/examples/$(INSTALL_DIR); \
+ 	  done'
+ 	test -z "$(INSTALL_SCRIPTS)" || \
+ 	  eval 'for i in $(INSTALL_SCRIPTS); do \
+-	    $(ISCRIPTCMD) $$i $(INSTDIR)/doc/mico/examples/$(INSTALL_DIR); \
++	    $(ISCRIPTCMD) $$i $(SHARED_INSTDIR)/doc/mico/examples/$(INSTALL_DIR); \
+ 	  done'
+ 
+ ifeq (.depend, $(wildcard .depend))
+--- demo/Makefile.orig	Wed May 12 18:29:55 1999
++++ demo/Makefile	Wed May 12 18:30:12 1999
+@@ -64,12 +64,12 @@
+ 	for i in $(DIRS); do $(MAKE) -C $$i clean || exit 1; done
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples
+ 	sed -e s/@MICO_VERSION@/$(VERSION)/g \
+ 		< MakeVars.install > MakeVars.install.ver
+-	$(ISRCCMD) MakeVars.install.ver $(INSTDIR)/doc/mico/examples/MakeVars
++	$(ISRCCMD) MakeVars.install.ver $(SHARED_INSTDIR)/doc/mico/examples/MakeVars
+ 	rm -f MakeVars.install.ver
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples
+ 	for i in $(INST_DIRS); do $(MAKE) -C $$i install || exit 1; done
+ 
+ install-cd: install
+--- demo/interop/Makefile.orig	Wed May 12 18:30:42 1999
++++ demo/interop/Makefile	Wed May 12 18:31:17 1999
+@@ -30,7 +30,7 @@
+ 	for i in $(DIRS); do $(MAKE) -C $$i clean || exit 1; done
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/interop
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/interop
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/interop
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/interop
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/interop
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/interop
+ 	for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done
+--- demo/poa/Makefile.orig	Wed May 12 18:33:14 1999
++++ demo/poa/Makefile	Wed May 12 18:33:28 1999
+@@ -13,7 +13,7 @@
+ 	rm -f *.o core *~ .depend
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/poa
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/poa
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/poa
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/poa
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/poa
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/poa
+ 	for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done
+--- demo/redlich/Makefile.orig	Wed May 12 18:33:38 1999
++++ demo/redlich/Makefile	Wed May 12 18:33:52 1999
+@@ -33,7 +33,7 @@
+ 	for i in $(DIRS); do $(MAKE) -C $$i clean || exit 1; done
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/redlich
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/redlich
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/redlich
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/redlich
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/redlich
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/redlich
+ 	for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done
+--- man/Makefile.orig	Wed May 12 18:27:23 1999
++++ man/Makefile	Wed May 12 18:27:40 1999
+@@ -26,9 +26,9 @@
+ 
+ install:
+ 	for i in $(DIRS); do \
+-	  $(IDIRCMD) $(SHARED_INSTDIR)/man/$$i; \
++	  $(IDIRCMD) $(prefix)/man/$$i; \
+ 	  for j in $$i/*.[1-9]; do $(IMANCMD) $$j \
+-		$(SHARED_INSTDIR)/man/$$i/; done; \
++		$(prefix)/man/$$i/; done; \
+ 	done
+ 
+ install-cd: install
+--- demo/boa/Makefile.orig	Mon Sep 27 22:52:48 1999
++++ demo/boa/Makefile	Mon Sep 27 22:53:43 1999
+@@ -31,7 +31,7 @@
+ 	for i in $(DIRS); do $(MAKE) -C $$i clean || exit 1; done
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/boa
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/boa
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/boa
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/boa
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/boa
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/boa
+ 	for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done
+--- demo/dispatcher/Makefile.orig	Mon Sep 27 22:54:58 1999
++++ demo/dispatcher/Makefile	Mon Sep 27 22:55:23 1999
+@@ -27,8 +27,8 @@
+ 	rm -f *.o core *~ .depend
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/dispatcher
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/dispatcher
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/dispatcher
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/dispatcher
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/dispatcher
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/dispatcher
+ 	test -z "$(DIRS)" || \
+ 	  eval 'for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done'
+--- demo/obv/Makefile.orig	Mon Sep 27 22:56:17 1999
++++ demo/obv/Makefile	Mon Sep 27 22:56:39 1999
+@@ -13,7 +13,7 @@
+ 	rm -f *.o core *~ .depend
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/obv
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/obv
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/obv
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/obv
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/obv
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/obv
+ 	for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done
+--- demo/services/Makefile.orig	Mon Sep 27 22:57:19 1999
++++ demo/services/Makefile	Mon Sep 27 22:57:43 1999
+@@ -13,7 +13,7 @@
+ 	rm -f *.o core *~ .depend
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/services
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/services
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/services
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/services
++	$(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
new file mode 100644
index 000000000000..3c724616d189
--- /dev/null
+++ b/devel/mico/files/patch-an
@@ -0,0 +1,20 @@
+--- 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)
+ LDFLAGS  := -L../orb $(LDFLAGS)
+-CXXFLAGS := -I. -I../include $(CXXFLAGS) $(X_CFLAGS)
++CXXFLAGS := -I. -I../include -I$(QT_INCLUDES) $(CXXFLAGS) $(X_CFLAGS)
+ 
+ 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-ao b/devel/mico/files/patch-ao
new file mode 100644
index 000000000000..3cd1d0986826
--- /dev/null
+++ b/devel/mico/files/patch-ao
@@ -0,0 +1,19 @@
+--- admin/mico-shld.def.in.orig	Mon Jul 26 20:44:44 1999
++++ admin/mico-shld.def.in	Mon Sep 27 23:32:57 1999
+@@ -50,10 +50,15 @@
+ outfile=` echo "$outfile" | sed -e 's/\.o$//' `'.@SOEXT@'
+ 
+ ldcmd="@SHARED_CC@ @PICFLAGS@ @LDSOFLAGS@ @DLFLAGS@ $libdirs @LDFLAGS@ -o $outfile \
+- $args" # @LIBS@
++-Wl,-soname,$outfile $args" # @LIBS@
+ 
+ echo "$ldcmd"
+ eval "$ldcmd" || exit
++
++symlink=` echo "$outfile" | sed 's/\.[1234567890]$//' `
++
++lncmd="ln -s $outfile $symlink"
++eval "$lncmd" || exit
+ 
+ # for HP-UX
+ chmod 555 "$outfile"
diff --git a/devel/mico/files/patch-ap b/devel/mico/files/patch-ap
new file mode 100644
index 000000000000..be39d860d053
--- /dev/null
+++ b/devel/mico/files/patch-ap
@@ -0,0 +1,11 @@
+--- coss/time/Makefile.orig	Mon Sep 27 00:12:40 1999
++++ coss/time/Makefile	Mon Sep 27 00:12:55 1999
+@@ -22,7 +22,7 @@
+ 
+ include ../../MakeVars
+ 
+-LDLIBS    = -lmicocoss$(VERSION) -lmico$(VERSION) $(CONFLIBS)
++LDLIBS    = -lmicocoss$(VERSION) -lmico$(VERSION) $(CONFLIBS) -lcompat
+ LDFLAGS  := -L.. -L.. -L../../orb $(LDFLAGS)
+ CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS)
+ IDLFLAGS := -I../../include --poa --no-boa --relative-paths
diff --git a/devel/mico/files/patch-aq b/devel/mico/files/patch-aq
new file mode 100644
index 000000000000..f1a0116c9e69
--- /dev/null
+++ b/devel/mico/files/patch-aq
@@ -0,0 +1,10 @@
+--- Makefile.orig	Fri Dec  3 14:35:16 1999
++++ Makefile	Fri Dec  3 14:36:14 1999
+@@ -62,7 +62,6 @@
+ 		$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \
+ 		$(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \
+ 	fi
+-	-ldconfig
+ 
+ install-cd:
+ 	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
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 ()