[gentoo-commits] gentoo-x86 commit in sci-chemistry/raster3d/files: 3.0.2-gentoo-prefix.patch 3.0.2-as-needed.patch

[gentoo-commits] gentoo-x86 commit in sci-chemistry/raster3d/files: 3.0.2-gentoo-prefix.patch 3.0.2-as-needed.patch

[Justin Lecher (jlec)]

jlec        11/02/27 10:40:36

  Added:                3.0.2-gentoo-prefix.patch 3.0.2-as-needed.patch
  Log:
  Version BUmp
  
  (Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch?rev=1.1&view=markup
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

Index: 3.0.2-gentoo-prefix.patch
===================================================================
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)



1.1                  sci-chemistry/raster3d/files/3.0.2-as-needed.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/raster3d/files/3.0.2-as-needed.patch?rev=1.1&view=markup
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

Index: 3.0.2-as-needed.patch
===================================================================
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