4 files changed, 127 insertions, 121 deletions

diff --git a/lang/eiffel/Makefile b/lang/eiffel/Makefile
index 6fd1a902b26c..22a8db932f41 100644
--- a/lang/eiffel/Makefile
+++ b/lang/eiffel/Makefile
@@ -9,11 +9,25 @@ PORTNAME=	eiffel
 PORTVERSION=	13a
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cm.cf.ac.uk/pub/Eiffel/SIG/Eiffel-S-1.3/BSD/
-DISTNAME=	eiffels13a
+DISTNAME=	${PORTNAME}s${PORTVERSION}
 EXTRACT_SUFX=	.freebsd.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/eiffel
+WRKSRC=		${WRKDIR}/${PORTNAME}
+NO_BUILD=	yes
+
+FILES=		IAFA-PACKAGE bin doc eiffels.20 examples install.freebsd \
+		introduction library readme.1st register.txt run3 \
+		sharewar.txt source
+
+do-configure:
+	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
+		${FILESDIR}/ecc.sh > ${WRKSRC}/ecc.sh
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/ecc.sh ${PREFIX}/bin/ecc
+	@${MKDIR} ${PREFIX}/eiffel
+	cd ${WRKSRC} && pax -rw ${FILES} ${PREFIX}/eiffel
 
 .include <bsd.port.mk>
diff --git a/lang/eiffel/files/ecc.sh b/lang/eiffel/files/ecc.sh
new file mode 100644
index 000000000000..a6eb22af8393
--- /dev/null
+++ b/lang/eiffel/files/ecc.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+PATH=$PATH:%%PREFIX%%/eiffel/bin
+EIFFEL_S=%%PREFIX%%/eiffel
+
+export EIFFEL_S PATH
+
+exec %%PREFIX%%/eiffel/bin/ecc $*
diff --git a/lang/eiffel/files/patch-aa b/lang/eiffel/files/patch-aa
deleted file mode 100644
index 2ccd2f947019..000000000000
--- a/lang/eiffel/files/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-*** Makefile~	Thu Sep 14 09:17:08 1995
---- Makefile	Thu Sep 14 09:58:57 1995
-***************
-*** 0 ****
---- 1,15 ----
-+ 
-+ 
-+ FILES= IAFA-PACKAGE install.freebsd run3 bin introduction sharewar.txt doc \
-+        library eiffels.20 readme.1st source examples register.txt
-+ 
-+ all: ecc
-+ 
-+ ecc: ecc.sh
-+ 	sed 's:@PREFIX@:${PREFIX}:' ecc.sh >$@
-+ 	chmod +x $@
-+ 
-+ install:
-+ 	-mkdir ${PREFIX}/eiffel
-+ 	pax -rw ${FILES} ${PREFIX}/eiffel
-+ 	cp ecc ${PREFIX}/bin
-*** ecc.sh~	Thu Sep 14 09:17:39 1995
---- ecc.sh	Thu Sep 14 09:21:23 1995
-***************
-*** 0 ****
---- 1,7 ----
-+ #!/bin/sh
-+ PATH=$PATH:@PREFIX@/eiffel/bin
-+ EIFFEL_S=@PREFIX@/eiffel
-+ 
-+ export EIFFEL_S PATH
-+ 
-+ exec @PREFIX@/eiffel/bin/ecc $*
diff --git a/lang/eiffel/pkg-plist b/lang/eiffel/pkg-plist
index b9eaade01438..7eb9a45258ac 100644
--- a/lang/eiffel/pkg-plist
+++ b/lang/eiffel/pkg-plist
@@ -1,4 +1,11 @@
 bin/ecc
+eiffel/IAFA-PACKAGE
+eiffel/bin/default.pdl
+eiffel/bin/ecc
+eiffel/bin/ecca
+eiffel/bin/eccb
+eiffel/bin/eif2bin
+eiffel/bin/ercc
 eiffel/doc/biblio.man
 eiffel/doc/books
 eiffel/doc/comp1.man
@@ -18,23 +25,75 @@ eiffel/doc/lib6a.man
 eiffel/doc/lib6b.man
 eiffel/doc/problems.doc
 eiffel/doc/rel1_3.man
-eiffel/bin/eif2bin
-eiffel/bin/default.pdl
-eiffel/bin/ercc
-eiffel/bin/ecc
-eiffel/bin/eccb
-eiffel/bin/ecca
-eiffel/run3/eiffel.h
-eiffel/run3/run3dbg.a
-eiffel/run3/run3opt.a
-eiffel/register.txt
-eiffel/sharewar.txt
 eiffel/eiffels.20
