4 files changed, 57 insertions, 36 deletions

diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile
index 6bd75cb2986f..528f3c6a1531 100644
--- a/graphics/ayam/Makefile
+++ b/graphics/ayam/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ayam
-PORTVERSION=	1.8.3
+PORTVERSION=	1.10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/ayam/distinfo b/graphics/ayam/distinfo
index b870cf6d5acf..2745fd49f753 100644
--- a/graphics/ayam/distinfo
+++ b/graphics/ayam/distinfo
@@ -1,3 +1,3 @@
-MD5 (ayam1.8.3.src.tar.gz) = c3da09a68aaccf19e142cac208288891
-SHA256 (ayam1.8.3.src.tar.gz) = 65228569a182837f7ff19502fe72a57dfb398b90428dbf307789c574fdcc2cc8
-SIZE (ayam1.8.3.src.tar.gz) = 2859196
+MD5 (ayam1.10.src.tar.gz) = b4d8b41aeb29efd175ffa62f10d0b464
+SHA256 (ayam1.10.src.tar.gz) = 118b24bb8bc9ac8844dfafb12f5ccfd82975805a60c7e68a7dec08a4fdc12d17
+SIZE (ayam1.10.src.tar.gz) = 3037620
diff --git a/graphics/ayam/files/patch-Makefile.shared b/graphics/ayam/files/patch-Makefile.shared
index 809e7b3475f7..8b587515dced 100644
--- a/graphics/ayam/files/patch-Makefile.shared
+++ b/graphics/ayam/files/patch-Makefile.shared
@@ -30,7 +30,7 @@ $FreeBSD$
  #CXX = g++
  
  # the linker
-@@ -77,7 +77,10 @@
+@@ -80,7 +80,10 @@
  # the default configuration is to build with Affine as RIB writer without
  # any shader parsing library (i.e. you will have to build and load a
  # plugin for shader parsing)
@@ -42,18 +42,21 @@ $FreeBSD$
  
  # simple configuration using BMRT
  #CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT
-@@ -128,49 +131,53 @@
- TOGLOBJECT = togl/togl.o
+@@ -134,7 +137,7 @@
  
  # OpenGL
--GLINCDIR = /usr/X11R6/include/
-+GLINCDIR = ${X11BASE}/include/
+ # OpenGL includes
+-GLINC = -I/usr/X11R6/include/
++GLINC = -I${X11BASE}/include/
+ # MacOSX (Aqua):
+ #GLINC =
  # link options for linking with OpenGL libraries
- GLLIBS = -lGLU -lGL
+@@ -144,24 +147,26 @@
  
  # TIFF
--TIFFINCDIR = /usr/include/
-+TIFFINCDIR = ${LOCALBASE}/include/
+ # TIFF includes
+-TIFFINC = -I/usr/include/
++TIFFINC = -I${LOCALBASE}/include/
  # link options for linking with TIFF library
  TIFFLIB = -ltiff
  
@@ -67,15 +70,19 @@ $FreeBSD$
 -TCLINC = -I$(TCLDIR)/generic
 +#TCLINC = -I$(TCLDIR)/generic
 +TCLINC = -I${LOCALBASE}/include/tcl8.2/generic
+ # MacOSX (Aqua):
+ #TCLINC =
  
  # Tcl library
  # link options for linking with Tcl library
 -TCLLIB = -L$(TCLDIR)/unix -ltcl8.2
 +#TCLLIB = -L$(TCLDIR)/unix -ltcl8.2
  #TCLLIB = -L$(TCLDIR)/unix -ltcl8.0
++TCLLIB = -L${LOCALBASE}/lib -ltcl82
  # if you have an installed Tcl/Tk, you probably just want:
  #TCLLIB = -ltcl
-+TCLLIB = -L${LOCALBASE}/lib -ltcl82
+ # MacOSX (Aqua):
+@@ -169,18 +174,20 @@
  
  # Tk sources directory
  # Note: You really need the Tk _sources_ in order to compile Ayam!
@@ -87,46 +94,54 @@ $FreeBSD$
 -TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix
 +#TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix
 +TKINC = -I${LOCALBASE}/include/tk8.2/generic -I${LOCALBASE}/include/tk8.2/unix
+ # MacOSX (Aqua):
+ #TKINC = -I$(TKDIR)/generic -I$(TKDIR)/macosx -I$(TKDIR)/xlib
  
  # Tk library
  # link options for linking with Tk library
 -TKLIB = -L$(TKDIR)/unix -ltk8.2
 +#TKLIB = -L$(TKDIR)/unix -ltk8.2
  #TKLIB = -L$(TKDIR)/unix -ltk8.0
++TKLIB = -L${LOCALBASE}/lib -ltk82
  # if you have an installed Tcl/Tk, you probably just want:
  #TKLIB = -ltk
-+TKLIB = -L${LOCALBASE}/lib -ltk82
- 
- 
- # X11-libs
+ # MacOSX (Aqua):
+@@ -188,11 +195,11 @@
+ 
+ # X11
+ # X11 includes
+-X11INC = -I/usr/X11R6/include
++X11INC = -I${X11BASE}/include
+ # MacOSX (Aqua):
+ #X11INC =
  # link options for linking with X11
 -X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
 +X11LIBS = -L${X11BASE}/lib -lXmu -lXext -lX11
  #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
- 
- 
-@@ -179,23 +186,23 @@
- AFFINEINCDIR = ./affine/include
+ # MacOSX (Aqua):
+ #X11LIBS =
+@@ -203,23 +210,23 @@
+ AFFINEINC = -Iaffine/include
  # if you use Affine as BMRT libribout replacement
  # (also add -DAYUSEAFFINE to CFLAGS!):
 -AFFINEOBJS = ./affine/src/write.o ./affine/src/constant.o
 +#AFFINEOBJS = ./affine/src/write.o ./affine/src/constant.o
  # if you do not use Affine as BMRT libribout replacement:
