aboutsummaryrefslogtreecommitdiffstats
path: root/devel/mico/files
diff options
context:
space:
mode:
authordaichi <daichi@FreeBSD.org>2003-07-02 21:02:29 +0800
committerdaichi <daichi@FreeBSD.org>2003-07-02 21:02:29 +0800
commit062f16ccec871f516d8f7e33422d97ff74cddf35 (patch)
tree9b472da36a046e56430a1f7e111afd0354bd54bc /devel/mico/files
parentbb6f776547e76593186ec913b3bf7b04808c699a (diff)
downloadfreebsd-ports-graphics-062f16ccec871f516d8f7e33422d97ff74cddf35.tar.gz
freebsd-ports-graphics-062f16ccec871f516d8f7e33422d97ff74cddf35.tar.zst
freebsd-ports-graphics-062f16ccec871f516d8f7e33422d97ff74cddf35.zip
update devel/mico: 2.3.10 --> 2.3.10_1
- install HTML documentation - add build options: WITH_X11, WITH_QT, TITH_GTK, WITH_TCL - fix PLIST and make it flexible and depended on build options - add WITH_GCC32 option to build with lang/gcc32 on -STABLE - add patches and rename old - many style fixes - change COMMENT to correspond to Mico current state - decrease pkg-descr to 24 lines PR: 53988 Submitted by: Sergey Matveychuk <sem@ciam.ru> (maintainer)
Diffstat (limited to 'devel/mico/files')
-rw-r--r--devel/mico/files/patch-aq10
-rw-r--r--devel/mico/files/patch-examples::Makefile11
-rw-r--r--devel/mico/files/patch-include::os-math.h (renamed from devel/mico/files/patch-as)0
-rw-r--r--devel/mico/files/patch-include::tclmico.h13
-rw-r--r--devel/mico/files/patch-src::Makefile28
-rw-r--r--devel/mico/files/patch-src::aclocal.m4 (renamed from devel/mico/files/patch-ar)0
-rw-r--r--devel/mico/files/patch-src::configure43
7 files changed, 95 insertions, 10 deletions
diff --git a/devel/mico/files/patch-aq b/devel/mico/files/patch-aq
deleted file mode 100644
index f1a0116c9e6..00000000000
--- a/devel/mico/files/patch-aq
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-examples::Makefile b/devel/mico/files/patch-examples::Makefile
new file mode 100644
index 00000000000..ac45d2381b5
--- /dev/null
+++ b/devel/mico/files/patch-examples::Makefile
@@ -0,0 +1,11 @@
+--- demo/Makefile.orig Mon Jun 30 05:51:13 2003
++++ demo/Makefile Mon Jun 30 05:51:23 2003
+@@ -27,7 +27,7 @@
+
+ RUNDIRS = bench dynany interceptor codesets poa obv mcast generic pi
+
+-INST_DIRS = $(DIRS) shlib ssl
++INST_DIRS = $(DIRS) shlib
+
+ ifeq ($(HAVE_DYNAMIC), yes)
+ DIRS := $(DIRS) shlib
diff --git a/devel/mico/files/patch-as b/devel/mico/files/patch-include::os-math.h
index 26c13c173b3..26c13c173b3 100644
--- a/devel/mico/files/patch-as
+++ b/devel/mico/files/patch-include::os-math.h
diff --git a/devel/mico/files/patch-include::tclmico.h b/devel/mico/files/patch-include::tclmico.h
new file mode 100644
index 00000000000..82a04f82383
--- /dev/null
+++ b/devel/mico/files/patch-include::tclmico.h
@@ -0,0 +1,13 @@
+--- tclmico.h.orig Mon May 26 14:55:46 2003
++++ include/mico/tclmico.h Sun Jun 29 02:25:42 2003
+@@ -32,6 +32,10 @@
+ #include <tcl.h>
+ #endif
+
++using std::list;
++using std::set;
++using std::less;
++
+ class TclDispatcher : public CORBA::Dispatcher {
+
+ struct FileEvent {
diff --git a/devel/mico/files/patch-src::Makefile b/devel/mico/files/patch-src::Makefile
new file mode 100644
index 00000000000..7feb181a648
--- /dev/null
+++ b/devel/mico/files/patch-src::Makefile
@@ -0,0 +1,28 @@
+--- Makefile.orig Fri Feb 14 13:55:53 2003
++++ Makefile Sun Jun 29 13:49:37 2003
+@@ -27,7 +27,7 @@
+ PRGDIRS = orb ir cpp idl daemon auxdir coss ccm tools
+ EXTRADIRS = test demo
+ ALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm test tools demo
+-INSTALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm tools include man demo
++INSTALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm tools include man
+ # Bootstrap minimal build configuration
+ MINLIBDIRS = orb ir idl
+ MINPRGDIRS = cpp idl
+@@ -68,11 +68,13 @@
+
+ install:
+ for i in $(INSTALLDIRS); do $(MAKE) -C $$i install || exit 1; done
++
++install-doc:
++ $(MAKE) -C demo install || exit 1;
+ if test -f doc/doc.ps; then \
+- $(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \
+- $(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \
++ $(IDIRCMD) $(SHARED_INSTDIR)/share/doc/mico; \
++ $(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/share/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-src::aclocal.m4
index 1fe4b3d1496..1fe4b3d1496 100644
--- a/devel/mico/files/patch-ar
+++ b/devel/mico/files/patch-src::aclocal.m4
diff --git a/devel/mico/files/patch-src::configure b/devel/mico/files/patch-src::configure
new file mode 100644
index 00000000000..b8f36de34b3
--- /dev/null
+++ b/devel/mico/files/patch-src::configure
@@ -0,0 +1,43 @@
+--- configure.orig Mon May 26 14:55:21 2003
++++ configure Sun Jun 29 05:48:32 2003
+@@ -3130,7 +3130,7 @@
+ # System dependencies.
+ #
+
+-CONF_OPT_FLAGS=-O2
++CONF_OPT_FLAGS="-O2"
+ CONF_DEBUG_FLAGS=-g
+ CONF_LIBNSL=yes
+ CONF_EXCEPT_FLAGS=
+@@ -3155,7 +3155,7 @@
+ CFLAGS="-Wall $CFLAGS"
+
+ if test X"$use_speed_tune" = Xyes; then
+- CONF_OPT_FLAGS=-O2
++ CONF_OPT_FLAGS="-O2"
+ fi
+
+ CONF_SHARED_CC="$CXX -shared"
+@@ -3233,6 +3233,12 @@
+ CXXFLAGS="$CXXFLAGS -D_THREAD_SAFE"
+ fi
+ ;;
++ *freebsd5*)
++ # must not use .so.1.0 here
++ if test X"$use_threads" = Xyes; then
++ CXXFLAGS="$CXXFLAGS -D_THREAD_SAFE"
++ fi
++ ;;
+ *netbsd*)
+ # must not use .so.1.0 here
+ if test X"$use_threads" = Xyes; then
+@@ -4274,7 +4280,8 @@
+ rm -rf conftest*
+ if test X"$TCL_VERSION" != X; then
+ TCL_VERSION=`echo $TCL_VERSION | tr -d \"`
+- TCL_LIBS=-ltcl$TCL_VERSION
++ TCL_LIBS="-ltcl$TCL_VERSION -L/usr/local/lib"
++ TCL_LIBS=`echo $TCL_LIBS | tr -d .`
+ HAVE_TCL=yes
+ echo "$ac_t""$TCL_VERSION" 1>&6
+ else