4 files changed, 22 insertions, 26 deletions

diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index b2187eb5b34a..4223bd2e61aa 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -6,32 +6,24 @@
 # $FreeBSD$
 #
 
-DISTNAME=	rexx-imc-1.6d
+DISTNAME=	rexx-imc-1.7
 CATEGORIES=	lang
-MASTER_SITES=	http://www.comlab.ox.ac.uk/oucl/users/ian.collier/distribution/
+MASTER_SITES=	http://ruby.comlab.ox.ac.uk/imc/distribution/           \
+		ftp://ftp.sai.msu.su/pub/unix/rexx/                     \
+		ftp://crydee.sai.msu.ru/zeus/unix/rexx/
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${DISTNAME}-19990331.patch
+PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-NO_WRKSUBDIR=	YES
-
 MAKE_ENV=	MKDIR="${MKDIR}"
-
-# we must patch these files until the author correct misuse of 
-# errno in struct fileinfo
-UGLY_PATCH=	rexx.c rxfn.c util.c
+MAN1=		rexx.1
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-.for c in ${UGLY_PATCH}
-	@${ECHO_MSG} "Changing struct fileinfo member errno to ferrno in ${c}"
-	@${MV} ${WRKSRC}/${c} ${WRKSRC}/${c}.old
-	@${SED} 's/->errno/->ferrno/g;' ${WRKSRC}/${c}.old > ${WRKSRC}/${c}
-	@${RM} ${WRKSRC}/${c}.old
-.endfor
-
 pre-build:
-		@ ${CP} ${FILESDIR}/Makefile ${WRKDIR}
+		@ ${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
 .if ${PORTOBJFORMAT} == "aout"
diff --git a/lang/rexx-imc/distinfo b/lang/rexx-imc/distinfo
index c7a258567e7c..a1b2172fd5a5 100644
--- a/lang/rexx-imc/distinfo
+++ b/lang/rexx-imc/distinfo
@@ -1 +1,2 @@
-MD5 (rexx-imc-1.6d.tar.gz) = 59e96d3401aed4df9a513fb32f34ce29
+MD5 (rexx-imc-1.7.tar.gz) = 2b55cbe521819e1edf43139125ced03a
+MD5 (rexx-imc-1.7-19990331.patch) = 5c29e511014dd281bf595decaf085a0e
diff --git a/lang/rexx-imc/files/Makefile b/lang/rexx-imc/files/Makefile
index e1e6194e12c8..5ebce4444283 100644
--- a/lang/rexx-imc/files/Makefile
+++ b/lang/rexx-imc/files/Makefile
@@ -1,12 +1,12 @@
-# Makefile for REXX/imc
+# Makefile for REXX/imc-1.6?
 #
 # Based upon the original by the author
 # Heavily hacked by jfitz@FreeBSD.ORG
 #
 
-CC=		gcc
+CC?=		gcc
 PIC=		-fPIC
-CCFLAGS=	-DHAS_TTYCOM -D_REQUIRED -c ${PIC}
+CCFLAGS=	-DHAS_TTYCOM -D_REQUIRED -DRENAME_UNDELETE -c ${PIC}
 
 OPTFLAGS=	-O2
 
@@ -16,8 +16,8 @@ RXMONTH=	8
 RXYEAR=		96
 DATE=		-DDAY=${RXDAY} -DMONTH=${RXMONTH} -DYEAR=${RXYEAR}
 
-REXXDOCS=	README README.avail README.bugreport README.docs \
-		README.files README.make README.news README.versions \
+REXXDOCS=	README README.bugreport README.docs \
+		README.files README.make README.news README.platforms \
 		rexx.info rexx.ref rexx.summary rexx.tech
 
 # Shared Library Version
@@ -38,7 +38,7 @@ FILEDEFS=	-DREXXIMC=\"${REXXIMC}\"
 LIBFILES=	rexx.o rxfn.o calc.o util.o shell.o interface.o globals.o
 HFILES=		const.h globals.h functions.h rexxsaa.h
 
-all:		rexx rxque rxstack ${MATH}
+all:		rexx rxque rxstack ${MATH} rexx.1
 
 interface.o:	interface.c ${HFILES}
 		${CC} ${OPTFLAGS} ${CCFLAGS} -c ${DATE} ${FILEDEFS} -o $@ interface.c
@@ -67,6 +67,9 @@ rxmathfn.rxfn:	rxmathfn.o ${HFILES}
 interface.o:	interface.c ${HFILES}
 		${CC} ${OPTFLAGS} ${CCFLAGS} -o interface.o ${FILEDEFS} interface.c
 
+rexx.1: rexx.1.in
+		sed -e "s|@REXXLIBDIR@|${PREFIX}/bin|" rexx.1.in > rexx.1
+
 install:
 		@strip ${SHAREDLIBS} rxmathfn.rxfn
 .for f in rexx rxque rxstack
@@ -84,6 +87,7 @@ install:
 .for f in ${REXXDOCS}
 		${BSD_INSTALL_DATA} ${f} ${PREFIX}/share/doc/rexx-imc/
 .endfor
+		${BSD_INSTALL_DATA} rexx.1 ${PREFIX}/man/man1
 .endif
 
 .c.o:
diff --git a/lang/rexx-imc/pkg-plist b/lang/rexx-imc/pkg-plist
index 9c9ace5f3d76..fc3740888f52 100644
--- a/lang/rexx-imc/pkg-plist
+++ b/lang/rexx-imc/pkg-plist
@@ -10,13 +10,12 @@ include/rexxsaa.h
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/doc/rexx-imc/README
-share/doc/rexx-imc/README.avail
 share/doc/rexx-imc/README.bugreport
 share/doc/rexx-imc/README.docs
 share/doc/rexx-imc/README.files
 share/doc/rexx-imc/README.make
 share/doc/rexx-imc/README.news
-share/doc/rexx-imc/README.versions
+share/doc/rexx-imc/README.platforms
 share/doc/rexx-imc/rexx.info
 share/doc/rexx-imc/rexx.ref
 share/doc/rexx-imc/rexx.summary