From 34ec27584704f2a54f0b4048649646c3dd506185 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Thu, 3 Mar 2005 01:39:46 +0000 Subject: - Update to 5.0 PR: 78273 Submitted by: Daniel O'Connor (maintainer) --- print/mup/files/Makefile.mup | 101 +++++++++++++++--------------- print/mup/files/patch-aa | 22 ------- print/mup/files/patch-ab | 19 ------ print/mup/files/patch-ac | 11 ---- print/mup/files/patch-mupdisp::dispttyp.h | 11 ++++ print/mup/files/patch-mupdisp::mupdisp.c | 31 +++++++++ print/mup/files/patch-mupdisp::mupdisp.h | 19 ++++++ 7 files changed, 112 insertions(+), 102 deletions(-) delete mode 100644 print/mup/files/patch-aa delete mode 100644 print/mup/files/patch-ab delete mode 100644 print/mup/files/patch-ac create mode 100644 print/mup/files/patch-mupdisp::dispttyp.h create mode 100644 print/mup/files/patch-mupdisp::mupdisp.c create mode 100644 print/mup/files/patch-mupdisp::mupdisp.h (limited to 'print/mup/files') diff --git a/print/mup/files/Makefile.mup b/print/mup/files/Makefile.mup index dc4440a8b21b..71f7ae1b18e4 100644 --- a/print/mup/files/Makefile.mup +++ b/print/mup/files/Makefile.mup @@ -3,55 +3,56 @@ LDADD+= -lm NOMAN= SRCS= abshorz.c \ - absvert.c \ - assign.c \ - beaming.c \ - beamstem.c \ - brac.c \ - charinfo.c \ - check.c \ - debug.c \ - errors.c \ - extchtbl.c \ - font.c \ - fontdata.c \ - globals.c \ - grpsyl.c \ - lex.c \ - locvar.c \ - lyrics.c \ - macros.c \ - main.c \ - mainlist.c \ - map.c \ - midi.c \ - midiutil.c \ - mkchords.c \ - muschtbl.c \ - nxtstrch.c \ - parstuff.c \ - phrase.c \ - plutils.c \ - print.c \ - prntdata.c \ - prntmisc.c \ - prnttab.c \ - prolog.c \ - range.c \ - rational.c \ - relvert.c \ - restsyl.c \ - roll.c \ - setgrps.c \ - setnotes.c \ - ssv.c \ - stuff.c \ - symtbl.c \ - tie.c \ - trantab.c \ - trnspose.c \ - undrscre.c \ - utils.c \ - ytab.c + absvert.c \ + assign.c \ + beaming.c \ + beamstem.c \ + brac.c \ + charinfo.c \ + check.c \ + debug.c \ + errors.c \ + extchtbl.c \ + font.c \ + fontdata.c \ + globals.c \ + grpsyl.c \ + lex.c \ + locvar.c \ + lyrics.c \ + macros.c \ + main.c \ + mainlist.c \ + map.c \ + midi.c \ + midiutil.c \ + mkchords.c \ + muschtbl.c \ + nxtstrch.c \ + parstssv.c \ + parstuff.c \ + phrase.c \ + plutils.c \ + print.c \ + prntdata.c \ + prntmisc.c \ + prnttab.c \ + prolog.c \ + range.c \ + rational.c \ + relvert.c \ + restsyl.c \ + roll.c \ + setgrps.c \ + setnotes.c \ + ssv.c \ + stuff.c \ + symtbl.c \ + tie.c \ + trantab.c \ + trnspose.c \ + undrscre.c \ + utils.c \ + ytab.c .include diff --git a/print/mup/files/patch-aa b/print/mup/files/patch-aa deleted file mode 100644 index e95febbaefd8..000000000000 --- a/print/mup/files/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ ---- mupdisp/mupdisp.c.orig Wed Nov 27 20:49:30 2002 -+++ mupdisp/mupdisp.c Wed Nov 27 23:03:09 2002 -@@ -45,6 +45,10 @@ - * chmod 4755 mupdisp - */ - -+#include -+#include -+#include -+#include - - #include "mupdisp.h" - #ifdef __WATCOMC__ -@@ -112,7 +116,7 @@ - /* arrange to clean up temp files. Note that the user interface - * will probably have its own cleanup */ - for (n = 0; n < NSIG; n++) { -- if (n != SIGKILL && n != SIGCLD && n != SIGWINCH) { -+ if (n != SIGKILL && n != SIGCHLD && n != SIGWINCH) { - signal(n, generalcleanup); - } - } diff --git a/print/mup/files/patch-ab b/print/mup/files/patch-ab deleted file mode 100644 index 9ff9bb04ec29..000000000000 --- a/print/mup/files/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ ---- mupdisp/mupdisp.h.orig Sun Oct 5 17:53:43 2003 -+++ mupdisp/mupdisp.h Sun Oct 5 17:54:05 2003 -@@ -12,8 +12,7 @@ - #include - #include - #include --#include --#if !defined(linux) && !defined(__EMX__) -+#if !defined(linux) && !defined(__EMX__) && !defined(__FreeBSD__) - /* undef SIGCHLD to avoid conflict with Xos.h */ - #undef SIGCHLD - #endif -@@ -146,6 +145,3 @@ - extern void init P((void)); - extern void do_cmd P((int c)); - --extern char *getenv(); --extern long ftell(); --extern long lseek(); diff --git a/print/mup/files/patch-ac b/print/mup/files/patch-ac deleted file mode 100644 index 3904bf0268ad..000000000000 --- a/print/mup/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- mupdisp/dispttyp.h.orig Sat Jun 22 12:30:53 2002 -+++ mupdisp/dispttyp.h Wed Nov 27 23:28:55 2002 -@@ -9,7 +9,7 @@ - * Support for other terminal types could be added in the future. */ - - #ifdef i386 --#if !defined(linux) && !defined(__EMX__) -+#if !defined(linux) && !defined(__EMX__) && !defined(__FreeBSD__) - #define AT386 1 - #endif - #endif diff --git a/print/mup/files/patch-mupdisp::dispttyp.h b/print/mup/files/patch-mupdisp::dispttyp.h new file mode 100644 index 000000000000..3904bf0268ad --- /dev/null +++ b/print/mup/files/patch-mupdisp::dispttyp.h @@ -0,0 +1,11 @@ +--- mupdisp/dispttyp.h.orig Sat Jun 22 12:30:53 2002 ++++ mupdisp/dispttyp.h Wed Nov 27 23:28:55 2002 +@@ -9,7 +9,7 @@ + * Support for other terminal types could be added in the future. */ + + #ifdef i386 +-#if !defined(linux) && !defined(__EMX__) ++#if !defined(linux) && !defined(__EMX__) && !defined(__FreeBSD__) + #define AT386 1 + #endif + #endif diff --git a/print/mup/files/patch-mupdisp::mupdisp.c b/print/mup/files/patch-mupdisp::mupdisp.c new file mode 100644 index 000000000000..0b51e3b452c1 --- /dev/null +++ b/print/mup/files/patch-mupdisp::mupdisp.c @@ -0,0 +1,31 @@ +--- mupdisp/mupdisp.c.orig Tue Jun 22 09:18:32 2004 ++++ mupdisp/mupdisp.c Wed Mar 2 16:19:53 2005 +@@ -45,6 +45,10 @@ + * chmod 4755 mupdisp + */ + ++#include ++#include ++#include ++#include + + #include "mupdisp.h" + #ifdef __WATCOMC__ +@@ -112,7 +116,7 @@ + /* arrange to clean up temp files. Note that the user interface + * will probably have its own cleanup */ + for (n = 0; n < NSIG; n++) { +- if (n != SIGKILL && n != SIGCLD && n != SIGWINCH) { ++ if (n != SIGKILL && n != SIGCHLD && n != SIGWINCH) { + signal(n, generalcleanup); + } + } +@@ -314,7 +318,7 @@ + int fd; + + +-#ifdef linux ++#if defined(linux) || defined(__FreeBSD__) + if ((fd = mkstemp(tmpfname)) < 0) { + fprintf(stderr, "can't create temp file\n"); + generalcleanup(1); diff --git a/print/mup/files/patch-mupdisp::mupdisp.h b/print/mup/files/patch-mupdisp::mupdisp.h new file mode 100644 index 000000000000..9ff9bb04ec29 --- /dev/null +++ b/print/mup/files/patch-mupdisp::mupdisp.h @@ -0,0 +1,19 @@ +--- mupdisp/mupdisp.h.orig Sun Oct 5 17:53:43 2003 ++++ mupdisp/mupdisp.h Sun Oct 5 17:54:05 2003 +@@ -12,8 +12,7 @@ + #include + #include + #include +-#include +-#if !defined(linux) && !defined(__EMX__) ++#if !defined(linux) && !defined(__EMX__) && !defined(__FreeBSD__) + /* undef SIGCHLD to avoid conflict with Xos.h */ + #undef SIGCHLD + #endif +@@ -146,6 +145,3 @@ + extern void init P((void)); + extern void do_cmd P((int c)); + +-extern char *getenv(); +-extern long ftell(); +-extern long lseek(); -- cgit v1.2.3