summaryrefslogtreecommitdiff
path: root/math/xlispstat/files/patch-aj
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2013-06-04 08:26:46 +0000
committerMartin Wilke <miwi@FreeBSD.org>2013-06-04 08:26:46 +0000
commitee00973678b95324d58dc0572802e7169c1345de (patch)
treed424397cd07ed9351a86f92422a2a9ed96cb0d5f /math/xlispstat/files/patch-aj
parent- Fix build with clang (diff)
- Update to 3.52.23
PR: 179216 Submitted by: Ports Fury
Notes
Notes: svn path=/head/; revision=319835
Diffstat (limited to 'math/xlispstat/files/patch-aj')
-rw-r--r--math/xlispstat/files/patch-aj41
1 files changed, 14 insertions, 27 deletions
diff --git a/math/xlispstat/files/patch-aj b/math/xlispstat/files/patch-aj
index 125891637795..37050a6d69e6 100644
--- a/math/xlispstat/files/patch-aj
+++ b/math/xlispstat/files/patch-aj
@@ -1,16 +1,13 @@
--- Makefile.in.orig Wed Feb 2 08:22:53 2000
+++ Makefile.in Wed May 3 09:00:00 2000
-@@ -6,7 +6,8 @@
- ##############################################################################
+@@ -7,13 +7,15 @@
##############################################################################
#
--# XLSLIB -- directory for xlisp executable, startup, example, and help files
-+# XLSLIB -- directory for xlisp example and help files
+ # XLSLIB -- directory for xlisp executable, startup, example, and help files
+# XLSLIBEXEC -- directory for xlisp executable and startup
# BINDIR -- directory for xlispstat shell script
#
- # For the remaining parameters, if your machine has a subdirectory in the
-@@ -34,7 +35,8 @@
+
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -19,31 +16,23 @@
+XLSLIBEXEC=${prefix}/libexec/xlispstat
BINDIR=${exec_prefix}/bin
- GRAPHSYS = @GRAPHSYS@
-@@ -67,11 +69,11 @@
- .lsp.fsl:
- echo "(compile-file \"$<\") (exit)" | ./xlisp
-
--CFLAGS = -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG}
-+CFLAGS = -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG} -Dunix
-
+ SHELL = /bin/sh
+@@ -33,7 +35,7 @@
LIBS = ${EXTRALIBS} -lm
--LDFLAGS = ${ULDFLAGS}
-+LDFLAGS+= ${ULDFLAGS}
-
- OSOBJS = xsdynload.o xssystem.o unixprim.o
-
-@@ -118,7 +120,7 @@
- compiler/assemble.fsl compiler/cmpfront.fsl
-
xlispstat: setup.shell xlisp.wks
- ./setup.shell xlispstat ${XLSLIB}
+ ./setup.shell xlispstat ${XLSLIB} ${XLSLIBEXEC}
chmod a+x xlispstat
- xlisp.wks: xlisp ${CMPFSLFILES} ${FSLFILES} ${AUTOFSLFILES}
-@@ -141,20 +143,21 @@
+ xlisp.wks: xlisp ${LSPDIR}/xlisp.wks
+@@ -46,24 +48,25 @@
+ rm -f xlisp
+ cp ${CDIR}/xlisp ./xlisp
+ ${CDIR}/xlisp:
+- (cd ${CDIR}; make xlisp)
++ (cd ${CDIR}; ${MAKE} xlisp)
+
install: installexecs installlsp
installexecs: xlispstat xlisp installdirs
@@ -52,19 +41,17 @@
+ ${BSD_INSTALL_SCRIPT} xlispstat ${BINDIR}/xlispstat
+ ${BSD_INSTALL_PROGRAM} xlisp ${XLSLIBEXEC}
- installlsp: xlisp.wks xlisp.hlp ${AUTOFSLFILES} ${CMPFSLFILES} installdirs
+ installlsp: xlisp.wks xlisp.hlp installdirs
- -cp xlisp.wks ${XLSLIB}
- -cp xlisp.hlp ${XLSLIB}
- -cp Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload
- -cp Data/*.lsp ${XLSLIB}/Data
- -cp Examples/*.lsp ${XLSLIB}/Examples
--# -cp ${CMPFSLFILES} ${XLSLIB}/compiler
+ ${BSD_INSTALL_SCRIPT} xlisp.wks ${XLSLIBEXEC}
+ ${BSD_INSTALL_DATA} xlisp.hlp ${XLSLIB}
+ ${BSD_INSTALL_DATA} Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload
+ ${BSD_INSTALL_DATA} Data/*.lsp ${XLSLIB}/Data
+ ${BSD_INSTALL_DATA} Examples/*.lsp ${XLSLIB}/Examples
-+# ${BSD_INSTALL_DATA} ${CMPFSLFILES} ${XLSLIB}/compiler
installdirs:
-mkdir -p ${BINDIR}