Update to version 1.7.0

PR:		6326
Submitted by:	Dirk Froemberg <ibex@physik.TU-Berlin.DE>

5 files changed, 60 insertions, 47 deletions

diff --git a/graphics/aero/Makefile b/graphics/aero/Makefile
index ac549ab607d0..8941e1a6f101 100644
--- a/graphics/aero/Makefile
+++ b/graphics/aero/Makefile
@@ -3,13 +3,13 @@
 # Date created:         Mon Aug 28 13:35:31 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.6 1996/11/18 11:27:41 asami Exp $
+# $Id: Makefile,v 1.7 1997/08/11 15:16:10 erich Exp $
 #
 
-DISTNAME=	aero_1.5.2_src
-PKGNAME=	aero-1.5.2
+DISTNAME=	aero_1.7.0_src
+PKGNAME=	aero-1.7.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.povray.org/pub/povray/utilities/modellers/aero/
+MASTER_SITES=	ftp://ftp.ee.uwa.edu.au/users/braunl/aero/
 
 MAINTAINER=	erich@FreeBSD.org
 
@@ -18,6 +18,7 @@ RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray
 LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
-WRKSRC=		work/aero/src
+WRKSRC=		${WRKDIR}/aero/src
+MAKEFILE=	Makefile.linux
 
 .include <bsd.port.mk>
diff --git a/graphics/aero/distinfo b/graphics/aero/distinfo
index cc8262854ddd..f4ae4df4aac6 100644
--- a/graphics/aero/distinfo
+++ b/graphics/aero/distinfo
@@ -1 +1 @@
-MD5 (aero_1.5.2_src.tar.gz) = c041d6132474b1aea098825e8994172a
+MD5 (aero_1.7.0_src.tar.gz) = 2ea6f065bc77162ce6b4f4c4a17a3636
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
diff --git a/graphics/aero/pkg-descr b/graphics/aero/pkg-descr
index 6843351f17cc..23ee44914643 100644
--- a/graphics/aero/pkg-descr
+++ b/graphics/aero/pkg-descr
@@ -7,4 +7,3 @@ used. The included script files for automatic generation of readable
 picture files out of the raytracer files need the "tgatoppm" command
 out of the PBM+ distribution. A special text file called
 README.raytracer explains how to use AERO's raytracing feature.
-
diff --git a/graphics/aero/pkg-plist b/graphics/aero/pkg-plist
index 0669bc6d49aa..54286e3700c1 100644
--- a/graphics/aero/pkg-plist
+++ b/graphics/aero/pkg-plist
@@ -1,10 +1,11 @@
-bin/xaero
 bin/povsubst
 bin/rayclear
 bin/raymany
 bin/raystart
 bin/raystat
+bin/xaero
 lib/X11/app-defaults/XAero
+lib/X11/xaero/FILELIST.povray-include
 lib/X11/xaero/aeromat2.inc
 lib/X11/xaero/aerop1materials.inc
 lib/X11/xaero/aeropov1.inc
@@ -26,3 +27,5 @@ lib/X11/xaero/examples/man.world
 lib/X11/xaero/examples/materials.world
 lib/X11/xaero/examples/pendulum-5.world
 lib/X11/xaero/examples/swing.world
+@dirrm lib/X11/xaero/examples
+@dirrm lib/X11/xaero