From 25e40d7419624f963eb9014e229c426253e99ffa Mon Sep 17 00:00:00 2001 From: sem Date: Tue, 14 Dec 2004 02:58:59 +0000 Subject: - Update to 1.8 PR: ports/74992 Submitted by: maintainer --- graphics/ayam/Makefile | 3 +-- graphics/ayam/distinfo | 4 +-- graphics/ayam/files/patch-Makefile.shared | 42 ++++++++++++++++++++----------- graphics/ayam/pkg-plist | 12 +++++++++ 4 files changed, 42 insertions(+), 19 deletions(-) (limited to 'graphics/ayam') diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile index cb19c34bc12a..d7680c06cec6 100644 --- a/graphics/ayam/Makefile +++ b/graphics/ayam/Makefile @@ -6,8 +6,7 @@ # PORTNAME= ayam -PORTVERSION= 1.7 -PORTREVISION= 1 +PORTVERSION= 1.8 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/ayam/distinfo b/graphics/ayam/distinfo index 4bb1cae29a25..16d68d471c7d 100644 --- a/graphics/ayam/distinfo +++ b/graphics/ayam/distinfo @@ -1,2 +1,2 @@ -MD5 (ayam1.7.src.tar.gz) = f4cd9c2f69304a0b4693a48d2d2b9fc5 -SIZE (ayam1.7.src.tar.gz) = 2135436 +MD5 (ayam1.8.src.tar.gz) = 893f8c533efded07226b1514777d5403 +SIZE (ayam1.8.src.tar.gz) = 2714421 diff --git a/graphics/ayam/files/patch-Makefile.shared b/graphics/ayam/files/patch-Makefile.shared index 15827e772529..a35ffb89a661 100644 --- a/graphics/ayam/files/patch-Makefile.shared +++ b/graphics/ayam/files/patch-Makefile.shared @@ -1,5 +1,8 @@ ---- Makefile.shared.orig Sat Mar 27 03:17:07 2004 -+++ Makefile.shared Tue Oct 5 21:43:30 2004 + +$FreeBSD$ + +--- Makefile.shared.orig ++++ Makefile.shared @@ -4,7 +4,7 @@ # Makefile for Ayam (shared version) @@ -9,14 +12,23 @@ #PREFIX = /opt/ayam # if you use one of the following, be sure to change LIBDIR # and DOCDIR to a more suitable (Ayam specific) path -@@ -34,14 +34,14 @@ - MKDIR = mkdir -p +@@ -31,21 +31,21 @@ - # the compiler + INSTALL = ./ninstall + #INSTALL = install +-MKDIR = mkdir -p ++#MKDIR = mkdir -p + + # the C compiler -CC = cc +CC ?= cc #CC = gcc + # the C++ compiler (just in use for the Aycsg plugin) +-CXX = CC ++CXX = ${CC} + #CXX = g++-3.0 + # the linker # Starting with BMRT2.5, libribout and libslcargs are in C++, # which forces us to use "CC" or "g++" to link the right libraries @@ -26,7 +38,7 @@ # for Linux, use #LD = g++ # MacOSX -@@ -68,7 +68,8 @@ +@@ -73,7 +73,8 @@ # o add -DAYOLDSLX if you compile with an Aqsis libslxargs prior to 0.7.19 # o add -DUSE_NON_CONST if you compile with Tcl/Tk 8.4.x @@ -36,7 +48,7 @@ # IRIX (-DAYIRIXBUG is needed by ncurve.c to work around a bug in libGLU):: #CFLAGS = -O -fullwarn -DAYIRIXBUG -DAYUSESLCARGS -DAYUSEBMRTRIBOUT # Linux: -@@ -115,49 +116,53 @@ +@@ -120,49 +121,53 @@ TOGLOBJECT = togl/togl.o # OpenGL @@ -99,7 +111,7 @@ #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 -@@ -172,18 +177,18 @@ +@@ -177,18 +182,18 @@ # Aqsis @@ -123,7 +135,7 @@ # BMRT -@@ -194,9 +199,9 @@ +@@ -199,9 +204,9 @@ BMRTINCDIR = $(BMRTDIR)/include BMRTLIBDIR = $(BMRTDIR)/lib # if you use BMRT libribout and not Affine: @@ -135,7 +147,7 @@ # if you do not use libslcargs from BMRT: SLCARGSLIB = # if you use Affine as BMRT libribout replacement and libslcargs from BMRT: -@@ -206,9 +211,9 @@ +@@ -211,9 +216,9 @@ # Dynamic Loading # Library for dynamic loading (contains dlopen()) # Linux, IRIX, Solaris, (MacOSX: get libdl from Fink!): @@ -147,7 +159,7 @@ # linker flags to produce shared modules: # Linux, Solaris, IRIX: -@@ -222,8 +227,8 @@ +@@ -227,8 +232,8 @@ RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm # Ayslx Plugin (Aqsis) @@ -158,9 +170,9 @@ # Ayso Plugin (RenderDotC, RDC) RDCDIR = /usr/local/rdc -@@ -373,9 +378,9 @@ - .c.o: - $(CC) -c $(CFLAGS) $*.c -o $@ -I. -IMF3D -I$(TOGLINCDIR) $(TCLINC) $(TKINC) -I$(BMRTINCDIR) -I$(GLINCDIR) -I$(AFFINEINCDIR) -I$(AQSISINCDIR) -I$(TIFFINCDIR) +@@ -413,9 +418,9 @@ + .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 -all: ayamsh csphere.so mfio.so metaobj.so +all: ayamsh csphere.so mfio.so metaobj.so ayslx.so @@ -169,4 +181,4 @@ +ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL) - csphere.so: $(CSPHEREOBJS) + aycsg.so: $(AYCSGOBJS) $(OPENCSGOBJS) diff --git a/graphics/ayam/pkg-plist b/graphics/ayam/pkg-plist index 5f3145e02f4d..db8bfcd6dde6 100644 --- a/graphics/ayam/pkg-plist +++ b/graphics/ayam/pkg-plist @@ -14,6 +14,8 @@ lib/ayam/tcl/action.tcl lib/ayam/tcl/ai.tcl lib/ayam/tcl/ayam.tcl lib/ayam/tcl/balloon.tcl +lib/ayam/tcl/birail1.tcl +lib/ayam/tcl/birail2.tcl lib/ayam/tcl/box.tcl lib/ayam/tcl/bpatch.tcl lib/ayam/tcl/browser.tcl @@ -27,6 +29,7 @@ lib/ayam/tcl/console.tcl lib/ayam/tcl/control.tcl lib/ayam/tcl/cylinder.tcl lib/ayam/tcl/disk.tcl +lib/ayam/tcl/extrnc.tcl lib/ayam/tcl/extrude.tcl lib/ayam/tcl/gordon.tcl lib/ayam/tcl/hyperb.tcl @@ -68,6 +71,8 @@ lib/ayam/tcl/sphere.tcl lib/ayam/tcl/splash.tcl lib/ayam/tcl/sweep.tcl lib/ayam/tcl/tc.tcl +lib/ayam/tcl/text.tcl +lib/ayam/tcl/tgui.tcl lib/ayam/tcl/tmp.tcl lib/ayam/tcl/toolbox.tcl lib/ayam/tcl/torus.tcl @@ -168,10 +173,15 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%PORTDOCS%%%%DOCSDIR%%/html/ayam-8.html %%PORTDOCS%%%%DOCSDIR%%/html/ayam.html %%PORTDOCS%%%%DOCSDIR%%/html/pics/ampick.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/birail1.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/birail1vc.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/birail2.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/birail2vc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/cap.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/clampnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/clone.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/concatnc.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/elevate.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/extrude.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/gordon-hood.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/icurves.gif @@ -180,6 +190,7 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%PORTDOCS%%%%DOCSDIR%%/html/pics/main.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/meta.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/multip.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/ncircle.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/plotcur.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/prefs.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/primitives.gif @@ -192,6 +203,7 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%PORTDOCS%%%%DOCSDIR%%/html/pics/ssweep.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/sweep.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/tce.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/text-ayam.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/tools.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/treeview.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/view.gif -- cgit