diff options
| author | steve <steve@FreeBSD.org> | 1998-05-11 11:16:15 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1998-05-11 11:16:15 +0800 |
| commit | 53a5df30064685783cfbf92e0b9f273682621a22 (patch) | |
| tree | 1f6408c2a55c2b41cd41d69e386863367a9459f6 /graphics/aero/files | |
| parent | e7a6fa299fd8a80eecc7541caf03fcc5b9e7d789 (diff) | |
| download | freebsd-ports-gnome-53a5df30064685783cfbf92e0b9f273682621a22.tar.gz freebsd-ports-gnome-53a5df30064685783cfbf92e0b9f273682621a22.tar.zst freebsd-ports-gnome-53a5df30064685783cfbf92e0b9f273682621a22.zip | |
Update to version 1.7.0
PR: 6326
Submitted by: Dirk Froemberg <ibex@physik.TU-Berlin.DE>
Diffstat (limited to 'graphics/aero/files')
| -rw-r--r-- | graphics/aero/files/patch-aa | 88 |
1 files changed, 49 insertions, 39 deletions
diff --git a/graphics/aero/files/patch-aa b/graphics/aero/files/patch-aa index 388e1703e463..59feaae5bab6 100644 --- a/graphics/aero/files/patch-aa +++ b/graphics/aero/files/patch-aa @@ -1,59 +1,69 @@ ---- Makefile.orig Fri Nov 4 08:06:34 1994 -+++ Makefile Wed Oct 16 12:31:20 1996 -@@ -21,8 +21,8 @@ +--- Makefile.linux.orig Fri Aug 30 19:19:25 1996 ++++ Makefile.linux Thu Apr 16 20:30:53 1998 +@@ -34,8 +34,8 @@ # Set path where you want to install xaero and it's application-default - # file. + # resource file. --XAEROBIN = /usr/local/X11R5/bin # or local: $HOME/bin --XAEROAPPL = /usr/local/X11R5/lib/app-defaults # or local: $HOME/app-defaults -+XAEROBIN = ${PREFIX}/bin # or local: $HOME/bin +-XAEROBIN = /usr/local/bin # or local: $HOME/bin +-XAEROAPPL = /usr/local/lib/app-defaults # or local: $HOME/app-defaults ++XAEROBIN = ${PREFIX}/bin # or local: $HOME/bin +XAEROAPPL = ${PREFIX}/lib/X11/app-defaults # or local: $HOME/app-defaults ########################################################################### -@@ -32,24 +32,24 @@ - DEBUG = # -g if you want some debug-information +@@ -43,17 +43,17 @@ + # of X11 in parallel on their systems, e.g. X11R5 and X11R6. So here + # you can choose the one you want. + +-XINCLUDE = /usr/local/X11R5/include +-XLIB = /usr/local/X11R5/lib +-FWFINCLUDE = /usr/local/lib/FWF/include +-FWFLIB = /usr/local/lib/FWF/lib.$(HOSTTYPE) ++XINCLUDE = ${PREFIX}/include ++XLIB = ${PREFIX}/lib ++FWFINCLUDE = $(XINCLUDE) ++FWFLIB = $(XLIB) + + + ########################################################################### + # Compiler and Linker definitions. + + CC = gcc +-COPTS = -ansi -Wall $(OPTIMIZE) ++COPTS = -ansi -Wall $(OPTIMIZE) + DEBUG = OPTIMIZE = -O2 -DNODEBUG - LD = ld --STATIC = -static -+STATIC = + +@@ -63,16 +63,16 @@ + #libraries if needed; use -L and -l syntax, e.g. + # ADDFWFLIB = -L/usr/local/lib -lxpm + +-ADDFWFLIB = ++ADDFWFLIB = -lXpm + ADDXLIB = +-ADDSYSLIB = ++ADDSYSLIB = # -lSM -lICE ########################################################################### - # + # Tools + RM = rm -f - ECHO = echo -CP = cp -i +CP = cp ########################################################################### - # Path-definitons for X11R5 and FWF +@@ -134,7 +134,7 @@ + # The default rule for compiling .o files from .c files --XINCLUDE = /usr/local/X11R5/include --XLIB = /usr/local/X11R5/lib --FWFINCLUDE = ../../FWF/FWF/include --FWFLIB = ../../FWF/FWF/lib.$(HOSTTYPE) --XPMLIB = ../../FWF/xpm-3.4a/lib.$(HOSTTYPE) -+XINCLUDE = /usr/X11R6/include -+XLIB = /usr/X11R6/lib -+FWFINCLUDE = . #../../FWF/FWF/include -+FWFLIB = -lfwf # ../../FWF/FWF/lib.$(HOSTTYPE) -+XPMLIB = -lXpm #../../FWF/xpm-3.4a/lib.$(HOSTTYPE) + .c.o: +- $(CC) $(CFLAGS) -c $*.c ++ $(CC) $(CFLAGS) -c $< ########################################################################### -@@ -92,8 +92,7 @@ - xaero: $(EDITOROBJS) $(ANZEIGEOBJS) $(FSBLIBNAME) - $(CC) $(STATIC) $(DEBUG) -o xaero $(EDITOROBJS) $(ANZEIGEOBJS) \ - -L. -L$(FWFLIB) -L$(XPMLIB) -L$(XLIB) \ -- -lfwf -lXaw -lXmu -lXt -lXext -lXpm -lX11 -l$(FSBLIB) -lm -- -+ -lfwf -lXaw -lXmu -lXt -lXext -lXpm -lX11 -l$(FSBLIB) -lSM -lICE -lm - - ########################################################################### - # example files generation (optional) -@@ -118,7 +117,23 @@ +@@ -158,7 +158,23 @@ copyFilesToDestination:: $(CP) xaero $(XAEROBIN) @@ -65,7 +75,7 @@ + $(CP) ../scripts/rayclear $(XAEROBIN) + $(CP) ../scripts/raystart $(XAEROBIN) + $(CP) ../scripts/raystat $(XAEROBIN) -+ sed 's:__XAERO_LIB_PATH__:${PREFIX}/lib/X11/xaero:' ../scripts/raymany >$(XAEROBIN)/raymany ++ sed 's:__XAERO_LIB_PATH__:${PREFIX}/lib/X11/xaero:' ../scripts/raymany > $(XAEROBIN)/raymany + chmod +x $(XAEROBIN)/raymany + $(CP) ../povray-include/FILELIST.povray-include ${PREFIX}/lib/X11/xaero + $(CP) ../povray-include/aeromat2.inc ${PREFIX}/lib/X11/xaero @@ -75,5 +85,5 @@ + mkdir -p ${PREFIX}/lib/X11/xaero/examples + $(CP) ../examples/* ${PREFIX}/lib/X11/xaero/examples - all:: - @make help + all:: xaero + strip xaero |