Attachment 24598 Details for Bug 42039 – file.diff

[patch] file.diff

file.diff (text/plain), 11.29 KB, created by tkato on 2002-08-26 19:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-08-26 19:20:01 UTC

Size: 11.29 KB

patch

obsolete

>diff -urN /usr/ports/graphics/white_dune/Makefile graphics/white_dune/Makefile
>--- /usr/ports/graphics/white_dune/Makefile	Tue Jul  9 06:01:07 2002
>+++ graphics/white_dune/Makefile	Tue Aug 20 07:38:02 2002
>@@ -7,37 +7,39 @@
> #
> 
> PORTNAME=	white_dune
>-PORTVERSION=	0.19b31
>+PORTVERSION=	0.19.4
>+PORTEPOCH=	1
> CATEGORIES=	graphics
> MASTER_SITES=	http://www.csv.ica.uni-stuttgart.de/vrml/dune/
>-DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
>+DISTNAME=	${PORTNAME}-${PORTVERSION:R}pl${PORTVERSION:E}
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>-LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
>-		jpeg:${PORTSDIR}/graphics/jpeg
>+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
>+		png.5:${PORTSDIR}/graphics/png
> 
> USE_REINPLACE=	yes
>-USE_BISON=	yes
> USE_MESA=	yes
> USE_MOTIF=	yes
> GNU_CONFIGURE=	yes
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>+		LDFLAGS="-L${LOCALBASE}/lib"
> ALL_TARGET=	# empty
> 
> MAN1=	dune.1
> 
> post-patch:
>-	@${GREP} -lR "malloc.h" ${WRKSRC} | ${XARGS} \
>-		${REINPLACE_CMD} -e "s/malloc\.h/stdlib.h/g"
>-	@${REINPLACE_CMD} -e "s/values\.h/limits.h/g" ${WRKSRC}/stdafx.h
>-	@${REINPLACE_CMD} -e "s/alloca\.h/stdlib.h/g" ${WRKSRC}/NodeNurbsSurface.cpp
>+	@${REINPLACE_CMD} -e 's|<values.h>|<limits.h>|g' ${WRKSRC}/src/stdafx.h
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/dune ${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/bin/dune ${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKSRC}/bin/nostereodune ${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-	${CP} -R ${WRKSRC}/docs/* ${DOCSDIR}
>+	${TAR} -C ${WRKSRC}/docs -cf - . | \
>+		${TAR} -C ${DOCSDIR} --unlink -xf -
>+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/graphics/white_dune/distinfo graphics/white_dune/distinfo
>--- /usr/ports/graphics/white_dune/distinfo	Fri Apr 12 04:25:29 2002
>+++ graphics/white_dune/distinfo	Tue Aug 20 03:48:37 2002
>@@ -1 +1 @@
>-MD5 (white_dune-0.19beta31.tar.gz) = 4823ee000399235cbd197fdc9e838d30
>+MD5 (white_dune-0.19pl4.tar.gz) = eeaec7cade0befab101aea4b2b58a3a9
>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	Thu Jan  1 09:00:00 1970
>+++ graphics/white_dune/files/patch-src::Makefile.in	Tue Aug 20 05:15:06 2002
>@@ -0,0 +1,13 @@
>+--- src/Makefile.in.orig	Tue Jul 16 23:42:39 2002
>++++ src/Makefile.in	Tue Aug 20 05:03:35 2002
>+@@ -11,8 +11,8 @@
>+ # WARNINGS = -Wall -Wwrite-strings
>+ # WARNINGS = -woff 3303
>+ # LFLAGS = -woff 1167 -woff 1110 -woff 3322
>+-CFLAGS = @OPTIM@ $(WARNINGS) -I. -Iswt/include @CPPFLAGS@
>+-CXXFLAGS = $(CFLAGS)
>++CFLAGS = @CFLAGS@ $(WARNINGS) -I. -Iswt/include @CPPFLAGS@
>++CXXFLAGS = @CXXFLAGS@ $(WARNINGS) -I. -Iswt/include @CPPFLAGS@
>+ LIBS = @STATIC@ -Lswt/lib -lswt @LIBS@
>+ 
>+ .SUFFIXES: .cpp
>diff -urN /usr/ports/graphics/white_dune/files/patch-src::swt::motif::Makefile.in graphics/white_dune/files/patch-src::swt::motif::Makefile.in
>--- /usr/ports/graphics/white_dune/files/patch-src::swt::motif::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ graphics/white_dune/files/patch-src::swt::motif::Makefile.in	Tue Aug 20 05:06:27 2002
>@@ -0,0 +1,11 @@
>+--- src/swt/motif/Makefile.in.orig	Tue Jul 16 23:42:39 2002
>++++ src/swt/motif/Makefile.in	Tue Aug 20 05:05:49 2002
>+@@ -8,7 +8,7 @@
>+ INCDIRS = -I../.. -I../include @CPPFLAGS@
>+ # WARNINGS = -Wall -Wwrite-strings
>+ FONT24 = @FONT24@
>+-CFLAGS = @OPTIM@ $(WARNINGS) $(INCDIRS) -DFONT24=\"$(FONT24)\"
>++CFLAGS = @CFLAGS@ $(WARNINGS) $(INCDIRS) -DFONT24=\"$(FONT24)\"
>+ DLIB = ../lib/libswt.so.0.1
>+ SLIB = ../lib/libswt.a
>+ 
>diff -urN /usr/ports/graphics/white_dune/files/patch-src::swt::rc::Makefile.in graphics/white_dune/files/patch-src::swt::rc::Makefile.in
>--- /usr/ports/graphics/white_dune/files/patch-src::swt::rc::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ graphics/white_dune/files/patch-src::swt::rc::Makefile.in	Tue Aug 20 05:08:42 2002
>@@ -0,0 +1,13 @@
>+--- src/swt/rc/Makefile.in.orig	Tue Jul 16 23:42:38 2002
>++++ src/swt/rc/Makefile.in	Tue Aug 20 05:08:27 2002
>+@@ -10,8 +10,8 @@
>+ LIBDIRS =
>+ INCDIRS = -I../include
>+ # WARNINGS = -Wall -Wwrite-strings
>+-CFLAGS = -g $(WARNINGS) $(INCDIRS)
>+-MAKEDEPEND=gcc -MM
>++CFLAGS = @CFLAGS@ $(WARNINGS) $(INCDIRS)
>++MAKEDEPEND=@CC@ -MM
>+ YFLAGS = -d
>+ 
>+ TARGET = rc
>diff -urN /usr/ports/graphics/white_dune/files/patch-src::swt::tests::Makefile.in graphics/white_dune/files/patch-src::swt::tests::Makefile.in
>--- /usr/ports/graphics/white_dune/files/patch-src::swt::tests::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ graphics/white_dune/files/patch-src::swt::tests::Makefile.in	Tue Aug 20 05:04:56 2002
>@@ -0,0 +1,13 @@
>+--- src/swt/tests/Makefile.in.orig	Tue Jul 16 23:42:38 2002
>++++ src/swt/tests/Makefile.in	Tue Aug 20 05:04:37 2002
>+@@ -12,8 +12,8 @@
>+ INCDIRS = -I../include
>+ 
>+ # WARNINGS = -Wall -Wwrite-strings
>+-CFLAGS = -g $(WARNINGS) $(INCDIRS)
>+-CXXFLAGS = $(CFLAGS)
>++CFLAGS = @CFLAGS@ $(WARNINGS) $(INCDIRS)
>++CXXFLAGS = @CXXFLAGS@ $(WARNINGS) $(INCDIRS)
>+ 
>+ TARGETS = swTest text buttons doodle drawing tree restest draw1
>+ 
>diff -urN /usr/ports/graphics/white_dune/pkg-plist graphics/white_dune/pkg-plist
>--- /usr/ports/graphics/white_dune/pkg-plist	Fri Apr 12 04:25:30 2002
>+++ graphics/white_dune/pkg-plist	Tue Aug 20 07:38:09 2002
>@@ -1,7 +1,23 @@
> bin/dune
>+bin/nostereodune
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/animation_example.wrl
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/index.html
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/joystick2.sh
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/joystick2.sh.html
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/nostereo.sh
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/nostereo.sh.html
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/spaceball_joystick_example.sh
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/spaceball_joystick_example.sh.html
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/wingmancordlessgamepad.sh
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/xinput_example.sh
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/xinput_example.sh.html
>+%%PORTDOCS%%share/doc/white_dune/commandline_examples/xinput_irix6.2_example.sh
>+%%PORTDOCS%%share/doc/white_dune/deutsch.jpg
>+%%PORTDOCS%%share/doc/white_dune/developer_docs/Doxyfile.in
>+%%PORTDOCS%%share/doc/white_dune/developer_docs/Makefile
> %%PORTDOCS%%share/doc/white_dune/developer_docs/dune.jpg
>-%%PORTDOCS%%share/doc/white_dune/developer_docs/dune.png
> %%PORTDOCS%%share/doc/white_dune/developer_docs/dune_developer.html
>+%%PORTDOCS%%share/doc/white_dune/english.jpg
> %%PORTDOCS%%share/doc/white_dune/index.html
> %%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/billboard.wrl
> %%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/bubble.wav
>@@ -23,29 +39,59 @@
> %%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/touch_trigger.wrl
> %%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/transform_animation.wrl
> %%PORTDOCS%%share/doc/white_dune/typical_vrml_examples/visibilty_trigger.wrl
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/6d.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/6dloc.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/6dlocal_right1.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/6dlocal_right2.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/6dlocal_right3.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/6dlocal_wrong.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/animation_onetime.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/animation_onetime2.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/animation_recording.jpg
> %%PORTDOCS%%share/doc/white_dune/usage_docs/cassettenrecorder.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/center.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/colorcircle1.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/colorcircle2.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/cosmo_colorpervertex.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/cosmo_no_colorpervertex.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/crash.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/crashrestore.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/rot.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/dials_default.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/dials_normal.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/dune.1.html
> %%PORTDOCS%%share/doc/white_dune/usage_docs/dune_animation.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_colorpervertex.jpg
> %%PORTDOCS%%share/doc/white_dune/usage_docs/dune_de.html
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_de_exercise.html
> %%PORTDOCS%%share/doc/white_dune/usage_docs/dune_en.html
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_en_exercise.html
> %%PORTDOCS%%share/doc/white_dune/usage_docs/dune_interaktion.jpg
>-%%PORTDOCS%%share/doc/white_dune/usage_docs/rot.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/dune_no_colorpervertex.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/fieldchange.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/interpolator.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/level3.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/navigation.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/node_add_invalid.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/node_add_valid.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/recording.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/recording_one.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/routecut1.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/routecut2.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/routemake1.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/routemake2.jpg
> %%PORTDOCS%%share/doc/white_dune/usage_docs/scale.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/scenegraphchange_invalid.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/scenegraphchange_valid.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/sceneicon.jpg
> %%PORTDOCS%%share/doc/white_dune/usage_docs/schieb.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/spaceball.jpg
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/timesensor.jpg
> %%PORTDOCS%%share/doc/white_dune/usage_docs/transform.jpg
> %%PORTDOCS%%share/doc/white_dune/usage_docs/transform2.jpg
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/animation_example.wrl
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/index.html
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/joystick2.sh
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/joystick2.sh.html
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/nostereo.sh
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/nostereo.sh.html
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/spaceball_joystick_example.sh
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/spaceball_joystick_example.sh.html
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/xinput_example.sh
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/xinput_example.sh.html
>-%%PORTDOCS%%share/doc/white_dune/usage_examples/xinput_irix6.2_example.sh
>-%%PORTDOCS%%@dirrm share/doc/white_dune/developer_docs
>-%%PORTDOCS%%@dirrm share/doc/white_dune/typical_vrml_examples
>+%%PORTDOCS%%share/doc/white_dune/usage_docs/windows.jpg
> %%PORTDOCS%%@dirrm share/doc/white_dune/usage_docs
>-%%PORTDOCS%%@dirrm share/doc/white_dune/usage_examples
>+%%PORTDOCS%%@dirrm share/doc/white_dune/typical_vrml_examples
>+%%PORTDOCS%%@dirrm share/doc/white_dune/developer_docs
>+%%PORTDOCS%%@dirrm share/doc/white_dune/commandline_examples
> %%PORTDOCS%%@dirrm share/doc/white_dune

Actions: View | Diff

Attachments on bug 42039: 24598