3 files changed, 27 insertions, 11 deletions

diff --git a/devel/ilu/Makefile b/devel/ilu/Makefile
index fd635141b5a7..50a6af6f7721 100644
--- a/devel/ilu/Makefile
+++ b/devel/ilu/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29.9.1997
 # Whom:                 cracauer@cons.org "Martin Cracauer"
 #
-# $Id: Makefile,v 1.10 1998/08/20 21:28:09 hoek Exp $
+# $Id: Makefile,v 1.11 1998/08/22 04:45:03 hoek Exp $
 #
 
 DISTNAME=	ilu-2.0alpha12
@@ -11,17 +11,15 @@ PKGNAME=	ilu-2.0a12
 CATEGORIES=	devel
 MASTER_SITES=	ftp://parcftp.xerox.com/pub/ilu/2.0a12/
 
-MAINTAINER=	cracauer@cons.org
+PATCH_SITES=	http://www2.cons.org:8000/freebsd-distfiles/
+PATCHFILES=	${DISTNAME}-patches.html.gz
 
-NO_PACKAGE=	Doesn't work with optimization enabled
+MAINTAINER=	cracauer@cons.org
 
-# The official guile port is outdated. If you have 1.2 installed, remove
-#   --disable-guile-support
-CONFIGURE_ARGS=	--disable-guile-support --enable-http-protocol
+CONFIGURE_ARGS=	--enable-http-protocol --enable-os-threads=posix
 
 NO_WRKSUBDIR=	yes
 HAS_CONFIGURE=	yes
-# Actually GNU_CONFIGURE
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/ilu
 
 INSTALL_TARGET=	Install
@@ -31,6 +29,9 @@ PLIST=		${WRKSRC}/PLIST
 startup_dir=	${PREFIX}/etc/rc.d
 startup_script=	${startup_dir}/50.ilu.sh
 
+post-patch:
+	${PATCH} ${PATCH_DIST_ARGS} < ${SHLIBPATCH}
+
 do-install:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	# Empty dir, but we really need it
@@ -63,3 +64,17 @@ do-install:
 	${startup_script}
 
 .include <bsd.port.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+SHLIBPATCH=files/shlib-elf.patch
+# The FreeBSD Java Development Kit is still in aout object format.
+# You might want to enable it if you have an ELF JDK and/or build
+# a seperate aout ILU runtime to use with Java.
+CONFIGURE_ARGS+=	--disable-java-support 
+.else
+SHLIBPATCH=files/shlib-aout.patch
+# Java support on -stable does not work (ILU runtime dumps core).
+# You might want to enable it if you know what you are doing.
+# Maybe taking -O out of patches/patch-1-cra-cflags help.
+CONFIGURE_ARGS+=	--disable-java-support 
+.endif
diff --git a/devel/ilu/distinfo b/devel/ilu/distinfo
index a81dcf835a5c..f0b1b8e478b5 100644
--- a/devel/ilu/distinfo
+++ b/devel/ilu/distinfo
@@ -1 +1,2 @@
 MD5 (ilu-2.0alpha12.tar.gz) = 1bf3ed2fb4629d977239278dd1bcbd19
+MD5 (ilu-2.0alpha12-patches.html.gz) = c38f20dd5186a9ed2b36eaadf059c8e2
diff --git a/devel/ilu/pkg-descr b/devel/ilu/pkg-descr
index dae7c9bf5da8..41dde2230fda 100644
--- a/devel/ilu/pkg-descr
+++ b/devel/ilu/pkg-descr
@@ -23,10 +23,10 @@ and various other things.  ILU is provided free for unrestricted use.
 
 FreeBSD port notes:
 - I enabled http protocol support by default.
-- Official ILU patches are turned into port patches.
+- Official ILU patches are not fetched from PARC, but I hold a proven
+  snapshot at one of my own sites.
 - configure --bindir/--mandir doesn't work with current ILU version.
   I make symbolic links to ${PREFIX}/{bin,man}.
 - The FreeBSD port builds shareds libs for C libraries.
-- jdk-1.1 for FreeBSD works, 1.0.2 is not supported.
-- guile support is diabled. You need guile-1.2 with slib, then
-  remove -"-disable-guile-support" from Makefile to built with guile
+- jdk-1.1 for FreeBSD works, but is disabled by default because the
+  FreeBSD jdk is still in aout object format.