Closing bug 32956

5 files changed, 135 insertions, 95 deletions

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 <phosphan@gentoo.org> 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-vararg.patch b/app-sci/magic/files/magic-7.1-misc.patch
index b0efbfd8eb39..122b92d88a2f 100644
--- a/app-sci/magic/files/magic-7.1-vararg.patch
+++ b/app-sci/magic/files/magic-7.1-misc.patch
@@ -344,3 +344,121 @@ diff -p1 -ur windows/windCmdAM.c magic-7.1/windows/windCmdAM.c
      (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/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
 }