1 files changed, 28 insertions, 25 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 5228994d4a17..82a5a4189bc2 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clisp
 PORTVERSION=	2.49
+PORTREVISION=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	GNU/${PORTNAME}/release/${PORTVERSION}
 
@@ -21,12 +22,13 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GNU-GPL
 
 USE_ICONV=	yes
+USE_LDCONFIG=	yes
 USE_GHOSTSCRIPT_BUILD=	yes
 WANT_GNOME=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \
 		--elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \
-		--docdir="${DOCSDIR} --with-dynamic-modules=no"
+		--docdir="${DOCSDIR}"
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
 # Complaints if the environment changes between build stages.
@@ -37,22 +39,21 @@ CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS=	BDB "Build Berkeley Database module" off \
-		CLX_MIT "Build X11 module (original MIT version)" off \
-		CLX_NEW "Build X11 module (new faster version)" off \
+OPTIONS=	BDB "Build Berkeley Database module" Off \
+		CLX_MIT "Build X11 module (original MIT version)" Off \
+		CLX_NEW "Build X11 module (new faster version)" Off \
 		DBUS "D-BUS control module" Off \
-		FASTCGI "Build FastCGI module" off \
-		GDBM "Build GNU Database manager module" off \
-		GTK2 "Build Gtk+2 module" off \
-		ORACLE "Build Oracle database module" off \
-		PARI "Build PARI (math and calc lib) module" off \
-		PCRE "Build PCRE (Perl Compatible Regexp) module" off \
-		PGSQL "Build PostgreSQL database module" off \
-		RAWSOCK "Build Raw Socket Access module" on \
-		SVM "Enable Support Vector Machines module" off \
+		FASTCGI "Build FastCGI module" Off \
+		GDBM "Build GNU Database manager module" Off \
+		GTK2 "Build Gtk+2 module" Off \
+		PARI "Build PARI (math and calc lib) module" Off \
+		PCRE "Build PCRE (Perl Compatible Regexp) module" Off \
+		PGSQL "Build PostgreSQL database module" Off \
+		RAWSOCK "Build Raw Socket Access module" On \
+		SVM "Enable Support Vector Machines module" Off \
 		THREADS "Enable multithreaded (Experimental)" Off \
-		WILDCARD "Build wildcard matching module" on \
-		ZLIB "Build ZLib interface module " off
+		WILDCARD "Build wildcard matching module" On \
+		ZLIB "Build ZLib interface module " On
 
 MAN1=		clisp.1 clisp-link.1
 SUB_FILES=	pkg-message
@@ -64,12 +65,16 @@ SUB_FILES=	pkg-message
 CONFIGURE_ARGS+=--disable-mmap
 .endif
 
+.if ${OSVERSION} < 700000
+BROKEN=		Does not build on FreeBSD 6.x
+.endif
+
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
-MODULES=	BDB CLX_MIT CLX_NEW DBUS FASTCGI GDBM GTK2 ORACLE PARI PCRE \
-		PGSQL RAWSOCK SVM WILDCARD ZLIB
+MODULES=	BDB CLX_NEW CLX_MIT DBUS FASTCGI GDBM GTK2 PARI PCRE PGSQL \
+		RAWSOCK SVM WILDCARD ZLIB
 
 .for mod in ${MODULES}
 .   if defined(WITH_${mod})
@@ -127,14 +132,6 @@ USE_GNOME=	gtk20 libglade2
 CONFIGURE_ARGS+=--with-module=gtk2
 .endif
 
-.if defined(WITH_ORACLE)
-BUILD_DEPENDS+=	${ORACLE_HOME}:${PORTSDIR}/databases/oracle8-client
-CONFIGURE_ARGS+=--with-module=oracle
-CPPFLAGS+=	-I${ORACLE_HOME}/rdbms/demo -I${ORACLE_HOME}/rdbms/public
-LDFLAGS+=	-L${ORACLE_HOME}/lib
-ORACLE_HOME?=	${LOCALBASE}/oracle8-client
-.endif
-
 .if defined(WITH_PARI)
 LIB_DEPENDS+=	pari-gmp.2:${PORTSDIR}/math/pari
 CONFIGURE_ARGS+=--with-module=pari
@@ -179,6 +176,12 @@ post-patch:
 		${WRKSRC}/modules/oracle/link.sh
 .endif
 
+pre-install:
+.if defined(WITH_CLX_MIT)
+	${CP} ${WRKSRC}/modules/clx/mit-clx/README.CLISP \
+		${WRKSRC}/src/clx/mit-clx/README.CLISP
+.endif
+
 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}