-eiffel/source/eclean.e
-eiffel/source/eclean.pdl
-eiffel/readme.1st
+eiffel/examples/basic/m_demo.e
+eiffel/examples/basic/m_demo.pdl
+eiffel/examples/basic/n_demo.e
+eiffel/examples/basic/n_demo.pdl
+eiffel/examples/basic/readme
+eiffel/examples/basic/sqmatrix.e
+eiffel/examples/contain/interact.e
+eiffel/examples/contain/listrace.e
+eiffel/examples/contain/listrace.pdl
+eiffel/examples/contain/lnk_iter.e
+eiffel/examples/contain/lnk_list.e
+eiffel/examples/contain/lnk_node.e
+eiffel/examples/contain/readme
+eiffel/examples/contain/sampler.e
+eiffel/examples/contain/sampler.pdl
+eiffel/examples/files/interact.e
+eiffel/examples/files/psdo_ed.e
+eiffel/examples/files/psdo_ed.pdl
+eiffel/examples/files/psdo_sh.e
+eiffel/examples/files/psdo_sh.pdl
+eiffel/examples/files/readme
+eiffel/examples/objects/demo.e
+eiffel/examples/objects/demo.pdl
+eiffel/examples/objects/probj.e
+eiffel/examples/objects/readme
+eiffel/examples/sorter/data
+eiffel/examples/sorter/interact.e
+eiffel/examples/sorter/qsorter.e
+eiffel/examples/sorter/readme
+eiffel/examples/sorter/sortrace.e
+eiffel/examples/sorter/sortrace.hlp
+eiffel/examples/sorter/sortrace.pdl
+eiffel/install.freebsd
+eiffel/introduction/about.txt
+eiffel/introduction/assertio.htm
+eiffel/introduction/books
+eiffel/introduction/chapt1.txt
+eiffel/introduction/chapt10.txt
+eiffel/introduction/chapt11.txt
+eiffel/introduction/chapt2.txt
+eiffel/introduction/chapt3.txt
+eiffel/introduction/chapt5.txt
+eiffel/introduction/chapt6.txt
+eiffel/introduction/chapt7.txt
+eiffel/introduction/chapt8.txt
+eiffel/introduction/chapt9.txt
+eiffel/introduction/classes_.htm
+eiffel/introduction/deferred.htm
+eiffel/introduction/design_m.htm
+eiffel/introduction/exceptio.htm
+eiffel/introduction/generici.htm
+eiffel/introduction/geninh_m.htm
+eiffel/introduction/inherita.htm
+eiffel/introduction/polymorp.htm
+eiffel/introduction/principl.htm
+eiffel/introduction/review.txt
+eiffel/introduction/types_ma.htm
+eiffel/library/basic/any.e
+eiffel/library/basic/array.e
+eiffel/library/basic/basic_io.e
+eiffel/library/basic/bit_n.e
+eiffel/library/basic/bool_ref.e
+eiffel/library/basic/boolean.e
+eiffel/library/basic/char_ref.e
+eiffel/library/basic/characte.e
+eiffel/library/basic/compar.e
+eiffel/library/basic/environ.e
 eiffel/library/basic/es3_spec.e
-eiffel/library/basic/sys_time.e
 eiffel/library/basic/except.e
 eiffel/library/basic/file.e
 eiffel/library/basic/file_sys.e
@@ -42,28 +101,19 @@ eiffel/library/basic/format.e
 eiffel/library/basic/fsys_dat.e
 eiffel/library/basic/general.e
 eiffel/library/basic/hashable.e
+eiffel/library/basic/int_ref.e
 eiffel/library/basic/integer.e
-eiffel/library/basic/compar.e
 eiffel/library/basic/internal.e
-eiffel/library/basic/int_ref.e
 eiffel/library/basic/none.e
+eiffel/library/basic/numeric.e
 eiffel/library/basic/objstruc.e
+eiffel/library/basic/partcomp.e
 eiffel/library/basic/platform.e
 eiffel/library/basic/real.e
 eiffel/library/basic/real_ref.e
 eiffel/library/basic/string.e
+eiffel/library/basic/sys_time.e
 eiffel/library/basic/textfile.e
