cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Gambit 4.8.4.

Browse Source 
In addition to the update, I'm removing the shared libs. The term
"shared" is misleading here, gambit will continue generating
dynamically linked binaries by default and the only static libraries
linked will be its own libraries. Nothing uses the non-versioned
gambit shared libraries in the ports tree.

OK jasper@.
This commit is contained in:
juanfra 2016-01-27 18:47:02 +00:00
parent 433c1fcb98
commit f128098de8
5 changed files with 42 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lang/gambit/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.21 2015/09/06 22:32:17 juanfra Exp $
# $OpenBSD: Makefile,v 1.22 2016/01/27 18:47:02 juanfra Exp $
SHARED_ONLY= Yes
COMMENT= complete, efficient and reliable implementation of Scheme
V= 4.7.9
DISTNAME= gambc-v${V:S/./_/g}
V= 4.8.4
DISTNAME= gambit-v${V:S/./_/g}
PKGNAME= gambit-$V
API_V= ${V:R:S/./0/}00${V:E}
SUBST_VARS+= API_V
@ -23,8 +23,7 @@ EXTRACT_SUFX= .tgz
WANTLIB += c m util
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--disable-cplusplus \
CONFIGURE_ARGS+=--disable-cplusplus \
--disable-absolute-shared-libs \
--docdir=${PREFIX}/share/doc/gambit/ \
--includedir=${PREFIX}/include/gambit/ \
@ -39,11 +38,6 @@ do-build:
ulimit -s 12288 && cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET}
post-install:
.for l in gambc gambcgsc gambcgsi
cd ${PREFIX}/lib/ && ln -s gambit/lib$l.so
.endfor
do-test:
cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} ${MAKE_PROGRAM} \
${TEST_FLAGS} -f makefile ${TEST_TARGET}

4
lang/gambit/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gambc-v4_7_9.tgz) = F+Si7rvQ9evYB7SteamLibKl7vABmcMYqIXbTvlQ8U8=
SIZE (gambc-v4_7_9.tgz) = 13209333
SHA256 (gambit-v4_8_4.tgz) = sxU2SUQL3g9hPAm1A44syId4QnfgeM3qPmcD5KWCoL8=
SIZE (gambit-v4_8_4.tgz) = 13163827

38
lang/gambit/patches/patch-configure
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.4 2015/08/24 11:47:05 jasper Exp $
$OpenBSD: patch-configure,v 1.5 2016/01/27 18:47:02 juanfra Exp $
- https://github.com/feeley/gambit/pull/163
- https://github.com/feeley/gambit/issues/124
--- configure.orig Wed Jul 15 03:07:26 2015
+++ configure Mon Aug 24 13:42:43 2015
@@ -8533,7 +8533,7 @@ done
--- configure.orig Sat Jan 16 00:50:43 2016
+++ configure Fri Jan 22 22:22:18 2016
@@ -8559,7 +8559,7 @@ done
case "$target_os" in
@ -14,43 +14,43 @@ $OpenBSD: patch-configure,v 1.4 2015/08/24 11:47:05 jasper Exp $
# OpenBSD/mips64(el) does have get_fpc_csr(), but lacks union fpc_csr.
;;
*)
@@ -13592,32 +13592,32 @@ if test "$datadir" = "\${datarootdir}"; then
@@ -13619,32 +13619,32 @@ if test "$datadir" = "\${datarootdir}"; then
datadir="\${prefix}/share"
fi
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR=\"\\\"`echo \"$prefix\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR=\"\\\"$prefix\\\"\""
-GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR=\"\\\"`echo \"$prefix\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR=\"\\\"$prefix\\\"\""
if test "$ENABLE_SYMLINKS" != yes; then
if test "$bindir" != "\${prefix}/bin"; then
- GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_BIN=\"\\\"`echo \"$bindir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_BIN=\"\\\"$bindir\\\"\""
- GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_BIN=\"\\\"`echo \"$bindir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_BIN=\"\\\"$bindir\\\"\""
fi
if test "$includedir" != "\${prefix}/include"; then
- GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INCLUDE=\"\\\"`echo \"$includedir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INCLUDE=\"\\\"$includedir\\\"\""
- GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_INCLUDE=\"\\\"`echo \"$includedir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_INCLUDE=\"\\\"$includedir\\\"\""
fi
if test "$libdir" != "\${prefix}/lib"; then
- GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_LIB=\"\\\"`echo \"$libdir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_LIB=\"\\\"$libdir\\\"\""
- GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_LIB=\"\\\"`echo \"$libdir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_LIB=\"\\\"$libdir\\\"\""
fi
if test "$docdir" != "\${prefix}/doc"; then
- GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_DOC=\"\\\"`echo \"$docdir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_DOC=\"\\\"$docdir\\\"\""
- GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_DOC=\"\\\"`echo \"$docdir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_DOC=\"\\\"$docdir\\\"\""
fi
if test "$infodir" != "\${prefix}/info"; then
- GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INFO=\"\\\"`echo \"$infodir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INFO=\"\\\"$infodir\\\"\""
- GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_INFO=\"\\\"`echo \"$infodir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_INFO=\"\\\"$infodir\\\"\""
fi
if test "$datadir" != "\${prefix}/share"; then
- GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_SHARE=\"\\\"`echo \"$datadir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_SHARE=\"\\\"$datadir\\\"\""
- GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_SHARE=\"\\\"`echo \"$datadir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
+ GAMBITLIB_DEFS="$GAMBITLIB_DEFS -D___GAMBITDIR_SHARE=\"\\\"$datadir\\\"\""
fi
fi

