summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2003-11-17 14:32:45 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2003-11-17 14:32:45 +0000
commite87dbf84b13ba79d9622febdcf64e8bce07e6b58 (patch)
tree2a279e93e0c64f3e4479d1ae725679c443e56524 /app-sci
parentShould compile now (diff)
downloadgentoo-2-e87dbf84b13ba79d9622febdcf64e8bce07e6b58.tar.gz
gentoo-2-e87dbf84b13ba79d9622febdcf64e8bce07e6b58.tar.bz2
gentoo-2-e87dbf84b13ba79d9622febdcf64e8bce07e6b58.zip
Should compile now
Diffstat (limited to 'app-sci')
-rw-r--r--app-sci/magic/ChangeLog8
-rw-r--r--app-sci/magic/Manifest6
-rw-r--r--app-sci/magic/files/digest-magic-7.1-r21
-rw-r--r--app-sci/magic/files/magic-7.1-vararg.patch346
-rw-r--r--app-sci/magic/magic-7.1-r2.ebuild54
5 files changed, 410 insertions, 5 deletions
diff --git a/app-sci/magic/ChangeLog b/app-sci/magic/ChangeLog
index 033ec23f0430..b032661ba875 100644
--- a/app-sci/magic/ChangeLog
+++ b/app-sci/magic/ChangeLog
@@ -1,6 +1,12 @@
# 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.6 2003/02/12 05:17:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/magic/ChangeLog,v 1.7 2003/11/17 14:32:39 phosphan Exp $
+
+*magic-7.1-r2 (17 Nov 2003)
+
+ 17 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> magic-7.1-r2.ebuild,
+ files/magic-7.1-vararg.patch:
+ Working on bug 32956 - package compiles fine now, paths are still incorrect.
15 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> magic-7.1-r1.ebuild :
Marked as stable.
diff --git a/app-sci/magic/Manifest b/app-sci/magic/Manifest
index d370cbb3d316..a45f6e469f1d 100644
--- a/app-sci/magic/Manifest
+++ b/app-sci/magic/Manifest
@@ -1,10 +1,8 @@
MD5 c2a27d44d0be46e39aba2a6390466cb4 magic-7.1.ebuild 1117
MD5 5b846a413bc6a8748980558985636cad magic-7.1-r1.ebuild 1203
-MD5 58f84bb6c1caca8f6319b0d9d7cf9f4f tech.c 15780
-MD5 d3d4da02aa9f00fd6017983c182b26b1 ChangeLog 919
-MD5 de2969f2e44258c14fe8835b14529878 magic-7.1-r2.ebuild 1461
+MD5 d5a08621d97bb393555e846a92e76838 ChangeLog 1136
+MD5 2ae7f18a4c03f6396571e15381a776af magic-7.1-r2.ebuild 1461
MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 5e64c64a6084c4b85df4a9aa8678e881 tech.c.new 15702
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
diff --git a/app-sci/magic/files/digest-magic-7.1-r2 b/app-sci/magic/files/digest-magic-7.1-r2
new file mode 100644
index 000000000000..b5c06b5e7f42
--- /dev/null
+++ b/app-sci/magic/files/digest-magic-7.1-r2
@@ -0,0 +1 @@
+MD5 13364b77566f5b47fd3f2783e188d3df magic-7.1.tar.gz 3860487
diff --git a/app-sci/magic/files/magic-7.1-vararg.patch b/app-sci/magic/files/magic-7.1-vararg.patch
new file mode 100644
index 000000000000..b0efbfd8eb39
--- /dev/null
+++ b/app-sci/magic/files/magic-7.1-vararg.patch
@@ -0,0 +1,346 @@
+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 <ctype.h>
+-#include <varargs.h>
++
+ #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 <ctype.h>
+-#include <varargs.h>
++
+ #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 <stdlib.h>
+-#include <varargs.h>
++
+ #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 <ctype.h>
+-#include <varargs.h>
++
+ #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 <ctype.h>
+-#include <varargs.h>
++#include <stdarg.h>
++
+ #include "misc/magic.h"
+@@ -1588,3 +1589,3 @@ int l, w;
+ /* debugging stuff */
+-#include <varargs.h>
++
+
+@@ -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 <ctype.h>
+-#include <varargs.h>
++
+ #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 <stdlib.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #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 <stdlib.h>
+-#include <varargs.h>
++#include <stdarg.h>
++
+ #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 <stdio.h>
+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 <varargs.h>
++
+ #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 <varargs.h>
++
+ #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 <stdarg.h>
++
+ #ifndef lint
+@@ -44,3 +46,3 @@ static char rcsid[] = "$Header: /ufs/rep
+ #ifndef NO_VARARGS
+-#include <varargs.h>
++
+ #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 <stdarg.h>
++
+ #ifndef lint
+@@ -24,3 +26,3 @@ static char rcsid[] = "$Header: /ufs/rep
+ #include <stdio.h>
+-#include <varargs.h>
++
+
+@@ -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 <stdio.h>
+ #include <ctype.h>
++#include <stdarg.h>
+ #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 <varargs.h>
+-#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
new file mode 100644
index 000000000000..54381e7d0952
--- /dev/null
+++ b/app-sci/magic/magic-7.1-r2.ebuild
@@ -0,0 +1,54 @@
+# 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.1 2003/11/17 14:32:40 phosphan Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="The VLSI design CAD tool"
+SRC_URI="http://vlsi.cornell.edu/magic/${P}.tar.gz"
+HOMEPAGE="http://vlsi.cornell.edu/magic/"
+KEYWORDS="~x86"
+LICENSE="as-is"
+DEPEND="sys-apps/findutils
+ dev-lang/perl
+ >=app-shells/tcsh-6.10-r3
+ sys-libs/libtermcap-compat"
+RDEPEND="sys-libs/libtermcap-compat"
+SLOT="7"
+
+inherit eutils
+
+src_unpack() {
+ unpack ${A}
+
+ # Patch to use FHS paths
+ epatch ${FILESDIR}/${P}-fhs.patch
+
+ # Patch for GCC 3.2 compatibility
+ epatch ${FILESDIR}/${P}-gcc3.2.patch
+
+ # deprecated varargs stuff
+ cd ${S}
+ epatch ${FILESDIR}/${P}-vararg.patch
+
+ # Insert our idea of configuration file
+ cp ${FILESDIR}/defs.mak-${PV}-r1 ${S}/defs.mak
+
+ scripts/makedbh database/database.h.in database/database.h
+
+ # Clean up all the pre-GCC-3.2 preprocessor directives
+ einfo "Cleansing preprocessor directives"
+ 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() {
+ emake || die
+ egrep -q "^make.*Error" make.log && die "Error while compiling - please add ${S}/make.log to your error report."
+}
+
+src_install () {
+ make DESTDIR=${D} install || die
+
+ insinto /etc/env.d
+ doins ${FILESDIR}/10magic
+}