summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorThomas Gellekum <tg@FreeBSD.org>2001-04-11 11:53:08 +0000
committerThomas Gellekum <tg@FreeBSD.org>2001-04-11 11:53:08 +0000
commit0616cc68659b568b53c2b522b3adbe0ffb430d67 (patch)
tree7791e74b5e34c06a51a4330c9f8e5a7738205c6b /graphics
parentRevert r.1.4 of files/patch-src_video_vgl_SDL__vglvideo.c - it doesn't work (diff)
Fix building.
Change @s to %%s, which don't have to be protected for perl5.
Notes
Notes: svn path=/head/; revision=41282
Diffstat (limited to 'graphics')
-rw-r--r--graphics/xfpovray/Makefile2
-rw-r--r--graphics/xfpovray/files/patch-ab4
-rw-r--r--graphics/xfpovray/files/patch-ac2
3 files changed, 4 insertions, 4 deletions
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index caf344b4c5db..0230dd0c4469 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -22,6 +22,6 @@ USE_IMAKE= yes
USE_GMAKE= yes
post-patch:
- ${PERL} -pi -e "s|\@LOCALBASE\@|${LOCALBASE}|g;" ${WRKSRC}/src/xfpovray.h
+ ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/src/xfpovray.h
.include <bsd.port.mk>
diff --git a/graphics/xfpovray/files/patch-ab b/graphics/xfpovray/files/patch-ab
index 9dc751eb202c..2acf7e286bcf 100644
--- a/graphics/xfpovray/files/patch-ab
+++ b/graphics/xfpovray/files/patch-ab
@@ -5,7 +5,7 @@
** Command to invoke POV-Ray
*/
-#define POV_COMMAND "/usr/local/bin/povray"
-+#define POV_COMMAND "@LOCALBASE@/bin/povray"
++#define POV_COMMAND "%%LOCALBASE%%/bin/povray"
/*
@@ -13,7 +13,7 @@
** the widget for a total of 5, even though POV-Ray supports more.
*/
-#define POV_LIB_PATH "/usr/local/include/povray"
-+#define POV_LIB_PATH "@LOCALBASE@/lib/povray3/include"
++#define POV_LIB_PATH "%%LOCALBASE%%/lib/povray3/include"
/*
diff --git a/graphics/xfpovray/files/patch-ac b/graphics/xfpovray/files/patch-ac
index b9ed852389f4..d24a0bea3790 100644
--- a/graphics/xfpovray/files/patch-ac
+++ b/graphics/xfpovray/files/patch-ac
@@ -17,7 +17,7 @@
-EXTRA_LIBRARIES = -L$(XFORMS_LIBDIR) ../flx/libflx.a -lforms -lm
- EXTRA_INCLUDES = -I$(XFORMS_INCDIR) -I../flx
-+EXTRA_LIBRARIES = ../flx/libflx.a -lxforms -lm
++EXTRA_LIBRARIES = ../flx/libflx.a -lxforms $(XPMLIB) -lm
+ EXTRA_INCLUDES = -I../flx
EXTRA_DEFINES = -DHELP_DIR=\"$(XFHELPDIR)\"
LDLIBS = $(EXTRA_LIBRARIES) $(XLIB)