| 1 |
jlec 11/02/27 10:40:36 |
| 2 |
|
| 3 |
Added: 3.0.2-gentoo-prefix.patch 3.0.2-as-needed.patch |
| 4 |
Log: |
| 5 |
Version BUmp |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 3.0.2-gentoo-prefix.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/Makefile.template b/Makefile.template |
| 18 |
index 59de553..0ed283d 100644 |
| 19 |
--- a/Makefile.template |
| 20 |
+++ b/Makefile.template |
| 21 |
@@ -8,15 +8,15 @@ include VERSION |
| 22 |
# |
| 23 |
# Where to install the program, data files, and manuals |
| 24 |
# |
| 25 |
-prefix = /usr/local |
| 26 |
+prefix = @GENTOO_PORTAGE_EPREFIX@/usr/ |
| 27 |
bindir = $(prefix)/bin |
| 28 |
datadir = $(prefix)/share/Raster3D/materials |
| 29 |
mandir = $(prefix)/man/manl |
| 30 |
-htmldir = $(prefix)/share/Raster3D/html |
| 31 |
+htmldir = $(prefix)/share/doc/MYPF/html |
| 32 |
examdir = $(prefix)/share/Raster3D/examples |
| 33 |
|
| 34 |
-INCDIRS = -I/usr/include -I/usr/local/include |
| 35 |
-LIBDIRS = -L/usr/local/lib |
| 36 |
+INCDIRS = -I@GENTOO_PORTAGE_EPREFIX@/usr/include |
| 37 |
+LIBDIRS = -L@GENTOO_PORTAGE_EPREFIX@/usr/MYLIB |
| 38 |
|
| 39 |
# |
| 40 |
# TIFF support (enabled by default) |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 sci-chemistry/raster3d/files/3.0.2-as-needed.patch |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/raster3d/files/3.0.2-as-needed.patch?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/raster3d/files/3.0.2-as-needed.patch?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: 3.0.2-as-needed.patch |
| 50 |
=================================================================== |
| 51 |
diff --git a/Makefile b/Makefile |
| 52 |
index 1a1c549..4d74dd0 100644 |
| 53 |
--- a/Makefile |
| 54 |
+++ b/Makefile |
| 55 |
@@ -58,7 +58,7 @@ linux: |
| 56 |
@echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl |
| 57 |
@echo include Makefile.package >> Makefile.incl |
| 58 |
@echo >> Makefile.incl |
| 59 |
- @echo qinp.o: qinp.f >> Makefile.incl |
| 60 |
+ @echo qinp.o: qinp.f normal3d.o >> Makefile.incl |
| 61 |
@echo " \$$(FC) -g -O0 -Wall -Wtabs -c -o qinp.o qinp.f" >> Makefile.incl |
| 62 |
@echo >> Makefile.incl |
| 63 |
|
| 64 |
@@ -214,20 +214,20 @@ ribbon: ribbon.f ribbon1.f modsubs.f |
| 65 |
ribbon.f ribbon1.f modsubs.f -o ribbon |
| 66 |
|
| 67 |
rastep: rastep.f quadric.o suv.o |
| 68 |
- $(FC) $(FFLAGS) \ |
| 69 |
- rastep.f quadric.o suv.o $(LDFLAGS) \ |
| 70 |
+ $(FC) $(FFLAGS) $(LDFLAGS) \ |
| 71 |
+ rastep.f quadric.o suv.o \ |
| 72 |
-o rastep |
| 73 |
|
| 74 |
render: render.o local.o quadric.o parse.o r3dtogd.o ungz.o qinp.o |
| 75 |
- $(FC) $(FFLAGS) \ |
| 76 |
+ $(FC) $(FFLAGS) $(LDFLAGS) \ |
| 77 |
render.o local.o quadric.o parse.o r3dtogd.o ungz.o \ |
| 78 |
qinp.o \ |
| 79 |
- $(LIBS) $(LDFLAGS) \ |
| 80 |
- -o render |
| 81 |
+ -o render \ |
| 82 |
+ $(LIBS) |
| 83 |
|
| 84 |
normal3d: normal3d.o quadric.o qinp.o ungz.o parameters.incl |
| 85 |
- $(FC) $(FFLAGS) \ |
| 86 |
- normal3d.o quadric.o ungz.o qinp.o $(LDFLAGS) \ |
| 87 |
+ $(FC) $(FFLAGS) $(LDFLAGS) \ |
| 88 |
+ normal3d.o quadric.o ungz.o qinp.o \ |
| 89 |
-o normal3d |
| 90 |
|
| 91 |
stereo3d: |
| 92 |
@@ -264,7 +264,7 @@ example1.png: render_small |
| 93 |
./render_small |
| 94 |
|
| 95 |
render_small: render_small.o local.o quadric.o parse_small.o r3dtogd.o ungz.o qinp_small.o |
| 96 |
- $(FC) $(FFLAGS) $^ $(LIBS) $(LDFLAGS) -o $@ |
| 97 |
+ $(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 98 |
|
| 99 |
.SUFFIXES: .incl |
| 100 |
SMALL=10 |
Archives