Date: Fri, 28 Nov 2003 22:30:19 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59756: Update port: graphics/white_dune to 0.26.1 Message-ID: <20031128223019.26e36e5e.tkato@prontomail.com> Resent-Message-ID: <200311281340.hASDeHfC062422@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59756 >Category: ports >Synopsis: Update port: graphics/white_dune to 0.26.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 28 05:40:17 PST 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.9-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.26.1 New file: files/patch-src::SDLjoystick::Makefile.in files/patch-src::SDLjoystick::bsd::SDL_sysjoystick.c Remove file: files/patch-src::Aflock.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/white_dune/Makefile graphics/white_dune/Makefile --- /usr/ports/graphics/white_dune/Makefile Tue Jul 1 17:12:01 2003 +++ graphics/white_dune/Makefile Fri Nov 28 21:05:20 2003 @@ -7,7 +7,7 @@ # PORTNAME= white_dune -PORTVERSION= 0.24.3 +PORTVERSION= 0.26.1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.csv.ica.uni-stuttgart.de/vrml/dune/ @@ -17,15 +17,15 @@ COMMENT= Graphical VRML97 Editor and animation tool LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ + glut:${PORTSDIR}/graphics/libglut \ png.5:${PORTSDIR}/graphics/png -USE_REINPLACE= yes -USE_MESA= yes USE_MOTIF= yes +USE_GL= yes +USE_SDL= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ YACC="/usr/bin/byacc" CONFIGURE_ARGS= --with-optimization \ --without-devil \ @@ -33,10 +33,17 @@ --with-nurbssurfaceprotourl="${DOCSDIR}/vrml200x_nurbssurface/NurbsSurfacePROTO.wrl" ALL_TARGET= # empty -MAN1= dune.1 +MAN1= dune.1 -post-patch: - @${REINPLACE_CMD} -e 's|<values.h>|<limits.h>|g' ${WRKSRC}/src/stdafx.h +CPPFLAGS= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` \ + -DUSBHID_UCR_DATA +LDFLAGS= -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500111 +CPPFLAGS+= -DUSBHID_NEW +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/dune ${PREFIX}/bin @@ -48,4 +55,4 @@ cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -urN /usr/ports/graphics/white_dune/distinfo graphics/white_dune/distinfo --- /usr/ports/graphics/white_dune/distinfo Tue Jul 1 17:12:01 2003 +++ graphics/white_dune/distinfo Fri Nov 28 21:05:06 2003 @@ -1 +1 @@ -MD5 (white_dune-0.24pl3.tar.gz) = bcf9ca4c6602b724754dd3bb1efd2981 +MD5 (white_dune-0.26pl1.tar.gz) = 9f1bcbb0c933d78954ed3fb8b9ac0bf7 diff -urN /usr/ports/graphics/white_dune/files/patch-src::Aflock.cpp graphics/white_dune/files/patch-src::Aflock.cpp --- /usr/ports/graphics/white_dune/files/patch-src::Aflock.cpp Mon May 19 10:29:23 2003 +++ graphics/white_dune/files/patch-src::Aflock.cpp Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ ---- src/Aflock.cpp.orig Fri May 16 12:39:46 2003 -+++ src/Aflock.cpp Fri May 16 22:56:14 2003 -@@ -807,7 +807,9 @@ - #ifndef __sgi - # ifndef __sun - # ifndef __APPLE__ -+# ifndef __FreeBSD__ - termIoPort.c_lflag = N_TTY; -+# endif - # endif - # endif - #endif diff -urN /usr/ports/graphics/white_dune/files/patch-src::Makefile.in graphics/white_dune/files/patch-src::Makefile.in --- /usr/ports/graphics/white_dune/files/patch-src::Makefile.in Mon Sep 2 02:02:36 2002 +++ graphics/white_dune/files/patch-src::Makefile.in Fri Nov 28 21:05:06 2003 @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig Tue Jul 16 23:42:39 2002 -+++ src/Makefile.in Tue Aug 20 05:03:35 2002 +--- src/Makefile.in.orig Tue Nov 25 01:30:34 2003 ++++ src/Makefile.in Tue Nov 25 15:07:52 2003 @@ -11,8 +11,8 @@ # WARNINGS = -Wall -Wwrite-strings # WARNINGS = -woff 3303 @@ -8,6 +8,6 @@ -CXXFLAGS = $(CFLAGS) +CFLAGS = @CFLAGS@ $(WARNINGS) -I. -Iswt/include @CPPFLAGS@ +CXXFLAGS = @CXXFLAGS@ $(WARNINGS) -I. -Iswt/include @CPPFLAGS@ - LIBS = @STATIC@ -Lswt/lib -lswt @LIBS@ + LIBS = @STATIC@ -Lswt/lib -lswt -LSDLjoystick @SDL_JOYSTICK_LIBS@ @LIBS@ + NEBULA = @NEBULA@ - .SUFFIXES: .cpp diff -urN /usr/ports/graphics/white_dune/files/patch-src::SDLjoystick::Makefile.in graphics/white_dune/files/patch-src::SDLjoystick::Makefile.in --- /usr/ports/graphics/white_dune/files/patch-src::SDLjoystick::Makefile.in Thu Jan 1 09:00:00 1970 +++ graphics/white_dune/files/patch-src::SDLjoystick::Makefile.in Fri Nov 28 21:05:06 2003 @@ -0,0 +1,27 @@ +--- src/SDLjoystick/Makefile.in.orig Tue Nov 25 01:30:45 2003 ++++ src/SDLjoystick/Makefile.in Tue Nov 25 15:23:59 2003 +@@ -13,7 +13,7 @@ + SDL_JOYSTICK_SUBDIR = @SDL_JOYSTICK_SUBDIR@ + LIBS = @LIBS@ + +-CFLAGS = @CFLAGS@ -I$$PWD ++CFLAGS = @CFLAGS@ -I$$PWD @CPPFLAGS@ + RANLIB = @RANLIB@ + + OBJS = mini_SDL_joystick.o $(SDL_JOYSTICK_SUBDIR)/SDL_sysjoystick.o +@@ -24,13 +24,13 @@ + $(RANLIB) $@ + + joysticktest: joysticktest.c libSDLjoystick.a +- cc -o $@ $(CFLAGS) joysticktest.c libSDLjoystick.a $(LIBS) ++ $(CC) -o $@ $(CFLAGS) joysticktest.c libSDLjoystick.a $(LIBS) + + clean: + rm -f joysticktest libSDLjoystick.a *.o */*.o + + depend: +- cc -M -I$$PWD $(SDL_JOYSTICK_SUBDIR)/SDL_sysjoystick.c >> Makefile ++ $(CC) -M -I$$PWD $(SDL_JOYSTICK_SUBDIR)/SDL_sysjoystick.c >> Makefile + + # do not delete + diff -urN /usr/ports/graphics/white_dune/files/patch-src::SDLjoystick::bsd::SDL_sysjoystick.c graphics/white_dune/files/patch-src::SDLjoystick::bsd::SDL_sysjoystick.c --- /usr/ports/graphics/white_dune/files/patch-src::SDLjoystick::bsd::SDL_sysjoystick.c Thu Jan 1 09:00:00 1970 +++ graphics/white_dune/files/patch-src::SDLjoystick::bsd::SDL_sysjoystick.c Fri Nov 28 21:05:06 2003 @@ -0,0 +1,21 @@ +--- src/SDLjoystick/bsd/SDL_sysjoystick.c.orig Tue Nov 25 01:30:44 2003 ++++ src/SDLjoystick/bsd/SDL_sysjoystick.c Tue Nov 25 21:30:52 2003 +@@ -39,9 +39,6 @@ + #include <string.h> + #include <errno.h> + +-#if defined(HAVE_USB_H) +-#include <usb.h> +-#endif + #include <dev/usb/usb.h> + #include <dev/usb/usbhid.h> + +@@ -51,6 +48,8 @@ + #include <libusb.h> + #elif defined(HAVE_LIBUSBHID_H) + #include <libusbhid.h> ++#elif defined(HAVE_USB_H) ++#include <usb.h> + #endif + + #include "SDL_error.h" diff -urN /usr/ports/graphics/white_dune/pkg-plist graphics/white_dune/pkg-plist --- /usr/ports/graphics/white_dune/pkg-plist Tue Jul 1 17:12:01 2003 +++ graphics/white_dune/pkg-plist Fri Nov 28 21:05:06 2003 @@ -14,23 +14,27 @@ %%PORTDOCS%%%%DOCSDIR%%/commandline_examples/wingmancordlessgamepad.sh %%PORTDOCS%%%%DOCSDIR%%/commandline_examples/wingmanrumblepad.sh %%PORTDOCS%%%%DOCSDIR%%/commandline_examples/wingmanrumblepad.sh.html +%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/wingmanrumblepad_linux_SDLjoystick.sh %%PORTDOCS%%%%DOCSDIR%%/commandline_examples/wingmanrumblepad_m$windows.bat %%PORTDOCS%%%%DOCSDIR%%/commandline_examples/wingmanrumblepad_m$windows.bat.html +%%PORTDOCS%%%%DOCSDIR%%/commandline_examples/wingmanrumblepad_macosx.sh %%PORTDOCS%%%%DOCSDIR%%/commandline_examples/xinput_example.sh %%PORTDOCS%%%%DOCSDIR%%/commandline_examples/xinput_example.sh.html %%PORTDOCS%%%%DOCSDIR%%/commandline_examples/xinput_irix6.2_example.sh %%PORTDOCS%%%%DOCSDIR%%/deutsch.jpg %%PORTDOCS%%%%DOCSDIR%%/developer_docs/Doxyfile.in -%%PORTDOCS%%%%DOCSDIR%%/developer_docs/Doxyf %%PORTDOCS%%%%DOCSDIR%%/developer_docs/Makefile %%PORTDOCS%%%%DOCSDIR%%/developer_docs/deutsch.jpg +%%PORTDOCS%%%%DOCSDIR%%/developer_docs/dialog.jpg %%PORTDOCS%%%%DOCSDIR%%/developer_docs/dune.png %%PORTDOCS%%%%DOCSDIR%%/developer_docs/dune_developer.html %%PORTDOCS%%%%DOCSDIR%%/developer_docs/man2html.sh +%%PORTDOCS%%%%DOCSDIR%%/developer_docs/mkdoxygen.sh %%PORTDOCS%%%%DOCSDIR%%/developer_docs/png2jpg.sh %%PORTDOCS%%%%DOCSDIR%%/developer_docs/standard.jpg %%PORTDOCS%%%%DOCSDIR%%/english.jpg %%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/russian.jpg %%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/billboard.wrl %%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/bubble.wav %%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/camera_animation.wrl @@ -46,6 +50,7 @@ %%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/ecmascript/test2.jpg %%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/ecmascript/text_change.wrl %%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/ecmascript/texture_change.wrl +%%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/ecmascript/worldcoordmessurement.wrl %%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/elevator_proximity_trigger.wrl %%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/forward_kinematic_animation.wrl %%PORTDOCS%%%%DOCSDIR%%/typical_vrml_examples/forward_kinematic_spheresensor.wrl @@ -70,14 +75,24 @@ %%PORTDOCS%%%%DOCSDIR%%/usage_docs/animation_onetime.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/animation_onetime2.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/animation_recording.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/box.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/box2nurbsdialog.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/cassettenrecorder.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/center.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/closedpeak.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/colorcircle1.png %%PORTDOCS%%%%DOCSDIR%%/usage_docs/colorcircle2.png +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/controlpoint.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/cosmo_colorpervertex.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/cosmo_no_colorpervertex.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/crash.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/crashrestore.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/cylinder.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/cylinderedge.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/degree1faceset1.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/degree1faceset2.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/degree1faceset3.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/degree1faceset4.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/delete_keys1.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/delete_keys2.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/delete_keys3.jpg @@ -92,6 +107,8 @@ %%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_en_exercise.html %%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_interaktion.png %%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_no_colorpervertex.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dune_ru.html +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/dunes.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/fieldchange.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/fieldchange1.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/fieldchange2.jpg @@ -100,10 +117,32 @@ %%PORTDOCS%%%%DOCSDIR%%/usage_docs/joystick_3D_move.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/joystick_3D_rot.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/joystick_sidewinder.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/knot.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/mantasurface.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/mantasurface1side.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/mantasurface2side.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/navigation.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/near_far.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/node_add_invalid.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/node_add_valid.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbscurve.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbscurve_scenegraph.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbscurvedialog.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbscurverotation2.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbscurverotationy.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsgroup1.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsgroup2.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsgroup3.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsgroup4.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsgroup5.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsgroup6.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsrotationdialog.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsrotationsurface.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsrotationsurface2.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsurface1.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/nurbsurface2.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/oneboxnurbs.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/order.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/recording.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/recording_one.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/rocket.jpg @@ -134,13 +173,33 @@ %%PORTDOCS%%%%DOCSDIR%%/usage_docs/simple_scriptbuild7.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/simple_scriptbuild8.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/simple_scriptbuild9.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/sixboxnurbs.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/spaceball.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/spherefaceset1.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/spherefaceset2.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/spherefaceset3.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/spherefaceset4.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/spherefaceset5.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/symetric1.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/symetric2.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/tess0.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/tess11.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/tess181.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/tess3.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/timesensor.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/transform.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/transform2.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/up_down.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/urledit.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/weight.jpg %%PORTDOCS%%%%DOCSDIR%%/usage_docs/windows.png +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/zfight1.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/zfight2.jpg +%%PORTDOCS%%%%DOCSDIR%%/usage_docs/zfightok.jpg +%%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsCurve.wrl +%%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsCurvePROTO.wrl +%%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsGroup.wrl +%%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsGroupPROTO.wrl %%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsSurface.wrl %%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsSurfacePROTO.wrl %%PORTDOCS%%%%DOCSDIR%%/vrml200x_nurbssurface/NurbsSurface_example.wrl >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031128223019.26e36e5e.tkato>