1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-17 08:01:36 +00:00

Unbreak by updating to 2.3.9

Removed most of the optional dependencies.
Reset Maintainer to ports

Note: I did not test, if the port works but at least it builds now.

PR:		37903,36838
Submitted by:	arved, Alex Zykov <az@ci.nnov.ru>
Approved by: 	Maintainer timeout (ca. 10 months)
This commit is contained in:
Tilman Keskinoz 2003-02-22 17:21:07 +00:00
parent bdbb3bc341
commit ffe44cb012
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=76181
8 changed files with 571 additions and 791 deletions

View File

@ -6,70 +6,58 @@
#
PORTNAME= mico
PORTVERSION= 2.3.1
PORTVERSION= 2.3.9
CATEGORIES= devel
MASTER_SITES= http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/
MASTER_SITES= http://www.mico.org/
MAINTAINER= scrappy@freebsd.org
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82
WRKSRC= ${WRKDIR}/mico
MICOVER= `${ECHO_CMD} ${DISTNAME} | ${SED} 's/mico-//'`
.if defined(QT2)
USE_QT_VER= 2
MAKE_ENV= QT_INCLUDES="${X11BASE}/include/qt2" \
QTVER="2"
CONFIGURE_ENV= QTVER="2"
.else
#USE_QT_VER= 1
#MAKE_ENV= QT_INCLUDES="${X11BASE}/include/X11/qt" \
# QTVER=""
#CONFIGURE_ENV= QTVER=""
.endif
BROKEN= "Needs someone to test with Qt2 support as Qt1 is gone."
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_GNOMENG= yes
USE_GNOME= gtk12
USE_AUTOCONF= yes
CONFIGURE_ARGS= --with-qt --with-gtk --with-tcl --disable-mini-stl \
--enable-static --enable-shared
PLIST_SUB= MICOVER="${MICOVER}"
WRKSRC= ${WRKDIR}/mico
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GCC= 2.95
CONIFUGRE_ARGS+= --enable-minimum-corba --enable-cd \
--disable-mini-stl \
MAN1= idl.1 imr.1 nsadmin.1
MAN5= micorc.5
MAN8= ird.8 micod.8 nsd.8
post-patch:
${REINPLACE_CMD} -e "s,so.1.0,so, ;s,-O2,${CFLAGS}," ${WRKSRC}/configure
post-configure:
${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
${REINPLACE_CMD} -e "s,/doc/,/share/doc/,"
${REINPLACE_CMD} -e "s,/doc/,/share/doc/," ${WRKSRC}/demo/MakeVars
post-install:
${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/libmicocoss${MICOVER}.so.1 ${PREFIX}/lib/libmicocoss.${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
@strip ${PREFIX}/bin/containmentd
@strip ${PREFIX}/bin/eventd
@strip ${PREFIX}/bin/idl
@strip ${PREFIX}/bin/imr
@strip ${PREFIX}/bin/iordump
@strip ${PREFIX}/bin/ird
@strip ${PREFIX}/bin/mico-cpp
@strip ${PREFIX}/bin/micod
@strip ${PREFIX}/bin/noded
@strip ${PREFIX}/bin/nsadmin
@strip ${PREFIX}/bin/nsd
@strip ${PREFIX}/bin/propertyd
@strip ${PREFIX}/bin/proxyd
@strip ${PREFIX}/bin/randomd
@strip ${PREFIX}/bin/referenced
@strip ${PREFIX}/bin/timed
@strip ${PREFIX}/bin/traderd
@strip ${PREFIX}/bin/traversald
${LN} -sf ${PREFIX}/lib/libmico${PORTVERSION}.so.1 ${PREFIX}/lib/libmico.${PORTVERSION}.so
${LN} -sf ${PREFIX}/lib/libmicoaux${PORTVERSION}.so.1 ${PREFIX}/lib/libmicoaux.${PORTVERSION}.so
${LN} -sf ${PREFIX}/lib/libmicocoss${PORTVERSION}.so.1 ${PREFIX}/lib/libmicocoss.${PORTVERSION}.so
${LN} -sf ${PREFIX}/lib/libmicogtk${PORTVERSION}.so.1 ${PREFIX}/lib/libmicogtk.${PORTVERSION}.so
${LN} -sf ${PREFIX}/lib/libmicoqt${PORTVERSION}.so.1 ${PREFIX}/lib/libmicoqt.${PORTVERSION}.so
${LN} -sf ${PREFIX}/lib/libmicotcl${PORTVERSION}.so.1 ${PREFIX}/lib/libmicotcl.${PORTVERSION}.so
${LN} -sf ${PREFIX}/lib/libmicox${PORTVERSION}.so.1 ${PREFIX}/lib/libmicox.${PORTVERSION}.so
@${STRIP_CMD} ${PREFIX}/bin/containmentd
@${STRIP_CMD} ${PREFIX}/bin/eventd
@${STRIP_CMD} ${PREFIX}/bin/idl
@${STRIP_CMD} ${PREFIX}/bin/imr
@${STRIP_CMD} ${PREFIX}/bin/iordump
@${STRIP_CMD} ${PREFIX}/bin/ird
@${STRIP_CMD} ${PREFIX}/bin/mico-cpp
@${STRIP_CMD} ${PREFIX}/bin/micod
@${STRIP_CMD} ${PREFIX}/bin/noded
@${STRIP_CMD} ${PREFIX}/bin/nsadmin
@${STRIP_CMD} ${PREFIX}/bin/nsd
@${STRIP_CMD} ${PREFIX}/bin/propertyd
@${STRIP_CMD} ${PREFIX}/bin/proxyd
@${STRIP_CMD} ${PREFIX}/bin/randomd
@${STRIP_CMD} ${PREFIX}/bin/referenced
@${STRIP_CMD} ${PREFIX}/bin/timed
@${STRIP_CMD} ${PREFIX}/bin/traderd
@${STRIP_CMD} ${PREFIX}/bin/traversald
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (mico-2.3.1.tar.gz) = 24bafbeec3299ab2ac38150914ee16cc
MD5 (mico-2.3.9.tar.gz) = 292a755ce9d3d8856159d4abff29512f

View File

@ -1,34 +0,0 @@
--- 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

View File

@ -1,168 +0,0 @@
--- 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

View File

@ -1,20 +0,0 @@
--- 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/$@ .

View File

@ -1,19 +0,0 @@
--- 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"

View File

@ -1,11 +0,0 @@
--- 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

File diff suppressed because it is too large Load Diff