diff options
author | Michael Weber <xmw@gentoo.org> | 2013-05-15 08:24:16 +0000 |
---|---|---|
committer | Michael Weber <xmw@gentoo.org> | 2013-05-15 08:24:16 +0000 |
commit | ecb959756b565420cdcef94fb1f94537a56d141c (patch) | |
tree | adbcb0c62d89bf626dd048fca7cfce9764102d93 /sci-electronics/netgen/files | |
parent | Version bump, our patches were accepted for stable upstream (diff) | |
download | gentoo-2-ecb959756b565420cdcef94fb1f94537a56d141c.tar.gz gentoo-2-ecb959756b565420cdcef94fb1f94537a56d141c.tar.bz2 gentoo-2-ecb959756b565420cdcef94fb1f94537a56d141c.zip |
Version bump, drop old.
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'sci-electronics/netgen/files')
6 files changed, 0 insertions, 278 deletions
diff --git a/sci-electronics/netgen/files/netgen-1.3.10-LDFLAGS.patch b/sci-electronics/netgen/files/netgen-1.3.10-LDFLAGS.patch deleted file mode 100644 index e1830533f1c4..000000000000 --- a/sci-electronics/netgen/files/netgen-1.3.10-LDFLAGS.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- netgen-1.3.10/scripts/configure -+++ netgen-1.3.10/scripts/configure -@@ -8487,11 +8487,11 @@ - ;; - - *-linux*) -- LDDL_FLAGS='-shared -Wl,-soname,$@' -+ LDDL_FLAGS+=' -shared -Wl,-soname,$@' - if test "x${loader_run_path}" != "x" ; then - LD_RUN_PATH="${LD_RUN_PATH} -Wl,-rpath,${loader_run_path}" - fi -- LDFLAGS="" -+ LDFLAGS+=" " - EXTRA_LIB_SPECS="-ldl" - ;; - ---- netgen-1.3.10/tcltk/Makefile -+++ netgen-1.3.10/tcltk/Makefile -@@ -24,7 +24,7 @@ - - netgenexec${EXEEXT}: netgenexec.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} netgenexec.c -o netgenexec${EXEEXT} \ -- ${LIBS} ${LIB_SPECS} -+ ${LIBS} ${LIB_SPECS} ${LDFLAGS} - - netgen.tcl: netgen.tcl.in - sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \ ---- netgen-1.3.10/rules.mak -+++ netgen-1.3.10/rules.mak -@@ -28,7 +28,7 @@ - ${MODULE}: lib${MODULE}.o ${EXTRA_LIBS} - @echo --- building main ${MODULE} - ${RM} ${MODULE} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS} -+ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS} ${LDFLAGS} - - ${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT} - ${RM} ${BINDIR}/${MODULE}${EXEEXT} ---- netgen-1.3.10/netgen/Makefile -+++ netgen-1.3.10/netgen/Makefile -@@ -22,7 +22,7 @@ - @echo --- making netgen Tcl library \(tclnetgen${SHDLIB_EXT}\) - ${RM} tclnetgen${SHDLIB_EXT} - ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} \ -- ${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} -lc ${LIBS} -+ ${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} -lc ${LIBS} ${LDFLAGS} - - $(DESTDIR)${BINDIR}/netgen: - ${RM} $@ -@@ -46,19 +46,19 @@ - - netcomp: netcomp.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} netcomp.c -o $@ ${LIBS} \ -- ${EXTRA_LIBS} -+ ${EXTRA_LIBS} ${LDFLAGS} - - inetcomp: inetcomp.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} inetcomp.c -o $@ ${LIBS} \ -- ${EXTRA_LIBS} -+ ${EXTRA_LIBS} ${LDFLAGS} - - ntk2adl: ntk2adl.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ntk2adl.c -o $@ ${LIBS} \ -- ${EXTRA_LIBS} -+ ${EXTRA_LIBS} ${LDFLAGS} - - ntk2xnf: ntk2xnf.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ntk2xnf.c -o $@ ${LIBS} \ -- ${EXTRA_LIBS} -+ ${EXTRA_LIBS} ${LDFLAGS} - - install: $(DESTDIR)${BINDIR}/netgen $(DESTDIR)${BINDIR}/netcomp \ - $(DESTDIR)${BINDIR}/inetcomp $(DESTDIR)${BINDIR}/ntk2adl \ ---- netgen-1.4.40/scripts/defs.mak.in -+++ netgen-1.4.40/scripts/defs.mak.in -@@ -47,9 +47,9 @@ - - RM = rm -f - CP = cp --AR = ar -+AR = @AR@ - ARFLAGS = crv --LINK = ld -r -+LINK = @LD@ -r - LD = @LD@ - M4 = @M4@ - RANLIB = @RANLIB@ diff --git a/sci-electronics/netgen/files/netgen-1.3.10-includes.patch b/sci-electronics/netgen/files/netgen-1.3.10-includes.patch deleted file mode 100644 index 4101c5b8ea87..000000000000 --- a/sci-electronics/netgen/files/netgen-1.3.10-includes.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- netgen-1.4.40/base/config.h -+++ netgen-1.4.40/base/config.h -@@ -192,6 +192,7 @@ - extern char *Tcl_Strdup(const char *); - #define STRDUP(a) Tcl_Strdup((const char *)a) - #else -+ #include <stdlib.h> - #define CALLOC(a, s) calloc(a, s) - #define MALLOC(s) malloc(s) - #define FREE(a) free(a) ---- netgen-1.4.40/base/place.c -+++ netgen-1.4.40/base/place.c -@@ -34,6 +34,7 @@ - #include "config.h" - - #include <stdio.h> -+#include <stdlib.h> - #include <math.h> - #include <setjmp.h> - #include <signal.h> ---- netgen-1.3.10/tcltk/tclnetgen.c -+++ netgen-1.3.10/tcltk/tclnetgen.c -@@ -19,6 +19,8 @@ - /* tclnetgen.c --- Tcl interpreter interface for using netgen */ - - #include <stdio.h> -+#include <string.h> -+#include <stdlib.h> - - #include <tcl.h> - ---- netgen-1.3.10/base/netcmp.c -+++ netgen-1.3.10/base/netcmp.c -@@ -21,6 +21,7 @@ - #include "config.h" - - #include <stdio.h> -+#include <stdlib.h> - #include <setjmp.h> - #include <signal.h> - #include <time.h> /* for time() as a seed for random number generator */ ---- netgen-1.3.10/base/spice.c -+++ netgen-1.3.10/base/spice.c -@@ -21,6 +21,7 @@ - #include "config.h" - - #include <stdio.h> -+#include <stdlib.h> - #if 0 - #include <stdarg.h> /* what about varargs, like in pdutils.c ??? */ - #endif diff --git a/sci-electronics/netgen/files/netgen-1.3.10-tk-version.patch b/sci-electronics/netgen/files/netgen-1.3.10-tk-version.patch deleted file mode 100644 index 8312ea6b7a04..000000000000 --- a/sci-electronics/netgen/files/netgen-1.3.10-tk-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- netgen-1.3.10/tcltk/tkcon.tcl -+++ netgen-1.3.10/tcltk/tkcon.tcl -@@ -44,7 +44,7 @@ - if {$tcl_version < 8.0} { - return -code error "tkcon requires at least Tcl/Tk8" - } else { -- package require -exact Tk $tcl_version -+ package require Tk - } - - catch {package require bogus-package-name} diff --git a/sci-electronics/netgen/files/netgen-1.4.40-LDFLAGS.patch b/sci-electronics/netgen/files/netgen-1.4.40-LDFLAGS.patch deleted file mode 100644 index c72a00ba2761..000000000000 --- a/sci-electronics/netgen/files/netgen-1.4.40-LDFLAGS.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- netgen-1.4.40/scripts/configure -+++ netgen-1.4.40/scripts/configure -@@ -6244,11 +6244,11 @@ - ;; - - *-linux*) -- LDDL_FLAGS='-shared -Wl,-soname,$@' -+ LDDL_FLAGS+=' -shared -Wl,-soname,$@' - if test "x${loader_run_path}" != "x" ; then - LD_RUN_PATH="${LD_RUN_PATH} -Wl,-rpath,${loader_run_path}" - fi -- LDFLAGS="" -+ LDFLAGS+=" " - EXTRA_LIB_SPECS="-ldl" - ;; - ---- netgen-1.4.40/tcltk/Makefile -+++ netgen-1.4.40/tcltk/Makefile -@@ -23,7 +23,7 @@ - ${CP} netgenexec${EXEEXT} $(DESTDIR)${TCLDIR}/netgenexec${EXEEXT} - - netgenexec${EXEEXT}: netgenexec.c -- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} netgenexec.c -o netgenexec${EXEEXT} \ -+ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} netgenexec.c -o netgenexec${EXEEXT} ${LDFLAGS} \ - ${LIBS} ${LIB_SPECS} - - netgen.tcl: netgen.tcl.in ---- netgen-1.4.40/rules.mak -+++ netgen-1.4.40/rules.mak -@@ -28,7 +28,7 @@ - ${MODULE}: lib${MODULE}.o ${EXTRA_LIBS} - @echo --- building main ${MODULE} - ${RM} ${MODULE} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS} -+ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS} ${LDFLAGS} - - clean: - ${RM} ${CLEANS} ---- netgen-1.4.40/netgen/Makefile -+++ netgen-1.4.40/netgen/Makefile -@@ -10,7 +10,7 @@ - DFLAGS += ${GR_DFLAGS} - DFLAGS += -DNETGEN_DATE="\"`date`\"" - --LIBS += ${GR_LIBS} -lm -+LIBS += ${GR_LIBS} -lm -ltcl - CFLAGS += ${GR_CFLAGS} -I${NETGENDIR}/base - CLEANS += netgen netcomp ntk2adl inetcomp ntk2xnf - -@@ -22,7 +22,7 @@ - @echo --- making netgen Tcl library \(tclnetgen${SHDLIB_EXT}\) - ${RM} tclnetgen${SHDLIB_EXT} - ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} \ -- ${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} -lc ${LIBS} -+ ${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} -lc ${LIBS} ${LDFLAGS} - - $(DESTDIR)${BINDIR}/netgen: - ${RM} $@ -@@ -46,19 +46,19 @@ - - netcomp: netcomp.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} netcomp.c -o $@ ${EXTRA_LIBS} \ -- ${LIBS} -+ ${LIBS} ${LDFLAGS} - - inetcomp: inetcomp.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} inetcomp.c -o $@ ${EXTRA_LIBS} \ -- ${LIBS} -+ ${LIBS} ${LDFLAGS} - - ntk2adl: ntk2adl.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ntk2adl.c -o $@ ${EXTRA_LIBS} \ -- ${LIBS} -+ ${LIBS} ${LDFLAGS} - - ntk2xnf: ntk2xnf.c - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ntk2xnf.c -o $@ ${EXTRA_LIBS} \ -- ${LIBS} -+ ${LIBS} ${LDFLAGS} - - install: $(DESTDIR)${BINDIR}/netgen $(DESTDIR)${BINDIR}/netcomp \ - $(DESTDIR)${BINDIR}/inetcomp $(DESTDIR)${BINDIR}/ntk2adl \ ---- netgen-1.4.40/scripts/defs.mak.in -+++ netgen-1.4.40/scripts/defs.mak.in -@@ -47,9 +47,9 @@ - - RM = rm -f - CP = cp --AR = ar -+AR = @AR@ - ARFLAGS = crv --LINK = ld -r -+LINK = @LD@ -r - LD = @LD@ - M4 = @M4@ - RANLIB = @RANLIB@ diff --git a/sci-electronics/netgen/files/netgen-1.4.40-includes.patch b/sci-electronics/netgen/files/netgen-1.4.40-includes.patch deleted file mode 100644 index 0bbe1a12c710..000000000000 --- a/sci-electronics/netgen/files/netgen-1.4.40-includes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- netgen-1.4.40/base/config.h -+++ netgen-1.4.40/base/config.h -@@ -192,6 +192,7 @@ - extern char *Tcl_Strdup(const char *); - #define STRDUP(a) Tcl_Strdup((const char *)a) - #else -+ #include <stdlib.h> - #define CALLOC(a, s) calloc(a, s) - #define MALLOC(s) malloc(s) - #define FREE(a) free(a) ---- netgen-1.4.40/base/place.c -+++ netgen-1.4.40/base/place.c -@@ -34,6 +34,7 @@ - #include "config.h" - - #include <stdio.h> -+#include <stdlib.h> - #include <math.h> - #include <setjmp.h> - #include <signal.h> diff --git a/sci-electronics/netgen/files/netgen-1.4.40-netcmp.patch b/sci-electronics/netgen/files/netgen-1.4.40-netcmp.patch deleted file mode 100644 index 6a3bda60515e..000000000000 --- a/sci-electronics/netgen/files/netgen-1.4.40-netcmp.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- netgen-1.4.40/base/netcmp.c -+++ netgen-1.4.40/base/netcmp.c -@@ -4300,8 +4300,8 @@ - SummarizeNodeClasses(NodeClasses); - break; - case 'P': -- PrintElementClasses(ElementClasses); -- PrintNodeClasses(NodeClasses); -+ PrintElementClasses(ElementClasses, -1, 0); -+ PrintNodeClasses(NodeClasses, -1, 0); - break; - case 'r': - while (!Iterate()) ; |