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

update slang to 2.2.1, dependent ports will be updated shortly.

Browse Source
This commit is contained in:
sthen 2009-10-13 21:46:20 +00:00
parent a971e8f207
commit 691b3ef0e0
7 changed files with 182 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
devel/libslang/Makefile
View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.45 2007/09/16 02:53:01 merdely Exp $
# $OpenBSD: Makefile,v 1.46 2009/10/13 21:46:20 sthen Exp $
COMMENT= stack-based interpreter for terminal applications
VERSION= 1.4.9
DISTNAME= slang-${VERSION}
PKGNAME= libslang-${VERSION}p3
SHARED_LIBS= slang 14.9
DISTNAME= slang-2.2.1
PKGNAME= lib${DISTNAME}
SHARED_LIBS= slang 15.0
CATEGORIES= devel
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
http://gd.tuwien.ac.at/editors/davis/slang/v1.4/
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v2.2/ \
ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/
HOMEPAGE= http://www.s-lang.org/
@ -19,8 +18,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
AUTOCONF_VERSION= 2.13
WANTLIB= c m termcap z
LIB_DEPENDS= pcre::devel/pcre
MODULES= converters/libiconv
AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf no-autoheader
AUTOCONF_DIR= ${WRKSRC}/autoconf
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf
REGRESS_TARGET= runtests
@ -29,10 +34,8 @@ REGRESS_FLAGS= TCAPLIB="-ltermlib"
MAKE_ENV= LIBslang_MAJOR=${LIBslang_VERSION:R} \
LIBslang_MINOR=${LIBslang_VERSION:E}
pre-patch:
.for f in aclocal.m4 configure.in
@cd ${WRKSRC} && ln -sf autoconf/${f} ${f}
.endfor
pre-configure:
cd ${AUTOCONF_DIR}; cp configure ..
.include <bsd.port.mk>

10
devel/libslang/distinfo
View File

@ -1,5 +1,5 @@
MD5 (slang-1.4.9.tar.gz) = xzqmKy0bIVylWnM32qP1Qw==
RMD160 (slang-1.4.9.tar.gz) = nPxrcIlmGNmde1Bbk789nf33Two=
SHA1 (slang-1.4.9.tar.gz) = 8Cpg6OdUvdA2d/bRybVwDCGQgho=
SHA256 (slang-1.4.9.tar.gz) = OWnbr96smNB4hV0p9HqNq5QfF4knTNCYGotADDl4Vfg=
SIZE (slang-1.4.9.tar.gz) = 805990
MD5 (slang-2.2.1.tar.gz) = mnJCDfKqexkyoZXG5ahUZQ==
RMD160 (slang-2.2.1.tar.gz) = BP6h+UljFDU2FWlNyoWKV6zZJ+I=
SHA1 (slang-2.2.1.tar.gz) = gUT20DYsjeIgbDD8K9z3PaQerzg=
SHA256 (slang-2.2.1.tar.gz) = oimy7HJE04Ir1O2UonAozzdfyZ2aIZTQy2r+QshpSzU=
SIZE (slang-2.2.1.tar.gz) = 1688579

79
devel/libslang/patches/patch-autoconf_aclocal_m4
View File