--#AFFINEOBJS = 
-+AFFINEOBJS = 
+-#AFFINEOBJS =
++AFFINEOBJS =
  
  # Aqsis
 -AQSISDIR = /usr/local/aqsis
--AQSISINCDIR = $(AQSISDIR)/include
+-AQSISINC = -I$(AQSISDIR)/include
 +AQSISDIR = ${LOCALBASE}
-+AQSISINCDIR = $(AQSISDIR)/include/aqsis
++AQSISINC = -I$(AQSISDIR)/include/aqsis
  AQSISLIBDIR = $(AQSISDIR)/lib
  # if you do not use Aqsis libslxargs as libslcargs replacement:
--AQSISOBJS = 
-+#AQSISOBJS = 
+-AQSISOBJS =
++#AQSISOBJS =
  # if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!):
 -#AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp
-+AQSISOBJS = $(AQSISLIBDIR)/libaqsis.a $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L ${LOCALBASE}/lib $(AQSISLIBDIR)/libraytrace.so -lstdc++
++AQSISOBJS = $(AQSISLIBDIR)/libaqsis.a $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L${AQSISLIBDIR} $(AQSISLIBDIR)/libraytrace.so -lstdc++
  
  # if you do not use Aqsis libri2rib as BMRT libribout replacement:
 -AQSISRI2RIB =
@@ -137,32 +152,32 @@ $FreeBSD$
  
  
  # BMRT
-@@ -220,9 +227,9 @@
- # IRIX, Solaris, (MacOSX: get libdl from Fink!):
+@@ -247,9 +254,9 @@
+ # IRIX, Solaris, (MacOSX<10.4: get libdl from Fink!):
  #DL = -ldl
  # Linux:
 -DL = -ldl -lpthread
 +#DL = -ldl -lpthread
- # NetBSD:
+ # NetBSD/MacOSX (Aqua):
 -#DL =
 +DL =
  
+ 
  # linker flags to produce shared modules:
- # Linux, Solaris, IRIX:
-@@ -236,8 +243,8 @@
+@@ -266,8 +273,8 @@
  RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm
  
  # Ayslx Plugin (Aqsis)
 -AYSLXINCDIR = $(AQSISDIR)/include
 -AYSLXLIBS = $(AQSISDIR)/lib/rcdummy.o $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L/usr/local/lib -llog4cpp
-+AYSLXINCDIR = ${AQSISINCDIR}
++AYSLXINCDIR = ${AQSISINC}
 +AYSLXLIBS = -L${AQSISLIBDIR} $(AQSISDIR)/lib/libaqsis.so $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L${LOCALBASE}/lib
  
  # Ayso Plugin (RenderDotC, RDC)
  RDCDIR = /usr/local/rdc
-@@ -431,7 +438,7 @@
+@@ -464,7 +471,7 @@
  .cpp.o:
- 	$(CXX) -c $(CFLAGS) $*.cpp -o $@ -I. -IMF3D -I$(TOGLINCDIR) $(TCLINC) $(TKINC) -I$(BMRTINCDIR) -I$(GLINCDIR) -I$(AFFINEINCDIR) -I$(AQSISINCDIR) -I$(OPENCSGINCDIR) -I$(GLEWINCDIR) -Iplugins
+ 	$(CXX) -c $(CFLAGS) $*.cpp -o $@ -I. -IMF3D $(TOGLINC) $(TCLINC) $(TKINC) $(BMRTINC) $(GLINC) $(AFFINEINC) $(AQSISINC) -I$(OPENCSGINCDIR) -I$(GLEWINCDIR) -Iplugins
  
 -all: ayamsh csphere.so mfio.so metaobj.so
 +all: ayamsh csphere.so mfio.so metaobj.so ayslx.so
diff --git a/graphics/ayam/pkg-plist b/graphics/ayam/pkg-plist
index 661f4f7d0451..626f940808e6 100644
--- a/graphics/ayam/pkg-plist
+++ b/graphics/ayam/pkg-plist
@@ -14,6 +14,7 @@ lib/ayam/tcl/action.tcl
 lib/ayam/tcl/ai.tcl
 lib/ayam/tcl/ayam.tcl
 lib/ayam/tcl/balloon.tcl
+lib/ayam/tcl/bevel.tcl
 lib/ayam/tcl/birail1.tcl
 lib/ayam/tcl/birail2.tcl
 lib/ayam/tcl/box.tcl
@@ -61,6 +62,7 @@ lib/ayam/tcl/revolve.tcl
 lib/ayam/tcl/riattr.tcl
 lib/ayam/tcl/riinc.tcl
 lib/ayam/tcl/riopt.tcl
+lib/ayam/tcl/riproc.tcl
 lib/ayam/tcl/root.tcl
 lib/ayam/tcl/run.tcl
 lib/ayam/tcl/script.tcl
@@ -172,8 +174,10 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc
 %%PORTDOCS%%%%DOCSDIR%%/html/ayam-6.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ayam-7.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ayam-8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ayam-9.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ayam.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/ampick.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pics/bevel.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/birail1.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/birail1vc.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/birail2.gif
@@ -199,6 +203,7 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/propgui.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/refine.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/revolve.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pics/shiftclsbsp.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/sgordon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/skin.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/splitnc.gif
@@ -206,6 +211,7 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/sweep.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/tce.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/text-ayam.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pics/tgui.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/tools.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/treeview.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/view.gif