diff options
author | Justin Lecher <jlec@gentoo.org> | 2011-02-27 10:40:36 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2011-02-27 10:40:36 +0000 |
commit | 7d762fcdd7bc00c950d91fc74d235bbac01b8bea (patch) | |
tree | 1e9176c1735ccbb29e892bae012e7b6ffa57b6d8 /sci-chemistry/raster3d/files | |
parent | USE="static-libs" and remove libdynamite.la in favour of libdynamite.pc. Pick... (diff) | |
download | historical-7d762fcdd7bc00c950d91fc74d235bbac01b8bea.tar.gz historical-7d762fcdd7bc00c950d91fc74d235bbac01b8bea.tar.bz2 historical-7d762fcdd7bc00c950d91fc74d235bbac01b8bea.zip |
Version BUmp
Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/raster3d/files')
-rw-r--r-- | sci-chemistry/raster3d/files/3.0.2-as-needed.patch | 50 | ||||
-rw-r--r-- | sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch | 24 |
2 files changed, 74 insertions, 0 deletions
diff --git a/sci-chemistry/raster3d/files/3.0.2-as-needed.patch b/sci-chemistry/raster3d/files/3.0.2-as-needed.patch new file mode 100644 index 000000000000..b127d9450661 --- /dev/null +++ b/sci-chemistry/raster3d/files/3.0.2-as-needed.patch @@ -0,0 +1,50 @@ +diff --git a/Makefile b/Makefile +index 1a1c549..4d74dd0 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,7 +58,7 @@ linux: + @echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl + @echo include Makefile.package >> Makefile.incl + @echo >> Makefile.incl +- @echo qinp.o: qinp.f >> Makefile.incl ++ @echo qinp.o: qinp.f normal3d.o >> Makefile.incl + @echo " \$$(FC) -g -O0 -Wall -Wtabs -c -o qinp.o qinp.f" >> Makefile.incl + @echo >> Makefile.incl + +@@ -214,20 +214,20 @@ ribbon: ribbon.f ribbon1.f modsubs.f + ribbon.f ribbon1.f modsubs.f -o ribbon + + rastep: rastep.f quadric.o suv.o +- $(FC) $(FFLAGS) \ +- rastep.f quadric.o suv.o $(LDFLAGS) \ ++ $(FC) $(FFLAGS) $(LDFLAGS) \ ++ rastep.f quadric.o suv.o \ + -o rastep + + render: render.o local.o quadric.o parse.o r3dtogd.o ungz.o qinp.o +- $(FC) $(FFLAGS) \ ++ $(FC) $(FFLAGS) $(LDFLAGS) \ + render.o local.o quadric.o parse.o r3dtogd.o ungz.o \ + qinp.o \ +- $(LIBS) $(LDFLAGS) \ +- -o render ++ -o render \ ++ $(LIBS) + + normal3d: normal3d.o quadric.o qinp.o ungz.o parameters.incl +- $(FC) $(FFLAGS) \ +- normal3d.o quadric.o ungz.o qinp.o $(LDFLAGS) \ ++ $(FC) $(FFLAGS) $(LDFLAGS) \ ++ normal3d.o quadric.o ungz.o qinp.o \ + -o normal3d + + stereo3d: +@@ -264,7 +264,7 @@ example1.png: render_small + ./render_small + + render_small: render_small.o local.o quadric.o parse_small.o r3dtogd.o ungz.o qinp_small.o +- $(FC) $(FFLAGS) $^ $(LIBS) $(LDFLAGS) -o $@ ++ $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + + .SUFFIXES: .incl + SMALL=10 diff --git a/sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch b/sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch new file mode 100644 index 000000000000..19b6cac3a6fe --- /dev/null +++ b/sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile.template b/Makefile.template +index 59de553..0ed283d 100644 +--- a/Makefile.template ++++ b/Makefile.template +@@ -8,15 +8,15 @@ include VERSION + # + # Where to install the program, data files, and manuals + # +-prefix = /usr/local ++prefix = @GENTOO_PORTAGE_EPREFIX@/usr/ + bindir = $(prefix)/bin + datadir = $(prefix)/share/Raster3D/materials + mandir = $(prefix)/man/manl +-htmldir = $(prefix)/share/Raster3D/html ++htmldir = $(prefix)/share/doc/MYPF/html + examdir = $(prefix)/share/Raster3D/examples + +-INCDIRS = -I/usr/include -I/usr/local/include +-LIBDIRS = -L/usr/local/lib ++INCDIRS = -I@GENTOO_PORTAGE_EPREFIX@/usr/include ++LIBDIRS = -L@GENTOO_PORTAGE_EPREFIX@/usr/MYLIB + + # + # TIFF support (enabled by default) |