- when there is no license, we are not allowed to distribute it at all!
- rename patches with update-patches
This commit is contained in:
parent
7f0cabbae4
commit
d3a40550b4
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2002/12/23 00:37:51 pvalchev Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2002/12/23 07:42:00 pvalchev Exp $
|
||||
|
||||
COMMENT= "Unix menuing shell"
|
||||
|
||||
@ -12,9 +12,9 @@ WRKDIST= ${WRKDIR}
|
||||
EXTRACT_ONLY=
|
||||
|
||||
PERMIT_PACKAGE_CDROM= "no explict license"
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_PACKAGE_FTP= "no explict license"
|
||||
PERMIT_DISTFILES_CDROM= "no explict license"
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
PERMIT_DISTFILES_FTP= "no explict license"
|
||||
|
||||
post-extract:
|
||||
zcat ${DISTDIR}/${DISTFILES} |(cd ${WRKDIR}; \
|
||||
|
50
misc/mshell/patches/patch-Makefile
Normal file
50
misc/mshell/patches/patch-Makefile
Normal file
@ -0,0 +1,50 @@
|
||||
$OpenBSD: patch-Makefile,v 1.1 2002/12/23 07:42:00 pvalchev Exp $
|
||||
--- Makefile.orig Sun Dec 22 23:47:32 2002
|
||||
+++ Makefile Sun Dec 22 23:47:32 2002
|
||||
@@ -8,14 +8,43 @@
|
||||
#
|
||||
# Check mshell.h for other options, e.g., max menu sizes.
|
||||
|
||||
-CFLAGS = -O -DBSD -DMENUDIR='"/nyx/lib/menus"' -DLOGDIR='"/nyx/lib/logs"'
|
||||
+CFLAGS += -DBSD -DMENUDIR=\"${PREFIX}/lib/menus\" -DMAILDIR='"/var/mail/"' \
|
||||
+ -DGLOBAL_MACRO_FILE=\"${PREFIX}/lib/menus/macros\" \
|
||||
+ -DCOMMAND_LIST=\"${PREFIX}/lib/menus/commands\"
|
||||
OBJS = mshell.o main.o string.o functions1.o functions2.o chdir.o mail.o \
|
||||
settatr.o setenv.o xsystem.o dl.o macro.o
|
||||
|
||||
+all: mshell
|
||||
+
|
||||
mshell: $(OBJS)
|
||||
- cc $(CFLAGS) $(OBJS) -lcurses -ltermcap -o mshell
|
||||
+ ${CC} $(CFLAGS) $(OBJS) -lcurses -ltermlib -o mshell
|
||||
|
||||
$(OBJS) : mshell.h
|
||||
|
||||
clean:
|
||||
- rm *.o mshell
|
||||
+ rm -f *.o mshell
|
||||
+
|
||||
+install: mshell
|
||||
+ mkdir -p ${PREFIX}/bin
|
||||
+ install -c -o bin mshell ${PREFIX}/bin
|
||||
+ mkdir -p ${PREFIX}/lib/menus
|
||||
+ sed -e s/dldir/HOME/g < sample.men > ${PREFIX}/lib/menus/sample.men
|
||||
+ install -c -m 644 menulogin ${PREFIX}/lib/menus
|
||||
+ mkdir -p ${PREFIX}/man/man1
|
||||
+ echo .Dd `/bin/date` > mshell.1
|
||||
+ echo .Dt MSHELL 1 >> mshell.1
|
||||
+ echo .Sh NAME >> mshell.1
|
||||
+ echo .Nm mshell >> mshell.1
|
||||
+ echo .Nd a Unix menuing shell >> mshell.1
|
||||
+ echo .Sh SYNOPSIS >> mshell.1
|
||||
+ echo .Nm mshell >> mshell.1
|
||||
+ echo .Op Fl s >> mshell.1
|
||||
+ echo .Ar menuname >> mshell.1
|
||||
+ echo .Sh DESCRIPTION >> mshell.1
|
||||
+ cat mshell.doc >>mshell.1
|
||||
+ echo >>mshell.1
|
||||
+ cat menu.doc >>mshell.1
|
||||
+ echo >>mshell.1
|
||||
+ echo .Sh AUTHOR >>mshell.1
|
||||
+ echo Andrew Burt, aburt@du.edu >>mshell.1
|
||||
+ install -m 644 mshell.1 ${PREFIX}/man/man1
|
@ -1,62 +0,0 @@
|
||||
*** Makefile.orig Wed Mar 21 11:13:05 2001
|
||||
--- Makefile Tue May 27 02:13:51 1997
|
||||
***************
|
||||
*** 8,21 ****
|
||||
#
|
||||
# Check mshell.h for other options, e.g., max menu sizes.
|
||||
|
||||
! CFLAGS = -O -DBSD -DMENUDIR='"/nyx/lib/menus"' -DLOGDIR='"/nyx/lib/logs"'
|
||||
OBJS = mshell.o main.o string.o functions1.o functions2.o chdir.o mail.o \
|
||||
settatr.o setenv.o xsystem.o dl.o macro.o
|
||||
|
||||
mshell: $(OBJS)
|
||||
! cc $(CFLAGS) $(OBJS) -lcurses -ltermcap -o mshell
|
||||
|
||||
$(OBJS) : mshell.h
|
||||
|
||||
clean:
|
||||
! rm *.o mshell
|
||||
--- 8,50 ----
|
||||
#
|
||||
# Check mshell.h for other options, e.g., max menu sizes.
|
||||
|
||||
! CFLAGS += -DBSD -DMENUDIR=\"${PREFIX}/lib/menus\" -DMAILDIR='"/var/mail/"' \
|
||||
! -DGLOBAL_MACRO_FILE=\"${PREFIX}/lib/menus/macros\" \
|
||||
! -DCOMMAND_LIST=\"${PREFIX}/lib/menus/commands\"
|
||||
OBJS = mshell.o main.o string.o functions1.o functions2.o chdir.o mail.o \
|
||||
settatr.o setenv.o xsystem.o dl.o macro.o
|
||||
|
||||
+ all: mshell
|
||||
+
|
||||
mshell: $(OBJS)
|
||||
! ${CC} $(CFLAGS) $(OBJS) -lcurses -ltermlib -o mshell
|
||||
|
||||
$(OBJS) : mshell.h
|
||||
|
||||
clean:
|
||||
! rm -f *.o mshell
|
||||
!
|
||||
! install: mshell
|
||||
! mkdir -p ${PREFIX}/bin
|
||||
! install -c -o bin mshell ${PREFIX}/bin
|
||||
! mkdir -p ${PREFIX}/lib/menus
|
||||
! sed -e s/dldir/HOME/g < sample.men > ${PREFIX}/lib/menus/sample.men
|
||||
! install -c -m 644 menulogin ${PREFIX}/lib/menus
|
||||
! mkdir -p ${PREFIX}/man/man1
|
||||
! echo .Dd `/bin/date` > mshell.1
|
||||
! echo .Dt MSHELL 1 >> mshell.1
|
||||
! echo .Sh NAME >> mshell.1
|
||||
! echo .Nm mshell >> mshell.1
|
||||
! echo .Nd a Unix menuing shell >> mshell.1
|
||||
! echo .Sh SYNOPSIS >> mshell.1
|
||||
! echo .Nm mshell >> mshell.1
|
||||
! echo .Op Fl s >> mshell.1
|
||||
! echo .Ar menuname >> mshell.1
|
||||
! echo .Sh DESCRIPTION >> mshell.1
|
||||
! cat mshell.doc >>mshell.1
|
||||
! echo >>mshell.1
|
||||
! cat menu.doc >>mshell.1
|
||||
! echo >>mshell.1
|
||||
! echo .Sh AUTHOR >>mshell.1
|
||||
! echo Andrew Burt, aburt@du.edu >>mshell.1
|
||||
! install -m 644 mshell.1 ${PREFIX}/man/man1
|
@ -1,46 +0,0 @@
|
||||
*** settatr.c.orig Sat Sep 24 00:47:17 1994
|
||||
--- settatr.c Sat Sep 24 00:49:46 1994
|
||||
***************
|
||||
*** 15,21 ****
|
||||
ioctl ( 0, TIOCGETP, &sg );
|
||||
if (access(".stty", 0) == -1) { /* not already set up */
|
||||
sg.sg_erase = '';
|
||||
! sg.sg_kill = '';
|
||||
sg.sg_flags |= XTABS;
|
||||
}
|
||||
sg.sg_flags |= ECHO;
|
||||
--- 15,21 ----
|
||||
ioctl ( 0, TIOCGETP, &sg );
|
||||
if (access(".stty", 0) == -1) { /* not already set up */
|
||||
sg.sg_erase = '';
|
||||
! sg.sg_kill = 21; /* ^U */
|
||||
sg.sg_flags |= XTABS;
|
||||
}
|
||||
sg.sg_flags |= ECHO;
|
||||
***************
|
||||
*** 25,36 ****
|
||||
ioctl ( 0, TIOCSETP, &sg );
|
||||
|
||||
ioctl ( 0, TIOCGETC, &tc );
|
||||
! tc.t_intrc = '';
|
||||
ioctl ( 0, TIOCSETC, &tc );
|
||||
|
||||
ioctl ( 0, TIOCGLTC, < );
|
||||
! lt.t_werasc = '';
|
||||
! lt.t_rprntc = '';
|
||||
ioctl ( 0, TIOCSLTC, < );
|
||||
#endif
|
||||
#ifdef SYSV
|
||||
--- 25,36 ----
|
||||
ioctl ( 0, TIOCSETP, &sg );
|
||||
|
||||
ioctl ( 0, TIOCGETC, &tc );
|
||||
! tc.t_intrc = 3; /* ^C */
|
||||
ioctl ( 0, TIOCSETC, &tc );
|
||||
|
||||
ioctl ( 0, TIOCGLTC, < );
|
||||
! lt.t_werasc = 23; /* ^W */
|
||||
! lt.t_rprntc = 18; /* ^R */
|
||||
ioctl ( 0, TIOCSLTC, < );
|
||||
#endif
|
||||
#ifdef SYSV
|
@ -1,19 +0,0 @@
|
||||
*** functions1.c.orig Sat Sep 24 00:51:45 1994
|
||||
--- functions1.c Sat Sep 24 00:52:03 1994
|
||||
***************
|
||||
*** 15,21 ****
|
||||
FILE * fp;
|
||||
char record [DESCLEN];
|
||||
if (( fp = fopen (filename, "r")) == NULL ) {
|
||||
! printf ("\tNo such helpfile as %s\!\!\n", filename);
|
||||
return;
|
||||
}
|
||||
|
||||
--- 15,21 ----
|
||||
FILE * fp;
|
||||
char record [DESCLEN];
|
||||
if (( fp = fopen (filename, "r")) == NULL ) {
|
||||
! printf ("\tNo such helpfile as %s!!\n", filename);
|
||||
return;
|
||||
}
|
||||
|
@ -1,22 +0,0 @@
|
||||
*** string.c.orig Fri Sep 23 18:34:06 1994
|
||||
--- string.c Fri Sep 23 18:50:39 1994
|
||||
***************
|
||||
*** 4,9 ****
|
||||
--- 4,20 ----
|
||||
#define strchr index
|
||||
#endif
|
||||
|
||||
+ char *
|
||||
+ gets (char *s)
|
||||
+ {
|
||||
+ char *x = fgets (s, WORDLEN, stdin);
|
||||
+ if (x) {
|
||||
+ char *p = strchr (x, '\n');
|
||||
+ if (p)
|
||||
+ *p = 0;
|
||||
+ }
|
||||
+ return x;
|
||||
+ }
|
||||
|
||||
/* function to find the position of sub_string in main_string
|
||||
* ---------------------------------------------------------- */
|
12
misc/mshell/patches/patch-functions1_c
Normal file
12
misc/mshell/patches/patch-functions1_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-functions1_c,v 1.1 2002/12/23 07:42:00 pvalchev Exp $
|
||||
--- functions1.c.orig Sun Dec 22 23:47:32 2002
|
||||
+++ functions1.c Sun Dec 22 23:47:32 2002
|
||||
@@ -15,7 +15,7 @@ char * filename;
|
||||
FILE * fp;
|
||||
char record [DESCLEN];
|
||||
if (( fp = fopen (filename, "r")) == NULL ) {
|
||||
- printf ("\tNo such helpfile as %s\!\!\n", filename);
|
||||
+ printf ("\tNo such helpfile as %s!!\n", filename);
|
||||
return;
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
$OpenBSD: patch-ad,v 1.2 1999/11/14 01:27:06 rohee Exp $
|
||||
|
||||
--- mshell.c.orig Sun Nov 14 02:15:12 1999
|
||||
+++ mshell.c Sun Nov 14 02:15:42 1999
|
||||
$OpenBSD: patch-mshell_c,v 1.1 2002/12/23 07:42:00 pvalchev Exp $
|
||||
--- mshell.c.orig Sun Dec 22 23:47:32 2002
|
||||
+++ mshell.c Sun Dec 22 23:47:32 2002
|
||||
@@ -1,6 +1,8 @@
|
||||
#include "mshell.h"
|
||||
#include <setjmp.h>
|
28
misc/mshell/patches/patch-settatr_c
Normal file
28
misc/mshell/patches/patch-settatr_c
Normal file
@ -0,0 +1,28 @@
|
||||
$OpenBSD: patch-settatr_c,v 1.1 2002/12/23 07:42:00 pvalchev Exp $
|
||||
--- settatr.c.orig Sun Dec 22 23:47:32 2002
|
||||
+++ settatr.c Sun Dec 22 23:47:32 2002
|
||||
@@ -15,7 +15,7 @@ set_terminal_attributes()
|
||||
ioctl ( 0, TIOCGETP, &sg );
|
||||
if (access(".stty", 0) == -1) { /* not already set up */
|
||||
sg.sg_erase = '';
|
||||
- sg.sg_kill = '';
|
||||
+ sg.sg_kill = 21; /* ^U */
|
||||
sg.sg_flags |= XTABS;
|
||||
}
|
||||
sg.sg_flags |= ECHO;
|
||||
@@ -25,12 +25,12 @@ set_terminal_attributes()
|
||||
ioctl ( 0, TIOCSETP, &sg );
|
||||
|
||||
ioctl ( 0, TIOCGETC, &tc );
|
||||
- tc.t_intrc = '';
|
||||
+ tc.t_intrc = 3; /* ^C */
|
||||
ioctl ( 0, TIOCSETC, &tc );
|
||||
|
||||
ioctl ( 0, TIOCGLTC, < );
|
||||
- lt.t_werasc = '';
|
||||
- lt.t_rprntc = '';
|
||||
+ lt.t_werasc = 23; /* ^W */
|
||||
+ lt.t_rprntc = 18; /* ^R */
|
||||
ioctl ( 0, TIOCSLTC, < );
|
||||
#endif
|
||||
#ifdef SYSV
|
21
misc/mshell/patches/patch-string_c
Normal file
21
misc/mshell/patches/patch-string_c
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-string_c,v 1.1 2002/12/23 07:42:00 pvalchev Exp $
|
||||
--- string.c.orig Sun Dec 22 23:50:21 2002
|
||||
+++ string.c Sun Dec 22 23:50:27 2002
|
||||
@@ -4,6 +4,17 @@
|
||||
#define strchr index
|
||||
#endif
|
||||
|
||||
+char *
|
||||
+gets (char *s)
|
||||
+{
|
||||
+ char *x = fgets (s, WORDLEN, stdin);
|
||||
+ if (x) {
|
||||
+ char *p = strchr (x, '\n');
|
||||
+ if (p)
|
||||
+ *p = 0;
|
||||
+ }
|
||||
+ return x;
|
||||
+}
|
||||
|
||||
/* function to find the position of sub_string in main_string
|
||||
* ---------------------------------------------------------- */
|
Loading…
x
Reference in New Issue
Block a user