-eiffel/library/basic/partcomp.e
-eiffel/library/basic/numeric.e
-eiffel/library/basic/any.e
-eiffel/library/basic/array.e
-eiffel/library/basic/basic_io.e
-eiffel/library/basic/bit_n.e
-eiffel/library/basic/boolean.e
-eiffel/library/basic/bool_ref.e
-eiffel/library/basic/characte.e
-eiffel/library/basic/char_ref.e
-eiffel/library/basic/environ.e
 eiffel/library/contain/array2.ce
 eiffel/library/contain/catalog.ce
 eiffel/library/contain/colctn.ce
@@ -97,63 +147,30 @@ eiffel/library/contain/tw_trvrs.ce
 eiffel/library/contain/twi_iter.ce
 eiffel/library/lib.lib
 eiffel/library/lib.pdl
-eiffel/library/sorter/sorter.ce
 eiffel/library/math/math.e
-eiffel/examples/basic/readme
-eiffel/examples/basic/n_demo.e
-eiffel/examples/basic/m_demo.e
-eiffel/examples/basic/sqmatrix.e
-eiffel/examples/basic/m_demo.pdl
-eiffel/examples/basic/n_demo.pdl
-eiffel/examples/contain/readme
-eiffel/examples/contain/listrace.pdl
-eiffel/examples/contain/sampler.pdl
-eiffel/examples/contain/interact.e
-eiffel/examples/contain/listrace.e
-eiffel/examples/contain/lnk_iter.e
-eiffel/examples/contain/lnk_list.e
-eiffel/examples/contain/lnk_node.e
-eiffel/examples/contain/sampler.e
-eiffel/examples/files/readme
-eiffel/examples/files/psdo_sh.pdl
-eiffel/examples/files/psdo_ed.pdl
-eiffel/examples/files/interact.e
-eiffel/examples/files/psdo_ed.e
-eiffel/examples/files/psdo_sh.e
-eiffel/examples/objects/probj.e
-eiffel/examples/objects/demo.e
-eiffel/examples/objects/readme
-eiffel/examples/objects/demo.pdl
-eiffel/examples/sorter/interact.e
-eiffel/examples/sorter/qsorter.e
-eiffel/examples/sorter/sortrace.hlp
-eiffel/examples/sorter/sortrace.e
-eiffel/examples/sorter/readme
-eiffel/examples/sorter/sortrace.pdl
-eiffel/examples/sorter/data
-eiffel/introduction/about.txt
-eiffel/introduction/assertio.htm
-eiffel/introduction/books
-eiffel/introduction/chapt1.txt
-eiffel/introduction/chapt10.txt
-eiffel/introduction/chapt11.txt
-eiffel/introduction/chapt2.txt
-eiffel/introduction/chapt3.txt
-eiffel/introduction/chapt5.txt
-eiffel/introduction/chapt6.txt
-eiffel/introduction/chapt7.txt
-eiffel/introduction/chapt8.txt
-eiffel/introduction/chapt9.txt
-eiffel/introduction/classes_.htm
-eiffel/introduction/deferred.htm
-eiffel/introduction/design_m.htm
-eiffel/introduction/exceptio.htm
-eiffel/introduction/generici.htm
-eiffel/introduction/geninh_m.htm
-eiffel/introduction/inherita.htm
-eiffel/introduction/polymorp.htm
-eiffel/introduction/principl.htm
-eiffel/introduction/review.txt
-eiffel/introduction/types_ma.htm
-eiffel/IAFA-PACKAGE
-eiffel/install.freebsd
+eiffel/library/sorter/sorter.ce
+eiffel/readme.1st
+eiffel/register.txt
+eiffel/run3/eiffel.h
+eiffel/run3/run3dbg.a
+eiffel/run3/run3opt.a
+eiffel/sharewar.txt
+eiffel/source/eclean.e
+eiffel/source/eclean.pdl
+@dirrm eiffel/source
+@dirrm eiffel/run3
+@dirrm eiffel/library/sorter
+@dirrm eiffel/library/math
+@dirrm eiffel/library/contain
+@dirrm eiffel/library/basic
+@dirrm eiffel/library
+@dirrm eiffel/introduction
+@dirrm eiffel/examples/sorter
+@dirrm eiffel/examples/objects
+@dirrm eiffel/examples/files
+@dirrm eiffel/examples/contain
+@dirrm eiffel/examples/basic
+@dirrm eiffel/examples
+@dirrm eiffel/doc
+@dirrm eiffel/bin
+@dirrm eiffel