Date: Wed, 21 Apr 1999 18:29:34 -0700 (PDT) From: pfgiffun@bachue.usc.unal.edu.co To: freebsd-gnats-submit@freebsd.org Subject: ports/11270: Update to the rexx-imc port Message-ID: <19990422012934.0E65815348@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 11270 >Category: ports >Synopsis: Update to the rexx-imc port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 21 18:30:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Pedro F Giffuni >Release: 3.1R >Organization: Universidad Nacional de Colombia >Environment: >Description: I had some contact with the rexx-imc author and he states that most patches in the previous distribution can be removed in his new version. BTW, this was also tested with egcs, so it should give no problems in -current >How-To-Repeat: While I did a simple update of the previous port, I was to lazy completely change the build procedure so there will be no man pages in this update but it should work better than the previous one. >Fix: diff -rNu rexx-imc.old/Makefile rexx-imc/Makefile --- rexx-imc.old/Makefile Tue Nov 24 18:22:26 1998 +++ rexx-imc/Makefile Wed Apr 21 19:20:39 1999 @@ -6,32 +6,22 @@ # $Id: Makefile,v 1.6 1998/11/24 18:46:06 nectar Exp $ # -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/ -MAINTAINER= jfitz@FreeBSD.ORG +PATCH_SITES= http://ruby.comlab.ox.ac.uk/imc/distribution/ +PATCHFILES= rexx-imc-1.7-19990331.patch +PATCH_DIST_STRIP= -p1 -NO_WRKSUBDIR= YES +MAINTAINER= jfitz@FreeBSD.ORG 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 - .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 -rNu rexx-imc.old/files/Makefile rexx-imc/files/Makefile --- rexx-imc.old/files/Makefile Tue Nov 24 18:22:26 1998 +++ rexx-imc/files/Makefile Wed Apr 21 19:21:30 1999 @@ -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 @@ 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 @@ -84,6 +84,8 @@ .for f in ${REXXDOCS} ${BSD_INSTALL_DATA} ${f} ${PREFIX}/share/doc/rexx-imc/ .endfor + ${BSD_INSTALL_DATA} rexx.man ${PREFIX}/man/man + .endif .c.o: diff -rNu rexx-imc.old/files/md5 rexx-imc/files/md5 --- rexx-imc.old/files/md5 Fri Feb 12 18:31:50 1999 +++ rexx-imc/files/md5 Wed Apr 21 18:42:41 1999 @@ -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) = 17f6401cb20fda7facafdaca79080748 diff -rNu rexx-imc.old/patches/patch-aa rexx-imc/patches/patch-aa --- rexx-imc.old/patches/patch-aa Sun Apr 27 12:47:06 1997 +++ rexx-imc/patches/patch-aa Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- functions.h.orig Sun Apr 27 13:41:36 1997 -+++ functions.h Sun Apr 27 13:42:39 1997 -@@ -197,7 +197,7 @@ - /* in rxfn.c */ - int rxfn Args((char *name,int argc)); /* Try to call a builtin function */ - int rxseterr Args((struct fileinfo *f)); /* Set rc to indicate a file's status */ --char *undelete Args((int *l)); /* Get last value without deleting it */ -+char *rx_undelete Args((int *l)); /* Get last value without deleting it */ - - /* in shell.c */ - int shell Args((char *command)); /* Interpret a shell command */ diff -rNu rexx-imc.old/patches/patch-ab rexx-imc/patches/patch-ab --- rexx-imc.old/patches/patch-ab Sun Apr 27 12:47:06 1997 +++ rexx-imc/patches/patch-ab Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- rexx.c.orig Sun Apr 27 13:41:41 1997 -+++ rexx.c Sun Apr 27 13:42:22 1997 -@@ -481,7 +481,7 @@ - scanning(lineptr,&tmpchr,&len); - lineptr+=tmpchr; - unplus(OPplus); /* do "name = expri + 0" */ -- istart=undelete(&len)-cstackptr; -+ istart=rx_undelete(&len)-cstackptr; - sllen= -1, /* limit=default (=null) (length -1) */ - sslen= -1, /* step=default (=1) */ - fr= -1; /* for=default (=null) */ diff -rNu rexx-imc.old/patches/patch-ac rexx-imc/patches/patch-ac --- rexx-imc.old/patches/patch-ac Sun Apr 27 12:47:06 1997 +++ rexx-imc/patches/patch-ac Wed Dec 31 19:00:00 1969 @@ -1,29 +0,0 @@ ---- rxfn.c.orig Sun Apr 27 13:41:46 1997 -+++ rxfn.c Sun Apr 27 13:42:35 1997 -@@ -243,7 +243,7 @@ - return strcmp(((struct fnlist*)s1)->name,((struct fnlist *)s2)->name); - } - --char *undelete(l) /* A utility function like delete(l) except that */ -+char *rx_undelete(l) /* A utility function like delete(l) except that */ - int *l; /* the value isn't deleted from the stack */ - { - char *ptr=cstackptr+ecstackptr-four; -@@ -1532,7 +1532,7 @@ - int i,l,l2; - char c; - if(argc!=1)die(Ecall); -- s=undelete(&l); -+ s=rx_undelete(&l); - l2=l--/2; - for(i=0;i<l2;i++)c=s[i],s[i]=s[l-i],s[l-i]=c; - } -@@ -1614,7 +1614,7 @@ - if(argc==3)argc--,ti=delete(&til); - if(argc==2)argc--,to=delete(&tol); - if(argc!=1)die(Ecall); -- s=undelete(&sl); -+ s=rx_undelete(&sl); - if(sl<0)die(Enoarg); - if(tol==-1&&til== -1)for(;sl--;s++)s[0]=uc(s[0]); - else for(;sl--;s++){ diff -rNu rexx-imc.old/patches/patch-ad rexx-imc/patches/patch-ad --- rexx-imc.old/patches/patch-ad Tue Nov 24 13:46:10 1998 +++ rexx-imc/patches/patch-ad Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- const.h.orig Sun Nov 22 13:03:47 1998 -+++ const.h Sun Nov 22 13:03:55 1998 -@@ -382,7 +382,7 @@ - long wrpos; /* The write character position (0-based) */ - int wrline; /* The write line position, if known (1-based) */ - int wrchars; /* Whether an incomplete line has been written */ -- int errno; /* Error status for stream('d') */ -+ int ferrno; /* Error status for stream('d') */ - }; - - typedef struct _hashent { /* Structure containing hash table entry */ diff -rNu rexx-imc.old/pkg/PLIST rexx-imc/pkg/PLIST --- rexx-imc.old/pkg/PLIST Tue Nov 24 18:22:27 1998 +++ rexx-imc/pkg/PLIST Sat Mar 27 17:53:00 1999 @@ -10,13 +10,12 @@ @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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990422012934.0E65815348>