upgrade to libslang 1.4.6

This commit is contained in:
brad 2002-10-19 03:07:28 +00:00
parent 662deeaedb
commit f060e4e8e2
6 changed files with 30 additions and 236 deletions

View File

@ -1,30 +1,34 @@
# $OpenBSD: Makefile,v 1.32 2002/05/08 02:04:08 brad Exp $
# $OpenBSD: Makefile,v 1.33 2002/10/19 03:07:28 brad Exp $
COMMENT= "stack-based interpreter for terminal applications"
COMMENT= "stack-based interpreter for terminal applications"
VERSION= 1.4.5
DISTNAME= slang-${VERSION}
PKGNAME= libslang-${VERSION}
CATEGORIES= devel
NEED_VERSION= 1.522
VERSION= 1.4.6
DISTNAME= slang-${VERSION}
PKGNAME= libslang-${VERSION}
CATEGORIES= devel
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
http://gd.tuwien.ac.at/editors/davis/slang/v1.4/
http://gd.tuwien.ac.at/editors/davis/slang/v1.4/
HOMEPAGE= http://www.s-lang.org/
HOMEPAGE= http://www.s-lang.org/
MAINTAINER= Brad Smith <brad@openbsd.org>
MAINTAINER= Brad Smith <brad@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf
REGRESS_TARGET= runtests
REGRESS_FLAGS= TCAPLIB="-ltermlib"
pre-patch:
.for f in aclocal.m4 configure.in
@cd ${WRKSRC} && ln -sf autoconf/${f} ${f}
.endfor
.include <bsd.port.mk>
.if !defined(NO_SHARED_LIBS)

View File

@ -1,3 +1,3 @@
MD5 (slang-1.4.5.tar.gz) = 9e597a0d3d07465e1014d5e020087e44
RMD160 (slang-1.4.5.tar.gz) = 1caebaee9e5c7ee0aa241373c8ba70bc4ea644d5
SHA1 (slang-1.4.5.tar.gz) = fcd43cdde43200a9d2d392cb9dc956337eabfb3f
MD5 (slang-1.4.6.tar.gz) = f567d1b11d094c0533d307dcfb650128
RMD160 (slang-1.4.6.tar.gz) = 1aa43de09e960cd05f94d5cb609d99615e85e851
SHA1 (slang-1.4.6.tar.gz) = a081d2059474d4a297dc3d9d54b220f096110760

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-autoconf_aclocal_m4,v 1.1 2002/05/08 02:04:08 brad Exp $
--- autoconf/aclocal.m4.orig Tue May 7 19:22:54 2002
+++ autoconf/aclocal.m4 Tue May 7 19:28:19 2002
$OpenBSD: patch-autoconf_aclocal_m4,v 1.2 2002/10/19 03:07:28 brad Exp $
--- autoconf/aclocal.m4.orig Mon Oct 7 16:36:22 2002
+++ autoconf/aclocal.m4 Fri Oct 18 22:35:10 2002
@@ -68,7 +68,7 @@ dnl# determine whether or not -R or -rpa
AC_DEFUN(JD_INIT_RPATH,
[
@ -11,9 +11,9 @@ $OpenBSD: patch-autoconf_aclocal_m4,v 1.1 2002/05/08 02:04:08 brad Exp $
then
if test "X$ac_R_nospace" = "Xno"
@@ -566,6 +566,25 @@ case "$host_os" in
ELFLIB="lib$(THIS_LIB).dylib"
ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"
ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"
ELFLIB="lib\$(THIS_LIB).dylib"
ELFLIB_MAJOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).dylib"
ELFLIB_MAJOR_MINOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION).dylib"
+ ;;
+ *openbsd* )
+ DYNAMIC_LINK_FLAGS=""

View File