8
lang/gambit/patches/patch-doc_makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-doc_makefile_in,v 1.3 2014/03/09 20:00:33 jasper Exp $
$OpenBSD: patch-doc_makefile_in,v 1.4 2016/01/27 18:47:02 juanfra Exp $
Don't reconstruct the ps file from the PDF, this makes ghostscript shit itself:
GPL Ghostscript 9.04: Error: Font Renderer Plugin ( FreeType ) return code = -1
--- doc/makefile.in.orig Sun Jan 12 03:17:54 2014
+++ doc/makefile.in Tue Feb 25 10:50:50 2014
--- doc/makefile.in.orig Thu Sep 3 01:14:02 2015
+++ doc/makefile.in Fri Jan 22 22:07:44 2016
@@ -95,7 +95,7 @@ all-pre:
all-post:
@ -12,5 +12,5 @@ GPL Ghostscript 9.04: Error: Font Renderer Plugin ( FreeType ) return code = -1
-doc: info pdf html txt ps
+doc: info pdf html txt
info: gambit-c.info
info: gambit.info

29
lang/gambit/pkg/PLIST
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.9 2015/09/06 22:32:17 juanfra Exp $
@comment $OpenBSD: PLIST,v 1.10 2016/01/27 18:47:02 juanfra Exp $
@conflict scheme48-*
bin/gambc-cc
bin/gambc-doc
bin/gambcomp-C
bin/gambdoc
@bin bin/gsc
bin/gsc-script
@bin bin/gsi
@ -15,17 +15,17 @@ bin/six-script
include/gambit/
include/gambit/gambit-not${API_V}.h
include/gambit/gambit.h
@info info/gambit-c.info
@info info/gambit.info
lib/gambit/
lib/gambit/_asm#.scm
lib/gambit/_assert#.scm
lib/gambit/_codegen#.scm
lib/gambit/_define-syntax.scm
lib/gambit/_eval#.scm
lib/gambit/_gambc.c
lib/gambit/_gambcgsc.c
lib/gambit/_gambcgsi.c
lib/gambit/_gambit#.scm
lib/gambit/_gambit.c
lib/gambit/_gambitgsc.c
lib/gambit/_gambitgsi.c
lib/gambit/_io#.scm
lib/gambit/_kernel#.scm
lib/gambit/_nonstd#.scm
@ -49,20 +49,17 @@ lib/gambit/_x86#.scm
lib/gambit/digest#.scm
lib/gambit/digest.scm
lib/gambit/gambit#.scm
lib/gambit/libgambc.so
lib/gambit/libgambcgsc.so
lib/gambit/libgambcgsi.so
lib/gambit/libgambit.a
lib/gambit/libgambitgsc.a
lib/gambit/libgambitgsi.a
lib/gambit/r4rs#.scm
lib/gambit/r5rs#.scm
lib/gambit/syntax-case.scm
lib/libgambc.so
lib/libgambcgsc.so
lib/libgambcgsi.so
@man man/man1/gsi.1
share/doc/gambit/
share/doc/gambit/gambit-c.html
share/doc/gambit/gambit-c.pdf
share/doc/gambit/gambit-c.txt
share/doc/gambit/gambit.html
share/doc/gambit/gambit.pdf
share/doc/gambit/gambit.txt
share/emacs/
share/emacs/site-lisp/
share/emacs/site-lisp/gambit.el