6 files changed, 33 insertions, 6 deletions

diff --git a/devel/cl-infix-clisp/Makefile b/devel/cl-infix-clisp/Makefile
index ed0af9a4b044..a5de1e998a7a 100644
--- a/devel/cl-infix-clisp/Makefile
+++ b/devel/cl-infix-clisp/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	infix
 PORTVERSION=	19960628
+PORTREVISION=	1
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile
index 800afb303922..ef1ad591301c 100644
--- a/devel/cl-infix-sbcl/Makefile
+++ b/devel/cl-infix-sbcl/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	infix
 PORTVERSION=	19960628
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
@@ -23,7 +23,5 @@ USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-BROKEN=		does not build with current lang/sbcl
-
 .include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-infix/Makefile b/devel/cl-infix/Makefile
index ba7856331853..214990c00d7e 100644
--- a/devel/cl-infix/Makefile
+++ b/devel/cl-infix/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	infix
 PORTVERSION=	19960628
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel lisp
 MASTER_SITES=	http://ftp.linux.org.uk/pub/lisp/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
@@ -24,9 +24,12 @@ NO_CDROM=	No fees or compensation can be charged
 
 USE_ASDF=	yes
 
+post-extract:
+	@${MV} ${WRKSRC}/infix.cl ${WRKSRC}/infix.lisp
+
 do-install:
 	@${MKDIR} ${ASDF_PATHNAME}
-	@${INSTALL_DATA} ${WRKSRC}/*.cl ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/infix.asd ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/infix.system ${ASDF_PATHNAME}
 	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
diff --git a/devel/cl-infix/files/patch-infix.asd b/devel/cl-infix/files/patch-infix.asd
new file mode 100644
index 000000000000..e1ffd431a083
--- /dev/null
+++ b/devel/cl-infix/files/patch-infix.asd
@@ -0,0 +1,11 @@
+
+$FreeBSD$
+
+--- infix.asd.orig
++++ infix.asd
+@@ -16,4 +16,4 @@
+ 	       (:static-file "COPYING")))
+ 
+ (defmethod source-file-type ((f cl-source-file) (s (eql (find-system 'infix))))
+-  "cl")
++  "lisp")
diff --git a/devel/cl-infix/files/patch-infix.system b/devel/cl-infix/files/patch-infix.system
new file mode 100644
index 000000000000..94745f09b5bf
--- /dev/null
+++ b/devel/cl-infix/files/patch-infix.system
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- infix.system.orig
++++ infix.system
+@@ -2,7 +2,7 @@
+ 
+ (mk:defsystem infix
+   :source-pathname "cl-library:infix;"
+-  :source-extension "cl"
++  :source-extension "lisp"
+   :binary-pathname nil
+   :binary-extension nil
+   :components ((:file "infix")))
diff --git a/devel/cl-infix/pkg-plist b/devel/cl-infix/pkg-plist
index e7dbd04ad2e7..e74a7b624c18 100644
--- a/devel/cl-infix/pkg-plist
+++ b/devel/cl-infix/pkg-plist
@@ -1,6 +1,6 @@
 lib/common-lisp/system-registry/infix.asd
 lib/common-lisp/infix/infix.asd
-lib/common-lisp/infix/infix.cl
+lib/common-lisp/infix/infix.lisp
 lib/common-lisp/infix/infix.system
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/infix.3lisp