git: e3ec54e79088 - main - graphics/rayshade: Unbreak with llvm15
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 18 May 2023 16:09:23 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e3ec54e79088ca4768cb82a636332b3b37ae894d
commit e3ec54e79088ca4768cb82a636332b3b37ae894d
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-05-17 18:39:47 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-05-18 16:09:11 +0000
graphics/rayshade: Unbreak with llvm15
- Pet portclippy
- Adopt port
---
graphics/rayshade/Makefile | 18 ++++++---
graphics/rayshade/files/patch-Configure | 12 +++---
.../rayshade/files/patch-etc__rsconvert__lex.l | 6 +--
.../rayshade/files/patch-etc__rsconvert__yacc.y | 2 +-
graphics/rayshade/files/patch-fog.c | 10 -----
graphics/rayshade/files/patch-fogdeck.c | 10 -----
graphics/rayshade/files/patch-libray_Makefile | 6 +--
.../files/patch-libray__libtext__texture.c | 6 +--
...extended.c => patch-libray_liblight_extended.c} | 6 +--
.../files/{patch-hf.c => patch-libray_libobj_hf.c} | 6 +--
graphics/rayshade/files/patch-libray_libsurf_fog.c | 10 +++++
.../rayshade/files/patch-libray_libsurf_fogdeck.c | 10 +++++
graphics/rayshade/files/patch-libshade__lex.l | 6 +--
graphics/rayshade/files/patch-libshade__yacc.y | 2 +-
graphics/rayshade/files/patch-raypaint_Makefile.SH | 43 ++++++++--------------
15 files changed, 75 insertions(+), 78 deletions(-)
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 8d613d19c2d9..563354193822 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -9,7 +9,7 @@ DISTFILES= ${PORTNAME}.${PORTVERSION}.tar.Z
DIST_SUBDIR= rayshade
EXTRACT_ONLY= ${PORTNAME}.${PORTVERSION}.tar.Z
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= bofh@FreeBSD.org
COMMENT= Extensible system for creating ray-traced images
WWW= http://www-graphics.stanford.edu/~cek/rayshade/
@@ -20,17 +20,19 @@ LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
BUILD_DEPENDS= ${LOCALBASE}/lib/librle.a:graphics/urt
-WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION:R}
-
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
+
ALL_TARGET= # empty
+WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION:R}
+
+PLIST_FILES= bin/rayshade
PORTDOCS= *
PORTEXAMPLES= *
-PLIST_FILES= bin/rayshade
OPTIONS_DEFINE= DOCS EXAMPLES
+
DOCS_DISTFILES= guide.ps.Z
.include <bsd.port.options.mk>
@@ -39,6 +41,12 @@ DOCS_DISTFILES= guide.ps.Z
CONFIGURE_ARGS= < ${WRKDIR}/config.ans
.endif
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+= -Wno-error=int-conversion
+.endif
+
pre-configure:
@${SED} -e \
"s,@CFLAGS@,${CFLAGS},g ; \
@@ -60,4 +68,4 @@ do-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/Examples/* ${STAGEDIR}${EXAMPLESDIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/rayshade/files/patch-Configure b/graphics/rayshade/files/patch-Configure
index fcff6ae0a4d8..d7820200a385 100644
--- a/graphics/rayshade/files/patch-Configure
+++ b/graphics/rayshade/files/patch-Configure
@@ -1,6 +1,6 @@
---- Configure.orig Mon Feb 10 12:04:23 1992
-+++ Configure Tue Jul 29 14:18:04 2003
-@@ -28,10 +28,11 @@
+--- Configure.orig 1992-02-10 03:04:23 UTC
++++ Configure
+@@ -28,10 +28,11 @@ PATH=$PATH:'/sys5.3/bin:/sys5.3/usr/bin /bsd4.3/bin /b
PATH=$PATH:'/bsd4.3/usr/bin:/usr/bsd'
export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$)
@@ -16,7 +16,7 @@
(alias) >/dev/null 2>&1 && \
echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \
-@@ -660,6 +661,7 @@
+@@ -660,6 +661,7 @@ case "$libs" in
;;
esac
set /usr/ccs/lib/libc.so
@@ -24,7 +24,7 @@
test -f $1 || set /usr/lib/libc.so
test -f $1 || set /usr/lib/libc.so.[0-9]*
eval set \$$#
-@@ -872,7 +874,7 @@
+@@ -872,7 +874,7 @@ $eunicefix filexp
: determine where manual pages are on this system
echo " "
case "$sysman" in
@@ -33,7 +33,7 @@
;;
esac
if test -d "$sysman"; then
-@@ -1418,14 +1420,8 @@
+@@ -1418,14 +1420,8 @@ if $contains '^index$' libc.list >/dev/null 2>&1 ; the
if $contains '^strchr$' libc.list >/dev/null 2>&1 ; then
if $contains strchr "$strings" >/dev/null 2>&1 ; then
if $contains index "$strings" >/dev/null 2>&1 ; then
diff --git a/graphics/rayshade/files/patch-etc__rsconvert__lex.l b/graphics/rayshade/files/patch-etc__rsconvert__lex.l
index 8c8888341ed3..319a00ab0bf7 100644
--- a/graphics/rayshade/files/patch-etc__rsconvert__lex.l
+++ b/graphics/rayshade/files/patch-etc__rsconvert__lex.l
@@ -1,5 +1,5 @@
---- etc/rsconvert/lex.l.orig 1992-02-10 12:03:54.000000000 +0900
-+++ etc/rsconvert/lex.l 2013-05-28 22:55:24.000000000 +0900
+--- etc/rsconvert/lex.l.orig 1992-02-10 03:03:54 UTC
++++ etc/rsconvert/lex.l
@@ -22,6 +22,7 @@
#include "libcommon/common.h"
#include "y.tab.h"
@@ -8,7 +8,7 @@
alpha [a-zA-Z]
special [\.\_-]
digit [0-9]
-@@ -113,7 +114,7 @@
+@@ -113,7 +114,7 @@ skipcomments()
if ((c = input()) == '/') {
WriteChar(c);
WriteNewline();
diff --git a/graphics/rayshade/files/patch-etc__rsconvert__yacc.y b/graphics/rayshade/files/patch-etc__rsconvert__yacc.y
index 4773a6fb527f..dc0847d28abf 100644
--- a/graphics/rayshade/files/patch-etc__rsconvert__yacc.y
+++ b/graphics/rayshade/files/patch-etc__rsconvert__yacc.y
@@ -1,4 +1,4 @@
---- etc/rsconvert/yacc.y.orig
+--- etc/rsconvert/yacc.y.orig 1992-02-10 03:04:17 UTC
+++ etc/rsconvert/yacc.y
@@ -14,6 +14,7 @@
/* $Id: yacc.y,v 4.0.1.3 92/02/07 11:05:21 cek Exp Locker: cek $ */
diff --git a/graphics/rayshade/files/patch-fog.c b/graphics/rayshade/files/patch-fog.c
deleted file mode 100644
index cdcd084a8b5d..000000000000
--- a/graphics/rayshade/files/patch-fog.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libray/libsurf/fog.c.orig Mon Feb 10 04:03:33 1992
-+++ libray/libsurf/fog.c Wed Feb 7 18:36:49 2007
-@@ -28,7 +28,6 @@
- Color *color, *trans;
- {
- Fog *fog;
-- static void ComputeFog();
-
- fog = (Fog *)Malloc(sizeof(Fog));
-
diff --git a/graphics/rayshade/files/patch-fogdeck.c b/graphics/rayshade/files/patch-fogdeck.c
deleted file mode 100644
index 58a165b40e25..000000000000
--- a/graphics/rayshade/files/patch-fogdeck.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libray/libsurf/fogdeck.c.orig Mon Feb 10 04:03:45 1992
-+++ libray/libsurf/fogdeck.c Wed Feb 7 18:37:51 2007
-@@ -31,7 +31,6 @@
- Color *color, *trans;
- {
- Fogdeck *fogdeck;
-- static void ComputeFogdeck();
-
- fogdeck = (Fogdeck *)Malloc(sizeof(Fogdeck));
-
diff --git a/graphics/rayshade/files/patch-libray_Makefile b/graphics/rayshade/files/patch-libray_Makefile
index 862e271a383a..9345516938d6 100644
--- a/graphics/rayshade/files/patch-libray_Makefile
+++ b/graphics/rayshade/files/patch-libray_Makefile
@@ -2,9 +2,9 @@ On really fast machines some of the .o files aren't being added to
libray.a because they are generated so fast that make(1) thinks the
library is up-to-date. Marvel at the horrific hack below.
---- libray/Makefile.orig Sat Feb 26 16:41:28 2000
-+++ libray/Makefile Sat Feb 26 16:42:36 2000
-@@ -12,6 +12,8 @@
+--- libray/Makefile.orig 1992-02-10 03:03:05 UTC
++++ libray/Makefile
+@@ -12,6 +12,8 @@ default:
for i in $(STUFF); do \
(cd $$i && $(MAKE)); \
done
diff --git a/graphics/rayshade/files/patch-libray__libtext__texture.c b/graphics/rayshade/files/patch-libray__libtext__texture.c
index 0ad51f4aa9b3..17d6cb52d8cc 100644
--- a/graphics/rayshade/files/patch-libray__libtext__texture.c
+++ b/graphics/rayshade/files/patch-libray__libtext__texture.c
@@ -1,6 +1,6 @@
---- libray/libtext/texture.c.orig 1992-02-10 12:04:02.000000000 +0900
-+++ libray/libtext/texture.c 2013-05-28 22:41:59.000000000 +0900
-@@ -162,7 +162,7 @@
+--- libray/libtext/texture.c.orig 1992-02-10 03:04:02 UTC
++++ libray/libtext/texture.c
+@@ -162,7 +162,7 @@ Float *u, *v;
*u = ptmp.x;
*v = ptmp.y;
if (dpdu == (Vector *)NULL || dpdv == (Vector *)NULL)
diff --git a/graphics/rayshade/files/patch-extended.c b/graphics/rayshade/files/patch-libray_liblight_extended.c
similarity index 59%
rename from graphics/rayshade/files/patch-extended.c
rename to graphics/rayshade/files/patch-libray_liblight_extended.c
index a5ac830b592a..367137f6af9e 100644
--- a/graphics/rayshade/files/patch-extended.c
+++ b/graphics/rayshade/files/patch-libray_liblight_extended.c
@@ -1,6 +1,6 @@
---- libray/liblight/extended.c.orig Mon Feb 10 04:03:43 1992
-+++ libray/liblight/extended.c Wed Feb 7 18:34:20 2007
-@@ -54,7 +54,7 @@
+--- libray/liblight/extended.c.orig 1992-02-10 03:03:43 UTC
++++ libray/liblight/extended.c
+@@ -54,7 +54,7 @@ ExtendedMethods()
/*
* Compute intensity ('color') of extended light source 'lp' from 'pos'.
*/
diff --git a/graphics/rayshade/files/patch-hf.c b/graphics/rayshade/files/patch-libray_libobj_hf.c
similarity index 58%
rename from graphics/rayshade/files/patch-hf.c
rename to graphics/rayshade/files/patch-libray_libobj_hf.c
index eb64a4c8626e..f313c3c73eed 100644
--- a/graphics/rayshade/files/patch-hf.c
+++ b/graphics/rayshade/files/patch-libray_libobj_hf.c
@@ -1,6 +1,6 @@
---- libray/libobj/hf.c.orig Mon Feb 10 04:04:18 1992
-+++ libray/libobj/hf.c Wed Feb 7 18:27:10 2007
-@@ -42,7 +42,7 @@
+--- libray/libobj/hf.c.orig 1992-02-10 03:04:18 UTC
++++ libray/libobj/hf.c
+@@ -42,7 +42,7 @@ typedef struct {
Vector cp, pDX, pDY;
} Trav2D;
diff --git a/graphics/rayshade/files/patch-libray_libsurf_fog.c b/graphics/rayshade/files/patch-libray_libsurf_fog.c
new file mode 100644
index 000000000000..9c27f68f617d
--- /dev/null
+++ b/graphics/rayshade/files/patch-libray_libsurf_fog.c
@@ -0,0 +1,10 @@
+--- libray/libsurf/fog.c.orig 1992-02-10 03:03:33 UTC
++++ libray/libsurf/fog.c
+@@ -28,7 +28,6 @@ FogCreate(color, trans)
+ Color *color, *trans;
+ {
+ Fog *fog;
+- static void ComputeFog();
+
+ fog = (Fog *)Malloc(sizeof(Fog));
+
diff --git a/graphics/rayshade/files/patch-libray_libsurf_fogdeck.c b/graphics/rayshade/files/patch-libray_libsurf_fogdeck.c
new file mode 100644
index 000000000000..e65a5da47c72
--- /dev/null
+++ b/graphics/rayshade/files/patch-libray_libsurf_fogdeck.c
@@ -0,0 +1,10 @@
+--- libray/libsurf/fogdeck.c.orig 1992-02-10 03:03:45 UTC
++++ libray/libsurf/fogdeck.c
+@@ -31,7 +31,6 @@ int octaves;
+ Color *color, *trans;
+ {
+ Fogdeck *fogdeck;
+- static void ComputeFogdeck();
+
+ fogdeck = (Fogdeck *)Malloc(sizeof(Fogdeck));
+
diff --git a/graphics/rayshade/files/patch-libshade__lex.l b/graphics/rayshade/files/patch-libshade__lex.l
index 1f82dacab387..b2e0900d6f42 100644
--- a/graphics/rayshade/files/patch-libshade__lex.l
+++ b/graphics/rayshade/files/patch-libshade__lex.l
@@ -1,5 +1,5 @@
---- libshade/lex.l.orig 1992-02-10 12:04:02.000000000 +0900
-+++ libshade/lex.l 2013-05-28 22:45:54.000000000 +0900
+--- libshade/lex.l.orig 1992-02-10 03:04:02 UTC
++++ libshade/lex.l
@@ -29,6 +29,7 @@
#include "y.tab.h"
extern char *strsave();
@@ -8,7 +8,7 @@
alpha [a-zA-Z]
special [\.\_-]
digit [0-9]
-@@ -171,7 +172,7 @@
+@@ -171,7 +172,7 @@ skipcomments()
while (input() != '*')
;
if ((c = input()) == '/')
diff --git a/graphics/rayshade/files/patch-libshade__yacc.y b/graphics/rayshade/files/patch-libshade__yacc.y
index 199c907d86c7..1620b93f5c6f 100644
--- a/graphics/rayshade/files/patch-libshade__yacc.y
+++ b/graphics/rayshade/files/patch-libshade__yacc.y
@@ -1,4 +1,4 @@
---- libshade/yacc.y.orig
+--- libshade/yacc.y.orig 1992-02-10 03:04:21 UTC
+++ libshade/yacc.y
@@ -13,6 +13,8 @@
/* for any purpose. It is provided solely "as is". */
diff --git a/graphics/rayshade/files/patch-raypaint_Makefile.SH b/graphics/rayshade/files/patch-raypaint_Makefile.SH
index 746d78b7db76..bb73f3d6e54c 100644
--- a/graphics/rayshade/files/patch-raypaint_Makefile.SH
+++ b/graphics/rayshade/files/patch-raypaint_Makefile.SH
@@ -1,27 +1,16 @@
-*** raypaint/Makefile.SH.orig Sat Mar 28 20:31:28 1998
---- raypaint/Makefile.SH Sat Mar 28 20:31:55 1998
-***************
-*** 55,65 ****
-
- #
- # If using X11, use:
-! #GRAPHICSLIB = -lX11
-
- #
- # If you are using GL, use:
-! GRAPHICSLIB = -lgl_s
-
- LIBRAY = $(LIBRAYDIR)/libray.a
- LIBSHADE = $(LIBSHADEDIR)/libshade.a
---- 55,65 ----
-
- #
- # If using X11, use:
-! GRAPHICSLIB = -lX11
-
- #
- # If you are using GL, use:
-! #GRAPHICSLIB = -lgl_s
-
- LIBRAY = $(LIBRAYDIR)/libray.a
- LIBSHADE = $(LIBSHADEDIR)/libshade.a
+--- raypaint/Makefile.SH.orig 1992-02-10 03:03:47 UTC
++++ raypaint/Makefile.SH
+@@ -55,11 +55,11 @@ YFLAGS = -d
+
+ #
+ # If using X11, use:
+-#GRAPHICSLIB = -lX11
++GRAPHICSLIB = -lX11
+
+ #
+ # If you are using GL, use:
+-GRAPHICSLIB = -lgl_s
++#GRAPHICSLIB = -lgl_s
+
+ LIBRAY = $(LIBRAYDIR)/libray.a
+ LIBSHADE = $(LIBSHADEDIR)/libshade.a