@ -1,49 +1,46 @@
$OpenBSD: patch-autoconf_aclocal_m4,v 1.4 2006/01/07 14:19:29 bernd Exp $
--- autoconf/aclocal.m4.orig Sun Mar 23 08:06:40 2003
+++ autoconf/aclocal.m4 Sat Jan 7 14:36:59 2006
@@ -86,7 +86,7 @@ case "$host_os" in
fi
fi
;;
- *osf*)
+ *osf* | *openbsd*)
if test "X$GCC" = Xyes
then
RPATH="-Wl,-rpath,"
@@ -482,8 +482,8 @@ AC_CHECK_HEADER(dlfcn.h,[
AC_SUBST(DYNAMIC_LINK_LIB)
$OpenBSD: patch-autoconf_aclocal_m4,v 1.5 2009/10/13 21:46:20 sthen Exp $
--- autoconf/aclocal.m4.orig Mon Sep 7 03:10:49 2009
+++ autoconf/aclocal.m4 Sat Oct 10 13:54:45 2009
@@ -570,13 +570,13 @@ fi
dnl #Some defaults
ELFLIB="lib\$(THIS_LIB).so"
-ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
-ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
-ELFLIB_MAJOR_MINOR="\$(ELFLIB_MAJOR).\$(ELF_MINOR_VERSION)"
+ELFLIB_MAJOR="\$(ELFLIB).\$(LIBslang_MAJOR)"
+ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(LIBslang_MAJOR).\$(LIBslang_MINOR)"
ELFLIB_MAJOR_MINOR_MICRO="\$(ELFLIB_MAJOR_MINOR).\$(ELF_MICRO_VERSION)"
case "$host_os" in
*linux* )
@@ -571,6 +571,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"
+ ;;
+ *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=
+ CC_SHARED="$CC -shared $ELF_CFLAGS"
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ DYNAMIC_LINK_FLAGS="-Wl,-E"
+ fi
;;
dnl# This specifies the target to use in the makefile to install the shared library
INSTALL_ELFLIB_TARGET="install-elf-and-links"
-ELFLIB_BUILD_NAME="\$(ELFLIB_MAJOR_MINOR_MICRO)"
+ELFLIB_BUILD_NAME="\$(ELFLIB_MAJOR_MINOR)"
INSTALL_MODULE="\$(INSTALL_DATA)"
SLANG_DLL_CFLAGS=""
M_LIB="-lm"
@@ -701,6 +701,25 @@ case "$host_os" in
ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)"
ELF_DEP_LIBS="\$(DL_LIB)"
CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
+ ;;
+ *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=
+ 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"

12
devel/libslang/patches/patch-autoconf_configure_in
View File

@ -1,12 +0,0 @@
--- autoconf/configure.in.orig 2003-03-23 02:06:40.000000000 -0500
+++ autoconf/configure.in 2004-01-10 23:16:55.000000000 -0500
@@ -107,7 +107,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"
AC_MSG_RESULT($slang_version)
AC_SUBST(slang_major_version)

14
devel/libslang/patches/patch-src_Makefile_in
View File

@ -1,11 +1,11 @@
--- src/Makefile.in.orig Sun Feb 10 02:39:19 2002
+++ src/Makefile.in Tue May 7 19:57:00 2002
@@ -38,7 +38,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
--- src/Makefile.in.orig Mon Sep 7 02:10:49 2009
+++ src/Makefile.in Wed Sep 9 21:57:37 2009
@@ -45,7 +45,7 @@ exec_prefix = @exec_prefix@
install_lib_dir = @libdir@
install_bin_dir = @bindir@
install_include_dir = @includedir@
-install_doc_dir = $(prefix)/doc/slang
+install_doc_dir = $(prefix)/share/doc/slang
-install_doc_dir = $(prefix)/share/doc/slang/v@slang_major_version@
+install_doc_dir = $(prefix)/share/doc/slang/
DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
MODULE_INSTALL_DIR = @libdir@/slang/modules
MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
#---------------------------------------------------------------------------

15
devel/libslang/pkg/PFRAG.shared
View File

@ -1,2 +1,15 @@
@comment $OpenBSD: PFRAG.shared,v 1.11 2006/01/07 14:19:29 bernd Exp $
@comment $OpenBSD: PFRAG.shared,v 1.12 2009/10/13 21:46:20 sthen Exp $
@comment lib/libslang.so
@lib lib/libslang.so.${LIBslang_VERSION}
lib/slang/v2/modules/fcntl-module.so
lib/slang/v2/modules/fork-module.so
lib/slang/v2/modules/iconv-module.so
lib/slang/v2/modules/pcre-module.so
lib/slang/v2/modules/rand-module.so
lib/slang/v2/modules/select-module.so
lib/slang/v2/modules/slsmg-module.so
lib/slang/v2/modules/socket-module.so
lib/slang/v2/modules/sysconf-module.so
lib/slang/v2/modules/termios-module.so
lib/slang/v2/modules/varray-module.so
lib/slang/v2/modules/zlib-module.so

109
devel/libslang/pkg/PLIST
View File

