From 91bf942cab9d8b63cb2aa68c0a3290abed11e533 Mon Sep 17 00:00:00 2001 From: Patrick Kursawe Date: Tue, 18 Nov 2003 08:36:46 +0000 Subject: Closing bug 32956 --- app-sci/magic/ChangeLog | 7 +- app-sci/magic/Manifest | 7 +- app-sci/magic/files/magic-7.1-misc.patch | 464 +++++++++++++++++++++++++++++ app-sci/magic/files/magic-7.1-paths.patch | 80 ----- app-sci/magic/files/magic-7.1-vararg.patch | 346 --------------------- app-sci/magic/magic-7.1-r2.ebuild | 18 +- 6 files changed, 481 insertions(+), 441 deletions(-) create mode 100644 app-sci/magic/files/magic-7.1-misc.patch delete mode 100644 app-sci/magic/files/magic-7.1-paths.patch delete mode 100644 app-sci/magic/files/magic-7.1-vararg.patch (limited to 'app-sci') diff --git a/app-sci/magic/ChangeLog b/app-sci/magic/ChangeLog index b032661ba875..6817bf7d4ae4 100644 --- a/app-sci/magic/ChangeLog +++ b/app-sci/magic/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-sci/magic # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/magic/ChangeLog,v 1.7 2003/11/17 14:32:39 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/magic/ChangeLog,v 1.8 2003/11/18 08:36:39 phosphan Exp $ + + 18 Nov 2003; Patrick Kursawe magic-7.1-r2.ebuild, + files/magic-7.1-misc.patch, files/magic-7.1-paths.patch, + files/magic-7.1-vararg.patch: + Should compile _and_ work now. *magic-7.1-r2 (17 Nov 2003) diff --git a/app-sci/magic/Manifest b/app-sci/magic/Manifest index 46a9e1aa2dee..41f8c7015af8 100644 --- a/app-sci/magic/Manifest +++ b/app-sci/magic/Manifest @@ -1,16 +1,15 @@ MD5 c2a27d44d0be46e39aba2a6390466cb4 magic-7.1.ebuild 1117 MD5 5b846a413bc6a8748980558985636cad magic-7.1-r1.ebuild 1203 -MD5 d5a08621d97bb393555e846a92e76838 ChangeLog 1136 -MD5 bdc0adbc890b7a70b9f0083d88bfee36 magic-7.1-r2.ebuild 1883 +MD5 10384643c6c5f54cd10d4daf78713d63 ChangeLog 1335 +MD5 cc7f5279ad317c2808b9d764d2447821 magic-7.1-r2.ebuild 1829 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 MD5 d81dbf84695b280009964a0bad9cf42c files/magic-7.1-gcc3.2.patch 593 MD5 d8eb4daf3f4c752bf337ea47c9dc9d61 files/digest-magic-7.1 66 MD5 51ef467f914b14f163fb1ecfa092876d files/defs.mak-7.1 1895 +MD5 825f3fd749c20f40a910f335bedee943 files/magic-7.1-misc.patch 14570 MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r1 62 MD5 ccf20deaf0d44a9a779f0f17695bd0b0 files/digest-magic-7.1-r2 62 -MD5 8d35901556f6e52f37dd73326a23769d files/magic-7.1-paths.patch 2967 MD5 9cd145fd8e71675bf5a1b7717e175e34 files/magic-7.1-fhs.patch 1310 -MD5 0d2e71d71b6842be61c5974d10912010 files/magic-7.1-vararg.patch 10453 MD5 0b1ea7223162f5c38659ab26393d20ec files/defs.mak-7.1-r1 2098 MD5 0d0472ae43dbddd46bc658a75f0c3b9e files/defs.mak-7.1-r2 2108 MD5 fdb38b03c3fbdbb89eff8081e9953744 files/10magic 14 diff --git a/app-sci/magic/files/magic-7.1-misc.patch b/app-sci/magic/files/magic-7.1-misc.patch new file mode 100644 index 000000000000..122b92d88a2f --- /dev/null +++ b/app-sci/magic/files/magic-7.1-misc.patch @@ -0,0 +1,464 @@ +diff -p1 -ur ext2sim/ext2sim-6.4.5/ext2sim.c magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim.c +--- ext2sim/ext2sim-6.4.5/ext2sim.c 2003-11-17 11:15:49.000000000 +0100 ++++ magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim.c 2003-11-17 11:26:52.000000000 +0100 +@@ -31,3 +31,3 @@ static char rcsid[] = "$Header: /ufs/rep + #include +-#include ++ + #include "magic.h" +diff -p1 -ur ext2sim/ext2sim-6.4.5/ext2sim6_3.c magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim6_3.c +--- ext2sim/ext2sim-6.4.5/ext2sim6_3.c 2003-11-17 11:15:49.000000000 +0100 ++++ magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim6_3.c 2003-11-17 11:26:52.000000000 +0100 +@@ -31,3 +31,3 @@ static char rcsid[] = "$Header: /ufs/rep + #include +-#include ++ + #include "magic.h" +diff -p1 -ur ext2sim/ext2sim.c magic-7.1/ext2sim/ext2sim.c +--- ext2sim/ext2sim.c 2003-11-17 11:15:49.000000000 +0100 ++++ magic-7.1/ext2sim/ext2sim.c 2003-11-17 11:26:52.000000000 +0100 +@@ -21,3 +21,3 @@ static char rcsid[] = "$Header: /ufs/rep + #include +-#include ++ + #include "misc/magic.h" +diff -p1 -ur ext2spice/ext2spice-6.4.5/ext2spice.c magic-7.1/ext2spice/ext2spice-6.4.5/ext2spice.c +--- ext2spice/ext2spice-6.4.5/ext2spice.c 2003-11-17 11:15:47.000000000 +0100 ++++ magic-7.1/ext2spice/ext2spice-6.4.5/ext2spice.c 2003-11-17 11:26:50.000000000 +0100 +@@ -35,3 +35,3 @@ static char rcsid[] = "$Header: /ufs/rep + #include +-#include ++ + #include "magic.h" +diff -p1 -ur ext2spice/ext2spice.c magic-7.1/ext2spice/ext2spice.c +--- ext2spice/ext2spice.c 2003-11-17 11:15:47.000000000 +0100 ++++ magic-7.1/ext2spice/ext2spice.c 2003-11-17 12:00:37.000000000 +0100 +@@ -20,3 +20,4 @@ static char rcsid[] = "$Header: /ufs/rep + #include +-#include ++#include ++ + #include "misc/magic.h" +@@ -1588,3 +1589,3 @@ int l, w; + /* debugging stuff */ +-#include ++ + +@@ -1592,7 +1593,5 @@ int l, w; + +-DBPRINT( va_alist ) +- va_dcl ++DBPRINT( const char * fmt, ... ) + { + va_list args; +- char *fmt; + FILE *fp; +@@ -1601,5 +1600,4 @@ DBPRINT( va_alist ) + if ( DBG ) { +- va_start( args ); ++ va_start( args,fmt ); + fp = stderr ; +- fmt = va_arg( args, char * ); + (void) vsprintf( buff, fmt, args ); +diff -p1 -ur extcheck/extcheck.c magic-7.1/extcheck/extcheck.c +--- extcheck/extcheck.c 2003-11-17 11:15:47.000000000 +0100 ++++ magic-7.1/extcheck/extcheck.c 2003-11-17 11:26:50.000000000 +0100 +@@ -30,3 +30,3 @@ static char rcsid[] = "$Header: /ufs/rep + #include +-#include ++ + #include "misc/magic.h" +diff -p1 -ur extflat/EFargs.c magic-7.1/extflat/EFargs.c +--- extflat/EFargs.c 2003-11-17 11:15:49.000000000 +0100 ++++ magic-7.1/extflat/EFargs.c 2003-11-17 12:01:36.000000000 +0100 +@@ -26,3 +26,3 @@ static char rcsid[] = "$Header: /ufs/rep + #include +-#include ++#include + #ifdef SYSV +diff -p1 -ur extflat/EFread.c magic-7.1/extflat/EFread.c +--- extflat/EFread.c 2003-11-17 11:15:49.000000000 +0100 ++++ magic-7.1/extflat/EFread.c 2003-11-17 11:50:53.000000000 +0100 +@@ -26,3 +26,4 @@ static char rcsid[] = "$Header: /ufs/rep + #include +-#include ++#include ++ + #include "misc/magic.h" +@@ -35,2 +36,5 @@ static char rcsid[] = "$Header: /ufs/rep + ++ ++void efReadError(const char *fmt, ...); ++ + /* +@@ -536,5 +540,4 @@ start: + /*VARARGS1*/ +-efReadError(fmt, va_alist) +- char *fmt; +- va_dcl ++ ++void efReadError(const char *fmt, ...) + { +@@ -543,3 +546,3 @@ efReadError(fmt, va_alist) + (void) printf("%s, line %d: ", efReadFileName, efReadLineNum); +- va_start(args); ++ va_start(args,fmt); + vfprintf(stdout, fmt, args); +diff -p1 -ur graphics/X11Helper.c magic-7.1/graphics/X11Helper.c +--- graphics/X11Helper.c 2003-11-17 11:15:48.000000000 +0100 ++++ magic-7.1/graphics/X11Helper.c 2003-11-17 12:11:09.000000000 +0100 +@@ -13,2 +13,4 @@ + ++#define X11HELP_PROG "XHelper7" ++ + #include +diff -p1 -ur graphics/grMain.c magic-7.1/graphics/grMain.c +--- graphics/grMain.c 2003-11-17 11:15:48.000000000 +0100 ++++ magic-7.1/graphics/grMain.c 2003-11-17 11:26:51.000000000 +0100 +@@ -122,3 +122,3 @@ static char rcsid[]="$Header: /ufs/repos + #ifndef NO_VARARGS +-#include ++ + #endif +diff -p1 -ur graphics/grX11su1.c magic-7.1/graphics/grX11su1.c +--- graphics/grX11su1.c 2003-11-17 11:15:48.000000000 +0100 ++++ magic-7.1/graphics/grX11su1.c 2003-11-17 12:13:22.000000000 +0100 +@@ -19,2 +19,5 @@ + */ ++ ++#define X11HELP_PROG "XHelper7" ++ + #define HIRES +diff -p1 -ur lisp/other/txOutput.c magic-7.1/lisp/other/txOutput.c +--- lisp/other/txOutput.c 2003-11-17 11:15:47.000000000 +0100 ++++ magic-7.1/lisp/other/txOutput.c 2003-11-17 11:26:49.000000000 +0100 +@@ -41,3 +41,3 @@ static char rcsid[] = "$Header: /ufs/rep + #ifndef NO_VARARGS +-#include ++ + #endif +diff -p1 -ur mpack/magicStubs.c magic-7.1/mpack/magicStubs.c +--- mpack/magicStubs.c 2003-11-17 11:15:48.000000000 +0100 ++++ magic-7.1/mpack/magicStubs.c 2003-11-17 12:23:32.000000000 +0100 +@@ -55,5 +55,5 @@ void SigDisableInterrupts(){} + /*VARARGS1*/ +-void ++/*void + TxError(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) +-char *format; ++const char *format; + { +@@ -64,5 +64,5 @@ char *format; + } +- ++*/ + /*VARARGS1*/ +-void ++/*void + TxPrintf(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) +@@ -73,3 +73,3 @@ char *format; + } +- ++*/ + void +diff -p1 -ur tech/tech.h magic-7.1/tech/tech.h +--- tech/tech.h 2003-11-17 11:15:47.000000000 +0100 ++++ magic-7.1/tech/tech.h 2003-11-17 11:53:25.000000000 +0100 +@@ -25,2 +25,2 @@ typedef int SectionID; /* Mask set by T + extern char *TechDefault; /* Name of default technology */ +-extern void TechError(); ++extern void TechError(const char *fmt, ...); +diff -p1 -ur textio/textio.h magic-7.1/textio/textio.h +--- textio/textio.h 2003-11-17 11:15:50.000000000 +0100 ++++ magic-7.1/textio/textio.h 2003-11-17 12:19:56.000000000 +0100 +@@ -31,6 +31,6 @@ + /* printing procedures */ +-extern void TxPrintf(); ++extern void TxPrintf(const char*, ...); + extern bool TxPrintOn(); /* enables TxPrintf output */ + extern bool TxPrintOff(); /* disables TxPrintf output */ +-extern void TxError(); ++extern void TxError(const char *, ...); + extern void TxFlush(); +diff -p1 -ur textio/textioInt.h magic-7.1/textio/textioInt.h +--- textio/textioInt.h 2003-11-17 11:15:50.000000000 +0100 ++++ magic-7.1/textio/textioInt.h 2003-11-17 12:16:13.000000000 +0100 +@@ -58,2 +58,2 @@ typedef struct { + extern int TxGetInputEvent(); +-extern void txFprintfBasic(); ++extern void txFprintfBasic(FILE *, const char*, ...); +diff -p1 -ur textio/txOutput.c magic-7.1/textio/txOutput.c +--- textio/txOutput.c 2003-11-17 11:15:50.000000000 +0100 ++++ magic-7.1/textio/txOutput.c 2003-11-17 12:21:19.000000000 +0100 +@@ -18,2 +18,4 @@ + ++#include ++ + #ifndef lint +@@ -44,3 +46,3 @@ static char rcsid[] = "$Header: /ufs/rep + #ifndef NO_VARARGS +-#include ++ + #endif +@@ -84,12 +86,7 @@ static bool txPrintFlag = TRUE; + void +-txFprintfBasic(va_alist) +-va_dcl ++txFprintfBasic(FILE *f, const char * fmt, ...) + { + va_list args; +- char *fmt; +- FILE *f; + +- va_start(args); +- f = va_arg(args, FILE *); +- fmt = va_arg(args, char *); ++ va_start(args, fmt); + (void) GrVfprintf(f, fmt, args); +@@ -137,7 +134,5 @@ txFprintfBasic(f, format, a1, a2, a3, a4 + void +-TxPrintf(va_alist) +-va_dcl ++TxPrintf(const char *fmt, ...) + { + va_list args; +- char *fmt; + FILE *f; +@@ -158,4 +153,3 @@ va_dcl + TxUnPrompt(); +- va_start(args); +- fmt = va_arg(args, char *); ++ va_start(args, fmt); + (void) GrVfprintf(f, fmt, args); +@@ -166,4 +160,3 @@ va_dcl + { +- va_start(args); +- fmt = va_arg(args, char *); ++ va_start(args, fmt); + (void) GrVfprintf(f, fmt, args); +@@ -308,7 +301,5 @@ TxFlush() + void +-TxError(va_alist) +-va_dcl ++TxError(const char *fmt, ...) + { + va_list args; +- char *fmt; + FILE *f; +@@ -323,4 +314,3 @@ va_dcl + TxUnPrompt(); +- va_start(args); +- fmt = va_arg(args, char *); ++ va_start(args, fmt); + (void) GrVfprintf(f, fmt, args); +@@ -330,4 +320,3 @@ va_dcl + else { +- va_start(args); +- fmt = va_arg(args, char *); ++ va_start(args,fmt); + (void) GrVfprintf(f, fmt, args); +diff -p1 -ur utils/LIBtextio.c magic-7.1/utils/LIBtextio.c +--- utils/LIBtextio.c 2003-11-17 11:15:48.000000000 +0100 ++++ magic-7.1/utils/LIBtextio.c 2003-11-17 12:25:20.000000000 +0100 +@@ -19,2 +19,4 @@ + ++#include ++ + #ifndef lint +@@ -24,3 +26,3 @@ static char rcsid[] = "$Header: /ufs/rep + #include +-#include ++ + +@@ -67,5 +69,3 @@ TxGetLine(buf, size) + /*VARARGS*/ +-TxError(fmt, va_alist) +- char *fmt; +- va_dcl ++TxError(const char *fmt, ...) + { +@@ -75,3 +75,3 @@ TxError(fmt, va_alist) + (void) fflush(stderr); +- va_start(ap); ++ va_start(ap,fmt); + vfprintf(stderr, fmt, ap); +@@ -98,5 +98,3 @@ TxError(fmt, va_alist) + /*VARARGS*/ +-TxPrintf(fmt, va_alist) +- char *fmt; +- va_dcl ++TxPrintf(const char *fmt, ...) + { +@@ -106,3 +104,3 @@ TxPrintf(fmt, va_alist) + (void) fflush(stdout); +- va_start(ap); ++ va_start(ap,fmt); + vfprintf(stdout, fmt, ap); +diff -p1 -ur windows/windCmdAM.c magic-7.1/windows/windCmdAM.c +--- windows/windCmdAM.c 2003-11-17 11:15:50.000000000 +0100 ++++ magic-7.1/windows/windCmdAM.c 2003-11-17 12:29:08.000000000 +0100 +@@ -304,6 +304,3 @@ windFilesCmd(w, cmd) + } else { +- if (errno < sys_nerr) +- TxError("file descriptor %d: %s\n", fd, STRERROR(errno)); +- else +- TxError("file descriptor %d: unknown error\n", fd); ++ TxError("file descriptor %d: %s\n", fd, strerror(errno)); + } +--- tech/tech.c 2003-11-17 13:18:16.000000000 +0100 ++++ tech/tech.c.new 2003-11-17 13:20:13.000000000 +0100 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include "misc/magic.h" + #include "utils/geometry.h" + #include "utils/utils.h" +@@ -30,10 +31,6 @@ + #include "graphics/graphics.h" + #include "utils/malloc.h" + +-#ifndef NO_VARARGS +-#include +-#endif NO_VARARGS +- + global char *TechDefault = NULL; + + int techLineNumber; +@@ -415,15 +412,12 @@ + /*VARARGS0*/ + + void +-TechError(va_alist) +-va_dcl ++TechError(const char *fmt, ...) + { + va_list args; +- char *fmt; + + TechPrintLine(); +- va_start(args); +- fmt = va_arg(args, char *); ++ va_start(args, fmt); + (void) GrVfprintf(stderr, fmt, args); + va_end(args); + } +diff -ru Makefile magic-7.1/Makefile +--- Makefile 2001-01-14 20:22:26.000000000 +0100 ++++ magic-7.1/Makefile 2003-11-17 17:05:41.000000000 +0100 +@@ -56,7 +56,7 @@ + + install-real: install-dirs + for dir in ${INSTALL_CAD_DIRS}; do \ +- (cd $$dir && ${MAKE} install); done ++ (cd $$dir && ${MAKE} DESTDIR="${DESTDIR}" install); done + + install-dirs: + ${MAGICDIR}/scripts/mkdirs ${BINDIR} ${MANDIR} ${SYSDIR} ${SCMDIR} +diff -ru misc/paths.h magic-7.1/misc/paths.h +--- misc/paths.h 2003-11-17 17:01:50.000000000 +0100 ++++ magic-7.1/misc/paths.h 2003-11-17 17:09:29.000000000 +0100 +@@ -27,18 +27,18 @@ + * + */ + +-#define EXT_PATH "~cad/share/lib/magic/%s ~cad/share/lib/magic/tutorial" +-#define DOT_MAGIC_PATH "~cad/share/lib/magic/sys ~ ." ++#define EXT_PATH "/usr/share/magic/%s /usr/share/magic/tutorial" ++#define DOT_MAGIC_PATH "/usr/share/magic/sys ~ ." + + /* + * Paths used by 'magic'. + * + */ +-#define MAGIC_CMOS_PATH "~cad/share/lib/magic/cmos ~cad/share/lib/magic/tutorial" +-#define MAGIC_NMOS_PATH "~cad/share/lib/magic/nmos ~cad/share/lib/magic/tutorial" +-#define MAGIC_SYS_PATH ". ~cad/share/lib/magic/sys ~cad/share/lib/magic/sys/current" +-#define MAGIC_SYS_DOT "~cad/share/lib/magic/sys/.magic" +-#define MAGIC_LIB_PATH "~cad/share/lib/magic/%s ~cad/share/lib/magic/tutorial" ++#define MAGIC_CMOS_PATH "/usr/share/magic/cmos /usr/share/magic/tutorial" ++#define MAGIC_NMOS_PATH "/usr/share/magic/nmos /usr/share/magic/tutorial" ++#define MAGIC_SYS_PATH ". /usr/share/magic/sys /usr/share/magic/sys/current" ++#define MAGIC_SYS_DOT "/usr/share/magic/sys/.magic" ++#define MAGIC_LIB_PATH "/usr/share/magic/%s /usr/share/magic/tutorial" + #define HELPER_PATH ". ~cad/bin" /* Used by graphics drivers */ + + /* +diff -ru utils/flock.c magic-7.1/utils/flock.c +--- utils/flock.c 2003-11-17 17:59:45.000000000 +0100 ++++ utils/flock.c 2003-11-17 18:01:01.000000000 +0100 +@@ -123,7 +123,7 @@ + struct timeval name_time; + struct timezone dtime; + char cur_path[400]; +- char *cad_path; ++ /* char *cad_path; */ + char cad_buf[400]; + FILE *lfile, *mfile; /* local file and master file */ + char *normal_cad = "~cad"; +@@ -132,7 +132,7 @@ + /* environment variable CAD_HOME overrides, otherwise do tilde expansion */ + /* on "~cad". */ + +- if ((cad_path = getenv("CAD_HOME")) == NULL) ++ /* if ((cad_path = getenv("CAD_HOME")) == NULL) + { + cad_path = cad_buf; + if (PaConvertTilde (&normal_cad, &cad_path, 400) == -1) +@@ -145,7 +145,7 @@ + } + } + +- sprintf(lock_buf, "%s/flock", cad_path); ++ */ strcpy(lock_buf,"/var/lock/magic"); + dir = stat(lock_buf, &dirstat); + if((dir == -1) || !(( dirstat.st_mode) & S_IFDIR)) + { +@@ -161,7 +161,7 @@ + + /* Open the master file to create a link in CAD_HOME/flock */ + +- sprintf(lock_buf, "%s/flock/lock_%u%u", cad_path, ++ sprintf(lock_buf, "/var/lock/magic/lock_%u%u", + name_time.tv_sec, name_time.tv_usec); + + if ((mfile = fopen(lock_buf, "w")) == NULL) +--- magic/proto.magic 2001-10-04 00:20:29.000000000 +0200 ++++ magic/proto.magic.new 2003-11-18 09:07:18.000000000 +0100 +@@ -1,12 +1,4 @@ +-# $(CAD_HOME)/lib/sys/.magic +-# System wide start up file for magic, defines default macros. +-# +-# rcsid $Header: /var/cvsroot/gentoo-x86/app-sci/magic/files/magic-7.1-misc.patch,v 1.1 2003/11/18 08:36:39 phosphan Exp $ +-# + #ifndef USE_NEW_MACROS +-############################################################################### +-# Default .magic macro file (original) +-############################################################################### + echo "" + macro s "select" + macro S "select more" +@@ -222,19 +214,13 @@ + macro XK_F11 "paint pc" + macro XK_F12 "paint via" + #endif +-#endif (USE_NEW_MACROS) ++#endif + #ifndef NO_PLOT +-# +-# additions for plot package +-# + plot parameter spoolCommand "echo use 'lpr -P%s -v -s -JMagic %s' to print plot" + plot parameter directory "." +-#endif (NO_PLOT) ++#endif + #ifndef NO_SCHEME_INTERPRETER +-# +-# additions for default scm path +-# + define scm-library-path "~cad/lib/magic/scm" + load-scm "default.scm" + load-scm "layout.scm" +-#endif (NO_SCHEME_INTERPRETER) ++#endif diff --git a/app-sci/magic/files/magic-7.1-paths.patch b/app-sci/magic/files/magic-7.1-paths.patch deleted file mode 100644 index 37c72fbf6114..000000000000 --- a/app-sci/magic/files/magic-7.1-paths.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ru Makefile magic-7.1/Makefile ---- Makefile 2001-01-14 20:22:26.000000000 +0100 -+++ magic-7.1/Makefile 2003-11-17 17:05:41.000000000 +0100 -@@ -56,7 +56,7 @@ - - install-real: install-dirs - for dir in ${INSTALL_CAD_DIRS}; do \ -- (cd $$dir && ${MAKE} install); done -+ (cd $$dir && ${MAKE} DESTDIR="${DESTDIR}" install); done - - install-dirs: - ${MAGICDIR}/scripts/mkdirs ${BINDIR} ${MANDIR} ${SYSDIR} ${SCMDIR} -diff -ru misc/paths.h magic-7.1/misc/paths.h ---- misc/paths.h 2003-11-17 17:01:50.000000000 +0100 -+++ magic-7.1/misc/paths.h 2003-11-17 17:09:29.000000000 +0100 -@@ -27,18 +27,18 @@ - * - */ - --#define EXT_PATH "~cad/share/lib/magic/%s ~cad/share/lib/magic/tutorial" --#define DOT_MAGIC_PATH "~cad/share/lib/magic/sys ~ ." -+#define EXT_PATH "/usr/share/magic/%s /usr/share/magic/tutorial" -+#define DOT_MAGIC_PATH "/usr/share/magic/sys ~ ." - - /* - * Paths used by 'magic'. - * - */ --#define MAGIC_CMOS_PATH "~cad/share/lib/magic/cmos ~cad/share/lib/magic/tutorial" --#define MAGIC_NMOS_PATH "~cad/share/lib/magic/nmos ~cad/share/lib/magic/tutorial" --#define MAGIC_SYS_PATH ". ~cad/share/lib/magic/sys ~cad/share/lib/magic/sys/current" --#define MAGIC_SYS_DOT "~cad/share/lib/magic/sys/.magic" --#define MAGIC_LIB_PATH "~cad/share/lib/magic/%s ~cad/share/lib/magic/tutorial" -+#define MAGIC_CMOS_PATH "/usr/share/magic/cmos /usr/share/magic/tutorial" -+#define MAGIC_NMOS_PATH "/usr/share/magic/nmos /usr/share/magic/tutorial" -+#define MAGIC_SYS_PATH ". /usr/share/magic/sys /usr/share/magic/sys/current" -+#define MAGIC_SYS_DOT "/usr/share/magic/sys/.magic" -+#define MAGIC_LIB_PATH "/usr/share/magic/%s /usr/share/magic/tutorial" - #define HELPER_PATH ". ~cad/bin" /* Used by graphics drivers */ - - /* -diff -ru utils/flock.c magic-7.1/utils/flock.c ---- utils/flock.c 2003-11-17 17:59:45.000000000 +0100 -+++ utils/flock.c 2003-11-17 18:01:01.000000000 +0100 -@@ -123,7 +123,7 @@ - struct timeval name_time; - struct timezone dtime; - char cur_path[400]; -- char *cad_path; -+ /* char *cad_path; */ - char cad_buf[400]; - FILE *lfile, *mfile; /* local file and master file */ - char *normal_cad = "~cad"; -@@ -132,7 +132,7 @@ - /* environment variable CAD_HOME overrides, otherwise do tilde expansion */ - /* on "~cad". */ - -- if ((cad_path = getenv("CAD_HOME")) == NULL) -+ /* if ((cad_path = getenv("CAD_HOME")) == NULL) - { - cad_path = cad_buf; - if (PaConvertTilde (&normal_cad, &cad_path, 400) == -1) -@@ -145,7 +145,7 @@ - } - } - -- sprintf(lock_buf, "%s/flock", cad_path); -+ */ strcpy(lock_buf,"/var/lock/magic"); - dir = stat(lock_buf, &dirstat); - if((dir == -1) || !(( dirstat.st_mode) & S_IFDIR)) - { -@@ -161,7 +161,7 @@ - - /* Open the master file to create a link in CAD_HOME/flock */ - -- sprintf(lock_buf, "%s/flock/lock_%u%u", cad_path, -+ sprintf(lock_buf, "/var/lock/magic/lock_%u%u", - name_time.tv_sec, name_time.tv_usec); - - if ((mfile = fopen(lock_buf, "w")) == NULL) diff --git a/app-sci/magic/files/magic-7.1-vararg.patch b/app-sci/magic/files/magic-7.1-vararg.patch deleted file mode 100644 index b0efbfd8eb39..000000000000 --- a/app-sci/magic/files/magic-7.1-vararg.patch +++ /dev/null @@ -1,346 +0,0 @@ -diff -p1 -ur ext2sim/ext2sim-6.4.5/ext2sim.c magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim.c ---- ext2sim/ext2sim-6.4.5/ext2sim.c 2003-11-17 11:15:49.000000000 +0100 -+++ magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim.c 2003-11-17 11:26:52.000000000 +0100 -@@ -31,3 +31,3 @@ static char rcsid[] = "$Header: /ufs/rep - #include --#include -+ - #include "magic.h" -diff -p1 -ur ext2sim/ext2sim-6.4.5/ext2sim6_3.c magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim6_3.c ---- ext2sim/ext2sim-6.4.5/ext2sim6_3.c 2003-11-17 11:15:49.000000000 +0100 -+++ magic-7.1/ext2sim/ext2sim-6.4.5/ext2sim6_3.c 2003-11-17 11:26:52.000000000 +0100 -@@ -31,3 +31,3 @@ static char rcsid[] = "$Header: /ufs/rep - #include --#include -+ - #include "magic.h" -diff -p1 -ur ext2sim/ext2sim.c magic-7.1/ext2sim/ext2sim.c ---- ext2sim/ext2sim.c 2003-11-17 11:15:49.000000000 +0100 -+++ magic-7.1/ext2sim/ext2sim.c 2003-11-17 11:26:52.000000000 +0100 -@@ -21,3 +21,3 @@ static char rcsid[] = "$Header: /ufs/rep - #include --#include -+ - #include "misc/magic.h" -diff -p1 -ur ext2spice/ext2spice-6.4.5/ext2spice.c magic-7.1/ext2spice/ext2spice-6.4.5/ext2spice.c ---- ext2spice/ext2spice-6.4.5/ext2spice.c 2003-11-17 11:15:47.000000000 +0100 -+++ magic-7.1/ext2spice/ext2spice-6.4.5/ext2spice.c 2003-11-17 11:26:50.000000000 +0100 -@@ -35,3 +35,3 @@ static char rcsid[] = "$Header: /ufs/rep - #include --#include -+ - #include "magic.h" -diff -p1 -ur ext2spice/ext2spice.c magic-7.1/ext2spice/ext2spice.c ---- ext2spice/ext2spice.c 2003-11-17 11:15:47.000000000 +0100 -+++ magic-7.1/ext2spice/ext2spice.c 2003-11-17 12:00:37.000000000 +0100 -@@ -20,3 +20,4 @@ static char rcsid[] = "$Header: /ufs/rep - #include --#include -+#include -+ - #include "misc/magic.h" -@@ -1588,3 +1589,3 @@ int l, w; - /* debugging stuff */ --#include -+ - -@@ -1592,7 +1593,5 @@ int l, w; - --DBPRINT( va_alist ) -- va_dcl -+DBPRINT( const char * fmt, ... ) - { - va_list args; -- char *fmt; - FILE *fp; -@@ -1601,5 +1600,4 @@ DBPRINT( va_alist ) - if ( DBG ) { -- va_start( args ); -+ va_start( args,fmt ); - fp = stderr ; -- fmt = va_arg( args, char * ); - (void) vsprintf( buff, fmt, args ); -diff -p1 -ur extcheck/extcheck.c magic-7.1/extcheck/extcheck.c ---- extcheck/extcheck.c 2003-11-17 11:15:47.000000000 +0100 -+++ magic-7.1/extcheck/extcheck.c 2003-11-17 11:26:50.000000000 +0100 -@@ -30,3 +30,3 @@ static char rcsid[] = "$Header: /ufs/rep - #include --#include -+ - #include "misc/magic.h" -diff -p1 -ur extflat/EFargs.c magic-7.1/extflat/EFargs.c ---- extflat/EFargs.c 2003-11-17 11:15:49.000000000 +0100 -+++ magic-7.1/extflat/EFargs.c 2003-11-17 12:01:36.000000000 +0100 -@@ -26,3 +26,3 @@ static char rcsid[] = "$Header: /ufs/rep - #include --#include -+#include - #ifdef SYSV -diff -p1 -ur extflat/EFread.c magic-7.1/extflat/EFread.c ---- extflat/EFread.c 2003-11-17 11:15:49.000000000 +0100 -+++ magic-7.1/extflat/EFread.c 2003-11-17 11:50:53.000000000 +0100 -@@ -26,3 +26,4 @@ static char rcsid[] = "$Header: /ufs/rep - #include --#include -+#include -+ - #include "misc/magic.h" -@@ -35,2 +36,5 @@ static char rcsid[] = "$Header: /ufs/rep - -+ -+void efReadError(const char *fmt, ...); -+ - /* -@@ -536,5 +540,4 @@ start: - /*VARARGS1*/ --efReadError(fmt, va_alist) -- char *fmt; -- va_dcl -+ -+void efReadError(const char *fmt, ...) - { -@@ -543,3 +546,3 @@ efReadError(fmt, va_alist) - (void) printf("%s, line %d: ", efReadFileName, efReadLineNum); -- va_start(args); -+ va_start(args,fmt); - vfprintf(stdout, fmt, args); -diff -p1 -ur graphics/X11Helper.c magic-7.1/graphics/X11Helper.c ---- graphics/X11Helper.c 2003-11-17 11:15:48.000000000 +0100 -+++ magic-7.1/graphics/X11Helper.c 2003-11-17 12:11:09.000000000 +0100 -@@ -13,2 +13,4 @@ - -+#define X11HELP_PROG "XHelper7" -+ - #include -diff -p1 -ur graphics/grMain.c magic-7.1/graphics/grMain.c ---- graphics/grMain.c 2003-11-17 11:15:48.000000000 +0100 -+++ magic-7.1/graphics/grMain.c 2003-11-17 11:26:51.000000000 +0100 -@@ -122,3 +122,3 @@ static char rcsid[]="$Header: /ufs/repos - #ifndef NO_VARARGS --#include -+ - #endif -diff -p1 -ur graphics/grX11su1.c magic-7.1/graphics/grX11su1.c ---- graphics/grX11su1.c 2003-11-17 11:15:48.000000000 +0100 -+++ magic-7.1/graphics/grX11su1.c 2003-11-17 12:13:22.000000000 +0100 -@@ -19,2 +19,5 @@ - */ -+ -+#define X11HELP_PROG "XHelper7" -+ - #define HIRES -diff -p1 -ur lisp/other/txOutput.c magic-7.1/lisp/other/txOutput.c ---- lisp/other/txOutput.c 2003-11-17 11:15:47.000000000 +0100 -+++ magic-7.1/lisp/other/txOutput.c 2003-11-17 11:26:49.000000000 +0100 -@@ -41,3 +41,3 @@ static char rcsid[] = "$Header: /ufs/rep - #ifndef NO_VARARGS --#include -+ - #endif -diff -p1 -ur mpack/magicStubs.c magic-7.1/mpack/magicStubs.c ---- mpack/magicStubs.c 2003-11-17 11:15:48.000000000 +0100 -+++ magic-7.1/mpack/magicStubs.c 2003-11-17 12:23:32.000000000 +0100 -@@ -55,5 +55,5 @@ void SigDisableInterrupts(){} - /*VARARGS1*/ --void -+/*void - TxError(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) --char *format; -+const char *format; - { -@@ -64,5 +64,5 @@ char *format; - } -- -+*/ - /*VARARGS1*/ --void -+/*void - TxPrintf(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) -@@ -73,3 +73,3 @@ char *format; - } -- -+*/ - void -diff -p1 -ur tech/tech.h magic-7.1/tech/tech.h ---- tech/tech.h 2003-11-17 11:15:47.000000000 +0100 -+++ magic-7.1/tech/tech.h 2003-11-17 11:53:25.000000000 +0100 -@@ -25,2 +25,2 @@ typedef int SectionID; /* Mask set by T - extern char *TechDefault; /* Name of default technology */ --extern void TechError(); -+extern void TechError(const char *fmt, ...); -diff -p1 -ur textio/textio.h magic-7.1/textio/textio.h ---- textio/textio.h 2003-11-17 11:15:50.000000000 +0100 -+++ magic-7.1/textio/textio.h 2003-11-17 12:19:56.000000000 +0100 -@@ -31,6 +31,6 @@ - /* printing procedures */ --extern void TxPrintf(); -+extern void TxPrintf(const char*, ...); - extern bool TxPrintOn(); /* enables TxPrintf output */ - extern bool TxPrintOff(); /* disables TxPrintf output */ --extern void TxError(); -+extern void TxError(const char *, ...); - extern void TxFlush(); -diff -p1 -ur textio/textioInt.h magic-7.1/textio/textioInt.h ---- textio/textioInt.h 2003-11-17 11:15:50.000000000 +0100 -+++ magic-7.1/textio/textioInt.h 2003-11-17 12:16:13.000000000 +0100 -@@ -58,2 +58,2 @@ typedef struct { - extern int TxGetInputEvent(); --extern void txFprintfBasic(); -+extern void txFprintfBasic(FILE *, const char*, ...); -diff -p1 -ur textio/txOutput.c magic-7.1/textio/txOutput.c ---- textio/txOutput.c 2003-11-17 11:15:50.000000000 +0100 -+++ magic-7.1/textio/txOutput.c 2003-11-17 12:21:19.000000000 +0100 -@@ -18,2 +18,4 @@ - -+#include -+ - #ifndef lint -@@ -44,3 +46,3 @@ static char rcsid[] = "$Header: /ufs/rep - #ifndef NO_VARARGS --#include -+ - #endif -@@ -84,12 +86,7 @@ static bool txPrintFlag = TRUE; - void --txFprintfBasic(va_alist) --va_dcl -+txFprintfBasic(FILE *f, const char * fmt, ...) - { - va_list args; -- char *fmt; -- FILE *f; - -- va_start(args); -- f = va_arg(args, FILE *); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); -@@ -137,7 +134,5 @@ txFprintfBasic(f, format, a1, a2, a3, a4 - void --TxPrintf(va_alist) --va_dcl -+TxPrintf(const char *fmt, ...) - { - va_list args; -- char *fmt; - FILE *f; -@@ -158,4 +153,3 @@ va_dcl - TxUnPrompt(); -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); -@@ -166,4 +160,3 @@ va_dcl - { -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); -@@ -308,7 +301,5 @@ TxFlush() - void --TxError(va_alist) --va_dcl -+TxError(const char *fmt, ...) - { - va_list args; -- char *fmt; - FILE *f; -@@ -323,4 +314,3 @@ va_dcl - TxUnPrompt(); -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); -@@ -330,4 +320,3 @@ va_dcl - else { -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args,fmt); - (void) GrVfprintf(f, fmt, args); -diff -p1 -ur utils/LIBtextio.c magic-7.1/utils/LIBtextio.c ---- utils/LIBtextio.c 2003-11-17 11:15:48.000000000 +0100 -+++ magic-7.1/utils/LIBtextio.c 2003-11-17 12:25:20.000000000 +0100 -@@ -19,2 +19,4 @@ - -+#include -+ - #ifndef lint -@@ -24,3 +26,3 @@ static char rcsid[] = "$Header: /ufs/rep - #include --#include -+ - -@@ -67,5 +69,3 @@ TxGetLine(buf, size) - /*VARARGS*/ --TxError(fmt, va_alist) -- char *fmt; -- va_dcl -+TxError(const char *fmt, ...) - { -@@ -75,3 +75,3 @@ TxError(fmt, va_alist) - (void) fflush(stderr); -- va_start(ap); -+ va_start(ap,fmt); - vfprintf(stderr, fmt, ap); -@@ -98,5 +98,3 @@ TxError(fmt, va_alist) - /*VARARGS*/ --TxPrintf(fmt, va_alist) -- char *fmt; -- va_dcl -+TxPrintf(const char *fmt, ...) - { -@@ -106,3 +104,3 @@ TxPrintf(fmt, va_alist) - (void) fflush(stdout); -- va_start(ap); -+ va_start(ap,fmt); - vfprintf(stdout, fmt, ap); -diff -p1 -ur windows/windCmdAM.c magic-7.1/windows/windCmdAM.c ---- windows/windCmdAM.c 2003-11-17 11:15:50.000000000 +0100 -+++ magic-7.1/windows/windCmdAM.c 2003-11-17 12:29:08.000000000 +0100 -@@ -304,6 +304,3 @@ windFilesCmd(w, cmd) - } else { -- if (errno < sys_nerr) -- TxError("file descriptor %d: %s\n", fd, STRERROR(errno)); -- else -- TxError("file descriptor %d: unknown error\n", fd); -+ TxError("file descriptor %d: %s\n", fd, strerror(errno)); - } ---- tech/tech.c 2003-11-17 13:18:16.000000000 +0100 -+++ tech/tech.c.new 2003-11-17 13:20:13.000000000 +0100 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "misc/magic.h" - #include "utils/geometry.h" - #include "utils/utils.h" -@@ -30,10 +31,6 @@ - #include "graphics/graphics.h" - #include "utils/malloc.h" - --#ifndef NO_VARARGS --#include --#endif NO_VARARGS -- - global char *TechDefault = NULL; - - int techLineNumber; -@@ -415,15 +412,12 @@ - /*VARARGS0*/ - - void --TechError(va_alist) --va_dcl -+TechError(const char *fmt, ...) - { - va_list args; -- char *fmt; - - TechPrintLine(); -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(stderr, fmt, args); - va_end(args); - } diff --git a/app-sci/magic/magic-7.1-r2.ebuild b/app-sci/magic/magic-7.1-r2.ebuild index fbfb9d00b378..e25348d27870 100644 --- a/app-sci/magic/magic-7.1-r2.ebuild +++ b/app-sci/magic/magic-7.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/magic/magic-7.1-r2.ebuild,v 1.2 2003/11/17 17:51:47 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/magic/magic-7.1-r2.ebuild,v 1.3 2003/11/18 08:36:39 phosphan Exp $ S=${WORKDIR}/${P} DESCRIPTION="The VLSI design CAD tool" @@ -26,12 +26,9 @@ src_unpack() { # Patch for GCC 3.2 compatibility epatch ${FILESDIR}/${P}-gcc3.2.patch - # deprecated varargs stuff + # some gcc 3.3 stuff, paths... cd ${S} - epatch ${FILESDIR}/${P}-vararg.patch - - # modify hardcoded paths - epatch ${FILESDIR}/${P}-paths.patch + epatch ${FILESDIR}/${P}-misc.patch # Insert our idea of configuration file cp ${FILESDIR}/defs.mak-${PV}-r2 ${S}/defs.mak @@ -40,8 +37,8 @@ src_unpack() { # Clean up all the pre-GCC-3.2 preprocessor directives einfo "Cleansing preprocessor directives" - find ./ -name "*.[ch]" -or -name "proto.magic" | xargs -n 1 perl -pi -e 's/^\#endif..*$/\#endif/' - find ./ -name "*.[ch]" -or -name "proto.magic" | xargs -n 1 perl -pi -e 's/^\#else..*$/\#else/' + find ./ -name "*.[ch]" | xargs -n 1 perl -pi -e 's/^\#endif..*$/\#endif/' + find ./ -name "*.[ch]" | xargs -n 1 perl -pi -e 's/^\#else..*$/\#else/' } src_compile() { @@ -62,6 +59,7 @@ src_install () { mv * ${D}/usr/share/magic/ cd ${D}/usr/lib mv *.h *.a magic/ - dosym ../share/magic/sys magic/sy - dosym ../share/magic/scm magic/scm + ln -s ../../share/magic/sys magic/sys + ln -s ../../share/magic/scm magic/scm + ln -s ../../share/magic/tutorial magic/tutorial } -- cgit v1.2.3-65-gdbad