summaryrefslogtreecommitdiff
path: root/devel/mico
diff options
context:
space:
mode:
authorMarc G. Fournier <scrappy@FreeBSD.org>1998-11-15 07:08:22 +0000
committerMarc G. Fournier <scrappy@FreeBSD.org>1998-11-15 07:08:22 +0000
commitc1f82c6f50a41bedd052068320923c70d646f0f9 (patch)
tree3cfd817b8608dda1d9df0adb50ce7ba13d81fa07 /devel/mico
parentMark BROKEN. Depends on broken gnomelibs. (diff)
Okay...
Fix Makefile: to use bsd.port.{pre.post}.mk check for proper libstdc++.a, depending on elf or aout run autoconf before configure Remove old patches and add: patch-ak search and find tcl8.0 header file setup shared library extension properly according to elf vs aout patch-al properly find gtk.h Leaving it as marked BROKEN, while I continue to figure out thie elf vs aout stuff ...
Notes
Notes: svn path=/head/; revision=14527
Diffstat (limited to 'devel/mico')
-rw-r--r--devel/mico/Makefile20
-rw-r--r--devel/mico/files/patch-ak23
2 files changed, 39 insertions, 4 deletions
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 48a7aaec27e2..3a8ae5232ae3 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -3,7 +3,7 @@
# Date created: 11 July 1998
# Whom: Marc G. Fournier <scrappy@freebsd.org>
#
-# $Id: Makefile,v 1.21 1998/11/13 13:15:18 scrappy Exp $
+# $Id: Makefile,v 1.22 1998/11/14 17:50:16 jseger Exp $
#
DISTNAME= mico-2.2.3
@@ -14,10 +14,19 @@ MAINTAINER= scrappy@freebsd.org
BROKEN_ELF= yes
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+LIBSTDC= ${PREFIX}/lib/gcc-lib/i386-unknown-freebsdelf${OSREL}/2.8.1/libstdc++.a
+.else
+LIBSTDC= ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd${OSREL}/2.8.1/libstdc++.a
+.endif
+
LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk \
- tcl80.1:${PORTSDIR}/lang/tcl80
+ tcl80.1:${PORTSDIR}/lang/tcl80
BUILD_DEPENDS= g++28:${PORTSDIR}/lang/gcc28 \
- ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd${OSREL}/2.8.1/libstdc++.a:${PORTSDIR}/lang/glibstdc++28
+ ${LIBSTDC}:${PORTSDIR}/lang/glibstdc++28 \
+ autoconf:${PORTSDIR}/devel/autoconf
CC= gcc28
CXX= g++28
@@ -35,7 +44,10 @@ MAN1= idl.1 imr.1 nsadmin.1
MAN5= micorc.5
MAN8= ird.8 micod.8 nsd.8
+pre-configure:
+ cd ${WRKSRC}; autoconf
+
post-install:
${LDCONFIG} -m ${PREFIX}/lib
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/mico/files/patch-ak b/devel/mico/files/patch-ak
new file mode 100644
index 000000000000..b3c00c943153
--- /dev/null
+++ b/devel/mico/files/patch-ak
@@ -0,0 +1,23 @@
+--- configure.in.orig Sun Nov 15 03:01:35 1998
++++ configure.in Sun Nov 15 02:52:12 1998
+@@ -102,7 +102,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 $QTDIR $GTKDIR $TCLDIR $SSLDIR, tcl8.0)
+
+ #
+ # misc
+@@ -234,7 +234,10 @@
+ CONF_OBJ_SIZE_LIMIT=yes
+ ;;
+ *bsd*)
+- CONF_SOEXT=so.1.0
++ if [ "$PORTOBJFORMAT" = "elf" ]; then
++ CONF_SOEXE=so.1
++ else
++ CONF_SOEXT=so.1.0
+ fi
+ ;;
+ *cygwin32*)