@ -1,17 +1,114 @@
@comment $OpenBSD: PLIST,v 1.14 2005/04/19 09:41:42 espie Exp $
@comment $OpenBSD: PLIST,v 1.15 2009/10/13 21:46:20 sthen Exp $
%%SHARED%%
@bin bin/slsh
include/slang.h
include/slcurses.h
lib/libslang.a
@endfake
@comment lib/libslang.so.15
lib/slang/
lib/slang/v2/
lib/slang/v2/modules/
@man man/man1/slsh.1
share/doc/slang/
share/doc/slang/COPYING
share/doc/slang/COPYING.ART
share/doc/slang/COPYING.GPL
share/doc/slang/COPYRIGHT
share/doc/slang/changes.txt
share/doc/slang/cref.txt
share/doc/slang/cslang.txt
share/doc/slang/slang.txt
share/doc/slang/slangdoc.html
share/doc/slang/slangfun.txt
share/doc/slsh/
share/doc/slsh/html/
share/doc/slsh/html/slshfun-1.html
share/doc/slsh/html/slshfun-2.html
share/doc/slsh/html/slshfun-3.html
share/doc/slsh/html/slshfun-4.html
share/doc/slsh/html/slshfun-5.html
share/doc/slsh/html/slshfun-6.html
share/doc/slsh/html/slshfun-7.html
share/doc/slsh/html/slshfun-8.html
share/doc/slsh/html/slshfun-9.html
share/doc/slsh/html/slshfun.html
share/slsh/
share/slsh/arrayfuns.sl
share/slsh/autoload.sl
share/slsh/cmaps/
share/slsh/cmaps/cool.map
share/slsh/cmaps/copper.map
share/slsh/cmaps/drywet.map
share/slsh/cmaps/ds9b.map
share/slsh/cmaps/ds9sls.map
share/slsh/cmaps/gebco.map
share/slsh/cmaps/globe.map
share/slsh/cmaps/gray.map
share/slsh/cmaps/haxby.map
share/slsh/cmaps/hot.map
share/slsh/cmaps/jet.map
share/slsh/cmaps/no_green.map
share/slsh/cmaps/ocean.map
share/slsh/cmaps/polar.map
share/slsh/cmaps/rainbow.map
share/slsh/cmaps/red2green.map
share/slsh/cmaps/relief.map
share/slsh/cmaps/sealand.map
share/slsh/cmaps/seis.map
share/slsh/cmaps/split.map
share/slsh/cmaps/topo.map
share/slsh/cmaps/wysiwyg.map
share/slsh/cmdopt.sl
share/slsh/fcntl.sl
share/slsh/fork.sl
share/slsh/glob.sl
share/slsh/help/
share/slsh/help/arrayfuns.hlp
share/slsh/help/cmdopt.hlp
share/slsh/help/forkfuns.hlp
share/slsh/help/glob.hlp
share/slsh/help/onigfuns.hlp
share/slsh/help/pcrefuns.hlp
share/slsh/help/pngfuns.hlp
share/slsh/help/print.hlp
share/slsh/help/process.hlp
share/slsh/help/profile.hlp
share/slsh/help/randfuns.hlp
share/slsh/help/readascii.hlp
share/slsh/help/require.hlp
share/slsh/help/sockfuns.hlp
share/slsh/help/structfuns.hlp
share/slsh/iconv.sl
share/slsh/local-packages/
share/slsh/onig.sl
share/slsh/pcre.sl
share/slsh/png.sl
share/slsh/print.sl
share/slsh/process.sl
share/slsh/profile.sl
share/slsh/rand.sl
share/slsh/readascii.sl
share/slsh/require.sl
share/slsh/rline/
share/slsh/rline/complete.sl
share/slsh/rline/editfuns.sl
share/slsh/rline/emacskeys.sl
share/slsh/rline/history.sl
share/slsh/rline/slrline.rc
share/slsh/rline/vikeys.sl
share/slsh/scripts/
share/slsh/scripts/jpegsize
share/slsh/scripts/lsrpm
share/slsh/scripts/sldb
share/slsh/scripts/slprof
share/slsh/scripts/svnsh
share/slsh/select.sl
share/slsh/sldb.sl
share/slsh/sldbcore.sl
share/slsh/sldbsock.sl
share/slsh/slshhelp.sl
share/slsh/slshrl.sl
share/slsh/slsmg.sl
share/slsh/socket.sl
share/slsh/stkcheck.sl
share/slsh/structfuns.sl
share/slsh/sysconf.sl
share/slsh/termios.sl
share/slsh/varray.sl
share/slsh/zlib.sl