@ -1,6 +1,6 @@
--- autoconf/configure.in.orig Sun Feb 10 02:39:19 2002
+++ autoconf/configure.in Tue May 7 19:57:00 2002
@@ -105,7 +105,8 @@ slang_minor_version=`echo $slang_version
--- autoconf/configure.in.orig Mon Oct 7 16:36:22 2002
+++ autoconf/configure.in Fri Oct 18 22:31:58 2002
@@ -106,7 +106,8 @@ slang_minor_version=`echo $slang_version
slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version |
awk '{ print ([$]1 - [$]2*10000 - [$]3*100) }'`

View File

@ -1,210 +0,0 @@
$OpenBSD: patch-configure,v 1.10 2002/05/08 02:04:08 brad Exp $
--- configure.orig Sun Feb 10 02:39:19 2002
+++ configure Tue May 7 19:57:59 2002
@@ -577,7 +577,7 @@ fi
ac_aux_dir=
-for ac_dir in autoconf $srcdir/autoconf; do
+for ac_dir in ${GNUSYSTEM_AUX_DIR} autoconf $srcdir/autoconf; do
if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -2032,6 +2032,25 @@ case "$host_os" in
ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"
ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"
;;
+ *openbsd* )
+ DYNAMIC_LINK_FLAGS=""
+ ELF_CC="$CC"
+ case `arch -s` in
+ sparc64)
+ ELF_CFLAGS="$CFLAGS -fPIC"
+ ;;
+ *)
+ ELF_CFLAGS="$CFLAGS -fpic"
+ ;;
+ esac
+ ELF_LINK="$CC -shared $ELF_CFLAGS"
+ ELF_LINK_CMD="\$(ELF_LINK)"
+ ELF_DEP_LIBS="\$(DL_LIB) -lm -lcurses"
+ CC_SHARED="$CC -shared $ELF_CFLAGS"
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ DYNAMIC_LINK_FLAGS="-Wl,-E"
+ fi
+ ;;
* )
echo "Note: ELF compiler for host_os=$host_os may be wrong"
ELF_CC="$CC"
@@ -2078,7 +2097,7 @@ then
then
case "$host_os" in
- *linux*|*solaris* )
+ *linux*|*solaris*|*openbsd* )
if test "X$GCC" = Xyes
then
if test "X$ac_R_nospace" = "Xno"
@@ -2117,7 +2136,7 @@ fi
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:2121: checking size of short" >&5
+echo "configure:2140: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2125,7 +2144,7 @@ else
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 2129 "configure"
+#line 2148 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2136,7 +2155,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
@@ -2156,7 +2175,7 @@ EOF
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2160: checking size of int" >&5
+echo "configure:2179: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2164,7 +2183,7 @@ else
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 2168 "configure"
+#line 2187 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2175,7 +2194,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -2195,7 +2214,7 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2199: checking size of long" >&5
+echo "configure:2218: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2203,7 +2222,7 @@ else
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 2207 "configure"
+#line 2226 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2214,7 +2233,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -2234,7 +2253,7 @@ EOF
echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:2238: checking size of float" >&5
+echo "configure:2257: checking size of float" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2242,7 +2261,7 @@ else
ac_cv_sizeof_float=4
else
cat > conftest.$ac_ext <<EOF
-#line 2246 "configure"
+#line 2265 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2253,7 +2272,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_float=`cat conftestval`
else
@@ -2273,7 +2292,7 @@ EOF
echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:2277: checking size of double" >&5
+echo "configure:2296: checking size of double" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2281,7 +2300,7 @@ else
ac_cv_sizeof_double=8
else
cat > conftest.$ac_ext <<EOF
-#line 2285 "configure"
+#line 2304 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2292,7 +2311,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_double=`cat conftestval`
else
@@ -2314,7 +2333,7 @@ EOF
echo $ac_n "checking for Terminfo""... $ac_c" 1>&6
-echo "configure:2318: checking for Terminfo" >&5
+echo "configure:2337: checking for Terminfo" >&5
MISC_TERMINFO_DIRS="$FINKPREFIX/share/terminfo"
if test ! -d $MISC_TERMINFO_DIRS
then
@@ -2431,7 +2450,7 @@ PROGRAM_ELF_ORULES="$PROGRAM_ELF_ORULES
echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
-echo "configure:2435: checking SLANG_VERSION" >&5
+echo "configure:2454: checking SLANG_VERSION" >&5
slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h |
awk '{ print $3 }'`
slang_major_version=`echo $slang_version |
@@ -2441,7 +2460,8 @@ slang_minor_version=`echo $slang_version
slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version |
awk '{ print ($1 - $2*10000 - $3*100) }'`
-slang_minor_version="$slang_minor_version.$slang_mminor_version"
+slang_major_version=$slang_major_version$slang_minor_version
+slang_minor_version=$slang_mminor_version
slang_version="$slang_major_version.$slang_minor_version"
echo "$ac_t""$slang_version" 1>&6

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2002/05/08 02:04:08 brad Exp $
lib/libslang.so.14.5
@comment $OpenBSD: PFRAG.shared,v 1.7 2002/10/19 03:07:28 brad Exp $
lib/libslang.so.14.6
DYNLIBDIR(%B)