diff options
author | Marc G. Fournier <scrappy@FreeBSD.org> | 2000-01-30 02:10:34 +0000 |
---|---|---|
committer | Marc G. Fournier <scrappy@FreeBSD.org> | 2000-01-30 02:10:34 +0000 |
commit | 1c74c3537e413fb73fccf1122998d69e249f5f8c (patch) | |
tree | 0b500dbdc1919199fcc07979f6c6f3a0b9bff9fc /devel | |
parent | Remove trailing whitespace, remove x11 from categories, USE_XLIB when (diff) |
This updates mico to 2.3.1 ...
PR: ports/16055
Submitted by: Maxim Sobolev <sobomax@altavista.net>
Notes
Notes:
svn path=/head/; revision=25304
Diffstat (limited to 'devel')
-rw-r--r-- | devel/mico/Makefile | 32 | ||||
-rw-r--r-- | devel/mico/distinfo | 2 | ||||
-rw-r--r-- | devel/mico/files/patch-ak | 18 | ||||
-rw-r--r-- | devel/mico/files/patch-am | 13 | ||||
-rw-r--r-- | devel/mico/files/patch-an | 14 | ||||
-rw-r--r-- | devel/mico/files/patch-ar | 10 | ||||
-rw-r--r-- | devel/mico/pkg-plist | 79 |
7 files changed, 124 insertions, 44 deletions
diff --git a/devel/mico/Makefile b/devel/mico/Makefile index 17e3f0db6041..dade4e0a3bad 100644 --- a/devel/mico/Makefile +++ b/devel/mico/Makefile @@ -1,19 +1,20 @@ # New ports collection makefile for: mico -# Version required: 2.2.7 +# Version required: 2.3.1 # Date created: 11 July 1998 # Whom: Marc G. Fournier <scrappy@freebsd.org> # # $FreeBSD$ # -DISTNAME= mico-2.3.0 +MICOVER= 2.3.1 +DISTNAME= mico-${MICOVER} CATEGORIES= devel MASTER_SITES= http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/ MAINTAINER= scrappy@freebsd.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - tcl80.1:${PORTSDIR}/lang/tcl80 + tcl82.1:${PORTSDIR}/lang/tcl82 GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -21,10 +22,14 @@ USE_NEWGCC= yes .if defined(QT2) USE_QT2= yes -MAKE_ENV= QT_INCLUDE="${X11BASE}/include/qt2" +MAKE_ENV= QT_INCLUDES="${X11BASE}/include/qt2" \ + QTVER="2" +CONFIGURE_ENV= QTVER="2" .else USE_QT= yes -MAKE_ENV= QT_INCLUDE="${X11BASE}/include/qt" +MAKE_ENV= QT_INCLUDES="${X11BASE}/include/X11/qt" \ + QTVER="" +CONFIGURE_ENV= QTVER="" .endif USE_AUTOCONF= yes @@ -34,20 +39,21 @@ WRKSRC= ${WRKDIR}/mico CONFIGURE_ARGS= --with-qt --with-gtk --with-tcl --disable-mini-stl \ --enable-static --enable-shared -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" + +PLIST_SUB= MICOVER="${MICOVER}" MAN1= idl.1 imr.1 nsadmin.1 MAN5= micorc.5 MAN8= ird.8 micod.8 nsd.8 post-install: - ${LN} -s ${PREFIX}/lib/libmico2.3.0.so.1 ${PREFIX}/lib/libmico.2.3.0.so - ${LN} -s ${PREFIX}/lib/libmicoaux2.3.0.so.1 ${PREFIX}/lib/libmicoaux.2.3.0.so - ${LN} -s ${PREFIX}/lib/libmicocoss2.3.0.so.1 ${PREFIX}/lib/libmicocoss.2.3.0.so - ${LN} -s ${PREFIX}/lib/libmicogtk2.3.0.so.1 ${PREFIX}/lib/libmicogtk.2.3.0.so - ${LN} -s ${PREFIX}/lib/libmicoqt2.3.0.so.1 ${PREFIX}/lib/libmicoqt.2.3.0.so - ${LN} -s ${PREFIX}/lib/libmicotcl2.3.0.so.1 ${PREFIX}/lib/libmicotcl.2.3.0.so - ${LN} -s ${PREFIX}/lib/libmicox2.3.0.so.1 ${PREFIX}/lib/libmicox.2.3.0.so + ${LN} -sf ${PREFIX}/lib/libmico${MICOVER}.so.1 ${PREFIX}/lib/libmico.${MICOVER}.so + ${LN} -sf ${PREFIX}/lib/libmicoaux${MICOVER}.so.1 ${PREFIX}/lib/libmicoaux.${MICOVER}.so + ${LN} -sf ${PREFIX}/lib/libmicogtk${MICOVER}.so.1 ${PREFIX}/lib/libmicogtk.${MICOVER}.so + ${LN} -sf ${PREFIX}/lib/libmicoqt${MICOVER}.so.1 ${PREFIX}/lib/libmicoqt.${MICOVER}.so + ${LN} -sf ${PREFIX}/lib/libmicotcl${MICOVER}.so.1 ${PREFIX}/lib/libmicotcl.${MICOVER}.so + ${LN} -sf ${PREFIX}/lib/libmicox${MICOVER}.so.1 ${PREFIX}/lib/libmicox.${MICOVER}.so ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib @strip ${PREFIX}/bin/containmentd @strip ${PREFIX}/bin/eventd diff --git a/devel/mico/distinfo b/devel/mico/distinfo index ffe06d0b1875..6a3c4f5d8366 100644 --- a/devel/mico/distinfo +++ b/devel/mico/distinfo @@ -1 +1 @@ -MD5 (mico-2.3.0.tar.gz) = 787e1bb9e49d41e62d560c0a86046782 +MD5 (mico-2.3.1.tar.gz) = 24bafbeec3299ab2ac38150914ee16cc 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 () diff --git a/devel/mico/pkg-plist b/devel/mico/pkg-plist index 34341dd7b925..690608031a4d 100644 --- a/devel/mico/pkg-plist +++ b/devel/mico/pkg-plist @@ -205,27 +205,25 @@ include/ministl/simplevec.h include/ministl/string include/ministl/vector include/ministl/vector.h -lib/libmico.2.3.0.so -lib/libmico2.3.0.a -lib/libmico2.3.0.so.1 -lib/libmicoaux.2.3.0.so -lib/libmicoaux2.3.0.a -lib/libmicoaux2.3.0.so.1 -lib/libmicocoss.2.3.0.so -lib/libmicocoss2.3.0.a -lib/libmicocoss2.3.0.so.1 -lib/libmicogtk.2.3.0.so -lib/libmicogtk2.3.0.a -lib/libmicogtk2.3.0.so.1 -lib/libmicoqt.2.3.0.so -lib/libmicoqt2.3.0.a -lib/libmicoqt2.3.0.so.1 -lib/libmicotcl.2.3.0.so -lib/libmicotcl2.3.0.a -lib/libmicotcl2.3.0.so.1 -lib/libmicox.2.3.0.so -lib/libmicox2.3.0.a -lib/libmicox2.3.0.so.1 +lib/libmico.%%MICOVER%%.so +lib/libmico%%MICOVER%%.a +lib/libmico%%MICOVER%%.so.1 +lib/libmicoaux.%%MICOVER%%.so +lib/libmicoaux%%MICOVER%%.a +lib/libmicoaux%%MICOVER%%.so.1 +lib/libmicocoss%%MICOVER%%.a +lib/libmicogtk.%%MICOVER%%.so +lib/libmicogtk%%MICOVER%%.a +lib/libmicogtk%%MICOVER%%.so.1 +lib/libmicoqt.%%MICOVER%%.so +lib/libmicoqt%%MICOVER%%.a +lib/libmicoqt%%MICOVER%%.so.1 +lib/libmicotcl.%%MICOVER%%.so +lib/libmicotcl%%MICOVER%%.a +lib/libmicotcl%%MICOVER%%.so.1 +lib/libmicox.%%MICOVER%%.so +lib/libmicox%%MICOVER%%.a +lib/libmicox%%MICOVER%%.so.1 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R lib/mico-setup.csh @@ -507,8 +505,40 @@ share/doc/mico/examples/shlib/client.cc share/doc/mico/examples/shlib/hello share/doc/mico/examples/shlib/hello.idl share/doc/mico/examples/shlib/server.cc +share/doc/mico/examples/siegel/Makefile share/doc/mico/examples/siegel/README -share/doc/mico/examples/siegel/diffs +share/doc/mico/examples/siegel/central/DepotData.cc +share/doc/mico/examples/siegel/central/DepotData.h +share/doc/mico/examples/siegel/central/DepotImpl.cc +share/doc/mico/examples/siegel/central/DepotImpl.h +share/doc/mico/examples/siegel/central/Makefile +share/doc/mico/examples/siegel/central/TreeNode.h +share/doc/mico/examples/siegel/central/depot.dat +share/doc/mico/examples/siegel/central/depot_server.cc +share/doc/mico/examples/siegel/idl/Central.idl +share/doc/mico/examples/siegel/idl/Makefile +share/doc/mico/examples/siegel/idl/POS.idl +share/doc/mico/examples/siegel/idl/Store.idl +share/doc/mico/examples/siegel/pos/InputMediaImpl.cc +share/doc/mico/examples/siegel/pos/InputMediaImpl.h +share/doc/mico/examples/siegel/pos/Makefile +share/doc/mico/examples/siegel/pos/OutputMediaImpl.cc +share/doc/mico/examples/siegel/pos/OutputMediaImpl.h +share/doc/mico/examples/siegel/pos/POSTerminalImpl.cc +share/doc/mico/examples/siegel/pos/POSTerminalImpl.h +share/doc/mico/examples/siegel/pos/POS_Client.cc +share/doc/mico/examples/siegel/pos/POS_Server.cc +share/doc/mico/examples/siegel/primer_utils/Makefile +share/doc/mico/examples/siegel/primer_utils/NsPublisher.cc +share/doc/mico/examples/siegel/primer_utils/NsPublisher.h +share/doc/mico/examples/siegel/store/Makefile +share/doc/mico/examples/siegel/store/StoreAccessImpl.cc +share/doc/mico/examples/siegel/store/StoreAccessImpl.h +share/doc/mico/examples/siegel/store/StoreImpl.cc +share/doc/mico/examples/siegel/store/StoreImpl.h +share/doc/mico/examples/siegel/store/TaxImpl.cc +share/doc/mico/examples/siegel/store/TaxImpl.h +share/doc/mico/examples/siegel/store/store_server.cc share/doc/mico/examples/ssl/Makefile share/doc/mico/examples/ssl/cert.pem share/doc/mico/examples/ssl/client.cc @@ -518,6 +548,11 @@ share/doc/mico/examples/ssl/server.cc share/doc/mico/examples/ssl/ssl share/doc/mico/manual.ps @dirrm share/doc/mico/examples/ssl +@dirrm share/doc/mico/examples/siegel/store +@dirrm share/doc/mico/examples/siegel/primer_utils +@dirrm share/doc/mico/examples/siegel/pos +@dirrm share/doc/mico/examples/siegel/idl +@dirrm share/doc/mico/examples/siegel/central @dirrm share/doc/mico/examples/siegel @dirrm share/doc/mico/examples/shlib @dirrm share/doc/mico/examples/services/trader |