Import devel/libslang2 (version 2.1.3). This is the current

version, and packages should switch to it as they are deemed compatible.
blurb:

S-Lang is a C programmer's library that includes routines for the rapid
development of sophisticated, user friendly, multi-platform applications.

The S-Lang library includes the following:

 -	Low level tty input routines for reading single characters at a
	time, as well as low-level terminal-independent routines for
	manipulating the display of a terminal.

 - 	Keymap routines for defining keys and manipulating multiple
	keymaps.

 -	High level screen management routines for manipulating both
 	monochrome and color terminals.  These routines are very efficient.

 -	Routines for reading single line input with line editing and recall
	capabilities.

 -	Searching functions: both ordinary searches and regular expression
	searches.

 -	An embedded stack-based language interpreter with a C-like syntax.

 -	A malloc debugging package

12 files changed, 574 insertions, 0 deletions

diff --git a/devel/libslang2/DESCR b/devel/libslang2/DESCR
new file mode 100644
index 00000000000..73255dddc3c
--- /dev/null
+++ b/devel/libslang2/DESCR
@@ -0,0 +1,24 @@
+S-Lang is a C programmer's library that includes routines for the rapid
+development of sophisticated, user friendly, multi-platform applications.
+
+The S-Lang library includes the following:
+
+ -	Low level tty input routines for reading single characters at a
+	time, as well as low-level terminal-independent routines for
+	manipulating the display of a terminal.
+
+ - 	Keymap routines for defining keys and manipulating multiple
+	keymaps.
+
+ -	High level screen management routines for manipulating both
+ 	monochrome and color terminals.  These routines are very efficient.
+
+ -	Routines for reading single line input with line editing and recall
+	capabilities.
+
+ -	Searching functions: both ordinary searches and regular expression
+	searches.
+
+ -	An embedded stack-based language interpreter with a C-like syntax.
+
+ -	A malloc debugging package
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
new file mode 100644
index 00000000000..b76b2e51503
--- /dev/null
+++ b/devel/libslang2/Makefile
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+#
+
+DISTNAME=	slang-2.1.3
+PKGNAME=	lib${DISTNAME:slang%=slang2%}
+SVR4_PKGNAME=	lslan
+CATEGORIES=	devel
+MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v2.1/ \
+		http://gd.tuwien.ac.at/editors/davis/slang/v2.1/ \
+		ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.1/ \
+		ftp://ftp.plig.org/pub/slang/v2.1/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.s-lang.org/
+COMMENT=	Routines for rapid alpha-numeric terminal applications development
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+MAKE_JOBS_SAFE=		no
+
+BUILDLINK_TRANSFORM+=	l:slang:slang2
+
+USE_TOOLS+=		gmake
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--without-x
+
+DLOPEN_REQUIRE_PTHREADS=no
+
+EGDIR=			${PREFIX}/share/examples/libslang2
+CONF_FILES+=		${EGDIR}/slsh.rc ${PKG_SYSCONFDIR}/slsh.rc
+
+INSTALL_MAKE_FLAGS+=	DEST_SLSH_CONF_DIR=${DESTDIR}/${EGDIR}
+
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/slang2
+
+.include "../../mk/termcap.buildlink3.mk"
+
+.if ${TERMCAP_TYPE} == "termcap"
+CONFIGURE_ENV+=		TERMCAP=${BUILDLINK_LDADD.termcap:Q}
+CONFIGURE_ENV+=		MISC_TERMINFO_DIRS=${PREFIX}/share/terminfo
+.else
+CONFIGURE_ENV+=		TERMCAP=
+CONFIGURE_ENV+=		MISC_TERMINFO_DIRS=${BUILDLINK_PREFIX.termcap}/share/terminfo
+.endif
+
+USE_FEATURES=		# empty (used in options.mk)
+.include "options.mk"
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libslang2/PLIST b/devel/libslang2/PLIST
new file mode 100644
index 00000000000..3d5d8012a91
--- /dev/null
+++ b/devel/libslang2/PLIST
@@ -0,0 +1,102 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+bin/slsh
+include/slang2/slang.h
+include/slang2/slcurses.h
+lib/libslang2.la
+lib/slang/v2/modules/fcntl-module.la
+lib/slang/v2/modules/iconv-module.la
+${PLIST.oniguruma}lib/slang/v2/modules/onig-module.la
+${PLIST.pcre}lib/slang/v2/modules/pcre-module.la
+${PLIST.png}lib/slang/v2/modules/png-module.la
+lib/slang/v2/modules/select-module.la
+lib/slang/v2/modules/slsmg-module.la
+lib/slang/v2/modules/socket-module.la
+lib/slang/v2/modules/termios-module.la
+lib/slang/v2/modules/varray-module.la
+man/man1/slsh.1
+share/doc/slang/v2/COPYING
+share/doc/slang/v2/changes.txt
+share/doc/slang/v2/cref.txt
+share/doc/slang/v2/cslang.txt
+share/doc/slang/v2/slang.txt
+share/doc/slang/v2/slangdoc.html
+share/doc/slang/v2/slangfun.txt
+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.html
+share/examples/libslang2/slsh.rc
+share/slsh/arrayfuns.sl
+share/slsh/autoload.sl
+share/slsh/cmaps/cool.map
+share/slsh/cmaps/copper.map
+share/slsh/cmaps/drywet.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/glob.sl
+share/slsh/help
+share/slsh/iconv.sl
+share/slsh/onig.sl
+share/slsh/pcre.sl
+share/slsh/png.sl
+share/slsh/print.sl
+share/slsh/profile.sl
+share/slsh/readascii.sl
+share/slsh/require.sl
+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/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/termios.sl
+share/slsh/varray.sl
+@dirrm share/slsh/scripts
+@dirrm share/slsh/rline
+@dirrm share/slsh/cmaps
+@dirrm share/slsh
+@dirrm share/examples/libslang2
+@dirrm share/doc/slsh/html
+@dirrm share/doc/slsh
+@dirrm share/doc/slang/v2
+@dirrm share/doc/slang
+@dirrm lib/slang/v2/modules
+@dirrm lib/slang/v2
+@dirrm lib/slang
+@dirrm include/slang2
diff --git a/devel/libslang2/buildlink3.mk b/devel/libslang2/buildlink3.mk
new file mode 100644
index 00000000000..4eceb35f4f6
--- /dev/null
+++ b/devel/libslang2/buildlink3.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBSLANG2_BUILDLINK3_MK:=	${LIBSLANG2_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	libslang2
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibslang2}
+BUILDLINK_PACKAGES+=	libslang2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang2
+
+.if ${LIBSLANG2_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.libslang2+=	libslang2>=2.1.3
+BUILDLINK_PKGSRCDIR.libslang2?=	../../devel/libslang2
+BUILDLINK_FNAME_TRANSFORM.libslang2+=	-e 's|include/slang2/|include/|g'
+BUILDLINK_TRANSFORM+=		l:slang:slang2
+pkgbase:=	libslang2
+.  include "../../mk/pkg-build-options.mk"
+.endif	# LIBSLANG2_BUILDLINK3_MK
+
+.if !empty(PKG_BUILD_OPTIONS.libslang2:Mpng)
+.  include "../../graphics/png/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.libslang2:Mpcre)
+.  include "../../devel/pcre/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.libslang2:Moniguruma)
+.  include "../../textproc/oniguruma/buildlink3.mk"
+.endif
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libslang2/distinfo b/devel/libslang2/distinfo
new file mode 100644
index 00000000000..dee7c876e93
--- /dev/null
+++ b/devel/libslang2/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+
+SHA1 (slang-2.1.3.tar.bz2) = 31fc6162684f69d9dd0377372dfdc336f0c4343a
+RMD160 (slang-2.1.3.tar.bz2) = b59424972e52c361a15b23874d1a0539683608e5
+Size (slang-2.1.3.tar.bz2) = 1191425 bytes
+SHA1 (patch-aa) = 6bccdf8d5caaadbc66c3f2b7eeab6da85efc5fef
+SHA1 (patch-ab) = eae92ea5fac608b1dd9e6106b452d67c79c19bcb
+SHA1 (patch-ac) = 1181b6ce5de5c7c149aa8692dbcded981bda688e
+SHA1 (patch-ad) = 03f839d82cd3f18f526293ff8015bfa1e029ede0
+SHA1 (patch-ae) = 9735e6211887bc6069e8efc6c471baac645d91f7
+SHA1 (patch-af) = 335d14eef480ff49bd7fb2ffc7a434a77ac9a2ec
diff --git a/devel/libslang2/options.mk b/devel/libslang2/options.mk
new file mode 100644
index 00000000000..35218d04f9b
--- /dev/null
+++ b/devel/libslang2/options.mk
@@ -0,0 +1,36 @@
+# $NetBSD: options.mk,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+#
+PKG_OPTIONS_VAR=		PKG_OPTIONS.libslang2
+PKG_SUPPORTED_OPTIONS=		png oniguruma pcre
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS=	${PKG_SUPPORTED_OPTIONS}
+.for var in ${PLIST_VARS}
+PLIST.${var}=	yes
+.endfor
+
+.if !empty(PKG_OPTIONS:Mpng)
+CONFIGURE_ARGS+=	--with-png=${BUILDLINK_PREFIX.png}
+.  include "../../graphics/png/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-png
+.endif
+
+.if !empty(PKG_OPTIONS:Mpcre)
+CONFIGURE_ARGS+=	--with-pcre=${BUILDLINK_PREFIX.pcre}
+.  include "../../devel/pcre/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-pcre
+.endif
+
+.if !empty(PKG_OPTIONS:Moniguruma)
+CONFIGURE_ARGS+=	--with-onig=${BUILDLINK_PREFIX.oniguruma}
+.  include "../../textproc/oniguruma/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-onig
+.endif
+
+.if empty(PKG_OPTIONS:Moniguruma) && empty(PKG_OPTIONS:Mpcre)
+USE_FEATURES+=		regcomp
+.endif
diff --git a/devel/libslang2/patches/patch-aa b/devel/libslang2/patches/patch-aa
new file mode 100644
index 00000000000..4c3447e3675
--- /dev/null
+++ b/devel/libslang2/patches/patch-aa
@@ -0,0 +1,83 @@
+$NetBSD: patch-aa,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+
+--- src/Makefile.in.orig	2007-09-07 22:47:29.000000000 -0400
++++ src/Makefile.in
+@@ -4,7 +4,7 @@
+ #---------------------------------------------------------------------------
+ CC              = @CC@
+ CFLAGS 		= @CFLAGS@
+-LDFLAGS		= @LDFLAGS@
++LDFLAGS		= $(EXECLIBS)
+ #-----------------------------------------------------------------------------
+ # System library that contains functions for dynamic linking (-ldl)
+ #-----------------------------------------------------------------------------
+@@ -22,7 +22,7 @@ ELF_DEP_LIBS	= @ELF_DEP_LIBS@
+ # Set these values to ABSOLUTE path names
+ #---------------------------------------------------------------------------
+ SRCDIR = @SRCDIR@# Location of sources
+-OBJDIR = @OBJDIR@# Location of objects
++OBJDIR = .# Location of objects
+ ELFDIR = @ELFDIR@# Location of elf objects
+ VERSION_SCRIPT	= $(SRCDIR)/slang.ver
+ 
+@@ -87,11 +87,11 @@ INSTALL_ELFLIB_TARGET	= @INSTALL_ELFLIB_
+ CONFIG_H		= config.h
+ ALL_CFLAGS		= $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)
+ ALL_ELF_CFLAGS		= $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)
+-COMPILE_CMD		= $(CC) -c $(ALL_CFLAGS)
++COMPILE_CMD		= $(LIBTOOL) --mode=compile --tag=CC $(LIBTOOL_FLAGS) $(CC) -c $(ALL_CFLAGS) $(LIBTOOL_CFLAGS)
+ ELFCOMPILE_CMD		= $(ELF_CC) -c $(ALL_ELF_CFLAGS)
+ ELF_LINK_CMD		= $(ELF_LINK)
+ 
+-NORMAL_LIB = lib$(THIS_LIB).a
++NORMAL_LIB = lib$(THIS_LIB)2.la
+ OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)
+ 
+ # On most systems, these variables have values of the form:
+@@ -136,14 +136,14 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
+ #---------------------------------------------------------------------------
+ # Rules
+ #---------------------------------------------------------------------------
+-all: static elf
+-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
++all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB)
++elf: all
+ 
+ $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
+-	-$(RM) $(OBJDIR_NORMAL_LIB)
+-	cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
+-	$(RANLIB) $(OBJDIR_NORMAL_LIB)
++	cd $(OBJDIR); $(LIBTOOL) --mode=link $(LIBTOOL_FLAGS) \
++		$(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
++			$(LIBTOOL_LDFLAGS) -rpath $(PREFIX)/lib \
++			$(DL_LIB) -lm -ltermcap -version-info 2:1
+ 	@echo ""
+ 	@echo $(NORMAL_LIB) created in $(OBJDIR)
+ 
+@@ -184,10 +184,9 @@ install-docs: $(DEST_DOCDIR)
+ 		echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
+ 		$(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
+ 	done
+-install-static: static install-headers install-docs $(DEST_LIBDIR)
++install-static: all install-headers install-docs $(DEST_LIBDIR)
+ 	@echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)/
+-	$(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)/
+-	$(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)/
+ install-elf-and-links:
+ 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
+ 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
+@@ -205,9 +204,9 @@ install-elf-cygwin:
+ 	$(INSTALL_DATA) $(ELFDIR_DLL_LIB) $(DEST_LIBDIR)/
+ 	$(MKINSDIR) $(DEST_BINDIR)
+ 	$(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_BINDIR)/
+-install-elf: elf install-headers install-docs $(DEST_LIBDIR) $(INSTALL_ELFLIB_TARGET)
+-install-all: install-elf install-static
+-install: install-all
++install-elf: install-static
++install-all: install-static
++install: install-static
+ #---------------------------------------------------------------------------
+ # Tests
+ #---------------------------------------------------------------------------
diff --git a/devel/libslang2/patches/patch-ab b/devel/libslang2/patches/patch-ab
new file mode 100644
index 00000000000..4cfbc882237
--- /dev/null
+++ b/devel/libslang2/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+
+--- configure.orig	2007-10-22 13:49:55.000000000 -0400
++++ configure
+@@ -10692,6 +10692,7 @@ fi
+ 
+ 
+ fi
++if false; then
+ { echo "$as_me:$LINENO: checking for terminfo" >&5
+ echo $ECHO_N "checking for terminfo... $ECHO_C" >&6; }
+ if test "$nc5config" != "no"
+@@ -10717,6 +10718,7 @@ echo "${ECHO_T}yes" >&6; }
+       break
+    fi
+ done
++fi
+ if test "$TERMCAP"; then
+   { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -10762,8 +10764,8 @@ then
+   fi
+ fi
+ 
+-OBJDIR=$SRCDIR/"$ARCH"objs
+-ELFDIR=$SRCDIR/elf"$ARCH"objs
++OBJDIR=$SRCDIR/
++ELFDIR=$OBJDIR
+ 
+ 
+ 
diff --git a/devel/libslang2/patches/patch-ac b/devel/libslang2/patches/patch-ac
new file mode 100644
index 00000000000..3de82127488
--- /dev/null
+++ b/devel/libslang2/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+
+--- src/slang.h.orig	2007-10-28 18:37:14.000000000 -0400
++++ src/slang.h
+@@ -43,6 +43,11 @@ USA.  
+ # endif
+ #endif /* __watcomc__ */
+ 
++#if defined(__NetBSD__) || defined(__APPLE__)
++#undef unix
++#define unix 1
++#endif
++
+ #if defined(unix) || defined(__unix)
+ # ifndef __unix__
+ #  define __unix__ 1
diff --git a/devel/libslang2/patches/patch-ad b/devel/libslang2/patches/patch-ad
new file mode 100644
index 00000000000..fce09d57f5a
--- /dev/null
+++ b/devel/libslang2/patches/patch-ad
@@ -0,0 +1,53 @@
+$NetBSD: patch-ad,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+
+--- demo/Makefile.in.orig	2006-05-12 15:09:10.000000000 -0400
++++ demo/Makefile.in
+@@ -28,17 +28,17 @@ CONFIG_H = config.h
+ 
+ ALL_CFLAGS = $(CFLAGS) -Dunix -I$(SLANG_INCLUDE)
+ 
+-COMPILE_CMD = $(CC) -c $(ALL_CFLAGS)
++COMPILE_CMD = $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS)
+ EXECLIBS = -L$(SLANG_LIB) -lslang -lm $(TCAPLIB)
+-EXECDEPS = $(SLANG_LIB)/libslang.a
++EXECDEPS = $(SLANG_LIB)/libslang.la
+ DOT_O_DEPS = demolib.c
+ 
+ #---------------------------------------------------------------------------
+ all: $(CONFIG_H) $(OTHERSTUFF)
+ 
+-$(CONFIG_H) : $(SLANG_LIB)/libslang.a ../src/config.h
+-	/bin/cp ../src/config.h $(CONFIG_H)
+-$(SLANG_LIB)/libslang.a :
++$(CONFIG_H) : $(SLANG_LIB)/libslang.la ../src/config.h
++	cp ../src/config.h $(CONFIG_H)
++$(SLANG_LIB)/libslang.la :
+ 	cd ../src; $(MAKE)
+ #---------------------------------------------------------------------------
+ # Housekeeping
+@@ -49,21 +49,21 @@ distclean: clean
+ 	-/bin/rm -rf Makefile config.h
+ #
+ useropen : useropen.o $(useropen_DEPS) $(EXECDEPS)
+-	$(CC) -o useropen $(LDFLAGS) useropen.o $(useropen_LIBS) $(EXECLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o useropen $(LDFLAGS) useropen.lo $(useropen_LIBS) $(EXECLIBS)
+ useropen.o : useropen.c $(DOT_O_DEPS) $(useropen_O_DEP)
+ 	$(COMPILE_CMD) $(useropen_INC) $(EXECINC) useropen.c
+ 
+ pager : pager.o $(pager_DEPS) $(EXECDEPS)
+-	$(CC) -o pager $(LDFLAGS) pager.o $(pager_LIBS) $(EXECLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o pager $(LDFLAGS) pager.lo $(pager_LIBS) $(EXECLIBS)
+ pager.o : pager.c $(DOT_O_DEPS) $(pager_O_DEP)
+ 	$(COMPILE_CMD) $(pager_INC) $(EXECINC) pager.c
+ 
+ keypad : keypad.o $(keypad_DEPS) $(EXECDEPS)
+-	$(CC) -o keypad $(LDFLAGS) keypad.o $(keypad_LIBS) $(EXECLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o keypad $(LDFLAGS) keypad.lo $(keypad_LIBS) $(EXECLIBS)
+ keypad.o : keypad.c $(DOT_O_DEPS) $(keypad_O_DEP)
+ 	$(COMPILE_CMD) $(keypad_INC) $(EXECINC) keypad.c
+ 
+ smgtest : smgtest.o $(smgtest_DEPS) $(EXECDEPS)
+-	$(CC) -o smgtest $(LDFLAGS) smgtest.o $(smgtest_LIBS) $(EXECLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o smgtest $(LDFLAGS) smgtest.lo $(smgtest_LIBS) $(EXECLIBS)
+ smgtest.o : smgtest.c $(DOT_O_DEPS) $(smgtest_O_DEP)
+ 	$(COMPILE_CMD) $(smgtest_INC) $(EXECINC) smgtest.c
diff --git a/devel/libslang2/patches/patch-ae b/devel/libslang2/patches/patch-ae
new file mode 100644
index 00000000000..e1e79a593da
--- /dev/null
+++ b/devel/libslang2/patches/patch-ae
@@ -0,0 +1,65 @@
+$NetBSD: patch-ae,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+
+--- modules/Makefile.in.orig	2007-09-07 22:47:29.000000000 -0400
++++ modules/Makefile.in
+@@ -69,9 +69,10 @@ DEST_HELPDIR	= $(DESTDIR)$(HELP_DIR)
+ #---------------------------------------------------------------------------
+ RPATH = @RPATH@
+ 
+-LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) -lm
++LIBS = $(LDFLAGS) -module -avoid-version -rpath $(PREFIX)/lib $(SLANG_LIB) $(DL_LIB) -lm
+ #LIBS = $(RPATH) $(DL_LIB) -lm
+ INCS = $(SLANG_INC)
++CC_SHARED:=${LIBTOOL} --mode=link ${LIBTOOL_FLAGS} ${CC} 
+ 
+ all: $(MODULES)
+ 
+@@ -79,35 +80,35 @@ config.h: ../src/config.h
+ 	cp ../src/config.h .
+ 
+ slsmg-module.so: slsmg-module.c config.h
+-	$(CC_SHARED) $(INCS) slsmg-module.c -o slsmg-module.so $(LIBS)
++	$(CC_SHARED) $(INCS) slsmg-module.c -o slsmg-module.la $(LIBS)
+ newt-module.so: newt-module.c config.h
+-	$(CC_SHARED) $(INCS) newt-module.c -o newt-module.so -lnewt $(LIBS)
++	$(CC_SHARED) $(INCS) newt-module.c -o newt-module.la -lnewt $(LIBS)
+ termios-module.so: termios-module.c config.h
+-	$(CC_SHARED) $(INCS) termios-module.c -o termios-module.so $(LIBS)
++	$(CC_SHARED) $(INCS) termios-module.c -o termios-module.la $(LIBS)
+ select-module.so: select-module.c config.h
+-	$(CC_SHARED) $(INCS) select-module.c -o select-module.so $(LIBS)
++	$(CC_SHARED) $(INCS) select-module.c -o select-module.la $(LIBS)
+ fcntl-module.so: fcntl-module.c config.h
+-	$(CC_SHARED) $(INCS) fcntl-module.c -o fcntl-module.so $(LIBS)
++	$(CC_SHARED) $(INCS) fcntl-module.c -o fcntl-module.la $(LIBS)
+ varray-module.so: varray-module.c config.h
+-	$(CC_SHARED) $(INCS) varray-module.c -o varray-module.so $(LIBS)
++	$(CC_SHARED) $(INCS) varray-module.c -o varray-module.la $(LIBS)
+ pcre-module.so: pcre-module.c config.h
+-	$(CC_SHARED) $(INCS) $(PCRE_INC) pcre-module.c -o pcre-module.so $(PCRE_LIB) $(LIBS)
++	$(CC_SHARED) $(INCS) $(PCRE_INC) pcre-module.c -o pcre-module.la $(PCRE_LIB) $(LIBS)
+ onig-module.so: onig-module.c config.h
+-	$(CC_SHARED) $(INCS) $(ONIG_INC) onig-module.c -o onig-module.so $(ONIG_LIB) $(LIBS)
++	$(CC_SHARED) $(INCS) $(ONIG_INC) onig-module.c -o onig-module.la $(ONIG_LIB) $(LIBS)
+ png-module.so: png-module.c config.h
+-	$(CC_SHARED) $(INCS) $(PNG_INC) png-module.c -o png-module.so $(PNG_LIB) $(LIBS)
++	$(CC_SHARED) $(INCS) $(PNG_INC) png-module.c -o png-module.la $(PNG_LIB) $(LIBS)
+ socket-module.so: socket-module.c config.h
+-	$(CC_SHARED) $(INCS) socket-module.c -o socket-module.so $(SOCKET_LIBS) $(LIBS)
++	$(CC_SHARED) $(INCS) socket-module.c -o socket-module.la $(SOCKET_LIBS) $(LIBS)
+ iconv-module.so: iconv-module.c config.h
+-	$(CC_SHARED) $(INCS) $(ICONV_INC) iconv-module.c -o iconv-module.so $(ICONV_LIB) $(LIBS)
++	$(CC_SHARED) $(INCS) $(ICONV_INC) iconv-module.c -o iconv-module.la $(ICONV_LIB) $(LIBS)
+ 
+ # Note that Windows/Cygwin modules need execute permissions
+ install: all
+ 	-$(MKINSDIR) $(DEST_MODULEDIR)
+-	@for i in $(MODULES); \
++	@for i in $(MODULES:.so=.la); \
+ 	do \
+ 		echo $(INSTALL_MODULE) $$i $(DEST_MODULEDIR); \
+-		$(INSTALL_MODULE) $$i $(DEST_MODULEDIR); \
++		$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $$i $(DEST_MODULEDIR); \
+ 	done
+ 	-$(MKINSDIR) $(DEST_SLSH_DIR)
+ 	@for i in $(SLFILES); \
diff --git a/devel/libslang2/patches/patch-af b/devel/libslang2/patches/patch-af
new file mode 100644
index 00000000000..014baaec48b
--- /dev/null
+++ b/devel/libslang2/patches/patch-af
@@ -0,0 +1,62 @@
+$NetBSD: patch-af,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+
+--- slsh/Makefile.in.orig	2007-09-08 21:39:18.000000000 -0400
++++ slsh/Makefile.in
+@@ -64,7 +64,7 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
+ #----------------------------------------------------------------------------
+ @SET_MAKE@
+ SHELL = /bin/sh
+-INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
++INST_LIBS = -L$(PREFIX)/lib -lslang $(READLINE_LIB) $(OTHER_LIBS)
+ DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
+  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
+  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' 
+@@ -72,25 +72,25 @@ SRC_LIBS = $(SLANG_SRCLIB) -lslang $(REA
+ #
+ all: slsh_exe
+ slsh_exe: slsh.o readline.o
+-	$(CC) $(CFLAGS) slsh.o readline.o -o slsh_exe $(LDFLAGS) $(SRC_LIBS)
+-slsh: slsh.o readline.o
+-	$(CC) $(CFLAGS) slsh.o readline.o -o slsh $(LDFLAGS) $(INST_LIBS)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) slsh.lo readline.lo -o slsh $(LDFLAGS) $(SRC_LIBS) $(INST_LIBS)
++#slsh: slsh.o readline.o
++#	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) slsh.lo readline.lo -o slsh $(LDFLAGS) $(INST_LIBS)
+ slsh.o: slsh.c slsh.h config.h Makefile
+-	$(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) slsh.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) slsh.c $(LIBTOOL_CFLAGS)
+ readline.o: readline.c slsh.h config.h Makefile
+-	$(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) readline.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) readline.c $(LIBTOOL_CFLAGS) -o readline.lo
+ config.h: ../src/config.h
+ 	cp ../src/config.h .
+ install_directories:
+-	$(MKINSDIR) $(DEST_BIN_DIR)
+-	$(MKINSDIR) $(DEST_MAN_DIR)
+-	$(MKINSDIR) $(DEST_SLSH_CONF_DIR)
+-	$(MKINSDIR) $(DEST_SLSH_LIB_DIR)
+-	$(MKINSDIR) $(DEST_SLSH_LIB_DIR)/rline
+-	$(MKINSDIR) $(DEST_SLSH_HELP_DIR)
+-	$(MKINSDIR) $(DEST_SLSH_LOCALLIB_DIR)
+-	$(MKINSDIR) $(DEST_SLSH_SCRIPT_DIR)
+-	$(MKINSDIR) $(DEST_SLSH_DOC_DIR)/html
++	$(BSD_INSTALL_PROGRAM_DIR) $(DEST_BIN_DIR)
++	$(BSD_INSTALL_MAN_DIR) $(DEST_MAN_DIR)
++	$(BSD_INSTALL_DATA_DIR) $(DEST_SLSH_CONF_DIR)
++	$(BSD_INSTALL_LIB_DIR) $(DEST_SLSH_LIB_DIR)
++	$(BSD_INSTALL_LIB_DIR) $(DEST_SLSH_LIB_DIR)/rline
++	$(BSD_INSTALL_DATA_DIR $(DEST_SLSH_HELP_DIR)
++	$(BSD_INSTALL_LIB_DIR $(DEST_SLSH_LOCALLIB_DIR)
++	$(BSD_INSTALL_SCRIPT_DIR) $(DEST_SLSH_SCRIPT_DIR)
++	$(BSD_INSTALL_DATA_DIR) $(DEST_SLSH_DOC_DIR)/html
+ install_lib_files:
+ 	@for X in lib/*.sl; \
+ 	do \
+@@ -139,7 +139,7 @@ install_docs:
+ 
+ install: slsh install_directories install_lib_files install_rline_files \
+  install_scripts install_help install_docs
+-	$(INSTALL) slsh $(DEST_BIN_DIR)/
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) slsh $(DEST_BIN_DIR)/
+ 	$(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/
+ 	echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc
+ 	$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/